Skip to content

Commit

Permalink
feat: remove page transition animation
Browse files Browse the repository at this point in the history
Because it slow down app navigation.

- Fix demo being always the same when navigating to demo details when the app has been started from Windows explorer
- Fix HLTV rating 1/2 being sorted twice
- Upgrade to VS 2022
- Includes navigation refactor
  • Loading branch information
akiver committed Mar 17, 2022
1 parent d049b2d commit ccdc551
Show file tree
Hide file tree
Showing 64 changed files with 660 additions and 2,295 deletions.
17 changes: 2 additions & 15 deletions CSGO Demos Manager.sln
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.32106.194
# Visual Studio Version 17
VisualStudioVersion = 17.1.32228.430
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Manager", "Manager\Manager.csproj", "{1D6D9598-4348-4444-A8DF-A634CA0D371B}"
ProjectSection(ProjectDependencies) = postProject
{496A0714-9ADF-4C56-8E93-3DFA0EBA89D1} = {496A0714-9ADF-4C56-8E93-3DFA0EBA89D1}
{4180E444-4AA1-4564-9296-50323FE504FE} = {4180E444-4AA1-4564-9296-50323FE504FE}
{22A46D61-1D40-43A9-802C-B9D43DADD9EC} = {22A46D61-1D40-43A9-802C-B9D43DADD9EC}
{9E6E1490-43BD-4925-8A3F-84B962828208} = {9E6E1490-43BD-4925-8A3F-84B962828208}
{B0B2F0B5-4E7F-41AE-817F-9C0F30DA5367} = {B0B2F0B5-4E7F-41AE-817F-9C0F30DA5367}
{22D4CFC7-6810-4C18-A353-71A49782394F} = {22D4CFC7-6810-4C18-A353-71A49782394F}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfPageTransitions", "WpfPageTransitions\WpfPageTransitions.csproj", "{22A46D61-1D40-43A9-802C-B9D43DADD9EC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DemoInfo", "demoinfo\DemoInfo\DemoInfo.csproj", "{22D4CFC7-6810-4C18-A353-71A49782394F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bot", "Bot\Bot.csproj", "{9E6E1490-43BD-4925-8A3F-84B962828208}"
Expand Down Expand Up @@ -67,16 +64,6 @@ Global
{1D6D9598-4348-4444-A8DF-A634CA0D371B}.SavePropValues|x86.Build.0 = Release|x86
{1D6D9598-4348-4444-A8DF-A634CA0D371B}.YoloDebug|x86.ActiveCfg = Debug|x86
{1D6D9598-4348-4444-A8DF-A634CA0D371B}.YoloDebug|x86.Build.0 = Debug|x86
{22A46D61-1D40-43A9-802C-B9D43DADD9EC}.Bitstream-Debugging|x86.ActiveCfg = Debug|x86
{22A46D61-1D40-43A9-802C-B9D43DADD9EC}.Bitstream-Debugging|x86.Build.0 = Debug|x86
{22A46D61-1D40-43A9-802C-B9D43DADD9EC}.Debug|x86.ActiveCfg = Debug|x86
{22A46D61-1D40-43A9-802C-B9D43DADD9EC}.Debug|x86.Build.0 = Debug|x86
{22A46D61-1D40-43A9-802C-B9D43DADD9EC}.Release|x86.ActiveCfg = Release|x86
{22A46D61-1D40-43A9-802C-B9D43DADD9EC}.Release|x86.Build.0 = Release|x86
{22A46D61-1D40-43A9-802C-B9D43DADD9EC}.SavePropValues|x86.ActiveCfg = Release|x86
{22A46D61-1D40-43A9-802C-B9D43DADD9EC}.SavePropValues|x86.Build.0 = Release|x86
{22A46D61-1D40-43A9-802C-B9D43DADD9EC}.YoloDebug|x86.ActiveCfg = Debug|x86
{22A46D61-1D40-43A9-802C-B9D43DADD9EC}.YoloDebug|x86.Build.0 = Debug|x86
{22D4CFC7-6810-4C18-A353-71A49782394F}.Bitstream-Debugging|x86.ActiveCfg = Bitstream-Debugging|Any CPU
{22D4CFC7-6810-4C18-A353-71A49782394F}.Bitstream-Debugging|x86.Build.0 = Bitstream-Debugging|Any CPU
{22D4CFC7-6810-4C18-A353-71A49782394F}.Debug|x86.ActiveCfg = Debug|Any CPU
Expand Down
2 changes: 0 additions & 2 deletions Manager/App.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
using System.Globalization;
using System.IO;
using System.Reflection;
using System.Runtime.ExceptionServices;
using System.Runtime.InteropServices;
using System.Threading;
using System.Threading.Tasks;
Expand All @@ -13,7 +12,6 @@
using ControlzEx.Theming;
using Core;
using GalaSoft.MvvmLight.Threading;
using MahApps.Metro;
using MahApps.Metro.Theming;
using Manager.Properties;

Expand Down
140 changes: 140 additions & 0 deletions Manager/Internals/Navigation.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,140 @@
using System.Windows.Controls;
using Core.Models;
using GalaSoft.MvvmLight.Messaging;
using Manager.Messages;
using Manager.ViewModel;
using Manager.Views.Accounts;
using Manager.Views.Demos;
using Manager.Views.Players;
using Manager.Views.Rounds;
using Manager.Views.Suspects;

namespace Manager.Internals
{
public static class Navigation
{
public static void ShowDemoList()
{
ShowPage(new DemoListView());
}

public static void ShowDemoDetails(Demo demo)
{
new ViewModelLocator().DemoDetails.Demo = demo;

ShowPage(new DemoDetailsView());
}

public static void ShowCurrentDemoDetails()
{
ShowPage(new DemoDetailsView());
}

public static void ShowRoundDetails(Demo demo, int roundNumber)
{
var roundViewModel = new ViewModelLocator().RoundDetails;
roundViewModel.Demo = demo;
roundViewModel.RoundNumber = roundNumber;

ShowPage(new RoundDetailsView());
}

public static void ShowPlayerDetails(Demo demo, Player player)
{
var playerViewModel = new ViewModelLocator().PlayerDetails;
playerViewModel.Demo = demo;
playerViewModel.CurrentPlayer = player;

ShowPage(new PlayerDetailsView());
}

public static void ShowDemoHeatmap(Demo demo)
{
new ViewModelLocator().DemoHeatmap.Demo = demo;

ShowPage(new DemoHeatmapView());
}

public static void ShowDemoOverview(Demo demo)
{
new ViewModelLocator().DemoOverview.Demo = demo;

ShowPage(new DemoOverviewView());
}

public static void ShowDemoKills(Demo demo)
{
new ViewModelLocator().DemoKills.Demo = demo;

ShowPage(new DemoKillsView());
}

public static void ShowDemoDamages(Demo demo)
{
new ViewModelLocator().DemoDamages.Demo = demo;

ShowPage(new DemoDamagesView());
}

public static void ShowDemoFlashbangs(Demo demo)
{
new ViewModelLocator().DemoFlashbangs.Demo = demo;

ShowPage(new DemoFlashbangsView());
}

public static void ShowDemoStuffs(Demo demo)
{
new ViewModelLocator().DemoStuffs.Demo = demo;

ShowPage(new DemoStuffsView());
}

public static void ShowDemoMovie(Demo demo)
{
new ViewModelLocator().DemoMovie.Demo = demo;

ShowPage(new DemoMovieView());
}

public static void ShowSuspectList()
{
ShowPage(new SuspectListView());
}

public static void ShowWhitelist()
{
ShowPage(new WhitelistView());
}

public static void ShowAccountOverall()
{
ShowPage(new AccountOverallView());
}

public static void ShowAccountMaps()
{
ShowPage(new AccountMapsView());
}

public static void ShowAccountWeapons()
{
ShowPage(new AccountWeaponsView());
}

public static void ShowAccountRank()
{
ShowPage(new AccountRankView());
}

public static void ShowAccountProgress()
{
ShowPage(new AccountProgressView());
}

private static void ShowPage(UserControl page)
{
Messenger.Default.Send(new ShowPageMessage(page));
}
}
}
Loading

0 comments on commit ccdc551

Please sign in to comment.