NavigationView-pre has been added

PieroCastillo · Oct 7, 2020 · d4949b6 · d4949b6
1 parent 5d1e7ef
commit d4949b6
Show file tree

Hide file tree

Showing 6 changed files with 101 additions and 136 deletions.
diff --git a/src/Aura.UI/Controls/ColourSlider.cs b/src/Aura.UI/Controls/ColourSlider.cs
diff --git a/src/Aura.UI/Controls/Follower.cs b/src/Aura.UI/Controls/Follower.cs
diff --git a/src/Aura.UI/Controls/Navigation/NavigationView.cs b/src/Aura.UI/Controls/Navigation/NavigationView.cs
@@ -28,22 +28,39 @@ protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
             ToggleNav.PointerPressed += ToggleNav_PointerPressed;
         }
 
+        protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)
+        {
+            base.OnPropertyChanged(change);
+
+            //if(change.Property == SelectedItemProperty)
+            //{
+                ChangeSelectedTitle();
+            //}
+        }
+
+        private void ChangeSelectedTitle()
+        {
+            if(SelectedItem is NavigationViewItem)
+            {
+                Title = (SelectedItem as NavigationViewItem).Title;
+            }
+        }
 
         private void ToggleNav_PointerPressed(object sender, Avalonia.Input.PointerPressedEventArgs e)
         {
-            ToggleNavigationViewExpansionState(this);
+            ToggleNavigationViewOpenState(this);
         }
 
-        public static void ToggleNavigationViewExpansionState(NavigationView navigationView)
+        public static void ToggleNavigationViewOpenState(NavigationView navigationView)
         {
-            var e = navigationView.ExpansionState;
+            var e = navigationView.IsOpen;
             switch (e)
             {
-                case ExpansionState.Total:
-                    navigationView.ExpansionState = ExpansionState.Hidden;
+                case true:
+                    navigationView.IsOpen = false;
                     break;
-                case ExpansionState.Hidden:
-                    navigationView.ExpansionState = ExpansionState.Total;
+                case false:
+                    navigationView.IsOpen = true;
                     break;
             }
         }
@@ -52,13 +69,22 @@ public static void ToggleNavigationViewExpansionState(NavigationView navigationV
         /// <summary>
         /// Get or set the expansion state of the NavigationView
         /// </summary>
-        public ExpansionState ExpansionState
+        public bool IsOpen
+        {
+            get { return GetValue(IsOpenProperty); }
+            set { SetValue(IsOpenProperty, value); }
+        }
+        public static readonly StyledProperty<bool> IsOpenProperty =
+            AvaloniaProperty.Register<NavigationView, bool>(nameof(IsOpen), false);
+
+        public object Title
         {
-            get { return GetValue(ExpansionStateProperty); }
-            set { SetValue(ExpansionStateProperty, value); }
+            get => GetValue(TitleProperty);
+            set => SetValue(TitleProperty, value);
         }
-        public static readonly StyledProperty<ExpansionState> ExpansionStateProperty =
-            AvaloniaProperty.Register<NavigationView, ExpansionState>(nameof(ExpansionState), ExpansionState.Total);
+        public static readonly StyledProperty<object> TitleProperty =
+            AvaloniaProperty.Register<NavigationView, object>(nameof(Title), "Title");
+
 
         public object Header
         {
@@ -75,6 +101,22 @@ public ITemplate HeaderTemplate
         }
         public static readonly StyledProperty<ITemplate> HeaderTemplateProperty =
             AvaloniaProperty.Register<NavigationView, ITemplate>(nameof(HeaderTemplate));
+
+        public double CompactPaneLength
+        {
+            get => GetValue(CompactPaneLengthProperty);
+            set => SetValue(CompactPaneLengthProperty, value);
+        }
+        public static readonly StyledProperty<double> CompactPaneLengthProperty =
+            AvaloniaProperty.Register<NavigationView, double>(nameof(CompactPaneLength), 150);
+
+        public double OpenPaneLength
+        {
+            get => GetValue(OpenPaneLengthProperty);
+            set => SetValue(OpenPaneLengthProperty, value);
+        }
+        public static readonly StyledProperty<double> OpenPaneLengthProperty =
+            AvaloniaProperty.Register<NavigationView, double>(nameof(OpenPaneLength), 50);
         #endregion
     }
-}
+}
diff --git a/src/Aura.UI/Controls/Navigation/NavigationViewItem.cs b/src/Aura.UI/Controls/Navigation/NavigationViewItem.cs
@@ -7,18 +7,33 @@
 
 namespace Aura.UI.Controls.Navigation
 {
-    public class NavigationViewItem : TabItem
+    public class NavigationViewItem : TabItem, IHeadered
     {
         /// <summary>
         /// Get or set the expansion state of the NavigationViewItem
         /// </summary>
-        public ExpansionState ExpansionState
+        public bool IsOpen
         {
-            get { return GetValue(ExpansionStateProperty); }
-            set { SetValue(ExpansionStateProperty, value); }
+            get { return GetValue(IsOpenProperty); }
+            set { SetValue(IsOpenProperty, value); }
         }
-        public static readonly StyledProperty<ExpansionState> ExpansionStateProperty =
-            AvaloniaProperty.Register<NavigationViewItem, ExpansionState>(nameof(ExpansionState), ExpansionState.Total);
+        public static readonly StyledProperty<bool> IsOpenProperty =
+            AvaloniaProperty.Register<NavigationViewItem, bool>(nameof(IsOpen), false);
+
+        public double CompactLength
+        {
+            get { return GetValue(CompactLengthProperty); }
+            set { SetValue(CompactLengthProperty, value); }
+        }
+        public static readonly StyledProperty<double> CompactLengthProperty =
+            AvaloniaProperty.Register<NavigationViewItem, double>(nameof(CompactLength), 50);
+        public double OpenLength
+        {
+            get { return GetValue(OpenLengthProperty); }
+            set { SetValue(OpenLengthProperty, value); }
+        }
+        public static readonly StyledProperty<double> OpenLengthProperty =
+            AvaloniaProperty.Register<NavigationViewItem, double>(nameof(OpenLength), 150);
 
         public IImage Icon
         {
@@ -28,5 +43,20 @@ public IImage Icon
         public static readonly StyledProperty<IImage> IconProperty =
             AvaloniaProperty.Register<NavigationViewItem, IImage>(nameof(Icon));
 
+        public bool IsHeader
+        {
+            get => GetValue(IsHeaderProperty);
+            set => SetValue(IsHeaderProperty, value);
+        }
+        public static readonly StyledProperty<bool> IsHeaderProperty =
+            AvaloniaProperty.Register<NavigationViewItem, bool>(nameof(IsHeader), false);
+
+        public object Title
+        {
+            get => GetValue(TitleProperty);
+            set => SetValue(TitleProperty, value);
+        }
+        public static readonly StyledProperty<object> TitleProperty =
+            AvaloniaProperty.Register<NavigationViewItem, object>(nameof(Title), "Title");
     }
 }
diff --git a/src/Aura.UI/Controls/Ribbon/Ribbon.cs b/src/Aura.UI/Controls/Ribbon/Ribbon.cs
@@ -185,6 +185,16 @@ public ExpansionState ExpansionState
         public static readonly StyledProperty<ExpansionState> ExpansionStateProperty =
             AvaloniaProperty.Register<Ribbon, ExpansionState>(nameof(ExpansionState), ExpansionState.Total);
 
+        /// <summary>
+        /// Defines the Pane Height of the Ribbon when this is opened
+        /// </summary>
+        public double OpenPaneHeight
+        {
+            get => GetValue(OpenPaneLengthProperty);
+            set => SetValue(OpenPaneLengthProperty, value);
+        }
+        public static readonly StyledProperty<double> OpenPaneLengthProperty =
+            AvaloniaProperty.Register<Ribbon, double>(nameof(OpenPaneHeight), 150);
         //public Ribbon Self
         //{
         //    get { return this; }

diff --git a/src/Aura.UI/Controls/Thumbs/ColourThumb.cs b/src/Aura.UI/Controls/Thumbs/ColourThumb.cs