Skip to content

Commit 9b74614

Browse files
ferrariofilippoferrariofilippo
committed
Again spacing
1 parent 467b6db commit 9b74614

File tree

2 files changed

+183
-183
lines changed

2 files changed

+183
-183
lines changed

‎src/Files.App/ViewModels/Properties/MainPropertiesViewModel.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ public NavigationViewItemButtonStyleItem SelectedNavigationViewItem
3333

3434
var page = value.ItemType switch
3535
{
36-
PropertiesNavigationViewItemType.General => typeof(GeneralPage),
37-
PropertiesNavigationViewItemType.Shortcut => typeof(ShortcutPage),
38-
PropertiesNavigationViewItemType.Library => typeof(LibraryPage),
39-
PropertiesNavigationViewItemType.Details => typeof(DetailsPage),
40-
PropertiesNavigationViewItemType.Security => typeof(SecurityPage),
36+
PropertiesNavigationViewItemType.General => typeof(GeneralPage),
37+
PropertiesNavigationViewItemType.Shortcut => typeof(ShortcutPage),
38+
PropertiesNavigationViewItemType.Library => typeof(LibraryPage),
39+
PropertiesNavigationViewItemType.Details => typeof(DetailsPage),
40+
PropertiesNavigationViewItemType.Security => typeof(SecurityPage),
4141
PropertiesNavigationViewItemType.Customization => typeof(CustomizationPage),
4242
PropertiesNavigationViewItemType.Compatibility => typeof(CompatibilityPage),
43-
PropertiesNavigationViewItemType.Hashes => typeof(HashesPage),
44-
PropertiesNavigationViewItemType.Signatures => typeof(SignaturesPage),
43+
PropertiesNavigationViewItemType.Hashes => typeof(HashesPage),
44+
PropertiesNavigationViewItemType.Signatures => typeof(SignaturesPage),
4545
_ => typeof(GeneralPage),
4646
};
4747

‎src/Files.App/Views/Properties/SignaturesPage.xaml‎

Lines changed: 176 additions & 176 deletions
Original file line numberDiff line numberDiff line change
@@ -13,184 +13,184 @@
1313
Tag="Signatures"
1414
mc:Ignorable="d">
1515

16-
<vm:BasePropertiesPage.Resources>
17-
<ResourceDictionary>
18-
<ResourceDictionary.MergedDictionaries>
19-
<ResourceDictionary Source="ms-appx:///Styles/PropertiesStyles.xaml" />
20-
</ResourceDictionary.MergedDictionaries>
16+
<vm:BasePropertiesPage.Resources>
17+
<ResourceDictionary>
18+
<ResourceDictionary.MergedDictionaries>
19+
<ResourceDictionary Source="ms-appx:///Styles/PropertiesStyles.xaml" />
20+
</ResourceDictionary.MergedDictionaries>
2121

22-
<toolkitconverters:BoolToObjectConverter
22+
<toolkitconverters:BoolToObjectConverter
2323
x:Key="BoolToBrushConverter"
2424
FalseValue="{ThemeResource SystemFillColorCriticalBrush}"
2525
TrueValue="{ThemeResource SystemFillColorSuccessBrush}" />
26-
</ResourceDictionary>
27-
</vm:BasePropertiesPage.Resources>
28-
29-
<ScrollViewer>
30-
31-
<Grid x:Name="RootGrid" Padding="12,6">
32-
33-
<!-- Signatures ItemsRepeater -->
34-
<ItemsRepeater x:Name="HashesListView" ItemsSource="{x:Bind SignaturesViewModel.Signatures, Mode=TwoWay}">
35-
36-
<!-- Template -->
37-
<ItemsRepeater.ItemTemplate>
38-
<DataTemplate x:DataType="datamodels:SignatureInfoItem">
39-
<Expander
40-
x:Name="ItemDetails"
41-
Margin="0,6"
42-
HorizontalAlignment="Stretch"
43-
VerticalAlignment="Top"
44-
HorizontalContentAlignment="Stretch"
45-
Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
46-
BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
47-
BorderThickness="1"
48-
CornerRadius="4"
49-
IsExpanded="True">
50-
<Expander.Header>
51-
<Grid Padding="0,8" ColumnSpacing="12">
52-
<Grid.ColumnDefinitions>
53-
<ColumnDefinition Width="Auto" />
54-
<ColumnDefinition Width="*" />
55-
<ColumnDefinition Width="Auto" />
56-
</Grid.ColumnDefinitions>
57-
<Grid.RowDefinitions>
58-
<RowDefinition Height="Auto" />
59-
<RowDefinition Height="Auto" />
60-
</Grid.RowDefinitions>
61-
62-
<!-- Signature verified badge -->
63-
<Border x:Name="SignatureVerifiedBadge" Grid.RowSpan="2">
64-
<FontIcon
65-
FontSize="24"
66-
Foreground="{x:Bind Verified, Converter={StaticResource BoolToBrushConverter}, Mode=OneWay}"
67-
Glyph="{x:Bind Glyph, Mode=OneWay}" />
68-
</Border>
69-
70-
<!-- Issuer -->
71-
<TextBlock Grid.Column="1" Text="{x:Bind IssuedTo, Mode=OneWay}" />
72-
73-
<!-- Current date -->
74-
<TextBlock
75-
Grid.Row="1"
76-
Grid.Column="1"
77-
FontSize="12"
78-
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
79-
Text="{x:Bind VerifiedTimestamp, Mode=OneWay}" />
80-
81-
<!-- TODO: Show certificate details -->
82-
<Button
83-
Grid.RowSpan="2"
84-
Grid.Column="2"
85-
Command="{x:Bind OpenDetailsCommand, Mode=OneWay}"
86-
Content="{helpers:ResourceString Name=Details}" />
87-
</Grid>
88-
</Expander.Header>
89-
<Expander.Content>
90-
<Grid
91-
HorizontalAlignment="Stretch"
92-
ColumnSpacing="8"
93-
RowSpacing="8">
94-
<Grid.ColumnDefinitions>
95-
<ColumnDefinition
96-
Width="Auto"
97-
MinWidth="100"
98-
MaxWidth="140" />
99-
<ColumnDefinition Width="*" />
100-
</Grid.ColumnDefinitions>
101-
<Grid.RowDefinitions>
102-
<RowDefinition Height="Auto" />
103-
<RowDefinition Height="Auto" />
104-
<RowDefinition Height="Auto" />
105-
<RowDefinition Height="Auto" />
106-
<RowDefinition Height="Auto" />
107-
</Grid.RowDefinitions>
108-
109-
<!-- Version -->
110-
<TextBlock
111-
Grid.Row="0"
112-
Grid.Column="0"
113-
HorizontalAlignment="Left"
114-
Style="{StaticResource PropertyName}"
115-
Text="{helpers:ResourceString Name=SettingsAboutVersionTitle}" />
116-
117-
<TextBlock
118-
x:Name="DigitalSignatureVersionValue"
119-
Grid.Row="0"
120-
Grid.Column="1"
121-
Style="{StaticResource PropertyValueTextBlock}"
122-
Text="{x:Bind Version, Mode=OneWay}"
123-
TextWrapping="Wrap" />
124-
125-
<!-- Issued by -->
126-
<TextBlock
127-
Grid.Row="1"
128-
Grid.Column="0"
129-
HorizontalAlignment="Left"
130-
Style="{StaticResource PropertyName}"
131-
Text="{helpers:ResourceString Name=IssuedBy}" />
132-
133-
<TextBlock
134-
x:Name="DigitalSignatureIssuedByValue"
135-
Grid.Row="1"
136-
Grid.Column="1"
137-
Style="{StaticResource PropertyValueTextBlock}"
138-
Text="{x:Bind IssuedBy, Mode=OneWay}"
139-
TextWrapping="Wrap" />
140-
141-
<!-- Issued to -->
142-
<TextBlock
143-
Grid.Row="2"
144-
Grid.Column="0"
145-
HorizontalAlignment="Left"
146-
Style="{StaticResource PropertyName}"
147-
Text="{helpers:ResourceString Name=IssuedTo}" />
148-
149-
<TextBlock
150-
x:Name="DigitalSignatureIssuedToValue"
151-
Grid.Row="2"
152-
Grid.Column="1"
153-
Style="{StaticResource PropertyValueTextBlock}"
154-
Text="{x:Bind IssuedTo, Mode=OneWay}"
155-
TextWrapping="Wrap" />
156-
157-
<!-- Valid from -->
158-
<TextBlock
159-
Grid.Row="3"
160-
Grid.Column="0"
161-
HorizontalAlignment="Left"
162-
Style="{StaticResource PropertyName}"
163-
Text="{helpers:ResourceString Name=ValidFrom}" />
164-
165-
<TextBlock
166-
x:Name="DigitalSignatureValidFromValue"
167-
Grid.Row="3"
168-
Grid.Column="1"
169-
Style="{StaticResource PropertyValueTextBlock}"
170-
Text="{x:Bind ValidFromTimestamp, Mode=OneWay}"
171-
TextWrapping="Wrap" />
172-
173-
<!-- Valid to -->
174-
<TextBlock
175-
Grid.Row="4"
176-
Grid.Column="0"
177-
HorizontalAlignment="Left"
178-
Style="{StaticResource PropertyName}"
179-
Text="{helpers:ResourceString Name=ValidTo}" />
180-
181-
<TextBlock
182-
x:Name="DigitalSignatureValidToValue"
183-
Grid.Row="4"
184-
Grid.Column="1"
185-
Style="{StaticResource PropertyValueTextBlock}"
186-
Text="{x:Bind ValidToTimestamp, Mode=OneWay}"
187-
TextWrapping="Wrap" />
188-
</Grid>
189-
</Expander.Content>
190-
</Expander>
191-
</DataTemplate>
192-
</ItemsRepeater.ItemTemplate>
193-
</ItemsRepeater>
194-
</Grid>
195-
</ScrollViewer>
26+
</ResourceDictionary>
27+
</vm:BasePropertiesPage.Resources>
28+
29+
<ScrollViewer>
30+
31+
<Grid x:Name="RootGrid" Padding="12,6">
32+
33+
<!-- Signatures ItemsRepeater -->
34+
<ItemsRepeater x:Name="HashesListView" ItemsSource="{x:Bind SignaturesViewModel.Signatures, Mode=TwoWay}">
35+
36+
<!-- Template -->
37+
<ItemsRepeater.ItemTemplate>
38+
<DataTemplate x:DataType="datamodels:SignatureInfoItem">
39+
<Expander
40+
x:Name="ItemDetails"
41+
Margin="0,6"
42+
HorizontalAlignment="Stretch"
43+
VerticalAlignment="Top"
44+
HorizontalContentAlignment="Stretch"
45+
Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
46+
BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
47+
BorderThickness="1"
48+
CornerRadius="4"
49+
IsExpanded="True">
50+
<Expander.Header>
51+
<Grid Padding="0,8" ColumnSpacing="12">
52+
<Grid.ColumnDefinitions>
53+
<ColumnDefinition Width="Auto" />
54+
<ColumnDefinition Width="*" />
55+
<ColumnDefinition Width="Auto" />
56+
</Grid.ColumnDefinitions>
57+
<Grid.RowDefinitions>
58+
<RowDefinition Height="Auto" />
59+
<RowDefinition Height="Auto" />
60+
</Grid.RowDefinitions>
61+
62+
<!-- Signature verified badge -->
63+
<Border x:Name="SignatureVerifiedBadge" Grid.RowSpan="2">
64+
<FontIcon
65+
FontSize="24"
66+
Foreground="{x:Bind Verified, Converter={StaticResource BoolToBrushConverter}, Mode=OneWay}"
67+
Glyph="{x:Bind Glyph, Mode=OneWay}" />
68+
</Border>
69+
70+
<!-- Issuer -->
71+
<TextBlock Grid.Column="1" Text="{x:Bind IssuedTo, Mode=OneWay}" />
72+
73+
<!-- Current date -->
74+
<TextBlock
75+
Grid.Row="1"
76+
Grid.Column="1"
77+
FontSize="12"
78+
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
79+
Text="{x:Bind VerifiedTimestamp, Mode=OneWay}" />
80+
81+
<!-- TODO: Show certificate details -->
82+
<Button
83+
Grid.RowSpan="2"
84+
Grid.Column="2"
85+
Command="{x:Bind OpenDetailsCommand, Mode=OneWay}"
86+
Content="{helpers:ResourceString Name=Details}" />
87+
</Grid>
88+
</Expander.Header>
89+
<Expander.Content>
90+
<Grid
91+
HorizontalAlignment="Stretch"
92+
ColumnSpacing="8"
93+
RowSpacing="8">
94+
<Grid.ColumnDefinitions>
95+
<ColumnDefinition
96+
Width="Auto"
97+
MinWidth="100"
98+
MaxWidth="140" />
99+
<ColumnDefinition Width="*" />
100+
</Grid.ColumnDefinitions>
101+
<Grid.RowDefinitions>
102+
<RowDefinition Height="Auto" />
103+
<RowDefinition Height="Auto" />
104+
<RowDefinition Height="Auto" />
105+
<RowDefinition Height="Auto" />
106+
<RowDefinition Height="Auto" />
107+
</Grid.RowDefinitions>
108+
109+
<!-- Version -->
110+
<TextBlock
111+
Grid.Row="0"
112+
Grid.Column="0"
113+
HorizontalAlignment="Left"
114+
Style="{StaticResource PropertyName}"
115+
Text="{helpers:ResourceString Name=SettingsAboutVersionTitle}" />
116+
117+
<TextBlock
118+
x:Name="DigitalSignatureVersionValue"
119+
Grid.Row="0"
120+
Grid.Column="1"
121+
Style="{StaticResource PropertyValueTextBlock}"
122+
Text="{x:Bind Version, Mode=OneWay}"
123+
TextWrapping="Wrap" />
124+
125+
<!-- Issued by -->
126+
<TextBlock
127+
Grid.Row="1"
128+
Grid.Column="0"
129+
HorizontalAlignment="Left"
130+
Style="{StaticResource PropertyName}"
131+
Text="{helpers:ResourceString Name=IssuedBy}" />
132+
133+
<TextBlock
134+
x:Name="DigitalSignatureIssuedByValue"
135+
Grid.Row="1"
136+
Grid.Column="1"
137+
Style="{StaticResource PropertyValueTextBlock}"
138+
Text="{x:Bind IssuedBy, Mode=OneWay}"
139+
TextWrapping="Wrap" />
140+
141+
<!-- Issued to -->
142+
<TextBlock
143+
Grid.Row="2"
144+
Grid.Column="0"
145+
HorizontalAlignment="Left"
146+
Style="{StaticResource PropertyName}"
147+
Text="{helpers:ResourceString Name=IssuedTo}" />
148+
149+
<TextBlock
150+
x:Name="DigitalSignatureIssuedToValue"
151+
Grid.Row="2"
152+
Grid.Column="1"
153+
Style="{StaticResource PropertyValueTextBlock}"
154+
Text="{x:Bind IssuedTo, Mode=OneWay}"
155+
TextWrapping="Wrap" />
156+
157+
<!-- Valid from -->
158+
<TextBlock
159+
Grid.Row="3"
160+
Grid.Column="0"
161+
HorizontalAlignment="Left"
162+
Style="{StaticResource PropertyName}"
163+
Text="{helpers:ResourceString Name=ValidFrom}" />
164+
165+
<TextBlock
166+
x:Name="DigitalSignatureValidFromValue"
167+
Grid.Row="3"
168+
Grid.Column="1"
169+
Style="{StaticResource PropertyValueTextBlock}"
170+
Text="{x:Bind ValidFromTimestamp, Mode=OneWay}"
171+
TextWrapping="Wrap" />
172+
173+
<!-- Valid to -->
174+
<TextBlock
175+
Grid.Row="4"
176+
Grid.Column="0"
177+
HorizontalAlignment="Left"
178+
Style="{StaticResource PropertyName}"
179+
Text="{helpers:ResourceString Name=ValidTo}" />
180+
181+
<TextBlock
182+
x:Name="DigitalSignatureValidToValue"
183+
Grid.Row="4"
184+
Grid.Column="1"
185+
Style="{StaticResource PropertyValueTextBlock}"
186+
Text="{x:Bind ValidToTimestamp, Mode=OneWay}"
187+
TextWrapping="Wrap" />
188+
</Grid>
189+
</Expander.Content>
190+
</Expander>
191+
</DataTemplate>
192+
</ItemsRepeater.ItemTemplate>
193+
</ItemsRepeater>
194+
</Grid>
195+
</ScrollViewer>
196196
</vm:BasePropertiesPage>

0 commit comments

Comments
 (0)