Skip to content

Commit 74abfdf

Browse files
author
Yair Aichenbaum
committed
Simplified Personalization page
1 parent c1d67fd commit 74abfdf

File tree

2 files changed

+62
-57
lines changed

2 files changed

+62
-57
lines changed

Files/SettingsPages/Personalization.xaml

Lines changed: 62 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -10,65 +10,74 @@
1010
<Grid Padding="24,24,0,0">
1111

1212
<ScrollViewer HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
13-
<StackPanel Orientation="Vertical">
14-
<StackPanel>
13+
<StackPanel Orientation="Vertical" Spacing="14">
14+
15+
<TextBlock FontSize="22" Text="Personalization" />
16+
17+
<Grid HorizontalAlignment="Stretch">
18+
<Grid.ColumnDefinitions>
19+
<ColumnDefinition Width="120" />
20+
<ColumnDefinition Width="*" MaxWidth="400" />
21+
<ColumnDefinition Width="200" />
22+
</Grid.ColumnDefinitions>
23+
1524
<TextBlock
16-
Margin="0,0,0,10"
17-
VerticalAlignment="Top"
18-
FontSize="18"
19-
Text="Choose your color scheme"
20-
TextWrapping="Wrap" />
21-
<StackPanel Orientation="Horizontal">
22-
<ComboBox
23-
x:Name="ThemeChooser"
24-
Width="250"
25-
VerticalAlignment="Center" />
26-
<TextBlock
27-
x:Name="RestartReminder"
28-
Margin="15,0"
29-
VerticalAlignment="Center"
30-
Foreground="Green"
31-
Opacity="0.0"
32-
Text="Restart app to apply theme." />
33-
</StackPanel>
34-
</StackPanel>
35-
<StackPanel Margin="0,15">
25+
Grid.Column="0"
26+
VerticalAlignment="Center"
27+
FontSize="16"
28+
Text="Theme" />
29+
30+
<ComboBox
31+
x:Name="ThemeChooser"
32+
Grid.Column="3"
33+
Width="150"
34+
Margin="0,0,8,0"
35+
HorizontalAlignment="Right" />
36+
</Grid>
37+
38+
<Grid HorizontalAlignment="Stretch">
39+
<Grid.ColumnDefinitions>
40+
<ColumnDefinition Width="120" />
41+
<ColumnDefinition Width="*" MaxWidth="400" />
42+
<ColumnDefinition Width="200" />
43+
</Grid.ColumnDefinitions>
44+
3645
<TextBlock
37-
Margin="0,0,0,10"
38-
VerticalAlignment="Top"
39-
FontSize="18"
40-
Text="Choose your date format"
41-
TextWrapping="Wrap" />
42-
<StackPanel Orientation="Horizontal">
43-
<ComboBox
44-
x:Name="DateFormatChooser"
45-
Width="250"
46-
VerticalAlignment="Center" />
47-
<TextBlock
48-
x:Name="TimeFormatReminder"
49-
Margin="15,0,0,0"
50-
VerticalAlignment="Center"
51-
Foreground="Green"
52-
Opacity="0.0"
53-
Text="Refresh list to apply time format." />
54-
</StackPanel>
55-
</StackPanel>
56-
<StackPanel Orientation="Horizontal">
46+
Grid.Column="0"
47+
VerticalAlignment="Center"
48+
FontSize="16"
49+
Text="Date format" />
50+
51+
<ComboBox
52+
x:Name="DateFormatChooser"
53+
Grid.Column="3"
54+
Width="175"
55+
Margin="0,0,8,0"
56+
HorizontalAlignment="Right" />
57+
</Grid>
58+
59+
<Grid HorizontalAlignment="Stretch">
60+
<Grid.ColumnDefinitions>
61+
<ColumnDefinition Width="120" />
62+
<ColumnDefinition Width="*" MaxWidth="400" />
63+
<ColumnDefinition Width="200" />
64+
</Grid.ColumnDefinitions>
65+
5766
<TextBlock
58-
Margin="0,0,0,0"
59-
HorizontalAlignment="Left"
67+
Grid.Column="0"
6068
VerticalAlignment="Center"
61-
FontSize="18"
62-
Text="Acrylic sidebar"
63-
TextWrapping="Wrap" />
69+
FontSize="16"
70+
Text="Acrylic sidebar" />
71+
6472
<ToggleSwitch
6573
x:Name="AcrylicSidebarSwitch"
66-
Width="300"
67-
Margin="10,0,0,0"
68-
HorizontalAlignment="Left"
69-
VerticalAlignment="Center"
70-
CornerRadius="2" />
71-
</StackPanel>
74+
Grid.Column="2"
75+
HorizontalAlignment="Right"
76+
OffContent=""
77+
OnContent=""
78+
Width="50"/>
79+
</Grid>
80+
7281
</StackPanel>
7382
</ScrollViewer>
7483

Files/SettingsPages/Personalization.xaml.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ public Personalization()
3030
ThemeChooser.SelectionChanged += async (s1, e1) =>
3131
{
3232
localSettings.Values["theme"] = e1.AddedItems[0].Equals("System") ? "Default" : e1.AddedItems[0].ToString();
33-
await RestartReminder.Fade(value: 1.0f, duration: 1500, delay: 0).StartAsync();
34-
await RestartReminder.Fade(value: 0.0f, duration: 1500, delay: 0).StartAsync();
3533
};
3634
};
3735
}
@@ -49,8 +47,6 @@ public Personalization()
4947
DateFormatChooser.SelectionChanged += async (s1, e1) =>
5048
{
5149
localSettings.Values["datetimeformat"] = e1.AddedItems[0].ToString();
52-
await TimeFormatReminder.Fade(value: 1.0f, duration: 1500, delay: 0).StartAsync();
53-
await TimeFormatReminder.Fade(value: 0.0f, duration: 1500, delay: 0).StartAsync();
5450
};
5551
};
5652
}

0 commit comments

Comments
 (0)