From 13bef94bf76cec6c03e2c6bc2aa7c77843b22742 Mon Sep 17 00:00:00 2001 From: Nicholas Tinsley Date: Wed, 27 Mar 2024 13:58:19 -0400 Subject: [PATCH] Update icons in conversation settings. --- .../ConversationSettingsFragment.kt | 10 +++++----- .../res/drawable/symbol_safety_number_24.xml | 12 ++++++++++++ app/src/main/res/drawable/symbol_timer_24.xml | 12 ++++++++++++ .../res/drawable/symbol_timer_slash_24.xml | 18 ++++++++++++++++++ 4 files changed, 47 insertions(+), 5 deletions(-) create mode 100644 app/src/main/res/drawable/symbol_safety_number_24.xml create mode 100644 app/src/main/res/drawable/symbol_timer_24.xml create mode 100644 app/src/main/res/drawable/symbol_timer_slash_24.xml diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt index f9a6c62078..182683d3f6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsFragment.kt @@ -476,9 +476,9 @@ class ConversationSettingsFragment : DSLSettingsFragment( val summary = DSLSettingsText.from(formatDisappearingMessagesLifespan(state.disappearingMessagesLifespan)) val icon = if (state.disappearingMessagesLifespan <= 0 || state.recipient.isBlocked) { - R.drawable.ic_update_timer_disabled_16 + R.drawable.symbol_timer_slash_24 } else { - R.drawable.ic_update_timer_16 + R.drawable.symbol_timer_24 } var enabled = !state.recipient.isBlocked @@ -521,7 +521,7 @@ class ConversationSettingsFragment : DSLSettingsFragment( if (!state.recipient.isReleaseNotes) { clickPref( title = DSLSettingsText.from(R.string.preferences__chat_color_and_wallpaper), - icon = DSLSettingsIcon.from(R.drawable.ic_color_24), + icon = DSLSettingsIcon.from(R.drawable.symbol_color_24), onClick = { startActivity(ChatWallpaperActivity.createIntent(requireContext(), state.recipient.id)) } @@ -531,7 +531,7 @@ class ConversationSettingsFragment : DSLSettingsFragment( if (!state.recipient.isSelf) { clickPref( title = DSLSettingsText.from(R.string.ConversationSettingsFragment__sounds_and_notifications), - icon = DSLSettingsIcon.from(R.drawable.ic_speaker_24), + icon = DSLSettingsIcon.from(R.drawable.symbol_speaker_24), isEnabled = !state.isDeprecatedOrUnregistered, onClick = { val action = ConversationSettingsFragmentDirections.actionConversationSettingsFragmentToSoundsAndNotificationsSettingsFragment(state.recipient.id) @@ -576,7 +576,7 @@ class ConversationSettingsFragment : DSLSettingsFragment( if (!state.recipient.isReleaseNotes && !state.recipient.isSelf) { clickPref( title = DSLSettingsText.from(R.string.ConversationSettingsFragment__view_safety_number), - icon = DSLSettingsIcon.from(R.drawable.ic_safety_number_24), + icon = DSLSettingsIcon.from(R.drawable.symbol_safety_number_24), isEnabled = !state.isDeprecatedOrUnregistered, onClick = { VerifyIdentityActivity.startOrShowExchangeMessagesDialog(requireActivity(), recipientState.identityRecord) diff --git a/app/src/main/res/drawable/symbol_safety_number_24.xml b/app/src/main/res/drawable/symbol_safety_number_24.xml new file mode 100644 index 0000000000..2dd5fb6e12 --- /dev/null +++ b/app/src/main/res/drawable/symbol_safety_number_24.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/symbol_timer_24.xml b/app/src/main/res/drawable/symbol_timer_24.xml new file mode 100644 index 0000000000..b0776b9227 --- /dev/null +++ b/app/src/main/res/drawable/symbol_timer_24.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/symbol_timer_slash_24.xml b/app/src/main/res/drawable/symbol_timer_slash_24.xml new file mode 100644 index 0000000000..b74bf0f445 --- /dev/null +++ b/app/src/main/res/drawable/symbol_timer_slash_24.xml @@ -0,0 +1,18 @@ + + + + + +