Switch up Font loading

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,

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;

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"];
             }
 
 

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

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,

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
             };
 

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);

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);