Skip to content

Commit d1f2cf1

Browse files
yaira2yaira2
authored
Adjusted OneDrive sync icons (#6617)
1 parent 188f6ab commit d1f2cf1

File tree

9 files changed

+77
-116
lines changed

9 files changed

+77
-116
lines changed

‎Files/App.xaml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@
3030
<ResourceDictionary>
3131
<ResourceDictionary.ThemeDictionaries>
3232
<ResourceDictionary x:Key="Light">
33-
<SolidColorBrush x:Key="CloudDriveSyncStatusOnlineColor" Color="#0078D7" />
34-
<SolidColorBrush x:Key="CloudDriveSyncStatusOfflineColor" Color="#30BB03" />
35-
<SolidColorBrush x:Key="CloudDriveSyncStatusExcludedColor" Color="#AAAAAA" />
3633
<Color x:Key="SolidBackgroundAcrylic">#FFFFFF</Color>
3734
<!-- Corner Radius -->
3835
<CornerRadius x:Key="ControlCornerRadius">4</CornerRadius>
@@ -70,9 +67,6 @@
7067
<SolidColorBrush x:Key="NavigationViewContentBackground" Color="Transparent" />
7168
</ResourceDictionary>
7269
<ResourceDictionary x:Key="Dark">
73-
<SolidColorBrush x:Key="CloudDriveSyncStatusOnlineColor" Color="#0078D7" />
74-
<SolidColorBrush x:Key="CloudDriveSyncStatusOfflineColor" Color="#30BB03" />
75-
<SolidColorBrush x:Key="CloudDriveSyncStatusExcludedColor" Color="#AAAAAA" />
7670
<Color x:Key="SolidBackgroundAcrylic">#2C2C2C</Color>
7771
<!-- Corner Radius -->
7872
<CornerRadius x:Key="ControlCornerRadius">4</CornerRadius>
@@ -123,9 +117,6 @@
123117
<SolidColorBrush x:Key="SolidBackgroundFillColorSecondaryBrush" Color="{StaticResource SystemColorWindowColor}" />
124118
<SolidColorBrush x:Key="SolidBackgroundFillColorTertiaryBrush" Color="{StaticResource SystemColorWindowColor}" />
125119
<SolidColorBrush x:Key="SolidBackgroundFillColorQuarternaryBrush" Color="{StaticResource SystemColorWindowColor}" />
126-
<SolidColorBrush x:Key="CloudDriveSyncStatusOnlineColor" Color="#0078D7" />
127-
<SolidColorBrush x:Key="CloudDriveSyncStatusOfflineColor" Color="#30BB03" />
128-
<SolidColorBrush x:Key="CloudDriveSyncStatusExcludedColor" Color="#AAAAAA" />
129120
<Color x:Key="SolidBackgroundAcrylic">#2C2C2C</Color>
130121
<!-- Corner Radius -->
131122
<CornerRadius x:Key="ControlCornerRadius">4</CornerRadius>

‎Files/Filesystem/Cloud/CloudDriveSyncStatusUI.cs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,6 @@ public string SyncStatusString
3131
set => SetProperty(ref syncStatusString, value);
3232
}
3333

34-
private SolidColorBrush foreground;
35-
36-
public SolidColorBrush Foreground
37-
{
38-
get => foreground;
39-
set => SetProperty(ref foreground, value);
40-
}
41-
4234
public CloudDriveSyncStatus SyncStatus { get; set; }
4335

4436
public static CloudDriveSyncStatusUI FromCloudDriveSyncStatus(CloudDriveSyncStatus syncStatus)
@@ -51,22 +43,19 @@ public static CloudDriveSyncStatusUI FromCloudDriveSyncStatus(CloudDriveSyncStat
5143
case CloudDriveSyncStatus.FileOnline:
5244
statusUI.LoadSyncStatus = true;
5345
statusUI.Glyph = "\uE753";
54-
statusUI.Foreground = (SolidColorBrush)App.Current.Resources["CloudDriveSyncStatusOnlineColor"];
5546
statusUI.SyncStatusString = "CloudDriveSyncStatus_Online".GetLocalized();
5647
break;
5748

5849
case CloudDriveSyncStatus.FileOffline:
5950
case CloudDriveSyncStatus.FileOfflinePinned:
6051
statusUI.LoadSyncStatus = true;
6152
statusUI.Glyph = "\uE73E";
62-
statusUI.Foreground = (SolidColorBrush)App.Current.Resources["CloudDriveSyncStatusOfflineColor"];
6353
statusUI.SyncStatusString = "CloudDriveSyncStatus_Offline".GetLocalized();
6454
break;
6555

6656
case CloudDriveSyncStatus.FileSync:
6757
statusUI.LoadSyncStatus = true;
6858
statusUI.Glyph = "\uE895";
69-
statusUI.Foreground = (SolidColorBrush)App.Current.Resources["CloudDriveSyncStatusOnlineColor"];
7059
statusUI.SyncStatusString = "CloudDriveSyncStatus_Sync".GetLocalized();
7160
break;
7261

@@ -75,7 +64,6 @@ public static CloudDriveSyncStatusUI FromCloudDriveSyncStatus(CloudDriveSyncStat
7564
case CloudDriveSyncStatus.FolderOfflinePartial:
7665
statusUI.LoadSyncStatus = true;
7766
statusUI.Glyph = "\uE753";
78-
statusUI.Foreground = (SolidColorBrush)App.Current.Resources["CloudDriveSyncStatusOnlineColor"];
7967
statusUI.SyncStatusString = "CloudDriveSyncStatus_PartialOffline".GetLocalized();
8068
break;
8169

@@ -84,14 +72,12 @@ public static CloudDriveSyncStatusUI FromCloudDriveSyncStatus(CloudDriveSyncStat
8472
case CloudDriveSyncStatus.FolderEmpty:
8573
statusUI.LoadSyncStatus = true;
8674
statusUI.Glyph = "\uE73E";
87-
statusUI.Foreground = (SolidColorBrush)App.Current.Resources["CloudDriveSyncStatusOfflineColor"];
8875
statusUI.SyncStatusString = "CloudDriveSyncStatus_Offline".GetLocalized();
8976
break;
9077

9178
case CloudDriveSyncStatus.FolderExcluded:
9279
statusUI.LoadSyncStatus = true;
9380
statusUI.Glyph = "\uF140";
94-
statusUI.Foreground = (SolidColorBrush)App.Current.Resources["CloudDriveSyncStatusExcludedColor"];
9581
statusUI.SyncStatusString = "CloudDriveSyncStatus_Excluded".GetLocalized();
9682
break;
9783

‎Files/ViewModels/ColumnsViewModel.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ public ColumnViewModel SizeColumn
101101
set => SetProperty(ref sizeColumn, value);
102102
}
103103

104-
public double TotalWidth => IconColumn.Length.Value + TagColumn.Length.Value + NameColumn.Length.Value + StatusColumn.Length.Value + DateModifiedColumn.Length.Value + OriginalPathColumn.Length.Value
105-
+ ItemTypeColumn.Length.Value + DateDeletedColumn.Length.Value + DateCreatedColumn.Length.Value + SizeColumn.Length.Value;
104+
public double TotalWidth => IconColumn.Length.Value + TagColumn.Length.Value + NameColumn.Length.Value + DateModifiedColumn.Length.Value + OriginalPathColumn.Length.Value
105+
+ ItemTypeColumn.Length.Value + DateDeletedColumn.Length.Value + DateCreatedColumn.Length.Value + SizeColumn.Length.Value + StatusColumn.Length.Value;
106106

107107
public void SetDesiredSize(double width)
108108
{
@@ -121,13 +121,13 @@ private void SetColumnSizeProportionally(double factor)
121121
{
122122
NameColumn.TryMultiplySize(factor);
123123
TagColumn.TryMultiplySize(factor);
124-
StatusColumn.TryMultiplySize(factor);
125124
DateModifiedColumn.TryMultiplySize(factor);
126125
OriginalPathColumn.TryMultiplySize(factor);
127126
ItemTypeColumn.TryMultiplySize(factor);
128127
DateDeletedColumn.TryMultiplySize(factor);
129128
DateCreatedColumn.TryMultiplySize(factor);
130129
SizeColumn.TryMultiplySize(factor);
130+
StatusColumn.TryMultiplySize(factor);
131131
}
132132
}
133133

‎Files/Views/LayoutModes/ColumnViewBase.xaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,8 +294,7 @@
294294
HorizontalAlignment="Center"
295295
VerticalAlignment="Center"
296296
x:Phase="2"
297-
FontSize="18"
298-
Foreground="{x:Bind ((local3:CloudDriveSyncStatusUI)SyncStatusUI).Foreground, Mode=OneWay}"
297+
FontSize="12"
299298
Glyph="{x:Bind ((local3:CloudDriveSyncStatusUI)SyncStatusUI).Glyph, Mode=OneWay}"
300299
Visibility="{x:Bind ((local3:CloudDriveSyncStatusUI)SyncStatusUI).LoadSyncStatus, Mode=OneWay}" />
301300
<Ellipse

‎Files/Views/LayoutModes/ColumnViewBrowser.xaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,8 +314,7 @@
314314
HorizontalAlignment="Center"
315315
VerticalAlignment="Center"
316316
x:Phase="2"
317-
FontSize="18"
318-
Foreground="{x:Bind ((local3:CloudDriveSyncStatusUI)SyncStatusUI).Foreground, Mode=OneWay}"
317+
FontSize="12"
319318
Glyph="{x:Bind ((local3:CloudDriveSyncStatusUI)SyncStatusUI).Glyph, Mode=OneWay}"
320319
Visibility="{x:Bind ((local3:CloudDriveSyncStatusUI)SyncStatusUI).LoadSyncStatus, Mode=OneWay}" />
321320
<Ellipse

0 commit comments

Comments
 (0)