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

Get Android Project up to date and building

Browse Source
This commit is contained in:
Joel Wetzell
2022-01-08 10:58:34 -06:00
parent b80a74d1bc
commit 716a55d1c5
5 changed files with 16952 additions and 5597 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Droid/Properties/AndroidManifest.xml
+2 -2
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="30" android:versionName="1.6.0" package="com.jwetzell.qlabcontroller" android:installLocation="auto">
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28" />
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="33" android:versionName="1.6.3" package="com.jwetzell.qlabcontroller" android:installLocation="auto">
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="30" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
Droid/Resources/Resource.designer.cs
Generated
+16903 -5579
View File
File diff suppressed because it is too large Load Diff
Droid/packages.config
+7
View File
@@ -153,6 +153,7 @@
<package id="Xamarin.AndroidX.Lifecycle.ViewModelSavedState" version="2.3.1.3" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Loader" version="1.1.0.10" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.LocalBroadcastManager" version="1.0.0.10" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Media" version="1.4.2.2" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.MediaRouter" version="1.2.5.2" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.Migration" version="1.0.8" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.MultiDex" version="2.0.1.10" targetFramework="monoandroid10.0" />
@@ -173,8 +174,14 @@
<package id="Xamarin.AndroidX.VersionedParcelable" version="1.1.1.10" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.ViewPager" version="1.0.0.10" targetFramework="monoandroid10.0" />
<package id="Xamarin.AndroidX.ViewPager2" version="1.0.0.12" targetFramework="monoandroid10.0" />
<package id="Xamarin.Build.Download" version="0.10.0" targetFramework="monoandroid11.0" />
<package id="Xamarin.Essentials" version="1.7.0" targetFramework="monoandroid10.0" />
<package id="Xamarin.Forms" version="5.0.0.2291" targetFramework="monoandroid10.0" />
<package id="Xamarin.Google.Android.Material" version="1.4.0.4" targetFramework="monoandroid10.0" />
<package id="Xamarin.Google.Guava.ListenableFuture" version="1.0.0.5" targetFramework="monoandroid10.0" />
<package id="Xamarin.GooglePlayServices.Base" version="117.6.0.3" targetFramework="monoandroid11.0" />
<package id="Xamarin.GooglePlayServices.Basement" version="117.6.0.4" targetFramework="monoandroid11.0" />
<package id="Xamarin.GooglePlayServices.Maps" version="117.0.1.3" targetFramework="monoandroid11.0" />
<package id="Xamarin.GooglePlayServices.Tasks" version="117.2.1.3" targetFramework="monoandroid11.0" />
<package id="Zeroconf" version="3.5.11" targetFramework="monoandroid10.0" />
</packages>
Droid/qController.Droid.csproj
+39 -15
View File
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<?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.Build.Download.0.10.0\build\Xamarin.Build.Download.props" Condition="Exists('..\packages\Xamarin.Build.Download.0.10.0\build\Xamarin.Build.Download.props')" />
<Import Project="..\packages\Xamarin.Forms.5.0.0.2291\build\Xamarin.Forms.props" Condition="Exists('..\packages\Xamarin.Forms.5.0.0.2291\build\Xamarin.Forms.props')" />
<Import Project="..\packages\Xamarin.Forms.5.0.0.2012\build\Xamarin.Forms.props" Condition="Exists('..\packages\Xamarin.Forms.5.0.0.2012\build\Xamarin.Forms.props')" />
<Import Project="..\packages\Xamarin.AndroidX.Migration.1.0.8\build\monoandroid90\Xamarin.AndroidX.Migration.props" Condition="Exists('..\packages\Xamarin.AndroidX.Migration.1.0.8\build\monoandroid90\Xamarin.AndroidX.Migration.props')" />
<PropertyGroup>
@@ -10,7 +12,7 @@
<OutputType>Library</OutputType>
<RootNamespace>qController.Droid</RootNamespace>
<AssemblyName>qController.Droid</AssemblyName>
<TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v11.0</TargetFrameworkVersion>
<AndroidApplication>True</AndroidApplication>
<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
<AndroidResgenClass>Resource</AndroidResgenClass>
@@ -26,17 +28,19 @@
<DefineConstants>DEBUG;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AndroidSigningKeyStore>/Users/jwetzell/Dropbox/App Stuff/Android/keystores/android.keystore</AndroidSigningKeyStore>
<AndroidSigningKeyStore></AndroidSigningKeyStore>
<AndroidSupportedAbis>x86;armeabi-v7a;arm64-v8a;x86_64</AndroidSupportedAbis>
<MandroidI18n>
</MandroidI18n>
<AotAssemblies>false</AotAssemblies>
<AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
<AndroidLinkMode>None</AndroidLinkMode>
<LangVersion>latestmajor</LangVersion>
<EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>false</DebugSymbols>
<DebugType>pdbonly</DebugType>
<DebugType></DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release</OutputPath>
<ErrorReport>prompt</ErrorReport>
@@ -59,6 +63,7 @@
<AndroidLinkTool>r8</AndroidLinkTool>
<EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
<MandroidI18n />
<LangVersion>latestmajor</LangVersion>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -80,9 +85,6 @@
<HintPath>..\packages\Acr.Support.2.1.0\lib\MonoAndroid10\Acr.Support.Android.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="AndHUD">
<HintPath>..\packages\AndHUD.1.4.2\lib\MonoAndroid81\AndHUD.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
</Reference>
@@ -366,26 +368,23 @@
<HintPath>..\packages\Xamarin.AndroidX.Browser.1.3.0.8\lib\monoandroid90\Xamarin.AndroidX.Browser.dll</HintPath>
</Reference>
<Reference Include="FormsViewGroup">
<HintPath>..\packages\Xamarin.Forms.5.0.0.2125\lib\MonoAndroid10.0\FormsViewGroup.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.5.0.0.2291\lib\MonoAndroid10.0\FormsViewGroup.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Core">
<HintPath>..\packages\Xamarin.Forms.5.0.0.2125\lib\MonoAndroid10.0\Xamarin.Forms.Core.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.5.0.0.2291\lib\MonoAndroid10.0\Xamarin.Forms.Core.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform.Android">
<HintPath>..\packages\Xamarin.Forms.5.0.0.2125\lib\MonoAndroid10.0\Xamarin.Forms.Platform.Android.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.5.0.0.2291\lib\MonoAndroid10.0\Xamarin.Forms.Platform.Android.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform">
<HintPath>..\packages\Xamarin.Forms.5.0.0.2125\lib\MonoAndroid10.0\Xamarin.Forms.Platform.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.5.0.0.2291\lib\MonoAndroid10.0\Xamarin.Forms.Platform.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Xaml">
<HintPath>..\packages\Xamarin.Forms.5.0.0.2125\lib\MonoAndroid10.0\Xamarin.Forms.Xaml.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.5.0.0.2291\lib\MonoAndroid10.0\Xamarin.Forms.Xaml.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Essentials">
<HintPath>..\packages\Xamarin.Essentials.1.7.0\lib\monoandroid10.0\Xamarin.Essentials.dll</HintPath>
</Reference>
<Reference Include="Acr.UserDialogs">
<HintPath>..\packages\Acr.UserDialogs.7.2.0.562\lib\monoandroid10.0\Acr.UserDialogs.dll</HintPath>
</Reference>
<Reference Include="Acr.Settings">
<HintPath>..\packages\Acr.Settings.9.0.1\lib\monoandroid80\Acr.Settings.dll</HintPath>
</Reference>
@@ -429,6 +428,24 @@
<Reference Include="Xamarin.AndroidX.Navigation.UI">
<HintPath>..\packages\Xamarin.AndroidX.Navigation.UI.2.3.5.3\lib\monoandroid90\Xamarin.AndroidX.Navigation.UI.dll</HintPath>
</Reference>
<Reference Include="AndHUD">
<HintPath>..\packages\AndHUD.1.4.3\lib\monoandroid81\AndHUD.dll</HintPath>
</Reference>
<Reference Include="Acr.UserDialogs">
<HintPath>..\packages\Acr.UserDialogs.7.2.0.562\lib\monoandroid10.0\Acr.UserDialogs.dll</HintPath>
</Reference>
<Reference Include="Xamarin.GooglePlayServices.Basement">
<HintPath>..\packages\Xamarin.GooglePlayServices.Basement.117.6.0.4\lib\monoandroid90\Xamarin.GooglePlayServices.Basement.dll</HintPath>
</Reference>
<Reference Include="Xamarin.GooglePlayServices.Tasks">
<HintPath>..\packages\Xamarin.GooglePlayServices.Tasks.117.2.1.3\lib\monoandroid90\Xamarin.GooglePlayServices.Tasks.dll</HintPath>
</Reference>
<Reference Include="Xamarin.GooglePlayServices.Base">
<HintPath>..\packages\Xamarin.GooglePlayServices.Base.117.6.0.3\lib\monoandroid90\Xamarin.GooglePlayServices.Base.dll</HintPath>
</Reference>
<Reference Include="Xamarin.GooglePlayServices.Maps">
<HintPath>..\packages\Xamarin.GooglePlayServices.Maps.117.0.1.3\lib\monoandroid90\Xamarin.GooglePlayServices.Maps.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="MainActivity.cs" />
@@ -577,4 +594,11 @@
<Import Project="..\packages\Xamarin.AndroidX.Browser.1.3.0.8\build\monoandroid90\Xamarin.AndroidX.Browser.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Browser.1.3.0.8\build\monoandroid90\Xamarin.AndroidX.Browser.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.MediaRouter.1.2.5.2\build\monoandroid90\Xamarin.AndroidX.MediaRouter.targets" Condition="Exists('..\packages\Xamarin.AndroidX.MediaRouter.1.2.5.2\build\monoandroid90\Xamarin.AndroidX.MediaRouter.targets')" />
<Import Project="..\packages\Xamarin.Google.Guava.ListenableFuture.1.0.0.5\build\monoandroid90\Xamarin.Google.Guava.ListenableFuture.targets" Condition="Exists('..\packages\Xamarin.Google.Guava.ListenableFuture.1.0.0.5\build\monoandroid90\Xamarin.Google.Guava.ListenableFuture.targets')" />
<Import Project="..\packages\Xamarin.AndroidX.Media.1.4.2.2\build\monoandroid90\Xamarin.AndroidX.Media.targets" Condition="Exists('..\packages\Xamarin.AndroidX.Media.1.4.2.2\build\monoandroid90\Xamarin.AndroidX.Media.targets')" />
<Import Project="..\packages\Xamarin.Forms.5.0.0.2291\build\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.5.0.0.2291\build\Xamarin.Forms.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.6.0.4\build\monoandroid90\Xamarin.GooglePlayServices.Basement.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Basement.117.6.0.4\build\monoandroid90\Xamarin.GooglePlayServices.Basement.targets')" />
<Import Project="..\packages\Xamarin.GooglePlayServices.Tasks.117.2.1.3\build\monoandroid90\Xamarin.GooglePlayServices.Tasks.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Tasks.117.2.1.3\build\monoandroid90\Xamarin.GooglePlayServices.Tasks.targets')" />
<Import Project="..\packages\Xamarin.GooglePlayServices.Base.117.6.0.3\build\monoandroid90\Xamarin.GooglePlayServices.Base.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Base.117.6.0.3\build\monoandroid90\Xamarin.GooglePlayServices.Base.targets')" />
<Import Project="..\packages\Xamarin.GooglePlayServices.Maps.117.0.1.3\build\monoandroid90\Xamarin.GooglePlayServices.Maps.targets" Condition="Exists('..\packages\Xamarin.GooglePlayServices.Maps.117.0.1.3\build\monoandroid90\Xamarin.GooglePlayServices.Maps.targets')" />
</Project>
qController.Standard/Views/QBrowserPage.xaml
+1 -1
View File
@@ -40,7 +40,7 @@
HorizontalOptions="FillAndExpand"
VerticalOptions="FillAndExpand"
HorizontalTextAlignment="Center"
FontSize="Header"
FontSize="Title"
Text="Discovered QLab Instances" />
<!--Need to try and remove the group spacing caused by ios:GroupHeaderStyle-->
<ListView x:Name="serverListView"