jwetzell/qController
1
0
Fork 0
mirror of https://github.com/jwetzell/qController.git synced 2026-08-08 17:03:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Address warnings and move to FlyoutPage for Xamarin Forms 5

Browse Source
This commit is contained in:
Joel Wetzell
2021-01-28 12:39:31 -06:00
parent c3acd35850
commit 746fd924d3
13 changed files with 135 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Droid/packages.config
+12 -12
View File
@@ -2,16 +2,16 @@
<packages>
<package id="Acr.Settings" version="9.0.1" targetFramework="monoandroid90" />
<package id="Acr.Support" version="2.1.0" targetFramework="monoandroid90" />
<package id="Acr.UserDialogs" version="7.1.0.442" targetFramework="monoandroid90" />
<package id="Acr.UserDialogs" version="7.1.0.475" targetFramework="monoandroid90" />
<package id="AndHUD" version="1.4.2" targetFramework="monoandroid90" />
<package id="Microsoft.CSharp" version="4.7.0" targetFramework="monoandroid90" />
<package id="Microsoft.NETCore.Platforms" version="3.1.1" targetFramework="monoandroid90" />
<package id="Microsoft.NETCore.Platforms" version="5.0.0" targetFramework="monoandroid90" />
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="monoandroid90" />
<package id="NETStandard.Library" version="2.0.3" targetFramework="monoandroid90" />
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="monoandroid90" />
<package id="Serilog" version="2.9.0" targetFramework="monoandroid90" />
<package id="Serilog" version="2.10.0" targetFramework="monoandroid90" />
<package id="Serilog.Sinks.Xamarin" version="0.2.0.64" targetFramework="monoandroid90" />
<package id="Splat" version="9.4.5" targetFramework="monoandroid90" />
<package id="Splat" version="10.0.1" targetFramework="monoandroid90" />
<package id="System.AppContext" version="4.3.0" targetFramework="monoandroid90" />
<package id="System.Collections" version="4.3.0" targetFramework="monoandroid90" />
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="monoandroid90" />
@@ -45,11 +45,11 @@
<package id="System.Net.Sockets" version="4.3.0" targetFramework="monoandroid90" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="monoandroid90" />
<package id="System.ObjectModel" version="4.3.0" targetFramework="monoandroid90" />
<package id="System.Reactive" version="4.4.1" targetFramework="monoandroid90" />
<package id="System.Reactive.Core" version="4.4.1" targetFramework="monoandroid90" />
<package id="System.Reactive.Interfaces" version="4.4.1" targetFramework="monoandroid90" />
<package id="System.Reactive.Linq" version="4.4.1" targetFramework="monoandroid90" />
<package id="System.Reactive.PlatformServices" version="4.4.1" targetFramework="monoandroid90" />
<package id="System.Reactive" version="5.0.0" targetFramework="monoandroid90" />
<package id="System.Reactive.Core" version="5.0.0" targetFramework="monoandroid90" />
<package id="System.Reactive.Interfaces" version="5.0.0" targetFramework="monoandroid90" />
<package id="System.Reactive.Linq" version="5.0.0" targetFramework="monoandroid90" />
<package id="System.Reactive.PlatformServices" version="5.0.0" targetFramework="monoandroid90" />
<package id="System.Reflection" version="4.3.0" targetFramework="monoandroid90" />
<package id="System.Reflection.Extensions" version="4.3.0" targetFramework="monoandroid90" />
<package id="System.Reflection.Primitives" version="4.3.0" targetFramework="monoandroid90" />
@@ -118,7 +118,7 @@
<package id="Xamarin.Android.Support.Vector.Drawable" version="28.0.0.3" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.VersionedParcelable" version="28.0.0.3" targetFramework="monoandroid90" />
<package id="Xamarin.Android.Support.ViewPager" version="28.0.0.3" targetFramework="monoandroid90" />
<package id="Xamarin.Essentials" version="1.5.3.2" targetFramework="monoandroid90" />
<package id="Xamarin.Forms" version="4.6.0.847" targetFramework="monoandroid90" />
<package id="Zeroconf" version="3.3.16" targetFramework="monoandroid90" />
<package id="Xamarin.Essentials" version="1.6.1" targetFramework="monoandroid90" />
<package id="Xamarin.Forms" version="5.0.0.1931" targetFramework="monoandroid90" />
<package id="Zeroconf" version="3.4.2" targetFramework="monoandroid90" />
</packages>
Droid/qController.Droid.csproj
+15 -21
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\Xamarin.Forms.4.6.0.847\build\Xamarin.Forms.props" Condition="Exists('..\packages\Xamarin.Forms.4.6.0.847\build\Xamarin.Forms.props')" />
<Import Project="..\packages\Xamarin.Forms.5.0.0.1931\build\Xamarin.Forms.props" Condition="Exists('..\packages\Xamarin.Forms.5.0.0.1931\build\Xamarin.Forms.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -75,7 +75,7 @@
<Private>False</Private>
</Reference>
<Reference Include="Acr.UserDialogs">
<HintPath>..\packages\Acr.UserDialogs.7.1.0.442\lib\monoandroid90\Acr.UserDialogs.dll</HintPath>
<HintPath>..\packages\Acr.UserDialogs.7.1.0.475\lib\monoandroid90\Acr.UserDialogs.dll</HintPath>
</Reference>
<Reference Include="AndHUD">
<HintPath>..\packages\AndHUD.1.4.2\lib\MonoAndroid81\AndHUD.dll</HintPath>
@@ -84,28 +84,28 @@
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Serilog">
<HintPath>..\packages\Serilog.2.9.0\lib\netstandard2.0\Serilog.dll</HintPath>
<HintPath>..\packages\Serilog.2.10.0\lib\netstandard2.1\Serilog.dll</HintPath>
</Reference>
<Reference Include="Serilog.Sinks.Xamarin">
<HintPath>..\packages\Serilog.Sinks.Xamarin.0.2.0.64\lib\MonoAndroid403\Serilog.Sinks.Xamarin.dll</HintPath>
</Reference>
<Reference Include="Splat">
<HintPath>..\packages\Splat.9.4.5\lib\netstandard2.0\Splat.dll</HintPath>
<HintPath>..\packages\Splat.10.0.1\lib\netstandard2.0\Splat.dll</HintPath>
</Reference>
<Reference Include="System.Reactive">
<HintPath>..\packages\System.Reactive.4.4.1\lib\netstandard2.0\System.Reactive.dll</HintPath>
<HintPath>..\packages\System.Reactive.5.0.0\lib\netstandard2.0\System.Reactive.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Core">
<HintPath>..\packages\System.Reactive.Core.4.4.1\lib\netstandard2.0\System.Reactive.Core.dll</HintPath>
<HintPath>..\packages\System.Reactive.Core.5.0.0\lib\netstandard2.0\System.Reactive.Core.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Interfaces">
<HintPath>..\packages\System.Reactive.Interfaces.4.4.1\lib\netstandard2.0\System.Reactive.Interfaces.dll</HintPath>
<HintPath>..\packages\System.Reactive.Interfaces.5.0.0\lib\netstandard2.0\System.Reactive.Interfaces.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Linq">
<HintPath>..\packages\System.Reactive.Linq.4.4.1\lib\netstandard2.0\System.Reactive.Linq.dll</HintPath>
<HintPath>..\packages\System.Reactive.Linq.5.0.0\lib\netstandard2.0\System.Reactive.Linq.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.PlatformServices">
<HintPath>..\packages\System.Reactive.PlatformServices.4.4.1\lib\netstandard2.0\System.Reactive.PlatformServices.dll</HintPath>
<HintPath>..\packages\System.Reactive.PlatformServices.5.0.0\lib\netstandard2.0\System.Reactive.PlatformServices.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Arch.Core.Common">
<HintPath>..\packages\Xamarin.Android.Arch.Core.Common.1.1.1.3\lib\monoandroid90\Xamarin.Android.Arch.Core.Common.dll</HintPath>
@@ -225,25 +225,19 @@
<HintPath>..\packages\Xamarin.Android.Support.ViewPager.28.0.0.3\lib\monoandroid90\Xamarin.Android.Support.ViewPager.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Essentials">
<HintPath>..\packages\Xamarin.Essentials.1.5.3.2\lib\monoandroid90\Xamarin.Essentials.dll</HintPath>
</Reference>
<Reference Include="FormsViewGroup">
<HintPath>..\packages\Xamarin.Forms.4.6.0.847\lib\MonoAndroid90\FormsViewGroup.dll</HintPath>
<HintPath>..\packages\Xamarin.Essentials.1.6.1\lib\monoandroid90\Xamarin.Essentials.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Core">
<HintPath>..\packages\Xamarin.Forms.4.6.0.847\lib\MonoAndroid90\Xamarin.Forms.Core.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform.Android">
<HintPath>..\packages\Xamarin.Forms.4.6.0.847\lib\MonoAndroid90\Xamarin.Forms.Platform.Android.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.5.0.0.1931\lib\netstandard2.0\Xamarin.Forms.Core.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform">
<HintPath>..\packages\Xamarin.Forms.4.6.0.847\lib\MonoAndroid90\Xamarin.Forms.Platform.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.5.0.0.1931\lib\netstandard2.0\Xamarin.Forms.Platform.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Xaml">
<HintPath>..\packages\Xamarin.Forms.4.6.0.847\lib\MonoAndroid90\Xamarin.Forms.Xaml.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.5.0.0.1931\lib\netstandard2.0\Xamarin.Forms.Xaml.dll</HintPath>
</Reference>
<Reference Include="Zeroconf">
<HintPath>..\packages\Zeroconf.3.3.16\lib\netstandard2.0\Zeroconf.dll</HintPath>
<HintPath>..\packages\Zeroconf.3.4.2\lib\netstandard2.0\Zeroconf.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -317,5 +311,5 @@
<Import Project="..\packages\Xamarin.Android.Support.Vector.Drawable.28.0.0.3\build\monoandroid90\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Vector.Drawable.28.0.0.3\build\monoandroid90\Xamarin.Android.Support.Vector.Drawable.targets')" />
<Import Project="..\packages\Xamarin.Android.Support.VersionedParcelable.28.0.0.3\build\monoandroid90\Xamarin.Android.Support.VersionedParcelable.targets" Condition="Exists('..\packages\Xamarin.Android.Support.VersionedParcelable.28.0.0.3\build\monoandroid90\Xamarin.Android.Support.VersionedParcelable.targets')" />
<Import Project="..\packages\Xamarin.Android.Support.ViewPager.28.0.0.3\build\monoandroid90\Xamarin.Android.Support.ViewPager.targets" Condition="Exists('..\packages\Xamarin.Android.Support.ViewPager.28.0.0.3\build\monoandroid90\Xamarin.Android.Support.ViewPager.targets')" />
<Import Project="..\packages\Xamarin.Forms.4.6.0.847\build\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.4.6.0.847\build\Xamarin.Forms.targets')" />
<Import Project="..\packages\Xamarin.Forms.5.0.0.1931\build\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.5.0.0.1931\build\Xamarin.Forms.targets')" />
</Project>
iOS/packages.config
+11 -11
View File
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Acr.Settings" version="9.0.1" targetFramework="xamarinios10" />
<package id="Acr.UserDialogs" version="7.1.0.442" targetFramework="xamarinios10" />
<package id="Acr.UserDialogs" version="7.1.0.475" targetFramework="xamarinios10" />
<package id="BTProgressHUD" version="1.3.2" targetFramework="xamarinios10" />
<package id="Microsoft.CSharp" version="4.7.0" targetFramework="xamarinios10" />
<package id="Microsoft.NETCore.Platforms" version="3.1.1" targetFramework="xamarinios10" />
<package id="Microsoft.NETCore.Platforms" version="5.0.0" targetFramework="xamarinios10" />
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="xamarinios10" />
<package id="NETStandard.Library" version="2.0.3" targetFramework="xamarinios10" />
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="xamarinios10" />
<package id="Serilog" version="2.9.0" targetFramework="xamarinios10" />
<package id="Serilog" version="2.10.0" targetFramework="xamarinios10" />
<package id="Serilog.Sinks.Xamarin" version="0.2.0.64" targetFramework="xamarinios10" />
<package id="System.AppContext" version="4.3.0" targetFramework="xamarinios10" />
<package id="System.Collections" version="4.3.0" targetFramework="xamarinios10" />
@@ -42,11 +42,11 @@
<package id="System.Net.Sockets" version="4.3.0" targetFramework="xamarinios10" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="xamarinios10" />
<package id="System.ObjectModel" version="4.3.0" targetFramework="xamarinios10" />
<package id="System.Reactive" version="4.4.1" targetFramework="xamarinios10" />
<package id="System.Reactive.Core" version="4.4.1" targetFramework="xamarinios10" />
<package id="System.Reactive.Interfaces" version="4.4.1" targetFramework="xamarinios10" />
<package id="System.Reactive.Linq" version="4.4.1" targetFramework="xamarinios10" />
<package id="System.Reactive.PlatformServices" version="4.4.1" targetFramework="xamarinios10" />
<package id="System.Reactive" version="5.0.0" targetFramework="xamarinios10" />
<package id="System.Reactive.Core" version="5.0.0" targetFramework="xamarinios10" />
<package id="System.Reactive.Interfaces" version="5.0.0" targetFramework="xamarinios10" />
<package id="System.Reactive.Linq" version="5.0.0" targetFramework="xamarinios10" />
<package id="System.Reactive.PlatformServices" version="5.0.0" targetFramework="xamarinios10" />
<package id="System.Reflection" version="4.3.0" targetFramework="xamarinios10" />
<package id="System.Reflection.Extensions" version="4.3.0" targetFramework="xamarinios10" />
<package id="System.Reflection.Primitives" version="4.3.0" targetFramework="xamarinios10" />
@@ -75,8 +75,8 @@
<package id="System.Xml.ReaderWriter" version="4.3.1" targetFramework="xamarinios10" />
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="xamarinios10" />
<package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="xamarinios10" />
<package id="Xamarin.Essentials" version="1.5.3.2" targetFramework="xamarinios10" />
<package id="Xamarin.Forms" version="4.6.0.847" targetFramework="xamarinios10" />
<package id="Xamarin.Essentials" version="1.6.1" targetFramework="xamarinios10" />
<package id="Xamarin.Forms" version="5.0.0.1931" targetFramework="xamarinios10" />
<package id="Xamarin.iOS.MaterialComponents" version="92.0.0" targetFramework="xamarinios10" />
<package id="Zeroconf" version="3.3.16" targetFramework="xamarinios10" />
<package id="Zeroconf" version="3.4.2" targetFramework="xamarinios10" />
</packages>
iOS/qController.iOS.csproj
+18 -14
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\Xamarin.Forms.4.6.0.847\build\Xamarin.Forms.props" Condition="Exists('..\packages\Xamarin.Forms.4.6.0.847\build\Xamarin.Forms.props')" />
<Import Project="..\packages\Xamarin.Forms.5.0.0.1931\build\Xamarin.Forms.props" Condition="Exists('..\packages\Xamarin.Forms.5.0.0.1931\build\Xamarin.Forms.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
@@ -91,7 +91,7 @@
<HintPath>..\packages\BTProgressHUD.1.3.2\lib\xamarinios10\BTProgressHUD.dll</HintPath>
</Reference>
<Reference Include="Acr.UserDialogs">
<HintPath>..\packages\Acr.UserDialogs.7.1.0.442\lib\xamarinios10\Acr.UserDialogs.dll</HintPath>
<HintPath>..\packages\Acr.UserDialogs.7.1.0.475\lib\xamarinios10\Acr.UserDialogs.dll</HintPath>
</Reference>
<Reference Include="OpenTK-1.0" />
<Reference Include="System.Net.Http" />
@@ -99,7 +99,7 @@
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.IO.Compression" />
<Reference Include="Zeroconf">
<HintPath>..\packages\Zeroconf.3.3.16\lib\netstandard2.0\Zeroconf.dll</HintPath>
<HintPath>..\packages\Zeroconf.3.4.2\lib\netstandard2.0\Zeroconf.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
@@ -108,34 +108,34 @@
<HintPath>..\packages\Acr.Settings.9.0.1\lib\xamarinios10\Acr.Settings.dll</HintPath>
</Reference>
<Reference Include="System.Reactive">
<HintPath>..\packages\System.Reactive.4.4.1\lib\netstandard2.0\System.Reactive.dll</HintPath>
<HintPath>..\packages\System.Reactive.5.0.0\lib\netstandard2.0\System.Reactive.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Core">
<HintPath>..\packages\System.Reactive.Core.4.4.1\lib\netstandard2.0\System.Reactive.Core.dll</HintPath>
<HintPath>..\packages\System.Reactive.Core.5.0.0\lib\netstandard2.0\System.Reactive.Core.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Interfaces">
<HintPath>..\packages\System.Reactive.Interfaces.4.4.1\lib\netstandard2.0\System.Reactive.Interfaces.dll</HintPath>
<HintPath>..\packages\System.Reactive.Interfaces.5.0.0\lib\netstandard2.0\System.Reactive.Interfaces.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Linq">
<HintPath>..\packages\System.Reactive.Linq.4.4.1\lib\netstandard2.0\System.Reactive.Linq.dll</HintPath>
<HintPath>..\packages\System.Reactive.Linq.5.0.0\lib\netstandard2.0\System.Reactive.Linq.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.PlatformServices">
<HintPath>..\packages\System.Reactive.PlatformServices.4.4.1\lib\netstandard2.0\System.Reactive.PlatformServices.dll</HintPath>
<HintPath>..\packages\System.Reactive.PlatformServices.5.0.0\lib\netstandard2.0\System.Reactive.PlatformServices.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Core">
<HintPath>..\packages\Xamarin.Forms.4.6.0.847\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.5.0.0.1931\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform">
<HintPath>..\packages\Xamarin.Forms.4.6.0.847\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.5.0.0.1931\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Xaml">
<HintPath>..\packages\Xamarin.Forms.4.6.0.847\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.5.0.0.1931\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Essentials">
<HintPath>..\packages\Xamarin.Essentials.1.5.3.2\lib\xamarinios10\Xamarin.Essentials.dll</HintPath>
<HintPath>..\packages\Xamarin.Essentials.1.6.1\lib\xamarinios10\Xamarin.Essentials.dll</HintPath>
</Reference>
<Reference Include="Serilog">
<HintPath>..\packages\Serilog.2.9.0\lib\netstandard2.0\Serilog.dll</HintPath>
<HintPath>..\packages\Serilog.2.10.0\lib\netstandard2.1\Serilog.dll</HintPath>
</Reference>
<Reference Include="Serilog.Sinks.Xamarin">
<HintPath>..\packages\Serilog.Sinks.Xamarin.0.2.0.64\lib\Xamarin.iOS10\Serilog.Sinks.Xamarin.dll</HintPath>
@@ -144,6 +144,10 @@
<Reference Include="MaterialComponents">
<HintPath>..\packages\Xamarin.iOS.MaterialComponents.92.0.0\lib\Xamarin.iOS\MaterialComponents.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform.iOS">
<HintPath>..\packages\Xamarin.Forms.5.0.0.1931\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
</Reference>
<Reference Include="System.Numerics" />
</ItemGroup>
<ItemGroup>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json">
@@ -225,5 +229,5 @@
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
<Import Project="..\packages\BTProgressHUD.1.3.2\build\xamarin.ios10\BTProgressHud.targets" Condition="Exists('..\packages\BTProgressHUD.1.3.2\build\xamarin.ios10\BTProgressHud.targets')" />
<Import Project="..\packages\Xamarin.Forms.4.6.0.847\build\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.4.6.0.847\build\Xamarin.Forms.targets')" />
<Import Project="..\packages\Xamarin.Forms.5.0.0.1931\build\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.5.0.0.1931\build\Xamarin.Forms.targets')" />
</Project>
qController.Standard/Classes/Cell/QLevelsCell.cs
+46 -46
View File
@@ -9,11 +9,15 @@ namespace qController.Cell
public List<double> 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<Slider> sliders = new List<Slider>();
public List<Label> sliderLabels = new List<Label>();
public QLevelsCell()
{
Padding = new Thickness(5);
@@ -22,6 +26,8 @@ namespace qController.Cell
HasShadow = true;
BackgroundColor = Color.FromHex("D8D8D8");
IsVisible = false;
int numberOfChannelsVisible = 6;
//highlight for testing
//BackgroundColor = Color.Red;
@@ -31,14 +37,13 @@ namespace qController.Cell
Padding = new Thickness(0),
RowDefinitions = {
new RowDefinition{Height = GridLength.Star},
new RowDefinition{Height = GridLength.Star},
new RowDefinition{Height = GridLength.Star}
},
ColumnDefinitions = {
new ColumnDefinition{Width = new GridLength(1,GridUnitType.Star)},
new ColumnDefinition{Width = new GridLength(1,GridUnitType.Star)},
new ColumnDefinition{Width = new GridLength(1,GridUnitType.Star)},
new ColumnDefinition{Width = new GridLength(1,GridUnitType.Star)},
new ColumnDefinition{Width = new GridLength(1,GridUnitType.Star)},
new ColumnDefinition{Width = new GridLength(1,GridUnitType.Star)}
}
};
@@ -50,52 +55,48 @@ namespace qController.Cell
};
leftSlider = new Slider
for (int i = 0; i < numberOfChannelsVisible; i++)
{
Minimum = -60,
Maximum = 12
};
var sliderToAdd = new Slider
{
Minimum = -60,
Maximum = 12
};
var labelToAdd = new Label
{
Text = $"{i + 1}:",
VerticalTextAlignment = TextAlignment.Center,
HorizontalTextAlignment = TextAlignment.Center
};
rightSlider = new Slider
{
Minimum = -60,
Maximum = 12
};
var valueLabelToAdd = new Label
{
Text = "",
VerticalTextAlignment = TextAlignment.Center,
HorizontalTextAlignment = TextAlignment.Center
};
mainG.RowDefinitions.Add(new RowDefinition { Height = GridLength.Star });
mainG.Children.Add(sliderToAdd, 1, i + 1);
Grid.SetColumnSpan(sliderToAdd, 4);
mainG.Children.Add(labelToAdd, 0, i + 1);
mainG.Children.Add(valueLabelToAdd, 5, i + 1);
sliders.Add(sliderToAdd);
sliderLabels.Add(valueLabelToAdd);
}
mainLabel = new Label
{
Text = "MAIN:",
VerticalTextAlignment = TextAlignment.Center,
HorizontalTextAlignment = TextAlignment.Center
};
leftLabel = new Label
{
Text = "1:",
VerticalTextAlignment = TextAlignment.Center,
HorizontalTextAlignment = TextAlignment.Center
};
rightLabel = new Label
{
Text = "2:",
Text = "M:",
VerticalTextAlignment = TextAlignment.Center,
HorizontalTextAlignment = TextAlignment.Center
};
mainG.Children.Add(mainSlider, 1, 0);
mainG.Children.Add(leftSlider, 1, 1);
mainG.Children.Add(rightSlider, 1, 2);
Grid.SetColumnSpan(mainSlider, 4);
Grid.SetColumnSpan(leftSlider, 4);
Grid.SetColumnSpan(rightSlider, 4);
mainG.Children.Add(mainLabel, 0, 0);
mainG.Children.Add(leftLabel, 0, 1);
mainG.Children.Add(rightLabel, 0, 2);
Content = mainG;
Margin = new Thickness(10);
@@ -108,14 +109,13 @@ namespace qController.Cell
{
mainSlider.Value = levels[0];
}
if (leftSlider != null)
for (int i = 0; i < sliders.Count; i++)
{
leftSlider.Value = levels[1];
}
if (rightSlider != null)
{
rightSlider.Value = levels[2];
Slider slider = sliders[i];
Label label = sliderLabels[i];
slider.Value = levels[i + 1];
label.Text = $"{levels[i + 1]}";
}
}
}
}
}
qController.Standard/Classes/Cell/QSelectedCueCell.cs
+1 -3
View File
@@ -229,9 +229,7 @@ namespace qController.Cell
protected virtual void OnSelectedCueEdited(string prop, string value)
{
if (SelectedCueEdited != null)
SelectedCueEdited(this, new CueEditArgs() { CueID = activeCue.uniqueID, Property = prop, NewValue = value }) ;
SelectedCueEdited?.Invoke(this, new CueEditArgs() { CueID = activeCue.uniqueID, Property = prop, NewValue = value });
}
}
}
qController.Standard/Classes/Communication/SharpOSC/TCPClient.cs
+2 -1
View File
@@ -4,6 +4,7 @@ using System.Linq;
using System.Text;
using System.Net.Sockets;
using System.Threading;
using Serilog;
namespace SharpOSC
{
@@ -124,7 +125,7 @@ namespace SharpOSC
}
} catch(Exception e)
{
//Console.WriteLine("TCPSENDER - Receive Exception: " + e.ToString());
Log.Debug("TCPClient - Receive Exception: " + e.ToString());
}
}
qController.Standard/Classes/Communication/SharpOSC/UDPListener.cs
+2 -1
View File
@@ -77,8 +77,9 @@ namespace SharpOSC
bytes = receivingUdpClient.EndReceive(result, ref RemoteIpEndPoint);
}
catch (ObjectDisposedException e)
{
{
// Ignore if disposed. This happens when closing the listener
Log.Debug(e.ToString());
}
// Process bytes
qController.Standard/Pages/App.xaml.cs
+1 -5
View File
@@ -52,13 +52,9 @@ namespace qController
}
var menuPage = new MenuPage();
rootPage = new RootPage();
NavigationPage = new NavigationPage(new QConnectionPage());
rootPage.Master = menuPage;
rootPage.Detail = NavigationPage;
rootPage.Detail = new NavigationPage(new QConnectionPage());
MainPage = rootPage;
rootPage.Init();
}
public static void showToast(string message)
qController.Standard/Pages/ControlPage.xaml.cs
+12 -9
View File
@@ -176,14 +176,17 @@ namespace qController
{
qController.qClient.sendTCP(workspace_prefix + "/cue_id/" + qLevelsCell.activeCue + "/sliderLevel/0", (float)args.NewValue);
};
qLevelsCell.leftSlider.ValueChanged += (sender, args) =>
for (int i = 0; i < qLevelsCell.sliders.Count; i++)
{
qController.qClient.sendTCP(workspace_prefix + "/cue_id/" + qLevelsCell.activeCue + "/sliderLevel/1", (float)args.NewValue);
};
qLevelsCell.rightSlider.ValueChanged += (sender, args) =>
{
qController.qClient.sendTCP(workspace_prefix + "/cue_id/" + qLevelsCell.activeCue + "/sliderLevel/2", (float)args.NewValue);
};
var channel = i + 1;
Log.Debug("Setting value changed for channel: " + channel);
qLevelsCell.sliders[i].ValueChanged += (sender, args) =>
{
qLevelsCell.sliderLabels[channel - 1].Text = $"{args.NewValue}";
qController.qClient.sendTCP(workspace_prefix + "/cue_id/" + qLevelsCell.activeCue + "/sliderLevel/" + channel, (float)args.NewValue);
};
}
showLevelsButton = new QLevelsButton();
@@ -200,12 +203,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(qLevelsCell, new Rectangle(0, 0.63, 1, 0.35));
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.45, 0.8, 0.25));
AbsoluteLayout.SetLayoutBounds(qLevelsCell, new Rectangle(0, 0.63, 1, 0.25));
AbsoluteLayout.SetLayoutBounds(showLevelsButton, new Rectangle(0.02, 0.39, App.HeightUnit * 8, App.HeightUnit * 8));
break;
}
qController.Standard/Pages/RootPage.xaml
+5 -4
View File
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<MasterDetailPage xmlns="http://xamarin.com/schemas/2014/forms" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" x:Class="qController.RootPage" xmlns:pages="clr-namespace:qController">
</MasterDetailPage>
<FlyoutPage xmlns="http://xamarin.com/schemas/2014/forms"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="qController.RootPage">
</FlyoutPage>
qController.Standard/Pages/RootPage.xaml.cs
+5 -10
View File
@@ -12,7 +12,7 @@ namespace qController
}
}
public partial class RootPage : MasterDetailPage
public partial class RootPage : FlyoutPage
{
public MenuPage MenuPage;
public delegate void MenuItemSelectedHandler(object source, MenuEventArgs args);
@@ -21,14 +21,10 @@ namespace qController
public RootPage()
{
InitializeComponent();
}
public void Init()
{
MenuPage = (MenuPage)Master;
MenuPage = new MenuPage();
MenuPage.setItemSelected(OnItemSelected);
Flyout = MenuPage;
}
void OnItemSelected(object sender, SelectedItemChangedEventArgs e)
@@ -38,8 +34,7 @@ namespace qController
{
MenuPage.clearSelectedItem();
IsPresented = false;
if (MenuItemSelected != null)
MenuItemSelected(this, new MenuEventArgs { Command = item.Command });
MenuItemSelected?.Invoke(this, new MenuEventArgs { Command = item.Command });
}
}
}
qController.Standard/qController.csproj
+5 -5
View File
@@ -55,13 +55,13 @@
</Compile>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Acr.UserDialogs" Version="7.1.0.442" />
<PackageReference Include="Zeroconf" Version="3.3.16" />
<PackageReference Include="Xamarin.Forms" Version="4.6.0.847" />
<PackageReference Include="Acr.UserDialogs" Version="7.1.0.475" />
<PackageReference Include="Zeroconf" Version="3.4.2" />
<PackageReference Include="Xamarin.Forms" Version="5.0.0.1931" />
<PackageReference Include="Acr.Settings" Version="9.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
<PackageReference Include="Serilog" Version="2.9.0" />
<PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
<PackageReference Include="Serilog" Version="2.10.0" />
</ItemGroup>
<ItemGroup>
<None Remove="App.xaml" />