Merge branch 'main' into neon-changes

CollapseLauncher · Jul 28, 2023 · c929bea · c929bea
2 parents bc580f1 + 0e82032
commit c929bea
Show file tree

Hide file tree

Showing 16 changed files with 39 additions and 24 deletions.
diff --git a/CollapseLauncher/Assets/BG/AiHappy.png → CollapseLauncher/Assets/Images/AiHappy.png b/CollapseLauncher/Assets/BG/AiHappy.png → CollapseLauncher/Assets/Images/AiHappy.png
diff --git a/CollapseLauncher/Assets/BG/AponiaFly.png → CollapseLauncher/Assets/Images/AponiaFly.png b/CollapseLauncher/Assets/BG/AponiaFly.png → CollapseLauncher/Assets/Images/AponiaFly.png
diff --git a/CollapseLauncher/Assets/BG/PaimonSleep.png → ...pseLauncher/Assets/Images/PaimonSleep.png b/CollapseLauncher/Assets/BG/PaimonSleep.png → ...pseLauncher/Assets/Images/PaimonSleep.png
diff --git a/CollapseLauncher/Assets/BG/PaimonWhat.png → ...apseLauncher/Assets/Images/PaimonWhat.png b/CollapseLauncher/Assets/BG/PaimonWhat.png → ...apseLauncher/Assets/Images/PaimonWhat.png
diff --git a/CollapseLauncher/Assets/BG/StartUpBG.png → ...ncher/Assets/Images/StartupBackground.png b/CollapseLauncher/Assets/BG/StartUpBG.png → ...ncher/Assets/Images/StartupBackground.png
diff --git a/CollapseLauncher/Assets/BG/StartUpBG2.png → ...cher/Assets/Images/StartupBackground2.png b/CollapseLauncher/Assets/BG/StartUpBG2.png → ...cher/Assets/Images/StartupBackground2.png
diff --git a/CollapseLauncher/Assets/BG/default.png → CollapseLauncher/Assets/Images/default.png b/CollapseLauncher/Assets/BG/default.png → CollapseLauncher/Assets/Images/default.png
diff --git a/CollapseLauncher/CollapseLauncher.csproj b/CollapseLauncher/CollapseLauncher.csproj
@@ -23,7 +23,6 @@
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
 		<DefineConstants>DISABLE_XAML_GENERATED_MAIN;PREVIEW;DISABLETRANSPARENT;DISABLEMOVEMIGRATE</DefineConstants>
-		<Optimize>False</Optimize>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
 		<DefineConstants>DISABLE_XAML_GENERATED_MAIN;PREVIEW;DISABLETRANSPARENT;DISABLEMOVEMIGRATE</DefineConstants>
@@ -56,49 +55,65 @@
 		<Content Include="CollapseLauncher.Hi3CacheUpdater.cmd">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</Content>
+
 		<Content Include="icon.ico">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</Content>
+
 		<Content Include="Misc\InstallMediaPack.cmd">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</Content>
+
 		<None Include="..\.editorconfig" Link=".editorconfig" />
-		<Content Update="Assets\BG\AiHappy.png">
+
+		<Content Update="Assets\Images\AiHappy.png">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</Content>
-		<Content Update="Assets\BG\AponiaFly.png">
+
+		<Content Update="Assets\Images\AponiaFly.png">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</Content>
-		<Content Update="Assets\BG\default.png">
+
+		<Content Update="Assets\Images\default.png">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</Content>
-		<Content Update="Assets\BG\PaimonSleep.png">
+
+		<Content Update="Assets\Images\PaimonSleep.png">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</Content>
-		<Content Update="Assets\BG\PaimonWhat.png">
+
+		<Content Update="Assets\Images\PaimonWhat.png">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</Content>
-		<Content Update="Assets\BG\StartUpBG.png">
+
+		<Content Update="Assets\Images\StartupBackground.png">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</Content>
-		<Content Update="Assets\BG\StartUpBG2.png">
+
+		<Content Update="Assets\Images\StartupBackground2.png">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</Content>
+
 		<Content Update="Assets\CollapseLauncherLogo.png">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</Content>
+
 		<Content Update="Assets\Fonts\FontAwesomeBrand6.otf">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</Content>
+
 		<Content Update="Assets\Fonts\FontAwesomeRegular6.otf">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</Content>
+
 		<Content Update="Assets\Fonts\FontAwesomeSolid6.otf">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</Content>
+
 		<Content Update="Assets\Presets\CommunityTools.json">
 		  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</Content>
+
 		<Content Update="Assets\Presets\Honkai\PersonalGraphicsSettingV2.json">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</Content>

diff --git a/CollapseLauncher/XAMLs/MainApp/DisconnectedPage.xaml b/CollapseLauncher/XAMLs/MainApp/DisconnectedPage.xaml
@@ -21,7 +21,7 @@
                 <Run Text="{x:Bind helper:Locale.Lang._DisconnectedPage.Footer3}"/>
             </TextBlock>
         </Grid>
-        <Image Source="ms-appx:///Assets/BG/PaimonSleep.png" Width="467" Height="496"
+        <Image Source="ms-appx:///Assets/Images/PaimonSleep.png" Width="467" Height="496"
                HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,32,32" PointerPressed="PaimonClicked"/>
     </Grid>
 </Page>
diff --git a/CollapseLauncher/XAMLs/MainApp/MainPage.xaml b/CollapseLauncher/XAMLs/MainApp/MainPage.xaml
@@ -15,8 +15,8 @@
     </Page.Resources>
     <Grid x:Name="MainPageGrid">
         <Grid x:Name="Background" Visibility="Collapsed">
-            <Image x:Name="BackgroundBack" Source="ms-appx:///Assets/BG/default.png" Stretch="UniformToFill" HorizontalAlignment="Center" VerticalAlignment="Center" Opacity="0"/>
-            <Image x:Name="BackgroundBackBuffer" Source="ms-appx:///Assets/BG/default.png" Stretch="UniformToFill" HorizontalAlignment="Center" VerticalAlignment="Center" Opacity="0"/>
+            <Image x:Name="BackgroundBack" Source="ms-appx:///Assets/Images/default.png" Stretch="UniformToFill" HorizontalAlignment="Center" VerticalAlignment="Center" Opacity="0"/>
+            <Image x:Name="BackgroundBackBuffer" Source="ms-appx:///Assets/Images/default.png" Stretch="UniformToFill" HorizontalAlignment="Center" VerticalAlignment="Center" Opacity="0"/>
         </Grid>
         <Grid x:Name="BackgroundAcrylicMask" Background="{ThemeResource BackgroundMaskAcrylicBrush}" Visibility="Collapsed"/>
         <NavigationView x:Name="NavigationViewControl"
@@ -33,8 +33,8 @@
             PaneOpening="NavigationPanelOpening_Event"
             PaneClosing="NavigationPanelClosing_Event">
             <Grid>
-                <Image x:Name="BackgroundFront" Margin="0,0,0,0" Source="ms-appx:///Assets/BG/default.png" Stretch="UniformToFill" HorizontalAlignment="Center" VerticalAlignment="Center" Opacity="1"/>
-                <Image x:Name="BackgroundFrontBuffer" Margin="0,0,0,0" Source="ms-appx:///Assets/BG/default.png" Stretch="UniformToFill" HorizontalAlignment="Center" VerticalAlignment="Center" Opacity="0"/>
+                <Image x:Name="BackgroundFront" Margin="0,0,0,0" Source="ms-appx:///Assets/Images/default.png" Stretch="UniformToFill" HorizontalAlignment="Center" VerticalAlignment="Center" Opacity="1"/>
+                <Image x:Name="BackgroundFrontBuffer" Margin="0,0,0,0" Source="ms-appx:///Assets/Images/default.png" Stretch="UniformToFill" HorizontalAlignment="Center" VerticalAlignment="Center" Opacity="0"/>
                 <Frame x:Name="LauncherFrame">
                     <Frame.ContentTransitions>
                         <NavigationThemeTransition/>
@@ -195,7 +195,7 @@
                     <StackPanel.OpacityTransition>
                         <ScalarTransition/>
                     </StackPanel.OpacityTransition>
-                    <Image Margin="0,0,0,16" Source="ms-appx:///Assets/BG/PaimonSleep.png" Width="200" HorizontalAlignment="Center" VerticalAlignment="Center" Opacity="0.5"/>
+                    <Image Margin="0,0,0,16" Source="ms-appx:///Assets/Images/PaimonSleep.png" Width="200" HorizontalAlignment="Center" VerticalAlignment="Center" Opacity="0.5"/>
                     <TextBlock Text="{x:Bind helper: Locale.Lang._MainPage.NotifNoNewNotifs}" FontSize="20" FontWeight="Medium" TextAlignment="Center" Opacity="0.3"/>
                 </StackPanel>
                 <StackPanel x:Name="NotificationContainer" Margin="0,0,0,7">

diff --git a/CollapseLauncher/XAMLs/MainApp/Pages/HomePage.xaml b/CollapseLauncher/XAMLs/MainApp/Pages/HomePage.xaml
@@ -309,7 +309,7 @@
                                   PointerExited="CarouselRestartScroll">
                                     <FlipView.ItemTemplate>
                                         <DataTemplate>
-                                            <c:ImageEx IsCacheEnabled="True" EnableLazyLoading="True" PlaceholderSource="ms-appx:///Assets/BG/default.png" Source="{Binding Icon}" Tag="{Binding URL}" ToolTipService.ToolTip="{Binding Description}" PointerPressed="OpenImageLinkFromTag"/>
+                                            <c:ImageEx IsCacheEnabled="True" EnableLazyLoading="True" PlaceholderSource="ms-appx:///Assets/Images/default.png" Source="{Binding Icon}" Tag="{Binding URL}" ToolTipService.ToolTip="{Binding Description}" PointerPressed="OpenImageLinkFromTag"/>
                                         </DataTemplate>
                                     </FlipView.ItemTemplate>
                                 </FlipView>
@@ -361,7 +361,7 @@
                                             </ScrollViewer>
                                             <StackPanel Visibility="{x:Bind IsPostEventPanelEmpty}" Margin="{x:Bind localWindowSize:WindowSize.CurrentWindowSize.PostPanelPaimonMargin}">
                                                 <Grid>
-                                                    <Image Source="ms-appx:///Assets/BG/PaimonWhat.png" Height="{x:Bind localWindowSize:WindowSize.CurrentWindowSize.PostPanelPaimonHeight}"
+                                                    <Image Source="ms-appx:///Assets/Images/PaimonWhat.png" Height="{x:Bind localWindowSize:WindowSize.CurrentWindowSize.PostPanelPaimonHeight}"
                                                            Margin="{x:Bind localWindowSize:WindowSize.CurrentWindowSize.PostPanelPaimonInnerMargin}" HorizontalAlignment="Right" VerticalAlignment="Center"/>
                                                     <TextBlock Text="{x:Bind helper:Locale.Lang._HomePage.PostPanel_NoNews}"
                                                            HorizontalAlignment="Right" VerticalAlignment="Center"
@@ -404,7 +404,7 @@
                                             </ScrollViewer>
                                             <StackPanel Visibility="{x:Bind IsPostNoticePanelEmpty}" Margin="{x:Bind localWindowSize:WindowSize.CurrentWindowSize.PostPanelPaimonMargin}">
                                                 <Grid>
-                                                    <Image Source="ms-appx:///Assets/BG/PaimonWhat.png" Height="{x:Bind localWindowSize:WindowSize.CurrentWindowSize.PostPanelPaimonHeight}"
+                                                    <Image Source="ms-appx:///Assets/Images/PaimonWhat.png" Height="{x:Bind localWindowSize:WindowSize.CurrentWindowSize.PostPanelPaimonHeight}"
                                                            Margin="{x:Bind localWindowSize:WindowSize.CurrentWindowSize.PostPanelPaimonInnerMargin}" HorizontalAlignment="Right" VerticalAlignment="Center"/>
                                                     <TextBlock Text="{x:Bind helper:Locale.Lang._HomePage.PostPanel_NoNews}"
                                                            HorizontalAlignment="Right" VerticalAlignment="Center"
@@ -447,7 +447,7 @@
                                             </ScrollViewer>
                                             <StackPanel Visibility="{x:Bind IsPostInfoPanelEmpty}" Margin="{x:Bind localWindowSize:WindowSize.CurrentWindowSize.PostPanelPaimonMargin}">
                                                 <Grid>
-                                                    <Image Source="ms-appx:///Assets/BG/PaimonWhat.png" Height="{x:Bind localWindowSize:WindowSize.CurrentWindowSize.PostPanelPaimonHeight}"
+                                                    <Image Source="ms-appx:///Assets/Images/PaimonWhat.png" Height="{x:Bind localWindowSize:WindowSize.CurrentWindowSize.PostPanelPaimonHeight}"
                                                            Margin="{x:Bind localWindowSize:WindowSize.CurrentWindowSize.PostPanelPaimonInnerMargin}" HorizontalAlignment="Right" VerticalAlignment="Center"/>
                                                     <TextBlock Text="{x:Bind helper:Locale.Lang._HomePage.PostPanel_NoNews}"
                                                            HorizontalAlignment="Right" VerticalAlignment="Center"

diff --git a/CollapseLauncher/XAMLs/MainApp/Pages/StartupPage.xaml b/CollapseLauncher/XAMLs/MainApp/Pages/StartupPage.xaml
@@ -9,7 +9,7 @@
     mc:Ignorable="d"
     Background="{ThemeResource PagesSolidAcrylicBrush}">
     <Grid>
-        <Image Grid.Column="0" Grid.ColumnSpan="2" Source="ms-appx:///Assets/BG/StartUpBG2.png" Stretch="UniformToFill" VerticalAlignment="Center" Opacity="0.50"/>
+        <Image Grid.Column="0" Grid.ColumnSpan="2" Source="ms-appx:///Assets/Images/StartupBackground2.png" Stretch="UniformToFill" VerticalAlignment="Center" Opacity="0.50"/>
         <Grid x:Name="Bg" Margin="32">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition/>

diff --git a/CollapseLauncher/XAMLs/MainApp/Pages/StartupPage_SelectGameBG.xaml b/CollapseLauncher/XAMLs/MainApp/Pages/StartupPage_SelectGameBG.xaml
@@ -14,7 +14,7 @@
         <s:AttachedDropShadow x:Key="DetailsTextShadowController" BlurRadius="8" Opacity="1" CastTo="{x:Bind GameDetailsTextShadow}"/>
     </Page.Resources>
     <Grid VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
-        <Image Source="ms-appx:///Assets/BG/StartUpBG2.png" Stretch="UniformToFill" VerticalAlignment="Center" Opacity="0.50"/>
+        <Image Source="ms-appx:///Assets/Images/StartupBackground2.png" Stretch="UniformToFill" VerticalAlignment="Center" Opacity="0.50"/>
         <Grid x:Name="GameDetails">
             <Image x:Name="GameDetailsPoster"
                VerticalAlignment="Stretch" HorizontalAlignment="Right" Stretch="UniformToFill"/>
@@ -49,7 +49,7 @@
               HorizontalAlignment="Right"
               Margin="0,0,96,0"
               Visibility="Collapsed">
-            <Image Source="ms-appx:///Assets/BG/AponiaFly.png"
+            <Image Source="ms-appx:///Assets/Images/AponiaFly.png"
                    Width="400" Height="400"/>
         </Grid>
     </Grid>

diff --git a/CollapseLauncher/XAMLs/MainApp/Pages/UpdatePage.xaml b/CollapseLauncher/XAMLs/MainApp/Pages/UpdatePage.xaml
@@ -14,7 +14,7 @@
             <ColumnDefinition Width="280"/>
             <ColumnDefinition/>
         </Grid.ColumnDefinitions>
-        <Image Source="ms-appx:///Assets/BG/AiHappy.png"
+        <Image Source="ms-appx:///Assets/Images/AiHappy.png"
                VerticalAlignment="Bottom" Margin="-32"
                HorizontalAlignment="Left" Opacity="0.30"
                Width="480" Grid.ColumnSpan="2"/>

diff --git a/CollapseLauncher/XAMLs/StartUp/StartupLanguageSelect.xaml b/CollapseLauncher/XAMLs/StartUp/StartupLanguageSelect.xaml
@@ -17,7 +17,7 @@
             <ColumnDefinition/>
             <ColumnDefinition/>
         </Grid.ColumnDefinitions>
-        <Image Grid.Column="0" Grid.ColumnSpan="2" Source="ms-appx:///Assets/BG/StartUpBG.png" Stretch="UniformToFill" VerticalAlignment="Center" Margin="-16,-32,-16,-16"/>
+        <Image Grid.Column="0" Grid.ColumnSpan="2" Source="ms-appx:///Assets/Images/StartupBackground.png" Stretch="UniformToFill" VerticalAlignment="Center" Margin="-16,-32,-16,-16"/>
         <StackPanel Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center">
             <StackPanel.Transitions>
                 <EntranceThemeTransition/>

diff --git a/Hi3Helper.Core/Classes/Shared/Region/Config/LauncherConfig.cs b/Hi3Helper.Core/Classes/Shared/Region/Config/LauncherConfig.cs
@@ -163,7 +163,7 @@ public static bool IsShowRegionChangeWarning
 
         public static Dictionary<string, IniValue> AppSettingsTemplate = new Dictionary<string, IniValue>
         {
-            { "CurrentBackground", "ms-appx:///Assets/BG/default.png" },
+            { "CurrentBackground", "ms-appx:///Assets/Images/default.png" },
             { "DownloadThread", 4 },
             { "ExtractionThread", 0 },
             { "GameFolder", Path.Combine(AppDataFolder, "GameFolder") },