From a6dfe9c8def96198693e4d9bfec9f4eeae5b98fb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 27 Oct 2024 14:46:32 +0100 Subject: [PATCH 1/7] Update dependency androidx.fragment:fragment-ktx to v1.8.4 (#3813) Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- mobile/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mobile/build.gradle b/mobile/build.gradle index 4bc8745cfd..6fc1ccbd31 100644 --- a/mobile/build.gradle +++ b/mobile/build.gradle @@ -151,7 +151,7 @@ dependencies { implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version" implementation "androidx.core:core-ktx:1.13.1" implementation "androidx.activity:activity-ktx:1.9.0" - implementation "androidx.fragment:fragment-ktx:1.8.1" + implementation "androidx.fragment:fragment-ktx:1.8.4" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "androidx.appcompat:appcompat:1.7.0" implementation "androidx.legacy:legacy-support-v4:1.0.0" From c7d468c3ee6769a9d565847a4aadaafb1b4594df Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 27 Oct 2024 14:47:43 +0100 Subject: [PATCH 2/7] Update about_libraries_version to v11.2.3 (#3818) Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- mobile/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mobile/build.gradle b/mobile/build.gradle index 6fc1ccbd31..fefbd77094 100644 --- a/mobile/build.gradle +++ b/mobile/build.gradle @@ -5,7 +5,7 @@ buildscript { ext.kotlin_coroutines_version = '1.8.1' ext.ok_http_version = '4.12.0' ext.work_manager_version = '2.9.0' - ext.about_libraries_version = '11.2.2' + ext.about_libraries_version = '11.2.3' ext.powermock_version = '2.0.9' ext.espresso_version = '3.5.1' ext.media3_version = '1.3.1' From a55838794f7cd68bf2d1ee05652aab7613920650 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 27 Oct 2024 14:48:08 +0100 Subject: [PATCH 3/7] Update acra_version to v5.11.4 (#3819) Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- mobile/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mobile/build.gradle b/mobile/build.gradle index fefbd77094..e1959e80be 100644 --- a/mobile/build.gradle +++ b/mobile/build.gradle @@ -9,7 +9,7 @@ buildscript { ext.powermock_version = '2.0.9' ext.espresso_version = '3.5.1' ext.media3_version = '1.3.1' - ext.acra_version = '5.11.3' + ext.acra_version = '5.11.4' repositories { mavenCentral() From e6ef4d3fd8728b2aeec9363c624b7bbf6b5a942e Mon Sep 17 00:00:00 2001 From: mueller-ma Date: Sun, 27 Oct 2024 14:48:46 +0100 Subject: [PATCH 4/7] Notification channels: severity => tag (#3821) Rename the user-facing parts of the notification channels. Signed-off-by: mueller-ma --- mobile/src/main/res/values/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml index d1c4753924..dff45f8c6f 100644 --- a/mobile/src/main/res/values/strings.xml +++ b/mobile/src/main/res/values/strings.xml @@ -348,8 +348,8 @@ Default Notifications sent by the server with no defined severity Messages - Severity \'%1$s\' - Notifications sent by the server with severity \'%1$s\' + Tag \'%1$s\' + Notifications sent by the server with tag \'%1$s\' %d new notification %d new notifications From eade0e67c81dd828d12e94cb0a7a2432e673d94e Mon Sep 17 00:00:00 2001 From: mueller-ma Date: Fri, 1 Nov 2024 15:52:46 +0100 Subject: [PATCH 5/7] Fix invisible buttongrid icons (#3827) The fallback color was black, so the icons were nearly invisible in dark mode. Closes #3826 Signed-off-by: mueller-ma --- .../src/main/java/org/openhab/habdroid/ui/WidgetAdapter.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mobile/src/main/java/org/openhab/habdroid/ui/WidgetAdapter.kt b/mobile/src/main/java/org/openhab/habdroid/ui/WidgetAdapter.kt index d7ad966589..93451cefd5 100644 --- a/mobile/src/main/java/org/openhab/habdroid/ui/WidgetAdapter.kt +++ b/mobile/src/main/java/org/openhab/habdroid/ui/WidgetAdapter.kt @@ -933,7 +933,7 @@ class WidgetAdapter( // Rows and columns start with 1 in Sitemap definition, thus decrement them here val button = buttons - .filter { it.visibility == true } + .filter { it.visibility } .firstOrNull { (it.row ?: 0) - 1 == row && (it.column ?: 0) - 1 == column } if (button != null && button.visibility) { buttonView.tag = button @@ -1927,9 +1927,10 @@ fun MaterialButton.setTextAndIcon( } val iconSize = context.resources.getDimensionPixelSize(R.dimen.section_switch_icon) CoroutineScope(Dispatchers.IO + Job()).launch { + val fallbackColor = context.getIconFallbackColor(IconBackground.APP_THEME) val drawable = try { connection.httpClient.get(iconUrl, caching = HttpClient.CachingMode.DEFAULT) - .asBitmap(iconSize, 0, ImageConversionPolicy.ForceTargetSize).response + .asBitmap(iconSize, fallbackColor, ImageConversionPolicy.ForceTargetSize).response .toDrawable(resources) } catch (e: HttpClient.HttpException) { Log.d(WidgetAdapter.TAG, "Error getting icon for button", e) From 7135d07c3654caa34e66bef5840e9573a7ad64fe Mon Sep 17 00:00:00 2001 From: mueller-ma Date: Fri, 1 Nov 2024 15:54:41 +0100 Subject: [PATCH 6/7] New Crowdin updates (#3808) --- mobile/src/main/res/values-ca/strings.xml | 2 -- mobile/src/main/res/values-cs/strings.xml | 2 -- mobile/src/main/res/values-de/strings.xml | 2 -- mobile/src/main/res/values-es-rUS/strings.xml | 2 -- mobile/src/main/res/values-es/strings.xml | 2 -- mobile/src/main/res/values-fi/strings.xml | 2 -- mobile/src/main/res/values-fr/strings.xml | 2 -- mobile/src/main/res/values-hu/strings.xml | 2 -- mobile/src/main/res/values-it/strings.xml | 4 +--- mobile/src/main/res/values-iw/strings.xml | 2 -- mobile/src/main/res/values-ja/strings.xml | 2 -- mobile/src/main/res/values-lb/strings.xml | 1 - mobile/src/main/res/values-nb/strings.xml | 2 -- mobile/src/main/res/values-nl/strings.xml | 2 -- mobile/src/main/res/values-pl/strings.xml | 2 -- mobile/src/main/res/values-pt-rBR/strings.xml | 2 -- mobile/src/main/res/values-ru/strings.xml | 2 -- mobile/src/main/res/values-uk/strings.xml | 2 -- mobile/src/main/res/values-zh-rCN/strings.xml | 2 -- 19 files changed, 1 insertion(+), 38 deletions(-) diff --git a/mobile/src/main/res/values-ca/strings.xml b/mobile/src/main/res/values-ca/strings.xml index df1fb36596..072726050d 100644 --- a/mobile/src/main/res/values-ca/strings.xml +++ b/mobile/src/main/res/values-ca/strings.xml @@ -289,8 +289,6 @@ No s\'ha pogut carregar el Sitemap. S\'ha produït l\'error següent: %1$sPer defecte Notificacions enviades pel servidor sense gravetat definida Missatges - Gravetat \'%1$s\' - Notificacions enviades pel servidor amb gravetat \'%1$s\' %d notificació nova %d notificacions noves diff --git a/mobile/src/main/res/values-cs/strings.xml b/mobile/src/main/res/values-cs/strings.xml index 12bac7383f..b955129b9b 100644 --- a/mobile/src/main/res/values-cs/strings.xml +++ b/mobile/src/main/res/values-cs/strings.xml @@ -292,8 +292,6 @@ Výchozí Oznámení odeslaná serverem se standardní důležitostí Zprávy - Priorita \"%1$s\" - Oznámení zasílaná serverem s prioritou \'%1$s\' %d nové oznámení %d nová oznámení diff --git a/mobile/src/main/res/values-de/strings.xml b/mobile/src/main/res/values-de/strings.xml index be24eb8af9..7c70a867a1 100644 --- a/mobile/src/main/res/values-de/strings.xml +++ b/mobile/src/main/res/values-de/strings.xml @@ -311,8 +311,6 @@ Standard Vom Server gesendete Benachrichtigungen ohne definierte Wichtigkeit Nachrichten - Dringlichkeit \'%1$s\' - Vom Server gesendete Benachrichtigungen mit Wichtigkeit \'%1$s\' %d neue Benachrichtigung %d neue Benachrichtigungen diff --git a/mobile/src/main/res/values-es-rUS/strings.xml b/mobile/src/main/res/values-es-rUS/strings.xml index acaf5b9361..4ef9da4ec4 100644 --- a/mobile/src/main/res/values-es-rUS/strings.xml +++ b/mobile/src/main/res/values-es-rUS/strings.xml @@ -309,8 +309,6 @@ Por defecto Notificaciones enviadas por el servidor con severidad no definida Mensajes - Importancia \'%1$s\' - Notificaciones enviadas por el servidor con importancia \'%1$s\' %d nueva notificación %d nuevas notificaciones diff --git a/mobile/src/main/res/values-es/strings.xml b/mobile/src/main/res/values-es/strings.xml index acaf5b9361..4ef9da4ec4 100644 --- a/mobile/src/main/res/values-es/strings.xml +++ b/mobile/src/main/res/values-es/strings.xml @@ -309,8 +309,6 @@ Por defecto Notificaciones enviadas por el servidor con severidad no definida Mensajes - Importancia \'%1$s\' - Notificaciones enviadas por el servidor con importancia \'%1$s\' %d nueva notificación %d nuevas notificaciones diff --git a/mobile/src/main/res/values-fi/strings.xml b/mobile/src/main/res/values-fi/strings.xml index 71f44af984..9eecb26094 100644 --- a/mobile/src/main/res/values-fi/strings.xml +++ b/mobile/src/main/res/values-fi/strings.xml @@ -244,8 +244,6 @@ Oletus Palvelimen lähettämät ilmoitukset ilman vakavuusarvoa Viestit - Vakavuus \'%1$s\' - Palvelimen lähettämät viestit vakavuudella \'%1$s\' %d uusi ilmoitus %d uutta ilmoitusta diff --git a/mobile/src/main/res/values-fr/strings.xml b/mobile/src/main/res/values-fr/strings.xml index 987e4b5320..d0dccda187 100644 --- a/mobile/src/main/res/values-fr/strings.xml +++ b/mobile/src/main/res/values-fr/strings.xml @@ -286,8 +286,6 @@ Défaut Notifications envoyées par le serveur sans définition de gravité Messages - Gravité «%1$s » - Notifications envoyées par le serveur avec la gravité \'%1$s\' %d nouvelles notifications %d nouvelles notifications diff --git a/mobile/src/main/res/values-hu/strings.xml b/mobile/src/main/res/values-hu/strings.xml index 93d1371244..96d5eb7ab4 100644 --- a/mobile/src/main/res/values-hu/strings.xml +++ b/mobile/src/main/res/values-hu/strings.xml @@ -310,8 +310,6 @@ Alapértelmezett A szerver által küldött értesítés nincs priorizálva Üzenetek - Súlyossága \"%1$s\" - A szerver által küldött értesítés fontossága \'%1$s\' %d új értesítés %d új értesítések diff --git a/mobile/src/main/res/values-it/strings.xml b/mobile/src/main/res/values-it/strings.xml index 04fc4b64ef..12487163d9 100644 --- a/mobile/src/main/res/values-it/strings.xml +++ b/mobile/src/main/res/values-it/strings.xml @@ -9,7 +9,7 @@ Elimina Trova openHAB server Seleziona server su Wi-Fi - Consigliato di accendere il Wi-Fi + Consigliato di attivare il Wi-Fi Sitemaps Impostazioni @@ -308,8 +308,6 @@ Predefinito Notifiche inviate dal server senza gravità definita Messaggi - Gravità \'%1$s\' - Notifiche inviate dal server con gravità \'%1$s\' %d nuova notifica %d nuove notifiche diff --git a/mobile/src/main/res/values-iw/strings.xml b/mobile/src/main/res/values-iw/strings.xml index 8e0c431c68..0062825258 100644 --- a/mobile/src/main/res/values-iw/strings.xml +++ b/mobile/src/main/res/values-iw/strings.xml @@ -312,8 +312,6 @@ ברירת מחדל התראות שנשלחו על ידי השרת ללא הגדרת תעדוף הודעות - דרגת חומרה \'%1$s\' - התראות שנשלחו על ידי השרת הוגדרו עם תעדוף ׳%1$s׳ %d התראה חדשה %d התראות חדשות diff --git a/mobile/src/main/res/values-ja/strings.xml b/mobile/src/main/res/values-ja/strings.xml index b881b31d77..e2da8e159f 100644 --- a/mobile/src/main/res/values-ja/strings.xml +++ b/mobile/src/main/res/values-ja/strings.xml @@ -247,8 +247,6 @@ デフォルト 重大度が定義されずにサーバーから送信された通知 メッセージ - 重要度 \'%1$s\' - 重要度 \'%1$s\' でサーバーから送信された通知 %d の新しい通知 diff --git a/mobile/src/main/res/values-lb/strings.xml b/mobile/src/main/res/values-lb/strings.xml index 8ccd5d429d..5af648befb 100644 --- a/mobile/src/main/res/values-lb/strings.xml +++ b/mobile/src/main/res/values-lb/strings.xml @@ -236,7 +236,6 @@ Feeler an den Hannergrond Prozesser Standard Messagen - Eescht \'%1$s\' %d nei Notifikatioun %d nei Notifikatiounen diff --git a/mobile/src/main/res/values-nb/strings.xml b/mobile/src/main/res/values-nb/strings.xml index 846522f9ae..9bcfef2429 100644 --- a/mobile/src/main/res/values-nb/strings.xml +++ b/mobile/src/main/res/values-nb/strings.xml @@ -311,8 +311,6 @@ Standard Varsler sendt av serveren uten en definert alvorlighetsgrad Meldinger - Alvorlighetsgrad \'%1$s\' - Varsler sendt av serveren med alvorlighetsgrad \'%1$s\' %d nytt varsel %d nye varsler diff --git a/mobile/src/main/res/values-nl/strings.xml b/mobile/src/main/res/values-nl/strings.xml index 21dec4f916..cae6f83a70 100644 --- a/mobile/src/main/res/values-nl/strings.xml +++ b/mobile/src/main/res/values-nl/strings.xml @@ -311,8 +311,6 @@ Standaard Meldingen verzonden door de server zonder gedefinieerde ernst Berichten - Ernst \'%1$s\' - Meldingen verzonden door de server met ernst \'%1$s\' %d nieuwe melding %d nieuwe meldingen diff --git a/mobile/src/main/res/values-pl/strings.xml b/mobile/src/main/res/values-pl/strings.xml index 4d131efa4f..2dbedc12cd 100644 --- a/mobile/src/main/res/values-pl/strings.xml +++ b/mobile/src/main/res/values-pl/strings.xml @@ -251,8 +251,6 @@ Domyślny Powiadomienia wysyłane przez serwer bez określonego poziomu Wiadomości - Poziom \'%1$s\' - Powiadomienia wysłane przez serwer o poziomie \'%1$s\' Nowe powiadomienia (%d) Nowe powiadomienia: %d diff --git a/mobile/src/main/res/values-pt-rBR/strings.xml b/mobile/src/main/res/values-pt-rBR/strings.xml index 0af904f1ac..fe294f01ba 100644 --- a/mobile/src/main/res/values-pt-rBR/strings.xml +++ b/mobile/src/main/res/values-pt-rBR/strings.xml @@ -259,8 +259,6 @@ Padrão Notificações enviadas pelo servidor sem gravidade definida Mensagens - Gravidade \'%1$s\' - Notificações enviadas pelo servidor com gravidade \'%1$s\' %d nova notificação %d novas notificações diff --git a/mobile/src/main/res/values-ru/strings.xml b/mobile/src/main/res/values-ru/strings.xml index c7309ac4ac..727c001a1b 100644 --- a/mobile/src/main/res/values-ru/strings.xml +++ b/mobile/src/main/res/values-ru/strings.xml @@ -273,8 +273,6 @@ По умолчанию Уведомления, отправленные сервером без заданной важности Сообщения - Важность \'%1$s\' - Уведомления, отправленные сервером с важностью \'%1$s\' %d уведомление %d уведомлений diff --git a/mobile/src/main/res/values-uk/strings.xml b/mobile/src/main/res/values-uk/strings.xml index 985666de55..50c0c450ff 100644 --- a/mobile/src/main/res/values-uk/strings.xml +++ b/mobile/src/main/res/values-uk/strings.xml @@ -269,8 +269,6 @@ За замовчуванням Сповіщення, надіслані сервером без вказаної важливості Повідомлення - Важливість \'%1$s - Сповіщення, надіслані сервером з важливістю \'%1$s\' %d нове сповіщення %d нових сповіщення diff --git a/mobile/src/main/res/values-zh-rCN/strings.xml b/mobile/src/main/res/values-zh-rCN/strings.xml index 329b21d335..199dff374d 100644 --- a/mobile/src/main/res/values-zh-rCN/strings.xml +++ b/mobile/src/main/res/values-zh-rCN/strings.xml @@ -296,8 +296,6 @@ 默认 服务器发送通知没有定义严重程度 消息 - 严重性 \'%1$s\' - 服务器发送严重程度为%1$s \' 的通知 %d 条新通知 From ad37a8c488d7633c391e50ca089e43450648c1fd Mon Sep 17 00:00:00 2001 From: openhab-bot Date: Fri, 1 Nov 2024 14:55:40 +0000 Subject: [PATCH 7/7] Bump version to 3.16.4-beta and update fastlane metadata Signed-off-by: openhab-bot --- fastlane/metadata/android/en-US/changelogs/558.txt | 6 ++++++ mobile/build.gradle | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/558.txt diff --git a/fastlane/metadata/android/en-US/changelogs/558.txt b/fastlane/metadata/android/en-US/changelogs/558.txt new file mode 100644 index 0000000000..a71916eef3 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/558.txt @@ -0,0 +1,6 @@ +## What's Changed +* Notification channels: severity => tag by @mueller-ma in https://github.com/openhab/openhab-android/pull/3821 +* Fix invisible buttongrid icons by @mueller-ma in https://github.com/openhab/openhab-android/pull/3827 + + +**Full Changelog**: https://github.com/openhab/openhab-android/compare/3.16.3-beta...3.16.4-beta diff --git a/mobile/build.gradle b/mobile/build.gradle index e1959e80be..71f9f3d683 100644 --- a/mobile/build.gradle +++ b/mobile/build.gradle @@ -49,8 +49,8 @@ android { minSdkVersion 21 compileSdk 34 targetSdkVersion 33 - versionCode 557 - versionName "3.16.3-beta" + versionCode 558 + versionName "3.16.4-beta" multiDexEnabled true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" buildConfigField "long", "TIMESTAMP", System.currentTimeMillis() + "L"