master merged

pedi-foods/Android/app/src/main/AndroidManifest.xml

@@ -13,12 +13,13 @@
         android:name=".AndroidAppMain"
         android:supportsRtl="true"
         android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/ic_launcher"
+        android:theme="@style/Theme.PediFoods">
         <activity
             android:name=".MainActivity"
             android:exported="true"
             android:configChanges="orientation|screenSize|screenLayout|keyboardHidden|mnc|colorMode|density|fontScale|fontWeightAdjustment|keyboard|layoutDirection|locale|mcc|navigation|smallestScreenSize|touchscreen|uiMode"
-            android:theme="@style/Theme.AppCompat.DayNight.NoActionBar"
+            android:theme="@style/Theme.PediFoods.Launch"
             android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

pedi-foods/Android/app/src/main/kotlin/Main.kt

@@ -88,6 +88,8 @@ open class MainActivity: AppCompatActivity {
     override fun onResume() {
         super.onResume()
         AppDelegate.shared.onResume()
+        requestLocationPermissionsIfNeeded()
+        cacheLastKnownLocation()
     }
 
     override fun onPause() {
@@ -172,7 +174,7 @@ open class MainActivity: AppCompatActivity {
             } catch (_: Exception) {
                 null
             }
-            if (candidate != null && (best == null || candidate.accuracy < best!!.accuracy)) {
+            if (candidate != null && (best == null || candidate.accuracy < best.accuracy)) {
                 best = candidate
             }
         }

pedi-foods/Android/app/src/main/res/drawable-night/launch_splash.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/splash_background_dark" />
+    <item
+        android:drawable="@mipmap/ic_launcher"
+        android:gravity="center"
+        android:width="128dp"
+        android:height="128dp" />
+</layer-list>

pedi-foods/Android/app/src/main/res/drawable/launch_splash.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/splash_background_light" />
+    <item
+        android:drawable="@mipmap/ic_launcher"
+        android:gravity="center"
+        android:width="128dp"
+        android:height="128dp" />
+</layer-list>

pedi-foods/Android/app/src/main/res/values-night/themes.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Theme.PediFoods" parent="Theme.AppCompat.DayNight.NoActionBar">
+        <item name="android:windowBackground">@color/splash_background_dark</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+    </style>
+
+    <style name="Theme.PediFoods.Launch" parent="Theme.PediFoods">
+        <item name="android:windowBackground">@drawable/launch_splash</item>
+    </style>
+</resources>

pedi-foods/Android/app/src/main/res/values/colors.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="splash_background_light">#F6F7FB</color>
+    <color name="splash_background_dark">#121212</color>
+</resources>

pedi-foods/Android/app/src/main/res/values/themes.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Theme.PediFoods" parent="Theme.AppCompat.DayNight.NoActionBar">
+        <item name="android:windowBackground">@color/splash_background_light</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+    </style>
+
+    <style name="Theme.PediFoods.Launch" parent="Theme.PediFoods">
+        <item name="android:windowBackground">@drawable/launch_splash</item>
+    </style>
+</resources>