Update Encoding for special characters

This commit is contained in:
2019-12-15 19:19:37 -06:00
parent 67c0fe176d
commit 7575fe1135
24 changed files with 4960 additions and 4855 deletions
+3 -5
View File
@@ -3,15 +3,13 @@
using Android.App;
using Android.Content;
using Android.Content.PM;
using Android.Runtime;
using Android.Views;
using Android.Widget;
using Android.OS;
using Android.Net;
namespace qController.Droid
{
[Activity(Label = "qController", Icon = "@drawable/icon", Theme = "@style/MyTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
[Activity(Label = "qController", Icon = "@drawable/icon", Theme = "@style/MyTheme", ScreenOrientation = ScreenOrientation.Portrait, MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity
{
protected override void OnCreate(Bundle bundle)
@@ -36,7 +34,7 @@ namespace qController.Droid
NetworkInfo networkInfo = connMgr.GetNetworkInfo(network);
if (networkInfo.Type == ConnectivityType.Wifi && networkInfo.IsAvailable && networkInfo.IsConnected)
{
Console.WriteLine("FIRST WIFI NETWORK FOUND......BINDING");
Console.WriteLine("ANDROID MAIN ACTIVITY - First Wi-Fi found......binding");
connMgr.BindProcessToNetwork(network);
}
}
+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="27" android:versionName="1.1.0" package="com.jwetzell.qlabcontroller">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="28" android:versionName="1.1.1" package="com.jwetzell.qlabcontroller" android:installLocation="auto">
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+4800 -4764
View File
File diff suppressed because it is too large Load Diff
+15
View File
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Reactive" publicKeyToken="94bc3704cddfc263" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
+8
View File
@@ -19,7 +19,10 @@
<package id="System.Console" version="4.3.1" targetFramework="monoandroid81" />
<package id="System.Diagnostics.Contracts" version="4.3.0" targetFramework="monoandroid80" />
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="monoandroid71" />
<package id="System.Diagnostics.Process" version="4.1.0" targetFramework="monoandroid81" />
<package id="System.Diagnostics.StackTrace" version="4.0.1" targetFramework="monoandroid81" />
<package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="monoandroid71" />
<package id="System.Diagnostics.TraceSource" version="4.0.0" targetFramework="monoandroid81" />
<package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="monoandroid71" />
<package id="System.Dynamic.Runtime" version="4.3.0" targetFramework="monoandroid80" />
<package id="System.Globalization" version="4.3.0" targetFramework="monoandroid71" />
@@ -29,11 +32,14 @@
<package id="System.IO.Compression.ZipFile" version="4.3.0" targetFramework="monoandroid71" />
<package id="System.IO.FileSystem" version="4.3.0" targetFramework="monoandroid71" />
<package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="monoandroid71" />
<package id="System.IO.FileSystem.Watcher" version="4.0.0" targetFramework="monoandroid81" />
<package id="System.Linq" version="4.3.0" targetFramework="monoandroid71" />
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="monoandroid71" />
<package id="System.Net.Http" version="4.3.4" targetFramework="monoandroid81" />
<package id="System.Net.NameResolution" version="4.0.0" targetFramework="monoandroid81" />
<package id="System.Net.NetworkInformation" version="4.3.0" targetFramework="monoandroid80" />
<package id="System.Net.Primitives" version="4.3.1" targetFramework="monoandroid81" />
<package id="System.Net.Requests" version="4.0.11" targetFramework="monoandroid81" />
<package id="System.Net.Sockets" version="4.3.0" targetFramework="monoandroid71" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="monoandroid81" />
<package id="System.ObjectModel" version="4.3.0" targetFramework="monoandroid71" />
@@ -45,6 +51,7 @@
<package id="System.Reflection" version="4.3.0" targetFramework="monoandroid71" />
<package id="System.Reflection.Extensions" version="4.3.0" targetFramework="monoandroid71" />
<package id="System.Reflection.Primitives" version="4.3.0" targetFramework="monoandroid71" />
<package id="System.Reflection.TypeExtensions" version="4.1.0" targetFramework="monoandroid81" />
<package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="monoandroid71" />
<package id="System.Runtime" version="4.3.1" targetFramework="monoandroid81" />
<package id="System.Runtime.Extensions" version="4.3.1" targetFramework="monoandroid81" />
@@ -65,6 +72,7 @@
<package id="System.Threading" version="4.3.0" targetFramework="monoandroid71" />
<package id="System.Threading.Tasks" version="4.3.0" targetFramework="monoandroid71" />
<package id="System.Threading.Tasks.Extensions" version="4.5.3" targetFramework="monoandroid81" />
<package id="System.Threading.Thread" version="4.0.0" targetFramework="monoandroid81" />
<package id="System.Threading.Timer" version="4.3.0" targetFramework="monoandroid71" />
<package id="System.Xml.ReaderWriter" version="4.3.1" targetFramework="monoandroid80" />
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="monoandroid71" />
+22 -6
View File
@@ -1,4 +1,4 @@
<?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.Forms.4.1.0.618606\build\Xamarin.Forms.props" Condition="Exists('..\packages\Xamarin.Forms.4.1.0.618606\build\Xamarin.Forms.props')" />
<PropertyGroup>
@@ -27,6 +27,12 @@
<WarningLevel>4</WarningLevel>
<AndroidSigningKeyStore>/Users/jwetzell/Dropbox/App Stuff/Android/keystores/android.keystore</AndroidSigningKeyStore>
<AndroidSupportedAbis>x86;armeabi-v7a;arm64-v8a;x86_64</AndroidSupportedAbis>
<AotAssemblies>false</AotAssemblies>
<EnableLLVM>false</EnableLLVM>
<AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
<BundleAssemblies>false</BundleAssemblies>
<MandroidI18n>
</MandroidI18n>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -37,12 +43,21 @@
<WarningLevel>4</WarningLevel>
<AndroidManagedSymbols>true</AndroidManagedSymbols>
<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
<AndroidKeyStore></AndroidKeyStore>
<AndroidSigningKeyStore></AndroidSigningKeyStore>
<AndroidSigningStorePass></AndroidSigningStorePass>
<AndroidSigningKeyAlias></AndroidSigningKeyAlias>
<AndroidSigningKeyPass></AndroidSigningKeyPass>
<AndroidKeyStore>
</AndroidKeyStore>
<AndroidSigningKeyStore>
</AndroidSigningKeyStore>
<AndroidSigningStorePass>
</AndroidSigningStorePass>
<AndroidSigningKeyAlias>
</AndroidSigningKeyAlias>
<AndroidSigningKeyPass>
</AndroidSigningKeyPass>
<AndroidSupportedAbis>armeabi-v7a;x86;arm64-v8a;x86_64</AndroidSupportedAbis>
<AotAssemblies>false</AotAssemblies>
<EnableLLVM>false</EnableLLVM>
<AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
<BundleAssemblies>false</BundleAssemblies>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -181,6 +196,7 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="Resources\AboutResources.txt" />
<None Include="Properties\AndroidManifest.xml" />
<None Include="Assets\AboutAssets.txt" />