Skip to content

Commit de1b484

Browse files
yaira2yaira2
authored
Improve styles in property dialog (#7388)
1 parent 3058d42 commit de1b484

File tree

94 files changed

+1333
-1234
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+1333
-1234
lines changed

‎builds/azure-pipelines-release.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ jobs:
2626
script: |
2727
[xml]$xmlDoc = Get-Content $(Build.SourcesDirectory)\src\Files.Package\Package.appxmanifest
2828
$xmlDoc.Package.Identity.Name="Files"
29+
$xmlDoc.Package.Identity.Publisher="CN=53EC4384-7F5B-4CF6-8C23-513FFE9D1AB7"
2930
$xmlDoc.Package.Properties.DisplayName="Files"
3031
$xmlDoc.Package.Applications.Application.VisualElements.DisplayName="Files"
3132
$xmlDoc.Save('$(Build.SourcesDirectory)\src\Files.Package\Package.appxmanifest')
@@ -110,6 +111,7 @@ jobs:
110111
script: |
111112
[xml]$xmlDoc = Get-Content $(Build.SourcesDirectory)\src\Files.Package\Package.appxmanifest
112113
$xmlDoc.Package.Identity.Name="49306atecsolution.FilesUWP"
114+
$xmlDoc.Package.Identity.Publisher="CN=53EC4384-7F5B-4CF6-8C23-513FFE9D1AB7"
113115
$xmlDoc.Package.Properties.DisplayName="Files"
114116
$xmlDoc.Package.Applications.Application.VisualElements.DisplayName="Files"
115117
$xmlDoc.Save('$(Build.SourcesDirectory)\src\Files.Package\Package.appxmanifest')

‎builds/azure-pipelines.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ steps:
1717
script: |
1818
[xml]$xmlDoc = Get-Content $(Build.SourcesDirectory)\src\Files.Package\Package.appxmanifest
1919
$xmlDoc.Package.Identity.Name="49306atecsolution.FilesUWP"
20+
$xmlDoc.Package.Identity.Publisher="CN=53EC4384-7F5B-4CF6-8C23-513FFE9D1AB7"
2021
$xmlDoc.Package.Properties.DisplayName="Files"
2122
$xmlDoc.Package.Applications.Application.VisualElements.DisplayName="Files"
2223
$xmlDoc.Save('$(Build.SourcesDirectory)\src\Files.Package\Package.appxmanifest')

‎src/Files.Package/Package.appxmanifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
xmlns:uap4="http://schemas.microsoft.com/appx/manifest/uap/windows10/4"
1010
xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5"
1111
IgnorableNamespaces="uap uap5 mp rescap desktop4 desktop">
12-
<Identity Name="FilesDev" Publisher="CN=53EC4384-7F5B-4CF6-8C23-513FFE9D1AB7" Version="2.0.42.0" />
12+
<Identity Name="FilesDev" Publisher="CN=Files" Version="2.0.42.0" />
1313
<Properties>
1414
<DisplayName>Files - Dev</DisplayName>
1515
<PublisherDisplayName>Yair A</PublisherDisplayName>

‎src/Files/Dialogs/SettingsDialog.xaml

Lines changed: 3 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -15,59 +15,9 @@
1515
<ResourceDictionary>
1616
<x:Double x:Key="ContentDialogMaxWidth">800</x:Double>
1717
<Thickness x:Key="ContentDialogPadding">0</Thickness>
18-
<Thickness x:Key="NavigationViewTopPaneHeight">40</Thickness>
19-
<Thickness x:Key="TopNavigationViewTopNavGridMargin">10</Thickness>
18+
<Thickness x:Key="TopNavigationViewTopNavGridMargin">4</Thickness>
2019
<SolidColorBrush x:Key="ContentDialogTopOverlay" Color="Transparent" />
21-
<ResourceDictionary.ThemeDictionaries>
22-
<ResourceDictionary x:Key="Light">
23-
<SolidColorBrush x:Key="NavigationViewExpandedPaneBackground" Color="Transparent" />
24-
<SolidColorBrush x:Key="NavigationViewDefaultPaneBackground" Color="Transparent" />
25-
<SolidColorBrush x:Key="NavigationViewItemBackground" Color="{ThemeResource SolidBackgroundFillColorTertiary}" />
26-
<SolidColorBrush x:Key="TopNavigationViewItemBackgroundPointerOver" Color="{ThemeResource SolidBackgroundFillColorTertiary}" />
27-
<SolidColorBrush x:Key="TopNavigationViewItemBackgroundPressed" Color="{ThemeResource SolidBackgroundFillColorTertiary}" />
28-
<SolidColorBrush x:Key="TopNavigationViewItemBackgroundSelected" Color="{ThemeResource SolidBackgroundFillColorTertiary}" />
29-
<SolidColorBrush x:Key="TopNavigationViewItemBackgroundSelectedPointerOver" Color="{ThemeResource SolidBackgroundFillColorTertiary}" />
30-
<SolidColorBrush x:Key="TopNavigationViewItemBackgroundSelectedPressed" Color="{ThemeResource SolidBackgroundFillColorTertiary}" />
31-
<SolidColorBrush x:Key="NavigationViewItemBorderBrush" Color="{ThemeResource ControlStrokeColorDefault}" />
32-
<SolidColorBrush x:Key="NavigationViewItemBorderBrushPointerOver" Color="{ThemeResource ControlStrokeColorDefault}" />
33-
<SolidColorBrush x:Key="NavigationViewItemBorderBrushPressed" Color="{ThemeResource ControlStrokeColorDefault}" />
34-
<SolidColorBrush x:Key="NavigationViewItemBorderBrushSelected" Color="{ThemeResource ControlStrokeColorDefault}" />
35-
<SolidColorBrush x:Key="NavigationViewItemBorderBrushSelectedPointerOver" Color="{ThemeResource ControlStrokeColorDefault}" />
36-
<SolidColorBrush x:Key="NavigationViewItemBorderBrushSelectedPressed" Color="{ThemeResource ControlStrokeColorDefault}" />
37-
</ResourceDictionary>
38-
<ResourceDictionary x:Key="Dark">
39-
<SolidColorBrush x:Key="NavigationViewExpandedPaneBackground" Color="Transparent" />
40-
<SolidColorBrush x:Key="NavigationViewDefaultPaneBackground" Color="Transparent" />
41-
<SolidColorBrush x:Key="NavigationViewItemBackground" Color="{ThemeResource SolidBackgroundFillColorTertiary}" />
42-
<SolidColorBrush x:Key="TopNavigationViewItemBackgroundPointerOver" Color="{ThemeResource SolidBackgroundFillColorTertiary}" />
43-
<SolidColorBrush x:Key="TopNavigationViewItemBackgroundPressed" Color="{ThemeResource SolidBackgroundFillColorTertiary}" />
44-
<SolidColorBrush x:Key="TopNavigationViewItemBackgroundSelected" Color="{ThemeResource SolidBackgroundFillColorTertiary}" />
45-
<SolidColorBrush x:Key="TopNavigationViewItemBackgroundSelectedPointerOver" Color="{ThemeResource SolidBackgroundFillColorTertiary}" />
46-
<SolidColorBrush x:Key="TopNavigationViewItemBackgroundSelectedPressed" Color="{ThemeResource SolidBackgroundFillColorTertiary}" />
47-
<SolidColorBrush x:Key="NavigationViewItemBorderBrush" Color="{ThemeResource ControlStrokeColorDefault}" />
48-
<SolidColorBrush x:Key="NavigationViewItemBorderBrushPointerOver" Color="{ThemeResource ControlStrokeColorDefault}" />
49-
<SolidColorBrush x:Key="NavigationViewItemBorderBrushPressed" Color="{ThemeResource ControlStrokeColorDefault}" />
50-
<SolidColorBrush x:Key="NavigationViewItemBorderBrushSelected" Color="{ThemeResource ControlStrokeColorDefault}" />
51-
<SolidColorBrush x:Key="NavigationViewItemBorderBrushSelectedPointerOver" Color="{ThemeResource ControlStrokeColorDefault}" />
52-
<SolidColorBrush x:Key="NavigationViewItemBorderBrushSelectedPressed" Color="{ThemeResource ControlStrokeColorDefault}" />
53-
</ResourceDictionary>
54-
<ResourceDictionary x:Key="HighContrast">
55-
<SolidColorBrush x:Key="NavigationViewExpandedPaneBackground" Color="Transparent" />
56-
<SolidColorBrush x:Key="NavigationViewDefaultPaneBackground" Color="Transparent" />
57-
<SolidColorBrush x:Key="NavigationViewItemBackground" Color="{ThemeResource SolidBackgroundFillColorTertiary}" />
58-
<SolidColorBrush x:Key="TopNavigationViewItemBackgroundPointerOver" Color="{ThemeResource SolidBackgroundFillColorTertiary}" />
59-
<SolidColorBrush x:Key="TopNavigationViewItemBackgroundPressed" Color="{ThemeResource SolidBackgroundFillColorTertiary}" />
60-
<SolidColorBrush x:Key="TopNavigationViewItemBackgroundSelected" Color="{ThemeResource SolidBackgroundFillColorTertiary}" />
61-
<SolidColorBrush x:Key="TopNavigationViewItemBackgroundSelectedPointerOver" Color="{ThemeResource SolidBackgroundFillColorTertiary}" />
62-
<SolidColorBrush x:Key="TopNavigationViewItemBackgroundSelectedPressed" Color="{ThemeResource SolidBackgroundFillColorTertiary}" />
63-
<SolidColorBrush x:Key="NavigationViewItemBorderBrush" Color="{ThemeResource ControlStrokeColorDefault}" />
64-
<SolidColorBrush x:Key="NavigationViewItemBorderBrushPointerOver" Color="{ThemeResource ControlStrokeColorDefault}" />
65-
<SolidColorBrush x:Key="NavigationViewItemBorderBrushPressed" Color="{ThemeResource ControlStrokeColorDefault}" />
66-
<SolidColorBrush x:Key="NavigationViewItemBorderBrushSelected" Color="{ThemeResource ControlStrokeColorDefault}" />
67-
<SolidColorBrush x:Key="NavigationViewItemBorderBrushSelectedPointerOver" Color="{ThemeResource ControlStrokeColorDefault}" />
68-
<SolidColorBrush x:Key="NavigationViewItemBorderBrushSelectedPressed" Color="{ThemeResource ControlStrokeColorDefault}" />
69-
</ResourceDictionary>
70-
</ResourceDictionary.ThemeDictionaries>
20+
<SolidColorBrush x:Key="NavigationViewContentGridBorderBrush" Color="Transparent" />
7121
</ResourceDictionary>
7222
</ContentDialog.Resources>
7323

@@ -150,10 +100,7 @@
150100
VerticalAlignment="Stretch"
151101
VerticalScrollBarVisibility="Visible"
152102
VerticalScrollMode="Enabled">
153-
<Frame
154-
x:Name="SettingsContentFrame"
155-
Padding="12"
156-
Background="{ThemeResource SolidBackgroundFillColorTertiary}" />
103+
<Frame x:Name="SettingsContentFrame" Padding="12,4,12,12" />
157104
</ScrollViewer>
158105
</muxc:NavigationView>
159106

‎src/Files/Files.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@
196196
<Compile Include="Helpers\ItemListDisplayHelpers\GroupedCollection.cs" />
197197
<Compile Include="Helpers\ItemListDisplayHelpers\GroupingHelper.cs" />
198198
<Compile Include="Helpers\StorageItemIconHelpers.cs" />
199+
<Compile Include="Helpers\StorageSenseHelper.cs" />
199200
<Compile Include="Helpers\UniversalLogWriter.cs" />
200201
<Compile Include="Helpers\SaveImageToFile.cs" />
201202
<Compile Include="Filesystem\FolderHelpers.cs" />
@@ -1548,4 +1549,4 @@
15481549
<Target Name="AfterBuild">
15491550
</Target>
15501551
-->
1551-
</Project>
1552+
</Project>

‎src/Files/Helpers/StorageSenseHelper.cs

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Text;
5+
using System.Threading.Tasks;
6+
using Windows.Foundation.Collections;
7+
using Windows.Foundation.Metadata;
8+
using Windows.System;
9+
10+
namespace Files.Helpers
11+
{
12+
internal class StorageSenseHelper
13+
{
14+
public static async void OpenStorageSense(string Path)
15+
{
16+
var connection = await AppServiceConnectionHelper.Instance;
17+
if (connection != null
18+
&& !Path.StartsWith("C:", StringComparison.OrdinalIgnoreCase)
19+
&& ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8))
20+
{
21+
await connection.SendMessageAsync(new ValueSet()
22+
{
23+
{ "Arguments", "LaunchSettings" },
24+
{ "page", "page=SettingsPageStorageSenseStorageOverview&target=SystemSettings_StorageSense_VolumeListLink" }
25+
});
26+
}
27+
else
28+
{
29+
await Launcher.LaunchUriAsync(new Uri("ms-settings:storagesense"));
30+
}
31+
}
32+
}
33+
}

‎src/Files/MultilingualResources/Files.af.xlf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2528,7 +2528,7 @@
25282528
<source>Security</source>
25292529
<target state="translated">Sekuriteit</target>
25302530
</trans-unit>
2531-
<trans-unit id="SecurityAdvancedPermissions.Text" translate="yes" xml:space="preserve">
2531+
<trans-unit id="AdvancedPermissions" translate="yes" xml:space="preserve">
25322532
<source>Advanced permissions</source>
25332533
<target state="translated">Gevorderde toestemmings</target>
25342534
</trans-unit>

‎src/Files/MultilingualResources/Files.ar.xlf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2394,7 +2394,7 @@
23942394
<source>Security</source>
23952395
<target state="needs-review-translation" state-qualifier="tm-suggestion">الأمان</target>
23962396
</trans-unit>
2397-
<trans-unit id="SecurityAdvancedPermissions.Text" translate="yes" xml:space="preserve">
2397+
<trans-unit id="AdvancedPermissions" translate="yes" xml:space="preserve">
23982398
<source>Advanced permissions</source>
23992399
<target state="needs-review-translation" state-qualifier="tm-suggestion">أذونات متقدمة:</target>
24002400
</trans-unit>

‎src/Files/MultilingualResources/Files.ca.xlf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2470,7 +2470,7 @@
24702470
<source>Security</source>
24712471
<target state="new">Security</target>
24722472
</trans-unit>
2473-
<trans-unit id="SecurityAdvancedPermissions.Text" translate="yes" xml:space="preserve">
2473+
<trans-unit id="AdvancedPermissions" translate="yes" xml:space="preserve">
24742474
<source>Advanced permissions</source>
24752475
<target state="new">Advanced permissions</target>
24762476
</trans-unit>

‎src/Files/MultilingualResources/Files.cs-CZ.xlf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2405,7 +2405,7 @@
24052405
<source>Security</source>
24062406
<target state="needs-review-translation" state-qualifier="tm-suggestion">Zabezpečení</target>
24072407
</trans-unit>
2408-
<trans-unit id="SecurityAdvancedPermissions.Text" translate="yes" xml:space="preserve">
2408+
<trans-unit id="AdvancedPermissions" translate="yes" xml:space="preserve">
24092409
<source>Advanced permissions</source>
24102410
<target state="needs-review-translation" state-qualifier="tm-suggestion">Rozšířená oprávnění</target>
24112411
</trans-unit>

0 commit comments

Comments
 (0)