From c3acd358507f6a21bab8e2a22c9f5ee7744ad822 Mon Sep 17 00:00:00 2001 From: Joel Wetzell Date: Fri, 19 Jun 2020 17:21:31 -0500 Subject: [PATCH 01/41] Only check for master branch --- .github/workflows/main.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6b87da5..c842b14 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,8 +1,15 @@ name: Build Android and iOS -on: [push, pull_request] - +on: + # Trigger the workflow on push or pull request, + # but only for the master branch + push: + branches: + - master + pull_request: + branches: + - master jobs: Android: From 746fd924d34bd8115f1c3fb62a19fdf2e471c664 Mon Sep 17 00:00:00 2001 From: Joel Wetzell Date: Thu, 28 Jan 2021 12:39:31 -0600 Subject: [PATCH 02/41] Address warnings and move to FlyoutPage for Xamarin Forms 5 --- Droid/packages.config | 24 ++--- Droid/qController.Droid.csproj | 36 +++----- iOS/packages.config | 22 ++--- iOS/qController.iOS.csproj | 32 ++++--- .../Classes/Cell/QLevelsCell.cs | 92 +++++++++---------- .../Classes/Cell/QSelectedCueCell.cs | 4 +- .../Communication/SharpOSC/TCPClient.cs | 3 +- .../Communication/SharpOSC/UDPListener.cs | 3 +- qController.Standard/Pages/App.xaml.cs | 6 +- .../Pages/ControlPage.xaml.cs | 21 +++-- qController.Standard/Pages/RootPage.xaml | 9 +- qController.Standard/Pages/RootPage.xaml.cs | 15 +-- qController.Standard/qController.csproj | 10 +- 13 files changed, 135 insertions(+), 142 deletions(-) diff --git a/Droid/packages.config b/Droid/packages.config index 671b605..81e556f 100644 --- a/Droid/packages.config +++ b/Droid/packages.config @@ -2,16 +2,16 @@ - + - + - + - + @@ -45,11 +45,11 @@ - - - - - + + + + + @@ -118,7 +118,7 @@ - - - + + + \ No newline at end of file diff --git a/Droid/qController.Droid.csproj b/Droid/qController.Droid.csproj index f3e512e..c2d72cd 100644 --- a/Droid/qController.Droid.csproj +++ b/Droid/qController.Droid.csproj @@ -1,6 +1,6 @@  - + Debug AnyCPU @@ -75,7 +75,7 @@ False - ..\packages\Acr.UserDialogs.7.1.0.442\lib\monoandroid90\Acr.UserDialogs.dll + ..\packages\Acr.UserDialogs.7.1.0.475\lib\monoandroid90\Acr.UserDialogs.dll ..\packages\AndHUD.1.4.2\lib\MonoAndroid81\AndHUD.dll @@ -84,28 +84,28 @@ ..\packages\Newtonsoft.Json.12.0.3\lib\netstandard2.0\Newtonsoft.Json.dll - ..\packages\Serilog.2.9.0\lib\netstandard2.0\Serilog.dll + ..\packages\Serilog.2.10.0\lib\netstandard2.1\Serilog.dll ..\packages\Serilog.Sinks.Xamarin.0.2.0.64\lib\MonoAndroid403\Serilog.Sinks.Xamarin.dll - ..\packages\Splat.9.4.5\lib\netstandard2.0\Splat.dll + ..\packages\Splat.10.0.1\lib\netstandard2.0\Splat.dll - ..\packages\System.Reactive.4.4.1\lib\netstandard2.0\System.Reactive.dll + ..\packages\System.Reactive.5.0.0\lib\netstandard2.0\System.Reactive.dll - ..\packages\System.Reactive.Core.4.4.1\lib\netstandard2.0\System.Reactive.Core.dll + ..\packages\System.Reactive.Core.5.0.0\lib\netstandard2.0\System.Reactive.Core.dll - ..\packages\System.Reactive.Interfaces.4.4.1\lib\netstandard2.0\System.Reactive.Interfaces.dll + ..\packages\System.Reactive.Interfaces.5.0.0\lib\netstandard2.0\System.Reactive.Interfaces.dll - ..\packages\System.Reactive.Linq.4.4.1\lib\netstandard2.0\System.Reactive.Linq.dll + ..\packages\System.Reactive.Linq.5.0.0\lib\netstandard2.0\System.Reactive.Linq.dll - ..\packages\System.Reactive.PlatformServices.4.4.1\lib\netstandard2.0\System.Reactive.PlatformServices.dll + ..\packages\System.Reactive.PlatformServices.5.0.0\lib\netstandard2.0\System.Reactive.PlatformServices.dll ..\packages\Xamarin.Android.Arch.Core.Common.1.1.1.3\lib\monoandroid90\Xamarin.Android.Arch.Core.Common.dll @@ -225,25 +225,19 @@ ..\packages\Xamarin.Android.Support.ViewPager.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.ViewPager.dll - ..\packages\Xamarin.Essentials.1.5.3.2\lib\monoandroid90\Xamarin.Essentials.dll - - - ..\packages\Xamarin.Forms.4.6.0.847\lib\MonoAndroid90\FormsViewGroup.dll + ..\packages\Xamarin.Essentials.1.6.1\lib\monoandroid90\Xamarin.Essentials.dll - ..\packages\Xamarin.Forms.4.6.0.847\lib\MonoAndroid90\Xamarin.Forms.Core.dll - - - ..\packages\Xamarin.Forms.4.6.0.847\lib\MonoAndroid90\Xamarin.Forms.Platform.Android.dll + ..\packages\Xamarin.Forms.5.0.0.1931\lib\netstandard2.0\Xamarin.Forms.Core.dll - ..\packages\Xamarin.Forms.4.6.0.847\lib\MonoAndroid90\Xamarin.Forms.Platform.dll + ..\packages\Xamarin.Forms.5.0.0.1931\lib\netstandard2.0\Xamarin.Forms.Platform.dll - ..\packages\Xamarin.Forms.4.6.0.847\lib\MonoAndroid90\Xamarin.Forms.Xaml.dll + ..\packages\Xamarin.Forms.5.0.0.1931\lib\netstandard2.0\Xamarin.Forms.Xaml.dll - ..\packages\Zeroconf.3.3.16\lib\netstandard2.0\Zeroconf.dll + ..\packages\Zeroconf.3.4.2\lib\netstandard2.0\Zeroconf.dll @@ -317,5 +311,5 @@ - + \ No newline at end of file diff --git a/iOS/packages.config b/iOS/packages.config index 6fb472f..1dc27fe 100644 --- a/iOS/packages.config +++ b/iOS/packages.config @@ -1,14 +1,14 @@  - + - + - + @@ -42,11 +42,11 @@ - - - - - + + + + + @@ -75,8 +75,8 @@ - - + + - + \ No newline at end of file diff --git a/iOS/qController.iOS.csproj b/iOS/qController.iOS.csproj index 10828fd..ff79118 100644 --- a/iOS/qController.iOS.csproj +++ b/iOS/qController.iOS.csproj @@ -1,6 +1,6 @@  - + Debug iPhoneSimulator @@ -91,7 +91,7 @@ ..\packages\BTProgressHUD.1.3.2\lib\xamarinios10\BTProgressHUD.dll - ..\packages\Acr.UserDialogs.7.1.0.442\lib\xamarinios10\Acr.UserDialogs.dll + ..\packages\Acr.UserDialogs.7.1.0.475\lib\xamarinios10\Acr.UserDialogs.dll @@ -99,7 +99,7 @@ - ..\packages\Zeroconf.3.3.16\lib\netstandard2.0\Zeroconf.dll + ..\packages\Zeroconf.3.4.2\lib\netstandard2.0\Zeroconf.dll ..\packages\Newtonsoft.Json.12.0.3\lib\netstandard2.0\Newtonsoft.Json.dll @@ -108,34 +108,34 @@ ..\packages\Acr.Settings.9.0.1\lib\xamarinios10\Acr.Settings.dll - ..\packages\System.Reactive.4.4.1\lib\netstandard2.0\System.Reactive.dll + ..\packages\System.Reactive.5.0.0\lib\netstandard2.0\System.Reactive.dll - ..\packages\System.Reactive.Core.4.4.1\lib\netstandard2.0\System.Reactive.Core.dll + ..\packages\System.Reactive.Core.5.0.0\lib\netstandard2.0\System.Reactive.Core.dll - ..\packages\System.Reactive.Interfaces.4.4.1\lib\netstandard2.0\System.Reactive.Interfaces.dll + ..\packages\System.Reactive.Interfaces.5.0.0\lib\netstandard2.0\System.Reactive.Interfaces.dll - ..\packages\System.Reactive.Linq.4.4.1\lib\netstandard2.0\System.Reactive.Linq.dll + ..\packages\System.Reactive.Linq.5.0.0\lib\netstandard2.0\System.Reactive.Linq.dll - ..\packages\System.Reactive.PlatformServices.4.4.1\lib\netstandard2.0\System.Reactive.PlatformServices.dll + ..\packages\System.Reactive.PlatformServices.5.0.0\lib\netstandard2.0\System.Reactive.PlatformServices.dll - ..\packages\Xamarin.Forms.4.6.0.847\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll + ..\packages\Xamarin.Forms.5.0.0.1931\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll - ..\packages\Xamarin.Forms.4.6.0.847\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll + ..\packages\Xamarin.Forms.5.0.0.1931\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll - ..\packages\Xamarin.Forms.4.6.0.847\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll + ..\packages\Xamarin.Forms.5.0.0.1931\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll - ..\packages\Xamarin.Essentials.1.5.3.2\lib\xamarinios10\Xamarin.Essentials.dll + ..\packages\Xamarin.Essentials.1.6.1\lib\xamarinios10\Xamarin.Essentials.dll - ..\packages\Serilog.2.9.0\lib\netstandard2.0\Serilog.dll + ..\packages\Serilog.2.10.0\lib\netstandard2.1\Serilog.dll ..\packages\Serilog.Sinks.Xamarin.0.2.0.64\lib\Xamarin.iOS10\Serilog.Sinks.Xamarin.dll @@ -144,6 +144,10 @@ ..\packages\Xamarin.iOS.MaterialComponents.92.0.0\lib\Xamarin.iOS\MaterialComponents.dll + + ..\packages\Xamarin.Forms.5.0.0.1931\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll + + @@ -225,5 +229,5 @@ - + \ No newline at end of file diff --git a/qController.Standard/Classes/Cell/QLevelsCell.cs b/qController.Standard/Classes/Cell/QLevelsCell.cs index 1d6d04f..f3d83e7 100644 --- a/qController.Standard/Classes/Cell/QLevelsCell.cs +++ b/qController.Standard/Classes/Cell/QLevelsCell.cs @@ -9,11 +9,15 @@ namespace qController.Cell public List levels; public string activeCue; public Slider mainSlider; - public Slider leftSlider; - public Slider rightSlider; + //public Slider leftSlider; + //public Slider rightSlider; public Label mainLabel; - public Label rightLabel; - public Label leftLabel; + //public Label rightLabel; + //public Label leftLabel; + + public List sliders = new List(); + public List