Skip to content

Remove Resource Download Page and fix UI on navbar #2681

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 19, 2025
Merged

Remove Resource Download Page and fix UI on navbar #2681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ecdb09
Remove Resource Download Page and fix UI on navbar
prpjzz May 8, 2025
6b445d0
Merge branch 'develop' into develop
prpjzz May 9, 2025
4e4c881
Merge branch 'develop' into develop
prpjzz May 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/MainView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@
x:Name="NavView"
Margin="0,0,0,0"
shuxc:NavigationViewHelper.PaneCornerRadius="0"
CompactPaneLength="48"
CompactPaneLength="45"
IsBackEnabled="{x:Bind ContentFrame.CanGoBack, Mode=OneWay}"
IsEnabled="{Binding ElementName=ContentFrame, Path=Content.DataContext.IsInitialized, Mode=OneWay}"
IsPaneOpen="True"
OpenPaneLength="192"
OpenPaneLength="205"
PaneDisplayMode="Left"
UseLayoutRounding="False">

Expand Down
35 changes: 0 additions & 35 deletions src/Snap.Hutao/Snap.Hutao/UI/Xaml/View/Page/LaunchGamePage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,41 +697,6 @@
</StackPanel>
</ScrollViewer>
</PivotItem>
<PivotItem Header="{shuxm:ResourceString Name=ViewPageLaunchGameResourceHeader}">
<Grid>
<ScrollViewer Visibility="{Binding GamePackage, Converter={StaticResource EmptyObjectToBoolConverter}}">
<StackPanel>
<Border Margin="16,16,16,0" cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
<Border Style="{ThemeResource AcrylicBorderCardStyle}">
<shuxvs:LaunchGameResourceExpander
cw:Effects.Shadow="{ThemeResource CompatCardShadow}"
DataContext="{Binding GamePackage.PreDownload.Major, Mode=OneWay}"
Header="{shuxm:ResourceString Name=ViewPageLaunchGameResourcePreDownloadHeader}"
IsEnabled="{Binding FallbackValue=False, Converter={StaticResource EmptyObjectToBoolConverter}}"
IsExpanded="{Binding FallbackValue=False, Converter={StaticResource EmptyObjectToBoolConverter}, Mode=OneTime}"/>
</Border>
</Border>
<ItemsControl
Margin="0,0,0,0"
ItemTemplate="{StaticResource GameResourceTemplate}"
ItemsSource="{Binding GamePackage.PreDownload.Patches, Mode=OneWay}"/>
<Border Margin="16,16,16,0" cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
<Border Style="{ThemeResource AcrylicBorderCardStyle}">
<shuxvs:LaunchGameResourceExpander
cw:Effects.Shadow="{ThemeResource CompatCardShadow}"
DataContext="{Binding GamePackage.Main.Major, Mode=OneWay}"
Header="{shuxm:ResourceString Name=ViewPageLaunchGameResourceLatestHeader}"/>
</Border>
</Border>
<ItemsControl
Margin="0,0,0,16"
ItemTemplate="{StaticResource GameResourceTemplate}"
ItemsSource="{Binding GamePackage.Main.Patches, Mode=OneWay}"/>
</StackPanel>
</ScrollViewer>
<shuxc:Loading IsLoading="{Binding GamePackage, Converter={StaticResource EmptyObjectToBoolRevertConverter}}" Style="{ThemeResource DefaultLoadingViewStyle}"/>
</Grid>
</PivotItem>
</Pivot>
</shuxc:StandardView>
</shuxc:ScopedPage>