Develop

.gitignore

@@ -35,4 +35,5 @@ API_KEY.txt
 google-services.json
 /.privado/
 /.detekt
-/.kotlin
+/.kotlin
+/.skills

app/build.gradle

@@ -1,8 +1,7 @@
 plugins {
  id 'com.android.application'
  id 'androidx.navigation.safeargs'
- id 'kotlin-android'
- id 'kotlin-kapt'
+ id 'com.android.legacy-kapt'
  id 'com.google.devtools.ksp'
 }
 
@@ -18,11 +17,11 @@ android {
  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 365130140
- versionName "5.13.0"
+ versionCode 375140110
+ versionName "5.14.0"
 
  vectorDrawables {
- useSupportLibrary true
+ useSupportLibrary = true
  }
  }
 
@@ -47,18 +46,19 @@ android {
  dataBinding true
  viewBinding true
  buildConfig true
+ resValues true
  }
 
  compileOptions {
  // Flag to enable support for the new language APIs
  coreLibraryDesugaringEnabled true
  // Sets Java compatibility to Java 8
- sourceCompatibility JavaVersion.VERSION_17
- targetCompatibility JavaVersion.VERSION_17
+ sourceCompatibility JavaVersion.VERSION_21
+ targetCompatibility JavaVersion.VERSION_21
  }
 
  kotlin {
- jvmToolchain(17)
+ jvmToolchain(21)
  }
 
  sourceSets {

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

@@ -682,6 +682,17 @@ class UnitTests {
  settingsManager.setPersonalKey(WeatherAPI.GOOGLE, false)
  }
 
+ @Throws(WeatherException::class)
+ @Test
+ fun getOpenMeteoWeather() {
+ runBlocking(Dispatchers.Default) {
+ val provider = weatherModule.weatherManager.getWeatherProvider(WeatherAPI.OPENMETEO)
+ val weather =
+ getWeather(provider, Coordinate(52.52, 13.41)) // ~ Berlin
+ assertTrue(weather.isValid && WeatherUiModel(weather).isValid)
+ }
+ }
+
  @Throws(WeatherException::class)
  @Test
  fun getGooglePollen() {

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

@@ -12,20 +12,23 @@ 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.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
 import com.thewizrd.shared_resources.locationdata.WeatherLocationProvider
 import com.thewizrd.shared_resources.locationdata.toLocationData
 import com.thewizrd.shared_resources.preferences.SettingsManager
+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
 import com.thewizrd.shared_resources.weatherdata.WeatherAPI
 import com.thewizrd.shared_resources.weatherdata.WeatherProvider
 import com.thewizrd.shared_resources.weatherdata.model.Weather
-import com.thewizrd.simpleweather.viewmodels.WeatherNowViewModel
 import com.thewizrd.weather_api.aqicn.AQICNProvider
 import com.thewizrd.weather_api.google.location.getFromLocationAsync
 import com.thewizrd.weather_api.google.location.getFromLocationNameAsync
@@ -41,15 +44,18 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import org.junit.After
-import org.junit.Assert.*
+import org.junit.Assert.assertEquals
+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
 
 @RunWith(AndroidJUnit4::class)
 class UnitTests {
@@ -546,4 +552,15 @@ class UnitTests {
  assertTrue(weather.isValid && WeatherUiModel(weather).isValid)
  }
  }
+
+ @Throws(WeatherException::class)
+ @Test
+ fun getOpenMeteoWeather() {
+ runBlocking(Dispatchers.Default) {
+ val provider = weatherModule.weatherManager.getWeatherProvider(WeatherAPI.OPENMETEO)
+ val weather =
+ getWeather(provider, Coordinate(52.52, 13.41)) // ~ Berlin
+ assertTrue(weather.isValid && WeatherUiModel(weather).isValid)
+ }
+ }
 }

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

@@ -9,6 +9,7 @@ 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.R as sharedRes
 import com.thewizrd.shared_resources.remoteconfig.remoteConfigService
 import com.thewizrd.shared_resources.utils.AnalyticsProps
 import com.thewizrd.shared_resources.utils.ContextUtils.isLargeTablet
@@ -38,7 +39,7 @@ object FirebaseConfigurator {
  isCrashlyticsCollectionEnabled = true
  sendUnsentReports()
  }
- FirebaseRemoteConfig.getInstance().setDefaultsAsync(R.xml.remote_config_defaults)
+ FirebaseRemoteConfig.getInstance().setDefaultsAsync(sharedRes.xml.remote_config_defaults)
 
  if (!BuildConfig.DEBUG) {
  Logger.registerLogger(CrashlyticsLoggingTree())

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

@@ -32,6 +32,7 @@ import com.thewizrd.simpleweather.utils.NavigationUtils.safeNavigate
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.tasks.await
 import timber.log.Timber
+import com.thewizrd.extras.R as extrasRes
 
 fun initializeExtras() {
  extrasModule.initialize()
@@ -84,7 +85,7 @@ fun BaseSettingsFragment.navigateToPremiumFragment() {
  showSnackbar(
  Snackbar.make(
  rootView.context,
-R.string.message_premium_required,
+extrasRes.string.message_premium_required,
  Snackbar.Duration.SHORT
  ),
  null
@@ -102,7 +103,7 @@ fun SettingsFragment.IconsFragment.navigateUnsupportedIconPack() {
  showSnackbar(
  Snackbar.make(
  rootView.context,
-R.string.message_premium_required,
+extrasRes.string.message_premium_required,
  Snackbar.Duration.SHORT
  ),
  null
@@ -124,7 +125,7 @@ fun isPremiumSupported(): Boolean {
 }
 
 fun isRadarInteractionEnabled(): Boolean {
- return extrasModule.isAtLeastProEnabled()
+ return true
 }
 
 fun areNotificationExtrasEnabled(): Boolean {
@@ -133,8 +134,8 @@ fun areNotificationExtrasEnabled(): Boolean {
 
 fun SettingsFragment.createPremiumPreference(): Preference {
  val premiumPref = Preference(requireContext()).apply {
- title = context.getString(R.string.pref_title_premium)
- summary = context.getString(R.string.pref_summary_premium)
+ title = context.getString(extrasRes.string.pref_title_premium)
+ summary = context.getString(extrasRes.string.pref_summary_premium)
  setIcon(R.drawable.ic_star_24dp)
  order = 0
  }
@@ -147,7 +148,7 @@ fun SettingsFragment.createPremiumPreference(): Preference {
  showSnackbar(
  Snackbar.make(
  rootView.context,
-R.string.message_premium_required,
+extrasRes.string.message_premium_required,
  Snackbar.Duration.SHORT
  ),
  null

app/src/fullgms/java/com/thewizrd/simpleweather/radar/rainviewer/RainViewerViewProvider.kt

@@ -333,7 +333,7 @@ class RainViewerViewProvider(context: Context, rootView: ViewGroup) : MapTileRad
  */
  private fun checkTileExists(x: Int, y: Int, zoom: Int): Boolean {
  val minZoom = MIN_ZOOM_LEVEL
- val maxZoom = MAX_ZOOM_LEVEL
+ val maxZoom = 7
 
  return zoom in minZoom..maxZoom
  }

app/src/fullgms/java/com/thewizrd/simpleweather/radar/tomorrowio/TomorrowIoRadarViewProvider.kt

@@ -20,6 +20,7 @@ import com.thewizrd.shared_resources.utils.Coordinate
 import com.thewizrd.shared_resources.utils.DateTimeUtils
 import com.thewizrd.shared_resources.weatherdata.WeatherAPI
 import com.thewizrd.simpleweather.databinding.RadarAnimateContainerBinding
+import com.thewizrd.simpleweather.extras.isRadarInteractionEnabled
 import com.thewizrd.simpleweather.radar.CachingUrlTileProvider
 import com.thewizrd.simpleweather.radar.MapTileRadarViewProvider
 import com.thewizrd.weather_api.keys.Keys
@@ -88,7 +89,7 @@ class TomorrowIoRadarViewProvider(context: Context, rootView: ViewGroup) :
 
  override fun updateRadarView() {
  radarContainerBinding!!.radarToolbar.visibility =
- if (interactionsEnabled()/* && isRadarInteractionEnabled()*/) View.VISIBLE else View.GONE
+ if (interactionsEnabled() && isRadarInteractionEnabled()) View.VISIBLE else View.GONE
  mapView.getMapAsync(this)
  }