From c3c8f8e7e6c5f5c80d3cd6e0885103d409692246 Mon Sep 17 00:00:00 2001 From: clark-signal Date: Thu, 12 Jan 2023 16:10:32 -0500 Subject: [PATCH] Update icons across home screen and settings screen. --- .../components/settings/DSLSettingsAdapter.kt | 6 +++- .../settings/app/AppSettingsFragment.kt | 26 +++++++++--------- .../EditNotificationProfileFragment.kt | 2 +- .../manage/ManageDonationsFragment.kt | 10 +++---- .../ConversationListArchiveFragment.java | 2 +- .../ConversationListFragment.java | 10 +++---- .../v2/stories/ChooseStoryTypeBottomSheet.kt | 2 +- .../profiles/manage/EditAboutFragment.java | 2 +- .../manage/ManageProfileFragment.java | 4 +-- .../securesms/recipients/Recipient.java | 2 +- .../stories/landing/StoriesLandingFragment.kt | 6 ++-- .../drawable-hdpi/ic_person_white_24dp.webp | Bin 228 -> 0 bytes .../drawable-mdpi/ic_person_white_24dp.webp | Bin 170 -> 0 bytes .../main/res/drawable-night/ic_share_24.xml | 9 ------ .../drawable-xhdpi/ic_person_white_24dp.webp | Bin 264 -> 0 bytes .../drawable-xxhdpi/ic_person_white_24dp.webp | Bin 360 -> 0 bytes .../ic_person_white_24dp.webp | Bin 458 -> 0 bytes app/src/main/res/drawable/ic_add_emoji.xml | 9 ------ .../main/res/drawable/ic_appearance_24.xml | 9 ------ app/src/main/res/drawable/ic_archive_24.xml | 10 ------- app/src/main/res/drawable/ic_archive_24dp.xml | 9 ------ app/src/main/res/drawable/ic_badge_24.xml | 9 ------ app/src/main/res/drawable/ic_gift_24.xml | 9 ------ app/src/main/res/drawable/ic_heart_24.xml | 9 ------ .../main/res/drawable/ic_info_solid_24.xml | 9 ------ app/src/main/res/drawable/ic_invite_24.xml | 9 ------ .../res/drawable/ic_linked_devices_24.xml | 9 ------ .../main/res/drawable/ic_profile_name_24.xml | 9 ------ app/src/main/res/drawable/ic_receipt_24.xml | 9 ------ app/src/main/res/drawable/ic_share_24.xml | 9 ------ app/src/main/res/drawable/ic_stories_16.xml | 12 -------- app/src/main/res/drawable/ic_stories_24.xml | 13 --------- app/src/main/res/drawable/ic_unarchive_24.xml | 21 -------------- app/src/main/res/drawable/ic_union.xml | 10 ------- .../res/drawable/symbol_appearance_24.xml | 17 ++++++++++++ .../main/res/drawable/symbol_archive_24.xml | 13 +++++++++ .../drawable/symbol_archive_android_24.xml | 13 +++++++++ .../drawable/symbol_archive_android_up_24.xml | 13 +++++++++ .../res/drawable/symbol_archive_up_24.xml | 13 +++++++++ app/src/main/res/drawable/symbol_at_24.xml | 10 +++++++ .../res/drawable/symbol_badge_multi_24.xml | 10 +++++++ app/src/main/res/drawable/symbol_bell_24.xml | 10 +++++++ .../main/res/drawable/symbol_camera_24.xml | 14 ++++++++++ app/src/main/res/drawable/symbol_chat_24.xml | 10 +++++++ app/src/main/res/drawable/symbol_data_24.xml | 10 +++++++ .../main/res/drawable/symbol_devices_24.xml | 13 +++++++++ app/src/main/res/drawable/symbol_edit_24.xml | 10 +++++++ .../res/drawable/symbol_emoji_plus_24.xml | 12 ++++++++ app/src/main/res/drawable/symbol_gift_24.xml | 10 +++++++ app/src/main/res/drawable/symbol_heart_24.xml | 10 +++++++ app/src/main/res/drawable/symbol_help_24.xml | 13 +++++++++ .../main/res/drawable/symbol_info_fill_24.xml | 10 +++++++ .../main/res/drawable/symbol_invite_24.xml | 10 +++++++ app/src/main/res/drawable/symbol_lock_24.xml | 13 +++++++++ app/src/main/res/drawable/symbol_open_20.xml | 12 ++++++++ .../main/res/drawable/symbol_payment_24.xml | 10 +++++++ .../main/res/drawable/symbol_person_24.xml | 10 +++++++ .../res/drawable/symbol_person_circle_24.xml | 14 ++++++++++ .../res/drawable/symbol_plus_compact_16.xml | 9 ++++++ .../main/res/drawable/symbol_receipt_24.xml | 13 +++++++++ .../main/res/drawable/symbol_search_24.xml | 10 +++++++ .../res/drawable/symbol_share_android_24.xml | 10 +++++++ .../main/res/drawable/symbol_stories_24.xml | 13 +++++++++ .../symbol_stories_fill_compact_12.xml | 9 ++++++ app/src/main/res/drawable/symbol_x_24.xml | 9 ++++++ app/src/main/res/layout/about_preset_item.xml | 2 +- .../res/layout/conversation_list_fragment.xml | 4 +-- .../res/layout/dsl_payments_preference.xml | 3 +- .../main/res/layout/edit_about_fragment.xml | 4 +-- .../main/res/layout/edit_proxy_fragment.xml | 6 ++-- .../fragment_edit_notification_profile.xml | 4 +-- .../main_activity_list_host_fragment.xml | 2 +- .../res/layout/manage_profile_fragment.xml | 10 +++---- .../main/res/layout/on_reaction_sent_view.xml | 22 +++++++-------- app/src/main/res/layout/share_button.xml | 2 +- .../layout/signal_bottom_action_bar_item.xml | 2 +- .../res/layout/signal_context_menu_item.xml | 2 +- .../sticker_management_sticker_item.xml | 2 +- .../main/res/layout/stories_landing_item.xml | 4 ++- .../stories_landing_item_my_stories.xml | 5 ++-- .../layout/stories_viewer_fragment_page.xml | 2 +- app/src/main/res/layout/tooltip.xml | 2 +- 82 files changed, 432 insertions(+), 254 deletions(-) delete mode 100644 app/src/main/res/drawable-hdpi/ic_person_white_24dp.webp delete mode 100644 app/src/main/res/drawable-mdpi/ic_person_white_24dp.webp delete mode 100644 app/src/main/res/drawable-night/ic_share_24.xml delete mode 100644 app/src/main/res/drawable-xhdpi/ic_person_white_24dp.webp delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_person_white_24dp.webp delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_person_white_24dp.webp delete mode 100644 app/src/main/res/drawable/ic_add_emoji.xml delete mode 100644 app/src/main/res/drawable/ic_appearance_24.xml delete mode 100644 app/src/main/res/drawable/ic_archive_24.xml delete mode 100644 app/src/main/res/drawable/ic_archive_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_badge_24.xml delete mode 100644 app/src/main/res/drawable/ic_gift_24.xml delete mode 100644 app/src/main/res/drawable/ic_heart_24.xml delete mode 100644 app/src/main/res/drawable/ic_info_solid_24.xml delete mode 100644 app/src/main/res/drawable/ic_invite_24.xml delete mode 100644 app/src/main/res/drawable/ic_linked_devices_24.xml delete mode 100644 app/src/main/res/drawable/ic_profile_name_24.xml delete mode 100644 app/src/main/res/drawable/ic_receipt_24.xml delete mode 100644 app/src/main/res/drawable/ic_share_24.xml delete mode 100644 app/src/main/res/drawable/ic_stories_16.xml delete mode 100644 app/src/main/res/drawable/ic_stories_24.xml delete mode 100644 app/src/main/res/drawable/ic_unarchive_24.xml delete mode 100644 app/src/main/res/drawable/ic_union.xml create mode 100644 app/src/main/res/drawable/symbol_appearance_24.xml create mode 100644 app/src/main/res/drawable/symbol_archive_24.xml create mode 100644 app/src/main/res/drawable/symbol_archive_android_24.xml create mode 100644 app/src/main/res/drawable/symbol_archive_android_up_24.xml create mode 100644 app/src/main/res/drawable/symbol_archive_up_24.xml create mode 100644 app/src/main/res/drawable/symbol_at_24.xml create mode 100644 app/src/main/res/drawable/symbol_badge_multi_24.xml create mode 100644 app/src/main/res/drawable/symbol_bell_24.xml create mode 100644 app/src/main/res/drawable/symbol_camera_24.xml create mode 100644 app/src/main/res/drawable/symbol_chat_24.xml create mode 100644 app/src/main/res/drawable/symbol_data_24.xml create mode 100644 app/src/main/res/drawable/symbol_devices_24.xml create mode 100644 app/src/main/res/drawable/symbol_edit_24.xml create mode 100644 app/src/main/res/drawable/symbol_emoji_plus_24.xml create mode 100644 app/src/main/res/drawable/symbol_gift_24.xml create mode 100644 app/src/main/res/drawable/symbol_heart_24.xml create mode 100644 app/src/main/res/drawable/symbol_help_24.xml create mode 100644 app/src/main/res/drawable/symbol_info_fill_24.xml create mode 100644 app/src/main/res/drawable/symbol_invite_24.xml create mode 100644 app/src/main/res/drawable/symbol_lock_24.xml create mode 100644 app/src/main/res/drawable/symbol_open_20.xml create mode 100644 app/src/main/res/drawable/symbol_payment_24.xml create mode 100644 app/src/main/res/drawable/symbol_person_24.xml create mode 100644 app/src/main/res/drawable/symbol_person_circle_24.xml create mode 100644 app/src/main/res/drawable/symbol_plus_compact_16.xml create mode 100644 app/src/main/res/drawable/symbol_receipt_24.xml create mode 100644 app/src/main/res/drawable/symbol_search_24.xml create mode 100644 app/src/main/res/drawable/symbol_share_android_24.xml create mode 100644 app/src/main/res/drawable/symbol_stories_24.xml create mode 100644 app/src/main/res/drawable/symbol_stories_fill_compact_12.xml create mode 100644 app/src/main/res/drawable/symbol_x_24.xml diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsAdapter.kt index 04221bbff..3fda7366b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsAdapter.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsAdapter.kt @@ -1,5 +1,7 @@ package org.thoughtcrime.securesms.components.settings +import android.graphics.PorterDuff +import android.graphics.PorterDuffColorFilter import android.text.Spanned import android.text.method.LinkMovementMethod import android.text.style.ClickableSpan @@ -230,7 +232,9 @@ class ExternalLinkPreferenceViewHolder(itemView: View) : PreferenceViewHolder handleArchive(id, false))); + items.add(new ActionItem(R.drawable.symbol_archive_android_up_24, getResources().getQuantityString(R.plurals.ConversationListFragment_unarchive_plural, 1), () -> handleArchive(id, false))); } else { - items.add(new ActionItem(R.drawable.ic_archive_24, getResources().getQuantityString(R.plurals.ConversationListFragment_archive_plural, 1), () -> handleArchive(id, false))); + items.add(new ActionItem(R.drawable.symbol_archive_android_24, getResources().getQuantityString(R.plurals.ConversationListFragment_archive_plural, 1), () -> handleArchive(id, false))); } items.add(new ActionItem(R.drawable.ic_delete_24, getResources().getQuantityString(R.plurals.ConversationListFragment_delete_plural, 1), () -> handleDelete(id))); @@ -1449,9 +1449,9 @@ public class ConversationListFragment extends MainFragment implements ActionMode } if (isArchived()) { - items.add(new ActionItem(R.drawable.ic_unarchive_24, getResources().getQuantityString(R.plurals.ConversationListFragment_unarchive_plural, count), () -> handleArchive(selectionIds, true))); + items.add(new ActionItem(R.drawable.symbol_archive_android_up_24, getResources().getQuantityString(R.plurals.ConversationListFragment_unarchive_plural, count), () -> handleArchive(selectionIds, true))); } else { - items.add(new ActionItem(R.drawable.ic_archive_24, getResources().getQuantityString(R.plurals.ConversationListFragment_archive_plural, count), () -> handleArchive(selectionIds, true))); + items.add(new ActionItem(R.drawable.symbol_archive_android_24, getResources().getQuantityString(R.plurals.ConversationListFragment_archive_plural, count), () -> handleArchive(selectionIds, true))); } items.add(new ActionItem(R.drawable.ic_delete_24, getResources().getQuantityString(R.plurals.ConversationListFragment_delete_plural, count), () -> handleDelete(selectionIds))); @@ -1480,7 +1480,7 @@ public class ConversationListFragment extends MainFragment implements ActionMode } protected @DrawableRes int getArchiveIconRes() { - return R.drawable.ic_archive_24; + return R.drawable.symbol_archive_android_24; } @WorkerThread diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/stories/ChooseStoryTypeBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/stories/ChooseStoryTypeBottomSheet.kt index 79a273bec..cd6e360ee 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/stories/ChooseStoryTypeBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/stories/ChooseStoryTypeBottomSheet.kt @@ -37,7 +37,7 @@ class ChooseStoryTypeBottomSheet : DSLSettingsBottomSheetFragment( stringId = R.string.ChooseStoryTypeBottomSheet__visible_only_to ), icon = DSLSettingsIcon.from( - iconId = R.drawable.ic_stories_24, + iconId = R.drawable.symbol_stories_24, iconTintId = R.color.signal_colorOnSurface, backgroundId = R.drawable.circle_tintable, backgroundTint = R.color.signal_colorSurface5, diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditAboutFragment.java b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditAboutFragment.java index d49190ed0..fdb7ab6a2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditAboutFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditAboutFragment.java @@ -143,7 +143,7 @@ public class EditAboutFragment extends Fragment implements ManageProfileActivity this.emojiView.setImageDrawable(drawable); this.selectedEmoji = emoji; } else { - this.emojiView.setImageResource(R.drawable.ic_add_emoji); + this.emojiView.setImageResource(R.drawable.symbol_emoji_plus_24); this.selectedEmoji = ""; } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/ManageProfileFragment.java b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/ManageProfileFragment.java index 8e28eda17..c462be7cd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/ManageProfileFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/manage/ManageProfileFragment.java @@ -238,14 +238,14 @@ public class ManageProfileFragment extends LoggingFragment { private void presentAboutEmoji(@NonNull String aboutEmoji) { if (aboutEmoji == null || aboutEmoji.isEmpty()) { - binding.manageProfileAboutIcon.setImageDrawable(ResourcesCompat.getDrawable(getResources(), R.drawable.ic_compose_24, null)); + binding.manageProfileAboutIcon.setImageDrawable(ResourcesCompat.getDrawable(getResources(), R.drawable.symbol_edit_24, null)); } else { Drawable emoji = EmojiUtil.convertToDrawable(requireContext(), aboutEmoji); if (emoji != null) { binding.manageProfileAboutIcon.setImageDrawable(emoji); } else { - binding.manageProfileAboutIcon.setImageDrawable(ResourcesCompat.getDrawable(getResources(), R.drawable.ic_compose_24, null)); + binding.manageProfileAboutIcon.setImageDrawable(ResourcesCompat.getDrawable(getResources(), R.drawable.symbol_edit_24, null)); } } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java index b9f118884..4234c79b1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java +++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java @@ -1362,7 +1362,7 @@ public class Recipient { } public @NonNull FallbackContactPhoto getPhotoForDistributionList() { - return new ResourceContactPhoto(R.drawable.ic_stories_24, R.drawable.ic_stories_24, R.drawable.ic_stories_24); + return new ResourceContactPhoto(R.drawable.symbol_stories_24, R.drawable.symbol_stories_24, R.drawable.symbol_stories_24); } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingFragment.kt index ebc210707..f8db6bceb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingFragment.kt @@ -142,11 +142,11 @@ class StoriesLandingFragment : DSLSettingsFragment(layoutId = R.layout.stories_l setEnterSharedElementCallback(object : SharedElementCallback() { override fun onSharedElementStart(sharedElementNames: MutableList?, sharedElements: MutableList?, sharedElementSnapshots: MutableList?) { if (sharedElementNames?.contains("camera_fab") == true) { - cameraFab.setImageResource(R.drawable.ic_compose_outline_24) + cameraFab.setImageResource(R.drawable.symbol_edit_24) lifecycleDisposable += Single.timer(200, TimeUnit.MILLISECONDS) .observeOn(AndroidSchedulers.mainThread()) .subscribeBy { - cameraFab.setImageResource(R.drawable.ic_camera_outline_24) + cameraFab.setImageResource(R.drawable.symbol_camera_24) sharedElementTarget.alpha = 0f } } @@ -157,7 +157,7 @@ class StoriesLandingFragment : DSLSettingsFragment(layoutId = R.layout.stories_l Permissions.with(this) .request(Manifest.permission.CAMERA) .ifNecessary() - .withRationaleDialog(getString(R.string.ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera), R.drawable.ic_camera_24) + .withRationaleDialog(getString(R.string.ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera), R.drawable.symbol_camera_24) .withPermanentDenialDialog(getString(R.string.ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video)) .onAllGranted { startActivityIfAble(MediaSelectionActivity.camera(requireContext(), isStory = true)) diff --git a/app/src/main/res/drawable-hdpi/ic_person_white_24dp.webp b/app/src/main/res/drawable-hdpi/ic_person_white_24dp.webp deleted file mode 100644 index 65cabe34e72154db4a69dbc6b931d2c3db15bb31..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 228 zcmVu!_fBqFml9UEn z!94?Bh)ojO!#fbNfDOU~?=;~9xBw3L5tslTgpLGa0Wb)Fz_Sbm29Sq!Fc^X(0bmQM zo>|+r?fm~~(`>TnIimj)AOhF6X1C{}ZCSD#NZh0u>;}9mL)QXim2QTa(A_ZS@0wx8 zbPY^}&aQn+O(!y|q*Y3An)>v5pEr#NXIJbFcIVgYyd883j>MElPe4D0CG(DIoPh9H elc@Xxi03&(d;s!&HEGN06G3mlmGw# diff --git a/app/src/main/res/drawable-night/ic_share_24.xml b/app/src/main/res/drawable-night/ic_share_24.xml deleted file mode 100644 index 5f97a4c2a..000000000 --- a/app/src/main/res/drawable-night/ic_share_24.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable-xhdpi/ic_person_white_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_person_white_24dp.webp deleted file mode 100644 index ee3d3561399ea2ab8ff801ea63f3dcfcecf0ad32..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 264 zcmV+j0r&n=Nk&Eh0RRA3MM6+kP&iEU0000lFTe{Bw?QCjWB<};yu|#^KZ8b+6bEnM z7@vH++O};N+i6pD2f_vt0N@2sK^W`-9ta&o1n>ud+!Y3l4WR(YAP98<7=hIB0l~b( z0038#Z6`{`6(3jJ9rE_SI4UnM_+Lc-CxHDW!(w;4ZF650vxLXIFqAN-AUH8pC_y+^ zAOvyl(-jEF=ysSj-3@bnJzLC*F2^KvJ{RL29V^6Arl2tq8S5%Aqu`Htsxw9XY<<11 z5|4ey_AqWYhx`4oX`+Ee7DhWjZbt!u)?b3uMNgCD&O!Rjku!_fBqG>jijb- zneR;s+_q81aFBOkWdr~L*Z>&dDFg_-59S;`0DdoxqJhwP=^`2c0pJ|gKp>X~xh!xH z0I_V-fq|gM3tk2wAPE4QwsG1H%FN8n%*vQ`0jMnRx_Wa&ydopRA?&a(pg$@Sr z%KmHVr&GPAi3dZ!g3ALuS`5t0I|eEXo@lMb8rBt zdki=RI6WJ^JRoQ3?O|=xJHA0~3s~mjhA4SQRXquH;=9c@X}FtY?qlGWH_pIV$+{UCOxd3QkSyledi5jDlJJ zUhg%%9iL#>mfb#SjK__W?Tl6YIyFRd%ZJA|js6Tq&Aa2Hl|szGhqJhOJ^_i7i>;!I zo;F#z1=QPWN<%4LYk-0;^#l=p@f4IjThObgU3>ziAD48BrEWp_+q6oitvOKKG%4dc z1)>)&MO^nl_Q9=${RRl%+Ev&9(t8So=d|V#yebf{<6Tm_#p_TT;sN=eUw`id0E)QS A - - diff --git a/app/src/main/res/drawable/ic_appearance_24.xml b/app/src/main/res/drawable/ic_appearance_24.xml deleted file mode 100644 index 979485e4f..000000000 --- a/app/src/main/res/drawable/ic_appearance_24.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_archive_24.xml b/app/src/main/res/drawable/ic_archive_24.xml deleted file mode 100644 index 49f77523c..000000000 --- a/app/src/main/res/drawable/ic_archive_24.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_archive_24dp.xml b/app/src/main/res/drawable/ic_archive_24dp.xml deleted file mode 100644 index 25b274837..000000000 --- a/app/src/main/res/drawable/ic_archive_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_badge_24.xml b/app/src/main/res/drawable/ic_badge_24.xml deleted file mode 100644 index 0660b97cf..000000000 --- a/app/src/main/res/drawable/ic_badge_24.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_gift_24.xml b/app/src/main/res/drawable/ic_gift_24.xml deleted file mode 100644 index 308543983..000000000 --- a/app/src/main/res/drawable/ic_gift_24.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_heart_24.xml b/app/src/main/res/drawable/ic_heart_24.xml deleted file mode 100644 index 262dcade1..000000000 --- a/app/src/main/res/drawable/ic_heart_24.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_info_solid_24.xml b/app/src/main/res/drawable/ic_info_solid_24.xml deleted file mode 100644 index 68b0be697..000000000 --- a/app/src/main/res/drawable/ic_info_solid_24.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_invite_24.xml b/app/src/main/res/drawable/ic_invite_24.xml deleted file mode 100644 index eda5cb514..000000000 --- a/app/src/main/res/drawable/ic_invite_24.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_linked_devices_24.xml b/app/src/main/res/drawable/ic_linked_devices_24.xml deleted file mode 100644 index 2211fd584..000000000 --- a/app/src/main/res/drawable/ic_linked_devices_24.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_profile_name_24.xml b/app/src/main/res/drawable/ic_profile_name_24.xml deleted file mode 100644 index 23dc66e2c..000000000 --- a/app/src/main/res/drawable/ic_profile_name_24.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_receipt_24.xml b/app/src/main/res/drawable/ic_receipt_24.xml deleted file mode 100644 index d002b6c4b..000000000 --- a/app/src/main/res/drawable/ic_receipt_24.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_share_24.xml b/app/src/main/res/drawable/ic_share_24.xml deleted file mode 100644 index 3018fe04d..000000000 --- a/app/src/main/res/drawable/ic_share_24.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_stories_16.xml b/app/src/main/res/drawable/ic_stories_16.xml deleted file mode 100644 index 5b19d6397..000000000 --- a/app/src/main/res/drawable/ic_stories_16.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_stories_24.xml b/app/src/main/res/drawable/ic_stories_24.xml deleted file mode 100644 index 27c10444a..000000000 --- a/app/src/main/res/drawable/ic_stories_24.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_unarchive_24.xml b/app/src/main/res/drawable/ic_unarchive_24.xml deleted file mode 100644 index 4d597711f..000000000 --- a/app/src/main/res/drawable/ic_unarchive_24.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_union.xml b/app/src/main/res/drawable/ic_union.xml deleted file mode 100644 index 0c2c05277..000000000 --- a/app/src/main/res/drawable/ic_union.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/symbol_appearance_24.xml b/app/src/main/res/drawable/symbol_appearance_24.xml new file mode 100644 index 000000000..91320fda9 --- /dev/null +++ b/app/src/main/res/drawable/symbol_appearance_24.xml @@ -0,0 +1,17 @@ + + + + + + + diff --git a/app/src/main/res/drawable/symbol_archive_24.xml b/app/src/main/res/drawable/symbol_archive_24.xml new file mode 100644 index 000000000..850a47c11 --- /dev/null +++ b/app/src/main/res/drawable/symbol_archive_24.xml @@ -0,0 +1,13 @@ + + + + diff --git a/app/src/main/res/drawable/symbol_archive_android_24.xml b/app/src/main/res/drawable/symbol_archive_android_24.xml new file mode 100644 index 000000000..850a47c11 --- /dev/null +++ b/app/src/main/res/drawable/symbol_archive_android_24.xml @@ -0,0 +1,13 @@ + + + + diff --git a/app/src/main/res/drawable/symbol_archive_android_up_24.xml b/app/src/main/res/drawable/symbol_archive_android_up_24.xml new file mode 100644 index 000000000..06f2e1057 --- /dev/null +++ b/app/src/main/res/drawable/symbol_archive_android_up_24.xml @@ -0,0 +1,13 @@ + + + + diff --git a/app/src/main/res/drawable/symbol_archive_up_24.xml b/app/src/main/res/drawable/symbol_archive_up_24.xml new file mode 100644 index 000000000..06f2e1057 --- /dev/null +++ b/app/src/main/res/drawable/symbol_archive_up_24.xml @@ -0,0 +1,13 @@ + + + + diff --git a/app/src/main/res/drawable/symbol_at_24.xml b/app/src/main/res/drawable/symbol_at_24.xml new file mode 100644 index 000000000..a0e75adf5 --- /dev/null +++ b/app/src/main/res/drawable/symbol_at_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/symbol_badge_multi_24.xml b/app/src/main/res/drawable/symbol_badge_multi_24.xml new file mode 100644 index 000000000..407bac89b --- /dev/null +++ b/app/src/main/res/drawable/symbol_badge_multi_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/symbol_bell_24.xml b/app/src/main/res/drawable/symbol_bell_24.xml new file mode 100644 index 000000000..b73194562 --- /dev/null +++ b/app/src/main/res/drawable/symbol_bell_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/symbol_camera_24.xml b/app/src/main/res/drawable/symbol_camera_24.xml new file mode 100644 index 000000000..9270ddabc --- /dev/null +++ b/app/src/main/res/drawable/symbol_camera_24.xml @@ -0,0 +1,14 @@ + + + + diff --git a/app/src/main/res/drawable/symbol_chat_24.xml b/app/src/main/res/drawable/symbol_chat_24.xml new file mode 100644 index 000000000..d893fa1c8 --- /dev/null +++ b/app/src/main/res/drawable/symbol_chat_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/symbol_data_24.xml b/app/src/main/res/drawable/symbol_data_24.xml new file mode 100644 index 000000000..f75eb09c5 --- /dev/null +++ b/app/src/main/res/drawable/symbol_data_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/symbol_devices_24.xml b/app/src/main/res/drawable/symbol_devices_24.xml new file mode 100644 index 000000000..3972863fb --- /dev/null +++ b/app/src/main/res/drawable/symbol_devices_24.xml @@ -0,0 +1,13 @@ + + + + diff --git a/app/src/main/res/drawable/symbol_edit_24.xml b/app/src/main/res/drawable/symbol_edit_24.xml new file mode 100644 index 000000000..f8469bf13 --- /dev/null +++ b/app/src/main/res/drawable/symbol_edit_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/symbol_emoji_plus_24.xml b/app/src/main/res/drawable/symbol_emoji_plus_24.xml new file mode 100644 index 000000000..a0b85b860 --- /dev/null +++ b/app/src/main/res/drawable/symbol_emoji_plus_24.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/symbol_gift_24.xml b/app/src/main/res/drawable/symbol_gift_24.xml new file mode 100644 index 000000000..5b5148d82 --- /dev/null +++ b/app/src/main/res/drawable/symbol_gift_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/symbol_heart_24.xml b/app/src/main/res/drawable/symbol_heart_24.xml new file mode 100644 index 000000000..65d42e88d --- /dev/null +++ b/app/src/main/res/drawable/symbol_heart_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/symbol_help_24.xml b/app/src/main/res/drawable/symbol_help_24.xml new file mode 100644 index 000000000..e771a985a --- /dev/null +++ b/app/src/main/res/drawable/symbol_help_24.xml @@ -0,0 +1,13 @@ + + + + diff --git a/app/src/main/res/drawable/symbol_info_fill_24.xml b/app/src/main/res/drawable/symbol_info_fill_24.xml new file mode 100644 index 000000000..f7e1befea --- /dev/null +++ b/app/src/main/res/drawable/symbol_info_fill_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/symbol_invite_24.xml b/app/src/main/res/drawable/symbol_invite_24.xml new file mode 100644 index 000000000..13a948fe0 --- /dev/null +++ b/app/src/main/res/drawable/symbol_invite_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/symbol_lock_24.xml b/app/src/main/res/drawable/symbol_lock_24.xml new file mode 100644 index 000000000..de682a381 --- /dev/null +++ b/app/src/main/res/drawable/symbol_lock_24.xml @@ -0,0 +1,13 @@ + + + + diff --git a/app/src/main/res/drawable/symbol_open_20.xml b/app/src/main/res/drawable/symbol_open_20.xml new file mode 100644 index 000000000..8bdd7dfda --- /dev/null +++ b/app/src/main/res/drawable/symbol_open_20.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/symbol_payment_24.xml b/app/src/main/res/drawable/symbol_payment_24.xml new file mode 100644 index 000000000..8069b84b9 --- /dev/null +++ b/app/src/main/res/drawable/symbol_payment_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/symbol_person_24.xml b/app/src/main/res/drawable/symbol_person_24.xml new file mode 100644 index 000000000..8decf852d --- /dev/null +++ b/app/src/main/res/drawable/symbol_person_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/symbol_person_circle_24.xml b/app/src/main/res/drawable/symbol_person_circle_24.xml new file mode 100644 index 000000000..b7fad710e --- /dev/null +++ b/app/src/main/res/drawable/symbol_person_circle_24.xml @@ -0,0 +1,14 @@ + + + + diff --git a/app/src/main/res/drawable/symbol_plus_compact_16.xml b/app/src/main/res/drawable/symbol_plus_compact_16.xml new file mode 100644 index 000000000..0626ca111 --- /dev/null +++ b/app/src/main/res/drawable/symbol_plus_compact_16.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/symbol_receipt_24.xml b/app/src/main/res/drawable/symbol_receipt_24.xml new file mode 100644 index 000000000..93d88a2c0 --- /dev/null +++ b/app/src/main/res/drawable/symbol_receipt_24.xml @@ -0,0 +1,13 @@ + + + + diff --git a/app/src/main/res/drawable/symbol_search_24.xml b/app/src/main/res/drawable/symbol_search_24.xml new file mode 100644 index 000000000..7db95e8e0 --- /dev/null +++ b/app/src/main/res/drawable/symbol_search_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/symbol_share_android_24.xml b/app/src/main/res/drawable/symbol_share_android_24.xml new file mode 100644 index 000000000..84c0f3c65 --- /dev/null +++ b/app/src/main/res/drawable/symbol_share_android_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/symbol_stories_24.xml b/app/src/main/res/drawable/symbol_stories_24.xml new file mode 100644 index 000000000..bfdfe64d8 --- /dev/null +++ b/app/src/main/res/drawable/symbol_stories_24.xml @@ -0,0 +1,13 @@ + + + + diff --git a/app/src/main/res/drawable/symbol_stories_fill_compact_12.xml b/app/src/main/res/drawable/symbol_stories_fill_compact_12.xml new file mode 100644 index 000000000..447111a6a --- /dev/null +++ b/app/src/main/res/drawable/symbol_stories_fill_compact_12.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/symbol_x_24.xml b/app/src/main/res/drawable/symbol_x_24.xml new file mode 100644 index 000000000..02cb3134d --- /dev/null +++ b/app/src/main/res/drawable/symbol_x_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/about_preset_item.xml b/app/src/main/res/layout/about_preset_item.xml index 2bbeda789..82edb6d11 100644 --- a/app/src/main/res/layout/about_preset_item.xml +++ b/app/src/main/res/layout/about_preset_item.xml @@ -17,7 +17,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/about_preset_body" app:layout_constraintBottom_toBottomOf="@id/about_preset_body" - tools:src="@drawable/ic_add_emoji"/> + tools:src="@drawable/symbol_emoji_plus_24"/> @@ -136,7 +136,7 @@ android:transitionName="new_convo_fab" android:visibility="gone" app:backgroundTint="@color/signal_colorPrimaryContainer" - app:srcCompat="@drawable/ic_compose_outline_24" + app:srcCompat="@drawable/symbol_edit_24" app:tint="@color/signal_colorOnSurface" tools:visibility="visible" /> diff --git a/app/src/main/res/layout/dsl_payments_preference.xml b/app/src/main/res/layout/dsl_payments_preference.xml index 9f8771908..04a9db419 100644 --- a/app/src/main/res/layout/dsl_payments_preference.xml +++ b/app/src/main/res/layout/dsl_payments_preference.xml @@ -17,7 +17,8 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:srcCompat="@drawable/ic_payments_24" /> + app:tint="@color/signal_icon_tint_primary" + app:srcCompat="@drawable/symbol_payment_24" /> - + app:srcCompat="@drawable/symbol_search_24" /> diff --git a/app/src/main/res/layout/manage_profile_fragment.xml b/app/src/main/res/layout/manage_profile_fragment.xml index 2cd26c24b..4a6724922 100644 --- a/app/src/main/res/layout/manage_profile_fragment.xml +++ b/app/src/main/res/layout/manage_profile_fragment.xml @@ -112,7 +112,7 @@ app:layout_constraintBottom_toBottomOf="@id/manage_profile_name_subtitle" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/manage_profile_name" - app:srcCompat="@drawable/ic_profile_name_24" + app:srcCompat="@drawable/symbol_person_24" app:tint="@color/signal_text_primary" /> @@ -221,7 +221,7 @@ app:layout_constraintBottom_toBottomOf="@id/manage_profile_about_subtitle" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/manage_profile_about" - app:srcCompat="@drawable/ic_compose_24" + app:srcCompat="@drawable/symbol_edit_24" app:tint="@color/signal_text_primary" /> + tools:background="@drawable/symbol_heart_24" /> + tools:background="@drawable/symbol_heart_24" /> + tools:background="@drawable/symbol_heart_24" /> + tools:background="@drawable/symbol_heart_24" /> + tools:background="@drawable/symbol_heart_24" /> + tools:background="@drawable/symbol_heart_24" /> + tools:background="@drawable/symbol_heart_24" /> @@ -82,7 +82,7 @@ android:layout_height="100dp" app:forceJumbo="true" app:layout_constraintTag="emoji" - tools:background="@drawable/ic_heart_24" /> + tools:background="@drawable/symbol_heart_24" /> + tools:background="@drawable/symbol_heart_24" /> + tools:background="@drawable/symbol_heart_24" /> \ No newline at end of file diff --git a/app/src/main/res/layout/share_button.xml b/app/src/main/res/layout/share_button.xml index cf4659ddf..8507b6594 100644 --- a/app/src/main/res/layout/share_button.xml +++ b/app/src/main/res/layout/share_button.xml @@ -11,6 +11,6 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:text="@string/preferences_share" - app:icon="@drawable/ic_share_24" + app:icon="@drawable/symbol_share_android_24" app:iconSize="20dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/signal_bottom_action_bar_item.xml b/app/src/main/res/layout/signal_bottom_action_bar_item.xml index 0d8ca7d37..9924e8761 100644 --- a/app/src/main/res/layout/signal_bottom_action_bar_item.xml +++ b/app/src/main/res/layout/signal_bottom_action_bar_item.xml @@ -20,7 +20,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="4dp" app:tint="@color/signal_colorOnSurface" - tools:src="@drawable/ic_archive_24"/> + tools:src="@drawable/symbol_archive_android_24"/> + tools:src="@drawable/symbol_archive_android_24" /> + app:tint="@color/signal_colorBackground" + app:srcCompat="@drawable/symbol_plus_compact_16" /> + app:tint="@color/signal_colorBackground" + app:srcCompat="@drawable/symbol_plus_compact_16" />