From 4938a0a0b33934573dc88ba3f3d2ce45b19967ce Mon Sep 17 00:00:00 2001
From: Joel Wetzell <jwetzell@yahoo.com>
Date: Wed, 17 Jul 2019 07:33:51 -0500
Subject: [PATCH] Android v1.0.7 / iOS v2.0.7

---
 Droid/Properties/AndroidManifest.xml          |  2 +-
 .../Classes/Cell/QLevelsCell.cs               |  4 ++--
 qController.Standard/Pages/ControlPage.xaml   |  4 ++--
 .../Pages/ControlPage.xaml.cs                 | 20 +++++++++++++------
 .../Pages/qConnectionPage.xaml.cs             |  2 +-
 5 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/Droid/Properties/AndroidManifest.xml b/Droid/Properties/AndroidManifest.xml
index c483e0c..a8f7809 100644
--- a/Droid/Properties/AndroidManifest.xml
+++ b/Droid/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="23" android:versionName="1.0.6" package="com.jwetzell.qlabcontroller">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="24" android:versionName="1.0.7" package="com.jwetzell.qlabcontroller">
 	<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="26" />
 	<uses-permission android:name="android.permission.INTERNET" />
 	<application android:label="qController" android:icon="@drawable/icon"></application>
diff --git a/qController.Standard/Classes/Cell/QLevelsCell.cs b/qController.Standard/Classes/Cell/QLevelsCell.cs
index 26d906d..07da1a2 100644
--- a/qController.Standard/Classes/Cell/QLevelsCell.cs
+++ b/qController.Standard/Classes/Cell/QLevelsCell.cs
@@ -74,14 +74,14 @@ namespace qController
 
             leftLabel = new Label
             {
-                Text = "0:",
+                Text = "1:",
                 VerticalTextAlignment = TextAlignment.Center,
                 HorizontalTextAlignment = TextAlignment.Center
             };
 
             rightLabel = new Label
             {
-                Text = "1:",
+                Text = "2:",
                 VerticalTextAlignment = TextAlignment.Center,
                 HorizontalTextAlignment = TextAlignment.Center
             };
diff --git a/qController.Standard/Pages/ControlPage.xaml b/qController.Standard/Pages/ControlPage.xaml
index 1b04f29..625a8fd 100644
--- a/qController.Standard/Pages/ControlPage.xaml
+++ b/qController.Standard/Pages/ControlPage.xaml
@@ -8,10 +8,10 @@
               </Grid.RowDefinitions>
               <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="4*" />
               </Grid.ColumnDefinitions>
               <Label x:Name = "menuButton" FontFamily = "{StaticResource qfont}"  HorizontalOptions = "Start" VerticalOptions="End" Margin="20,10,20,10" Grid.Row="0" Grid.Column="0" FontSize="25" Text="&#xF0C9;"/>
-              <Label x:Name = "instanceName" HorizontalTextAlignment="Center" HorizontalOptions = "CenterAndExpand" VerticalOptions="End" Margin="20,10,20,10" Grid.Row="0" Grid.Column="1"/>
+              <Label x:Name = "instanceName" HorizontalTextAlignment="End" HorizontalOptions = "FillAndExpand" VerticalOptions="End" Margin="20,10,20,10" Grid.Row="0" Grid.Column="1"/>
             </Grid>
         </AbsoluteLayout>
 	</ContentPage.Content>
diff --git a/qController.Standard/Pages/ControlPage.xaml.cs b/qController.Standard/Pages/ControlPage.xaml.cs
index f6016b6..f867073 100644
--- a/qController.Standard/Pages/ControlPage.xaml.cs
+++ b/qController.Standard/Pages/ControlPage.xaml.cs
@@ -26,7 +26,7 @@ namespace qController
             App.rootPage.MenuItemSelected += OnMenuItemSelected;
 
             instanceName.Text = name;
-
+            
             InitGUI();
 
             qController.KickOff();
@@ -75,12 +75,14 @@ namespace qController
             NavigationPage.SetHasNavigationBar(this, false);
 
             BackgroundColor = Color.FromHex("4A4A4A");
-
             qCell = new QSelectedCueCell();
 
             qCell.SelectedCueEdited += OnSelectedCueEdited;
-
+            
             AbsoluteLayout.SetLayoutFlags(qCell, AbsoluteLayoutFlags.All);
+
+            instanceName.FontSize = App.HeightUnit * 3;
+            
             switch (Device.RuntimePlatform)
             {
                 case Device.iOS:
@@ -159,12 +161,12 @@ namespace qController
                 case Device.iOS:
                     AbsoluteLayout.SetLayoutBounds(qControlsBlock, new Rectangle(0, 0.53, 1, 0.25));
                     AbsoluteLayout.SetLayoutBounds(qLevelsCell, new Rectangle(0.9,0.40,0.8,0.25));
-                    AbsoluteLayout.SetLayoutBounds(showLevelsButton, new Rectangle(0.04, 0.34, App.HeightUnit * 8, App.HeightUnit * 8));
+                    AbsoluteLayout.SetLayoutBounds(showLevelsButton, new Rectangle(0.02, 0.34, App.HeightUnit * 8, App.HeightUnit * 8));
                     break;
                 case Device.Android:
                     AbsoluteLayout.SetLayoutBounds(qControlsBlock, new Rectangle(0, 0.58, 1, 0.25));
-                    AbsoluteLayout.SetLayoutBounds(qLevelsCell, new Rectangle(0.9, 0.40, 0.8, 0.25));
-                    AbsoluteLayout.SetLayoutBounds(showLevelsButton, new Rectangle(0.04, 0.39, App.HeightUnit * 8, App.HeightUnit * 8));
+                    AbsoluteLayout.SetLayoutBounds(qLevelsCell, new Rectangle(0.9, 0.45, 0.8, 0.25));
+                    AbsoluteLayout.SetLayoutBounds(showLevelsButton, new Rectangle(0.02, 0.39, App.HeightUnit * 8, App.HeightUnit * 8));
                     break;
             }
 
@@ -229,7 +231,10 @@ namespace qController
                     if (cue.levels != null)
                         showLevelsButton.IsVisible = true;
                     else
+                    {
                         showLevelsButton.IsVisible = false;
+                        qLevelsCell.IsVisible = false;
+                    }
                     qCell.UpdateSelectedCue(cue);
                 });
             }
@@ -255,7 +260,10 @@ namespace qController
                     if (args.Cue.levels != null)
                         showLevelsButton.IsVisible = true;
                     else
+                    {
                         showLevelsButton.IsVisible = false;
+                        qLevelsCell.IsVisible = false;
+                    }
                     qCell.UpdateSelectedCue(args.Cue);
                     if(qLevelsCell != null)
                     {
diff --git a/qController.Standard/Pages/qConnectionPage.xaml.cs b/qController.Standard/Pages/qConnectionPage.xaml.cs
index f211b9f..1623b39 100644
--- a/qController.Standard/Pages/qConnectionPage.xaml.cs
+++ b/qController.Standard/Pages/qConnectionPage.xaml.cs
@@ -31,7 +31,7 @@ namespace qController
             }
             else if (args.Command == "feedback")
             {
-                Console.WriteLine("Give Feedback selected");
+                Device.OpenUri(new Uri("mailto:jwetzell1996@gmail.com"));
             }
             else if(args.Command == "support")
             {