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

* Info.plist:

Browse Source 
* packages.config:
* qController.iOS.csproj:
* qController.Droid.csproj:
* AndroidManifest.xml:
* qController.csproj: Update Packages

* ControlPage.xaml.cs:
* QLevelsCell.cs: Revert multi level sliders...ugh
This commit is contained in:
Joel Wetzell
2021-04-29 01:00:59 -05:00
parent 0621275605
commit d391e6a688
8 changed files with 106 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Droid/Properties/AndroidManifest.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="31" android:versionName="1.6.1" package="com.jwetzell.qlabcontroller" android:installLocation="auto">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="32" android:versionName="1.6.2" package="com.jwetzell.qlabcontroller" android:installLocation="auto">
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="29" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
Droid/packages.config
+12 -10
View File
@@ -11,8 +11,8 @@
<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="11.0.1" targetFramework="monoandroid10.0" />
<package id="Square.OkHttp3" version="3.12.3" targetFramework="monoandroid10.0" />
<package id="Square.OkIO" version="1.15.0" targetFramework="monoandroid10.0" />
<package id="Square.OkHttp3" version="4.9.0" targetFramework="monoandroid10.0" />
<package id="Square.OkIO" version="2.8.0" targetFramework="monoandroid10.0" />
<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" />
@@ -171,17 +171,19 @@
<package id="Xamarin.Build.Download" version="0.10.0" targetFramework="monoandroid10.0" />
<package id="Xamarin.Essentials" version="1.6.1" targetFramework="monoandroid10.0" />
<package id="Xamarin.Forms" version="5.0.0.2012" targetFramework="monoandroid10.0" />
<package id="Xamarin.Google.Android.DataTransport.TransportApi" version="2.2.0" targetFramework="monoandroid10.0" />
<package id="Xamarin.Google.Android.DataTransport.TransportBackendCct" version="2.2.3" targetFramework="monoandroid10.0" />
<package id="Xamarin.Google.Android.DataTransport.TransportRuntime" version="2.2.3" targetFramework="monoandroid10.0" />
<package id="Xamarin.Google.Android.DataTransport.TransportApi" version="2.2.1" targetFramework="monoandroid10.0" />
<package id="Xamarin.Google.Android.DataTransport.TransportBackendCct" version="2.3.3" targetFramework="monoandroid10.0" />
<package id="Xamarin.Google.Android.DataTransport.TransportRuntime" version="2.2.6" targetFramework="monoandroid10.0" />
<package id="Xamarin.Google.Android.Material" version="1.3.0.1" targetFramework="monoandroid10.0" />
<package id="Xamarin.Google.AutoValue.Annotations" version="1.6.5" targetFramework="monoandroid10.0" />
<package id="Xamarin.Google.Dagger" version="2.25.2.1" targetFramework="monoandroid10.0" />
<package id="Xamarin.Google.AutoValue.Annotations" version="1.6.6" targetFramework="monoandroid10.0" />
<package id="Xamarin.Google.Dagger" version="2.27.0" targetFramework="monoandroid10.0" />
<package id="Xamarin.Google.Guava.ListenableFuture" version="1.0.0.2" targetFramework="monoandroid10.0" />
<package id="Xamarin.GooglePlayServices.Base" version="117.1.0" targetFramework="monoandroid10.0" />
<package id="Xamarin.GooglePlayServices.Basement" version="117.2.1" targetFramework="monoandroid10.0" />
<package id="Xamarin.GooglePlayServices.Basement" version="117.6.0" targetFramework="monoandroid10.0" />
<package id="Xamarin.GooglePlayServices.Stats" version="117.0.0" targetFramework="monoandroid10.0" />
<package id="Xamarin.GooglePlayServices.Tasks" version="117.0.2" targetFramework="monoandroid10.0" />
<package id="Xamarin.GooglePlayServices.Tasks" version="117.2.1" targetFramework="monoandroid10.0" />
<package id="Xamarin.JavaX.Inject" version="1.0.0" targetFramework="monoandroid10.0" />
<package id="Xamarin.Jetbrains.Annotations" version="13.0.0.3" targetFramework="monoandroid10.0" />
<package id="Xamarin.Kotlin.StdLib" version="1.4.20" targetFramework="monoandroid10.0" />
<package id="Xamarin.Kotlin.StdLib.Common" version="1.4.20" targetFramework="monoandroid10.0" />
<package id="Zeroconf" version="3.4.2" targetFramework="monoandroid90" />
</packages>
Droid/qController.Droid.csproj
+24 -11
View File
@@ -31,6 +31,7 @@
<AndroidSupportedAbis>x86;armeabi-v7a;arm64-v8a;x86_64</AndroidSupportedAbis>
<MandroidI18n>
</MandroidI18n>
<EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -394,28 +395,28 @@
<HintPath>..\packages\Xamarin.AndroidX.ConstraintLayout.2.0.4.2\lib\monoandroid90\Xamarin.AndroidX.ConstraintLayout.dll</HintPath>
</Reference>
<Reference Include="Square.OkIO">
<HintPath>..\packages\Square.OkIO.1.15.0\lib\monoandroid44\Square.OkIO.dll</HintPath>
<HintPath>..\packages\Square.OkIO.2.8.0\lib\monoandroid90\Square.OkIO.dll</HintPath>
</Reference>
<Reference Include="Square.OkHttp3">
<HintPath>..\packages\Square.OkHttp3.3.12.3\lib\monoandroid44\Square.OkHttp3.dll</HintPath>
<HintPath>..\packages\Square.OkHttp3.4.9.0\lib\monoandroid10.0\Square.OkHttp3.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Google.Android.DataTransport.TransportApi">
<HintPath>..\packages\Xamarin.Google.Android.DataTransport.TransportApi.2.2.0\lib\monoandroid90\Xamarin.Google.Android.DataTransport.TransportApi.dll</HintPath>
<HintPath>..\packages\Xamarin.Google.Android.DataTransport.TransportApi.2.2.1\lib\monoandroid90\Xamarin.Google.Android.DataTransport.TransportApi.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Google.Android.DataTransport.TransportBackendCct">
<HintPath>..\packages\Xamarin.Google.Android.DataTransport.TransportBackendCct.2.2.3\lib\monoandroid90\Xamarin.Google.Android.DataTransport.TransportBackendCct.dll</HintPath>
<HintPath>..\packages\Xamarin.Google.Android.DataTransport.TransportBackendCct.2.3.3\lib\monoandroid90\Xamarin.Google.Android.DataTransport.TransportBackendCct.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Google.AutoValue.Annotations">
<HintPath>..\packages\Xamarin.Google.AutoValue.Annotations.1.6.5\lib\monoandroid80\Xamarin.Google.AutoValue.Annotations.dll</HintPath>
<HintPath>..\packages\Xamarin.Google.AutoValue.Annotations.1.6.6\lib\monoandroid80\Xamarin.Google.AutoValue.Annotations.dll</HintPath>
</Reference>
<Reference Include="Xamarin.GooglePlayServices.Basement">
<HintPath>..\packages\Xamarin.GooglePlayServices.Basement.117.2.1\lib\monoandroid90\Xamarin.GooglePlayServices.Basement.dll</HintPath>
<HintPath>..\packages\Xamarin.GooglePlayServices.Basement.117.6.0\lib\monoandroid90\Xamarin.GooglePlayServices.Basement.dll</HintPath>
</Reference>
<Reference Include="Xamarin.GooglePlayServices.Stats">
<HintPath>..\packages\Xamarin.GooglePlayServices.Stats.117.0.0\lib\monoandroid90\Xamarin.GooglePlayServices.Stats.dll</HintPath>
</Reference>
<Reference Include="Xamarin.GooglePlayServices.Tasks">
<HintPath>..\packages\Xamarin.GooglePlayServices.Tasks.117.0.2\lib\monoandroid90\Xamarin.GooglePlayServices.Tasks.dll</HintPath>
<HintPath>..\packages\Xamarin.GooglePlayServices.Tasks.117.2.1\lib\monoandroid90\Xamarin.GooglePlayServices.Tasks.dll</HintPath>
</Reference>
<Reference Include="Xamarin.GooglePlayServices.Base">
<HintPath>..\packages\Xamarin.GooglePlayServices.Base.117.1.0\lib\monoandroid90\Xamarin.GooglePlayServices.Base.dll</HintPath>
@@ -424,10 +425,19 @@
<HintPath>..\packages\Xamarin.JavaX.Inject.1.0.0\lib\monoandroid90\Xamarin.JavaX.Inject.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Google.Dagger">
<HintPath>..\packages\Xamarin.Google.Dagger.2.25.2.1\lib\monoandroid90\Xamarin.Google.Dagger.dll</HintPath>
<HintPath>..\packages\Xamarin.Google.Dagger.2.27.0\lib\monoandroid90\Xamarin.Google.Dagger.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Google.Android.DataTransport.TransportRuntime">
<HintPath>..\packages\Xamarin.Google.Android.DataTransport.TransportRuntime.2.2.3\lib\monoandroid90\Xamarin.Google.Android.DataTransport.TransportRuntime.dll</HintPath>
<HintPath>..\packages\Xamarin.Google.Android.DataTransport.TransportRuntime.2.2.6\lib\monoandroid90\Xamarin.Google.Android.DataTransport.TransportRuntime.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Jetbrains.Annotations">
<HintPath>..\packages\Xamarin.Jetbrains.Annotations.13.0.0.3\lib\monoandroid10.0\Xamarin.Jetbrains.Annotations.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Kotlin.StdLib.Common">
<HintPath>..\packages\Xamarin.Kotlin.StdLib.Common.1.4.20\lib\monoandroid10.0\Xamarin.Kotlin.StdLib.Common.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Kotlin.StdLib">
<HintPath>..\packages\Xamarin.Kotlin.StdLib.1.4.20\lib\monoandroid10.0\Xamarin.Kotlin.StdLib.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -554,8 +564,11 @@
<Import Project="..\packages\Xamarin.AndroidX.Annotation.Experimental.1.1.0\build\monoandroid9.0\Xamarin.AndroidX.Annotation.Experimental.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Annotation.Experimental.1.1.0\build\monoandroid9.0\Xamarin.AndroidX.Annotation.Experimental.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Lifecycle.Runtime.2.3.1.1\build\monoandroid9.0\Xamarin.AndroidX.Lifecycle.Runtime.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Lifecycle.Runtime.2.3.1.1\build\monoandroid9.0\Xamarin.AndroidX.Lifecycle.Runtime.targets')" />
<Import Project="..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.targets" Condition="Exists('..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.targets')" />
<Import Project="..\packages\Xamarin.GooglePlayServices.Basement.117.2.1\build\MonoAndroid90\Xamarin.GooglePlayServices.Basement.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Basement.117.2.1\build\MonoAndroid90\Xamarin.GooglePlayServices.Basement.targets')" />
<Import Project="..\packages\Xamarin.GooglePlayServices.Stats.117.0.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Stats.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Stats.117.0.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Stats.targets')" />
<Import Project="..\packages\Xamarin.GooglePlayServices.Tasks.117.0.2\build\MonoAndroid90\Xamarin.GooglePlayServices.Tasks.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Tasks.117.0.2\build\MonoAndroid90\Xamarin.GooglePlayServices.Tasks.targets')" />
<Import Project="..\packages\Xamarin.GooglePlayServices.Base.117.1.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Base.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Base.117.1.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Base.targets')" />
<Import Project="..\packages\Xamarin.GooglePlayServices.Basement.117.6.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Basement.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Basement.117.6.0\build\MonoAndroid90\Xamarin.GooglePlayServices.Basement.targets')" />
<Import Project="..\packages\Xamarin.GooglePlayServices.Tasks.117.2.1\build\MonoAndroid90\Xamarin.GooglePlayServices.Tasks.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Tasks.117.2.1\build\MonoAndroid90\Xamarin.GooglePlayServices.Tasks.targets')" />
<Import Project="..\packages\Xamarin.Jetbrains.Annotations.13.0.0.3\build\monoandroid10.0\Xamarin.Jetbrains.Annotations.targets" Condition="Exists('..\packages\Xamarin.Jetbrains.Annotations.13.0.0.3\build\monoandroid10.0\Xamarin.Jetbrains.Annotations.targets')" />
<Import Project="..\packages\Xamarin.Kotlin.StdLib.Common.1.4.20\build\monoandroid10.0\Xamarin.Kotlin.StdLib.Common.targets" Condition="Exists('..\packages\Xamarin.Kotlin.StdLib.Common.1.4.20\build\monoandroid10.0\Xamarin.Kotlin.StdLib.Common.targets')" />
<Import Project="..\packages\Xamarin.Kotlin.StdLib.1.4.20\build\monoandroid10.0\Xamarin.Kotlin.StdLib.targets" Condition="Exists('..\packages\Xamarin.Kotlin.StdLib.1.4.20\build\monoandroid10.0\Xamarin.Kotlin.StdLib.targets')" />
</Project>