Optimized advice synchronisation; extended record edit model and advi…

…ce form, added detail pages for "bestimmen"

KBS.Xamarin.TaxonFinder/KBS.Xamarin.TaxonFinder.Droid/MainActivity.cs

@@ -3,45 +3,75 @@
 using Android.Content.PM;
 using Android.OS;
 using Android.Runtime;
+using Android.Views;
 using Plugin.CurrentActivity;
 using Plugin.Permissions;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace KBS.App.TaxonFinder.Droid
 {
     [Activity(Label = "BODENTIER hoch 4", Icon = "@drawable/icon", Theme = "@style/MainTheme", MainLauncher = false, ScreenOrientation = ScreenOrientation.Portrait, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
-	public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity
-	{
-		protected override void OnCreate(Bundle bundle)
-		{
-			TabLayoutResource = Resource.Layout.Tabbar;
-			ToolbarResource = Resource.Layout.Toolbar;
-
-			base.OnCreate(bundle);
-			CrossCurrentActivity.Current.Init(this, bundle);
-			Xamarin.Essentials.Platform.Init(this, bundle);
-			global::Xamarin.Forms.Forms.Init(this, bundle);
-			Xamarin.FormsMaps.Init(this, bundle);
-
-			LoadApplication(new App());
-
-		}
-		public override void OnRequestPermissionsResult(int requestCode, string[] permissions, [GeneratedEnum] Android.Content.PM.Permission[] grantResults)
-		{
-			PermissionsImplementation.Current.OnRequestPermissionsResult(requestCode, permissions, grantResults);
-			Xamarin.Essentials.Platform.OnRequestPermissionsResult(requestCode, permissions, grantResults);
-		}
-		public override void OnBackPressed()
-		{
-			if (App.Current.MainPage.Navigation.NavigationStack.Count > 1)
-			{
-				base.OnBackPressed();
-			}
-			else
-			{
-				this.FinishAffinity();
-			}
-		}
-
-	}
+    //public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity
+    public class MainActivity : global::NavigationSam.Droid.FormsAppCompatActivitySam
+    {
+        protected override void OnCreate(Bundle bundle)
+        {
+            TabLayoutResource = Resource.Layout.Tabbar;
+            ToolbarResource = Resource.Layout.Toolbar;
+
+            base.OnCreate(bundle);
+
+            CrossCurrentActivity.Current.Init(this, bundle);
+            Xamarin.Essentials.Platform.Init(this, bundle);
+            global::Xamarin.Forms.Forms.Init(this, bundle);
+            Xamarin.FormsMaps.Init(this, bundle);
+
+            //NavigationSam specific
+            NavigationSam.Droid.Preserver.Preserve();
+            Xamarin.Forms.Forms.Init(this, bundle);
+            //LoadApplication(new App());
+
+            LoadApplication(new App());
+
+        }
+        public override void OnRequestPermissionsResult(int requestCode, string[] permissions, [GeneratedEnum] Android.Content.PM.Permission[] grantResults)
+        {
+            PermissionsImplementation.Current.OnRequestPermissionsResult(requestCode, permissions, grantResults);
+            Xamarin.Essentials.Platform.OnRequestPermissionsResult(requestCode, permissions, grantResults);
+        }
+        public override void OnBackPressed()
+        {
+            if (App.Current.MainPage.Navigation.NavigationStack.Count > 1)
+            {
+                try
+                {
+                    IReadOnlyList<Xamarin.Forms.Page> pageList = App.Current.MainPage.Navigation.NavigationStack;
+                    List<Xamarin.Forms.Page> pageList2 = new List<Xamarin.Forms.Page>(pageList);
+                    Xamarin.Forms.Page lastPage = pageList2.Last();
+                    var dbg = lastPage.GetType().Name;
+
+                    if (dbg == "FilterSelectionV2" || dbg == "FilterSelection")
+                    {
+                        base.OnBackPressed();
+                    }
+                    else
+                    {
+                        App.Current.MainPage.Navigation.PopAsync();
+                    }
+                }
+                catch (Exception ex)
+                {
+                    System.Diagnostics.Debug.WriteLine(ex.Message);
+                    App.Current.MainPage.Navigation.PopAsync();
+                }
+            }
+            else
+            {
+                this.FinishAffinity();
+            }
+        }
+    }
 }
 

KBS.Xamarin.TaxonFinder/KBS.Xamarin.TaxonFinder.Droid/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:installLocation="auto" android:versionName="1.0.22" package="com.kbs.idoapp" android:versionCode="22">
-	<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="29" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="preferExternal" android:versionName="1.1.9.4" package="com.kbs.idoapp" android:versionCode="46">
+	<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="31" />
 	<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_NETWORK_STATE" />

KBS.Xamarin.TaxonFinder/KBS.Xamarin.TaxonFinder.Droid/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Bodentier hoch 4")]
-[assembly: AssemblyCopyright("Copyright © 2021")]
+[assembly: AssemblyCopyright("Copyright © 2022")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]