Remove warning about ID4 Popup requirement

ID5+ has supported it for years
BimmerGestalt · Oct 20, 2024 · d4f4e7e · d4f4e7e
1 parent ea49ba1
commit d4f4e7e
Show file tree

Hide file tree

Showing 20 changed files with 0 additions and 153 deletions.
diff --git a/app/src/main/java/me/hufman/androidautoidrive/CarInformation.kt b/app/src/main/java/me/hufman/androidautoidrive/CarInformation.kt
@@ -208,11 +208,6 @@ class CarCapabilitiesSummarized(val carInformation: CarInformation) {
 	val isHmiNotSupported: Boolean
 		get() = carInformation.connectionBrand?.uppercase() == "J29"
 
-	val isPopupSupported: Boolean
-		get() = isHmiSupported
-	val isPopupNotSupported: Boolean
-		get() = isHmiNotSupported
-
 	val isTtsSupported: Boolean
 		get() = isHmiSupported && carInformation.capabilities["tts"]?.lowercase(Locale.ROOT) == "true"
 	val isTtsNotSupported: Boolean

diff --git a/app/src/main/java/me/hufman/androidautoidrive/phoneui/viewmodels/CarCapabilitiesViewModel.kt b/app/src/main/java/me/hufman/androidautoidrive/phoneui/viewmodels/CarCapabilitiesViewModel.kt
@@ -53,15 +53,6 @@ class CarCapabilitiesViewModel(val carInformation: CarInformation, val musicAppM
 	private val _audioStateHint = MutableLiveData<Context.() -> String>()
 	val audioStateHint: LiveData<Context.() -> String> = _audioStateHint
 
-	private val _isPopupSupported = MutableLiveData(false)
-	val isPopupSupported: LiveData<Boolean> = _isPopupSupported
-	private val _isPopupNotSupported = MutableLiveData(false)
-	val isPopupNotSupported: LiveData<Boolean> = _isPopupNotSupported
-	private val _popupStatus = MutableLiveData<Context.() -> String>()
-	val popupStatus: LiveData<Context.() -> String> = _popupStatus
-	private val _popupHint = MutableLiveData<Context.() -> String>()
-	val popupHint: LiveData<Context.() -> String> = _popupHint
-
 	private val _isTtsSupported = MutableLiveData(false)
 	val isTtsSupported: LiveData<Boolean> = _isTtsSupported
 	private val _isTtsNotSupported = MutableLiveData(false)
@@ -119,15 +110,6 @@ class CarCapabilitiesViewModel(val carInformation: CarInformation, val musicAppM
 			}
 		}
 
-		_isPopupSupported.value = summarized.isPopupSupported
-		_isPopupNotSupported.value = summarized.isPopupNotSupported
-		_popupStatus.value = if (summarized.isPopupSupported) {
-			{ getString(R.string.txt_capabilities_popup_yes) }
-		} else {
-			{ getString(R.string.txt_capabilities_popup_no) }
-		}
-		_popupHint.value = { "" }
-
 		_isTtsSupported.value = summarized.isTtsSupported
 		_isTtsNotSupported.value = summarized.isTtsNotSupported
 		if (summarized.isTtsSupported) {

diff --git a/app/src/main/res/layout/fragment_car_capabilities.xml b/app/src/main/res/layout/fragment_car_capabilities.xml
@@ -88,39 +88,6 @@
                     android:layout_height="wrap_content" />
             </LinearLayout>
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:paddingBottom="@dimen/checkbox_vertical_margin"
-                android:gravity="center_vertical">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:gravity="center_vertical">
-
-                    <ImageView
-                        android:layout_width="48dp"
-                        android:layout_height="48dp"
-                        android:padding="12dp"
-                        android:src="@{viewModel.isPopupSupported ? android.R.drawable.checkbox_on_background : android.R.drawable.checkbox_off_background}" />
-                    <TextView
-                        android:text="@{viewModel.popupStatus}"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:paddingTop="12dp"
-                        android:paddingBottom="12dp" />
-                </LinearLayout>
-                <TextView
-                    android:text="@{viewModel.popupHint}"
-                    android:visibility="@{viewModel.popupHint}"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-            </LinearLayout>
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"

diff --git a/app/src/main/res/layout/fragment_notification_settings.xml b/app/src/main/res/layout/fragment_notification_settings.xml
@@ -25,7 +25,6 @@
             android:id="@+id/swNotificationPopup"
             android:checked="@={settings.notificationPopup}"
             app:animationDuration="300"
-            android:alpha="@{capabilities.isPopupNotSupported() ? 0.5f : 1.0f}"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:minHeight="48dp"
@@ -36,19 +35,11 @@
             android:id="@+id/paneNotificationPopup"
             android:visibility="@{settings.notificationPopup}"
             app:animationDuration="300"
-            android:alpha="@{capabilities.isPopupNotSupported() ? 0.5f : 1.0f}"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
             android:layout_marginStart="24dp">
 
-            <TextView
-                android:id="@+id/txtPopupVersion"
-                android:visibility="@{!capabilities.isPopupSupported()}"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:text="@string/lbl_popupVersion" />
             <androidx.appcompat.widget.SwitchCompat
                 android:id="@+id/swNotificationPopupPassenger"
                 android:checked="@={settings.notificationPopupPassenger}"

diff --git a/app/src/main/res/values-b+zh+Hans/strings.xml b/app/src/main/res/values-b+zh+Hans/strings.xml
@@ -70,7 +70,6 @@
     <string name="lbl_notification_permissions">查看通知权限</string>
     <string name="lbl_notification_sms_permissions">显示SMS图片权限</string>
     <string name="lbl_notification_permissions_hint">您可以稍后授予获取通知权限，并且可以在任何时候轻松撤销</string>
-    <string name="lbl_popupVersion">只有IDrive4支持弹出框</string>
     <string name="lbl_ttsUnsupported">您的车辆不支持TTS</string>
     <string name="lbl_smsPermission">允许在车上查看SMS图片，SMS文字默认可见.</string>
     <string name="lbl_calendarpage">您的日历可以显示在汽车中，为预约事件提供快速导航</string>
@@ -240,9 +239,6 @@
     <string name="txt_capabilities_audiostate_id4">ID4 不支持此功能</string>
     <string name="txt_capabilities_audiostate_audiocontext">此功能需要 Audio Context支持</string>
     <string name="txt_capabilities_audiostate_spotify">安装最新版Spotify以支持此功能</string>
-    <string name="txt_capabilities_popup_yes">支持通知弹出框</string>
-    <string name="txt_capabilities_popup_no">不支持通知弹出框</string>
-    <string name="txt_capabilities_popup_hint">仅ID4支持通知弹出框</string>
     <string name="txt_capabilities_tts_yes">支持通知文字转语音</string>
     <string name="txt_capabilities_tts_no">不支持通知文字转语音</string>
     <string name="txt_capabilities_navi_yes">支持车载导航</string>

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -71,7 +71,6 @@
     <string name="lbl_notification_permissions">Zugriff auf Benachrichtigungen</string>
     <string name="lbl_notification_sms_permissions">Zugriff um SMS Bilder anzuzeigen</string>
     <string name="lbl_notification_permissions_hint">Du kannst auch später die Rechte für \"Benachrichtigungen\" erteilen und sie auch jederzeit widerrufen</string>
-    <string name="lbl_popupVersion">PopUps funktionieren nur mit IDrive4</string>
     <string name="lbl_ttsUnsupported">TTS wird von Ihrem Fahrzeug nicht unterstützt</string>
     <string name="lbl_smsPermission">Erteile Zugriff für SMS-Nachrichten um Bilder von Nachrichten im Fahrzeug zu sehen. Text ist immer sichtbar.</string>
     <string name="lbl_calendarpage">Ihr Kalender kann im Fahrzeug angezeigt werden und bietet eine schnelle Navigation zu Terminen</string>
@@ -243,9 +242,6 @@
     <string name="txt_capabilities_audiostate_id4">ID4 unterstützt diese Funktion nicht</string>
     <string name="txt_capabilities_audiostate_audiocontext">Diese Funktion erfordert Audiokontext</string>
     <string name="txt_capabilities_audiostate_spotify">Installieren Sie die neueste Spotify-Version, um diese Funktion zu aktivieren</string>
-    <string name="txt_capabilities_popup_yes">Benachrichtigungs-Popups werden unterstützt</string>
-    <string name="txt_capabilities_popup_no">Benachrichtigungs-Popups werden nicht unterstützt</string>
-    <string name="txt_capabilities_popup_hint">Benachrichtigungs-Popups werden nur unter ID4 unterstützt</string>
     <string name="txt_capabilities_tts_yes">Benachrichtigung Text-to-Speech wird unterstützt</string>
     <string name="txt_capabilities_tts_no">Benachrichtigung Text-to-Speech wird nicht unterstützt</string>
     <string name="txt_capabilities_navi_yes">Autonavigation wird unterstützt</string>

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -71,7 +71,6 @@
     <string name="lbl_notification_permissions">Acceso para ver notificaciones</string>
     <string name="lbl_notification_sms_permissions">Acceso para ver fotos de SMS</string>
     <string name="lbl_notification_permissions_hint">Puedes conceder permisos de notificación más tarde y fácilmente revocarlos en cualquier momento</string>
-    <string name="lbl_popupVersion">Las ventanass emergentes sólo funcionan con IDrive4</string>
     <string name="lbl_ttsUnsupported">TTS no está soportado por tu coche</string>
     <string name="lbl_smsPermission">Otorgue el permiso de SMS para ver las imágenes entrantes de imágenes SMS en el automóvil. El texto siempre será visible.</string>
     <string name="lbl_postNotificationsPermission">Acceso para mostrar una notificación de servicio para permanecer en funcionamiento mientras está conectado al coche</string>
@@ -242,9 +241,6 @@
     <string name="txt_capabilities_audiostate_id4">ID4 no soporta esta característica</string>
     <string name="txt_capabilities_audiostate_audiocontext">Esta función requiere Audio Context</string>
     <string name="txt_capabilities_audiostate_spotify">Instalar la última versión de Spotify para activar esta función</string>
-    <string name="txt_capabilities_popup_yes">Se admiten Notificaciones Emergentes</string>
-    <string name="txt_capabilities_popup_no">No se admiten Notificaciones Emergentes</string>
-    <string name="txt_capabilities_popup_hint">Las Notificaciones Emergentes sólo están soportadas en ID4</string>
     <string name="txt_capabilities_tts_yes">Se admite Notificación de conversión Texto a Voz</string>
     <string name="txt_capabilities_tts_no">No se admite Notificación de conversión Texto a Voz</string>
     <string name="txt_capabilities_navi_yes">La Navegación del Coche está soportada</string>

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -69,7 +69,6 @@
     <string name="notification_quickreplies_default">[\"👍\",\"En route !\",\"Actuellement dans la voiture\",\"Impossible de texter, appelez-moi à la place\",\"Je vous appellerai plus tard\"]</string>
     <string name="lbl_notification_permissions">Accès pour la vue des notifications</string>
     <string name="lbl_notification_sms_permissions">Accès pour afficher les images SMS</string>
-    <string name="lbl_popupVersion">Les popups ne fonctionnent qu\'avec IDrive4</string>
     <string name="lbl_ttsUnsupported">TTS n\'est pas pris en charge par votre voiture</string>
     <string name="lbl_smsPermission">Autorise l\'accès aux images contenues dans les SMS depuis la voiture. Le text est quant à lui toujours visible.</string>
     <string name="lbl_calendarpage">Votre calendrier peut être affiché dans la voiture, offrant une navigation rapide aux rendez-vous</string>
@@ -234,9 +233,6 @@
     <string name="txt_capabilities_audiostate_id4">ID4 ne supporte pas cette fonctionnalité</string>
     <string name="txt_capabilities_audiostate_audiocontext">Cette fonctionnalité nécessite Audio Context</string>
     <string name="txt_capabilities_audiostate_spotify">Installez la dernière version de Spotify pour activer cette fonctionnalité</string>
-    <string name="txt_capabilities_popup_yes">Les Notification Popup sont supportées</string>
-    <string name="txt_capabilities_popup_no">Les Notification Popup ne sont pas supportées</string>
-    <string name="txt_capabilities_popup_hint">Les Notification Popups ne sont supportées que sur ID4</string>
     <string name="txt_capabilities_tts_yes">La synthèse vocale des notifications est supportée</string>
     <string name="txt_capabilities_tts_no">La synthèse vocale des notifications n\'est pas supportée</string>
     <string name="txt_capabilities_navi_yes">La navigation de voiture est supportée</string>

diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
@@ -64,7 +64,6 @@
     <string name="notification_quickreplies_default">[\"👍\",\"אני בדרך!\",\"בנהיגה לא יכול/ה לדבר\",\"לא יכול/ה לענות, תתקשר/י במקום\",\"אתקשר מאוחר יותר]</string>
     <string name="lbl_notification_permissions">הרשאה לקריאת התראות</string>
     <string name="lbl_notification_sms_permissions">הרשאה להצגת הודעות תמונה MMS</string>
-    <string name="lbl_popupVersion">התראות קופצות עובדות רק עם IDrive 4</string>
     <string name="lbl_ttsUnsupported">TTS לא נתמך על ידי הרכב שלך</string>
     <string name="lbl_smsPermission">אפשר הרשאת SMS כדי לצפות בתמונות מהודעות נכנסות ברכב. הטקסט תמיד יוצג.</string>
     <string name="lbl_widescreen_map">מפה במסך רחב</string>
@@ -154,9 +153,6 @@
     <string name="txt_capabilities_audiostate_id4">ID4 לא תומך בתכונה זו</string>
     <string name="txt_capabilities_audiostate_audiocontext">תכונה זו דורשת השמעת מוזיקה</string>
     <string name="txt_capabilities_audiostate_spotify">התקן את הגרסה האחרונה של Spotify כדי לאפשר תכונה זו</string>
-    <string name="txt_capabilities_popup_yes">התראות קופצות זמינות</string>
-    <string name="txt_capabilities_popup_no">התראות קופצות לא זמינות</string>
-    <string name="txt_capabilities_popup_hint">התראות קופצות זמינות רק ל-ID4</string>
     <string name="txt_capabilities_tts_yes">התראת טקסט-לדיבור זמין</string>
     <string name="txt_capabilities_tts_no">התראות טקסט-לדיבור לא זמין</string>
     <string name="txt_capabilities_navi_yes">ניווט ברכב זמין</string>

diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
@@ -67,7 +67,6 @@
     <string name="lbl_notification_permissions">Hozzáférés az értesítésekhez</string>
     <string name="lbl_notification_sms_permissions">Hozzáférés az SMS képek megjelenítéséhez</string>
     <string name="lbl_notification_permissions_hint">Később is adhatsz értesítési engedélyeket, és bármikor könnyedén visszavonhatod azokat</string>
-    <string name="lbl_popupVersion">Felugró értesítések megjelenítése csak IDrive4-en működik</string>
     <string name="lbl_ttsUnsupported">TTS nem támogatott az autódban</string>
     <string name="lbl_smsPermission">Engedélyezés a beérkező SMS üzenetekben lévő képeknek az autóban történő megjelenítésre. A szöveg állandóan látható.</string>
     <string name="lbl_calendarpage">A naptárad megjeleníthető az autóban, mely gyors útvonaltervezést tesz lehetővé találkozóidra</string>
@@ -232,9 +231,6 @@
     <string name="txt_capabilities_audiostate_id4">ID4 nem támogatja ezt a funkciót</string>
     <string name="txt_capabilities_audiostate_audiocontext">Ehhez a funkcióhoz Audio Context szükséges</string>
     <string name="txt_capabilities_audiostate_spotify">Telepítsd a legfissebb Spotify alkalmazást a funkció bekapcsolásához</string>
-    <string name="txt_capabilities_popup_yes">Felugró értesítések támogatva</string>
-    <string name="txt_capabilities_popup_no">Felugró értesítések nincsenek támogatva</string>
-    <string name="txt_capabilities_popup_hint">Felugró értesítések cak ID4-en vannak támogatva</string>
     <string name="txt_capabilities_tts_yes">Értesítések szövegfelolvasása támogatva</string>
     <string name="txt_capabilities_tts_no">Értesítések szövegfelolvasása nincsen támogatva</string>
     <string name="txt_capabilities_navi_yes">Támogatott autó navigáció</string>

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
@@ -71,7 +71,6 @@
     <string name="lbl_notification_permissions">Accesso per visualizzare le notifiche</string>
     <string name="lbl_notification_sms_permissions">Accesso per visualizzare immagini negli SMS</string>
     <string name="lbl_notification_permissions_hint">Puoi concedere i permessi di notifica in un secondo momento e puoi facilmente revocarli in qualsiasi momento</string>
-    <string name="lbl_popupVersion">Il popup funziona solo con IDrive4</string>
     <string name="lbl_ttsUnsupported">TTS non è supportato dalla tua auto</string>
     <string name="lbl_smsPermission">Concedi l\'autorizzazione SMS per visualizzare le immagini nell\'auto. Il testo è sempre visibile.</string>
     <string name="lbl_postNotificationsPermission">Accesso per mostrare una notifica di servizio che rimane in esecuzione durante il collegamento all\'auto</string>
@@ -242,9 +241,6 @@
     <string name="txt_capabilities_audiostate_id4">ID4 non supporta questa funzione</string>
     <string name="txt_capabilities_audiostate_audiocontext">Questa funzione richiede il Contesto Audio</string>
     <string name="txt_capabilities_audiostate_spotify">Installa l\'ultima versione di Spotify per abilitare questa funzione</string>
-    <string name="txt_capabilities_popup_yes">Notifiche Popup sono supportate</string>
-    <string name="txt_capabilities_popup_no">Notifiche Popup non sono supportate</string>
-    <string name="txt_capabilities_popup_hint">Le notifiche popup sono supportate solo su ID4</string>
     <string name="txt_capabilities_tts_yes">Le Notifiche Text-to-Speech sono supportate</string>
     <string name="txt_capabilities_tts_no">Le Notifiche Text-to-Speech non sono supportate</string>
     <string name="txt_capabilities_navi_yes">Il Navigatore è supportato</string>

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
@@ -64,7 +64,6 @@
     <string name="notification_quickreplies_default">[\"👍\",\"途中です！\",\"現在車内にあります\",\"テキストメッセージを送信できません。代わりに電話してください\",\"I後で電話します\"]</string>
     <string name="lbl_notification_permissions">通知を表示するためのアクセス</string>
     <string name="lbl_notification_sms_permissions">SMS画像を表示するためのアクセス</string>
-    <string name="lbl_popupVersion">ポップアップはIDrive4でのみ機能します</string>
     <string name="lbl_ttsUnsupported">TTSはお使いの車ではサポートされていません</string>
     <string name="lbl_smsPermission">車内の着信SMS画像から画像を表示するためのSMS権限を付与します。テキスト自体は常に表示されます。</string>
     <string name="lbl_widescreen_map">ワイドスクリーンマップ</string>
@@ -181,9 +180,6 @@
     <string name="txt_capabilities_audiostate_id4">ID4はこの機能をサポートしていません</string>
     <string name="txt_capabilities_audiostate_audiocontext">この機能にはオーディオコンテキストが必要です</string>
     <string name="txt_capabilities_audiostate_spotify">最新のSpotifyをインストールしてこの機能を有効にします</string>
-    <string name="txt_capabilities_popup_yes">通知ポップアップがサポートされています</string>
-    <string name="txt_capabilities_popup_no">通知ポップアップはサポートされていません</string>
-    <string name="txt_capabilities_popup_hint">通知ポップアップはID4でのみサポートされています</string>
     <string name="txt_capabilities_tts_yes">通知テキスト読み上げがサポートされています</string>
     <string name="txt_capabilities_tts_no">通知テキスト読み上げはサポートされていません</string>
     <string name="txt_capabilities_navi_yes">カーナビゲーションがサポートされています</string>