Release 1.2.3

wrk-fmd · Feb 17, 2022 · 1e3dfd2 · 1e3dfd2
2 parents eac62bb + 1b333ec
commit 1e3dfd2
Show file tree

Hide file tree

Showing 11 changed files with 49 additions and 59 deletions.
diff --git a/GeoClient/GeoClient.Android/GeoClient.Android.csproj b/GeoClient/GeoClient.Android/GeoClient.Android.csproj
@@ -15,7 +15,7 @@
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
-    <TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v11.0</TargetFrameworkVersion>
     <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
@@ -63,25 +63,34 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Plugin.Permissions">
-      <Version>3.0.0.12</Version>
+      <Version>6.0.1</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.Android.Support.Compat">
       <Version>28.0.0.3</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.Android.Support.Vector.Drawable">
       <Version>28.0.0.3</Version>
     </PackageReference>
+    <PackageReference Include="Xamarin.AndroidX.AppCompat.Resources">
+      <Version>1.1.0</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.AndroidX.MediaRouter">
+      <Version>1.2.5.2</Version>
+    </PackageReference>
+    <PackageReference Include="Xamarin.AndroidX.Palette">
+      <Version>1.0.0.10</Version>
+    </PackageReference>
     <PackageReference Include="Xamarin.Essentials">
-      <Version>1.4.0</Version>
+      <Version>1.7.1</Version>
     </PackageReference>
-    <PackageReference Include="Xamarin.Forms" Version="4.4.0.991640" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2337" />
     <PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" />
     <PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="28.0.0.3" />
     <PackageReference Include="Xamarin.Android.Support.v4" Version="28.0.0.3" />
     <PackageReference Include="Xamarin.Android.Support.v7.CardView" Version="28.0.0.3" />
     <PackageReference Include="Xamarin.Android.Support.v7.MediaRouter" Version="28.0.0.3" />
     <PackageReference Include="Xamarin.GooglePlayServices.Location">
-      <Version>71.1600.0</Version>
+      <Version>118.0.0.3</Version>
     </PackageReference>
     <PackageReference Include="ZXing.Net.Mobile">
       <Version>2.4.1</Version>

diff --git a/GeoClient/GeoClient.Android/Location/GooglePlayLocationProvider.cs b/GeoClient/GeoClient.Android/Location/GooglePlayLocationProvider.cs
@@ -7,7 +7,7 @@
 
 namespace GeoClient.Droid.Location
 {
-    public class GooglePlayLocationProvider : Java.Lang.Object, ILocationListener, ILocationProvider, GoogleApiClient.IConnectionCallbacks, GoogleApiClient.IOnConnectionFailedListener
+    public class GooglePlayLocationProvider : LocationCallback, ILocationProvider
     {
         private const string LoggerTag = "GooglePlayLocationProvider";
 
@@ -16,15 +16,11 @@ public class GooglePlayLocationProvider : Java.Lang.Object, ILocationListener, I
             Log.Warn(LoggerTag, "No location update delegate registered!");
         };
 
-        private readonly GoogleApiClient _googleApiClient;
+        private readonly FusedLocationProviderClient _fusedLocationClient;
 
         public GooglePlayLocationProvider()
         {
-            _googleApiClient = new GoogleApiClient.Builder(Application.Context)
-                .AddApi(LocationServices.API)
-                .AddConnectionCallbacks(this)
-                .AddOnConnectionFailedListener(this)
-                .Build();
+            _fusedLocationClient = LocationServices.GetFusedLocationProviderClient(Application.Context);
         }
 
         public void RegisterLocationUpdateDelegate(LocationProviderListener updateDelegate)
@@ -34,43 +30,28 @@ public void RegisterLocationUpdateDelegate(LocationProviderListener updateDelega
 
         public void StartLocationProvider()
         {
-            _googleApiClient.Connect();
-        }
-
-        public void StopLocationProvider()
-        {
-            _googleApiClient.Disconnect();
-        }
-
-        public void OnConnected(Bundle connectionHint)
-        {
-            var locationRequest = new LocationRequest()
+            var locationRequest = LocationRequest.Create()
                 .SetPriority(LocationRequest.PriorityHighAccuracy)
-                .SetInterval(10000)
+                .SetInterval(15000)
                 .SetFastestInterval(5000);
-            LocationServices.FusedLocationApi.RequestLocationUpdates(_googleApiClient, locationRequest, this);
+            _fusedLocationClient.RequestLocationUpdates(locationRequest, this, Looper.MainLooper);
         }
 
-        public void OnConnectionSuspended(int cause)
-        {
-            Log.Warn(LoggerTag, "Connection of google API client has been suspended!");
-        }
-
-        public void OnConnectionFailed(ConnectionResult result)
+        public void StopLocationProvider()
         {
-            Log.Warn(LoggerTag, "Connection to google API client failed!");
+            _fusedLocationClient.RemoveLocationUpdates(this);
         }
 
-        public void OnLocationChanged(Android.Locations.Location location)
+        public override void OnLocationResult(LocationResult location)
         {
             if (location != null)
             {
-                var updatedLocation = XamarinLocationFactory.CreateXamarinLocation(location);
+                var updatedLocation = XamarinLocationFactory.CreateXamarinLocation(location.LastLocation);
                 _updateDelegate.Invoke(updatedLocation);
             }
             else
             {
-                Log.Debug(LoggerTag, "Received empty location update from google play provider!");
+                Log.Debug(LoggerTag, "Received empty location update from Google Play provider!");
             }
         }
     }

diff --git a/GeoClient/GeoClient.Android/Properties/AndroidManifest.xml b/GeoClient/GeoClient.Android/Properties/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="90" android:versionName="1.2.2" package="at.wrk.fmd.cocemocl" android:installLocation="auto">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="95" android:versionName="1.2.3" package="at.wrk.fmd.cocemocl" android:installLocation="auto">
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30" />
 	<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 	<uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />

diff --git a/GeoClient/GeoClient.UWP/GeoClient.UWP.csproj b/GeoClient/GeoClient.UWP/GeoClient.UWP.csproj
@@ -149,10 +149,10 @@
       <Version>4.5.0.6</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.Essentials">
-      <Version>1.4.0</Version>
+      <Version>1.7.1</Version>
     </PackageReference>
-    <PackageReference Include="Xamarin.Forms" Version="4.4.0.991640" />
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.9" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2337" />
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.13" />
     <PackageReference Include="ZXing.Net.Mobile">
       <Version>2.4.1</Version>
     </PackageReference>

diff --git a/GeoClient/GeoClient.iOS/GeoClient.iOS.csproj b/GeoClient/GeoClient.iOS/GeoClient.iOS.csproj
@@ -137,9 +137,9 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Xamarin.Essentials">
-      <Version>1.4.0</Version>
+      <Version>1.7.1</Version>
     </PackageReference>
-    <PackageReference Include="Xamarin.Forms" Version="4.4.0.991640" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2337" />
     <PackageReference Include="ZXing.Net.Mobile">
       <Version>2.4.1</Version>
     </PackageReference>
@@ -207,7 +207,7 @@
   </ItemGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties XamarinHotReloadWrongLinkerErrorInfoBarGeoClientiOSHideInfoBar="True" XamarinHotReloadXFormsNugetUpgradeInfoBarGeoClientiOSHideInfoBar="True" />
+      <UserProperties XamarinHotReloadXFormsNugetUpgradeInfoBarGeoClientiOSHideInfoBar="True" XamarinHotReloadWrongLinkerErrorInfoBarGeoClientiOSHideInfoBar="True" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
diff --git a/GeoClient/GeoClient.iOS/Info.plist b/GeoClient/GeoClient.iOS/Info.plist
@@ -28,7 +28,7 @@
     <key>CFBundleIdentifier</key>
     <string>at.wrk.fmd.cocemocl.geoclient</string>
     <key>CFBundleVersion</key>
-    <string>1.2.2</string>
+    <string>1.2.3</string>
     <key>UILaunchStoryboardName</key>
     <string>LaunchScreen</string>
     <key>CFBundleName</key>
@@ -48,7 +48,7 @@
     <key>NSLocationWhenInUseUsageDescription</key>
     <string>GeoClient needs access to the location data in the background to send correct location data</string>
     <key>CFBundleShortVersionString</key>
-    <string>1.2.2</string>
+    <string>1.2.3</string>
     <key>UIBackgroundModes</key>
     <array>
         <string>location</string>

diff --git a/GeoClient/GeoClient.iOS/Main.cs b/GeoClient/GeoClient.iOS/Main.cs
@@ -9,7 +9,7 @@ static void Main(string[] args)
         {
             // if you want to use a different Application Delegate class from "AppDelegate"
             // you can specify it here.
-            UIApplication.Main(args, null, "AppDelegate");
+            UIApplication.Main(args, null, typeof(AppDelegate));
         }
     }
 }
diff --git a/GeoClient/GeoClient.iOS/Properties/AssemblyInfo.cs b/GeoClient/GeoClient.iOS/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.2.0")]
-[assembly: AssemblyFileVersion("1.2.2.0")]
+[assembly: AssemblyVersion("1.2.3.0")]
+[assembly: AssemblyFileVersion("1.2.3.0")]
diff --git a/GeoClient/GeoClient/GeoClient.csproj b/GeoClient/GeoClient/GeoClient.csproj
@@ -6,9 +6,9 @@
     <Authors>Daniel Steiner, Robert Wittek</Authors>
     <Copyright>MIT License</Copyright>
     <Description>App to share the position data</Description>
-    <Version>1.2.2</Version>
-    <AssemblyVersion>1.2.2.0</AssemblyVersion>
-    <FileVersion>1.2.2.0</FileVersion>
+    <Version>1.2.3</Version>
+    <AssemblyVersion>1.2.3.0</AssemblyVersion>
+    <FileVersion>1.2.3.0</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -18,9 +18,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.4.0" />
-    <PackageReference Include="Xamarin.Forms" Version="4.4.0.991640" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.7.1" />
+    <PackageReference Include="Xamarin.Forms" Version="5.0.0.2337" />
     <PackageReference Include="ZXing.Net.Mobile" Version="2.4.1" />
     <PackageReference Include="ZXing.Net.Mobile.Forms" Version="2.4.1" />
   </ItemGroup>

diff --git a/GeoClient/GeoClient/Views/AboutPage.xaml b/GeoClient/GeoClient/Views/AboutPage.xaml
@@ -26,7 +26,7 @@
                                 FontAttributes="Bold"
                                 FontSize="Large" />
                             <Span
-                                Text="1.2.2"
+                                Text="1.2.3"
                                 FontSize="Large"
                                 ForegroundColor="{StaticResource LightTextColor}" />
                         </FormattedString.Spans>

diff --git a/GeoClientTests/GeoClientTests.csproj b/GeoClientTests/GeoClientTests.csproj
@@ -29,11 +29,11 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json">
-      <Version>12.0.3</Version>
+      <Version>13.0.1</Version>
     </PackageReference>
-    <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="Xamarin.UITest" Version="3.0.5" />
-    <PackageReference Include="NUnitTestAdapter" Version="2.2.0" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
+    <PackageReference Include="Xamarin.UITest" Version="3.2.6" />
+    <PackageReference Include="NUnitTestAdapter" Version="2.3.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\GeoClient\GeoClient\GeoClient.csproj">