Skip to content

Commit 47a1411

Browse files
HakuSystemsHakuSystems
committed
Refactor UI and add experimental features indication.
Removed unused drop shadow effects, enhanced settings presentation with "NEW" and "Experimental" labels, and expanded details for dynamic scaling options. Updated the default scaling mode to "Simple" for better consistency.
1 parent a01118c commit 47a1411

File tree

4 files changed

+97
-20
lines changed

4 files changed

+97
-20
lines changed

‎EasyExtractUnitypackageRework/EasyExtract/Controls/BetterSettings.xaml

Lines changed: 68 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,13 @@
8686
<ColumnDefinition Width="*" />
8787
<ColumnDefinition Width="Auto" />
8888
</Grid.ColumnDefinitions>
89+
<Grid.RowDefinitions>
90+
<RowDefinition Height="Auto" />
91+
<RowDefinition Height="Auto" />
92+
</Grid.RowDefinitions>
8993

9094
<ui:Card
95+
Grid.Column="0"
9196
HorizontalAlignment="Left"
9297
Margin="5"
9398
VerticalAlignment="Center">
@@ -99,14 +104,31 @@
99104
</ui:Card>
100105

101106
<StackPanel Grid.Column="1" VerticalAlignment="Center">
102-
<ui:TextBlock
103-
FontTypography="BodyStrong"
104-
Text="Dynamic Scaling"
105-
TextWrapping="WrapWithOverflow" />
107+
<StackPanel Margin="6" Orientation="Horizontal">
108+
<ui:TextBlock
109+
FontTypography="BodyStrong"
110+
Text="Dynamic Scaling"
111+
TextWrapping="WrapWithOverflow" />
112+
113+
<Border
114+
Background="#FF3B30"
115+
CornerRadius="8"
116+
Margin="6,0,0,0"
117+
Padding="6,2"
118+
VerticalAlignment="Center">
119+
<TextBlock
120+
FontSize="10"
121+
FontWeight="Bold"
122+
Foreground="White"
123+
Text="Experimental New Feature"
124+
VerticalAlignment="Center" />
125+
</Border>
126+
</StackPanel>
127+
106128
<ui:TextBlock
107129
Appearance="Secondary"
108130
Opacity="0.5"
109-
Text="Toggle dynamic scaling on/off, and choose the scaling mode."
131+
Text="Enable or disable dynamic scaling, and select the preferred scaling mode."
110132
TextWrapping="WrapWithOverflow" />
111133
</StackPanel>
112134

@@ -116,6 +138,7 @@
116138
VerticalAlignment="Center">
117139
<ui:TextBlock
118140
FontTypography="Caption"
141+
Foreground="#FF3B30"
119142
Margin="0,0,5,0"
120143
Text="(Applies at restart)"
121144
VerticalAlignment="Center" />
@@ -131,6 +154,40 @@
131154
IsDesignTimeCreatable=True}"
132155
x:Name="DynamicScalingComboBox" />
133156
</StackPanel>
157+
<Grid
158+
Grid.Column="0"
159+
Grid.ColumnSpan="3"
160+
Grid.Row="1">
161+
<ui:CardExpander
162+
Header="What Does Each Scaling Mode Do?"
163+
Margin="5,5,5,5"
164+
Padding="5">
165+
<StackPanel>
166+
<ui:TextBlock
167+
Appearance="Secondary"
168+
FontTypography="BodyStrong"
169+
Text="Scaling modes determine how the application adapts to different DPI settings."
170+
TextWrapping="WrapWithOverflow" />
171+
<ui:TextBlock
172+
Appearance="Secondary"
173+
Opacity="0.5"
174+
Text="In 'Simple' mode, only the main dashboard is scaled dynamically."
175+
TextWrapping="WrapWithOverflow" />
176+
<ui:TextBlock
177+
Appearance="Secondary"
178+
Opacity="0.5"
179+
Text="In 'Experimental' mode, both the main dashboard and all its content are fully scaled dynamically. it may sometimes look unusual or inconsistent."
180+
TextWrapping="WrapWithOverflow" />
181+
<ui:InfoBar
182+
IsClosable="False"
183+
IsOpen="True"
184+
Message="We recommend using 'Simple' mode as it is less likely to cause issues."
185+
Padding="5"
186+
Severity="Success"
187+
Title="Recommendation" />
188+
</StackPanel>
189+
</ui:CardExpander>
190+
</Grid>
134191
</Grid>
135192
</ui:Card>
136193

@@ -209,8 +266,11 @@
209266
<ui:TextBlock
210267
Appearance="Secondary"
211268
Opacity="0.5"
212-
Text="When enabled, borders will appear (applies only to this Settings page)."
213-
TextWrapping="Wrap" />
269+
TextWrapping="WrapWithOverflow">
270+
<Run Text="When enabled, borders will appear " />
271+
<Run FontWeight="Bold" Text="(applies only to this Settings page)" />
272+
<Run Text="." />
273+
</ui:TextBlock>
214274
</StackPanel>
215275

216276
<ui:ToggleSwitch
@@ -315,6 +375,7 @@
315375
VerticalAlignment="Center">
316376
<ui:TextBlock
317377
FontTypography="Caption"
378+
Foreground="#FF3B30"
318379
Margin="0,0,5,0"
319380
Text="(Applies at restart)"
320381
VerticalAlignment="Center" />

‎EasyExtractUnitypackageRework/EasyExtract/Controls/Feedback.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
ShadowDepth="6" />
5151
</Border.Effect>
5252

53-
<Grid AutomationProperties.Name="FeedbackGrid" Background="{DynamicResource ApplicationBackgroundBrush}">
53+
<Grid AutomationProperties.Name="FeedbackGrid">
5454

5555
<Grid
5656
HorizontalAlignment="Center"

‎EasyExtractUnitypackageRework/EasyExtract/Models/ConfigModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ namespace EasyExtract.Models;
44

55
public class ConfigModel
66
{
7-
public DynamicScalingModes DynamicScalingMode { get; set; } = DynamicScalingModes.Off;
7+
public DynamicScalingModes DynamicScalingMode { get; set; } = DynamicScalingModes.Simple;
88
public string AppTitle { get; set; } = "EasyExtractUnitypackage";
99
public AvailableThemes ApplicationTheme { get; set; } = AvailableThemes.System;
1010
public bool EasterEggHeader { get; set; } = true;

‎EasyExtractUnitypackageRework/EasyExtract/Views/Dashboard.xaml

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,6 @@
6262
Margin="12"
6363
VerticalAlignment="Stretch"
6464
x:Name="MainContentBorder">
65-
<Border.Effect>
66-
<DropShadowEffect
67-
BlurRadius="10"
68-
Color="#40000000"
69-
Direction="320"
70-
ShadowDepth="6" />
71-
</Border.Effect>
72-
73-
7465
<Grid
7566
HorizontalAlignment="Stretch"
7667
VerticalAlignment="Stretch"
@@ -217,15 +208,40 @@
217208

218209
<ui:NavigationView.FooterMenuItems>
219210
<ui:NavigationViewItem
220-
Content="Settings"
221211
Foreground="{DynamicResource TextFillColorPrimaryBrush}"
222212
Icon="{ui:SymbolIcon Settings24}"
223-
TargetPageType="{x:Type extraction:BetterSettings}" />
213+
TargetPageType="{x:Type extraction:BetterSettings}">
214+
<StackPanel
215+
Margin="6"
216+
Orientation="Horizontal"
217+
VerticalAlignment="Center">
218+
<TextBlock
219+
FontSize="14"
220+
Text="Settings"
221+
VerticalAlignment="Center" />
222+
223+
<Border
224+
Background="#FF3B30"
225+
CornerRadius="8"
226+
Margin="6,0,0,0"
227+
Padding="6,2"
228+
VerticalAlignment="Center">
229+
<TextBlock
230+
FontSize="10"
231+
FontWeight="Bold"
232+
Foreground="White"
233+
Text="NEW"
234+
VerticalAlignment="Center" />
235+
</Border>
236+
</StackPanel>
237+
</ui:NavigationViewItem>
238+
224239
<ui:NavigationViewItem
225240
Foreground="{DynamicResource TextFillColorPrimaryBrush}"
226241
IsEnabled="False"
227242
x:Name="VersionTxt" />
228243
</ui:NavigationView.FooterMenuItems>
244+
229245
</ui:NavigationView>
230246
</Grid>
231247
</Border>

0 commit comments

Comments
 (0)