Fix blurred disk drive icons (#813)

tsvietOK · web-flow · commit aa56ffef825e · 2020-05-19T20:26:02.000-04:00
diff --git a/Files/App.xaml.cs b/Files/App.xaml.cs
@@ -345,16 +345,10 @@ private void OnSuspending(object sender, SuspendingEventArgs e)
 
     public class WSLDistroItem : INavigationControlItem
     {
-        public string DistroName { get; set; }
+        public string Glyph { get; set; } = null;
+        public string Text { get; set; }
         public string Path { get; set; }
+        public NavigationControlItemType ItemType => NavigationControlItemType.LinuxDistro;
         public Uri Logo { get; set; }
-
-        string INavigationControlItem.IconGlyph => null;
-
-        string INavigationControlItem.Text => DistroName;
-
-        string INavigationControlItem.Path => Path;
-
-        NavigationControlItemType INavigationControlItem.ItemType => NavigationControlItemType.LinuxDistro;
     }
 }
diff --git a/Files/Filesystem/DriveItem.cs b/Files/Filesystem/DriveItem.cs
@@ -8,31 +8,36 @@ namespace Files.Filesystem
     public class DriveItem : INavigationControlItem
     {
         public string Glyph { get; set; }
+        public string Text { get; set; }
+        public string Path => Tag;
+        public NavigationControlItemType ItemType { get; set; } = NavigationControlItemType.Drive;
         public ulong MaxSpace { get; set; } = 0;
         public ulong SpaceUsed { get; set; } = 0;
-        public string DriveText { get; set; }
-        public string Tag { get; set; }
-        public Visibility ProgressBarVisibility { get; set; }
         public string SpaceText { get; set; }
-        public Visibility CloudGlyphVisibility { get; set; } = Visibility.Collapsed;
-        public Visibility DriveGlyphVisibility { get; set; } = Visibility.Visible;
+        public string Tag { get; set; }
         public Visibility ItemVisibility { get; set; } = Visibility.Visible;
-        public DriveType Type { get; set; }
-        string INavigationControlItem.IconGlyph => Glyph;
-        string INavigationControlItem.Text => DriveText;
-        string INavigationControlItem.Path => Tag;
-        private readonly NavigationControlItemType NavItemType = NavigationControlItemType.Drive;
-        NavigationControlItemType INavigationControlItem.ItemType => NavItemType;
+
+        private DriveType _type;
+        public DriveType Type
+        {
+            get => _type;
+            set
+            {
+                _type = value;
+                SetGlyph(_type);
+            }
+        }
 
         public DriveItem()
         {
-            NavItemType = NavigationControlItemType.OneDrive;
+            ItemType = NavigationControlItemType.OneDrive;
         }
 
-        public DriveItem(StorageFolder root, Visibility progressBarVisibility, DriveType type)
+        public DriveItem(StorageFolder root, DriveType type)
         {
-            this.ProgressBarVisibility = progressBarVisibility;
+            Text = root.DisplayName;
             Type = type;
+            Tag = root.Path;
 
             var properties = Task.Run(async () =>
             {
@@ -52,11 +57,10 @@ public DriveItem(StorageFolder root, Visibility progressBarVisibility, DriveType
             {
                 SpaceText = "Unknown";
             }
+        }
 
-            DriveText = root.DisplayName;
-
-            Tag = root.Path;
-
+        private void SetGlyph(DriveType type)
+        {
             switch (type)
             {
                 case DriveType.Fixed:
@@ -85,6 +89,7 @@ public DriveItem(StorageFolder root, Visibility progressBarVisibility, DriveType
                     break;
 
                 case DriveType.VirtualDrive:
+                    Glyph = "\uE753";
                     break;
 
                 case DriveType.FloppyDisk:
diff --git a/Files/Filesystem/Drives.cs b/Files/Filesystem/Drives.cs
@@ -130,12 +130,7 @@ private async void DeviceAdded(DeviceWatcher sender, DeviceInformation args)
                 return;
             }
 
-            DriveType type = DriveType.Removable;
-
-            var driveItem = new DriveItem(
-                root,
-                Visibility.Visible,
-                type);
+            var driveItem = new DriveItem(root, DriveType.Removable);
 
             Logger.Info($"Drive added: {driveItem.Tag}, {driveItem.Type}");
 
@@ -261,10 +256,7 @@ private async Task GetDrives(IList<DriveItem> list)
                         break;
                 }
 
-                var driveItem = new DriveItem(
-                    folder,
-                    Visibility.Visible,
-                    type);
+                var driveItem = new DriveItem(folder, type);
 
                 Logger.Info($"Drive added: {driveItem.Tag}, {driveItem.Type}");
 
@@ -276,12 +268,9 @@ private void GetVirtualDrivesList(IList<DriveItem> list)
         {
             var oneDriveItem = new DriveItem()
             {
-                DriveText = "OneDrive",
+                Text = "OneDrive",
                 Tag = "OneDrive",
-                CloudGlyphVisibility = Visibility.Visible,
-                DriveGlyphVisibility = Visibility.Collapsed,
                 Type = DriveType.VirtualDrive,
-                //itemVisibility = App.AppSettings.PinOneDriveToSideBar
             };
 
             var setting = ApplicationData.Current.LocalSettings.Values["PinOneDrive"];
diff --git a/Files/Filesystem/INavigationControlItem.cs b/Files/Filesystem/INavigationControlItem.cs
@@ -8,10 +8,8 @@ namespace Files.Filesystem
 {
     public interface INavigationControlItem
     {
-        public string IconGlyph { get; }
-
+        public string Glyph { get; }
         public string Text { get; }
-
         public string Path { get; }
         public NavigationControlItemType ItemType { get; }
     }
diff --git a/Files/Filesystem/LocationItem.cs b/Files/Filesystem/LocationItem.cs
@@ -8,29 +8,18 @@ namespace Files.Filesystem
 {
     public class LocationItem : INavigationControlItem
     {
-        public bool IsDefaultLocation { get; set; }
         public string Glyph { get; set; }
         public string Text { get; set; }
         public string Path { get; set; }
-
-        string INavigationControlItem.IconGlyph => Glyph;
-
-        string INavigationControlItem.Text => Text;
-
-        string INavigationControlItem.Path => Path;
-
-        NavigationControlItemType INavigationControlItem.ItemType => NavigationControlItemType.Location;
+        public NavigationControlItemType ItemType => NavigationControlItemType.Location;
+        public bool IsDefaultLocation { get; set; }
     }
 
     public class HeaderTextItem : INavigationControlItem
     {
-        string INavigationControlItem.IconGlyph => null;
+        public string Glyph { get; set; } = null;
         public string Text { get; set; }
-
-        string INavigationControlItem.Text => Text;
-
-        string INavigationControlItem.Path => null;
-
-        NavigationControlItemType INavigationControlItem.ItemType => NavigationControlItemType.Header;
+        public string Path { get; set; } = null;
+        public NavigationControlItemType ItemType => NavigationControlItemType.Header;
     }
 }
diff --git a/Files/UserControls/ModernSidebar.xaml b/Files/UserControls/ModernSidebar.xaml
@@ -35,62 +35,34 @@
 
             <DataTemplate x:Key="DriveNavItem" x:DataType="local2:DriveItem">
                 <muxc:NavigationViewItem
-                    Padding="0"
+                    Content="{x:Bind Text}"
                     BorderThickness="0.8"
                     DataContext="{x:Bind}"
+                    Padding="0"
                     Tag="{x:Bind Tag}"
-                    Visibility="{x:Bind ItemVisibility}">
-                    <muxc:NavigationViewItem.Content>
-                        <StackPanel
-                            Margin="-4,0,0,0"
-                            DataContext="{x:Bind}"
-                            Orientation="Horizontal"
-                            Spacing="12"
-                            ToolTipService.ToolTip="{x:Bind SpaceText}">
-                            <Grid>
-                                <FontIcon
-                                    FontFamily="Segoe MDL2 Assets"
-                                    FontSize="18"
-                                    Glyph="{x:Bind Glyph}"
-                                    Visibility="{x:Bind DriveGlyphVisibility}" />
-                                <FontIcon
-                                    FontFamily="Segoe MDL2 Assets"
-                                    FontSize="18"
-                                    Glyph="&#xE753;"
-                                    Visibility="{x:Bind CloudGlyphVisibility}" />
-                            </Grid>
-                            <TextBlock
-                                FontSize="14"
-                                Text="{x:Bind DriveText}"
-                                TextTrimming="CharacterEllipsis" />
-                        </StackPanel>
-                    </muxc:NavigationViewItem.Content>
+                    Visibility="{x:Bind ItemVisibility}"
+                    ToolTipService.ToolTip="{x:Bind SpaceText}">
+                    <muxc:NavigationViewItem.Icon>
+                        <FontIcon Glyph="{x:Bind Glyph}" />
+                    </muxc:NavigationViewItem.Icon>
                 </muxc:NavigationViewItem>
             </DataTemplate>
 
             <DataTemplate x:Key="LinuxNavItem" x:DataType="local1:WSLDistroItem">
                 <muxc:NavigationViewItem
-                    Padding="0"
+                    Content="{x:Bind Text}"
                     BorderThickness="0.8"
                     DataContext="{x:Bind}"
+                    Padding="0"
                     IsTabStop="False"
                     Tag="{x:Bind Path}">
-                    <muxc:NavigationViewItem.Content>
-                        <StackPanel
-                            DataContext="{x:Bind}"
-                            Orientation="Horizontal"
-                            Spacing="6">
-                            <BitmapIcon
-                                Width="30"
-                                Height="30"
-                                ShowAsMonochrome="False"
-                                UriSource="{x:Bind Logo}" />
-                            <TextBlock
-                                VerticalAlignment="Center"
-                                FontSize="14"
-                                Text="{x:Bind DistroName}" />
-                        </StackPanel>
-                    </muxc:NavigationViewItem.Content>
+                    <muxc:NavigationViewItem.Icon>
+                        <BitmapIcon
+                            Width="30"
+                            Height="30"
+                            ShowAsMonochrome="False"
+                            UriSource="{x:Bind Logo}" />
+                    </muxc:NavigationViewItem.Icon>
                 </muxc:NavigationViewItem>
             </DataTemplate>
 
@@ -120,6 +92,7 @@
             OpenPaneLength="200"
             PaneDisplayMode="Left"
             SelectedItem="{x:Bind SelectedSidebarItem, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+            <NavigationViewItemSeparator />
             <muxc:NavigationView.PaneFooter>
                 <Grid Width="200">
                     <Button
diff --git a/Files/View Models/SettingsViewModel.cs b/Files/View Models/SettingsViewModel.cs
@@ -215,7 +215,7 @@ private async void DetectWSLDistros()
                         logoURI = new Uri("ms-appx:///Assets/WSL/genericpng.png");
                     }
 
-                    App.sideBarItems.Add(new WSLDistroItem() { DistroName = folder.DisplayName, Path = folder.Path, Logo = logoURI });
+                    App.sideBarItems.Add(new WSLDistroItem() { Text = folder.DisplayName, Path = folder.Path, Logo = logoURI });
                 }
             }
             catch (Exception)
@@ -371,12 +371,9 @@ public bool PinOneDriveToSideBar
                         localSettings.Values["PinOneDrive"] = true;
                         var oneDriveItem = new DriveItem()
                         {
-                            DriveText = "OneDrive",
+                            Text = "OneDrive",
                             Tag = "OneDrive",
-                            CloudGlyphVisibility = Visibility.Visible,
-                            DriveGlyphVisibility = Visibility.Collapsed,
                             Type = Filesystem.DriveType.VirtualDrive,
-                            //itemVisibility = App.AppSettings.PinOneDriveToSideBar
                         };
                         App.sideBarItems.Add(oneDriveItem);
                     }

Original file line number	Diff line number	Diff line change
`@@ -345,16 +345,10 @@ private void OnSuspending(object sender, SuspendingEventArgs e)`
`345`	`345`
`346`	`346`	`public class WSLDistroItem : INavigationControlItem`
`347`	`347`	`{`
`348`		`- public string DistroName { get; set; }`
	`348`	`+ public string Glyph { get; set; } = null;`
	`349`	`+ public string Text { get; set; }`
`349`	`350`	`public string Path { get; set; }`
	`351`	`+ public NavigationControlItemType ItemType => NavigationControlItemType.LinuxDistro;`
`350`	`352`	`public Uri Logo { get; set; }`
`351`		`-`
`352`		`- string INavigationControlItem.IconGlyph => null;`
`353`		`-`
`354`		`- string INavigationControlItem.Text => DistroName;`
`355`		`-`
`356`		`- string INavigationControlItem.Path => Path;`
`357`		`-`
`358`		`- NavigationControlItemType INavigationControlItem.ItemType => NavigationControlItemType.LinuxDistro;`
`359`	`353`	`}`
`360`	`354`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,8 @@ namespace Files.Filesystem`
`8`	`8`	`{`
`9`	`9`	`public interface INavigationControlItem`
`10`	`10`	`{`
`11`		`- public string IconGlyph { get; }`
`12`		`-`
	`11`	`+ public string Glyph { get; }`
`13`	`12`	`public string Text { get; }`
`14`		`-`
`15`	`13`	`public string Path { get; }`
`16`	`14`	`public NavigationControlItemType ItemType { get; }`
`17`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,29 +8,18 @@ namespace Files.Filesystem`
`8`	`8`	`{`
`9`	`9`	`public class LocationItem : INavigationControlItem`
`10`	`10`	`{`
`11`		`- public bool IsDefaultLocation { get; set; }`
`12`	`11`	`public string Glyph { get; set; }`
`13`	`12`	`public string Text { get; set; }`
`14`	`13`	`public string Path { get; set; }`
`15`		`-`
`16`		`- string INavigationControlItem.IconGlyph => Glyph;`
`17`		`-`
`18`		`- string INavigationControlItem.Text => Text;`
`19`		`-`
`20`		`- string INavigationControlItem.Path => Path;`
`21`		`-`
`22`		`- NavigationControlItemType INavigationControlItem.ItemType => NavigationControlItemType.Location;`
	`14`	`+ public NavigationControlItemType ItemType => NavigationControlItemType.Location;`
	`15`	`+ public bool IsDefaultLocation { get; set; }`
`23`	`16`	`}`
`24`	`17`
`25`	`18`	`public class HeaderTextItem : INavigationControlItem`
`26`	`19`	`{`
`27`		`- string INavigationControlItem.IconGlyph => null;`
	`20`	`+ public string Glyph { get; set; } = null;`
`28`	`21`	`public string Text { get; set; }`
`29`		`-`
`30`		`- string INavigationControlItem.Text => Text;`
`31`		`-`
`32`		`- string INavigationControlItem.Path => null;`
`33`		`-`
`34`		`- NavigationControlItemType INavigationControlItem.ItemType => NavigationControlItemType.Header;`
	`22`	`+ public string Path { get; set; } = null;`
	`23`	`+ public NavigationControlItemType ItemType => NavigationControlItemType.Header;`
`35`	`24`	`}`
`36`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ private async void DetectWSLDistros()`
`215`	`215`	`logoURI = new Uri("ms-appx:///Assets/WSL/genericpng.png");`
`216`	`216`	`}`
`217`	`217`
`218`		`- App.sideBarItems.Add(new WSLDistroItem() { DistroName = folder.DisplayName, Path = folder.Path, Logo = logoURI });`
	`218`	`+ App.sideBarItems.Add(new WSLDistroItem() { Text = folder.DisplayName, Path = folder.Path, Logo = logoURI });`
`219`	`219`	`}`
`220`	`220`	`}`
`221`	`221`	`catch (Exception)`
`@@ -371,12 +371,9 @@ public bool PinOneDriveToSideBar`
`371`	`371`	`localSettings.Values["PinOneDrive"] = true;`
`372`	`372`	`var oneDriveItem = new DriveItem()`
`373`	`373`	`{`
`374`		`- DriveText = "OneDrive",`
	`374`	`+ Text = "OneDrive",`
`375`	`375`	`Tag = "OneDrive",`
`376`		`- CloudGlyphVisibility = Visibility.Visible,`
`377`		`- DriveGlyphVisibility = Visibility.Collapsed,`
`378`	`376`	`Type = Filesystem.DriveType.VirtualDrive,`
`379`		`- //itemVisibility = App.AppSettings.PinOneDriveToSideBar`
`380`	`377`	`};`
`381`	`378`	`App.sideBarItems.Add(oneDriveItem);`
`382`	`379`	`}`