Merge remote-tracking branch 'origin/develop' into public

# Conflicts:
#	wearapp/src/main/res/drawable/ic_check_24dp.xml

Author: thewizrd

Diff for: app/build.gradle

@@ -15,8 +15,8 @@ android {
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
         // NOTE: Version Code Format (TargetSDK, Version Name, Build Number, Variant Code (Android: 0, WearOS: 1)
-        versionCode 345100040
-        versionName "5.10.0"
+        versionCode 345100070
+        versionName "5.10.1"
 
         vectorDrawables {
             useSupportLibrary true
@@ -173,7 +173,7 @@ dependencies {
     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 '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'

Diff for: app/src/fullgms/java/com/thewizrd/simpleweather/updates/InAppUpdateManager.kt

@@ -83,8 +83,7 @@ class InAppUpdateManager private constructor(context: Context) {
 
             val json = mConfig.getString("android_updates")
 
-            val updateTypeToken = listType<UpdateInfo>()
-            return@withContext JSONParser.deserializer(json, updateTypeToken)
+            return@withContext JSONParser.deserializer(json, listType<UpdateInfo>())
         }
     }
 

Diff for: app/src/main/java/com/thewizrd/simpleweather/controls/graphs/BaseGraphHorizontalScrollView.java

@@ -172,6 +172,10 @@ public void setBottomTextSize(@Px float textSize) {
         getGraph().setBottomTextSize(textSize);
     }
 
+    public void setBottomTextShadow(boolean enable) {
+        getGraph().setBottomTextShadow(enable);
+    }
+
     public void setIconSize(@Px float iconSize) {
         getGraph().setIconSize(iconSize);
     }

Diff for: app/src/main/java/com/thewizrd/simpleweather/controls/graphs/BaseGraphView.java

@@ -97,6 +97,14 @@ public void setBottomTextSize(@Px float textSize) {
         bottomTextPaint.setTextSize(textSize);
     }
 
+    public void setBottomTextShadow(boolean enable) {
+        if (enable) {
+            bottomTextPaint.setShadowLayer(1, 1, 1, Colors.BLACK);
+        } else {
+            bottomTextPaint.clearShadowLayer();
+        }
+    }
+
     public void setIconSize(@Px float iconSize) {
         this.iconHeight = iconSize;
     }

Diff for: app/src/main/java/com/thewizrd/simpleweather/viewmodels/WeatherNowViewModel.kt

@@ -237,6 +237,11 @@ class WeatherNowViewModel(app: Application) : AndroidViewModel(app) {
                     WeatherRequest.Builder()
                         .forceRefresh(forceRefresh)
                         .loadAlerts()
+                        .apply {
+                            if (forceRefresh) {
+                                loadForecasts()
+                            }
+                        }
                         .build()
                 )
             } else {

Diff for: app/src/main/java/com/thewizrd/simpleweather/widgets/WidgetUpdaterHelper.kt

@@ -7,6 +7,7 @@ import android.content.Intent
 import android.os.Build
 import android.os.Bundle
 import android.os.SystemClock
+import android.text.style.TextAppearanceSpan
 import android.util.Log
 import android.util.TypedValue
 import android.view.View
@@ -27,6 +28,7 @@ import com.thewizrd.shared_resources.utils.ContextUtils.dpToPx
 import com.thewizrd.shared_resources.utils.ContextUtils.getThemeContextOverride
 import com.thewizrd.shared_resources.utils.JSONParser
 import com.thewizrd.shared_resources.utils.Logger
+import com.thewizrd.shared_resources.utils.TextUtils.applySpan
 import com.thewizrd.shared_resources.weatherdata.model.Forecast
 import com.thewizrd.shared_resources.weatherdata.model.HourlyForecast
 import com.thewizrd.shared_resources.weatherdata.model.Weather
@@ -39,6 +41,7 @@ import com.thewizrd.simpleweather.widgets.preferences.KEY_FORECASTOPTION
 import com.thewizrd.simpleweather.widgets.preferences.KEY_ICONSIZE
 import com.thewizrd.simpleweather.widgets.preferences.KEY_TEXTSIZE
 import com.thewizrd.simpleweather.widgets.preferences.KEY_TXTCOLORCODE
+import com.thewizrd.simpleweather.widgets.preferences.KEY_TXTSHADOW
 import com.thewizrd.simpleweather.widgets.remoteviews.CustomBackgroundWidgetRemoteViewCreator
 import com.thewizrd.simpleweather.widgets.remoteviews.WidgetRemoteViewCreator
 import com.thewizrd.weather_api.weatherModule
@@ -403,17 +406,50 @@ object WidgetUpdaterHelper {
         val dividerId = getResIdentifier(R.id::class.java, "${prefix}${forecastIdx + 1}_divider")
             ?: return
 
+        val useTextShadow =
+            newOptions.get(KEY_TXTSHADOW) as? Boolean ?: WidgetUtils.useTextShadow(appWidgetId)
+        val textAppearanceSpan = if (useTextShadow) {
+            TextAppearanceSpan(context, R.style.ShadowText)
+        } else {
+            null
+        }
+
         forecastPanel.setTextViewText(
             dateId,
             if (info.widgetType == WidgetType.Widget4x4MaterialYou && forecast is ForecastItemViewModel) {
                 forecast.longDate
             } else {
                 forecast.shortDate
+            }?.run {
+                if (WidgetUtils.isBackgroundOptionalWidget(info.widgetType)) {
+                    this.applySpan(textAppearanceSpan)
+                } else {
+                    this
+                }
             }
         )
-        forecastPanel.setTextViewText(hiId, forecast.hiTemp)
+        forecastPanel.setTextViewText(hiId, forecast.hiTemp?.run {
+            if (WidgetUtils.isBackgroundOptionalWidget(info.widgetType)) {
+                this.applySpan(textAppearanceSpan)
+            } else {
+                this
+            }
+        })
         if (forecast is ForecastItemViewModel) {
-            forecastPanel.setTextViewText(loId, forecast.loTemp)
+            forecastPanel.setTextViewText(dividerId, "|".run {
+                if (WidgetUtils.isBackgroundOptionalWidget(info.widgetType)) {
+                    this.applySpan(textAppearanceSpan)
+                } else {
+                    this
+                }
+            })
+            forecastPanel.setTextViewText(loId, forecast.loTemp?.run {
+                if (WidgetUtils.isBackgroundOptionalWidget(info.widgetType)) {
+                    this.applySpan(textAppearanceSpan)
+                } else {
+                    this
+                }
+            })
         }
 
         if (info.widgetType != WidgetType.Widget4x2MaterialYou && info.widgetType != WidgetType.Widget4x4MaterialYou && (background != WidgetUtils.WidgetBackground.CURRENT_CONDITIONS || style != WidgetUtils.WidgetBackgroundStyle.PANDA)) {

Diff for: app/src/main/java/com/thewizrd/simpleweather/widgets/WidgetUtils.kt

@@ -49,7 +49,7 @@ object WidgetUtils {
     }
 
     // Widget Prefs
-    private const val CurrentPrefsVersion = 6
+    private const val CurrentPrefsVersion = 7
 
     // Keys
     // TODO: Move preference keys to another class
@@ -70,6 +70,7 @@ object WidgetUtils {
     private const val KEY_USETIMEZONE = "key_usetimezone"
     private const val KEY_BGCOLORCODE = "key_bgcolorcode"
     private const val KEY_TXTCOLORCODE = "key_txtcolorcode"
+    private const val KEY_TXTSHADOW = "key_txtshadow"
     private const val KEY_MAXFORECAST_LENGTH = "key_forecastlengthset"
     private const val KEY_MAXHRFORECAST_LENGTH = "key_hrforecastlengthset"
     private const val KEY_CUSTOMTXTMULTIPLIER = "key_customtxtmultiplier"
@@ -94,7 +95,7 @@ object WidgetUtils {
             private val map = SparseArray<WidgetBackground>()
 
             init {
-                for (background in values()) {
+                for (background in entries) {
                     map.put(background.value, background)
                 }
             }
@@ -114,7 +115,7 @@ object WidgetUtils {
             private val map = SparseArray<WidgetBackgroundStyle>()
 
             init {
-                for (style in values()) {
+                for (style in entries) {
                     map.put(style.value, style)
                 }
             }
@@ -135,7 +136,7 @@ object WidgetUtils {
             private val map = SparseArray<ForecastOption>()
 
             init {
-                for (opt in values()) {
+                for (opt in entries) {
                     map.put(opt.value, opt)
                 }
             }
@@ -205,6 +206,17 @@ object WidgetUtils {
                         }
                     }
                 }
+                6 -> {
+                    // Keep text shadow enabled for current users
+                    val widgetIds = getAllWidgetIds()
+                    for (appWidgetId in widgetIds) {
+                        val widgetType = getWidgetTypeFromID(appWidgetId)
+
+                        if (isBackgroundCustomOnlyWidget(widgetType)) {
+                            setUseTextShadow(appWidgetId, true)
+                        }
+                    }
+                }
             }
         }
 
@@ -225,7 +237,7 @@ object WidgetUtils {
     private fun getAllWidgetIds(): IntArray {
         var widgetIds = IntArray(0)
 
-        for (widgetType in WidgetType.values()) {
+        for (widgetType in WidgetType.entries) {
             val ids = getWidgetIds(widgetType)
             if (ids.isNotEmpty()) {
                 widgetIds = widgetIds.plus(ids)
@@ -503,16 +515,15 @@ object WidgetUtils {
             val parentPath = context.filesDir.parent
             val sharedPrefsPath = String.format(Locale.ROOT, "%s/shared_prefs", parentPath)
             val sharedPrefsFolder = File(sharedPrefsPath)
-            val appWidgetFiles = sharedPrefsFolder.listFiles { dir, name ->
-                val lowerCaseName = name.toLowerCase(Locale.ROOT)
+            val appWidgetFiles = sharedPrefsFolder.listFiles { _, name ->
+                val lowerCaseName = name.lowercase(Locale.ROOT)
                 lowerCaseName.startsWith("appwidget_") && lowerCaseName.endsWith(".xml")
             } ?: emptyArray()
 
             for (file in appWidgetFiles) {
                 val fileName = file.name
-                var idString = ""
                 if (!fileName.isNullOrBlank()) {
-                    idString = fileName.replace("appwidget_", "")
+                    val idString = fileName.replace("appwidget_", "")
                         .replace(".xml", "")
 
                     try {
@@ -1142,4 +1153,15 @@ object WidgetUtils {
             putString(KEY_BACKGROUNDURI, uri)
         }
     }
+
+    fun useTextShadow(widgetId: Int): Boolean {
+        val prefs = getPreferences(widgetId)
+        return prefs.getBoolean(KEY_TXTSHADOW, false)
+    }
+
+    fun setUseTextShadow(widgetId: Int, value: Boolean) {
+        getPreferences(widgetId).edit(true) {
+            putBoolean(KEY_TXTSHADOW, value)
+        }
+    }
 }

Diff for: app/src/main/java/com/thewizrd/simpleweather/widgets/preferences/BaseWeatherWidgetPreferenceFragment.kt

@@ -28,6 +28,7 @@ abstract class BaseWeatherWidgetPreferenceFragment : AbstractWeatherWidgetPrefer
     protected lateinit var bgChoicePref: ListPreference
     protected lateinit var bgColorPref: ColorPreference
     protected lateinit var txtColorPref: ColorPreference
+    protected lateinit var txtShadowPref: SwitchPreference
     protected lateinit var bgStylePref: ListPreference
 
     protected lateinit var textSizePref: SliderPreference
@@ -154,6 +155,7 @@ abstract class BaseWeatherWidgetPreferenceFragment : AbstractWeatherWidgetPrefer
         bgStylePref = findPreference(KEY_BGSTYLE)!!
         bgColorPref = findPreference(KEY_BGCOLORCODE)!!
         txtColorPref = findPreference(KEY_TXTCOLORCODE)!!
+        txtShadowPref = findPreference(KEY_TXTSHADOW)!!
 
         bgChoicePref.onPreferenceChangeListener =
             Preference.OnPreferenceChangeListener { _, newValue ->
@@ -204,7 +206,14 @@ abstract class BaseWeatherWidgetPreferenceFragment : AbstractWeatherWidgetPrefer
                 true
             }
 
-        val styles = WidgetUtils.WidgetBackgroundStyle.values()
+        txtShadowPref.onPreferenceChangeListener =
+            Preference.OnPreferenceChangeListener { _, newValue ->
+                mWidgetOptions.putBoolean(KEY_TXTSHADOW, newValue as Boolean)
+                updateWidgetView()
+                true
+            }
+
+        val styles = WidgetUtils.WidgetBackgroundStyle.entries
         val styleEntries = arrayOfNulls<CharSequence>(styles.size)
         val styleEntryValues = arrayOfNulls<CharSequence>(styles.size)
 
@@ -232,15 +241,14 @@ abstract class BaseWeatherWidgetPreferenceFragment : AbstractWeatherWidgetPrefer
         val mWidgetBGStyle = WidgetUtils.getBackgroundStyle(mAppWidgetId)
         @ColorInt val mWidgetBackgroundColor = WidgetUtils.getBackgroundColor(mAppWidgetId)
         @ColorInt val mWidgetTextColor = WidgetUtils.getTextColor(mAppWidgetId)
+        val mWidgetTextShadow = WidgetUtils.useTextShadow(mAppWidgetId)
 
         if (WidgetUtils.isBackgroundOptionalWidget(mWidgetType)) {
             bgChoicePref.setValueIndex(mWidgetBackground.value)
             bgChoicePref.callChangeListener(bgChoicePref.value)
 
             bgStylePref.setValueIndex(
-                listOf(*WidgetUtils.WidgetBackgroundStyle.values()).indexOf(
-                    mWidgetBGStyle
-                )
+                WidgetUtils.WidgetBackgroundStyle.entries.indexOf(mWidgetBGStyle)
             )
             bgStylePref.callChangeListener(bgStylePref.value)
 
@@ -249,6 +257,9 @@ abstract class BaseWeatherWidgetPreferenceFragment : AbstractWeatherWidgetPrefer
             txtColorPref.color = mWidgetTextColor
             txtColorPref.callChangeListener(txtColorPref.color)
 
+            txtShadowPref.isChecked = mWidgetTextShadow
+            txtShadowPref.callChangeListener(mWidgetTextShadow)
+
             findPreference<Preference>(KEY_BACKGROUND)!!.isVisible = true
             if (WidgetUtils.isBackgroundCustomOnlyWidget(mWidgetType)) {
                 bgChoicePref.isVisible = false
@@ -328,6 +339,7 @@ abstract class BaseWeatherWidgetPreferenceFragment : AbstractWeatherWidgetPrefer
         WidgetUtils.setWidgetBackground(mAppWidgetId, bgChoicePref.value.toInt())
         WidgetUtils.setBackgroundColor(mAppWidgetId, bgColorPref.color)
         WidgetUtils.setTextColor(mAppWidgetId, txtColorPref.color)
+        WidgetUtils.setUseTextShadow(mAppWidgetId, txtShadowPref.isChecked)
         WidgetUtils.setBackgroundStyle(mAppWidgetId, bgStylePref.value.toInt())
         WidgetUtils.setSettingsButtonHidden(mAppWidgetId, hideSettingsBtnPref.isChecked)
         WidgetUtils.setRefreshButtonHidden(mAppWidgetId, hideRefreshBtnPref.isChecked)

Diff for: app/src/main/java/com/thewizrd/simpleweather/widgets/preferences/WeatherWidgetPreferenceFragment.kt

@@ -6,6 +6,7 @@ import android.content.Intent
 import android.location.LocationManager
 import android.os.Build
 import android.os.Bundle
+import android.text.style.TextAppearanceSpan
 import android.view.Gravity
 import android.view.View
 import android.widget.FrameLayout
@@ -37,6 +38,7 @@ import com.thewizrd.shared_resources.locationdata.toLocationData
 import com.thewizrd.shared_resources.utils.CommonActions
 import com.thewizrd.shared_resources.utils.ContextUtils.dpToPx
 import com.thewizrd.shared_resources.utils.JSONParser
+import com.thewizrd.shared_resources.utils.TextUtils.applySpan
 import com.thewizrd.shared_resources.weatherdata.model.LocationType
 import com.thewizrd.simpleweather.R
 import com.thewizrd.simpleweather.preferences.ArrayListPreference
@@ -383,9 +385,15 @@ class WeatherWidgetPreferenceFragment : BaseWeatherWidgetPreferenceFragment() {
     private fun updateLocationView() {
         val locationView = binding.widgetContainer.findViewById<TextView>(R.id.location_name)
         if (locationView != null) {
-            locationView.text = lastSelectedValue?.let {
+            locationView.text = (lastSelectedValue?.let {
                 locationPref.findEntryFromValue(it)?.toString()
-            } ?: locationView.context.getString(R.string.pref_location)
+            } ?: locationView.context.getString(R.string.pref_location)).run {
+                if (WidgetUtils.isBackgroundOptionalWidget(mWidgetType) && txtShadowPref.isChecked) {
+                    applySpan(TextAppearanceSpan(locationView.context, R.style.ShadowText))
+                } else {
+                    this
+                }
+            }
 
             locationView.isVisible = !hideLocNamePref.isChecked
         }

Diff for: app/src/main/java/com/thewizrd/simpleweather/widgets/preferences/WidgetPreferenceKeys.kt

@@ -16,6 +16,7 @@ internal const val KEY_BGCOLOR = "key_bgcolor"
 internal const val KEY_BGCOLORCODE = "key_bgcolorcode"
 internal const val KEY_TXTCOLORCODE = "key_txtcolorcode"
 internal const val KEY_BGSTYLE = "key_bgstyle"
+internal const val KEY_TXTSHADOW = "key_txtshadow"
 
 internal const val KEY_FORECAST = "key_forecast"
 internal const val KEY_FORECASTOPTION = "key_fcastoption"