Code Quality: Adding ToolbarButton controls

src/Files.App.Controls/Files.App.Controls.csproj

@@ -1,4 +1,4 @@
-<!--  Copyright (c) 2024 Files Community. Licensed under the MIT License. See the LICENSE.  -->
+<!--  Copyright (c) 2024 Files Community. Licensed under the MIT License. See the LICENSE.  -->
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>

src/Files.App.Controls/GlobalUsings.cs

@@ -0,0 +1,24 @@
+// Copyright (c) 2024 Files Community
+// Licensed under the MIT License. See the LICENSE.
+
+// System
+global using global::System;
+global using global::System.Collections;
+global using global::System.Collections.Generic;
+global using global::System.Collections.ObjectModel;
+global using global::System.Linq;
+global using global::System.Threading;
+global using global::System.Threading.Tasks;
+global using global::System.ComponentModel;
+global using global::System.Diagnostics;
+global using global::System.Text.Json;
+global using global::System.Text.Json.Serialization;
+global using SystemIO = global::System.IO;
+
+// Microsoft.UI
+global using global::Microsoft.UI.Xaml;
+global using global::Microsoft.UI.Xaml.Controls;
+global using global::Microsoft.UI.Xaml.Controls.Primitives;
+
+// Files.App.Controls
+global using global::Files.App.Controls.Primitives;

src/Files.App.Controls/ThemedIcon/ThemedIcon.ThemeResources.xaml

@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ResourceDictionary
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:local="using:Files.App.Controls">
+
+	<ResourceDictionary.ThemeDictionaries>
+
+		<ResourceDictionary x:Key="Default">
+			<Color x:Key="ThemedIconBaseColor">#DBF0F0F0</Color>
+			<Color x:Key="ThemedIconAltColor">#66161616</Color>
+
+			<StaticResource x:Key="ThemedIconBaseBrush" ResourceKey="ThemedIconBaseColor" />
+			<StaticResource x:Key="ThemedIconAltBrush" ResourceKey="ThemedIconAltColor" />
+			<StaticResource x:Key="ThemedIconAccentBrush" ResourceKey="AccentFillColorDefaultBrush" />
+			<StaticResource x:Key="ThemedIconAccentContrastBrush" ResourceKey="TextOnAccentFillColorPrimaryBrush" />
+			<StaticResource x:Key="ThemedIconDisabledBrush" ResourceKey="TextFillColorDisabledBrush" />
+			<StaticResource x:Key="ThemedIconDisabledToggleBrush" ResourceKey="TextOnAccentFillColorDisabledBrush" />
+
+			<StaticResource x:Key="ThemedIconCriticalBrush" ResourceKey="SystemFillColorCritical" />
+			<StaticResource x:Key="ThemedIconCautionBrush" ResourceKey="SystemFillColorCaution" />
+			<StaticResource x:Key="ThemedIconSuccessBrush" ResourceKey="SystemFillColorSuccess" />
+			<StaticResource x:Key="ThemedIconNeutralBrush" ResourceKey="SystemFillColorSolidNeutral" />
+
+			<StaticResource x:Key="ThemedIconCriticalBackgroundBrush" ResourceKey="SystemFillColorCriticalBackgroundBrush" />
+			<StaticResource x:Key="ThemedIconCautionBackgroundBrush" ResourceKey="SystemFillColorCautionBackgroundBrush" />
+			<StaticResource x:Key="ThemedIconSuccessBackgroundBrush" ResourceKey="SystemFillColorSuccessBackgroundBrush" />
+			<StaticResource x:Key="ThemedIconNeutralBackgroundBrush" ResourceKey="SystemFillColorNeutralBackgroundBrush" />
+
+			<x:Boolean x:Key="ThemedIconHighContrast">False</x:Boolean>
+		</ResourceDictionary>
+
+		<ResourceDictionary x:Key="Light">
+			<Color x:Key="ThemedIconBaseColor">#DB161616</Color>
+			<Color x:Key="ThemedIconAltColor">#66F0F0F0</Color>
+
+			<StaticResource x:Key="ThemedIconBaseBrush" ResourceKey="ThemedIconBaseColor" />
+			<StaticResource x:Key="ThemedIconAltBrush" ResourceKey="ThemedIconAltColor" />
+			<StaticResource x:Key="ThemedIconAccentBrush" ResourceKey="AccentFillColorDefaultBrush" />
+			<StaticResource x:Key="ThemedIconAccentContrastBrush" ResourceKey="TextOnAccentFillColorPrimaryBrush" />
+			<StaticResource x:Key="ThemedIconDisabledBrush" ResourceKey="TextFillColorDisabledBrush" />
+			<StaticResource x:Key="ThemedIconDisabledToggleBrush" ResourceKey="TextOnAccentFillColorDisabledBrush" />
+
+			<StaticResource x:Key="ThemedIconCriticalBrush" ResourceKey="SystemFillColorCritical" />
+			<StaticResource x:Key="ThemedIconCautionBrush" ResourceKey="SystemFillColorCaution" />
+			<StaticResource x:Key="ThemedIconSuccessBrush" ResourceKey="SystemFillColorSuccess" />
+			<StaticResource x:Key="ThemedIconNeutralBrush" ResourceKey="SystemFillColorSolidNeutral" />
+
+			<StaticResource x:Key="ThemedIconCriticalBackgroundBrush" ResourceKey="SystemFillColorCriticalBackgroundBrush" />
+			<StaticResource x:Key="ThemedIconCautionBackgroundBrush" ResourceKey="SystemFillColorCautionBackgroundBrush" />
+			<StaticResource x:Key="ThemedIconSuccessBackgroundBrush" ResourceKey="SystemFillColorSuccessBackgroundBrush" />
+			<StaticResource x:Key="ThemedIconNeutralBackgroundBrush" ResourceKey="SystemFillColorNeutralBackgroundBrush" />
+
+			<x:Boolean x:Key="ThemedIconHighContrast">False</x:Boolean>
+		</ResourceDictionary>
+
+		<ResourceDictionary x:Key="HighContrast">
+			<Color x:Key="ThemedIconBaseColor">#FF000000</Color>
+			<Color x:Key="ThemedIconAltColor">#00000000</Color>
+
+			<StaticResource x:Key="ThemedIconBaseBrush" ResourceKey="SystemColorButtonTextColorBrush" />
+			<StaticResource x:Key="ThemedIconAltBrush" ResourceKey="SystemColorButtonFaceColorBrush" />
+			<StaticResource x:Key="ThemedIconAccentBrush" ResourceKey="SystemColorHighlightColorBrush" />
+			<StaticResource x:Key="ThemedIconAccentContrastBrush" ResourceKey="SystemColorHighlightTextColorBrush" />
+			<StaticResource x:Key="ThemedIconDisabledBrush" ResourceKey="SystemColorGrayTextColorBrush" />
+			<StaticResource x:Key="ThemedIconDisabledToggleBrush" ResourceKey="SystemColorHighlightTextColorBrush" />
+
+			<StaticResource x:Key="ThemedIconCriticalBrush" ResourceKey="SystemColorHighlightColorBrush" />
+			<StaticResource x:Key="ThemedIconCautionBrush" ResourceKey="SystemColorHighlightColorBrush" />
+			<StaticResource x:Key="ThemedIconSuccessBrush" ResourceKey="SystemColorHighlightColorBrush" />
+			<StaticResource x:Key="ThemedIconNeutralBrush" ResourceKey="SystemColorHighlightColorBrush" />
+
+			<StaticResource x:Key="ThemedIconCriticalBackgroundBrush" ResourceKey="SystemColorWindowColorBrush" />
+			<StaticResource x:Key="ThemedIconCautionBackgroundBrush" ResourceKey="SystemColorWindowColorBrush" />
+			<StaticResource x:Key="ThemedIconSuccessBackgroundBrush" ResourceKey="SystemColorWindowColorBrush" />
+			<StaticResource x:Key="ThemedIconNeutralBackgroundBrush" ResourceKey="SystemColorWindowColorBrush" />
+
+			<x:Boolean x:Key="ThemedIconHighContrast">True</x:Boolean>
+		</ResourceDictionary>
+
+	</ResourceDictionary.ThemeDictionaries>
+
+</ResourceDictionary>

src/Files.App.Controls/Themes/Generic.xaml

@@ -4,88 +4,31 @@
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:local="using:Files.App.Controls">
 
-	<ResourceDictionary.ThemeDictionaries>
-
-		<ResourceDictionary x:Key="Default">
-			<Color x:Key="ThemedIconBaseColor">#DBF0F0F0</Color>
-			<Color x:Key="ThemedIconAltColor">#66161616</Color>
-
-			<StaticResource x:Key="ThemedIconBaseBrush" ResourceKey="ThemedIconBaseColor" />
-			<StaticResource x:Key="ThemedIconAltBrush" ResourceKey="ThemedIconAltColor" />
-			<StaticResource x:Key="ThemedIconAccentBrush" ResourceKey="AccentFillColorDefaultBrush" />
-			<StaticResource x:Key="ThemedIconAccentContrastBrush" ResourceKey="TextOnAccentFillColorPrimaryBrush" />
-			<StaticResource x:Key="ThemedIconDisabledBrush" ResourceKey="TextFillColorDisabledBrush" />
-			<StaticResource x:Key="ThemedIconDisabledToggleBrush" ResourceKey="TextOnAccentFillColorDisabledBrush" />
-
-			<StaticResource x:Key="ThemedIconCriticalBrush" ResourceKey="SystemFillColorCritical" />
-			<StaticResource x:Key="ThemedIconCautionBrush" ResourceKey="SystemFillColorCaution" />
-			<StaticResource x:Key="ThemedIconSuccessBrush" ResourceKey="SystemFillColorSuccess" />
-			<StaticResource x:Key="ThemedIconNeutralBrush" ResourceKey="SystemFillColorSolidNeutral" />
-
-			<StaticResource x:Key="ThemedIconCriticalBackgroundBrush" ResourceKey="SystemFillColorCriticalBackgroundBrush" />
-			<StaticResource x:Key="ThemedIconCautionBackgroundBrush" ResourceKey="SystemFillColorCautionBackgroundBrush" />
-			<StaticResource x:Key="ThemedIconSuccessBackgroundBrush" ResourceKey="SystemFillColorSuccessBackgroundBrush" />
-			<StaticResource x:Key="ThemedIconNeutralBackgroundBrush" ResourceKey="SystemFillColorNeutralBackgroundBrush" />
-
-			<x:Boolean x:Key="ThemedIconHighContrast">False</x:Boolean>
-		</ResourceDictionary>
-
-		<ResourceDictionary x:Key="Light">
-			<Color x:Key="ThemedIconBaseColor">#DB161616</Color>
-			<Color x:Key="ThemedIconAltColor">#66F0F0F0</Color>
-
-			<StaticResource x:Key="ThemedIconBaseBrush" ResourceKey="ThemedIconBaseColor" />
-			<StaticResource x:Key="ThemedIconAltBrush" ResourceKey="ThemedIconAltColor" />
-			<StaticResource x:Key="ThemedIconAccentBrush" ResourceKey="AccentFillColorDefaultBrush" />
-			<StaticResource x:Key="ThemedIconAccentContrastBrush" ResourceKey="TextOnAccentFillColorPrimaryBrush" />
-			<StaticResource x:Key="ThemedIconDisabledBrush" ResourceKey="TextFillColorDisabledBrush" />
-			<StaticResource x:Key="ThemedIconDisabledToggleBrush" ResourceKey="TextOnAccentFillColorDisabledBrush" />
-
-			<StaticResource x:Key="ThemedIconCriticalBrush" ResourceKey="SystemFillColorCritical" />
-			<StaticResource x:Key="ThemedIconCautionBrush" ResourceKey="SystemFillColorCaution" />
-			<StaticResource x:Key="ThemedIconSuccessBrush" ResourceKey="SystemFillColorSuccess" />
-			<StaticResource x:Key="ThemedIconNeutralBrush" ResourceKey="SystemFillColorSolidNeutral" />
-
-			<StaticResource x:Key="ThemedIconCriticalBackgroundBrush" ResourceKey="SystemFillColorCriticalBackgroundBrush" />
-			<StaticResource x:Key="ThemedIconCautionBackgroundBrush" ResourceKey="SystemFillColorCautionBackgroundBrush" />
-			<StaticResource x:Key="ThemedIconSuccessBackgroundBrush" ResourceKey="SystemFillColorSuccessBackgroundBrush" />
-			<StaticResource x:Key="ThemedIconNeutralBackgroundBrush" ResourceKey="SystemFillColorNeutralBackgroundBrush" />
-
-			<x:Boolean x:Key="ThemedIconHighContrast">False</x:Boolean>
-		</ResourceDictionary>
-
-		<ResourceDictionary x:Key="HighContrast">
-			<Color x:Key="ThemedIconBaseColor">#FF000000</Color>
-			<Color x:Key="ThemedIconAltColor">#00000000</Color>
-
-			<StaticResource x:Key="ThemedIconBaseBrush" ResourceKey="SystemColorButtonTextColorBrush" />
-			<StaticResource x:Key="ThemedIconAltBrush" ResourceKey="SystemColorButtonFaceColorBrush" />
-			<StaticResource x:Key="ThemedIconAccentBrush" ResourceKey="SystemColorHighlightColorBrush" />
-			<StaticResource x:Key="ThemedIconAccentContrastBrush" ResourceKey="SystemColorHighlightTextColorBrush" />
-			<StaticResource x:Key="ThemedIconDisabledBrush" ResourceKey="SystemColorGrayTextColorBrush" />
-			<StaticResource x:Key="ThemedIconDisabledToggleBrush" ResourceKey="SystemColorHighlightTextColorBrush" />
-
-			<StaticResource x:Key="ThemedIconCriticalBrush" ResourceKey="SystemColorHighlightColorBrush" />
-			<StaticResource x:Key="ThemedIconCautionBrush" ResourceKey="SystemColorHighlightColorBrush" />
-			<StaticResource x:Key="ThemedIconSuccessBrush" ResourceKey="SystemColorHighlightColorBrush" />
-			<StaticResource x:Key="ThemedIconNeutralBrush" ResourceKey="SystemColorHighlightColorBrush" />
-
-			<StaticResource x:Key="ThemedIconCriticalBackgroundBrush" ResourceKey="SystemColorWindowColorBrush" />
-			<StaticResource x:Key="ThemedIconCautionBackgroundBrush" ResourceKey="SystemColorWindowColorBrush" />
-			<StaticResource x:Key="ThemedIconSuccessBackgroundBrush" ResourceKey="SystemColorWindowColorBrush" />
-			<StaticResource x:Key="ThemedIconNeutralBackgroundBrush" ResourceKey="SystemColorWindowColorBrush" />
+	<ResourceDictionary.MergedDictionaries>
+		<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
 
-			<x:Boolean x:Key="ThemedIconHighContrast">True</x:Boolean>
-		</ResourceDictionary>
+		<!--#region Theme Dictionaries-->
+		<ResourceDictionary Source="ms-appx:///Files.App.Controls/ThemedIcon/ThemedIcon.ThemeResources.xaml" />
 
-	</ResourceDictionary.ThemeDictionaries>
+		<ResourceDictionary Source="ms-appx:///Files.App.Controls/Toolbar/Toolbar.ThemeResources.xaml" />
+		<ResourceDictionary Source="ms-appx:///Files.App.Controls/Toolbar/ToolbarSeparator/ToolbarSeparator.ThemeResources.xaml" />
+		<ResourceDictionary Source="ms-appx:///Files.App.Controls/Toolbar/ToolbarButton/ToolbarButton.ThemeResources.xaml" />
+		<ResourceDictionary Source="ms-appx:///Files.App.Controls/Toolbar/ToolbarToggleButton/ToolbarToggleButton.ThemeResources.xaml" />
+		<!--#endregion-->
 
-	<ResourceDictionary.MergedDictionaries>
-		<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
-		<!--#region ThemedIconStyles-->
+		<!--#region ThemedIcon-->
 		<ResourceDictionary Source="ms-appx:///Files.App.Controls/ThemedIcon/ThemedIcon.xaml" />
 		<ResourceDictionary Source="ms-appx:///Files.App.Controls/ThemedIcon/ThemedIconLayer/ThemedIconLayer.xaml" />
-		<!--  Icon Style Sets  -->
+		<!--#endregion-->
+
+		<!--#region ToolbarButtons-->
+		<ResourceDictionary Source="ms-appx:///Files.App.Controls/Toolbar/Toolbar.xaml" />
+		<ResourceDictionary Source="ms-appx:///Files.App.Controls/Toolbar/ToolbarSeparator/ToolbarSeparator.xaml" />
+		<ResourceDictionary Source="ms-appx:///Files.App.Controls/Toolbar/ToolbarButton/ToolbarButton.xaml" />
+		<ResourceDictionary Source="ms-appx:///Files.App.Controls/Toolbar/ToolbarToggleButton/ToolbarToggleButton.xaml" />
+		<!--#endregion-->
+
+		<!--#region  ThemedIcon Styles-->
 		<ResourceDictionary Source="ms-appx:///Files.App.Controls/ThemedIcon/Styles/Icons.Common.xaml" />
 		<ResourceDictionary Source="ms-appx:///Files.App.Controls/ThemedIcon/Styles/Icons.New.xaml" />
 		<ResourceDictionary Source="ms-appx:///Files.App.Controls/ThemedIcon/Styles/Icons.Open.xaml" />

src/Files.App.Controls/Toolbar/Primitives/IToolbarItemSet.cs

@@ -0,0 +1,12 @@
+// Copyright (c) 2024 Files Community
+// Licensed under the MIT License. See the LICENSE.
+
+namespace Files.App.Controls
+{
+	/// <summary>
+	/// Interface to scope allowed items in the Private Item list
+	/// </summary>
+	public interface IToolbarItemSet
+	{
+	}
+}

src/Files.App.Controls/Toolbar/Primitives/IToolbarOverflowItemSet.cs

@@ -0,0 +1,12 @@
+// Copyright (c) 2024 Files Community
+// Licensed under the MIT License. See the LICENSE.
+
+namespace Files.App.Controls
+{
+	/// <summary>
+	/// Interface to scope allowed items in the Private Overflow list
+	/// </summary>
+	public interface IToolbarOverflowItemSet
+	{
+	}
+}

src/Files.App.Controls/Toolbar/Primitives/OverflowBehaviors.cs

@@ -0,0 +1,23 @@
+// Copyright (c) 2024 Files Community
+// Licensed under the MIT License. See the LICENSE.
+
+namespace Files.App.Controls.Primitives
+{
+	public enum OverflowBehaviors
+	{
+		/// <summary>
+		/// Item will move to the overflow menu if space available is too small
+		/// </summary>
+		Auto,
+
+		/// <summary>
+		/// Item will always appear in the overflow menu
+		/// </summary>
+		Always,
+
+		/// <summary>
+		/// Item will never move to the overflow menu
+		/// </summary>
+		Never,
+	}
+}

src/Files.App.Controls/Toolbar/Primitives/ToolbarLayout.cs

@@ -0,0 +1,72 @@
+// Copyright (c) 2024 Files Community
+// Licensed under the MIT License. See the LICENSE.
+
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Windows.Foundation;
+
+namespace Files.App.Controls.Primitives
+{
+	public partial class ToolbarLayout : NonVirtualizingLayout
+	{
+		private Size m_availableSize;
+
+		public ToolbarLayout()
+		{
+
+		}
+
+		private int GetItemCount(NonVirtualizingLayoutContext context)
+		{
+			return context.Children.Count;
+		}
+
+		private UIElement GetElementAt(NonVirtualizingLayoutContext context , int index)
+		{
+			return context.Children[index];
+		}
+
+		// Measuring is performed in a single step, every element is measured, including the overflow button
+		// item, but the total amount of space needed is only composed of the Toolbar Items
+		protected override Size MeasureOverride(NonVirtualizingLayoutContext context , Size availableSize)
+		{
+			m_availableSize = availableSize;
+
+			Size accumulatedItemsSize = new(0, 0);
+
+			for (int i = 0; i < GetItemCount(context); ++i)
+			{
+				//var toolbarItem = (ToolbarItem)GetElementAt(context, i);
+				//toolbarItem.Measure( availableSize );
+
+				if ( i != 0 )
+				{
+					//accumulatedItemsSize.Width += toolbarItem.DesiredSize.Width;
+					//accumulatedItemsSize.Height = Math.Max( accumulatedItemsSize.Height , toolbarItem.DesiredSize.Height );
+				}
+			}
+
+			if ( accumulatedItemsSize.Width > availableSize.Width )
+			{
+
+			}
+			else
+			{
+
+			}
+
+			return accumulatedItemsSize;
+		}
+
+		private void ArrangeItem(UIElement breadcrumbItem , ref float accumulatedWidths , float maxElementHeight)
+		{
+		}
+
+		// Arranging is performed in a single step, as many elements are tried to be drawn going from the last element
+		// towards the first one, if there's not enough space, then the ellipsis button is drawn
+		protected override Size ArrangeOverride(NonVirtualizingLayoutContext context , Size finalSize)
+		{
+			return finalSize;
+		}
+	}
+}

src/Files.App.Controls/Toolbar/Primitives/ToolbarSizes.cs

@@ -0,0 +1,23 @@
+// Copyright (c) 2024 Files Community
+// Licensed under the MIT License. See the LICENSE.
+
+namespace Files.App.Controls.Primitives
+{
+	public enum ToolbarSizes
+	{
+		/// <summary>
+		/// Buttons set to 32 x 32 size
+		/// </summary>
+		Small,
+
+		/// <summary>
+		/// Buttons set to 32 x 32 size
+		/// </summary>
+		Medium,
+
+		/// <summary>
+		/// Buttons set to 40 x 40 size
+		/// </summary>
+		Large,
+	}
+}