From c21cce220f344fd55e4cad9e800d61d6d6244797 Mon Sep 17 00:00:00 2001 From: Dave Antoine Date: Wed, 6 Sep 2023 22:38:47 -0400 Subject: [PATCH 01/10] gradle: update dependencies --- app/build.gradle | 2 +- build.gradle | 2 +- common/build.gradle | 2 +- wearapp/build.gradle | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0824d0e91..501c25814 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -166,7 +166,7 @@ dependencies { fullgmsImplementation 'com.google.android.gms:play-services-base:18.2.0' 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.0.0' + fullgmsImplementation 'com.google.android.gms:play-services-wearable:18.1.0' fullgmsImplementation 'com.google.android.play:app-update-ktx:2.1.0' fullgmsImplementation 'com.google.android.play:feature-delivery-ktx:2.1.0' fullgmsImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-play-services:$kotlinx_version" diff --git a/build.gradle b/build.gradle index bd432053b..47757b579 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ buildscript { activity_version = '1.7.2' appcompat_version = '1.6.1' constraintlayout_version = '2.1.4' - core_version = '1.10.1' + core_version = '1.12.0-rc01' arch_core_runtime_version = '2.2.0' fragment_version = '1.6.1' lifecycle_version = '2.6.1' diff --git a/common/build.gradle b/common/build.gradle index 2ed936581..c979a12a8 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -82,6 +82,6 @@ dependencies { fullgmsImplementation 'com.google.android.gms:play-services-basement:18.2.0' fullgmsImplementation 'com.google.android.gms:play-services-tasks:18.0.2' fullgmsImplementation "com.google.android.gms:play-services-location:$gms_location_version" - fullgmsImplementation 'com.google.android.gms:play-services-wearable:18.0.0' + fullgmsImplementation 'com.google.android.gms:play-services-wearable:18.1.0' fullgmsImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-play-services:$kotlinx_version" } \ No newline at end of file diff --git a/wearapp/build.gradle b/wearapp/build.gradle index 47117b600..06dbfb2cc 100644 --- a/wearapp/build.gradle +++ b/wearapp/build.gradle @@ -139,7 +139,7 @@ dependencies { implementation "com.google.android.gms:play-services-location:$gms_location_version" // WearOS - implementation 'com.google.android.gms:play-services-wearable:18.0.0' + implementation 'com.google.android.gms:play-services-wearable:18.1.0' compileOnly 'com.google.android.wearable:wearable:2.9.0' implementation 'androidx.wear:wear:1.3.0' From 45548d300d284ae15bbd8526e1155d846d200058 Mon Sep 17 00:00:00 2001 From: Dave Antoine Date: Wed, 6 Sep 2023 22:40:11 -0400 Subject: [PATCH 02/10] SetupSettingsFragment: set initial temp unit based on locale --- .../thewizrd/simpleweather/setup/SetupSettingsFragment.kt | 6 ++++++ .../shared_resources/preferences/SettingsManager.kt | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/thewizrd/simpleweather/setup/SetupSettingsFragment.kt b/app/src/main/java/com/thewizrd/simpleweather/setup/SetupSettingsFragment.kt index 2c2f7e7a6..48bc4da27 100644 --- a/app/src/main/java/com/thewizrd/simpleweather/setup/SetupSettingsFragment.kt +++ b/app/src/main/java/com/thewizrd/simpleweather/setup/SetupSettingsFragment.kt @@ -11,6 +11,7 @@ import android.view.ViewGroup import androidx.activity.result.ActivityResultLauncher import androidx.activity.result.contract.ActivityResultContracts import androidx.annotation.NonNull +import androidx.core.text.util.LocalePreferences import androidx.preference.ListPreference import androidx.preference.SwitchPreferenceCompat import com.google.android.material.snackbar.BaseTransientBottomBar @@ -77,12 +78,17 @@ class SetupSettingsFragment : CustomPreferenceFragmentCompat() { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { setPreferencesFromResource(R.xml.pref_setup, rootKey) + val unitPref = findPreference(SettingsManager.KEY_USECELSIUS)!! val intervalPref = findPreference(SettingsManager.KEY_REFRESHINTERVAL)!! val notIconPref = findPreference(SettingsManager.KEY_NOTIFICATIONICON)!! val onGoingPref = findPreference(SettingsManager.KEY_ONGOINGNOTIFICATION)!! val alertsPref = findPreference(SettingsManager.KEY_USEALERTS)!! + if (LocalePreferences.getTemperatureUnit() == LocalePreferences.TemperatureUnit.CELSIUS) { + unitPref.setDefaultValue(true) + } + if (enableAdditionalRefreshIntervals()) { intervalPref.setEntries(R.array.premium_refreshinterval_entries) intervalPref.setEntryValues(R.array.premium_refreshinterval_values) diff --git a/shared_resources/src/main/java/com/thewizrd/shared_resources/preferences/SettingsManager.kt b/shared_resources/src/main/java/com/thewizrd/shared_resources/preferences/SettingsManager.kt index cfe2256a0..4507f2918 100644 --- a/shared_resources/src/main/java/com/thewizrd/shared_resources/preferences/SettingsManager.kt +++ b/shared_resources/src/main/java/com/thewizrd/shared_resources/preferences/SettingsManager.kt @@ -74,7 +74,7 @@ class SettingsManager(context: Context) { const val KEY_APIKEY = "API_KEY" private const val KEY_APIKEY_VERIFIED = "API_KEY_VERIFIED" const val KEY_APIKEY_PREFIX = "api_key" - private const val KEY_USECELSIUS = "key_usecelsius" + const val KEY_USECELSIUS = "key_usecelsius" const val KEY_WEATHERLOADED = "weatherLoaded" const val KEY_FOLLOWGPS = "key_followgps" private const val KEY_LASTGPSLOCATION = "key_lastgpslocation" From 125856cec22f697911d2028d8bffa02eada61a0f Mon Sep 17 00:00:00 2001 From: Dave Antoine Date: Wed, 6 Sep 2023 23:06:34 -0400 Subject: [PATCH 03/10] WeatherCoroutinesTileService: update resources version --- .../wearable/tiles/WeatherCoroutinesTileService.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wearapp/src/main/java/com/thewizrd/simpleweather/wearable/tiles/WeatherCoroutinesTileService.kt b/wearapp/src/main/java/com/thewizrd/simpleweather/wearable/tiles/WeatherCoroutinesTileService.kt index c211d2f63..006c25a95 100644 --- a/wearapp/src/main/java/com/thewizrd/simpleweather/wearable/tiles/WeatherCoroutinesTileService.kt +++ b/wearapp/src/main/java/com/thewizrd/simpleweather/wearable/tiles/WeatherCoroutinesTileService.kt @@ -123,7 +123,7 @@ abstract class WeatherCoroutinesTileService : SuspendingTileService() { Timber.tag(this::class.java.name).d("buildTile: v($wipKey)") return Tile.Builder() - .setResourcesVersion(wipKey) + .setResourcesVersion("${wipKey}:${weather?.location?.name}:${weather?.condition?.observationTime}") .setTileTimeline(singleTileTimeline) .setFreshnessIntervalMillis(freshnessIntervalMillis) .build() @@ -158,6 +158,8 @@ abstract class WeatherCoroutinesTileService : SuspendingTileService() { resourceIds: List ) { Timber.tag(this::class.java.name).d("produceRequestedResources") + Timber.tag(this::class.java.name).e("res - resIds = $resourceIds") + val resources = resourceIds.takeIf { it.isNotEmpty() } ?: resources if (resources.isNotEmpty()) { From 5fdf0c2274e4a8726204b6de2ddd903b313d5b70 Mon Sep 17 00:00:00 2001 From: Dave Antoine Date: Wed, 6 Sep 2023 23:07:10 -0400 Subject: [PATCH 04/10] wear: remove long titles from small complications --- .../wearable/complications/AQIComplicationService.kt | 6 ------ .../wearable/complications/BeaufortComplicationService.kt | 4 ---- .../wearable/complications/UVComplicationService.kt | 4 ++-- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/wearapp/src/main/java/com/thewizrd/simpleweather/wearable/complications/AQIComplicationService.kt b/wearapp/src/main/java/com/thewizrd/simpleweather/wearable/complications/AQIComplicationService.kt index aed67dc72..b788c838b 100644 --- a/wearapp/src/main/java/com/thewizrd/simpleweather/wearable/complications/AQIComplicationService.kt +++ b/wearapp/src/main/java/com/thewizrd/simpleweather/wearable/complications/AQIComplicationService.kt @@ -105,9 +105,6 @@ class AQIComplicationService : BaseWeatherComplicationService() { ).build() ).setText( PlainComplicationText.Builder("57").build() - ).setTitle( - PlainComplicationText.Builder(getString(R.string.label_airquality_short)) - .build() ).build() } ComplicationType.SHORT_TEXT -> { @@ -163,9 +160,6 @@ class AQIComplicationService : BaseWeatherComplicationService() { ).build() ).setText( PlainComplicationText.Builder(aqiIndex.toString()).build() - ).setTitle( - PlainComplicationText.Builder(getString(R.string.label_airquality_short)) - .build() ).setTapAction( getTapIntent(this) ).build() diff --git a/wearapp/src/main/java/com/thewizrd/simpleweather/wearable/complications/BeaufortComplicationService.kt b/wearapp/src/main/java/com/thewizrd/simpleweather/wearable/complications/BeaufortComplicationService.kt index 719c52a02..6dd0d2911 100644 --- a/wearapp/src/main/java/com/thewizrd/simpleweather/wearable/complications/BeaufortComplicationService.kt +++ b/wearapp/src/main/java/com/thewizrd/simpleweather/wearable/complications/BeaufortComplicationService.kt @@ -57,8 +57,6 @@ class BeaufortComplicationService : WeatherHourlyForecastComplicationService() { ).build() ).setText( PlainComplicationText.Builder("3").build() - ).setTitle( - PlainComplicationText.Builder("Beaufort").build() ).build() } ComplicationType.SHORT_TEXT -> { @@ -150,8 +148,6 @@ class BeaufortComplicationService : WeatherHourlyForecastComplicationService() { ).build() ).setText( PlainComplicationText.Builder(beaufortModel.progress.toString()).build() - ).setTitle( - PlainComplicationText.Builder(beaufortModel.beaufort.label).build() ).setTapAction( getTapIntent(this) ).build() diff --git a/wearapp/src/main/java/com/thewizrd/simpleweather/wearable/complications/UVComplicationService.kt b/wearapp/src/main/java/com/thewizrd/simpleweather/wearable/complications/UVComplicationService.kt index 502f322ef..4da4036b1 100644 --- a/wearapp/src/main/java/com/thewizrd/simpleweather/wearable/complications/UVComplicationService.kt +++ b/wearapp/src/main/java/com/thewizrd/simpleweather/wearable/complications/UVComplicationService.kt @@ -47,7 +47,7 @@ class UVComplicationService : WeatherHourlyForecastComplicationService() { ).setText( PlainComplicationText.Builder("3").build() ).setTitle( - PlainComplicationText.Builder(getString(R.string.label_uv)).build() + PlainComplicationText.Builder("UV").build() ).build() } ComplicationType.SHORT_TEXT -> { @@ -107,7 +107,7 @@ class UVComplicationService : WeatherHourlyForecastComplicationService() { ).setText( PlainComplicationText.Builder(uvModel.index.toString()).build() ).setTitle( - PlainComplicationText.Builder(getString(R.string.label_uv)).build() + PlainComplicationText.Builder("UV").build() ).setTapAction( getTapIntent(this) ).build() From 55848da725b9872dc1d67715601b7a6d5ee7832b Mon Sep 17 00:00:00 2001 From: Dave Antoine Date: Wed, 6 Sep 2023 23:24:47 -0400 Subject: [PATCH 05/10] SimpleWeather: v5.8.2-build2 --- app/build.gradle | 2 +- wearapp/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 501c25814..d789c5575 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 335820100 + versionCode 335820200 versionName "5.8.2" vectorDrawables.useSupportLibrary true diff --git a/wearapp/build.gradle b/wearapp/build.gradle index 06dbfb2cc..75d9f3a82 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 335820101 + versionCode 335820201 versionName "5.8.2" vectorDrawables.useSupportLibrary true From 741cdb8b120f5461283c8506cdbc47442da9baaf Mon Sep 17 00:00:00 2001 From: Dave Antoine Date: Thu, 7 Sep 2023 22:42:59 -0400 Subject: [PATCH 06/10] WeatherDetailItem: increase minimum height --- .../common/controls/DetailItemViewModel.java | 6 ++ .../ui/components/WeatherDetailItem.kt | 83 +++++++++---------- 2 files changed, 45 insertions(+), 44 deletions(-) diff --git a/common/src/main/java/com/thewizrd/common/controls/DetailItemViewModel.java b/common/src/main/java/com/thewizrd/common/controls/DetailItemViewModel.java index 09454e3fd..21b1e70ed 100644 --- a/common/src/main/java/com/thewizrd/common/controls/DetailItemViewModel.java +++ b/common/src/main/java/com/thewizrd/common/controls/DetailItemViewModel.java @@ -3,6 +3,7 @@ import android.content.Context; import androidx.annotation.NonNull; +import androidx.annotation.RestrictTo; import com.thewizrd.shared_resources.R; import com.thewizrd.shared_resources.SharedModuleKt; @@ -272,6 +273,11 @@ public DetailItemViewModel(@NonNull UV uv) { } } + @RestrictTo(RestrictTo.Scope.TESTS) + public DetailItemViewModel(@NonNull WeatherDetailsType detailsType) { + this.detailsType = detailsType; + } + @NonNull public WeatherDetailsType getDetailsType() { return detailsType; diff --git a/wearapp/src/main/java/com/thewizrd/simpleweather/ui/components/WeatherDetailItem.kt b/wearapp/src/main/java/com/thewizrd/simpleweather/ui/components/WeatherDetailItem.kt index e620bbe8a..5f0528d69 100644 --- a/wearapp/src/main/java/com/thewizrd/simpleweather/ui/components/WeatherDetailItem.kt +++ b/wearapp/src/main/java/com/thewizrd/simpleweather/ui/components/WeatherDetailItem.kt @@ -1,27 +1,38 @@ package com.thewizrd.simpleweather.ui.components -import android.content.res.Configuration +import androidx.compose.foundation.Image import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.wrapContentSize import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.rotate -import androidx.compose.ui.tooling.preview.Devices -import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.platform.LocalInspectionMode +import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp import androidx.wear.compose.material.Chip import androidx.wear.compose.material.ChipDefaults import androidx.wear.compose.material.Text +import androidx.wear.compose.ui.tooling.preview.WearPreviewFontScales import com.thewizrd.common.controls.DetailItemViewModel import com.thewizrd.common.controls.WeatherDetailsType +import com.thewizrd.simpleweather.R import com.thewizrd.simpleweather.ui.text.spannableStringToAnnotatedString +import com.thewizrd.simpleweather.ui.tools.WearPreviewDevices +import org.jetbrains.annotations.TestOnly @Composable fun WeatherDetailItem( model: DetailItemViewModel ) { + val isPreview = LocalInspectionMode.current + Chip( - modifier = Modifier.fillMaxWidth(), + modifier = Modifier + .fillMaxWidth() + .heightIn(min = 60.dp), label = { Text( text = spannableStringToAnnotatedString(model.label) @@ -35,52 +46,36 @@ fun WeatherDetailItem( onClick = {}, colors = ChipDefaults.secondaryChipColors(), icon = { - WeatherIcon( - modifier = Modifier - .size(24.dp) - .rotate(model.iconRotation.toFloat()), - weatherIcon = model.icon - ) + if (isPreview) { + Image( + modifier = Modifier + .size(ChipDefaults.IconSize) + .wrapContentSize(align = Alignment.Center), + painter = painterResource(id = R.drawable.ic_error), + contentDescription = "" + ) + } else { + WeatherIcon( + modifier = Modifier + .size(ChipDefaults.IconSize) + .wrapContentSize(align = Alignment.Center) + .rotate(model.iconRotation.toFloat()), + weatherIcon = model.icon + ) + } } ) } -@Preview( - apiLevel = 26, - uiMode = Configuration.UI_MODE_TYPE_WATCH, - showSystemUi = true, - device = Devices.WEAR_OS_LARGE_ROUND, - widthDp = 360, - heightDp = 360, - showBackground = true, - backgroundColor = 0xFF000000 -) -@Preview( - apiLevel = 26, - uiMode = Configuration.UI_MODE_TYPE_WATCH, - showSystemUi = true, - device = Devices.WEAR_OS_SQUARE, - widthDp = 360, - heightDp = 360, - showBackground = true, - backgroundColor = 0xFF000000 -) -@Preview( - apiLevel = 26, - uiMode = Configuration.UI_MODE_TYPE_WATCH, - showSystemUi = true, - device = Devices.WEAR_OS_SMALL_ROUND, - widthDp = 320, - heightDp = 320, - showBackground = true, - backgroundColor = 0xFF000000 -) +@WearPreviewDevices +@WearPreviewFontScales @Composable +@TestOnly fun PreviewWeatherDetailItem() { WeatherDetailItem( - model = DetailItemViewModel( - WeatherDetailsType.FEELSLIKE, - "70°" - ) + model = DetailItemViewModel(WeatherDetailsType.FEELSLIKE).apply { + value = "70°" + label = "Feels like" + } ) } \ No newline at end of file From 7c69304e39b0cf968c776585e077b9889ee3de80 Mon Sep 17 00:00:00 2001 From: Dave Antoine Date: Thu, 7 Sep 2023 22:49:37 -0400 Subject: [PATCH 07/10] SimpleWeather: v5.8.2-build3 --- app/build.gradle | 2 +- wearapp/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d789c5575..78105f643 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 335820200 + versionCode 335820300 versionName "5.8.2" vectorDrawables.useSupportLibrary true diff --git a/wearapp/build.gradle b/wearapp/build.gradle index 75d9f3a82..e16c631a8 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 335820201 + versionCode 335820301 versionName "5.8.2" vectorDrawables.useSupportLibrary true From 2e287a188fbfa247f7f0fb51a5a82df28b12f87d Mon Sep 17 00:00:00 2001 From: Dave Antoine Date: Sun, 10 Sep 2023 09:54:00 -0400 Subject: [PATCH 08/10] WeatherCoroutinesTileService: fix icon provider --- .../wearable/tiles/WeatherCoroutinesTileService.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wearapp/src/main/java/com/thewizrd/simpleweather/wearable/tiles/WeatherCoroutinesTileService.kt b/wearapp/src/main/java/com/thewizrd/simpleweather/wearable/tiles/WeatherCoroutinesTileService.kt index 006c25a95..d96fcbe69 100644 --- a/wearapp/src/main/java/com/thewizrd/simpleweather/wearable/tiles/WeatherCoroutinesTileService.kt +++ b/wearapp/src/main/java/com/thewizrd/simpleweather/wearable/tiles/WeatherCoroutinesTileService.kt @@ -141,7 +141,7 @@ abstract class WeatherCoroutinesTileService : SuspendingTileService() { .setVersion(requestParams.version) .apply { produceRequestedResources( - requestParams.version, + requestParams.version.split(':').first(), requestParams.deviceConfiguration, requestParams.resourceIds ) @@ -157,8 +157,8 @@ abstract class WeatherCoroutinesTileService : SuspendingTileService() { deviceParameters: DeviceParameters, resourceIds: List ) { - Timber.tag(this::class.java.name).d("produceRequestedResources") - Timber.tag(this::class.java.name).e("res - resIds = $resourceIds") + Timber.tag(this::class.java.name).d("produceRequestedResources: key = $wipKey") + Timber.tag(this::class.java.name).d("res - resIds = $resourceIds") val resources = resourceIds.takeIf { it.isNotEmpty() } ?: resources From 8420436f963229dd378cc9dc4e66303cd13861b7 Mon Sep 17 00:00:00 2001 From: Dave Antoine Date: Sun, 10 Sep 2023 14:59:12 -0400 Subject: [PATCH 09/10] Import translations --- shared_resources/src/main/res/values-pl/weather_conditions.xml | 2 +- wearapp/src/main/res/values-de/strings.xml | 1 + wearapp/src/main/res/values-es/strings.xml | 1 + wearapp/src/main/res/values-fr/strings.xml | 1 + wearapp/src/main/res/values-nl/strings.xml | 1 + wearapp/src/main/res/values-pl/strings.xml | 1 + wearapp/src/main/res/values-sk/strings.xml | 1 + wearapp/src/main/res/values-zh-rCN/strings.xml | 1 + 8 files changed, 8 insertions(+), 1 deletion(-) diff --git a/shared_resources/src/main/res/values-pl/weather_conditions.xml b/shared_resources/src/main/res/values-pl/weather_conditions.xml index b0082da4b..7ed8badf1 100644 --- a/shared_resources/src/main/res/values-pl/weather_conditions.xml +++ b/shared_resources/src/main/res/values-pl/weather_conditions.xml @@ -31,7 +31,7 @@ "Ładnie" "Deszcz z gradem" "Gorąco" - "Miejscowe burze z piorunami" + "Pojedyncze burze z piorunami" "Rozproszone burze z piorunami" "Rozproszone przelotne opady" "Silne opady śniegu" diff --git a/wearapp/src/main/res/values-de/strings.xml b/wearapp/src/main/res/values-de/strings.xml index c52167f5e..d7fe2d800 100644 --- a/wearapp/src/main/res/values-de/strings.xml +++ b/wearapp/src/main/res/values-de/strings.xml @@ -47,4 +47,5 @@ Weather (High/Low) --> "Wetter (hoch / niedrig)" "Wetter (Standort)" + "Wetter + Stündliche Vorhersage" \ No newline at end of file diff --git a/wearapp/src/main/res/values-es/strings.xml b/wearapp/src/main/res/values-es/strings.xml index f0e00c248..0abcf5bd5 100644 --- a/wearapp/src/main/res/values-es/strings.xml +++ b/wearapp/src/main/res/values-es/strings.xml @@ -44,4 +44,5 @@ Weather (High/Low) --> "Tiempo (Máx / Mín)" "Tiempo (ubicación actual)" + "Tiempo + Previsión horaria" \ No newline at end of file diff --git a/wearapp/src/main/res/values-fr/strings.xml b/wearapp/src/main/res/values-fr/strings.xml index 70fe3e22f..f37c12e9f 100644 --- a/wearapp/src/main/res/values-fr/strings.xml +++ b/wearapp/src/main/res/values-fr/strings.xml @@ -44,4 +44,5 @@ Weather (High/Low) --> "Météo (Max / Min)" "Météo (emplacement actuel)" + "Météo + prévisions horaires" \ No newline at end of file diff --git a/wearapp/src/main/res/values-nl/strings.xml b/wearapp/src/main/res/values-nl/strings.xml index 03d27d32a..473f51045 100644 --- a/wearapp/src/main/res/values-nl/strings.xml +++ b/wearapp/src/main/res/values-nl/strings.xml @@ -44,4 +44,5 @@ Weather (High/Low) --> "Weer (Max / Min)" "Weer (huidige locatie)" + "Weer + Uurvoorspelling" \ No newline at end of file diff --git a/wearapp/src/main/res/values-pl/strings.xml b/wearapp/src/main/res/values-pl/strings.xml index df18a28cf..6276a4a4c 100644 --- a/wearapp/src/main/res/values-pl/strings.xml +++ b/wearapp/src/main/res/values-pl/strings.xml @@ -44,4 +44,5 @@ Weather (High/Low) --> "Pogoda (Maks / Min)" "Pogoda (obecna lokalizacja)" + "Pogoda + prognoza godzinowa" \ No newline at end of file diff --git a/wearapp/src/main/res/values-sk/strings.xml b/wearapp/src/main/res/values-sk/strings.xml index 9012bf1af..5587533b7 100644 --- a/wearapp/src/main/res/values-sk/strings.xml +++ b/wearapp/src/main/res/values-sk/strings.xml @@ -45,4 +45,5 @@ Weather (High/Low) --> "Počasie (V. / N.)" "Počasie (súčasná poloha)" + "Počasie + hodinová predpoveď" \ No newline at end of file diff --git a/wearapp/src/main/res/values-zh-rCN/strings.xml b/wearapp/src/main/res/values-zh-rCN/strings.xml index 646986c10..f1a148091 100644 --- a/wearapp/src/main/res/values-zh-rCN/strings.xml +++ b/wearapp/src/main/res/values-zh-rCN/strings.xml @@ -61,4 +61,5 @@ Weather (High/Low) --> "天气 (高溫 / 低溫)" "天气 (当前地址)" + "天气 + 每小时预报" \ No newline at end of file From 90e8de5c41b88ae8216e0678f87063be00ae9c78 Mon Sep 17 00:00:00 2001 From: Dave Antoine Date: Sun, 10 Sep 2023 14:33:33 -0400 Subject: [PATCH 10/10] SimpleWeather: v5.8.2-build4 --- app/build.gradle | 2 +- wearapp/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 78105f643..7ee064820 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 335820300 + versionCode 335820400 versionName "5.8.2" vectorDrawables.useSupportLibrary true diff --git a/wearapp/build.gradle b/wearapp/build.gradle index e16c631a8..700b67151 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 335820301 + versionCode 335820401 versionName "5.8.2" vectorDrawables.useSupportLibrary true