From 97c6c0b553aa080733f028171e27069aa42420a4 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 30 Jul 2025 18:40:04 +0200 Subject: [PATCH] Updated bell and bell_slash icons --- .../java/org/linphone/ui/main/viewmodel/MainViewModel.kt | 4 ++-- app/src/main/res/drawable/bell.xml | 9 +++++++++ app/src/main/res/drawable/bell_simple.xml | 9 --------- app/src/main/res/drawable/bell_simple_slash.xml | 9 --------- app/src/main/res/drawable/bell_slash.xml | 9 +++++++++ .../res/layout-sw600dp/assistant_register_fragment.xml | 2 +- app/src/main/res/layout/assistant_register_fragment.xml | 2 +- app/src/main/res/layout/chat_conversation_fragment.xml | 2 +- .../res/layout/chat_conversation_long_press_menu.xml | 2 +- app/src/main/res/layout/chat_conversation_popup_menu.xml | 4 ++-- app/src/main/res/layout/chat_info_fragment.xml | 2 +- app/src/main/res/layout/chat_list_cell.xml | 2 +- app/src/main/res/layout/main_activity_alert_top_bar.xml | 2 +- 13 files changed, 29 insertions(+), 29 deletions(-) create mode 100644 app/src/main/res/drawable/bell.xml delete mode 100644 app/src/main/res/drawable/bell_simple.xml delete mode 100644 app/src/main/res/drawable/bell_simple_slash.xml create mode 100644 app/src/main/res/drawable/bell_slash.xml diff --git a/app/src/main/java/org/linphone/ui/main/viewmodel/MainViewModel.kt b/app/src/main/java/org/linphone/ui/main/viewmodel/MainViewModel.kt index 547ff0ef4..d2c8ec691 100644 --- a/app/src/main/java/org/linphone/ui/main/viewmodel/MainViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/viewmodel/MainViewModel.kt @@ -640,10 +640,10 @@ class MainViewModel R.drawable.wifi_slash } SEND_NOTIFICATIONS_PERMISSION_NOT_GRANTED, FULL_SCREEN_INTENTS_PERMISSION_NOT_GRANTED -> { - R.drawable.bell_simple_slash + R.drawable.bell_slash } else -> { - R.drawable.bell_simple + R.drawable.bell } } alertIcon.postValue(icon) diff --git a/app/src/main/res/drawable/bell.xml b/app/src/main/res/drawable/bell.xml new file mode 100644 index 000000000..6c8ea2439 --- /dev/null +++ b/app/src/main/res/drawable/bell.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/bell_simple.xml b/app/src/main/res/drawable/bell_simple.xml deleted file mode 100644 index 99803a93f..000000000 --- a/app/src/main/res/drawable/bell_simple.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/bell_simple_slash.xml b/app/src/main/res/drawable/bell_simple_slash.xml deleted file mode 100644 index 70b3b7728..000000000 --- a/app/src/main/res/drawable/bell_simple_slash.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/bell_slash.xml b/app/src/main/res/drawable/bell_slash.xml new file mode 100644 index 000000000..19510cf05 --- /dev/null +++ b/app/src/main/res/drawable/bell_slash.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout-sw600dp/assistant_register_fragment.xml b/app/src/main/res/layout-sw600dp/assistant_register_fragment.xml index 1732576b4..c3a301d9f 100644 --- a/app/src/main/res/layout-sw600dp/assistant_register_fragment.xml +++ b/app/src/main/res/layout-sw600dp/assistant_register_fragment.xml @@ -100,7 +100,7 @@ android:layout_marginTop="68dp" android:background="@drawable/circle_light_blue_button_background" android:padding="16dp" - android:src="@drawable/bell_simple_slash" + android:src="@drawable/bell_slash" android:contentDescription="@null" app:tint="?attr/color_main2_500" app:layout_constraintVertical_chainStyle="packed" diff --git a/app/src/main/res/layout/assistant_register_fragment.xml b/app/src/main/res/layout/assistant_register_fragment.xml index c90c7ca69..c332ff0cc 100644 --- a/app/src/main/res/layout/assistant_register_fragment.xml +++ b/app/src/main/res/layout/assistant_register_fragment.xml @@ -87,7 +87,7 @@ android:layout_marginTop="68dp" android:background="@drawable/circle_light_blue_button_background" android:padding="16dp" - android:src="@drawable/bell_simple_slash" + android:src="@drawable/bell_slash" android:contentDescription="@null" app:tint="?attr/color_main2_500" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/chat_conversation_fragment.xml b/app/src/main/res/layout/chat_conversation_fragment.xml index b64502933..11713365b 100644 --- a/app/src/main/res/layout/chat_conversation_fragment.xml +++ b/app/src/main/res/layout/chat_conversation_fragment.xml @@ -126,7 +126,7 @@ android:layout_width="@dimen/small_icon_size" android:layout_height="@dimen/small_icon_size" android:layout_marginEnd="5dp" - android:src="@drawable/bell_simple_slash" + android:src="@drawable/bell_slash" android:contentDescription="@string/content_description_chat_muted" android:visibility="@{viewModel.isMuted ? View.VISIBLE : View.GONE, default=gone}" app:layout_constraintStart_toStartOf="@id/title" diff --git a/app/src/main/res/layout/chat_conversation_long_press_menu.xml b/app/src/main/res/layout/chat_conversation_long_press_menu.xml index 77491e404..503138d0f 100644 --- a/app/src/main/res/layout/chat_conversation_long_press_menu.xml +++ b/app/src/main/res/layout/chat_conversation_long_press_menu.xml @@ -62,7 +62,7 @@ android:text="@{isMuted ? @string/conversation_action_unmute : @string/conversation_action_mute, default=@string/conversation_action_mute}" android:background="@drawable/menu_item_background" android:layout_marginBottom="1dp" - android:drawableStart="@{isMuted ? @drawable/bell_simple : @drawable/bell_simple_slash, default=@drawable/bell_simple_slash}" + android:drawableStart="@{isMuted ? @drawable/bell : @drawable/bell_slash, default=@drawable/bell_slash}" android:visibility="@{isReadOnly ? View.GONE : View.VISIBLE}" app:layout_constraintBottom_toTopOf="@id/call" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/chat_conversation_popup_menu.xml b/app/src/main/res/layout/chat_conversation_popup_menu.xml index 45c9f5f72..7ef778dd8 100644 --- a/app/src/main/res/layout/chat_conversation_popup_menu.xml +++ b/app/src/main/res/layout/chat_conversation_popup_menu.xml @@ -77,7 +77,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/conversation_action_mute" - android:drawableStart="@drawable/bell_simple_slash" + android:drawableStart="@drawable/bell_slash" android:visibility="@{conversationMuted || readOnlyConversation ? View.GONE : View.VISIBLE}" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -91,7 +91,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:text="@string/conversation_action_unmute" - android:drawableStart="@drawable/bell_simple" + android:drawableStart="@drawable/bell" android:visibility="@{conversationMuted && !readOnlyConversation ? View.VISIBLE : View.GONE, default=gone}" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/chat_info_fragment.xml b/app/src/main/res/layout/chat_info_fragment.xml index 991d8be1c..f7272d0c9 100644 --- a/app/src/main/res/layout/chat_info_fragment.xml +++ b/app/src/main/res/layout/chat_info_fragment.xml @@ -203,7 +203,7 @@ android:onClick="@{() -> viewModel.toggleMute()}" android:padding="16dp" android:contentDescription="@string/content_description_chat_toggle_mute" - android:src="@{viewModel.isMuted ? @drawable/bell_simple : @drawable/bell_simple_slash, default=@drawable/bell_simple_slash}" + android:src="@{viewModel.isMuted ? @drawable/bell : @drawable/bell_slash, default=@drawable/bell_slash}" android:visibility="@{viewModel.isReadOnly ? View.GONE : View.VISIBLE}" app:layout_constraintEnd_toStartOf="@id/call" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/chat_list_cell.xml b/app/src/main/res/layout/chat_list_cell.xml index 7e864bc9f..746c81f1d 100644 --- a/app/src/main/res/layout/chat_list_cell.xml +++ b/app/src/main/res/layout/chat_list_cell.xml @@ -174,7 +174,7 @@ android:layout_width="@dimen/small_icon_size" android:layout_height="@dimen/small_icon_size" android:layout_marginEnd="10dp" - android:src="@drawable/bell_simple_slash" + android:src="@drawable/bell_slash" android:contentDescription="@string/content_description_chat_muted" android:visibility="@{model.isMuted ? View.VISIBLE : View.GONE}" app:layout_constraintEnd_toStartOf="@id/last_sent_message_status" diff --git a/app/src/main/res/layout/main_activity_alert_top_bar.xml b/app/src/main/res/layout/main_activity_alert_top_bar.xml index a10a85ba0..2aa6962c2 100644 --- a/app/src/main/res/layout/main_activity_alert_top_bar.xml +++ b/app/src/main/res/layout/main_activity_alert_top_bar.xml @@ -23,7 +23,7 @@ android:layout_marginStart="16dp" android:layout_marginTop="5dp" android:layout_marginBottom="5dp" - android:src="@{viewModel.alertIcon, default=@drawable/bell_simple}" + android:src="@{viewModel.alertIcon, default=@drawable/bell}" android:contentDescription="@null" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"