Skip to content

Commit 5f2495b

Browse files
neon-nyanneon-nyan
committed
XAML and .cs CodeQA
1 parent 81aa640 commit 5f2495b

21 files changed

+202
-226
lines changed

‎CollapseLauncher/App.xaml‎

Lines changed: 44 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
5+
xmlns:controls="using:Microsoft.UI.Xaml.Controls"
56
xmlns:conv="using:CollapseLauncher.Pages"
67
xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
7-
xmlns:controls="using:Microsoft.UI.Xaml.Controls"
88
xmlns:primitives="using:Microsoft.UI.Xaml.Controls.Primitives"
99
xmlns:ui="using:Windows.UI">
1010
<!-- ReSharper disable Xaml.InvalidResourceType -->
@@ -2190,11 +2190,11 @@
21902190
<!-- Fix https://github.com/microsoft/microsoft-ui-xaml/issues/8657 -->
21912191
<interactivity:Interaction.Behaviors>
21922192
<interactivity:DataTriggerBehavior Binding="{Binding ShouldConstrainToRootBounds, ElementName=Popup}"
2193-
ComparisonCondition="Equal"
2194-
Value="False">
2193+
ComparisonCondition="Equal"
2194+
Value="False">
21952195
<interactivity:ChangePropertyAction PropertyName="ShouldConstrainToRootBounds"
2196-
TargetObject="{Binding ElementName=Popup}"
2197-
Value="True" />
2196+
TargetObject="{Binding ElementName=Popup}"
2197+
Value="True" />
21982198
</interactivity:DataTriggerBehavior>
21992199
</interactivity:Interaction.Behaviors>
22002200
<Border x:Name="PopupBorder"
@@ -2627,11 +2627,11 @@
26272627
<!-- Fix https://github.com/microsoft/microsoft-ui-xaml/issues/8657 -->
26282628
<interactivity:Interaction.Behaviors>
26292629
<interactivity:DataTriggerBehavior Binding="{Binding ShouldConstrainToRootBounds, ElementName=Popup}"
2630-
ComparisonCondition="Equal"
2631-
Value="False">
2630+
ComparisonCondition="Equal"
2631+
Value="False">
26322632
<interactivity:ChangePropertyAction PropertyName="ShouldConstrainToRootBounds"
2633-
TargetObject="{Binding ElementName=Popup}"
2634-
Value="True" />
2633+
TargetObject="{Binding ElementName=Popup}"
2634+
Value="True" />
26352635
</interactivity:DataTriggerBehavior>
26362636
</interactivity:Interaction.Behaviors>
26372637
<Border x:Name="PopupBorder"
@@ -5018,7 +5018,8 @@
50185018
</Style>
50195019

50205020
<!-- PipsPager styles -->
5021-
<Style x:Key="DefaultPipsPagerStyle" TargetType="controls:PipsPager">
5021+
<Style x:Key="DefaultPipsPagerStyle"
5022+
TargetType="controls:PipsPager">
50225023
<Setter Property="Background" Value="Transparent" />
50235024
<Setter Property="HorizontalAlignment" Value="Left" />
50245025
<Setter Property="VerticalAlignment" Value="Top" />
@@ -5030,7 +5031,9 @@
50305031
<Setter Property="Template">
50315032
<Setter.Value>
50325033
<ControlTemplate TargetType="controls:PipsPager">
5033-
<StackPanel x:Name="RootPanel" Orientation="{TemplateBinding Orientation}" Background="{TemplateBinding Background}">
5034+
<StackPanel x:Name="RootPanel"
5035+
Background="{TemplateBinding Background}"
5036+
Orientation="{TemplateBinding Orientation}">
50345037

50355038
<VisualStateManager.VisualStateGroups>
50365039
<VisualStateGroup x:Name="PreviousPageButtonVisibilityStates">
@@ -5111,9 +5114,23 @@
51115114
</VisualStateGroup>
51125115

51135116
</VisualStateManager.VisualStateGroups>
5114-
<Button x:Name="PreviousPageButton" ToolTipService.ToolTip="{Binding ElementName=PreviousPageButton, Path=(AutomationProperties.Name)}" ToolTipService.Placement="Top" Style="{TemplateBinding PreviousButtonStyle}" HorizontalAlignment="Center" VerticalAlignment="Center" />
5115-
<ScrollViewer x:Name="PipsPagerScrollViewer" VerticalScrollBarVisibility="Hidden" VerticalScrollMode="Disabled" HorizontalScrollBarVisibility="Hidden" HorizontalScrollMode="Disabled" IsHorizontalScrollChainingEnabled="False" IsVerticalScrollChainingEnabled="False" HorizontalAlignment="Center" VerticalAlignment="Center">
5116-
<controls:ItemsRepeater x:Name="PipsPagerItemsRepeater" ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.PipsPagerItems}">
5117+
<Button x:Name="PreviousPageButton"
5118+
HorizontalAlignment="Center"
5119+
VerticalAlignment="Center"
5120+
Style="{TemplateBinding PreviousButtonStyle}"
5121+
ToolTipService.Placement="Top"
5122+
ToolTipService.ToolTip="{Binding ElementName=PreviousPageButton, Path=(AutomationProperties.Name)}" />
5123+
<ScrollViewer x:Name="PipsPagerScrollViewer"
5124+
HorizontalAlignment="Center"
5125+
VerticalAlignment="Center"
5126+
HorizontalScrollBarVisibility="Hidden"
5127+
HorizontalScrollMode="Disabled"
5128+
IsHorizontalScrollChainingEnabled="False"
5129+
IsVerticalScrollChainingEnabled="False"
5130+
VerticalScrollBarVisibility="Hidden"
5131+
VerticalScrollMode="Disabled">
5132+
<controls:ItemsRepeater x:Name="PipsPagerItemsRepeater"
5133+
ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.PipsPagerItems}">
51175134
<controls:ItemsRepeater.Layout>
51185135
<controls:StackLayout Orientation="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Orientation}" />
51195136
</controls:ItemsRepeater.Layout>
@@ -5124,20 +5141,29 @@
51245141
</controls:ItemsRepeater.ItemTemplate>
51255142
</controls:ItemsRepeater>
51265143
</ScrollViewer>
5127-
<Button x:Name="NextPageButton" ToolTipService.ToolTip="{Binding ElementName=NextPageButton, Path=(AutomationProperties.Name)}" ToolTipService.Placement="Bottom" Style="{TemplateBinding NextButtonStyle}" HorizontalAlignment="Center" VerticalAlignment="Center" />
5144+
<Button x:Name="NextPageButton"
5145+
HorizontalAlignment="Center"
5146+
VerticalAlignment="Center"
5147+
Style="{TemplateBinding NextButtonStyle}"
5148+
ToolTipService.Placement="Bottom"
5149+
ToolTipService.ToolTip="{Binding ElementName=NextPageButton, Path=(AutomationProperties.Name)}" />
51285150
</StackPanel>
51295151

51305152
</ControlTemplate>
51315153
</Setter.Value>
51325154
</Setter>
51335155
</Style>
5134-
<Style BasedOn="{StaticResource DefaultPipsPagerStyle}" TargetType="controls:PipsPager" />
5156+
<Style BasedOn="{StaticResource DefaultPipsPagerStyle}"
5157+
TargetType="controls:PipsPager" />
51355158

51365159
<!-- Pivot styles -->
5137-
<Style x:Key="ThinPivotHeaderItemStyle" TargetType="PivotHeaderItem" BasedOn="{StaticResource DefaultPivotHeaderItemStyle}">
5160+
<Style x:Key="ThinPivotHeaderItemStyle"
5161+
BasedOn="{StaticResource DefaultPivotHeaderItemStyle}"
5162+
TargetType="PivotHeaderItem">
51385163
<Setter Property="Height" Value="30" />
51395164
</Style>
5140-
<Style BasedOn="{StaticResource ThinPivotHeaderItemStyle}" TargetType="PivotHeaderItem" />
5165+
<Style BasedOn="{StaticResource ThinPivotHeaderItemStyle}"
5166+
TargetType="PivotHeaderItem" />
51415167
<Thickness x:Key="PivotNavButtonMargin">0,-6,0,0</Thickness>
51425168
</ResourceDictionary>
51435169
</ResourceDictionary.MergedDictionaries>

‎CollapseLauncher/Classes/InstallManagement/Base/InstallManagerBase.PkgVersion.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,9 @@ public virtual async ValueTask CleanUpGameFiles(bool withDialog = true)
117117
{
118118
if (WindowUtility.CurrentWindow is MainWindow mainWindow)
119119
{
120-
mainWindow.overlayFrame.BackStack?.Clear();
121-
mainWindow.overlayFrame.Navigate(typeof(NullPage));
122-
mainWindow.overlayFrame.Navigate(typeof(FileCleanupPage), null,
120+
mainWindow.OverlayFrame.BackStack?.Clear();
121+
mainWindow.OverlayFrame.Navigate(typeof(NullPage));
122+
mainWindow.OverlayFrame.Navigate(typeof(FileCleanupPage), null,
123123
new DrillInNavigationTransitionInfo());
124124
}
125125

@@ -153,8 +153,8 @@ static void ExitFromOverlay(object? sender, RoutedEventArgs args)
153153
if (WindowUtility.CurrentWindow is not MainWindow mainWindow)
154154
return;
155155

156-
mainWindow.overlayFrame.GoBack();
157-
mainWindow.overlayFrame.BackStack?.Clear();
156+
mainWindow.OverlayFrame.GoBack();
157+
mainWindow.OverlayFrame.BackStack?.Clear();
158158
}
159159
}
160160

‎CollapseLauncher/XAMLs/MainApp/DisconnectedPage.xaml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:helper="using:Hi3Helper"
77
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
8-
xmlns:p="using:CollapseLauncher.Helper.Metadata"
98
xmlns:uielementex="using:CollapseLauncher.Extension"
109
Background="Transparent"
1110
mc:Ignorable="d">
@@ -25,6 +24,7 @@
2524
FontSize="72"
2625
FontWeight="Bold"
2726
Text="{x:Bind helper:Locale.Lang._DisconnectedPage.Header2}" />
27+
<!-- ReSharper disable once UnusedMember.Local -->
2828
<Button x:Name="ShowErrorBtn"
2929
Margin="0,16,0,0"
3030
Padding="8,8"
@@ -61,6 +61,7 @@
6161
</Grid>
6262
</Grid>
6363
</Button>
64+
<!-- ReSharper disable once UnusedMember.Local -->
6465
<Button x:Name="GoToAppSettingsBtn"
6566
Margin="0,8,0,0"
6667
Padding="8,8"
@@ -103,6 +104,7 @@
103104
Text="{x:Bind helper:Locale.Lang._DisconnectedPage.RegionChangerTitle}" />
104105
<TextBlock Margin="0,0,0,16"
105106
Text="{x:Bind helper:Locale.Lang._DisconnectedPage.RegionChangerSubtitle}" />
107+
<!-- ReSharper disable once UnusedMember.Local -->
106108
<Grid x:Name="ComboBoxGameGrid"
107109
CornerRadius="{x:Bind uielementex:UIElementExtensions.AttachRoundedKindCornerRadius(ComboBoxGameGrid)}">
108110
<Grid.ColumnDefinitions>
@@ -111,7 +113,6 @@
111113
</Grid.ColumnDefinitions>
112114
<ComboBox x:Name="ComboBoxGameCategory"
113115
HorizontalAlignment="Stretch"
114-
HorizontalContentAlignment="Stretch"
115116
Canvas.ZIndex="2"
116117
CornerRadius="15,0,0,15"
117118
PlaceholderText="{x:Bind helper:Locale.Lang._GameClientTitles['Honkai Impact 3rd']}"
@@ -120,15 +121,15 @@
120121
<ComboBox x:Name="ComboBoxGameRegion"
121122
Grid.Column="1"
122123
HorizontalAlignment="Stretch"
123-
HorizontalContentAlignment="Stretch"
124124
Canvas.ZIndex="2"
125125
CornerRadius="0,15,15,0"
126126
PlaceholderText="{x:Bind helper:Locale.Lang._GameClientRegions['Southeast Asia']}"
127127
SelectionChanged="SetGameRegionChange"
128128
Style="{ThemeResource DefaultComboBoxStyle}" />
129129
</Grid>
130130
</StackPanel>
131-
<TextBlock VerticalAlignment="Bottom"
131+
<TextBlock Grid.Column="0"
132+
VerticalAlignment="Bottom"
132133
FontSize="16"
133134
Opacity="0.75">
134135
<Run Text="{x:Bind helper:Locale.Lang._DisconnectedPage.Footer1}" />

‎CollapseLauncher/XAMLs/MainApp/MainWindow.xaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
xmlns:uiextension="using:CollapseLauncher.Extension"
1010
SizeChanged="MainWindow_OnSizeChanged"
1111
mc:Ignorable="d">
12-
<Grid x:Name="MainWindowGridContainer">
12+
<Grid>
1313
<Grid.Resources>
1414
<ThemeShadow x:Name="SharedThemeShadow" />
1515
</Grid.Resources>
@@ -26,7 +26,7 @@
2626
Grid.Row="0"
2727
Grid.RowSpan="3"
2828
Opacity="1">
29-
<Frame x:Name="rootFrame"
29+
<Frame x:Name="RootFrame"
3030
x:FieldModifier="public"
3131
Opacity="1">
3232
<Frame.ContentTransitions>
@@ -35,7 +35,7 @@
3535
</TransitionCollection>
3636
</Frame.ContentTransitions>
3737
</Frame>
38-
<Frame x:Name="overlayFrame"
38+
<Frame x:Name="OverlayFrame"
3939
x:FieldModifier="public"
4040
Opacity="1">
4141
<Frame.ContentTransitions>
@@ -67,12 +67,12 @@
6767
Visibility="Collapsed" />
6868
</Grid>
6969
<Grid x:Name="LoadingStatusBackgroundGrid"
70+
Grid.Row="0"
7071
Grid.RowSpan="3"
7172
x:FieldModifier="internal"
7273
Background="{ThemeResource LoadingGradientBG}"
7374
Visibility="Collapsed" />
74-
<Grid x:Name="MiddleFrameGrid"
75-
Grid.Row="1" />
75+
<Grid Grid.Row="1" />
7676
<Grid x:Name="LoadingStatusGrid"
7777
Grid.Row="2"
7878
Margin="32"
@@ -159,6 +159,7 @@
159159
</Button>
160160
</Grid>
161161
<customcontrol:ContentDialogCollapse x:Name="ContentDialog"
162+
Grid.Row="0"
162163
x:FieldModifier="internal" />
163164
<Grid x:Name="TitleBarFrameGrid"
164165
Grid.Row="0">
@@ -174,8 +175,7 @@
174175
CornerRadius="8"
175176
Shadow="{StaticResource CaptionButtonShadow}"
176177
Translation="0,0,16" />
177-
<Grid x:Name="CaptionButtonAcrylicGrid"
178-
Margin="8,8"
178+
<Grid Margin="8,8"
179179
HorizontalAlignment="Right"
180180
Background="{ThemeResource WindowCaptionBackgroundAcrylicLight}"
181181
CornerRadius="8">
@@ -186,7 +186,6 @@
186186
<Button x:Name="MinimizeButton"
187187
Grid.Column="0"
188188
Width="40"
189-
Height="32"
190189
x:FieldModifier="internal"
191190
Click="MinimizeButton_Click"
192191
Content="M 0 0 H 10"
@@ -196,7 +195,6 @@
196195
<Button x:Name="CloseButton"
197196
Grid.Column="1"
198197
Width="40"
199-
Height="32"
200198
HorizontalAlignment="Right"
201199
x:FieldModifier="internal"
202200
Background="{ThemeResource WindowCaptionBackgroundClose}"
@@ -208,6 +206,7 @@
208206
<Button.Resources>
209207
<ResourceDictionary>
210208
<ResourceDictionary.ThemeDictionaries>
209+
<!-- ReSharper disable Xaml.StaticResourceNotResolved -->
211210
<ResourceDictionary x:Key="Light">
212211
<StaticResource x:Key="WindowCaptionButtonBackgroundPointerOver"
213212
ResourceKey="WindowCaptionBackgroundClosePointerOver" />
@@ -228,6 +227,7 @@
228227
<StaticResource x:Key="WindowCaptionButtonStrokePressed"
229228
ResourceKey="CloseButtonStrokePressed" />
230229
</ResourceDictionary>
230+
<!-- ReSharper restore Xaml.StaticResourceNotResolved -->
231231
</ResourceDictionary.ThemeDictionaries>
232232
</ResourceDictionary>
233233
</Button.Resources>

0 commit comments

Comments
 (0)