diff --git a/Droid/Resources/values/styles.xml b/Droid/Resources/values/styles.xml index 7d6f9e5..06e53b3 100644 --- a/Droid/Resources/values/styles.xml +++ b/Droid/Resources/values/styles.xml @@ -15,13 +15,13 @@ #1976D2 - #FF4081 + #71AEFF true @style/AppCompatDialogStyle diff --git a/qController.Standard/Classes/UI/QNavBar.cs b/qController.Standard/Classes/UI/QNavBar.cs index 666f4c8..33003d1 100644 --- a/qController.Standard/Classes/UI/QNavBar.cs +++ b/qController.Standard/Classes/UI/QNavBar.cs @@ -4,7 +4,7 @@ namespace qController.UI { public class QNavBar : Grid { - public Button menuButton; + public Label menuButton; public Label instanceName; public QNavBar() @@ -23,15 +23,17 @@ namespace qController.UI new ColumnDefinition {Width = new GridLength(4,GridUnitType.Star)}, }; - menuButton = new Button + menuButton = new Label { FontFamily = App.QFont, HorizontalOptions = LayoutOptions.StartAndExpand, VerticalOptions = LayoutOptions.FillAndExpand, + HorizontalTextAlignment = TextAlignment.Start, + VerticalTextAlignment = TextAlignment.Center, Padding = 0, Margin = new Thickness(10,0,0,0), Text = QIcon.MENU, - CornerRadius = 0, + BackgroundColor = Color.Transparent, //BackgroundColor = Color.Red }; @@ -53,7 +55,9 @@ namespace qController.UI instanceName.SetDynamicResource(Label.TextColorProperty, "PrimaryTextColor"); - menuButton.Clicked += App.ShowMenu; + var menuButtonGesture = new TapGestureRecognizer(); + menuButtonGesture.Tapped += App.ShowMenu; + menuButton.GestureRecognizers.Add(menuButtonGesture); switch (Device.RuntimePlatform) {