diff --git a/qController.Standard/Pages/ControlPage.xaml.cs b/qController.Standard/Pages/ControlPage.xaml.cs index ecd7f61..370435a 100644 --- a/qController.Standard/Pages/ControlPage.xaml.cs +++ b/qController.Standard/Pages/ControlPage.xaml.cs @@ -74,7 +74,6 @@ namespace qController NavigationPage.SetHasNavigationBar(this, false); topBar.BackgroundColor = Color.FromHex("71AEFF"); - topBar.HeightRequest = Math.Max(App.Height * .09, 65); BackgroundColor = Color.FromHex("4A4A4A"); @@ -83,12 +82,14 @@ namespace qController switch (Device.RuntimePlatform) { case Device.iOS: + topBar.HeightRequest = Math.Max(App.Height * .09, 65); menuButton.Margin = new Thickness(App.WidthUnit * 2, 0, 0, App.WidthUnit * 2); menuButton.FontSize = App.Height * .04; break; case Device.Android: + topBar.HeightRequest = App.Height * .08; menuButton.Margin = new Thickness(App.WidthUnit * 2, 0, 0, App.WidthUnit * 2); - menuButton.FontSize = App.Height * .04; + menuButton.FontSize = App.Height * .05; break; } var menuButtonGesture = new TapGestureRecognizer(); diff --git a/qController.Standard/Pages/qConnectionPage.xaml.cs b/qController.Standard/Pages/qConnectionPage.xaml.cs index 7c7a958..d3cfd4b 100644 --- a/qController.Standard/Pages/qConnectionPage.xaml.cs +++ b/qController.Standard/Pages/qConnectionPage.xaml.cs @@ -37,7 +37,6 @@ namespace qController private void InitGUI() { NavigationPage.SetHasNavigationBar(this, false); - topBar.HeightRequest = Math.Max(App.Height * .09, 65); lstView.ItemsSource = QStorage.qInstances; lstView.ItemTemplate = new DataTemplate(typeof(QInstanceCell)); @@ -54,13 +53,14 @@ namespace qController switch (Device.RuntimePlatform) { case Device.iOS: + topBar.HeightRequest = Math.Max(App.Height * .09, 65); menuButton.Margin = new Thickness(App.WidthUnit * 2, 0, 0, App.WidthUnit * 2); menuButton.FontSize = App.Height * .04; break; case Device.Android: - topBar.HeightRequest = Math.Max(App.Height * .09, 65); + topBar.HeightRequest = App.Height * .08; menuButton.Margin = new Thickness(App.WidthUnit * 2, 0, 0, App.WidthUnit * 2); - menuButton.FontSize = App.Height * .04; + menuButton.FontSize = App.Height * .05; break; }