Merge pull request #22 from SimpleAppProjects/develop

v5.12.0

Author: thewizrd

.aiexclude

@@ -0,0 +1,38 @@
+*.iml
+*.bak
+*.orig
+.gradle
+/local.properties
+/.idea/assetWizardSettings.xml
+/.idea/workspace.xml
+/.idea/libraries
+/.idea/caches
+/.idea
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+API_KEY.txt
+.cxx
+/weather-api/src/main/jni/fullgms
+/weather-api/src/fullgms/java/com/thewizrd/weather_api/keys/Keys.java
+/weather-api/src/fullgms/java/com/thewizrd/weather_api/keys/WeatherKitConfig.kt
+/app/debug
+/app/release
+/app/fullgms
+/app/nongms
+/wearapp/debug
+/wearapp/release
+/wearapp/fullgms
+/wearapp/nongms
+/keycheck.bat
+/keycheck.ps1
+/ImportTranslations.bat
+/secure.properties
+/weathericons/
+/extras/
+*.7z
+google-services.json
+/.privado/
+/.detekt
+/.kotlin

app/build.gradle

@@ -16,8 +16,8 @@ android {
         targetSdkVersion rootProject.targetSdkVersion
         // NOTE: Version Code Format (TargetSDK, Version Name, Build Number, Variant Code (Android: 0, WearOS: 1)
         // ex) 345100131 = (34, 5.10, 013, 0)
-        versionCode 345110040
-        versionName "5.11.1"
+        versionCode 355120090
+        versionName "5.12.0"
 
         vectorDrawables {
             useSupportLibrary true

app/src/androidTestFullgms/java/com/thewizrd/simpleweather/test/UnitTests.kt

@@ -378,7 +378,9 @@ class UnitTests {
             val queryVM = locations.firstOrNull()
             assertNotNull(queryVM)
 
-            val locModel = if (locationProvider.needsLocationFromName()) {
+            val locModel = if (locationProvider.needsLocationFromID()) {
+                locationProvider.getLocationFromID(queryVM!!)
+            } else if (locationProvider.needsLocationFromName()) {
                 locationProvider.getLocationFromName(queryVM!!)
             } else if (locationProvider.needsLocationFromGeocoder()) {
                 locationProvider.getLocation(
@@ -387,8 +389,6 @@ class UnitTests {
                         queryVM.locationLong
                     ), WeatherAPI.GOOGLE
                 )
-            } else if (locationProvider.needsLocationFromID()) {
-                locationProvider.getLocationFromID(queryVM!!)
             } else {
                 queryVM
             }

app/src/fullgms/java/com/thewizrd/simpleweather/extras/Extras.kt

@@ -6,11 +6,14 @@ package com.thewizrd.simpleweather.extras
 import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
+import androidx.lifecycle.lifecycleScope
 import androidx.navigation.findNavController
 import androidx.preference.Preference
 import com.google.android.gms.maps.MapsInitializer
 import com.google.android.gms.maps.MapsInitializer.Renderer
 import com.google.android.play.core.splitcompat.SplitCompat
+import com.google.firebase.installations.ktx.installations
+import com.google.firebase.ktx.Firebase
 import com.thewizrd.extras.extrasModule
 import com.thewizrd.shared_resources.appLib
 import com.thewizrd.shared_resources.store.PlayStoreUtils
@@ -21,10 +24,13 @@ import com.thewizrd.simpleweather.NavGraphDirections
 import com.thewizrd.simpleweather.R
 import com.thewizrd.simpleweather.locale.UserLocaleActivity
 import com.thewizrd.simpleweather.preferences.BaseSettingsFragment
+import com.thewizrd.simpleweather.preferences.DevSettingsFragment
 import com.thewizrd.simpleweather.preferences.SettingsFragment
 import com.thewizrd.simpleweather.preferences.`SettingsFragment$IconsFragmentDirections`
 import com.thewizrd.simpleweather.snackbar.Snackbar
 import com.thewizrd.simpleweather.utils.NavigationUtils.safeNavigate
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.tasks.await
 import timber.log.Timber
 
 fun initializeExtras() {
@@ -179,4 +185,13 @@ fun SettingsFragment.AboutAppFragment.setupReviewPreference(preference: Preferen
             }
         }
     }
+}
+
+fun DevSettingsFragment.updateFirebaseIdPreference(preference: Preference) {
+    runCatching {
+        lifecycleScope.launch {
+            val firebaseId = Firebase.installations.id.await()
+            preference.summary = firebaseId
+        }
+    }
 }

app/src/main/AndroidManifest.xml

@@ -49,6 +49,7 @@
         android:allowBackup="${allowBackup}"
         android:enableOnBackInvokedCallback="true"
         android:fullBackupContent="@xml/backup_rules"
+        android:dataExtractionRules="@xml/data_extraction_rules"
         android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"