SimpleAppProjects · thewizrd · Sep 16, 2024 · Feb 4, 2024 · Feb 4, 2024 · Feb 4, 2024
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,15 +9,18 @@ android {
 
     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
-        // NOTE: Version Code Format (TargetSDK, Version Name, Build Number, Variant Code (Android: 00, WearOS: 01)
-        versionCode 335840000
-        versionName "5.8.4"
+        // NOTE: Version Code Format (TargetSDK, Version Name, Build Number, Variant Code (Android: 0, WearOS: 1)
+        versionCode 345100040
+        versionName "5.10.0"
 
-        vectorDrawables.useSupportLibrary true
+        vectorDrawables {
+            useSupportLibrary true
+        }
     }
 
     buildTypes {
@@ -40,6 +43,7 @@ android {
     buildFeatures {
         dataBinding true
         viewBinding true
+        buildConfig true
     }
 
     compileOptions {
@@ -124,7 +128,7 @@ dependencies {
     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:1.1.0'
+    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"
@@ -145,7 +149,7 @@ dependencies {
     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.2.4'
+    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"
@@ -163,15 +167,16 @@ dependencies {
     fullgmsImplementation 'com.google.firebase:firebase-config'
     fullgmsImplementation 'com.google.firebase:firebase-perf'
 
-    fullgmsImplementation 'com.google.android.gms:play-services-base:18.2.0'
+    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:18.1.0'
-    fullgmsImplementation 'com.google.android.gms:play-services-wearable:18.1.0'
+    fullgmsImplementation 'com.google.android.gms:play-services-maps:19.0.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.1'
     fullgmsImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-play-services:$kotlinx_version"
 
-    nongmsImplementation 'org.osmdroid:osmdroid-android:6.1.16'
+    nongmsImplementation 'org.osmdroid:osmdroid-android:6.1.20'
 }
 
 if (getGradle().getStartParameter().getTaskRequests().toString().contains("Fullgms")) {

diff --git a/.../simpleweather/ExampleInstrumentedTest.kt → ...d/simpleweather/test/InstrumentedTests.kt b/.../simpleweather/ExampleInstrumentedTest.kt → ...d/simpleweather/test/InstrumentedTests.kt
@@ -1,4 +1,4 @@
-package com.thewizrd.simpleweather
+package com.thewizrd.simpleweather.test
 
 import android.content.Context
 import android.content.SharedPreferences
@@ -49,7 +49,7 @@ import java.util.*
  * @see [Testing documentation](http://d.android.com/tools/testing)
  */
 @RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
+class InstrumentedTests {
     private lateinit var settingsManager: SettingsManager
 
     @Before

diff --git a/...a/com/thewizrd/simpleweather/UnitTests.kt → .../thewizrd/simpleweather/test/UnitTests.kt b/...a/com/thewizrd/simpleweather/UnitTests.kt → .../thewizrd/simpleweather/test/UnitTests.kt
@@ -1,4 +1,4 @@
-package com.thewizrd.simpleweather
+package com.thewizrd.simpleweather.test
 
 import android.content.Context
 import android.content.SharedPreferences
@@ -13,6 +13,7 @@ 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.di.settingsManager
 import com.thewizrd.shared_resources.exceptions.WeatherException
 import com.thewizrd.shared_resources.locationdata.LocationData
 import com.thewizrd.shared_resources.locationdata.WeatherLocationProvider
@@ -22,9 +23,11 @@ import com.thewizrd.shared_resources.remoteconfig.WeatherProviderConfig
 import com.thewizrd.shared_resources.utils.Coordinate
 import com.thewizrd.shared_resources.utils.DateTimeUtils
 import com.thewizrd.shared_resources.utils.JSONParser
+import com.thewizrd.shared_resources.utils.LocaleUtils
 import com.thewizrd.shared_resources.utils.ZoneIdCompat
 import com.thewizrd.shared_resources.weatherdata.WeatherAPI
 import com.thewizrd.shared_resources.weatherdata.WeatherProvider
+import com.thewizrd.shared_resources.weatherdata.auth.BasicAuthProviderKey
 import com.thewizrd.shared_resources.weatherdata.model.Weather
 import com.thewizrd.simpleweather.images.ImageDatabase
 import com.thewizrd.simpleweather.images.model.ImageData
@@ -97,19 +100,19 @@ class UnitTests {
         }
 
         runBlocking {
-            appLib.settingsManager.loadIfNeeded()
+            settingsManager.loadIfNeeded()
         }
 
-        if (appLib.settingsManager.usePersonalKey()) {
-            appLib.settingsManager.setPersonalKey(false)
+        if (settingsManager.usePersonalKey()) {
+            settingsManager.setPersonalKey(false)
             wasUsingPersonalKey = true
         }
     }
 
     @After
     fun destroy() {
         if (wasUsingPersonalKey) {
-            appLib.settingsManager.setPersonalKey(true)
+            settingsManager.setPersonalKey(true)
             wasUsingPersonalKey = false
         }
     }
@@ -470,28 +473,43 @@ class UnitTests {
     @Throws(WeatherException::class)
     @Test
     fun getTomorrowIOWeather() {
+        settingsManager.setPersonalKey(true)
+        settingsManager.setAPIKey(WeatherAPI.TOMORROWIO, "TomorrowIo_REPLACE_VALUE")
+
         runBlocking(Dispatchers.Default) {
             val provider = weatherModule.weatherManager.getWeatherProvider(WeatherAPI.TOMORROWIO)
             val weather =
                 getWeather(provider, Coordinate(34.0207305, -118.6919157)) // ~ Los Angeles
             assertTrue(weather.isValid && WeatherUiModel(weather).isValid)
         }
+
+        settingsManager.setAPIKey(WeatherAPI.TOMORROWIO, null)
+        settingsManager.setPersonalKey(false)
     }
 
     @Throws(WeatherException::class)
     @Test
     fun getWeatherbitIOWeather() {
+        settingsManager.setPersonalKey(true)
+        settingsManager.setAPIKey(WeatherAPI.WEATHERBITIO, "WeatherBitIo_REPLACE_VALUE")
+
         runBlocking(Dispatchers.Default) {
             val provider =
                 weatherModule.weatherManager.getWeatherProvider(WeatherAPI.WEATHERBITIO)
             val weather =
                 getWeather(provider, Coordinate(39.9, -105.1)) // ~ Denver, CO
             assertTrue(weather.isValid && WeatherUiModel(weather).isValid)
         }
+
+        settingsManager.setAPIKey(WeatherAPI.WEATHERBITIO, null)
+        settingsManager.setPersonalKey(false)
     }
 
     @Test
     fun getPollenData() {
+        settingsManager.setPersonalKey(true)
+        settingsManager.setAPIKey(WeatherAPI.TOMORROWIO, "TomorrowIo_REPLACE_VALUE")
+
         runBlocking(Dispatchers.Default) {
             val provider = TomorrowIOWeatherProvider()
             val location =
@@ -500,18 +518,30 @@ class UnitTests {
             val pollenData = provider.getPollenData(location!!)
             assertNotNull(pollenData)
         }
+
+        settingsManager.setAPIKey(WeatherAPI.TOMORROWIO, null)
+        settingsManager.setPersonalKey(false)
     }
 
     @Throws(WeatherException::class)
     @Test
     fun getMeteomaticsWeather() {
+        settingsManager.setPersonalKey(true)
+        settingsManager.setAPIKey(
+            WeatherAPI.METEOMATICS,
+            BasicAuthProviderKey("username", "password").toString()
+        )
+
         runBlocking(Dispatchers.Default) {
             val provider =
                 weatherModule.weatherManager.getWeatherProvider(WeatherAPI.METEOMATICS)
             val weather =
                 getWeather(provider, Coordinate(52.22, 20.97))
             assertTrue(weather.isValid && WeatherUiModel(weather).isValid)
         }
+
+        settingsManager.setAPIKey(WeatherAPI.METEOMATICS, null)
+        settingsManager.setPersonalKey(false)
     }
 
     @Test
@@ -543,6 +573,47 @@ class UnitTests {
         }
     }
 
+    @Throws(WeatherException::class)
+    @Test
+    fun getDWDWeather() {
+        runBlocking(Dispatchers.Default) {
+            val provider =
+                weatherModule.weatherManager.getWeatherProvider(WeatherAPI.DWD)
+            val weather =
+                getWeather(provider, Coordinate(52.52, 13.4)) // Berlin
+            assertTrue(weather.isValid && WeatherUiModel(weather).isValid)
+        }
+    }
+
+    @Throws(WeatherException::class)
+    @Test
+    fun getECCCWeather() {
+        runBlocking(Dispatchers.Default) {
+            val provider =
+                weatherModule.weatherManager.getWeatherProvider(WeatherAPI.ECCC)
+            val weather =
+                getWeather(provider, Coordinate(48.737, -91.984)) // Banning, ON
+            assertTrue(weather.isValid && WeatherUiModel(weather).isValid)
+        }
+    }
+
+    @Throws(WeatherException::class)
+    @Test
+    fun getECCCWeather_FR() {
+        runBlocking(Dispatchers.Default) {
+            val locale = LocaleUtils.getLocale()
+            LocaleUtils.setLocaleCode(Locale.CANADA_FRENCH.toLanguageTag())
+
+            val provider =
+                weatherModule.weatherManager.getWeatherProvider(WeatherAPI.ECCC)
+            val weather =
+                getWeather(provider, Coordinate(48.737, -91.984)) // Banning, ON
+            assertTrue(weather.isValid && WeatherUiModel(weather).isValid)
+            // Restore
+            LocaleUtils.setLocaleCode(locale.toLanguageTag())
+        }
+    }
+
     @Test
     fun moshiSerializeTest() {
         JSONParser.deserializer<WeatherProviderConfig>(

diff --git a/...a/com/thewizrd/simpleweather/UnitTests.kt → .../thewizrd/simpleweather/test/UnitTests.kt b/...a/com/thewizrd/simpleweather/UnitTests.kt → .../thewizrd/simpleweather/test/UnitTests.kt
@@ -1,4 +1,4 @@
-package com.thewizrd.simpleweather
+package com.thewizrd.simpleweather.test
 
 import android.content.Context
 import android.content.SharedPreferences

diff --git a/app/src/fullgms/java/com/thewizrd/simpleweather/FirebaseConfigurator.kt b/app/src/fullgms/java/com/thewizrd/simpleweather/FirebaseConfigurator.kt
@@ -6,14 +6,25 @@ import com.google.firebase.analytics.FirebaseAnalytics
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.google.firebase.messaging.FirebaseMessaging
 import com.google.firebase.remoteconfig.FirebaseRemoteConfig
+import com.thewizrd.shared_resources.utils.AnalyticsProps
+import com.thewizrd.shared_resources.utils.ContextUtils.isLargeTablet
+import com.thewizrd.shared_resources.utils.ContextUtils.isSmallestWidth
+import com.thewizrd.shared_resources.utils.ContextUtils.isTv
 import com.thewizrd.shared_resources.utils.CrashlyticsLoggingTree
 import com.thewizrd.shared_resources.utils.Logger
-import timber.log.Timber
 
 object FirebaseConfigurator {
     @SuppressLint("MissingPermission")
     fun initialize(context: Context) {
-        FirebaseAnalytics.getInstance(context).setUserProperty("device_type", "mobile")
+        FirebaseAnalytics.getInstance(context).setUserProperty(
+            AnalyticsProps.DEVICE_TYPE, if (context.isTv()) {
+                "tv"
+            } else if (context.isLargeTablet() || context.isSmallestWidth(600)) {
+                "tablet"
+            } else {
+                "mobile"
+            }
+        )
 
         FirebaseCrashlytics.getInstance().apply {
             setCrashlyticsCollectionEnabled(true)

diff --git a/app/src/fullgms/java/com/thewizrd/simpleweather/extras/Extras.kt b/app/src/fullgms/java/com/thewizrd/simpleweather/extras/Extras.kt
@@ -9,11 +9,16 @@ import android.content.Intent
 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.thewizrd.extras.extrasModule
 import com.thewizrd.shared_resources.appLib
 import com.thewizrd.shared_resources.store.PlayStoreUtils
-import com.thewizrd.simpleweather.*
+import com.thewizrd.simpleweather.App
+import com.thewizrd.simpleweather.BuildConfig
+import com.thewizrd.simpleweather.FirebaseConfigurator
+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.SettingsFragment
@@ -25,13 +30,16 @@ import timber.log.Timber
 fun initializeExtras() {
     extrasModule.initialize()
 
-    MapsInitializer.initialize(appLib.context, MapsInitializer.Renderer.LATEST) {
+    MapsInitializer.initialize(
+        appLib.context,
+        if (BuildConfig.DEBUG) Renderer.LEGACY else Renderer.LATEST
+    ) {
         when (it) {
-            MapsInitializer.Renderer.LATEST -> {
+            Renderer.LATEST -> {
                 Timber.tag("Application").d("The latest version of the renderer is used.")
             }
 
-            MapsInitializer.Renderer.LEGACY -> {
+            Renderer.LEGACY -> {
                 Timber.tag("Application").d("The legacy version of the renderer is used.")
             }
         }
@@ -83,7 +91,7 @@ fun SettingsFragment.IconsFragment.navigateUnsupportedIconPack() {
     // Navigate to premium page
     if (isPremiumSupported()) {
         rootView.findNavController()
-            .navigate(`SettingsFragment$IconsFragmentDirections`.actionIconsFragmentToPremiumFragment())
+            .safeNavigate(`SettingsFragment$IconsFragmentDirections`.actionIconsFragmentToPremiumFragment())
     } else {
         showSnackbar(
             Snackbar.make(
@@ -98,7 +106,7 @@ fun SettingsFragment.IconsFragment.navigateUnsupportedIconPack() {
 }
 
 fun enableAdditionalRefreshIntervals(): Boolean {
-    return extrasModule.isEnabled()
+    return extrasModule.isPremiumEnabled()
 }
 
 fun checkPremiumStatus() {
@@ -110,17 +118,17 @@ fun isPremiumSupported(): Boolean {
 }
 
 fun isRadarInteractionEnabled(): Boolean {
-    return extrasModule.isEnabled()
+    return extrasModule.isAtLeastProEnabled()
 }
 
 fun areNotificationExtrasEnabled(): Boolean {
-    return extrasModule.isEnabled()
+    return extrasModule.isAtLeastProEnabled()
 }
 
 fun SettingsFragment.createPremiumPreference(): Preference {
     val premiumPref = Preference(requireContext()).apply {
         title = context.getString(R.string.pref_title_premium)
-        summary = context.getString(R.string.message_premium_prompt)
+        summary = context.getString(R.string.pref_summary_premium)
         setIcon(R.drawable.ic_star_24dp)
         order = 0
     }