diff --git a/Droid/packages.config b/Droid/packages.config index 0baee24..9c83f37 100644 --- a/Droid/packages.config +++ b/Droid/packages.config @@ -5,11 +5,11 @@ - + - + @@ -33,8 +33,9 @@ - + + @@ -60,7 +61,7 @@ - + @@ -88,6 +89,7 @@ - + + \ No newline at end of file diff --git a/Droid/qController.Droid.csproj b/Droid/qController.Droid.csproj index 7112e1c..1d871ca 100644 --- a/Droid/qController.Droid.csproj +++ b/Droid/qController.Droid.csproj @@ -1,6 +1,6 @@ - + Debug AnyCPU @@ -79,7 +79,7 @@ ..\packages\Acr.Settings.9.0.1\lib\monoandroid80\Acr.Settings.dll - ..\packages\Splat.7.0.8\lib\monoandroid81\Splat.dll + ..\packages\Splat.7.3.7\lib\monoandroid81\Splat.dll ..\packages\System.Reactive.4.1.5\lib\netstandard2.0\System.Reactive.dll @@ -151,24 +151,29 @@ ..\packages\Xamarin.Android.Support.v7.MediaRouter.28.0.0.1\lib\monoandroid81\Xamarin.Android.Support.v7.MediaRouter.dll - ..\packages\Xamarin.Forms.3.6.0.344457\lib\MonoAndroid81\FormsViewGroup.dll + ..\packages\Xamarin.Forms.4.0.0.497661\lib\MonoAndroid81\FormsViewGroup.dll - ..\packages\Xamarin.Forms.3.6.0.344457\lib\MonoAndroid81\Xamarin.Forms.Core.dll + ..\packages\Xamarin.Forms.4.0.0.497661\lib\MonoAndroid81\Xamarin.Forms.Core.dll - ..\packages\Xamarin.Forms.3.6.0.344457\lib\MonoAndroid81\Xamarin.Forms.Platform.Android.dll + ..\packages\Xamarin.Forms.4.0.0.497661\lib\MonoAndroid81\Xamarin.Forms.Platform.Android.dll - ..\packages\Xamarin.Forms.3.6.0.344457\lib\MonoAndroid81\Xamarin.Forms.Platform.dll + ..\packages\Xamarin.Forms.4.0.0.497661\lib\MonoAndroid81\Xamarin.Forms.Platform.dll - ..\packages\Xamarin.Forms.3.6.0.344457\lib\MonoAndroid81\Xamarin.Forms.Xaml.dll + ..\packages\Xamarin.Forms.4.0.0.497661\lib\MonoAndroid81\Xamarin.Forms.Xaml.dll ..\packages\Xamarin.Android.Support.CustomTabs.28.0.0.1\lib\monoandroid81\Xamarin.Android.Support.CustomTabs.dll + + ..\packages\Xamarin.Essentials.1.1.0\lib\monoandroid81\Xamarin.Essentials.dll + + + @@ -221,5 +226,5 @@ - + \ No newline at end of file diff --git a/qController.Standard/Classes/Cell/QInstanceCell.cs b/qController.Standard/Classes/Cell/QInstanceCell.cs index 49d630e..ca71f96 100644 --- a/qController.Standard/Classes/Cell/QInstanceCell.cs +++ b/qController.Standard/Classes/Cell/QInstanceCell.cs @@ -72,21 +72,22 @@ namespace qController nameLabel.HorizontalTextAlignment = TextAlignment.Center; nameLabel.VerticalTextAlignment = TextAlignment.End; nameLabel.FontAttributes = FontAttributes.Bold; - nameLabel.FontSize = 20; + nameLabel.FontSize = App.HeightUnit * 3; addressLabel.HorizontalTextAlignment = TextAlignment.Center; addressLabel.VerticalTextAlignment = TextAlignment.Start; + addressLabel.FontSize = App.HeightUnit * 2.5; connectLabel.HorizontalOptions = LayoutOptions.CenterAndExpand; connectLabel.VerticalOptions = LayoutOptions.CenterAndExpand; connectLabel.Text = QIcon.WIFI; - connectLabel.FontSize = 40; + connectLabel.FontSize = App.HeightUnit * 6; connectLabel.TextColor = Color.LimeGreen; deleteLabel.HorizontalOptions = LayoutOptions.CenterAndExpand; deleteLabel.VerticalOptions = LayoutOptions.CenterAndExpand; deleteLabel.Text = QIcon.TRASH_EMPTY; - deleteLabel.FontSize = 40; + deleteLabel.FontSize = App.HeightUnit * 6; deleteLabel.TextColor = Color.Red; connectLabel.FontFamily = App.QFont; diff --git a/qController.Standard/Classes/Cell/QSelectedCueCell.cs b/qController.Standard/Classes/Cell/QSelectedCueCell.cs index 1bd9641..7e7bca0 100644 --- a/qController.Standard/Classes/Cell/QSelectedCueCell.cs +++ b/qController.Standard/Classes/Cell/QSelectedCueCell.cs @@ -21,7 +21,7 @@ namespace qController RowDefinitions = { new RowDefinition{Height = GridLength.Star}, - new RowDefinition{Height = GridLength.Star} + new RowDefinition{Height = new GridLength(2, GridUnitType.Star)} }, ColumnDefinitions = { @@ -69,7 +69,7 @@ namespace qController number = new Label { Text = "", FontAttributes = FontAttributes.Bold, - FontSize = 30, + FontSize = App.HeightUnit * 5, Margin = new Thickness(5) }; @@ -77,7 +77,7 @@ namespace qController Text = "Loading Workspace....", FontAttributes = FontAttributes.Bold, HorizontalTextAlignment = TextAlignment.Center, - FontSize = 20, + FontSize = App.HeightUnit * 3.5, Margin = new Thickness(0) }; @@ -87,10 +87,13 @@ namespace qController VerticalTextAlignment = TextAlignment.Center, HorizontalTextAlignment = TextAlignment.End, Margin = new Thickness(5), - FontSize = 27 + FontSize = App.HeightUnit * 5 }; - notes = new Label { Text = "Loading Cue Lists and Playhead Position" }; + notes = new Label { + Text = "Loading Cue Lists and Playhead Position", + HorizontalTextAlignment = TextAlignment.Center + }; notes.HorizontalTextAlignment = TextAlignment.Center; notes.Margin = new Thickness(0, 0, 0, 10); diff --git a/qController.Standard/Pages/App.xaml.cs b/qController.Standard/Pages/App.xaml.cs index c84aea7..fe838ee 100644 --- a/qController.Standard/Pages/App.xaml.cs +++ b/qController.Standard/Pages/App.xaml.cs @@ -11,7 +11,9 @@ namespace qController public static string QFont; public static DisplayInfo mainDisplayInfo; public static double Height; - public static double Width; + public static double Width; + public static double HeightUnit; + public static double WidthUnit; public static bool MenuIsPresented { get @@ -33,7 +35,9 @@ namespace qController mainDisplayInfo = DeviceDisplay.MainDisplayInfo; Height = mainDisplayInfo.Height / mainDisplayInfo.Density; - Width = mainDisplayInfo.Width / mainDisplayInfo.Density; + Width = mainDisplayInfo.Width / mainDisplayInfo.Density; + HeightUnit = Height / 100.0; + WidthUnit = Width / 100.0; System.Console.WriteLine(Height); System.Console.WriteLine(Width); switch (Device.RuntimePlatform) diff --git a/qController.Standard/Pages/qConnectionPage.xaml b/qController.Standard/Pages/qConnectionPage.xaml index a24bf1b..a202508 100644 --- a/qController.Standard/Pages/qConnectionPage.xaml +++ b/qController.Standard/Pages/qConnectionPage.xaml @@ -1,4 +1,4 @@ - + @@ -10,7 +10,7 @@ -