Merge Dev to Release (#37)

* Bitmap Cache Hardware Accelerated for Image Controls and Remove old code * Whoops Re-Add Waves Background that was accidentally removed in last commit. * Change Target Platform Upgrade Target Platform too 10.0.20348.0 * Edited Custom Panel * Debug Symbols * Update LaunchPassCustomPanel.cs * Fix All Scaling & Cropping Issues This has been a long term problem, happy to get this one done * Couple of small changes * Waves-LP file difference resolution update asset from more updated branch * Game Title Sort Order Backport retropassdev@da6dedc user can now sort games to any order instead of just alphabetically * Build Version v2.0.3 * Add files via upload * Delete Screenshot 2023-04-22 021815.png * Update README.md * Update README.md Description Update README.md * Update README.md Add Sort Title ID# recommendation. * Additional Doc Images * Setup Video's * Additional Doc Images Setup Video's * Moved These to Youtube * Add Cache to Media Elements Should hopefully improve stability with Video Backgrounds and some other minor optimisations * Revert "Add Cache to Media Elements" This reverts commit 2797364. * Add Cache to Media Player Elements * Update GameDetailsPage.xaml * Update README.md Update README.md * Update Docs Images * Update README.md (#23) Update README.md (#24) * Update README.md * Build * Game Title Sort Fix Probably fixes game title sort. * bump * Revert "Merge remote-tracking branch 'LaunchPass-Cloud/Optomise-Branch' into Dev" This reverts commit bc6183f, reversing changes made to 354e985. * Add Cache to Media Player Elements * Revert "Add Cache to Media Player Elements" This reverts commit fd70609. * Regenerate assets and reset XMLs to default if assets any are missing This stops LaunchPass getting stuck on the splashscreen if assets or XMLs are missing from the USB * Improves Image Loading & Fixes Cache Clearing when quitting LaunchPass Greatly improves how images are first loaded into Platforms, should help a lot with large collections too. Cache is now remembered properly and works as intended. * Update README.md (#28) * Update README.md * XBSX 2.0 URI Fix * 2.1.7.0 * Add Discord Button & Multiple URI`s All extra URI`s added to be used for splitting up Retroarch for individual systems. nintendo64 gameboy gbcolour gbadvance win95 w98 saturn nds dos URIs added to split up Dolphin in a simular way. gamecube wii virtualconsole riivolution This GitHub has versions of Dolphin and Retroarch that are split up and kept updated with icons, names and themes to match each system https://github.com/DevModeUWP?tab=repositories * Fix grammar and the fact that Box - Front was a country (#35) * Update Game.cs * fix grammar (msedge cant be uninstalled btw) * Update UrlSchemeGenerator.cs --------- Co-authored-by: MoistDreams <22002023+Misunderstood-Wookiee@users.noreply.github.com> Co-authored-by: MoistDreams <no-reply@no-reply.com> Co-authored-by: JJRoyale <98667766+JJRoyale@users.noreply.github.com>
Misunderstood-Wookiee · May 21, 2023 · 1209cce · 1209cce
1 parent 70504ac
commit 1209cce
Show file tree

Hide file tree

Showing 7 changed files with 280 additions and 14 deletions.
diff --git a/LaunchPass/Game.cs b/LaunchPass/Game.cs
@@ -69,8 +69,7 @@ private async Task<StorageFile> FindImageThumbnailAsync(StorageFolder folder)
                     "Europe",
                     "United States",
                     "Australia",
-                    "Canada",
-                    "Box - Front" };
+                    "Canada" };
 
                 int currentRegionIndex = 100;
                 int prefferedFileIndex = -1;

diff --git a/LaunchPass/LaunchPass_TemporaryKey.pfx b/LaunchPass/LaunchPass_TemporaryKey.pfx
diff --git a/LaunchPass/Package.appxmanifest b/LaunchPass/Package.appxmanifest
@@ -5,7 +5,7 @@
 		 xmlns:control="using:Microsoft.UI.Xaml.Controls"
          xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" 
          IgnorableNamespaces="uap mp rescap">
-  <Identity Name="f3a28ab5-9cd3-480a-86e5-58ecbeba4015" Publisher="CN=river" Version="2.1.7.0" />
+  <Identity Name="f3a28ab5-9cd3-480a-86e5-58ecbeba4015" Publisher="CN=LaunchPass" Version="2.1.8.0" />
   <mp:PhoneIdentity PhoneProductId="23dd9619-e5f5-42f7-858e-13d0fa3bd336" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>LaunchPass</DisplayName>

diff --git a/LaunchPass/Platform.cs b/LaunchPass/Platform.cs
@@ -16,6 +16,19 @@ public enum EEmulatorType
             duckstation,
             xenia,
             xeniacanary,
+            gamecube,
+            wii,
+            virtualconsole,
+            riivolution,
+            nintendo64,
+            gameboy,
+            gbcolour,
+            gbadvance,
+            win95,
+            w98,
+            saturn,
+            nds,
+            dos,
         }
 
         public string Name { get; set; }
@@ -60,6 +73,58 @@ public void SetEmulatorType(string emulatorPath)
             {
                 EmulatorType = EEmulatorType.duckstation;
             }
+            else if (string.IsNullOrEmpty(emulatorPath) == false && emulatorPath.Contains("gamecube", System.StringComparison.CurrentCultureIgnoreCase))
+            {
+                EmulatorType = EEmulatorType.gamecube;
+            }
+            else if (string.IsNullOrEmpty(emulatorPath) == false && emulatorPath.Contains("wii", System.StringComparison.CurrentCultureIgnoreCase))
+            {
+                EmulatorType = EEmulatorType.wii;
+            }
+            else if (string.IsNullOrEmpty(emulatorPath) == false && emulatorPath.Contains("virtualconsole", System.StringComparison.CurrentCultureIgnoreCase))
+            {
+                EmulatorType = EEmulatorType.virtualconsole;
+            }
+            else if (string.IsNullOrEmpty(emulatorPath) == false && emulatorPath.Contains("riivolution", System.StringComparison.CurrentCultureIgnoreCase))
+            {
+                EmulatorType = EEmulatorType.riivolution;
+            }
+            else if (string.IsNullOrEmpty(emulatorPath) == false && emulatorPath.Contains("nintendo64", System.StringComparison.CurrentCultureIgnoreCase))
+            {
+                EmulatorType = EEmulatorType.nintendo64;
+            }
+            else if (string.IsNullOrEmpty(emulatorPath) == false && emulatorPath.Contains("gameboy", System.StringComparison.CurrentCultureIgnoreCase))
+            {
+                EmulatorType = EEmulatorType.gameboy;
+            }
+            else if (string.IsNullOrEmpty(emulatorPath) == false && emulatorPath.Contains("gbcolour", System.StringComparison.CurrentCultureIgnoreCase))
+            {
+                EmulatorType = EEmulatorType.gbcolour;
+            }
+            else if (string.IsNullOrEmpty(emulatorPath) == false && emulatorPath.Contains("gbadvance", System.StringComparison.CurrentCultureIgnoreCase))
+            {
+                EmulatorType = EEmulatorType.gbadvance;
+            }
+            else if (string.IsNullOrEmpty(emulatorPath) == false && emulatorPath.Contains("win95", System.StringComparison.CurrentCultureIgnoreCase))
+            {
+                EmulatorType = EEmulatorType.win95;
+            }
+            else if (string.IsNullOrEmpty(emulatorPath) == false && emulatorPath.Contains("w98", System.StringComparison.CurrentCultureIgnoreCase))
+            {
+                EmulatorType = EEmulatorType.w98;
+            }
+            else if (string.IsNullOrEmpty(emulatorPath) == false && emulatorPath.Contains("saturn", System.StringComparison.CurrentCultureIgnoreCase))
+            {
+                EmulatorType = EEmulatorType.saturn;
+            }
+            else if (string.IsNullOrEmpty(emulatorPath) == false && emulatorPath.Contains("nds", System.StringComparison.CurrentCultureIgnoreCase))
+            {
+                EmulatorType = EEmulatorType.nds;
+            }
+            else if (string.IsNullOrEmpty(emulatorPath) == false && emulatorPath.Contains("dos", System.StringComparison.CurrentCultureIgnoreCase))
+            {
+                EmulatorType = EEmulatorType.dos;
+            }
             else if (string.IsNullOrEmpty(emulatorPath) == false &&
                 (emulatorPath.Contains("xenia-canary", System.StringComparison.CurrentCultureIgnoreCase) ||
                 emulatorPath.Contains("xeniacanary", System.StringComparison.CurrentCultureIgnoreCase) ||

diff --git a/LaunchPass/SettingsPage.xaml b/LaunchPass/SettingsPage.xaml
@@ -72,26 +72,31 @@
             <TextBlock Grid.Row="4" x:Name ="TextStatus" Text=""
                        HorizontalAlignment="Left"
                        TextWrapping="Wrap" VerticalAlignment="Top" Width="283" Style="{StaticResource TitleTextBlockStyle}" Margin="705,307,0,0" Height="40" />
-            <Button x:Name="ButtonHelp" Click="ButtonHelp_Click" Content="User Manual" Width="auto" Background="#7000" MinWidth="147.6" FontFamily="{StaticResource ApplicationFonts}" Margin="723,78,0,0" Grid.Row="4" VerticalAlignment="Top" />
+            <Button x:Name="ButtonHelp" Click="ButtonHelp_Click" Content="User Manual" Width="auto" Background="#7000" MinWidth="147.6" FontFamily="{StaticResource ApplicationFonts}" Margin="716,78,0,0" Grid.Row="4" VerticalAlignment="Top" />
             <Button x:Name="ButtonRetroAchievements" Content="RetroAchievements" Background="#7000" MinWidth="218.6" Click="RetroAchievements_Click" FontFamily="{StaticResource ApplicationFonts}" Margin="231,245,0,0" Grid.Row="4" VerticalAlignment="Top" Width="auto" />
             <TextBlock HorizontalAlignment="Left" Margin="230,19,0,0" TextWrapping="Wrap" Text="Settings" FontSize="24" FontFamily="{StaticResource ApplicationFonts}" VerticalAlignment="Top" Height="34" Width="190" Grid.Row="4" />
             <Button x:Name="ButtonClearRemovableCache" Click="ButtonClearRemovableCache_Click" Background="#7000" MinWidth="125.6" Content="Delete Cache" FontFamily="{StaticResource ApplicationFonts}" Margin="534,78,10,0" Grid.Row="4" VerticalAlignment="Top" />
             <Button x:Name="ButtonCustomize" Content="Customize" Click="ButtonCustomize_Click" Background="#7000" MinWidth="125.6" FontFamily="{StaticResource ApplicationFonts}" Margin="382,78,10,0" Grid.Row="4" VerticalAlignment="Top" />
             <Button x:Name="ButtonActivateRemovableStorage" Click="ButtonActivateRemovableStorage_Click" MinWidth="125.6" Content="Activate" Background="#6000" FontFamily="{StaticResource ApplicationFonts}" Margin="231,78,10,0" Grid.Row="4" VerticalAlignment="Top" />
 
-            <Button x:Name="Xeh" Click="Xhb_Click" Content="Xbox Emulation Hub" Width="auto" Background="#7000" MinWidth="218.6" FontFamily="{StaticResource ApplicationFonts}" Margin="488,245,0,0" Grid.Row="4" VerticalAlignment="Top" />
+            <Button x:Name="Xeh" Click="Xhb_Click" Content="Xbox Emulation Hub" Width="auto" Background="#7000" MinWidth="218.6" FontFamily="{StaticResource ApplicationFonts}" Margin="482,245,0,0" Grid.Row="4" VerticalAlignment="Top" />
             <Button x:Name="SM" Click="SM_Click" Content="Source code" Width="auto" Background="#7000" MinWidth="180.6" FontFamily="{StaticResource ApplicationFonts}" Margin="443,365,0,0" Grid.Row="4" VerticalAlignment="Top" />
             <Button x:Name="Our_Apps" Click="Our_Apps_Click" Content="Updates/Apps" Width="auto" Background="#7000" FontFamily="{StaticResource ApplicationFonts}" Margin="231,365,0,0" Grid.Row="4" VerticalAlignment="Top" />
             <TextBlock HorizontalAlignment="Left" Margin="235,62,0,0" Grid.Row="4" FontSize="9.5" TextWrapping="Wrap" Text="Set up your USB" FontFamily="{StaticResource ApplicationFonts}" Width="Auto" VerticalAlignment="Top" />
             <TextBlock HorizontalAlignment="Left" Margin="386,62,0,0" Grid.Row="4" FontSize="9.5" TextWrapping="Wrap" Text="Make it Your Own" FontFamily="{StaticResource ApplicationFonts}" Width="Auto" VerticalAlignment="Top" />
             <TextBlock HorizontalAlignment="Left" Margin="540,62,0,0" Grid.Row="4" FontSize="9.5" TextWrapping="Wrap" Text="Reset Your Images" FontFamily="{StaticResource ApplicationFonts}" Width="Auto" VerticalAlignment="Top" />
-            <TextBlock HorizontalAlignment="Left" Margin="727,62,0,0" Grid.Row="4" FontSize="9.5" TextWrapping="Wrap" Text="Check out the Guide" FontFamily="{StaticResource ApplicationFonts}" Width="Auto" VerticalAlignment="Top" SelectionChanged="TextBlock_SelectionChanged" />
+            <TextBlock HorizontalAlignment="Left" Margin="721,62,0,0" Grid.Row="4" FontSize="9.5" TextWrapping="Wrap" Text="Check out the Guide" FontFamily="{StaticResource ApplicationFonts}" Width="Auto" VerticalAlignment="Top" SelectionChanged="TextBlock_SelectionChanged" />
             <TextBlock HorizontalAlignment="Left" Margin="235,229,0,0" Grid.Row="4" FontSize="9.5" TextWrapping="Wrap" Text="View your Progress" FontFamily="{StaticResource ApplicationFonts}" Width="Auto" VerticalAlignment="Top" />
             <TextBlock HorizontalAlignment="Left" Margin="230,186,0,0" Grid.Row="4" FontSize="24" TextWrapping="Wrap" Text="Community" FontFamily="{StaticResource ApplicationFonts}" Width="Auto" VerticalAlignment="Top" />
-            <TextBlock HorizontalAlignment="Left" Margin="493,229,0,0" Grid.Row="4" FontSize="9.5" TextWrapping="Wrap" Text="Join the Discussion" FontFamily="{StaticResource ApplicationFonts}" Width="Auto" VerticalAlignment="Top" />
+            <TextBlock HorizontalAlignment="Left" Margin="487,229,0,0" Grid.Row="4" FontSize="9.5" TextWrapping="Wrap" Text="Join the Discussion" FontFamily="{StaticResource ApplicationFonts}" Width="Auto" VerticalAlignment="Top" />
             <TextBlock HorizontalAlignment="Left" Margin="449,349,0,0" Grid.Row="4" FontSize="9.5" TextWrapping="Wrap" Text="Help Development" FontFamily="{StaticResource ApplicationFonts}" Width="Auto" VerticalAlignment="Top" />
             <TextBlock HorizontalAlignment="Left" Margin="235,349,0,0" Grid.Row="4" FontSize="9.5" TextWrapping="Wrap" Text="Take a Look" FontFamily="{StaticResource ApplicationFonts}" Width="Auto" VerticalAlignment="Top" />
             <TextBlock HorizontalAlignment="Left" Margin="230,307,0,0" Grid.Row="4" FontSize="24" TextWrapping="Wrap" Text="More" FontFamily="{StaticResource ApplicationFonts}" Width="Auto" VerticalAlignment="Top" />
+            <Button x:Name="Discord" Click="LP_Click" Content="LaunchPass" Width="auto" Background="#7000" MinWidth="137.6" FontFamily="{StaticResource ApplicationFonts}" Margin="733,245,0,0" Grid.Row="4" VerticalAlignment="Top" />
+            <TextBlock HorizontalAlignment="Left" Margin="737,229,0,0" Grid.Row="4" FontSize="9.5" TextWrapping="Wrap" Text="Get Help/Support" FontFamily="{StaticResource ApplicationFonts}" Width="Auto" VerticalAlignment="Top" />
+            <TextBlock Margin="0,5,15,0" 
+                   HorizontalAlignment="Right" VerticalAlignment="Top"  
+                   Text="{x:Bind AppVersion,Mode=OneWay}" FontSize="12" CharacterSpacing="40"></TextBlock>
         </Grid>
         <Grid x:Name="OverlaySearch" Visibility="Visible" MaxWidth="300" Height="32" Margin="0,0,28,26" Padding="0,0,0,0" HorizontalAlignment="Right" VerticalAlignment="Bottom">
             <Border Opacity="0.78" Background="Black" CornerRadius="5"></Border>

diff --git a/LaunchPass/SettingsPage.xaml.cs b/LaunchPass/SettingsPage.xaml.cs
@@ -1,5 +1,6 @@
-using LaunchPass;
+using LaunchPass;
 using System;
+using Windows.ApplicationModel;
 using Windows.Storage;
 using Windows.System;
 using Windows.UI.Core;
@@ -21,6 +22,7 @@ public sealed partial class SettingsPage : Page
     {
         DataSourceManager dataSourceManager;
         Brush defaultForeground;
+        string AppVersion { get; set; }
 
         public SettingsPage()
         {
@@ -29,6 +31,10 @@ public SettingsPage()
             Loaded += SettingsPage_Loaded;
 
             defaultForeground = ButtonActivateLocalStorage.Foreground;
+            {
+                var version = Package.Current.Id.Version;
+                AppVersion = string.Format("v{0}.{1}.{2}", version.Major, version.Minor, version.Build);
+            }
         }
 
         protected override async void OnKeyDown(KeyRoutedEventArgs e)
@@ -275,7 +281,7 @@ private async void ButtonHelp_Click(object sender, RoutedEventArgs e)
             else
             {
                 // URI launch failed
-                var dialog = new MessageDialog("Sorry, something went wrong! Check your connection and make sure you have MS-Edge browser.");
+                var dialog = new MessageDialog("Sorry, something went wrong!");
                 await dialog.ShowAsync();
             }
         }
@@ -300,7 +306,7 @@ private async void RetroAchievements_Click(object sender, RoutedEventArgs e)
             else
             {
                 // URI launch failed
-                var dialog = new MessageDialog("Sorry, something went wrong! Check your connection and make sure you have MS-Edge browser.");
+                var dialog = new MessageDialog("Sorry, something went wrong!");
                 await dialog.ShowAsync();
             }
         }
@@ -318,7 +324,7 @@ private async void Xhb_Click(object sender, RoutedEventArgs e)
             else
             {
                 // URI launch failed
-                var dialog = new MessageDialog("Sorry, something went wrong! Check your connection and make sure you have MS-Edge browser.");
+                var dialog = new MessageDialog("Sorry, something went wrong!");
                 await dialog.ShowAsync();
             }
         }
@@ -336,7 +342,7 @@ private async void SM_Click(object sender, RoutedEventArgs e)
             else
             {
                 // URI launch failed
-                var dialog = new MessageDialog("Sorry, something went wrong! Check your connection and make sure you have MS-Edge browser.");
+                var dialog = new MessageDialog("Sorry, something went wrong!");
                 await dialog.ShowAsync();
             }
         }
@@ -354,7 +360,24 @@ private async void Our_Apps_Click(object sender, RoutedEventArgs e)
             else
             {
                 // URI launch failed
-                var dialog = new MessageDialog("Sorry, something went wrong! Check your connection and make sure you have MS-Edge browser.");
+                var dialog = new MessageDialog("Sorry, something went wrong!");
+                await dialog.ShowAsync();
+            }
+        }
+        private async void LP_Click(object sender, RoutedEventArgs e)
+        {
+            // The URI to launch
+            var uri = new Uri("microsoft-edge:https://discord.gg/eYt92NNhNE");
+            // Launch the URI
+            var success = await Windows.System.Launcher.LaunchUriAsync(uri);
+            if (success)
+            {
+                // URI launched
+            }
+            else
+            {
+                // URI launch failed
+                var dialog = new MessageDialog("Sorry, something went wrong!");
                 await dialog.ShowAsync();
             }
         }
@@ -363,4 +386,4 @@ private void TextBlock_SelectionChanged(object sender, RoutedEventArgs e)
         {
         }
     }
-}
+}