From 7c14629227ff82a5ae88723e29598f67d6b39a62 Mon Sep 17 00:00:00 2001 From: Joel Wetzell Date: Sun, 18 Oct 2020 19:20:22 -0500 Subject: [PATCH] Styling Changes --- qController.Standard/App.xaml.cs | 2 +- .../Classes/UI/QSelectedCueFrame.cs | 2 +- qController.Standard/Views/MenuPage.xaml.cs | 37 +++++++++---------- qController.Standard/Views/WorkspacePage.xaml | 8 ++-- .../Views/WorkspacePage.xaml.cs | 6 +++ 5 files changed, 30 insertions(+), 25 deletions(-) diff --git a/qController.Standard/App.xaml.cs b/qController.Standard/App.xaml.cs index cc88676..014eca1 100644 --- a/qController.Standard/App.xaml.cs +++ b/qController.Standard/App.xaml.cs @@ -117,7 +117,7 @@ namespace qController private void SetLightResources() { - Resources["NavigationBarColor"] = Color.FromHex("#71AEFF"); + Resources["NavigationBarColor"] = Color.FromHex("#3089ff"); Resources["PageBackgroundColor"] = Color.LightGray; diff --git a/qController.Standard/Classes/UI/QSelectedCueFrame.cs b/qController.Standard/Classes/UI/QSelectedCueFrame.cs index 51b3a54..3d24a7b 100644 --- a/qController.Standard/Classes/UI/QSelectedCueFrame.cs +++ b/qController.Standard/Classes/UI/QSelectedCueFrame.cs @@ -83,7 +83,7 @@ namespace qController.UI HorizontalTextAlignment = TextAlignment.Center, VerticalTextAlignment = TextAlignment.Center, BackgroundColor = Color.Transparent, - FontSize = Device.GetNamedSize(NamedSize.Large, typeof(Label)) + FontSize = App.HeightUnit * 2.75 }; name.SetDynamicResource(Label.TextColorProperty, "PrimaryTextColor"); name.SetBinding(Label.TextProperty, "name", BindingMode.TwoWay); diff --git a/qController.Standard/Views/MenuPage.xaml.cs b/qController.Standard/Views/MenuPage.xaml.cs index 0bb254c..19635a6 100644 --- a/qController.Standard/Views/MenuPage.xaml.cs +++ b/qController.Standard/Views/MenuPage.xaml.cs @@ -17,11 +17,10 @@ namespace qController ChangeToHome(); listView.ItemsSource = items; - listView.RowHeight = (int)(App.HeightUnit * 6); listView.ItemTemplate = new DataTemplate(() => { var grid = new Grid { - Padding = new Thickness(5, 10), + Padding = 0, ColumnDefinitions = { new ColumnDefinition{Width = new GridLength(30)}, @@ -29,38 +28,36 @@ namespace qController } }; - var icon = new Label { FontFamily = App.QFont, HorizontalTextAlignment = TextAlignment.Center, VerticalTextAlignment = TextAlignment.Center, - FontSize = App.HeightUnit * 3 + FontSize = App.HeightUnit * 2.75 }; - icon.SetBinding(Label.TextProperty, "Icon"); icon.SetDynamicResource(Label.TextColorProperty, "IconTextColor"); var label = new Label { - VerticalOptions = LayoutOptions.FillAndExpand + VerticalOptions = LayoutOptions.FillAndExpand, + VerticalTextAlignment = TextAlignment.Center, + FontSize = App.HeightUnit * 2.75 + }; label.SetBinding(Label.TextProperty, "Title"); label.SetDynamicResource(Label.TextColorProperty, "PrimaryTextColor"); - if (label.Text == "Disconnect") - label.TextColor = Color.DarkRed; - - - switch (Device.RuntimePlatform) - { - case Device.iOS: - label.FontSize = App.HeightUnit * 3; - break; - case Device.Android: - label.FontSize = App.HeightUnit * 2.2; - break; - } - + //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); diff --git a/qController.Standard/Views/WorkspacePage.xaml b/qController.Standard/Views/WorkspacePage.xaml index 04ef26c..a4e2405 100644 --- a/qController.Standard/Views/WorkspacePage.xaml +++ b/qController.Standard/Views/WorkspacePage.xaml @@ -12,12 +12,13 @@ - + - + IsVisible="False" + Grid.Row="1"/> diff --git a/qController.Standard/Views/WorkspacePage.xaml.cs b/qController.Standard/Views/WorkspacePage.xaml.cs index e60c463..1982f12 100644 --- a/qController.Standard/Views/WorkspacePage.xaml.cs +++ b/qController.Standard/Views/WorkspacePage.xaml.cs @@ -109,6 +109,12 @@ namespace qController }).Wait(); } connectedWorkspace.valueForKey(cue, QOSCKey.PlaybackPositionId); //fetch playback position for cueList once all cue loading is done. + + Device.BeginInvokeOnMainThread(() => + { + selectedCueFrame.IsVisible = true; + cueListScrollView.IsVisible = true; + }); break; //only load first cue list with cues. } }