From b8fcb4d10d6186497756dd69d3efb00a7adcfd83 Mon Sep 17 00:00:00 2001
From: Thorsten Jung <tajbender@users.noreply.github.com>
Date: Sun, 20 Oct 2024 18:46:42 +0200
Subject: [PATCH 1/5] Update package `JetBrains.Annotations`

---
 src/electrifier/Views/ShellPage.xaml | 4 ++--
 src/electrifier/electrifier.csproj   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/electrifier/Views/ShellPage.xaml b/src/electrifier/Views/ShellPage.xaml
index e64a262b..27858a5a 100644
--- a/src/electrifier/Views/ShellPage.xaml
+++ b/src/electrifier/Views/ShellPage.xaml
@@ -46,7 +46,7 @@
                     <StackPanel Orientation="Horizontal">
                         <Button>
                             <Image x:Name="AppTitleBarBackButtonImageCenter"
-                                   VerticalAlignment="Top"
+                                   VerticalAlignment="Center"
                                    MaxHeight="23"
                                    Source="ms-appx:///Assets/Themes/Aero Blackcomb/Back Button 48px.png" />
                         </Button>
@@ -59,7 +59,7 @@
                         </Button>
                         <TextBox x:Name="CenterStackPanelTextBlock"
                                  Text="Search..."
-                                 VerticalAlignment="Center" />
+                                 VerticalAlignment="Stretch" />
                     </StackPanel>
                 </Border>
             </StackPanel>
diff --git a/src/electrifier/electrifier.csproj b/src/electrifier/electrifier.csproj
index a242476a..676322d9 100644
--- a/src/electrifier/electrifier.csproj
+++ b/src/electrifier/electrifier.csproj
@@ -51,7 +51,7 @@
     <PackageReference Include="CommunityToolkit.WinUI.Controls.Segmented" Version="8.1.240916" />
     <PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.1.240916" />
     <PackageReference Include="CommunityToolkit.WinUI.Controls.Sizers" Version="8.1.240916" />
-    <PackageReference Include="JetBrains.Annotations" Version="2024.2.0" />
+    <PackageReference Include="JetBrains.Annotations" Version="2024.3.0-eap1" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
     <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.240923002" />

From 72c67872c1150c9fb3e9181837bc73e2940fdc40 Mon Sep 17 00:00:00 2001
From: Thorsten Jung <tajbender@users.noreply.github.com>
Date: Mon, 21 Oct 2024 16:11:25 +0200
Subject: [PATCH 2/5] Cleanup

---
 .../Controls/Vanara/ExplorerBrowser.xaml      | 21 -------------------
 1 file changed, 21 deletions(-)

diff --git a/src/electrifier/Controls/Vanara/ExplorerBrowser.xaml b/src/electrifier/Controls/Vanara/ExplorerBrowser.xaml
index c5b09820..b1b6abc0 100644
--- a/src/electrifier/Controls/Vanara/ExplorerBrowser.xaml
+++ b/src/electrifier/Controls/Vanara/ExplorerBrowser.xaml
@@ -199,7 +199,6 @@
             <Border Grid.Column="1"
                     Width="8"
                     Background="Transparent" />
-            <!-- controls:GridSplitter -->
             <Border x:Name="ShellGridViewBorder"
                     Grid.Column="2">
                 <StackPanel Orientation="Vertical">
@@ -233,26 +232,6 @@
                     </AppBar>
                 </StackPanel>
             </Border>
-            <!-- add `ShellGridViewEast`:
-            <controls:GridSplitter
-                x:Name="MidArenaGridSplitter"
-                Grid.Column="3"
-                Width="12"
-                HorizontalAlignment="Left"
-                ResizeBehavior="BasedOnAlignment"
-                ResizeDirection="Columns"
-                Visibility="{x:Bind ArenaGridSplitterVisibility}">
-                <controls:GridSplitter.RenderTransform>
-                    <TranslateTransform X="-6" />
-                </controls:GridSplitter.RenderTransform>
-            </controls:GridSplitter>
-            <Border Grid.Column="4">
-                <local:Shell32GridView
-                    x:Name="ShellGridViewEast"
-                    BorderThickness="3"
-                    ItemsSource="{x:Bind CurrentFolderItems}"
-                    Visibility="{x:Bind GridViewVisibility}" />
-            </Border>-->
         </Grid>
         <CommandBar Grid.Row="3"
                     HorizontalAlignment="Left"

From edd9b15e0c4064975d2c6b0667a8e65ed05cdb96 Mon Sep 17 00:00:00 2001
From: Thorsten Jung <tajbender@users.noreply.github.com>
Date: Mon, 21 Oct 2024 16:43:45 +0200
Subject: [PATCH 3/5] In `FileManagerPage`, remove second `ExplorerBrowser`
 pane temporary

---
 src/electrifier/Views/FileManagerPage.xaml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/src/electrifier/Views/FileManagerPage.xaml b/src/electrifier/Views/FileManagerPage.xaml
index c332d310..cbb7005d 100644
--- a/src/electrifier/Views/FileManagerPage.xaml
+++ b/src/electrifier/Views/FileManagerPage.xaml
@@ -173,10 +173,6 @@
         </CommandBar>
         <Grid x:Name="SplitViewGrid"
               Grid.Row="1">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition></ColumnDefinition>
-                <ColumnDefinition></ColumnDefinition>
-            </Grid.ColumnDefinitions>
             <Border x:Name="PrimaryExplorerBrowserBorder">
                 <vanara:ExplorerBrowser x:Name="PrimaryExplorerBrowserControl"
                                         BottomAppBarVisibility="Collapsed"
@@ -184,14 +180,6 @@
                                         GridViewVisibility="Visible"
                                         TopCommandBarVisibility="Collapsed" />
             </Border>
-            <Border Grid.Column="1"
-                    x:Name="SecondaryExplorerBrowserBorder">
-                <vanara:ExplorerBrowser x:Name="SecondaryExplorerBrowserControl"
-                                        BottomAppBarVisibility="Collapsed"
-                                        BottomCommandBarVisibility="Visible"
-                                        GridViewVisibility="Visible"
-                                        TopCommandBarVisibility="Collapsed" />
-            </Border>
         </Grid>
     </Grid>
 </Page>

From 996ff0ab0203551f0370d0d5534c75ce96217151 Mon Sep 17 00:00:00 2001
From: Thorsten Jung <tajbender@users.noreply.github.com>
Date: Mon, 21 Oct 2024 19:05:58 +0200
Subject: [PATCH 4/5] Add `Tags` Menu to `FileManagerPage`

---
 .../Controls/Vanara/ExplorerBrowserItem.cs    |  17 +--
 src/electrifier/Views/FileManagerPage.xaml    | 140 +++++++++++-------
 2 files changed, 91 insertions(+), 66 deletions(-)

diff --git a/src/electrifier/Controls/Vanara/ExplorerBrowserItem.cs b/src/electrifier/Controls/Vanara/ExplorerBrowserItem.cs
index 9c3f9db9..b398152a 100644
--- a/src/electrifier/Controls/Vanara/ExplorerBrowserItem.cs
+++ b/src/electrifier/Controls/Vanara/ExplorerBrowserItem.cs
@@ -29,11 +29,11 @@ private bool TransparentHiddenFiles
             set;
         }
     }
+    public SoftwareBitmapSource? BitmapSource { get; set; }
 
-    /// <summary>Gets the set of Children as an <seealso cref="List{T}"/>.</summary>
+    /// <summary>Get the current set of <seealso cref="ExplorerBrowserItem"/>s as <seealso cref="List{T}"/>.</summary>
     public List<ExplorerBrowserItem>? Children;
-
-    /// <summary>Gets the DisplayName.</summary>
+    /// <summary>Get the DisplayName.</summary>
     public string DisplayName
     {
         get;
@@ -61,10 +61,7 @@ public bool HasUnrealizedChildren
             return false;
         }
     }
-    public bool IsExpanded
-    {
-        get; set;
-    }
+    public bool IsExpanded { get; set; }
     public bool IsFolder => ShellItem.IsFolder;
     public bool IsLink => ShellItem.IsLink;
     public bool IsSelected
@@ -76,9 +73,6 @@ public ShellItem ShellItem
         get;
     }
 
-    public SoftwareBitmapSource? BitmapSource { get; set; }
-
-
     public ExplorerBrowserItem(ShellItem? shItem, bool isSeparator = false)
     {
         ShellItem = new ShellItem(shItem.PIDL);
@@ -86,9 +80,6 @@ public ExplorerBrowserItem(ShellItem? shItem, bool isSeparator = false)
         IsExpanded = false;
         // todo: If IsSelected, add overlay of opened folder icon to TreeView optionally
         IsSelected = false;
-
-        // todo: Use Debug-Levels as property
-        //Debug.Print($"ExplorerBrowserItem <{GetDebuggerDisplay()}> created.");
     }
 
     public event PropertyChangedEventHandler? PropertyChanged;
diff --git a/src/electrifier/Views/FileManagerPage.xaml b/src/electrifier/Views/FileManagerPage.xaml
index cbb7005d..5d15dd5d 100644
--- a/src/electrifier/Views/FileManagerPage.xaml
+++ b/src/electrifier/Views/FileManagerPage.xaml
@@ -28,9 +28,11 @@
                         <Flyout>
                             <StackPanel>
                                 <AppBarButton Icon="Folder"
-                                              Label="Folder" />
+                                              Label="Folder"
+                                              IsEnabled="False" />
                                 <AppBarButton Icon="Link"
-                                              Label="Shortcut" />
+                                              Label="Shortcut"
+                                              IsEnabled="False" />
                             </StackPanel>
                         </Flyout>
                     </SplitButton.Flyout>
@@ -55,18 +57,6 @@
             <AppBarButton Icon="Delete"
                           IsEnabled="False"
                           Label="Delete" />
-
-            <!--<Button Content="Options">
-                <Button.Flyout>
-                    <MenuFlyout>
-                        <MenuFlyoutItem Text="Reset"/>
-                        <MenuFlyoutSeparator/>
-                        <ToggleMenuFlyoutItem Text="Repeat" IsChecked="True"/>
-                        <ToggleMenuFlyoutItem Text="Shuffle" IsChecked="True"/>
-                    </MenuFlyout>
-                </Button.Flyout>
-            </Button>-->
-
             <AppBarSeparator />
             <AppBarElementContainer>
                 <SplitButton x:Name="SortSplitButton"
@@ -74,16 +64,26 @@
                     <SplitButton.Flyout>
                         <Flyout>
                             <StackPanel>
-                                <Button Content="Name" />
-                                <Button Content="Date Modified" />
-                                <Button Content="Type" />
-                                <Button Content="~" />
-                                <Button Content="More" />
-                                <Button Content="~" />
-                                <Button Content="Ascending" />
-                                <Button Content="Descending" />
-                                <Button Content="~" />
-                                <Button Content="Group by" />
+                                <Button Content="Name"
+                                        IsEnabled="False" />
+                                <Button Content="Date Modified"
+                                        IsEnabled="False" />
+                                <Button Content="Type"
+                                        IsEnabled="False" />
+                                <Button Content="~"
+                                        IsEnabled="False" />
+                                <Button Content="More"
+                                        IsEnabled="False" />
+                                <Button Content="~"
+                                        IsEnabled="False" />
+                                <Button Content="Ascending"
+                                        IsEnabled="False" />
+                                <Button Content="Descending"
+                                        IsEnabled="False" />
+                                <Button Content="~"
+                                        IsEnabled="False" />
+                                <Button Content="Group by"
+                                        IsEnabled="False" />
                             </StackPanel>
                         </Flyout>
                     </SplitButton.Flyout>
@@ -101,31 +101,37 @@
                     <SplitButton.Flyout>
                         <Flyout>
                             <StackPanel>
-                                <Button Content="Tiles" />
-                                <Button Content="Content" />
-                                <Button Content="~" />
-                                <Button Content="Details pane" />
-                                <Button Content="Preview pane" />
-                                <Button Content="~" />
-                                <Button Content="Show" />
-                                <Button Content="~" />
-                                <Button Content="Two Pages" />
+                                <Button Content="Tiles"
+                                        IsEnabled="False" />
+                                <Button Content="Content"
+                                        IsEnabled="False" />
+                                <Button Content="~"
+                                        IsEnabled="False" />
+                                <Button Content="Details pane"
+                                        IsEnabled="False" />
+                                <Button Content="Preview pane"
+                                        IsEnabled="False" />
+                                <Button Content="~"
+                                        IsEnabled="False" />
+                                <Button Content="Show"
+                                        IsEnabled="False" />
+                                <Button Content="~"
+                                        IsEnabled="False" />
+                                <Button Content="Two Pages"
+                                        IsEnabled="False" />
                                 <!--  Glyph: E89A, TwoPage  -->
                                 <AppBarButton Icon="TwoPage"
-                                              Label="Double pane mode" />
+                                              Label="Double pane mode"
+                                              IsEnabled="False" />
                                 <AppBarButton Icon="Refresh"
-                                              Label="Refresh" />
+                                              Label="Refresh"
+                                              IsEnabled="False" />
                                 <AppBarButton Icon="Orientation"
-                                              Label="Orientation" />
+                                              Label="Orientation"
+                                              IsEnabled="False" />
                             </StackPanel>
                         </Flyout>
                     </SplitButton.Flyout>
-                    <SplitButton.Resources>
-                        <TeachingTip x:Name="ViewSplitButtonTeachingTip"
-                                     Title="TODO: Sort and Group options."
-                                     Subtitle="Use the dropdown button option to save your item and create another."
-                                     Target="{x:Bind SortSplitButton}" />
-                    </SplitButton.Resources>
                 </SplitButton>
             </AppBarElementContainer>
             <AppBarElementContainer>
@@ -134,10 +140,14 @@
                     <SplitButton.Flyout>
                         <Flyout>
                             <StackPanel>
-                                <Button Content="All File Types" />
-                                <Button Content="~" />
-                                <Button Content="Files" />
-                                <Button Content="Folders" />
+                                <Button Content="All File Types"
+                                        IsEnabled="False" />
+                                <Button Content="~"
+                                        IsEnabled="False" />
+                                <Button Content="Files"
+                                        IsEnabled="False" />
+                                <Button Content="Folders"
+                                        IsEnabled="False" />
                             </StackPanel>
                         </Flyout>
                     </SplitButton.Flyout>
@@ -150,25 +160,49 @@
                 </SplitButton>
             </AppBarElementContainer>
             <AppBarSeparator />
+            <AppBarElementContainer>
+                <SplitButton x:Name="TagsSplitButton"
+                             Content="Tags">
+                    <SplitButton.Flyout>
+                        <Flyout>
+                            <StackPanel>
+                                <Button Content="Low Priority"
+                                        IsEnabled="False" />
+                                <Button Content="Medium Priority"
+                                        IsEnabled="False" />
+                                <Button Content="High Priority"
+                                        IsEnabled="False" />
+                            </StackPanel>
+                        </Flyout>
+                    </SplitButton.Flyout>
+                </SplitButton>
+            </AppBarElementContainer>
             <CommandBar.SecondaryCommands>
                 <AppBarButton Icon="Undo"
-                              Label="Undo" />
+                              Label="Undo"
+                              IsEnabled="False" />
                 <AppBarSeparator />
                 <AppBarButton Icon="Pin"
-                              Label="Pin to Quick access" />
+                              Label="Pin to Quick access"
+                              IsEnabled="False" />
                 <AppBarSeparator />
                 <AppBarButton Icon="SelectAll"
-                              Label="Select all" />
+                              Label="Select all"
+                              IsEnabled="False" />
                 <!-- TODO: The Icon="ViewAll" is the one, that Windows Explorer uses for `Select none` -->
                 <AppBarButton Icon="ClearSelection"
-                              Label="Select none" />
+                              Label="Select none"
+                              IsEnabled="False" />
                 <AppBarButton Icon="Shuffle"
-                              Label="Invert selection" />
+                              Label="Invert selection"
+                              IsEnabled="False" />
                 <AppBarSeparator />
                 <AppBarButton Icon="Repair"
-                              Label="Properties" />
+                              Label="Properties"
+                              IsEnabled="False" />
                 <AppBarButton Icon="Setting"
-                              Label="Options" />
+                              Label="Options"
+                              IsEnabled="False" />
             </CommandBar.SecondaryCommands>
         </CommandBar>
         <Grid x:Name="SplitViewGrid"

From f68b98d3b35760fbfdd743c34d52cc2175467e93 Mon Sep 17 00:00:00 2001
From: Thorsten Jung <tajbender@users.noreply.github.com>
Date: Mon, 21 Oct 2024 19:51:17 +0200
Subject: [PATCH 5/5] Rename `_unplated` TaskBar Application Icon

---
 ...00_unplated.png => Square44x44Logo_unplated.png} | Bin
 src/electrifier/electrifier.csproj                  |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename src/electrifier/Assets/{Square44x44Logo.scale-200_unplated.png => Square44x44Logo_unplated.png} (100%)

diff --git a/src/electrifier/Assets/Square44x44Logo.scale-200_unplated.png b/src/electrifier/Assets/Square44x44Logo_unplated.png
similarity index 100%
rename from src/electrifier/Assets/Square44x44Logo.scale-200_unplated.png
rename to src/electrifier/Assets/Square44x44Logo_unplated.png
diff --git a/src/electrifier/electrifier.csproj b/src/electrifier/electrifier.csproj
index 676322d9..961b3a51 100644
--- a/src/electrifier/electrifier.csproj
+++ b/src/electrifier/electrifier.csproj
@@ -36,7 +36,7 @@
     <None Remove="Assets\Square44x44Logo.scale-200_altform-unplated.png" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Assets\Square44x44Logo.scale-200_unplated.png" />
+    <EmbeddedResource Include="Assets\Square44x44Logo_unplated.png" />
   </ItemGroup>
 
   <ItemGroup>