Merge pull request #25 from SimpleAppProjects/feature/merge_5.13.0

v5.13.0

Author: thewizrd

app/build.gradle

@@ -1,23 +1,25 @@
-apply plugin: 'com.android.application'
-apply plugin: 'androidx.navigation.safeargs'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-kapt'
-apply plugin: 'com.google.devtools.ksp'
+plugins {
+    id 'com.android.application'
+    id 'androidx.navigation.safeargs'
+    id 'kotlin-android'
+    id 'kotlin-kapt'
+    id 'com.google.devtools.ksp'
+}
 
 android {
-    compileSdk rootProject.compileSdkVersion
+    compileSdk = libs.versions.compileSdkVersion.get().toInteger()
 
     defaultConfig {
         applicationId "com.thewizrd.simpleweather"
         testApplicationId "com.thewizrd.simpleweather.test"
         // Specifies the fully-qualified class name of the test instrumentation runner.
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        minSdkVersion rootProject.minSdkVersion
-        targetSdkVersion rootProject.targetSdkVersion
+        minSdkVersion libs.versions.minSdkVersion.get().toInteger()
+        targetSdkVersion libs.versions.targetSdkVersion.get().toInteger()
         // NOTE: Version Code Format (TargetSDK, Version Name, Build Number, Variant Code (Android: 0, WearOS: 1)
         // ex) 345100131 = (34, 5.10, 013, 0)
-        versionCode 355120090
-        versionName "5.12.0"
+        versionCode 365130140
+        versionName "5.13.0"
 
         vectorDrawables {
             useSupportLibrary true
@@ -29,7 +31,7 @@ android {
             applicationIdSuffix ".debug"
             debuggable true
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             manifestPlaceholders = [allowBackup: false]
         }
         release {
@@ -100,88 +102,88 @@ dependencies {
     fullgmsImplementation project(":extras")
 
     // Unit Testing
-    androidTestImplementation "androidx.test:core:$test_core_version"
+    androidTestImplementation libs.test.core
 
     // AndroidJUnitRunner and JUnit Rules
-    androidTestImplementation "androidx.test:runner:$test_runner_version"
-    androidTestImplementation "androidx.test:rules:$test_rules_version"
+    androidTestImplementation libs.test.runner
+    androidTestImplementation libs.test.rules
 
     // Assertions
-    androidTestImplementation "androidx.test.ext:junit:$junit_version"
-    androidTestImplementation "androidx.test.ext:truth:$androidx_truth_version"
-    androidTestImplementation "com.google.truth:truth:$google_truth_version"
+    androidTestImplementation libs.test.ext.junit
+    androidTestImplementation libs.test.ext.truth
+    androidTestImplementation libs.google.truth
 
-    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:$desugar_version"
+    coreLibraryDesugaring libs.desugar.jdk.libs
 
     // Kotlin
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinx_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinx_version"
-
-    implementation "androidx.core:core-ktx:$core_version"
-    implementation "androidx.core:core-splashscreen:$coresplash_version"
-    implementation "androidx.appcompat:appcompat:$appcompat_version"
-    implementation "androidx.fragment:fragment-ktx:$fragment_version"
-    implementation "com.google.android.material:material:$material_version"
-    implementation "androidx.arch.core:core-runtime:$arch_core_runtime_version"
-    implementation 'androidx.cardview:cardview:1.0.0'
-    implementation "androidx.recyclerview:recyclerview:$recyclerview_version"
-    implementation "androidx.preference:preference-ktx:$preference_version"
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation "androidx.annotation:annotation:$annotation_version"
-    implementation "androidx.constraintlayout:constraintlayout:$constraintlayout_version"
-    implementation "androidx.vectordrawable:vectordrawable:$vectordrawable_version"
-    implementation 'androidx.palette:palette-ktx:1.0.0'
-    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
-    implementation "androidx.paging:paging-runtime-ktx:$paging_version"
-    implementation "androidx.work:work-runtime-ktx:$work_version"
-    implementation "androidx.work:work-multiprocess:$work_version"
-
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
-
-    implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
-    implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
-
-    implementation "androidx.room:room-runtime:$room_version"
-    ksp "androidx.room:room-compiler:$room_version"
-
-    implementation "com.squareup.okhttp3:okhttp:$okhttp_version"
-    implementation "com.github.bumptech.glide:glide:$glide_version"
-    ksp "com.github.bumptech.glide:ksp:$glide_version"
-    implementation "com.jakewharton.timber:timber:$timber_version"
-    implementation "com.ibm.icu:icu4j:$icu4j_version"
-    implementation 'com.github.skydoves:colorpickerview:2.3.0'
-
-    implementation "com.squareup.moshi:moshi-kotlin:$moshi_version"
-    ksp "com.squareup.moshi:moshi-kotlin-codegen:$moshi_version"
-    implementation "com.squareup.moshi:moshi-adapters:$moshi_version"
+    implementation libs.kotlinx.coroutines.core
+    implementation libs.kotlinx.coroutines.android
+
+    implementation libs.core.ktx
+    implementation libs.core.splashscreen
+    implementation libs.appcompat
+    implementation libs.fragment.ktx
+    implementation libs.material
+    implementation libs.arch.core.runtime
+    implementation libs.cardview
+    implementation libs.recyclerview
+    implementation libs.preference.ktx
+    implementation libs.legacy.support.v4
+    implementation libs.annotation
+    implementation libs.constraintlayout
+    implementation libs.vectordrawable
+    implementation libs.palette.ktx
+    implementation libs.swiperefreshlayout
+    implementation libs.paging.runtime.ktx
+    implementation libs.work.runtime.ktx
+    implementation libs.work.multiprocess
+
+    implementation libs.lifecycle.extensions
+    implementation libs.lifecycle.runtime.ktx
+
+    implementation libs.navigation.fragment.ktx
+    implementation libs.navigation.ui.ktx
+
+    implementation libs.room.runtime
+    ksp libs.room.compiler
+
+    implementation libs.okhttp
+    implementation libs.glide
+    ksp libs.glide.ksp
+    implementation libs.timber
+    implementation libs.icu4j
+    implementation libs.colorpickerview
+
+    implementation libs.moshi.kotlin
+    ksp libs.moshi.kotlin.codegen
+    implementation libs.moshi.adapters
 
     // Firebase
-    fullgmsImplementation platform("com.google.firebase:firebase-bom:$firebase_version")
-    fullgmsImplementation 'com.google.firebase:firebase-analytics'
-    fullgmsImplementation 'com.google.firebase:firebase-crashlytics'
-    fullgmsImplementation 'com.google.firebase:firebase-auth'
-    fullgmsImplementation 'com.google.firebase:firebase-firestore'
-    fullgmsImplementation 'com.google.firebase:firebase-messaging'
-    fullgmsImplementation 'com.google.firebase:firebase-storage'
-    fullgmsImplementation 'com.google.firebase:firebase-database'
-    fullgmsImplementation 'com.google.firebase:firebase-config'
-    fullgmsImplementation 'com.google.firebase:firebase-perf'
-
-    fullgmsImplementation "com.google.android.gms:play-services-base:$gms_base_version"
-    fullgmsImplementation "com.google.android.gms:play-services-location:$gms_location_version"
-    fullgmsImplementation 'com.google.android.gms:play-services-maps:19.2.0'
-    fullgmsImplementation "com.google.android.gms:play-services-wearable:$gms_wearable_version"
-    fullgmsImplementation 'com.google.android.play:app-update-ktx:2.1.0'
-    fullgmsImplementation 'com.google.android.play:feature-delivery-ktx:2.1.0'
-    fullgmsImplementation 'com.google.android.play:review-ktx:2.0.2'
-    fullgmsImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-play-services:$kotlinx_version"
-
-    nongmsImplementation 'org.osmdroid:osmdroid-android:6.1.20'
+    fullgmsImplementation platform(libs.firebase.bom)
+    fullgmsImplementation libs.firebase.analytics
+    fullgmsImplementation libs.firebase.crashlytics
+    fullgmsImplementation libs.firebase.auth
+    fullgmsImplementation libs.firebase.firestore
+    fullgmsImplementation libs.firebase.messaging
+    fullgmsImplementation libs.firebase.storage
+    fullgmsImplementation libs.firebase.database
+    fullgmsImplementation libs.firebase.config
+    fullgmsImplementation libs.firebase.perf
+
+    fullgmsImplementation libs.gms.play.services.base
+    fullgmsImplementation libs.gms.play.services.location
+    fullgmsImplementation libs.gms.play.services.maps
+    fullgmsImplementation libs.gms.play.services.wearable
+    fullgmsImplementation libs.play.app.update.ktx
+    fullgmsImplementation libs.play.feature.delivery.ktx
+    fullgmsImplementation libs.play.review.ktx
+    fullgmsImplementation libs.kotlinx.coroutines.play.services
+
+    nongmsImplementation libs.osmdroid.android
 }
 
 if (getGradle().getStartParameter().getTaskRequests().toString().contains("Fullgms")) {
     apply plugin: 'com.google.gms.google-services'
     apply plugin: 'com.google.firebase.crashlytics'
     apply plugin: 'com.google.firebase.firebase-perf'
-}
+}

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

@@ -12,7 +12,11 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.thewizrd.common.CommonModule
 import com.thewizrd.common.commonModule
 import com.thewizrd.common.controls.WeatherUiModel
-import com.thewizrd.shared_resources.*
+import com.thewizrd.shared_resources.AppState
+import com.thewizrd.shared_resources.ApplicationLib
+import com.thewizrd.shared_resources.DateTimeConstants
+import com.thewizrd.shared_resources.SharedModule
+import com.thewizrd.shared_resources.appLib
 import com.thewizrd.shared_resources.di.settingsManager
 import com.thewizrd.shared_resources.exceptions.WeatherException
 import com.thewizrd.shared_resources.locationdata.LocationData
@@ -21,6 +25,7 @@ import com.thewizrd.shared_resources.locationdata.toLocationData
 import com.thewizrd.shared_resources.okhttp3.OkHttp3Utils.await
 import com.thewizrd.shared_resources.preferences.SettingsManager
 import com.thewizrd.shared_resources.remoteconfig.WeatherProviderConfig
+import com.thewizrd.shared_resources.sharedDeps
 import com.thewizrd.shared_resources.utils.Coordinate
 import com.thewizrd.shared_resources.utils.DateTimeUtils
 import com.thewizrd.shared_resources.utils.JSONParser
@@ -39,6 +44,7 @@ import com.thewizrd.weather_api.google.location.AndroidLocationProvider
 import com.thewizrd.weather_api.google.location.GoogleLocationProvider
 import com.thewizrd.weather_api.google.location.getFromLocationNameAsync
 import com.thewizrd.weather_api.google.location.isGeocoderAvailable
+import com.thewizrd.weather_api.google.pollen.GooglePollenProvider
 import com.thewizrd.weather_api.here.auth.hereOAuthService
 import com.thewizrd.weather_api.locationiq.LocationIQProvider
 import com.thewizrd.weather_api.nws.SolCalcAstroProvider
@@ -53,15 +59,17 @@ import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import okhttp3.Request
 import org.junit.After
-import org.junit.Assert.*
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import java.io.IOException
 import java.time.Duration
 import java.time.ZonedDateTime
 import java.time.format.DateTimeFormatter
-import java.util.*
+import java.util.Locale
 import java.util.concurrent.ExecutionException
 
 @RunWith(AndroidJUnit4::class)
@@ -307,8 +315,8 @@ class UnitTests {
     @Throws(ExecutionException::class, InterruptedException::class)
     fun firebaseDBTest() {
         runBlocking(Dispatchers.Default) {
-            val updateTime = ImageDatabase.getLastUpdateTime()
-            assertTrue(updateTime > 0)
+            val remoteDBVersionTimestamp = ImageDatabase.getVersionTimestamp()
+            assertTrue(remoteDBVersionTimestamp > 0)
         }
     }
 
@@ -674,6 +682,29 @@ class UnitTests {
         settingsManager.setPersonalKey(WeatherAPI.GOOGLE, false)
     }
 
+    @Throws(WeatherException::class)
+    @Test
+    fun getGooglePollen() {
+        val originalKey = settingsManager.getAPIKey(WeatherAPI.GOOGLE_POLLEN)
+
+        settingsManager.setPersonalKey(WeatherAPI.GOOGLE_POLLEN, true)
+        settingsManager.setAPIKey(WeatherAPI.GOOGLE_POLLEN, "Google_REPLACE_VALUE")
+
+        runBlocking(Dispatchers.Default) {
+            val locationData = LocationData().apply {
+                latitude = 47.6721646
+                longitude = -122.1706614
+                tzLong = "America/Los_Angeles"
+            }
+
+            val pollen = GooglePollenProvider().getPollenData(locationData) // ~ Mountain View
+            assertNotNull(pollen)
+        }
+
+        settingsManager.setAPIKey(WeatherAPI.GOOGLE_POLLEN, originalKey)
+        settingsManager.setPersonalKey(WeatherAPI.GOOGLE_POLLEN, false)
+    }
+
     @Test
     fun moshiSerializeTest() {
         JSONParser.deserializer<WeatherProviderConfig>(

app/src/fullgms/AndroidManifest.xml

@@ -4,6 +4,22 @@
 
     <application tools:ignore="AllowBackup,MissingApplicationIcon">
 
+        <activity
+            android:name=".wearable.RemoteLaunchActivity"
+            android:theme="@android:style/Theme.NoDisplay"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:scheme="simpleweather"
+                    android:host="launch-activity" />
+            </intent-filter>
+        </activity>
+
         <service
             android:name=".wearable.WearableDataListenerService"
             android:enabled="true"

app/src/fullgms/java/com/thewizrd/simpleweather/FirebaseConfigurator.kt

@@ -5,7 +5,11 @@ import android.content.Context
 import com.google.firebase.analytics.FirebaseAnalytics
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.google.firebase.messaging.FirebaseMessaging
+import com.google.firebase.remoteconfig.ConfigUpdate
+import com.google.firebase.remoteconfig.ConfigUpdateListener
 import com.google.firebase.remoteconfig.FirebaseRemoteConfig
+import com.google.firebase.remoteconfig.FirebaseRemoteConfigException
+import com.thewizrd.shared_resources.remoteconfig.remoteConfigService
 import com.thewizrd.shared_resources.utils.AnalyticsProps
 import com.thewizrd.shared_resources.utils.ContextUtils.isLargeTablet
 import com.thewizrd.shared_resources.utils.ContextUtils.isSmallestWidth
@@ -47,5 +51,24 @@ object FirebaseConfigurator {
                 FirebaseMessaging.getInstance().subscribeToTopic("debug_all")
             }
         }
+
+        // Add Firebase RemoteConfig real-time listener
+        FirebaseRemoteConfig.getInstance().run {
+            addOnConfigUpdateListener(object : ConfigUpdateListener {
+                override fun onUpdate(configUpdate: ConfigUpdate) {
+                    Logger.verbose("FirebaseConfigurator", "Remote update received")
+
+                    remoteConfigService.checkConfig()
+                }
+
+                override fun onError(error: FirebaseRemoteConfigException) {
+                    Logger.error(
+                        "FirebaseConfigurator",
+                        message = "Error on real-time update",
+                        t = error
+                    )
+                }
+            })
+        }
     }
 }

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

@@ -12,8 +12,8 @@ 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.google.firebase.Firebase
+import com.google.firebase.installations.installations
 import com.thewizrd.extras.extrasModule
 import com.thewizrd.shared_resources.appLib
 import com.thewizrd.shared_resources.store.PlayStoreUtils