From 4c7196c948919eff3ebefe734f01fd79c3c63cf3 Mon Sep 17 00:00:00 2001
From: Joel Wetzell <jwetzell@yahoo.com>
Date: Sat, 27 Mar 2021 16:19:11 -0500
Subject: [PATCH] Switch up Font loading

---
 qController.Standard/App.xaml                 | 12 ++++----
 qController.Standard/App.xaml.cs              | 11 -------
 .../Classes/Helpers/IconConstants.cs          |  2 +-
 .../Classes/QItems/QCueList.cs                |  3 +-
 .../Classes/UI/Buttons/QLevelsButton.cs       |  2 +-
 .../Classes/UI/Cells/QCueListCell.cs          |  2 +-
 .../Classes/UI/Cells/QInstanceCell.cs         |  9 +++---
 .../Classes/UI/Cells/QSelectedCueCell.cs      |  2 +-
 qController.Standard/Classes/UI/QCueGrid.cs   |  2 +-
 qController.Standard/Classes/UI/QNavBar.cs    |  7 +++--
 .../Classes/UI/QSelectedCueFrame.cs           |  4 ++-
 .../Classes/UI/QSelectedCueGrid.cs            |  2 +-
 .../ViewModels/QWorkspaceViewModel.cs         |  5 +---
 qController.Standard/Views/MenuPage.xaml.cs   | 30 ++++++++-----------
 14 files changed, 39 insertions(+), 54 deletions(-)

diff --git a/qController.Standard/App.xaml b/qController.Standard/App.xaml
index e465072..a38b2c7 100644
--- a/qController.Standard/App.xaml
+++ b/qController.Standard/App.xaml
@@ -4,21 +4,21 @@
              x:Class="qController.App">
 	<Application.Resources>
 		<!-- Application resource dictionary -->
-        <OnPlatform x:Key="qfont" x:TypeArguments="x:String">
-            <On Platform="Android" Value="qfont.ttf#qfont" />
-            <On Platform="iOS" Value="qfont" />
+        <OnPlatform x:Key="QFontFamily" x:TypeArguments="x:String">
+            <On Platform="Android">qfont.ttf#qfont</On>
+            <On Platform="iOS">qfont</On>
         </OnPlatform>
 
         <OnPlatform x:Key="MaterialFontFamily" x:TypeArguments="x:String">
-            <On Platform="iOS" Value="Material Design Icons" />
-            <On Platform="Android" Value="materialdesignicons-webfont.ttf#Material Design Icons" />
+            <On Platform="iOS">Material Design Icons</On>
+            <On Platform="Android">materialdesignicons-webfont.ttf#Material Design Icons</On>
         </OnPlatform>
 
         <Style TargetType="Label"
                Class="QFont"
                ApplyToDerivedTypes="true">
             <Setter Property="FontFamily"
-                    Value="{StaticResource qfont}" />
+                    Value="{StaticResource QFontFamily}" />
         </Style>
 
         <Style TargetType="Label"
diff --git a/qController.Standard/App.xaml.cs b/qController.Standard/App.xaml.cs
index b882064..36ba80d 100644
--- a/qController.Standard/App.xaml.cs
+++ b/qController.Standard/App.xaml.cs
@@ -14,7 +14,6 @@ namespace qController
         public static INavigation iNav;
         public static NavigationPage NavigationPage { get; private set; }
         public static RootPage rootPage;
-        public static string QFont;
         public static DisplayInfo mainDisplayInfo;
         public static double Height;
         public static double Width;
@@ -46,16 +45,6 @@ namespace qController
             HeightUnit = Height / 100.0;
             WidthUnit = Width / 100.0;
 
-            switch (Device.RuntimePlatform)
-            {
-                case Device.iOS:
-                    QFont = "qfont";
-                    break;
-                case Device.Android:
-                    QFont = "qfont.ttf#qfont";
-                    break;
-            }
-
             rootPage = new RootPage();
             NavigationPage = new NavigationPage(new QBrowserPage());
             rootPage.Detail = NavigationPage;
diff --git a/qController.Standard/Classes/Helpers/IconConstants.cs b/qController.Standard/Classes/Helpers/IconConstants.cs
index 6f0052b..1bfebf8 100644
--- a/qController.Standard/Classes/Helpers/IconConstants.cs
+++ b/qController.Standard/Classes/Helpers/IconConstants.cs
@@ -1,6 +1,6 @@
 namespace qController.Helpers
 {
-	static class IconConstants
+	public static class IconConstants
 	{
 		public const string VectorSquare = "\U000f0001";
 		public const string AccessPointNetwork = "\U000f0002";
diff --git a/qController.Standard/Classes/QItems/QCueList.cs b/qController.Standard/Classes/QItems/QCueList.cs
index 1215ef0..a3b3571 100644
--- a/qController.Standard/Classes/QItems/QCueList.cs
+++ b/qController.Standard/Classes/QItems/QCueList.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using qController.Helpers;
 
 namespace qController.QItems
 {
@@ -18,7 +19,7 @@ namespace qController.QItems
         {
             get
             {
-                return QIcon.GetIconFromType("Group");
+                return IconConstants.FormatListBulleted;
             }
         }
     }
diff --git a/qController.Standard/Classes/UI/Buttons/QLevelsButton.cs b/qController.Standard/Classes/UI/Buttons/QLevelsButton.cs
index 8b10a5e..94240b6 100644
--- a/qController.Standard/Classes/UI/Buttons/QLevelsButton.cs
+++ b/qController.Standard/Classes/UI/Buttons/QLevelsButton.cs
@@ -10,7 +10,7 @@ namespace qController.UI.Buttons
             {
                 Text = QIcon.SLIDERS,
                 TextColor = Color.Black,
-                FontFamily = App.QFont,
+                FontFamily = (OnPlatform<string>)Application.Current.Resources["QFontFamily"],
                 FontSize = App.HeightUnit * 4,
                 VerticalOptions = LayoutOptions.FillAndExpand,
                 HorizontalOptions = LayoutOptions.FillAndExpand,
diff --git a/qController.Standard/Classes/UI/Cells/QCueListCell.cs b/qController.Standard/Classes/UI/Cells/QCueListCell.cs
index 3757ad8..300efa4 100644
--- a/qController.Standard/Classes/UI/Cells/QCueListCell.cs
+++ b/qController.Standard/Classes/UI/Cells/QCueListCell.cs
@@ -28,7 +28,7 @@ namespace qController.UI.Cells
 
                     var icon = new Label();
 
-                    icon.FontFamily = App.QFont;
+                    icon.FontFamily = (OnPlatform<string>)Application.Current.Resources["QFontFamily"];
                     icon.SetBinding(Label.TextProperty, "Icon");
                     icon.HorizontalTextAlignment = TextAlignment.Center;
                     icon.VerticalTextAlignment = TextAlignment.Center;
diff --git a/qController.Standard/Classes/UI/Cells/QInstanceCell.cs b/qController.Standard/Classes/UI/Cells/QInstanceCell.cs
index c8f701d..711f5ce 100644
--- a/qController.Standard/Classes/UI/Cells/QInstanceCell.cs
+++ b/qController.Standard/Classes/UI/Cells/QInstanceCell.cs
@@ -1,6 +1,7 @@
 using System;
 using Xamarin.Forms;
 using Serilog;
+using qController.Helpers;
 
 namespace qController.UI.Cells
 {
@@ -87,18 +88,18 @@ namespace qController.UI.Cells
 
                 connectLabel.HorizontalOptions = LayoutOptions.StartAndExpand;
                 connectLabel.VerticalOptions = LayoutOptions.CenterAndExpand;
-                connectLabel.Text = QIcon.WIFI;
+                connectLabel.Text = IconConstants.Wifi;
                 connectLabel.FontSize = App.HeightUnit * 5;
                 connectLabel.TextColor = Color.LimeGreen;
 
                 deleteLabel.HorizontalOptions = LayoutOptions.CenterAndExpand;
                 deleteLabel.VerticalOptions = LayoutOptions.CenterAndExpand;
-                deleteLabel.Text = QIcon.TRASH_EMPTY;
+                deleteLabel.Text = IconConstants.Delete;
                 deleteLabel.FontSize = App.HeightUnit * 5;
                 deleteLabel.TextColor = Color.Red;
 
-                connectLabel.FontFamily = App.QFont;
-                deleteLabel.FontFamily = App.QFont;
+                connectLabel.FontFamily = (OnPlatform<string>)Application.Current.Resources["MaterialFontFamily"];
+                deleteLabel.FontFamily = (OnPlatform<string>)Application.Current.Resources["MaterialFontFamily"];
             }
 
 
diff --git a/qController.Standard/Classes/UI/Cells/QSelectedCueCell.cs b/qController.Standard/Classes/UI/Cells/QSelectedCueCell.cs
index 4ff3c50..2af0408 100644
--- a/qController.Standard/Classes/UI/Cells/QSelectedCueCell.cs
+++ b/qController.Standard/Classes/UI/Cells/QSelectedCueCell.cs
@@ -89,7 +89,7 @@ namespace qController.UI.Cells
 
             type = new Label { 
                 Text = QIcon.SPIN3, 
-                FontFamily = App.QFont,
+                FontFamily = (OnPlatform<string>)Application.Current.Resources["QFontFamily"],
                 VerticalTextAlignment = TextAlignment.Center,
                 HorizontalTextAlignment = TextAlignment.End,
                 FontSize = App.HeightUnit * 5
diff --git a/qController.Standard/Classes/UI/QCueGrid.cs b/qController.Standard/Classes/UI/QCueGrid.cs
index 3663042..21546ee 100644
--- a/qController.Standard/Classes/UI/QCueGrid.cs
+++ b/qController.Standard/Classes/UI/QCueGrid.cs
@@ -63,7 +63,7 @@ namespace qController.UI
 
             var cueTypeLabel = new Label
             {
-                FontFamily = App.QFont,
+                FontFamily = (OnPlatform<string>)Application.Current.Resources["QFontFamily"],
                 BindingContext = qCueViewModel,
                 HorizontalOptions = LayoutOptions.FillAndExpand,
                 HorizontalTextAlignment = TextAlignment.Start,
diff --git a/qController.Standard/Classes/UI/QNavBar.cs b/qController.Standard/Classes/UI/QNavBar.cs
index 9d0ce41..28b223a 100644
--- a/qController.Standard/Classes/UI/QNavBar.cs
+++ b/qController.Standard/Classes/UI/QNavBar.cs
@@ -1,4 +1,5 @@
-using Xamarin.Forms;
+using qController.Helpers;
+using Xamarin.Forms;
 
 namespace qController.UI
 {
@@ -33,14 +34,14 @@ namespace qController.UI
 
             menuButton = new Label
             {
-                FontFamily = App.QFont,
+                FontFamily = (OnPlatform<string>)Application.Current.Resources["MaterialFontFamily"],
                 HorizontalOptions = LayoutOptions.StartAndExpand,
                 VerticalOptions = LayoutOptions.FillAndExpand,
                 HorizontalTextAlignment = TextAlignment.Start,
                 VerticalTextAlignment = TextAlignment.Center,
                 Padding = 0,
                 Margin = new Thickness(10, 0, 0, 0),
-                Text = QIcon.MENU,
+                Text = IconConstants.Menu,
                 BackgroundColor = Color.Transparent
             };
 
diff --git a/qController.Standard/Classes/UI/QSelectedCueFrame.cs b/qController.Standard/Classes/UI/QSelectedCueFrame.cs
index 453820f..6146156 100644
--- a/qController.Standard/Classes/UI/QSelectedCueFrame.cs
+++ b/qController.Standard/Classes/UI/QSelectedCueFrame.cs
@@ -1,5 +1,7 @@
 using Acr.UserDialogs;
+using qController.Helpers;
 using qController.ViewModels;
+using Serilog;
 using Xamarin.Forms;
 
 namespace qController.UI
@@ -69,7 +71,7 @@ namespace qController.UI
                 Margin = 0,
                 Padding = new Thickness(0,0,15,0),
                 FontSize = App.HeightUnit * 4,
-                FontFamily = App.QFont
+                FontFamily = (OnPlatform<string>)Application.Current.Resources["QFontFamily"]
             };
             type.SetDynamicResource(Label.TextColorProperty, "PrimaryTextColor");
             type.SetBinding(Label.TextProperty, "type", BindingMode.OneWay);
diff --git a/qController.Standard/Classes/UI/QSelectedCueGrid.cs b/qController.Standard/Classes/UI/QSelectedCueGrid.cs
index afd02a6..21621f5 100644
--- a/qController.Standard/Classes/UI/QSelectedCueGrid.cs
+++ b/qController.Standard/Classes/UI/QSelectedCueGrid.cs
@@ -55,7 +55,7 @@ namespace qController.UI
                 Margin = 0,
                 Padding = 0,
                 FontSize = App.HeightUnit * 4,
-                FontFamily = App.QFont
+                FontFamily = (OnPlatform<string>)Application.Current.Resources["QFontFamily"]
             };
             type.SetBinding(Label.TextProperty, "type", BindingMode.OneWay);
             Children.Add(type, 4, 0);
diff --git a/qController.Standard/ViewModels/QWorkspaceViewModel.cs b/qController.Standard/ViewModels/QWorkspaceViewModel.cs
index df69a86..edd8f7a 100644
--- a/qController.Standard/ViewModels/QWorkspaceViewModel.cs
+++ b/qController.Standard/ViewModels/QWorkspaceViewModel.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Threading.Tasks;
-using QControlKit;
-using Xamarin.Forms;
+using QControlKit;
 
 namespace qController.ViewModels
 {
diff --git a/qController.Standard/Views/MenuPage.xaml.cs b/qController.Standard/Views/MenuPage.xaml.cs
index c22f331..c3ce408 100644
--- a/qController.Standard/Views/MenuPage.xaml.cs
+++ b/qController.Standard/Views/MenuPage.xaml.cs
@@ -2,6 +2,7 @@
 using Xamarin.Forms;
 using qController.QItems;
 using System;
+using qController.Helpers;
 
 namespace qController
 {
@@ -21,17 +22,21 @@ namespace qController
             {
                 var grid = new Grid {
                     Padding = 0,
+                    ColumnSpacing = 0,
                     ColumnDefinitions =
                     {
-                        new ColumnDefinition{Width = new GridLength(30)},
+                        new ColumnDefinition{Width = GridLength.Auto},
                         new ColumnDefinition { Width = GridLength.Star }
                     }
                 };
 
                 var icon = new Label {
-                    FontFamily = App.QFont,
+                    FontFamily = (OnPlatform<string>)Application.Current.Resources["MaterialFontFamily"],
                     HorizontalTextAlignment = TextAlignment.Center,
                     VerticalTextAlignment = TextAlignment.Center,
+                    VerticalOptions = LayoutOptions.FillAndExpand,
+                    HorizontalOptions = LayoutOptions.FillAndExpand,
+                    Margin = new Thickness(10,0,10,0),
                     FontSize = App.HeightUnit * 2.75
                 };
 
@@ -47,18 +52,6 @@ namespace qController
                 label.SetBinding(Label.TextProperty, "Title");
                 label.SetDynamicResource(Label.TextColorProperty, "PrimaryTextColor");
 
-                //switch (Device.RuntimePlatform)
-                //{
-                //    case Device.iOS:
-                //        listView.RowHeight = (int)(App.HeightUnit * 5);
-                //        label.FontSize = App.HeightUnit * 2.75;
-                //        break;
-                //    case Device.Android:
-                //        listView.RowHeight = (int)(App.HeightUnit * 5);
-                //        label.FontSize = App.HeightUnit * 2.75;
-                //        break;
-                //}
-
                 grid.Children.Add(icon);
                 grid.Children.Add(label, 1, 0);
                 return new ViewCell { View = grid };
@@ -81,11 +74,12 @@ namespace qController
             items.Add(new MenuPageItem
             {
                 Title = "Disconnect",
-                Icon = QIcon.CANCEL,
+                Icon = IconConstants.Close,
                 Command = "disconnect"
             });
             
         }
+
         public void ChangeToWorkspace(QOldWorkspace workspace)
         {
             for(int i = 0; i < workspace.data.Count; i++)
@@ -106,19 +100,19 @@ namespace qController
             items.Add(new MenuPageItem
             {
                 Title = "Scan Network",
-                Icon = "\uE800",
+                Icon = IconConstants.Magnify,
                 Command = "scan"
             });
             items.Add(new MenuPageItem
             {
                 Title = "Send Feedback",
-                Icon = QIcon.MAIL,
+                Icon = IconConstants.Email,
                 Command = "feedback"
             });
             items.Add(new MenuPageItem
             {
                 Title = "Support Project",
-                Icon = QIcon.DOLLAR,
+                Icon = IconConstants.CurrencyUsd,
                 Command = "support"
             });
         }