Skip to content

Commit 1755d03

Browse files
TyrrrzTyrrrz
committed
Refactor UI
1 parent 830b86a commit 1755d03

5 files changed

Lines changed: 34 additions & 38 deletions

File tree

‎YoutubeDownloader/Views/Dialogs/AuthSetupView.axaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828
HorizontalAlignment="Center"
2929
VerticalAlignment="Center"
3030
IsVisible="{Binding IsAuthenticated}"
31-
Orientation="Vertical">
31+
Orientation="Vertical"
32+
Spacing="16">
3233
<materialIcons:MaterialIcon
3334
Width="196"
3435
Height="196"
@@ -47,7 +48,6 @@
4748
<!-- Log out -->
4849
<Button
4950
x:Name="LogOutButton"
50-
Margin="16"
5151
HorizontalAlignment="Center"
5252
Click="LogOutButton_OnClick"
5353
Content="{Binding LocalizationManager.LogOutButton}"

‎YoutubeDownloader/Views/Dialogs/DownloadMultipleSetupView.axaml‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -56,38 +56,37 @@
5656
<StackPanel
5757
Grid.Column="1"
5858
Margin="8,0,0,0"
59-
Orientation="Vertical">
59+
Orientation="Vertical"
60+
Spacing="8">
6061
<!-- Title -->
6162
<TextBlock
6263
FontSize="16"
6364
Text="{Binding Title}"
6465
TextTrimming="CharacterEllipsis"
6566
ToolTip.Tip="{Binding Title}" />
6667

67-
<StackPanel Margin="0,8,0,0" Orientation="Horizontal">
68+
<StackPanel Orientation="Horizontal" Spacing="8">
6869
<!-- Author -->
69-
<StackPanel Orientation="Horizontal">
70+
<StackPanel Orientation="Horizontal" Spacing="3">
7071
<materialIcons:MaterialIcon
7172
Width="16"
7273
Height="16"
7374
BorderThickness="1"
7475
Kind="UserOutline" />
7576
<TextBlock
76-
Margin="3,0,0,0"
7777
FontWeight="Light"
7878
Text="{Binding Author.Title}"
7979
TextTrimming="CharacterEllipsis" />
8080
</StackPanel>
8181

8282
<!-- Duration -->
83-
<StackPanel Margin="8,0,0,0" Orientation="Horizontal">
83+
<StackPanel Orientation="Horizontal" Spacing="3">
8484
<materialIcons:MaterialIcon
8585
Width="16"
8686
Height="16"
8787
BorderThickness="1"
8888
Kind="ClockOutline" />
8989
<TextBlock
90-
Margin="3,0,0,0"
9190
FontWeight="Light"
9291
Text="{Binding Duration, TargetNullValue=Live}"
9392
TextTrimming="CharacterEllipsis" />
@@ -112,19 +111,19 @@
112111
<!-- Preferences -->
113112
<UniformGrid
114113
Grid.Row="2"
115-
Margin="16"
114+
Margin="8"
116115
Columns="2">
117116
<!-- Container preference -->
118117
<ComboBox
119-
Margin="0,0,8,0"
118+
Margin="8"
120119
materialAssists:ComboBoxAssist.Label="{Binding LocalizationManager.ContainerLabel}"
121120
ItemsSource="{Binding AvailableContainers}"
122121
SelectedItem="{Binding SelectedContainer}"
123122
Theme="{DynamicResource MaterialFilledComboBox}" />
124123

125124
<!-- Video quality preference -->
126125
<ComboBox
127-
Margin="8,0,0,0"
126+
Margin="8"
128127
materialAssists:ComboBoxAssist.Label="{Binding LocalizationManager.VideoQualityLabel}"
129128
IsEnabled="{Binding !SelectedContainer.IsAudioOnly}"
130129
ItemsSource="{Binding AvailableVideoQualityPreferences}"
@@ -139,14 +138,13 @@
139138
</UniformGrid>
140139

141140
<!-- Buttons -->
142-
<StackPanel
141+
<UniformGrid
143142
Grid.Row="3"
144-
Margin="16,8,16,16"
145-
HorizontalAlignment="Right"
146-
Orientation="Horizontal">
143+
Margin="8"
144+
Columns="2">
147145
<!-- Download -->
148146
<Button
149-
Margin="0,0,8,0"
147+
Margin="8"
150148
Command="{Binding ConfirmCommand}"
151149
IsDefault="True"
152150
Theme="{DynamicResource MaterialOutlineButton}">
@@ -160,11 +158,11 @@
160158

161159
<!-- Cancel -->
162160
<Button
163-
Margin="8,0,0,0"
161+
Margin="8"
164162
Command="{Binding CloseCommand}"
165163
Content="{Binding LocalizationManager.CancelButton}"
166164
IsCancel="True"
167165
Theme="{DynamicResource MaterialOutlineButton}" />
168-
</StackPanel>
166+
</UniformGrid>
169167
</Grid>
170168
</UserControl>

‎YoutubeDownloader/Views/Dialogs/DownloadSingleSetupView.axaml‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
<StackPanel
1616
Grid.Row="0"
1717
Margin="16"
18-
Orientation="Vertical">
18+
Orientation="Vertical"
19+
Spacing="8">
1920
<!-- Title -->
2021
<TextBlock
2122
FontSize="19"
@@ -29,30 +30,28 @@
2930
</TextBlock.ContextMenu>
3031
</TextBlock>
3132

32-
<StackPanel Margin="0,8,0,0" Orientation="Horizontal">
33+
<StackPanel Orientation="Horizontal" Spacing="16">
3334
<!-- Author -->
34-
<StackPanel Orientation="Horizontal">
35+
<StackPanel Orientation="Horizontal" Spacing="3">
3536
<materialIcons:MaterialIcon
3637
Width="16"
3738
Height="16"
3839
BorderThickness="1"
3940
Kind="UserOutline" />
4041
<TextBlock
41-
Margin="3,0,0,0"
4242
FontWeight="Light"
4343
Text="{Binding Video.Author.Title}"
4444
TextTrimming="CharacterEllipsis" />
4545
</StackPanel>
4646

4747
<!-- Duration -->
48-
<StackPanel Margin="16,0,0,0" Orientation="Horizontal">
48+
<StackPanel Orientation="Horizontal" Spacing="3">
4949
<materialIcons:MaterialIcon
5050
Width="16"
5151
Height="16"
5252
BorderThickness="1"
5353
Kind="ClockOutline" />
5454
<TextBlock
55-
Margin="3,0,0,0"
5655
FontWeight="Light"
5756
Text="{Binding Video.Duration, TargetNullValue=Live}"
5857
TextTrimming="CharacterEllipsis" />
@@ -116,26 +115,25 @@
116115
</ComboBox>
117116

118117
<!-- Buttons -->
119-
<StackPanel
118+
<UniformGrid
120119
Grid.Row="3"
121-
Margin="16,8,16,16"
122-
HorizontalAlignment="Right"
123-
Orientation="Horizontal">
120+
Margin="8"
121+
Columns="2">
124122
<!-- Download -->
125123
<Button
126-
Margin="0,0,8,0"
124+
Margin="8"
127125
Command="{Binding ConfirmCommand}"
128126
Content="{Binding LocalizationManager.DownloadButton}"
129127
IsDefault="True"
130128
Theme="{DynamicResource MaterialOutlineButton}" />
131129

132130
<!-- Cancel -->
133131
<Button
134-
Margin="8,0,0,0"
132+
Margin="8"
135133
Command="{Binding CloseCommand}"
136134
Content="{Binding LocalizationManager.CancelButton}"
137135
IsCancel="True"
138136
Theme="{DynamicResource MaterialOutlineButton}" />
139-
</StackPanel>
137+
</UniformGrid>
140138
</Grid>
141139
</UserControl>

‎YoutubeDownloader/Views/Dialogs/MessageBoxView.axaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,4 @@
6969
</Button>
7070
</UniformGrid>
7171
</Grid>
72-
</UserControl>
72+
</UserControl>

‎YoutubeDownloader/Views/Dialogs/SettingsView.axaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,7 @@
6161
</DockPanel>
6262

6363
<!-- Persist authentication -->
64-
<DockPanel
65-
IsVisible="{OnPlatform False,
66-
Windows=True}"
67-
LastChildFill="False">
64+
<DockPanel IsVisible="{OnPlatform False, Windows=True}" LastChildFill="False">
6865
<ToolTip.Tip>
6966
<TextBlock Inlines="{Binding LocalizationManager.PersistAuthTooltip, Converter={x:Static converters:MarkdownToInlinesConverter.Instance}}" />
7067
</ToolTip.Tip>
@@ -177,8 +174,11 @@
177174
LastChildFill="False"
178175
ToolTip.Tip="{Binding LocalizationManager.ParallelLimitTooltip}">
179176
<TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.ParallelLimitLabel}" />
180-
<StackPanel DockPanel.Dock="Right" Orientation="Horizontal">
181-
<TextBlock Margin="10,0" Text="{Binding ParallelLimit}" />
177+
<StackPanel
178+
DockPanel.Dock="Right"
179+
Orientation="Horizontal"
180+
Spacing="10">
181+
<TextBlock Text="{Binding ParallelLimit}" />
182182
<Slider
183183
Width="150"
184184
IsSnapToTickEnabled="True"

0 commit comments

Comments
 (0)