From a971ec7cad9cc73e43a33302ff730463169c581c Mon Sep 17 00:00:00 2001 From: Dave Antoine Date: Sun, 27 Aug 2023 18:51:25 -0400 Subject: [PATCH 1/7] bug fixes --- .../viewmodels/AirQualityForecastViewModel.kt | 8 +++-- .../controls/viewmodels/ChartsViewModel.kt | 10 ++++-- .../WeatherAlertNotificationService.java | 2 +- .../preferences/SettingsFragment.kt | 10 ++++++ .../setup/SetupProviderFragment.kt | 10 ++++++ .../viewmodels/WeatherNowViewModel.kt | 16 +++++++--- .../viewmodels/LocationSearchViewModel.kt | 15 +++++++++ .../common/weatherdata/WeatherDataLoader.kt | 5 +-- .../viewmodels/WeatherNowViewModel.kt | 31 ++++++++++++++----- .../weather_api/weatherbit/HourlyResponse.kt | 2 +- 10 files changed, 88 insertions(+), 21 deletions(-) diff --git a/app/src/main/java/com/thewizrd/simpleweather/controls/viewmodels/AirQualityForecastViewModel.kt b/app/src/main/java/com/thewizrd/simpleweather/controls/viewmodels/AirQualityForecastViewModel.kt index 6c6064146..0fee26e62 100644 --- a/app/src/main/java/com/thewizrd/simpleweather/controls/viewmodels/AirQualityForecastViewModel.kt +++ b/app/src/main/java/com/thewizrd/simpleweather/controls/viewmodels/AirQualityForecastViewModel.kt @@ -4,7 +4,11 @@ import android.app.Application import androidx.annotation.MainThread import androidx.arch.core.util.Function import androidx.core.util.ObjectsCompat -import androidx.lifecycle.* +import androidx.lifecycle.AndroidViewModel +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.Observer +import androidx.lifecycle.viewModelScope import com.thewizrd.common.controls.AirQualityViewModel import com.thewizrd.shared_resources.database.WeatherDatabase import com.thewizrd.shared_resources.locationdata.LocationData @@ -49,7 +53,7 @@ class AirQualityForecastViewModel(app: Application) : AndroidViewModel(app) { } } - private val forecastObserver = Observer { forecastData -> + private val forecastObserver = Observer { forecastData -> this.aqiForecastData.postValue(forecastData?.aqiForecast) } diff --git a/app/src/main/java/com/thewizrd/simpleweather/controls/viewmodels/ChartsViewModel.kt b/app/src/main/java/com/thewizrd/simpleweather/controls/viewmodels/ChartsViewModel.kt index cec7c7984..fe6e03298 100644 --- a/app/src/main/java/com/thewizrd/simpleweather/controls/viewmodels/ChartsViewModel.kt +++ b/app/src/main/java/com/thewizrd/simpleweather/controls/viewmodels/ChartsViewModel.kt @@ -4,7 +4,11 @@ import android.app.Application import androidx.annotation.MainThread import androidx.arch.core.util.Function import androidx.core.util.ObjectsCompat -import androidx.lifecycle.* +import androidx.lifecycle.AndroidViewModel +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.Observer +import androidx.lifecycle.viewModelScope import com.thewizrd.shared_resources.database.WeatherDatabase import com.thewizrd.shared_resources.locationdata.LocationData import com.thewizrd.shared_resources.locationdata.LocationQuery @@ -85,7 +89,7 @@ class ChartsViewModel(app: Application) : AndroidViewModel(app) { } } - private val forecastObserver = Observer { forecastData -> + private val forecastObserver = Observer { forecastData -> this.forecastData.postValue( graphDataMapper.apply( Pair( @@ -96,7 +100,7 @@ class ChartsViewModel(app: Application) : AndroidViewModel(app) { ) } - private val hrforecastObserver = Observer> { forecastData -> + private val hrforecastObserver = Observer?> { forecastData -> this.forecastData.postValue( graphDataMapper.apply( Pair( diff --git a/app/src/main/java/com/thewizrd/simpleweather/notifications/WeatherAlertNotificationService.java b/app/src/main/java/com/thewizrd/simpleweather/notifications/WeatherAlertNotificationService.java index aaf62a8d7..3077dd25a 100644 --- a/app/src/main/java/com/thewizrd/simpleweather/notifications/WeatherAlertNotificationService.java +++ b/app/src/main/java/com/thewizrd/simpleweather/notifications/WeatherAlertNotificationService.java @@ -72,7 +72,7 @@ public void onCreate() { @Override public void onDestroy() { - String json = JSONParser.serializer(mNotifications, HashMap.class); + String json = JSONParser.serializer(mNotifications, Map.class); notifPrefs.edit().putString(KEY_NOTIFS, json).apply(); super.onDestroy(); diff --git a/app/src/main/java/com/thewizrd/simpleweather/preferences/SettingsFragment.kt b/app/src/main/java/com/thewizrd/simpleweather/preferences/SettingsFragment.kt index d3c68a6a9..62267a89d 100644 --- a/app/src/main/java/com/thewizrd/simpleweather/preferences/SettingsFragment.kt +++ b/app/src/main/java/com/thewizrd/simpleweather/preferences/SettingsFragment.kt @@ -576,6 +576,16 @@ class SettingsFragment : BaseSettingsFragment(), } registerPref = findPreference(KEY_APIREGISTER)!! + registerPref.setOnPreferenceClickListener { preference -> + preference.intent?.let { + runCatching { + if (it.resolveActivity(preference.context.packageManager) != null) { + startActivity(it) + } + } + } + true + } // Set key as verified if API Key is req for API and its set if (weatherModule.weatherManager.isKeyRequired()) { diff --git a/app/src/main/java/com/thewizrd/simpleweather/setup/SetupProviderFragment.kt b/app/src/main/java/com/thewizrd/simpleweather/setup/SetupProviderFragment.kt index 722bac702..e9219015d 100644 --- a/app/src/main/java/com/thewizrd/simpleweather/setup/SetupProviderFragment.kt +++ b/app/src/main/java/com/thewizrd/simpleweather/setup/SetupProviderFragment.kt @@ -175,6 +175,16 @@ class SetupProviderFragment : CustomPreferenceFragmentCompat(), StepperFragment } registerPref = findPreference(KEY_APIREGISTER)!! + registerPref.setOnPreferenceClickListener { preference -> + preference.intent?.let { + runCatching { + if (it.resolveActivity(preference.context.packageManager) != null) { + startActivity(it) + } + } + } + true + } providerPref.value = settingsManager.getAPI() diff --git a/app/src/main/java/com/thewizrd/simpleweather/viewmodels/WeatherNowViewModel.kt b/app/src/main/java/com/thewizrd/simpleweather/viewmodels/WeatherNowViewModel.kt index 30c8b3e10..8269949de 100644 --- a/app/src/main/java/com/thewizrd/simpleweather/viewmodels/WeatherNowViewModel.kt +++ b/app/src/main/java/com/thewizrd/simpleweather/viewmodels/WeatherNowViewModel.kt @@ -34,7 +34,11 @@ import com.thewizrd.simpleweather.R import com.thewizrd.simpleweather.controls.ImageDataViewModel import com.thewizrd.weather_api.weatherModule import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.flow.* +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.map +import kotlinx.coroutines.flow.stateIn +import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch import kotlinx.coroutines.withContext @@ -230,8 +234,9 @@ class WeatherNowViewModel(app: Application) : AndroidViewModel(app) { if (state.locationData?.countryCode?.let { !wm.isRegionSupported(it) } == true) { Logger.writeLine( Log.WARN, - "Location: %s", - JSONParser.serializer(state.locationData) + "Location: %s; countryCode: %s", + JSONParser.serializer(state.locationData), + state.locationData.countryCode ) Logger.writeLine( Log.WARN, @@ -288,8 +293,9 @@ class WeatherNowViewModel(app: Application) : AndroidViewModel(app) { if (state.locationData?.countryCode?.let { !wm.isRegionSupported(it) } == true) { Logger.writeLine( Log.WARN, - "Location: %s", - JSONParser.serializer(state.locationData) + "Location: %s; countryCode: %s", + JSONParser.serializer(state.locationData), + state.locationData.countryCode ) Logger.writeLine( Log.WARN, diff --git a/common/src/main/java/com/thewizrd/common/viewmodels/LocationSearchViewModel.kt b/common/src/main/java/com/thewizrd/common/viewmodels/LocationSearchViewModel.kt index 84204d707..6030e7833 100644 --- a/common/src/main/java/com/thewizrd/common/viewmodels/LocationSearchViewModel.kt +++ b/common/src/main/java/com/thewizrd/common/viewmodels/LocationSearchViewModel.kt @@ -1,6 +1,7 @@ package com.thewizrd.common.viewmodels import android.app.Application +import android.util.Log import androidx.annotation.StringRes import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.viewModelScope @@ -16,6 +17,8 @@ import com.thewizrd.shared_resources.locationdata.LocationQuery import com.thewizrd.shared_resources.locationdata.toLocationData import com.thewizrd.shared_resources.remoteconfig.remoteConfigService import com.thewizrd.shared_resources.utils.Coordinate +import com.thewizrd.shared_resources.utils.JSONParser +import com.thewizrd.shared_resources.utils.Logger import com.thewizrd.weather_api.weatherModule import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job @@ -162,6 +165,12 @@ class LocationSearchViewModel(app: Application) : AndroidViewModel(app) { } if (!wm.isRegionSupported(locQuery.locationCountry)) { + Logger.writeLine( + Log.WARN, + "Location: %s; countryCode: %s", + JSONParser.serializer(locQuery.toLocationData()), + locQuery.locationCountry + ) postErrorMessage(R.string.error_message_weather_region_unsupported) viewModelState.update { it.copy(isLoading = false) @@ -286,6 +295,12 @@ class LocationSearchViewModel(app: Application) : AndroidViewModel(app) { } if (!wm.isRegionSupported(queryResult.locationCountry)) { + Logger.writeLine( + Log.WARN, + "Location: %s; countryCode: %s", + JSONParser.serializer(queryResult.toLocationData()), + locQuery.locationCountry + ) postErrorMessage(R.string.error_message_weather_region_unsupported) viewModelState.update { it.copy(isLoading = false) diff --git a/common/src/main/java/com/thewizrd/common/weatherdata/WeatherDataLoader.kt b/common/src/main/java/com/thewizrd/common/weatherdata/WeatherDataLoader.kt index 84d80e773..a9f17a20d 100644 --- a/common/src/main/java/com/thewizrd/common/weatherdata/WeatherDataLoader.kt +++ b/common/src/main/java/com/thewizrd/common/weatherdata/WeatherDataLoader.kt @@ -157,8 +157,9 @@ class WeatherDataLoader { if (weather == null) { Logger.writeLine( Log.WARN, - "Location: %s", - JSONParser.serializer(location, LocationData::class.java) + "Location: %s; countryCode: %s", + JSONParser.serializer(location), + location.countryCode ) throw WeatherException(ErrorStatus.QUERYNOTFOUND).initCause(CustomException(R.string.error_message_weather_region_unsupported)) } diff --git a/wearapp/src/main/java/com/thewizrd/simpleweather/viewmodels/WeatherNowViewModel.kt b/wearapp/src/main/java/com/thewizrd/simpleweather/viewmodels/WeatherNowViewModel.kt index 8ce8b5c58..9befe2237 100644 --- a/wearapp/src/main/java/com/thewizrd/simpleweather/viewmodels/WeatherNowViewModel.kt +++ b/wearapp/src/main/java/com/thewizrd/simpleweather/viewmodels/WeatherNowViewModel.kt @@ -1,7 +1,11 @@ package com.thewizrd.simpleweather.viewmodels import android.app.Application -import android.content.* +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import android.content.IntentFilter +import android.content.SharedPreferences import android.location.LocationManager import android.util.Log import androidx.core.location.LocationManagerCompat @@ -35,8 +39,19 @@ import com.thewizrd.shared_resources.weatherdata.model.LocationType import com.thewizrd.simpleweather.R import com.thewizrd.simpleweather.wearable.WearableWorker import com.thewizrd.weather_api.weatherModule -import kotlinx.coroutines.* -import kotlinx.coroutines.flow.* +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.Job +import kotlinx.coroutines.delay +import kotlinx.coroutines.ensureActive +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.map +import kotlinx.coroutines.flow.mapNotNull +import kotlinx.coroutines.flow.stateIn +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.launch +import kotlinx.coroutines.supervisorScope +import kotlinx.coroutines.withContext import timber.log.Timber sealed interface WeatherNowState { @@ -242,8 +257,9 @@ class WeatherNowViewModel(private val app: Application) : AndroidViewModel(app), if (state.locationData?.countryCode?.let { !wm.isRegionSupported(it) } == true) { Logger.writeLine( Log.WARN, - "Location: %s", - JSONParser.serializer(state.locationData) + "Location: %s; countryCode: %s", + JSONParser.serializer(state.locationData), + state.locationData.countryCode ) Logger.writeLine( Log.WARN, @@ -280,8 +296,9 @@ class WeatherNowViewModel(private val app: Application) : AndroidViewModel(app), if (state.locationData?.countryCode?.let { !wm.isRegionSupported(it) } == true) { Logger.writeLine( Log.WARN, - "Location: %s", - JSONParser.serializer(state.locationData) + "Location: %s; countryCode: %s", + JSONParser.serializer(state.locationData), + state.locationData.countryCode ) Logger.writeLine( Log.WARN, diff --git a/weather-api/src/main/java/com/thewizrd/weather_api/weatherbit/HourlyResponse.kt b/weather-api/src/main/java/com/thewizrd/weather_api/weatherbit/HourlyResponse.kt index d572155aa..b79406128 100644 --- a/weather-api/src/main/java/com/thewizrd/weather_api/weatherbit/HourlyResponse.kt +++ b/weather-api/src/main/java/com/thewizrd/weather_api/weatherbit/HourlyResponse.kt @@ -83,7 +83,7 @@ data class HourlyForecastDataItem( var snowDepth: Float? = null, @field:Json(name = "dni") - var dni: Int? = null, + var dni: Float? = null, @field:Json(name = "uv") var uv: Float? = null, From a053240e2eeab544ff007e2afe9ec2bc827aa3eb Mon Sep 17 00:00:00 2001 From: Dave Antoine Date: Sun, 27 Aug 2023 18:54:46 -0400 Subject: [PATCH 2/7] gradle: update dependencies --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 152ee08e0..5464cc420 100644 --- a/build.gradle +++ b/build.gradle @@ -60,10 +60,10 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.1.0' + classpath 'com.android.tools.build:gradle:8.1.1' classpath "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:$ksp_version" classpath 'com.google.gms:google-services:4.3.15' - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.8' + classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9' classpath 'com.google.firebase:perf-plugin:1.4.2' classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" From 4646dfd8948bdf1a3e4ab54d9d605e20809b037d Mon Sep 17 00:00:00 2001 From: Dave Antoine Date: Tue, 29 Aug 2023 20:16:29 -0400 Subject: [PATCH 3/7] jdwi: remove gradient for pre-Nougat (API v24) --- .../main/res/drawable-v24/jdwi_clear_day.xml | 126 ++++++++++++ .../res/drawable-v24/jdwi_clear_night.xml | 126 ++++++++++++ .../src/main/res/drawable-v24/jdwi_cloudy.xml | 126 ++++++++++++ .../main/res/drawable-v24/jdwi_cloudy_day.xml | 145 ++++++++++++++ .../res/drawable-v24/jdwi_cloudy_night.xml | 145 ++++++++++++++ .../src/main/res/drawable-v24/jdwi_fog.xml | 88 +++++++++ .../main/res/drawable-v24/jdwi_fog_day.xml | 157 +++++++++++++++ .../main/res/drawable-v24/jdwi_fog_night.xml | 157 +++++++++++++++ .../drawable-v24/jdwi_partly_cloudy_day.xml | 145 ++++++++++++++ .../drawable-v24/jdwi_partly_cloudy_night.xml | 145 ++++++++++++++ .../src/main/res/drawable-v24/jdwi_rain.xml | 145 ++++++++++++++ .../main/res/drawable-v24/jdwi_rain_day.xml | 114 +++++++++++ .../main/res/drawable-v24/jdwi_rain_night.xml | 164 ++++++++++++++++ .../src/main/res/drawable-v24/jdwi_sleet.xml | 165 ++++++++++++++++ .../main/res/drawable-v24/jdwi_sleet_day.xml | 184 ++++++++++++++++++ .../res/drawable-v24/jdwi_sleet_night.xml | 184 ++++++++++++++++++ .../src/main/res/drawable-v24/jdwi_snow.xml | 145 ++++++++++++++ .../main/res/drawable-v24/jdwi_snow_day.xml | 114 +++++++++++ .../main/res/drawable-v24/jdwi_snow_night.xml | 114 +++++++++++ .../src/main/res/drawable-v24/jdwi_storm.xml | 111 +++++++++++ .../main/res/drawable-v24/jdwi_storm_day.xml | 130 +++++++++++++ .../res/drawable-v24/jdwi_storm_night.xml | 130 +++++++++++++ .../main/res/drawable-v24/jdwi_unknown.xml | 79 ++++++++ .../src/main/res/drawable-v24/jdwi_windy.xml | 54 +++++ .../src/main/res/drawable/jdwi_clear_day.xml | 101 ++-------- .../main/res/drawable/jdwi_clear_night.xml | 101 ++-------- .../src/main/res/drawable/jdwi_cloudy.xml | 101 ++-------- .../src/main/res/drawable/jdwi_cloudy_day.xml | 101 ++-------- .../main/res/drawable/jdwi_cloudy_night.xml | 101 ++-------- .../src/main/res/drawable/jdwi_fog.xml | 51 +---- .../src/main/res/drawable/jdwi_fog_day.xml | 101 ++-------- .../src/main/res/drawable/jdwi_fog_night.xml | 101 ++-------- .../res/drawable/jdwi_partly_cloudy_day.xml | 101 ++-------- .../res/drawable/jdwi_partly_cloudy_night.xml | 101 ++-------- .../src/main/res/drawable/jdwi_rain.xml | 101 ++-------- .../src/main/res/drawable/jdwi_rain_day.xml | 51 +---- .../src/main/res/drawable/jdwi_rain_night.xml | 101 ++-------- .../src/main/res/drawable/jdwi_sleet.xml | 101 ++-------- .../src/main/res/drawable/jdwi_sleet_day.xml | 101 ++-------- .../main/res/drawable/jdwi_sleet_night.xml | 101 ++-------- .../src/main/res/drawable/jdwi_snow.xml | 101 ++-------- .../src/main/res/drawable/jdwi_snow_day.xml | 51 +---- .../src/main/res/drawable/jdwi_snow_night.xml | 51 +---- .../src/main/res/drawable/jdwi_storm.xml | 51 +---- .../src/main/res/drawable/jdwi_storm_day.xml | 51 +---- .../main/res/drawable/jdwi_storm_night.xml | 51 +---- .../src/main/res/drawable/jdwi_unknown.xml | 51 +---- .../src/main/res/drawable/jdwi_windy.xml | 26 +-- 48 files changed, 3424 insertions(+), 1718 deletions(-) create mode 100644 shared_resources/src/main/res/drawable-v24/jdwi_clear_day.xml create mode 100644 shared_resources/src/main/res/drawable-v24/jdwi_clear_night.xml create mode 100644 shared_resources/src/main/res/drawable-v24/jdwi_cloudy.xml create mode 100644 shared_resources/src/main/res/drawable-v24/jdwi_cloudy_day.xml create mode 100644 shared_resources/src/main/res/drawable-v24/jdwi_cloudy_night.xml create mode 100644 shared_resources/src/main/res/drawable-v24/jdwi_fog.xml create mode 100644 shared_resources/src/main/res/drawable-v24/jdwi_fog_day.xml create mode 100644 shared_resources/src/main/res/drawable-v24/jdwi_fog_night.xml create mode 100644 shared_resources/src/main/res/drawable-v24/jdwi_partly_cloudy_day.xml create mode 100644 shared_resources/src/main/res/drawable-v24/jdwi_partly_cloudy_night.xml create mode 100644 shared_resources/src/main/res/drawable-v24/jdwi_rain.xml create mode 100644 shared_resources/src/main/res/drawable-v24/jdwi_rain_day.xml create mode 100644 shared_resources/src/main/res/drawable-v24/jdwi_rain_night.xml create mode 100644 shared_resources/src/main/res/drawable-v24/jdwi_sleet.xml create mode 100644 shared_resources/src/main/res/drawable-v24/jdwi_sleet_day.xml create mode 100644 shared_resources/src/main/res/drawable-v24/jdwi_sleet_night.xml create mode 100644 shared_resources/src/main/res/drawable-v24/jdwi_snow.xml create mode 100644 shared_resources/src/main/res/drawable-v24/jdwi_snow_day.xml create mode 100644 shared_resources/src/main/res/drawable-v24/jdwi_snow_night.xml create mode 100644 shared_resources/src/main/res/drawable-v24/jdwi_storm.xml create mode 100644 shared_resources/src/main/res/drawable-v24/jdwi_storm_day.xml create mode 100644 shared_resources/src/main/res/drawable-v24/jdwi_storm_night.xml create mode 100644 shared_resources/src/main/res/drawable-v24/jdwi_unknown.xml create mode 100644 shared_resources/src/main/res/drawable-v24/jdwi_windy.xml diff --git a/shared_resources/src/main/res/drawable-v24/jdwi_clear_day.xml b/shared_resources/src/main/res/drawable-v24/jdwi_clear_day.xml new file mode 100644 index 000000000..86c33801b --- /dev/null +++ b/shared_resources/src/main/res/drawable-v24/jdwi_clear_day.xml @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/shared_resources/src/main/res/drawable-v24/jdwi_clear_night.xml b/shared_resources/src/main/res/drawable-v24/jdwi_clear_night.xml new file mode 100644 index 000000000..e7d2a647c --- /dev/null +++ b/shared_resources/src/main/res/drawable-v24/jdwi_clear_night.xml @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/shared_resources/src/main/res/drawable-v24/jdwi_cloudy.xml b/shared_resources/src/main/res/drawable-v24/jdwi_cloudy.xml new file mode 100644 index 000000000..f394990bd --- /dev/null +++ b/shared_resources/src/main/res/drawable-v24/jdwi_cloudy.xml @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/shared_resources/src/main/res/drawable-v24/jdwi_cloudy_day.xml b/shared_resources/src/main/res/drawable-v24/jdwi_cloudy_day.xml new file mode 100644 index 000000000..9c8801809 --- /dev/null +++ b/shared_resources/src/main/res/drawable-v24/jdwi_cloudy_day.xml @@ -0,0 +1,145 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/shared_resources/src/main/res/drawable-v24/jdwi_cloudy_night.xml b/shared_resources/src/main/res/drawable-v24/jdwi_cloudy_night.xml new file mode 100644 index 000000000..3497a2f13 --- /dev/null +++ b/shared_resources/src/main/res/drawable-v24/jdwi_cloudy_night.xml @@ -0,0 +1,145 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/shared_resources/src/main/res/drawable-v24/jdwi_fog.xml b/shared_resources/src/main/res/drawable-v24/jdwi_fog.xml new file mode 100644 index 000000000..c90d1d6ff --- /dev/null +++ b/shared_resources/src/main/res/drawable-v24/jdwi_fog.xml @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/shared_resources/src/main/res/drawable-v24/jdwi_fog_day.xml b/shared_resources/src/main/res/drawable-v24/jdwi_fog_day.xml new file mode 100644 index 000000000..08ab7c957 --- /dev/null +++ b/shared_resources/src/main/res/drawable-v24/jdwi_fog_day.xml @@ -0,0 +1,157 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/shared_resources/src/main/res/drawable-v24/jdwi_fog_night.xml b/shared_resources/src/main/res/drawable-v24/jdwi_fog_night.xml new file mode 100644 index 000000000..e0e0932b5 --- /dev/null +++ b/shared_resources/src/main/res/drawable-v24/jdwi_fog_night.xml @@ -0,0 +1,157 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/shared_resources/src/main/res/drawable-v24/jdwi_partly_cloudy_day.xml b/shared_resources/src/main/res/drawable-v24/jdwi_partly_cloudy_day.xml new file mode 100644 index 000000000..e17267e1c --- /dev/null +++ b/shared_resources/src/main/res/drawable-v24/jdwi_partly_cloudy_day.xml @@ -0,0 +1,145 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/shared_resources/src/main/res/drawable-v24/jdwi_partly_cloudy_night.xml b/shared_resources/src/main/res/drawable-v24/jdwi_partly_cloudy_night.xml new file mode 100644 index 000000000..6e6f6c4bb --- /dev/null +++ b/shared_resources/src/main/res/drawable-v24/jdwi_partly_cloudy_night.xml @@ -0,0 +1,145 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/shared_resources/src/main/res/drawable-v24/jdwi_rain.xml b/shared_resources/src/main/res/drawable-v24/jdwi_rain.xml new file mode 100644 index 000000000..97c089277 --- /dev/null +++ b/shared_resources/src/main/res/drawable-v24/jdwi_rain.xml @@ -0,0 +1,145 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/shared_resources/src/main/res/drawable-v24/jdwi_rain_day.xml b/shared_resources/src/main/res/drawable-v24/jdwi_rain_day.xml new file mode 100644 index 000000000..b418fe72e --- /dev/null +++ b/shared_resources/src/main/res/drawable-v24/jdwi_rain_day.xml @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/shared_resources/src/main/res/drawable-v24/jdwi_rain_night.xml b/shared_resources/src/main/res/drawable-v24/jdwi_rain_night.xml new file mode 100644 index 000000000..f5aa7b39b --- /dev/null +++ b/shared_resources/src/main/res/drawable-v24/jdwi_rain_night.xml @@ -0,0 +1,164 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/shared_resources/src/main/res/drawable-v24/jdwi_sleet.xml b/shared_resources/src/main/res/drawable-v24/jdwi_sleet.xml new file mode 100644 index 000000000..91dba72ca --- /dev/null +++ b/shared_resources/src/main/res/drawable-v24/jdwi_sleet.xml @@ -0,0 +1,165 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/shared_resources/src/main/res/drawable-v24/jdwi_sleet_day.xml b/shared_resources/src/main/res/drawable-v24/jdwi_sleet_day.xml new file mode 100644 index 000000000..d9ad442b7 --- /dev/null +++ b/shared_resources/src/main/res/drawable-v24/jdwi_sleet_day.xml @@ -0,0 +1,184 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/shared_resources/src/main/res/drawable-v24/jdwi_sleet_night.xml b/shared_resources/src/main/res/drawable-v24/jdwi_sleet_night.xml new file mode 100644 index 000000000..69deea516 --- /dev/null +++ b/shared_resources/src/main/res/drawable-v24/jdwi_sleet_night.xml @@ -0,0 +1,184 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/shared_resources/src/main/res/drawable-v24/jdwi_snow.xml b/shared_resources/src/main/res/drawable-v24/jdwi_snow.xml new file mode 100644 index 000000000..8e4be1f70 --- /dev/null +++ b/shared_resources/src/main/res/drawable-v24/jdwi_snow.xml @@ -0,0 +1,145 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/shared_resources/src/main/res/drawable-v24/jdwi_snow_day.xml b/shared_resources/src/main/res/drawable-v24/jdwi_snow_day.xml new file mode 100644 index 000000000..d18049deb --- /dev/null +++ b/shared_resources/src/main/res/drawable-v24/jdwi_snow_day.xml @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/shared_resources/src/main/res/drawable-v24/jdwi_snow_night.xml b/shared_resources/src/main/res/drawable-v24/jdwi_snow_night.xml new file mode 100644 index 000000000..da882bdfa --- /dev/null +++ b/shared_resources/src/main/res/drawable-v24/jdwi_snow_night.xml @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/shared_resources/src/main/res/drawable-v24/jdwi_storm.xml b/shared_resources/src/main/res/drawable-v24/jdwi_storm.xml new file mode 100644 index 000000000..af7b799b9 --- /dev/null +++ b/shared_resources/src/main/res/drawable-v24/jdwi_storm.xml @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/shared_resources/src/main/res/drawable-v24/jdwi_storm_day.xml b/shared_resources/src/main/res/drawable-v24/jdwi_storm_day.xml new file mode 100644 index 000000000..832657186 --- /dev/null +++ b/shared_resources/src/main/res/drawable-v24/jdwi_storm_day.xml @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/shared_resources/src/main/res/drawable-v24/jdwi_storm_night.xml b/shared_resources/src/main/res/drawable-v24/jdwi_storm_night.xml new file mode 100644 index 000000000..461ecf1a8 --- /dev/null +++ b/shared_resources/src/main/res/drawable-v24/jdwi_storm_night.xml @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/shared_resources/src/main/res/drawable-v24/jdwi_unknown.xml b/shared_resources/src/main/res/drawable-v24/jdwi_unknown.xml new file mode 100644 index 000000000..4d04ffcca --- /dev/null +++ b/shared_resources/src/main/res/drawable-v24/jdwi_unknown.xml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/shared_resources/src/main/res/drawable-v24/jdwi_windy.xml b/shared_resources/src/main/res/drawable-v24/jdwi_windy.xml new file mode 100644 index 000000000..d15b362e1 --- /dev/null +++ b/shared_resources/src/main/res/drawable-v24/jdwi_windy.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/shared_resources/src/main/res/drawable/jdwi_clear_day.xml b/shared_resources/src/main/res/drawable/jdwi_clear_day.xml index 43bdcc371..e5feb9bae 100644 --- a/shared_resources/src/main/res/drawable/jdwi_clear_day.xml +++ b/shared_resources/src/main/res/drawable/jdwi_clear_day.xml @@ -1,5 +1,4 @@ - - - - - - - - - - + - - - - - - - - - - + - - - - - - - - - - + - - - - - - - - - - + diff --git a/shared_resources/src/main/res/drawable/jdwi_clear_night.xml b/shared_resources/src/main/res/drawable/jdwi_clear_night.xml index e7d2a647c..1cf714f2d 100644 --- a/shared_resources/src/main/res/drawable/jdwi_clear_night.xml +++ b/shared_resources/src/main/res/drawable/jdwi_clear_night.xml @@ -1,5 +1,4 @@ - - - - - - - - - - + - - - - - - - - - - + - - - - - - - - - - + - - - - - - - - - - + diff --git a/shared_resources/src/main/res/drawable/jdwi_cloudy.xml b/shared_resources/src/main/res/drawable/jdwi_cloudy.xml index f394990bd..001cb4530 100644 --- a/shared_resources/src/main/res/drawable/jdwi_cloudy.xml +++ b/shared_resources/src/main/res/drawable/jdwi_cloudy.xml @@ -1,5 +1,4 @@ - - - - - - - - - - + - - - - - - - - - - + - - - - - - - - - - + - - - - - - - - - - + diff --git a/shared_resources/src/main/res/drawable/jdwi_cloudy_day.xml b/shared_resources/src/main/res/drawable/jdwi_cloudy_day.xml index 9c8801809..20c0cac57 100644 --- a/shared_resources/src/main/res/drawable/jdwi_cloudy_day.xml +++ b/shared_resources/src/main/res/drawable/jdwi_cloudy_day.xml @@ -1,5 +1,4 @@ - - - - - - - - - - + - - - - - - - - - - + - - - - - - - - - - + - - - - - - - - - - + diff --git a/shared_resources/src/main/res/drawable/jdwi_cloudy_night.xml b/shared_resources/src/main/res/drawable/jdwi_cloudy_night.xml index 3497a2f13..f5fb9a929 100644 --- a/shared_resources/src/main/res/drawable/jdwi_cloudy_night.xml +++ b/shared_resources/src/main/res/drawable/jdwi_cloudy_night.xml @@ -1,5 +1,4 @@ - - - - - - - - - - + - - - - - - - - - - + - - - - - - - - - - + - - - - - - - - - - + diff --git a/shared_resources/src/main/res/drawable/jdwi_fog.xml b/shared_resources/src/main/res/drawable/jdwi_fog.xml index c90d1d6ff..799179893 100644 --- a/shared_resources/src/main/res/drawable/jdwi_fog.xml +++ b/shared_resources/src/main/res/drawable/jdwi_fog.xml @@ -1,5 +1,4 @@ - - - - - - - - - - + - - - - - - - - - - + diff --git a/shared_resources/src/main/res/drawable/jdwi_fog_day.xml b/shared_resources/src/main/res/drawable/jdwi_fog_day.xml index 08ab7c957..b5a155070 100644 --- a/shared_resources/src/main/res/drawable/jdwi_fog_day.xml +++ b/shared_resources/src/main/res/drawable/jdwi_fog_day.xml @@ -1,5 +1,4 @@ - - - - - - - - - - + - - - - - - - - - - + - - - - - - - - - - + - - - - - - - - - - + diff --git a/shared_resources/src/main/res/drawable/jdwi_fog_night.xml b/shared_resources/src/main/res/drawable/jdwi_fog_night.xml index e0e0932b5..4fe4a4b85 100644 --- a/shared_resources/src/main/res/drawable/jdwi_fog_night.xml +++ b/shared_resources/src/main/res/drawable/jdwi_fog_night.xml @@ -1,5 +1,4 @@ - - - - - - - - - - + - - - - - - - - - - + - - - - - - - - - - + - - - - - - - - - - + diff --git a/shared_resources/src/main/res/drawable/jdwi_partly_cloudy_day.xml b/shared_resources/src/main/res/drawable/jdwi_partly_cloudy_day.xml index e17267e1c..9822fd191 100644 --- a/shared_resources/src/main/res/drawable/jdwi_partly_cloudy_day.xml +++ b/shared_resources/src/main/res/drawable/jdwi_partly_cloudy_day.xml @@ -1,5 +1,4 @@ - - - - - - - - - - + - - - - - - - - - - + - - - - - - - - - - + - - - - - - - - - - + diff --git a/shared_resources/src/main/res/drawable/jdwi_partly_cloudy_night.xml b/shared_resources/src/main/res/drawable/jdwi_partly_cloudy_night.xml index 6e6f6c4bb..70c555d94 100644 --- a/shared_resources/src/main/res/drawable/jdwi_partly_cloudy_night.xml +++ b/shared_resources/src/main/res/drawable/jdwi_partly_cloudy_night.xml @@ -1,5 +1,4 @@ - - - - - - - - - - + - - - - - - - - - - + - - - - - - - - - - + - - - - - - - - - - + diff --git a/shared_resources/src/main/res/drawable/jdwi_rain.xml b/shared_resources/src/main/res/drawable/jdwi_rain.xml index 97c089277..d45bf6b95 100644 --- a/shared_resources/src/main/res/drawable/jdwi_rain.xml +++ b/shared_resources/src/main/res/drawable/jdwi_rain.xml @@ -1,5 +1,4 @@ - - - - - - - - - - + - - - - - - - - - - + - - - - - - - - - - + - - - - - - - - - - + diff --git a/shared_resources/src/main/res/drawable/jdwi_rain_day.xml b/shared_resources/src/main/res/drawable/jdwi_rain_day.xml index b418fe72e..8c9a3dc53 100644 --- a/shared_resources/src/main/res/drawable/jdwi_rain_day.xml +++ b/shared_resources/src/main/res/drawable/jdwi_rain_day.xml @@ -1,5 +1,4 @@ - - - - - - - - - - + - - - - - - - - - - + diff --git a/shared_resources/src/main/res/drawable/jdwi_rain_night.xml b/shared_resources/src/main/res/drawable/jdwi_rain_night.xml index f5aa7b39b..9523eff2b 100644 --- a/shared_resources/src/main/res/drawable/jdwi_rain_night.xml +++ b/shared_resources/src/main/res/drawable/jdwi_rain_night.xml @@ -1,5 +1,4 @@ - - - - - - - - - - + - - - - - - - - - - + - - - - - - - - - - + - - - - - - - - - - + diff --git a/shared_resources/src/main/res/drawable/jdwi_sleet.xml b/shared_resources/src/main/res/drawable/jdwi_sleet.xml index 91dba72ca..008958f8b 100644 --- a/shared_resources/src/main/res/drawable/jdwi_sleet.xml +++ b/shared_resources/src/main/res/drawable/jdwi_sleet.xml @@ -1,5 +1,4 @@ - - - - - - - - - - + - - - - - - - - - - + - - - - - - - - - - + - - - - - - - - - - + diff --git a/shared_resources/src/main/res/drawable/jdwi_sleet_day.xml b/shared_resources/src/main/res/drawable/jdwi_sleet_day.xml index d9ad442b7..320d38a69 100644 --- a/shared_resources/src/main/res/drawable/jdwi_sleet_day.xml +++ b/shared_resources/src/main/res/drawable/jdwi_sleet_day.xml @@ -1,5 +1,4 @@ - - - - - - - - - - + - - - - - - - - - - + - - - - - - - - - - + - - - - - - - - - - + diff --git a/shared_resources/src/main/res/drawable/jdwi_sleet_night.xml b/shared_resources/src/main/res/drawable/jdwi_sleet_night.xml index 69deea516..27e7305f0 100644 --- a/shared_resources/src/main/res/drawable/jdwi_sleet_night.xml +++ b/shared_resources/src/main/res/drawable/jdwi_sleet_night.xml @@ -1,5 +1,4 @@ - - - - - - - - - - + - - - - - - - - - - + - - - - - - - - - - + - - - - - - - - - - + diff --git a/shared_resources/src/main/res/drawable/jdwi_snow.xml b/shared_resources/src/main/res/drawable/jdwi_snow.xml index 8e4be1f70..546747bb4 100644 --- a/shared_resources/src/main/res/drawable/jdwi_snow.xml +++ b/shared_resources/src/main/res/drawable/jdwi_snow.xml @@ -1,5 +1,4 @@ - - - - - - - - - - + - - - - - - - - - - + - - - - - - - - - - + - - - - - - - - - - + diff --git a/shared_resources/src/main/res/drawable/jdwi_snow_day.xml b/shared_resources/src/main/res/drawable/jdwi_snow_day.xml index d18049deb..0c1e012b4 100644 --- a/shared_resources/src/main/res/drawable/jdwi_snow_day.xml +++ b/shared_resources/src/main/res/drawable/jdwi_snow_day.xml @@ -1,5 +1,4 @@ - - - - - - - - - - + - - - - - - - - - - + diff --git a/shared_resources/src/main/res/drawable/jdwi_snow_night.xml b/shared_resources/src/main/res/drawable/jdwi_snow_night.xml index da882bdfa..a88e7c473 100644 --- a/shared_resources/src/main/res/drawable/jdwi_snow_night.xml +++ b/shared_resources/src/main/res/drawable/jdwi_snow_night.xml @@ -1,5 +1,4 @@ - - - - - - - - - - + - - - - - - - - - - + diff --git a/shared_resources/src/main/res/drawable/jdwi_storm.xml b/shared_resources/src/main/res/drawable/jdwi_storm.xml index af7b799b9..125b58954 100644 --- a/shared_resources/src/main/res/drawable/jdwi_storm.xml +++ b/shared_resources/src/main/res/drawable/jdwi_storm.xml @@ -1,5 +1,4 @@ - - - - - - - - - - + - - - - - - - - - - + diff --git a/shared_resources/src/main/res/drawable/jdwi_storm_day.xml b/shared_resources/src/main/res/drawable/jdwi_storm_day.xml index 832657186..0ce6b29b1 100644 --- a/shared_resources/src/main/res/drawable/jdwi_storm_day.xml +++ b/shared_resources/src/main/res/drawable/jdwi_storm_day.xml @@ -1,5 +1,4 @@ - - - - - - - - - - + - - - - - - - - - - + diff --git a/shared_resources/src/main/res/drawable/jdwi_storm_night.xml b/shared_resources/src/main/res/drawable/jdwi_storm_night.xml index 461ecf1a8..e778fb5a2 100644 --- a/shared_resources/src/main/res/drawable/jdwi_storm_night.xml +++ b/shared_resources/src/main/res/drawable/jdwi_storm_night.xml @@ -1,5 +1,4 @@ - - - - - - - - - - + - - - - - - - - - - + diff --git a/shared_resources/src/main/res/drawable/jdwi_unknown.xml b/shared_resources/src/main/res/drawable/jdwi_unknown.xml index 4d04ffcca..f8e6b3b56 100644 --- a/shared_resources/src/main/res/drawable/jdwi_unknown.xml +++ b/shared_resources/src/main/res/drawable/jdwi_unknown.xml @@ -1,5 +1,4 @@ - - - - - - - - - - + - - - - - - - - - - + diff --git a/shared_resources/src/main/res/drawable/jdwi_windy.xml b/shared_resources/src/main/res/drawable/jdwi_windy.xml index d15b362e1..4e1be2612 100644 --- a/shared_resources/src/main/res/drawable/jdwi_windy.xml +++ b/shared_resources/src/main/res/drawable/jdwi_windy.xml @@ -1,5 +1,4 @@ - - - - - - - - - - + From e1bf2b611d7266550a9716e01e02c49e8106c1b1 Mon Sep 17 00:00:00 2001 From: Dave Antoine Date: Tue, 29 Aug 2023 20:24:52 -0400 Subject: [PATCH 4/7] gradle: update dependencies --- build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 5464cc420..e5c234105 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ buildscript { desugar_version = '2.0.3' - firebase_version = '32.2.2' + firebase_version = '32.2.3' gms_location_version = '21.0.1' annotation_version = '1.6.0' @@ -23,7 +23,7 @@ buildscript { arch_core_runtime_version = '2.2.0' fragment_version = '1.6.1' lifecycle_version = '2.6.1' - nav_version = '2.7.0' + nav_version = '2.7.1' paging_version = '3.2.0' preference_version = '1.2.1' recyclerview_version = '1.3.1' @@ -40,13 +40,13 @@ buildscript { material_version = '1.9.0' - compose_compiler_version = '1.5.1' + compose_compiler_version = '1.5.2' compose_version = '1.5.0' wear_compose_version = '1.2.0' horologist_version = '0.4.12' accompanist_version = '0.30.1' - glide_version = '4.15.1' + glide_version = '4.16.0' icu4j_version = '73.2' moshi_version = '1.15.0' okhttp_version = '4.11.0' From 912ec85de9c3dfdd3cc6a08d53e8af9208c469fd Mon Sep 17 00:00:00 2001 From: Dave Antoine Date: Tue, 29 Aug 2023 20:42:16 -0400 Subject: [PATCH 5/7] glide: fix build errors --- .../com/thewizrd/simpleweather/main/WeatherNowFragment.kt | 4 ++-- .../CustomBackgroundWidgetRemoteViewCreator.kt | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/thewizrd/simpleweather/main/WeatherNowFragment.kt b/app/src/main/java/com/thewizrd/simpleweather/main/WeatherNowFragment.kt index 5a01a576b..2244e38cf 100644 --- a/app/src/main/java/com/thewizrd/simpleweather/main/WeatherNowFragment.kt +++ b/app/src/main/java/com/thewizrd/simpleweather/main/WeatherNowFragment.kt @@ -1145,7 +1145,7 @@ class WeatherNowFragment : AbstractWeatherListDetailFragment(), BannerManagerInt .transition(BitmapTransitionOptions.withCrossFade(300)) .addListener(object : RequestListener { override fun onLoadFailed( - e: GlideException?, model: Any, + e: GlideException?, model: Any?, target: Target, isFirstResource: Boolean ): Boolean { @@ -1155,7 +1155,7 @@ class WeatherNowFragment : AbstractWeatherListDetailFragment(), BannerManagerInt } override fun onResourceReady( - resource: Bitmap?, model: Any, + resource: Bitmap, model: Any, target: Target, dataSource: DataSource, isFirstResource: Boolean diff --git a/app/src/main/java/com/thewizrd/simpleweather/widgets/remoteviews/CustomBackgroundWidgetRemoteViewCreator.kt b/app/src/main/java/com/thewizrd/simpleweather/widgets/remoteviews/CustomBackgroundWidgetRemoteViewCreator.kt index 5a2220819..c2042912b 100644 --- a/app/src/main/java/com/thewizrd/simpleweather/widgets/remoteviews/CustomBackgroundWidgetRemoteViewCreator.kt +++ b/app/src/main/java/com/thewizrd/simpleweather/widgets/remoteviews/CustomBackgroundWidgetRemoteViewCreator.kt @@ -240,7 +240,7 @@ abstract class CustomBackgroundWidgetRemoteViewCreator( override fun onLoadFailed( e: GlideException?, model: Any?, - target: Target?, + target: Target, isFirstResource: Boolean ): Boolean { if (it.isActive) { @@ -250,10 +250,10 @@ abstract class CustomBackgroundWidgetRemoteViewCreator( } override fun onResourceReady( - resource: Bitmap?, - model: Any?, + resource: Bitmap, + model: Any, target: Target?, - dataSource: DataSource?, + dataSource: DataSource, isFirstResource: Boolean ): Boolean { if (it.isActive) { From 39bba42d00c2b5af645e74a50f8962958d01f9f3 Mon Sep 17 00:00:00 2001 From: Dave Antoine Date: Tue, 29 Aug 2023 20:29:33 -0400 Subject: [PATCH 6/7] SimpleWeather: v5.8.2-build0 --- app/build.gradle | 4 ++-- wearapp/build.gradle | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 44a99686a..9ca4a7378 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,8 +14,8 @@ android { minSdkVersion rootProject.minSdkVersion targetSdkVersion rootProject.targetSdkVersion // NOTE: Version Code Format (TargetSDK, Version Name, Build Number, Variant Code (Android: 00, WearOS: 01) - versionCode 335810200 - versionName "5.8.1" + versionCode 335820000 + versionName "5.8.2" vectorDrawables.useSupportLibrary true } diff --git a/wearapp/build.gradle b/wearapp/build.gradle index 8f7dbd4d2..d20d0fab3 100644 --- a/wearapp/build.gradle +++ b/wearapp/build.gradle @@ -17,8 +17,8 @@ android { minSdkVersion 26 targetSdkVersion rootProject.targetSdkVersion // NOTE: Version Code Format (TargetSDK, Version Name, Build Number, Variant Code (Android: 00, WearOS: 01) - versionCode 335810201 - versionName "5.8.1" + versionCode 335820001 + versionName "5.8.2" vectorDrawables.useSupportLibrary true } From 61652581e1eab8b38185643b7ec0033653a53888 Mon Sep 17 00:00:00 2001 From: Dave Antoine Date: Tue, 29 Aug 2023 21:12:45 -0400 Subject: [PATCH 7/7] SimpleWeather: v5.8.2-build1 * rollback targetSdk 33 --- app/build.gradle | 2 +- build.gradle | 2 +- wearapp/build.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 9ca4a7378..0824d0e91 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,7 +14,7 @@ android { minSdkVersion rootProject.minSdkVersion targetSdkVersion rootProject.targetSdkVersion // NOTE: Version Code Format (TargetSDK, Version Name, Build Number, Variant Code (Android: 00, WearOS: 01) - versionCode 335820000 + versionCode 335820100 versionName "5.8.2" vectorDrawables.useSupportLibrary true diff --git a/build.gradle b/build.gradle index e5c234105..bd432053b 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { ext { compileSdkVersion = 34 minSdkVersion = 21 - targetSdkVersion = 34 + targetSdkVersion = 33 kotlin_version = '1.9.0' kotlinx_version = '1.7.3' diff --git a/wearapp/build.gradle b/wearapp/build.gradle index d20d0fab3..47117b600 100644 --- a/wearapp/build.gradle +++ b/wearapp/build.gradle @@ -17,7 +17,7 @@ android { minSdkVersion 26 targetSdkVersion rootProject.targetSdkVersion // NOTE: Version Code Format (TargetSDK, Version Name, Build Number, Variant Code (Android: 00, WearOS: 01) - versionCode 335820001 + versionCode 335820101 versionName "5.8.2" vectorDrawables.useSupportLibrary true