diff --git a/qController.Standard/Classes/Communication/QController.cs b/qController.Standard/Classes/Communication/QController.cs
index 7a9946d..86da786 100644
--- a/qController.Standard/Classes/Communication/QController.cs
+++ b/qController.Standard/Classes/Communication/QController.cs
@@ -22,11 +22,11 @@ namespace qController
{
qClient = new QClient(address, port);
qUpdater = new QUpdater(this);
- qUpdater.Start();
+
//Connect();
//Connect();
//KickOff();
-
+
}
public void Connect(string workspace_id)
@@ -34,6 +34,7 @@ namespace qController
Console.WriteLine("QCONTROLLER CONNECT CALLED: " + workspace_id);
qWorkspace = new QWorkSpace();
qWorkspace.workspace_id = workspace_id;
+ qUpdater.Start();
qClient.sendStringUDP("/connect");
qClient.sendArgsUDP("/workspace/"+workspace_id+"/updates", 1);
qClient.sendAndReceiveString("/workspace/"+workspace_id+"/cueLists");
diff --git a/qController.Standard/Pages/ControlPage.xaml b/qController.Standard/Pages/ControlPage.xaml
index 6479686..bd30c0d 100644
--- a/qController.Standard/Pages/ControlPage.xaml
+++ b/qController.Standard/Pages/ControlPage.xaml
@@ -10,7 +10,8 @@
-
+
+
diff --git a/qController.Standard/Pages/ControlPage.xaml.cs b/qController.Standard/Pages/ControlPage.xaml.cs
index c3458b7..ecd7f61 100644
--- a/qController.Standard/Pages/ControlPage.xaml.cs
+++ b/qController.Standard/Pages/ControlPage.xaml.cs
@@ -8,7 +8,6 @@ namespace qController
public partial class ControlPage : ContentPage
{
QController qController;
- Label instanceName = new Label();
QSelectedCueCell qCell;
QSelectedCueOptionsCell qSelectedCueOptions;
Grid mainG;
@@ -74,23 +73,23 @@ namespace qController
App.rootPage.MenuPage.ChangeToControl();
NavigationPage.SetHasNavigationBar(this, false);
- instanceName.HorizontalTextAlignment = TextAlignment.Center;
- instanceName.HorizontalOptions = LayoutOptions.CenterAndExpand;
- instanceName.VerticalOptions = LayoutOptions.CenterAndExpand;
- topBar.Children.Add(instanceName, 1, 0);
topBar.BackgroundColor = Color.FromHex("71AEFF");
topBar.HeightRequest = Math.Max(App.Height * .09, 65);
BackgroundColor = Color.FromHex("4A4A4A");
menuButton.Text = QIcon.MENU;
+
switch (Device.RuntimePlatform)
{
case Device.iOS:
- menuButton.Margin = new Thickness(20, 35, 20, 10);
- instanceName.Margin = new Thickness(20, 35, 20, 10);
+ menuButton.Margin = new Thickness(App.WidthUnit * 2, 0, 0, App.WidthUnit * 2);
+ menuButton.FontSize = App.Height * .04;
+ break;
+ case Device.Android:
+ menuButton.Margin = new Thickness(App.WidthUnit * 2, 0, 0, App.WidthUnit * 2);
+ menuButton.FontSize = App.Height * .04;
break;
-
}
var menuButtonGesture = new TapGestureRecognizer();