diff --git a/iOS/packages.config b/iOS/packages.config index 34e1091..58d929f 100644 --- a/iOS/packages.config +++ b/iOS/packages.config @@ -31,6 +31,7 @@ + @@ -62,6 +63,7 @@ + \ No newline at end of file diff --git a/iOS/qController.iOS.csproj b/iOS/qController.iOS.csproj index 40bba45..10f4b70 100644 --- a/iOS/qController.iOS.csproj +++ b/iOS/qController.iOS.csproj @@ -133,6 +133,9 @@ ..\packages\Xamarin.Forms.4.0.0.497661\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll + + ..\packages\Xamarin.Essentials.1.1.0\lib\xamarinios10\Xamarin.Essentials.dll + diff --git a/qController.Standard/Classes/Cell/QInstanceCell.cs b/qController.Standard/Classes/Cell/QInstanceCell.cs index 8033ac0..49d630e 100644 --- a/qController.Standard/Classes/Cell/QInstanceCell.cs +++ b/qController.Standard/Classes/Cell/QInstanceCell.cs @@ -26,8 +26,7 @@ namespace qController deleteLabel.GestureRecognizers.Add(deleteTapGesture); InitItems(); - - + //SET BINDINGS nameLabel.SetBinding(Label.TextProperty, new Binding("name")); @@ -63,11 +62,11 @@ namespace qController HorizontalOptions = LayoutOptions.FillAndExpand, Padding = 30, Margin = new Thickness(10,10,10,10), - CornerRadius=20 + CornerRadius=20, }; f.BackgroundColor = Color.FromHex("D8D8D8"); View = f; - + void InitItems() { nameLabel.HorizontalTextAlignment = TextAlignment.Center; diff --git a/qController.Standard/Pages/App.xaml.cs b/qController.Standard/Pages/App.xaml.cs index ef3cdfe..c84aea7 100644 --- a/qController.Standard/Pages/App.xaml.cs +++ b/qController.Standard/Pages/App.xaml.cs @@ -1,6 +1,6 @@ using Acr.UserDialogs; using Xamarin.Forms; - +using Xamarin.Essentials; namespace qController { public partial class App : Application @@ -9,7 +9,9 @@ namespace qController public static NavigationPage NavigationPage { get; private set; } public static RootPage rootPage; public static string QFont; - + public static DisplayInfo mainDisplayInfo; + public static double Height; + public static double Width; public static bool MenuIsPresented { get @@ -29,6 +31,11 @@ namespace qController /*MainPage = new NavigationPage(new QConnectionPage()); iNav = MainPage.Navigation;*/ + mainDisplayInfo = DeviceDisplay.MainDisplayInfo; + Height = mainDisplayInfo.Height / mainDisplayInfo.Density; + Width = mainDisplayInfo.Width / mainDisplayInfo.Density; + System.Console.WriteLine(Height); + System.Console.WriteLine(Width); switch (Device.RuntimePlatform) { case Device.iOS: diff --git a/qController.Standard/Pages/ControlPage.xaml b/qController.Standard/Pages/ControlPage.xaml index 76b8436..6479686 100644 --- a/qController.Standard/Pages/ControlPage.xaml +++ b/qController.Standard/Pages/ControlPage.xaml @@ -1,4 +1,4 @@ - + diff --git a/qController.Standard/Pages/ControlPage.xaml.cs b/qController.Standard/Pages/ControlPage.xaml.cs index 41af074..77630aa 100644 --- a/qController.Standard/Pages/ControlPage.xaml.cs +++ b/qController.Standard/Pages/ControlPage.xaml.cs @@ -73,11 +73,14 @@ 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; @@ -96,6 +99,8 @@ namespace qController qCell = new QSelectedCueCell(); + qCell.HeightRequest = Math.Max(App.Height * .20, 125); + sLayout.Children.Add(qCell); } diff --git a/qController.Standard/Pages/qConnectionPage.xaml b/qController.Standard/Pages/qConnectionPage.xaml index cc93395..a24bf1b 100644 --- a/qController.Standard/Pages/qConnectionPage.xaml +++ b/qController.Standard/Pages/qConnectionPage.xaml @@ -1,4 +1,4 @@ - + @@ -11,7 +11,6 @@