Merge branch 'main' into target-sdk-34

Signed-off-by: mueller-ma <[email protected]>
mueller-ma · Nov 17, 2024 · 54ca80c · 54ca80c
2 parents c4ea466 + ad37a8c
commit 54ca80c
Show file tree

Hide file tree

Showing 23 changed files with 17 additions and 47 deletions.
diff --git a/fastlane/metadata/android/en-US/changelogs/558.txt 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
@@ -5,11 +5,11 @@ 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'
-    ext.acra_version = '5.11.3'
+    ext.acra_version = '5.11.4'
 
     repositories {
         mavenCentral()
@@ -48,8 +48,8 @@ android {
         minSdkVersion 21
         compileSdk 34
         targetSdkVersion 34
-        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"
@@ -150,7 +150,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"

diff --git 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)

diff --git 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$s</stri
     <string name="notification_channel_messages_default_severity">Per defecte</string>
     <string name="notification_channel_messages_default_severity_description">Notificacions enviades pel servidor sense gravetat definida</string>
     <string name="notification_channel_group_messages">Missatges</string>
-    <string name="notification_channel_severity_value">Gravetat \'%1$s\'</string>
-    <string name="notification_channel_severity_value_description">Notificacions enviades pel servidor amb gravetat \'%1$s\'</string>
     <plurals name="summary_notification_text">
         <item quantity="one">%d notificació nova</item>
         <item quantity="other">%d notificacions noves</item>

diff --git a/mobile/src/main/res/values-cs/strings.xml b/mobile/src/main/res/values-cs/strings.xml
@@ -292,8 +292,6 @@
     <string name="notification_channel_messages_default_severity">Výchozí</string>
     <string name="notification_channel_messages_default_severity_description">Oznámení odeslaná serverem se standardní důležitostí</string>
     <string name="notification_channel_group_messages">Zprávy</string>
-    <string name="notification_channel_severity_value">Priorita \"%1$s\"</string>
-    <string name="notification_channel_severity_value_description">Oznámení zasílaná serverem s prioritou \'%1$s\'</string>
     <plurals name="summary_notification_text">
         <item quantity="one">%d nové oznámení</item>
         <item quantity="few">%d nová oznámení</item>

diff --git a/mobile/src/main/res/values-de/strings.xml b/mobile/src/main/res/values-de/strings.xml
@@ -311,8 +311,6 @@
     <string name="notification_channel_messages_default_severity">Standard</string>
     <string name="notification_channel_messages_default_severity_description">Vom Server gesendete Benachrichtigungen ohne definierte Wichtigkeit</string>
     <string name="notification_channel_group_messages">Nachrichten</string>
-    <string name="notification_channel_severity_value">Dringlichkeit \'%1$s\'</string>
-    <string name="notification_channel_severity_value_description">Vom Server gesendete Benachrichtigungen mit Wichtigkeit \'%1$s\'</string>
     <plurals name="summary_notification_text">
         <item quantity="one">%d neue Benachrichtigung</item>
         <item quantity="other">%d neue Benachrichtigungen</item>

diff --git a/mobile/src/main/res/values-es-rUS/strings.xml b/mobile/src/main/res/values-es-rUS/strings.xml
@@ -309,8 +309,6 @@
     <string name="notification_channel_messages_default_severity">Por defecto</string>
     <string name="notification_channel_messages_default_severity_description">Notificaciones enviadas por el servidor con severidad no definida</string>
     <string name="notification_channel_group_messages">Mensajes</string>
-    <string name="notification_channel_severity_value">Importancia \'%1$s\'</string>
-    <string name="notification_channel_severity_value_description">Notificaciones enviadas por el servidor con importancia \'%1$s\'</string>
     <plurals name="summary_notification_text">
         <item quantity="one">%d nueva notificación</item>
         <item quantity="other">%d nuevas notificaciones</item>

diff --git a/mobile/src/main/res/values-es/strings.xml b/mobile/src/main/res/values-es/strings.xml
@@ -309,8 +309,6 @@
     <string name="notification_channel_messages_default_severity">Por defecto</string>
     <string name="notification_channel_messages_default_severity_description">Notificaciones enviadas por el servidor con severidad no definida</string>
     <string name="notification_channel_group_messages">Mensajes</string>
-    <string name="notification_channel_severity_value">Importancia \'%1$s\'</string>
-    <string name="notification_channel_severity_value_description">Notificaciones enviadas por el servidor con importancia \'%1$s\'</string>
     <plurals name="summary_notification_text">
         <item quantity="one">%d nueva notificación</item>
         <item quantity="other">%d nuevas notificaciones</item>

diff --git a/mobile/src/main/res/values-fi/strings.xml b/mobile/src/main/res/values-fi/strings.xml
@@ -244,8 +244,6 @@
     <string name="notification_channel_messages_default_severity">Oletus</string>
     <string name="notification_channel_messages_default_severity_description">Palvelimen lähettämät ilmoitukset ilman vakavuusarvoa</string>
     <string name="notification_channel_group_messages">Viestit</string>
-    <string name="notification_channel_severity_value">Vakavuus \'%1$s\'</string>
-    <string name="notification_channel_severity_value_description">Palvelimen lähettämät viestit vakavuudella \'%1$s\'</string>
     <plurals name="summary_notification_text">
         <item quantity="one">%d uusi ilmoitus</item>
         <item quantity="other">%d uutta ilmoitusta</item>

diff --git a/mobile/src/main/res/values-fr/strings.xml b/mobile/src/main/res/values-fr/strings.xml
@@ -286,8 +286,6 @@
     <string name="notification_channel_messages_default_severity">Défaut</string>
     <string name="notification_channel_messages_default_severity_description">Notifications envoyées par le serveur sans définition de gravité</string>
     <string name="notification_channel_group_messages">Messages</string>
-    <string name="notification_channel_severity_value">Gravité «%1$s »</string>
-    <string name="notification_channel_severity_value_description">Notifications envoyées par le serveur avec la gravité \'%1$s\'</string>
     <plurals name="summary_notification_text">
         <item quantity="one">%d nouvelles notifications</item>
         <item quantity="other">%d nouvelles notifications</item>

diff --git a/mobile/src/main/res/values-hu/strings.xml b/mobile/src/main/res/values-hu/strings.xml
@@ -310,8 +310,6 @@
     <string name="notification_channel_messages_default_severity">Alapértelmezett</string>
     <string name="notification_channel_messages_default_severity_description">A szerver által küldött értesítés nincs priorizálva</string>
     <string name="notification_channel_group_messages">Üzenetek</string>
-    <string name="notification_channel_severity_value">Súlyossága \"%1$s\"</string>
-    <string name="notification_channel_severity_value_description">A szerver által küldött értesítés fontossága \'%1$s\'</string>
     <plurals name="summary_notification_text">
         <item quantity="one">%d új értesítés</item>
         <item quantity="other">%d új értesítések</item>

diff --git a/mobile/src/main/res/values-it/strings.xml b/mobile/src/main/res/values-it/strings.xml
@@ -9,7 +9,7 @@
     <string name="delete">Elimina</string>
     <string name="attribution_tag_discover_server">Trova openHAB server</string>
     <string name="attribution_tag_select_server_wifi">Seleziona server su Wi-Fi</string>
-    <string name="attribution_tag_suggest_turn_on_wifi">Consigliato di accendere il Wi-Fi</string>
+    <string name="attribution_tag_suggest_turn_on_wifi">Consigliato di attivare il Wi-Fi</string>
     <!-- Main menu items -->
     <string name="mainmenu_openhab_sitemaps">Sitemaps</string>
     <string name="mainmenu_openhab_preferences">Impostazioni</string>
@@ -308,8 +308,6 @@
     <string name="notification_channel_messages_default_severity">Predefinito</string>
     <string name="notification_channel_messages_default_severity_description">Notifiche inviate dal server senza gravità definita</string>
     <string name="notification_channel_group_messages">Messaggi</string>
-    <string name="notification_channel_severity_value">Gravità \'%1$s\'</string>
-    <string name="notification_channel_severity_value_description">Notifiche inviate dal server con gravità \'%1$s\'</string>
     <plurals name="summary_notification_text">
         <item quantity="one">%d nuova notifica</item>
         <item quantity="other">%d nuove notifiche</item>

diff --git a/mobile/src/main/res/values-iw/strings.xml b/mobile/src/main/res/values-iw/strings.xml
@@ -312,8 +312,6 @@
     <string name="notification_channel_messages_default_severity">ברירת מחדל</string>
     <string name="notification_channel_messages_default_severity_description">התראות שנשלחו על ידי השרת ללא הגדרת תעדוף</string>
     <string name="notification_channel_group_messages">הודעות</string>
-    <string name="notification_channel_severity_value">דרגת חומרה \'%1$s\'</string>
-    <string name="notification_channel_severity_value_description">התראות שנשלחו על ידי השרת הוגדרו עם תעדוף ׳%1$s׳</string>
     <plurals name="summary_notification_text">
         <item quantity="one">%d התראה חדשה</item>
         <item quantity="two">%d התראות חדשות</item>

diff --git a/mobile/src/main/res/values-ja/strings.xml b/mobile/src/main/res/values-ja/strings.xml
@@ -247,8 +247,6 @@
     <string name="notification_channel_messages_default_severity">デフォルト</string>
     <string name="notification_channel_messages_default_severity_description">重大度が定義されずにサーバーから送信された通知</string>
     <string name="notification_channel_group_messages">メッセージ</string>
-    <string name="notification_channel_severity_value">重要度 \'%1$s\'</string>
-    <string name="notification_channel_severity_value_description">重要度 \'%1$s\' でサーバーから送信された通知</string>
     <plurals name="summary_notification_text">
         <item quantity="other">%d の新しい通知</item>
     </plurals>

diff --git a/mobile/src/main/res/values-lb/strings.xml b/mobile/src/main/res/values-lb/strings.xml
@@ -236,7 +236,6 @@
     <string name="notification_channel_background_error">Feeler an den Hannergrond Prozesser</string>
     <string name="notification_channel_messages_default_severity">Standard</string>
     <string name="notification_channel_group_messages">Messagen</string>
-    <string name="notification_channel_severity_value">Eescht \'%1$s\'</string>
     <plurals name="summary_notification_text">
         <item quantity="one">%d nei Notifikatioun</item>
         <item quantity="other">%d nei Notifikatiounen</item>

diff --git a/mobile/src/main/res/values-nb/strings.xml b/mobile/src/main/res/values-nb/strings.xml
@@ -311,8 +311,6 @@
     <string name="notification_channel_messages_default_severity">Standard</string>
     <string name="notification_channel_messages_default_severity_description">Varsler sendt av serveren uten en definert alvorlighetsgrad</string>
     <string name="notification_channel_group_messages">Meldinger</string>
-    <string name="notification_channel_severity_value">Alvorlighetsgrad \'%1$s\'</string>
-    <string name="notification_channel_severity_value_description">Varsler sendt av serveren med alvorlighetsgrad \'%1$s\'</string>
     <plurals name="summary_notification_text">
         <item quantity="one">%d nytt varsel</item>
         <item quantity="other">%d nye varsler</item>

diff --git a/mobile/src/main/res/values-nl/strings.xml b/mobile/src/main/res/values-nl/strings.xml
@@ -311,8 +311,6 @@
     <string name="notification_channel_messages_default_severity">Standaard</string>
     <string name="notification_channel_messages_default_severity_description">Meldingen verzonden door de server zonder gedefinieerde ernst</string>
     <string name="notification_channel_group_messages">Berichten</string>
-    <string name="notification_channel_severity_value">Ernst \'%1$s\'</string>
-    <string name="notification_channel_severity_value_description">Meldingen verzonden door de server met ernst \'%1$s\'</string>
     <plurals name="summary_notification_text">
         <item quantity="one">%d nieuwe melding</item>
         <item quantity="other">%d nieuwe meldingen</item>

diff --git a/mobile/src/main/res/values-pl/strings.xml b/mobile/src/main/res/values-pl/strings.xml
@@ -251,8 +251,6 @@
     <string name="notification_channel_messages_default_severity">Domyślny</string>
     <string name="notification_channel_messages_default_severity_description">Powiadomienia wysyłane przez serwer bez określonego poziomu</string>
     <string name="notification_channel_group_messages">Wiadomości</string>
-    <string name="notification_channel_severity_value">Poziom \'%1$s\'</string>
-    <string name="notification_channel_severity_value_description">Powiadomienia wysłane przez serwer o poziomie \'%1$s\'</string>
     <plurals name="summary_notification_text">
         <item quantity="one">Nowe powiadomienia (%d)</item>
         <item quantity="few">Nowe powiadomienia: %d</item>

diff --git a/mobile/src/main/res/values-pt-rBR/strings.xml b/mobile/src/main/res/values-pt-rBR/strings.xml
@@ -259,8 +259,6 @@
     <string name="notification_channel_messages_default_severity">Padrão</string>
     <string name="notification_channel_messages_default_severity_description">Notificações enviadas pelo servidor sem gravidade definida</string>
     <string name="notification_channel_group_messages">Mensagens</string>
-    <string name="notification_channel_severity_value">Gravidade \'%1$s\'</string>
-    <string name="notification_channel_severity_value_description">Notificações enviadas pelo servidor com gravidade \'%1$s\'</string>
     <plurals name="summary_notification_text">
         <item quantity="one">%d nova notificação</item>
         <item quantity="other">%d novas notificações</item>

diff --git a/mobile/src/main/res/values-ru/strings.xml b/mobile/src/main/res/values-ru/strings.xml
@@ -273,8 +273,6 @@
     <string name="notification_channel_messages_default_severity">По умолчанию</string>
     <string name="notification_channel_messages_default_severity_description">Уведомления, отправленные сервером без заданной важности</string>
     <string name="notification_channel_group_messages">Сообщения</string>
-    <string name="notification_channel_severity_value">Важность \'%1$s\'</string>
-    <string name="notification_channel_severity_value_description">Уведомления, отправленные сервером с важностью \'%1$s\'</string>
     <plurals name="summary_notification_text">
         <item quantity="one">%d уведомление</item>
         <item quantity="few">%d уведомлений</item>

diff --git a/mobile/src/main/res/values-uk/strings.xml b/mobile/src/main/res/values-uk/strings.xml
@@ -269,8 +269,6 @@
     <string name="notification_channel_messages_default_severity">За замовчуванням</string>
     <string name="notification_channel_messages_default_severity_description">Сповіщення, надіслані сервером без вказаної важливості</string>
     <string name="notification_channel_group_messages">Повідомлення</string>
-    <string name="notification_channel_severity_value">Важливість \'%1$s</string>
-    <string name="notification_channel_severity_value_description">Сповіщення, надіслані сервером з важливістю \'%1$s\'</string>
     <plurals name="summary_notification_text">
         <item quantity="one">%d нове сповіщення</item>
         <item quantity="few">%d нових сповіщення</item>

diff --git a/mobile/src/main/res/values-zh-rCN/strings.xml b/mobile/src/main/res/values-zh-rCN/strings.xml
@@ -296,8 +296,6 @@
     <string name="notification_channel_messages_default_severity">默认</string>
     <string name="notification_channel_messages_default_severity_description">服务器发送通知没有定义严重程度</string>
     <string name="notification_channel_group_messages">消息</string>
-    <string name="notification_channel_severity_value">严重性 \'%1$s\'</string>
-    <string name="notification_channel_severity_value_description">服务器发送严重程度为%1$s \' 的通知</string>
     <plurals name="summary_notification_text">
         <item quantity="other">%d 条新通知</item>
     </plurals>

diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
@@ -348,8 +348,8 @@
     <string name="notification_channel_messages_default_severity">Default</string>
     <string name="notification_channel_messages_default_severity_description">Notifications sent by the server with no defined severity</string>
     <string name="notification_channel_group_messages">Messages</string>
-    <string name="notification_channel_severity_value">Severity \'%1$s\'</string>
-    <string name="notification_channel_severity_value_description">Notifications sent by the server with severity \'%1$s\'</string>
+    <string name="notification_channel_severity_value">Tag \'%1$s\'</string>
+    <string name="notification_channel_severity_value_description">Notifications sent by the server with tag \'%1$s\'</string>
     <plurals name="summary_notification_text">
         <item quantity="one">%d new notification</item>
         <item quantity="other">%d new notifications</item>