Merge pull request #51 from Clancey/ViewTitle

View title
lytico · Jul 22, 2019 · 6d6961a · 6d6961a
2 parents d465828 + b193056
commit 6d6961a
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 16 deletions.
diff --git a/sample/HotUI.Samples/MainPage.cs b/sample/HotUI.Samples/MainPage.cs
@@ -45,8 +45,7 @@ public class MainPage : View {
 
 		public MainPage (List<MenuItem> additionalPage = null)
 		{
-            Title = "HotUI Samples";
-
+            this.Title("Main Page");
             //This is only required since there is a parameter for the view
             HotReloadHelper.Register(this, additionalPage);
             if (additionalPage != null)
@@ -61,7 +60,7 @@ public MainPage (List<MenuItem> additionalPage = null)
                         new Text(page.Title),
                         new Spacer()
                     }.Frame(height:44).Padding(left:10),
-				}.OnSelected(page => Navigation.PerformNavigate(page.Page?.Invoke()))
+				}.OnSelected(page => Navigation.PerformNavigate(page.Page?.Invoke()?.Title(page.Title)))
 			};
 
         }

diff --git a/sample/HotUI.Samples/TabViewSample.cs b/sample/HotUI.Samples/TabViewSample.cs
@@ -3,10 +3,6 @@ namespace HotUI.Samples
 {
     public class TabViewSample : View
     {
-        public TabViewSample()
-        {
-            this.Title = "TabView sample";
-        }
 
         [Body]
         View body() => new TabView

diff --git a/src/HotUI.iOS/Controls/HUITabView.cs b/src/HotUI.iOS/Controls/HUITabView.cs
@@ -42,7 +42,7 @@ public override void MovedToSuperview()
         {
             base.MovedToSuperview();
             var vc = this.GetViewController();
-            vc.AddChildViewController(tabViewController);
+            vc?.AddChildViewController(tabViewController);
         }
         public override void RemoveFromSuperview()
         {

diff --git a/src/HotUI.iOS/HotUIViewController.cs b/src/HotUI.iOS/HotUIViewController.cs
@@ -24,7 +24,7 @@ public View CurrentView
                 else
                     _startingCurrentView = value;
 
-                Title = value?.Title ?? "";
+                Title = value?.GetEnvironment<string>(EnvironmentKeys.View.Title) ?? "";
             }
         }
 

diff --git a/src/HotUI/Controls/View.cs b/src/HotUI/Controls/View.cs
@@ -34,13 +34,6 @@ public string Tag
             internal set => tag = value;
         }
 
-        string title;
-        public string Title
-        {
-            get => title ?? parent?.Title;
-            protected set => title = value;
-        }
-
         public View Parent
         {
             get => parent;

diff --git a/src/HotUI/EnvironmentData.cs b/src/HotUI/EnvironmentData.cs
@@ -31,6 +31,7 @@ public static class View
 	        public const string ClipShape = "ClipShape";
             public const string Shadow = "Shadow";
             public const string Overlay = "Overlay";
+            public const string Title = "Title";
         }
 
         public static class Shape

diff --git a/src/HotUI/Helpers/ViewExtensions.cs b/src/HotUI/Helpers/ViewExtensions.cs
@@ -56,5 +56,8 @@ public static List<FieldInfo> GetFieldsWithAttribute(this object obj, Type attri
             var fields = type.GetFields(BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance).Where(x => Attribute.IsDefined(x, attribute)).ToList();
             return fields;
         }
+
+        public static T Title<T>(this T view, string title) where T : View =>
+            view.SetEnvironment(EnvironmentKeys.View.Title, title);
     }
 }