diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/detail/DonationReceiptDetailFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/detail/DonationReceiptDetailFragment.kt index 7f565c1e89..cbe530c3b7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/detail/DonationReceiptDetailFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/detail/DonationReceiptDetailFragment.kt @@ -67,12 +67,6 @@ class DonationReceiptDetailFragment : DSLSettingsFragment(layoutId = R.layout.do private fun getConfiguration(record: InAppPaymentReceiptRecord, subscriptionName: String?): DSLConfiguration { return configure { - customPref( - SplashImage.Model( - splashImageResId = R.drawable.ic_molly_logo - ) - ) - textPref( title = DSLSettingsText.from( charSequence = FiatMoneyUtil.format(resources, record.amount), diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/CreateReleaseChannelJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/CreateReleaseChannelJob.kt index d9e7726217..f5f4dbb5a1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/CreateReleaseChannelJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/CreateReleaseChannelJob.kt @@ -76,7 +76,7 @@ class CreateReleaseChannelJob private constructor(parameters: Parameters) : Base AvatarRenderer.renderAvatar( context, Avatar.Resource( - R.drawable.ic_molly_logo, + R.drawable.ic_molly_logo_large, Avatars.ColorPair(ContextCompat.getColor(context, R.color.notification_background_ultramarine), ContextCompat.getColor(context, R.color.core_white), "") ), onAvatarRendered = { media -> diff --git a/app/src/main/res/drawable-anydpi-v24/ic_molly_background_connection.xml b/app/src/main/res/drawable-anydpi-v24/ic_molly_background_connection.xml deleted file mode 100644 index 132a2156a0..0000000000 --- a/app/src/main/res/drawable-anydpi-v24/ic_molly_background_connection.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable-anydpi-v24/ic_molly_backup.xml b/app/src/main/res/drawable-anydpi-v24/ic_molly_backup.xml deleted file mode 100644 index dcb8825cba..0000000000 --- a/app/src/main/res/drawable-anydpi-v24/ic_molly_backup.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable-anydpi-v24/ic_molly_cached.xml b/app/src/main/res/drawable-anydpi-v24/ic_molly_cached.xml deleted file mode 100644 index e9c9cdbcb6..0000000000 --- a/app/src/main/res/drawable-anydpi-v24/ic_molly_cached.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable-anydpi-v24/ic_notification.xml b/app/src/main/res/drawable-anydpi-v24/ic_notification.xml deleted file mode 100644 index e601a4277f..0000000000 --- a/app/src/main/res/drawable-anydpi-v24/ic_notification.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable-anydpi/ic_molly_background_connection.xml b/app/src/main/res/drawable-anydpi/ic_molly_background_connection.xml new file mode 100644 index 0000000000..c5ec4173c9 --- /dev/null +++ b/app/src/main/res/drawable-anydpi/ic_molly_background_connection.xml @@ -0,0 +1,19 @@ + + + + + + + + diff --git a/app/src/main/res/drawable-anydpi/ic_molly_backup.xml b/app/src/main/res/drawable-anydpi/ic_molly_backup.xml new file mode 100644 index 0000000000..742837738e --- /dev/null +++ b/app/src/main/res/drawable-anydpi/ic_molly_backup.xml @@ -0,0 +1,19 @@ + + + + + + + + diff --git a/app/src/main/res/drawable-anydpi/ic_molly_cached.xml b/app/src/main/res/drawable-anydpi/ic_molly_cached.xml new file mode 100644 index 0000000000..92cd20cd5b --- /dev/null +++ b/app/src/main/res/drawable-anydpi/ic_molly_cached.xml @@ -0,0 +1,22 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable-anydpi/ic_notification.xml b/app/src/main/res/drawable-anydpi/ic_notification.xml new file mode 100644 index 0000000000..8f884bc0f5 --- /dev/null +++ b/app/src/main/res/drawable-anydpi/ic_notification.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable-hdpi/ic_molly_background_connection.png b/app/src/main/res/drawable-hdpi/ic_molly_background_connection.png index 11290c76a7..ffcd795f28 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_molly_background_connection.png and b/app/src/main/res/drawable-hdpi/ic_molly_background_connection.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_molly_backup.png b/app/src/main/res/drawable-hdpi/ic_molly_backup.png index 4a3185b9bf..de06e425c6 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_molly_backup.png and b/app/src/main/res/drawable-hdpi/ic_molly_backup.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_molly_cached.png b/app/src/main/res/drawable-hdpi/ic_molly_cached.png index 4ab9e8e653..040dac7ece 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_molly_cached.png and b/app/src/main/res/drawable-hdpi/ic_molly_cached.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_notification.png b/app/src/main/res/drawable-hdpi/ic_notification.png index 1ecacf42b3..94a4195690 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_notification.png and b/app/src/main/res/drawable-hdpi/ic_notification.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_molly_background_connection.png b/app/src/main/res/drawable-mdpi/ic_molly_background_connection.png index a0c2d6b699..0d50b2b5e3 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_molly_background_connection.png and b/app/src/main/res/drawable-mdpi/ic_molly_background_connection.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_molly_backup.png b/app/src/main/res/drawable-mdpi/ic_molly_backup.png index a3e473c3e3..3591a41006 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_molly_backup.png and b/app/src/main/res/drawable-mdpi/ic_molly_backup.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_molly_cached.png b/app/src/main/res/drawable-mdpi/ic_molly_cached.png index da590eb1f1..d092347a12 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_molly_cached.png and b/app/src/main/res/drawable-mdpi/ic_molly_cached.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_notification.png b/app/src/main/res/drawable-mdpi/ic_notification.png index 32a1008237..3f8173c7c7 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_notification.png and b/app/src/main/res/drawable-mdpi/ic_notification.png differ diff --git a/app/src/main/res/drawable-night/delete_sync.xml b/app/src/main/res/drawable-night/delete_sync.xml index b58d851ec2..efa661a70d 100644 --- a/app/src/main/res/drawable-night/delete_sync.xml +++ b/app/src/main/res/drawable-night/delete_sync.xml @@ -8,11 +8,11 @@ android:fillColor="#373D52"/> + android:fillColor="#8069E8"/> @@ -24,11 +24,11 @@ android:fillColor="#373D52"/> + android:fillColor="#8069E8"/> diff --git a/app/src/main/res/drawable-night/ic_all_devices.xml b/app/src/main/res/drawable-night/ic_all_devices.xml index 0be4ae9f27..feb2e2b0b7 100644 --- a/app/src/main/res/drawable-night/ic_all_devices.xml +++ b/app/src/main/res/drawable-night/ic_all_devices.xml @@ -5,41 +5,41 @@ android:viewportHeight="112"> + android:fillColor="#E2DCFF"/> + android:fillColor="#CABEFF"/> + android:fillColor="#E2DCFF"/> + android:fillColor="#E2DCFF"/> + android:fillColor="#E2DCFF"/> diff --git a/app/src/main/res/drawable-night/ic_devices.xml b/app/src/main/res/drawable-night/ic_devices.xml index 2f3402be1e..723fbe1132 100644 --- a/app/src/main/res/drawable-night/ic_devices.xml +++ b/app/src/main/res/drawable-night/ic_devices.xml @@ -5,30 +5,30 @@ android:viewportHeight="112"> + android:fillColor="#E2DCFF"/> + android:fillColor="#CABEFF"/> + android:fillColor="#E2DCFF"/> + android:fillColor="#E2DCFF"/> diff --git a/app/src/main/res/drawable-night/ic_devices_intro.xml b/app/src/main/res/drawable-night/ic_devices_intro.xml index ab5c17b35a..e35eb12ee0 100644 --- a/app/src/main/res/drawable-night/ic_devices_intro.xml +++ b/app/src/main/res/drawable-night/ic_devices_intro.xml @@ -5,62 +5,62 @@ android:viewportHeight="112"> + android:fillColor="#E2DCFF"/> + android:fillColor="#CABEFF"/> + android:fillColor="#E2DCFF"/> + android:fillColor="#E2DCFF"/> + android:fillColor="#CABEFF"/> + android:fillColor="#E2DCFF"/> + android:fillColor="#CABEFF"/> + android:fillColor="#6341FF"/> + android:fillColor="#6341FF"/> + android:fillColor="#CABEFF"/> + android:fillColor="#6341FF"/> + android:fillColor="#6341FF"/> diff --git a/app/src/main/res/drawable-night/ic_phone_lock.xml b/app/src/main/res/drawable-night/ic_phone_lock.xml index dcae314fe1..0955068ca9 100644 --- a/app/src/main/res/drawable-night/ic_phone_lock.xml +++ b/app/src/main/res/drawable-night/ic_phone_lock.xml @@ -5,23 +5,23 @@ android:viewportHeight="112"> + android:fillColor="#E2DCFF"/> + android:fillColor="#E2DCFF"/> + android:fillColor="#6341FF"/> diff --git a/app/src/main/res/drawable-night/image_signal_backups.xml b/app/src/main/res/drawable-night/image_signal_backups.xml index fef161c8a5..1138908d65 100644 --- a/app/src/main/res/drawable-night/image_signal_backups.xml +++ b/app/src/main/res/drawable-night/image_signal_backups.xml @@ -4,30 +4,30 @@ android:viewportWidth="80" android:viewportHeight="80"> diff --git a/app/src/main/res/drawable-night/image_signal_backups_key.xml b/app/src/main/res/drawable-night/image_signal_backups_key.xml index ce806ab2bc..f181211cac 100644 --- a/app/src/main/res/drawable-night/image_signal_backups_key.xml +++ b/app/src/main/res/drawable-night/image_signal_backups_key.xml @@ -4,14 +4,14 @@ android:viewportWidth="80" android:viewportHeight="80"> diff --git a/app/src/main/res/drawable-night/image_signal_backups_lock.xml b/app/src/main/res/drawable-night/image_signal_backups_lock.xml index 1d80d9bdbc..45c36e57ec 100644 --- a/app/src/main/res/drawable-night/image_signal_backups_lock.xml +++ b/app/src/main/res/drawable-night/image_signal_backups_lock.xml @@ -4,14 +4,14 @@ android:viewportWidth="80" android:viewportHeight="80"> diff --git a/app/src/main/res/drawable-night/image_signal_backups_media.xml b/app/src/main/res/drawable-night/image_signal_backups_media.xml index db200e5dcb..d8440391ad 100644 --- a/app/src/main/res/drawable-night/image_signal_backups_media.xml +++ b/app/src/main/res/drawable-night/image_signal_backups_media.xml @@ -14,27 +14,27 @@ android:endX="40" android:endY="64"> diff --git a/app/src/main/res/drawable-night/image_signal_backups_plans.xml b/app/src/main/res/drawable-night/image_signal_backups_plans.xml index e95ef99b3e..cec81aea1d 100644 --- a/app/src/main/res/drawable-night/image_signal_backups_plans.xml +++ b/app/src/main/res/drawable-night/image_signal_backups_plans.xml @@ -14,60 +14,60 @@ android:endX="40" android:endY="72"> diff --git a/app/src/main/res/drawable-night/image_signal_backups_subscribed.xml b/app/src/main/res/drawable-night/image_signal_backups_subscribed.xml index 8f2c2b080a..a36e620e82 100644 --- a/app/src/main/res/drawable-night/image_signal_backups_subscribed.xml +++ b/app/src/main/res/drawable-night/image_signal_backups_subscribed.xml @@ -5,31 +5,31 @@ android:viewportHeight="64"> diff --git a/app/src/main/res/drawable-night/sms_export_error.xml b/app/src/main/res/drawable-night/sms_export_error.xml deleted file mode 100644 index 86f246a7e9..0000000000 --- a/app/src/main/res/drawable-night/sms_export_error.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable-night/sms_export_partial_complete.xml b/app/src/main/res/drawable-night/sms_export_partial_complete.xml deleted file mode 100644 index e375ef746a..0000000000 --- a/app/src/main/res/drawable-night/sms_export_partial_complete.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable-night/sms_message.xml b/app/src/main/res/drawable-night/sms_message.xml deleted file mode 100644 index ebedfe1831..0000000000 --- a/app/src/main/res/drawable-night/sms_message.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable-night/sms_small_encrypted.xml b/app/src/main/res/drawable-night/sms_small_encrypted.xml deleted file mode 100644 index d7c1d68a97..0000000000 --- a/app/src/main/res/drawable-night/sms_small_encrypted.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable-night/sms_small_export.xml b/app/src/main/res/drawable-night/sms_small_export.xml deleted file mode 100644 index c982f4719f..0000000000 --- a/app/src/main/res/drawable-night/sms_small_export.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable-night/sms_small_insecure.xml b/app/src/main/res/drawable-night/sms_small_insecure.xml deleted file mode 100644 index afa17e261c..0000000000 --- a/app/src/main/res/drawable-night/sms_small_insecure.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable-night/usernames_48_color.xml b/app/src/main/res/drawable-night/usernames_48_color.xml index 9ce90516ec..dcc66436c8 100644 --- a/app/src/main/res/drawable-night/usernames_48_color.xml +++ b/app/src/main/res/drawable-night/usernames_48_color.xml @@ -4,7 +4,7 @@ android:viewportWidth="48" android:viewportHeight="48"> + android:strokeColor="#8881A8"> + android:strokeColor="#8881A8"> + android:strokeColor="#8881A8" /> diff --git a/app/src/main/res/drawable/app_icon_tutorial_notification.xml b/app/src/main/res/drawable/app_icon_tutorial_notification.xml index 89489e4ea1..da0ca5cec9 100644 --- a/app/src/main/res/drawable/app_icon_tutorial_notification.xml +++ b/app/src/main/res/drawable/app_icon_tutorial_notification.xml @@ -18,7 +18,7 @@ + android:strokeColor="#8881A8"> + android:fillColor="#E2DCFF"/> + android:fillColor="#CABEFF"/> + android:fillColor="#E2DCFF"/> + android:fillColor="#E2DCFF"/> + android:fillColor="#E2DCFF"/> diff --git a/app/src/main/res/drawable/ic_censorship_megaphone_64.xml b/app/src/main/res/drawable/ic_censorship_megaphone_64.xml index 3f03594c85..03e0b85b9b 100644 --- a/app/src/main/res/drawable/ic_censorship_megaphone_64.xml +++ b/app/src/main/res/drawable/ic_censorship_megaphone_64.xml @@ -5,7 +5,7 @@ android:viewportHeight="64"> + android:fillColor="#5335DD" + android:strokeColor="#5335DD"/> diff --git a/app/src/main/res/drawable/ic_devices.xml b/app/src/main/res/drawable/ic_devices.xml index d97ba9b284..e7e20a5d14 100644 --- a/app/src/main/res/drawable/ic_devices.xml +++ b/app/src/main/res/drawable/ic_devices.xml @@ -5,30 +5,30 @@ android:viewportHeight="112"> + android:fillColor="#E2DCFF"/> + android:fillColor="#CABEFF"/> + android:fillColor="#E2DCFF"/> + android:fillColor="#E2DCFF"/> diff --git a/app/src/main/res/drawable/ic_devices_intro.xml b/app/src/main/res/drawable/ic_devices_intro.xml index 71cdfb12c5..dab6556d56 100644 --- a/app/src/main/res/drawable/ic_devices_intro.xml +++ b/app/src/main/res/drawable/ic_devices_intro.xml @@ -5,62 +5,62 @@ android:viewportHeight="112"> + android:fillColor="#E2DCFF"/> + android:fillColor="#CABEFF"/> + android:fillColor="#E2DCFF"/> + android:fillColor="#E2DCFF"/> + android:fillColor="#CABEFF"/> + android:fillColor="#E2DCFF"/> + android:fillColor="#CABEFF"/> + android:fillColor="#290F9F"/> + android:fillColor="#290F9F"/> + android:fillColor="#CABEFF"/> + android:fillColor="#290F9F"/> + android:fillColor="#290F9F"/> diff --git a/app/src/main/res/drawable/ic_drag_handle.xml b/app/src/main/res/drawable/ic_drag_handle.xml index 6be50d4f0c..d3b0b8d91c 100644 --- a/app/src/main/res/drawable/ic_drag_handle.xml +++ b/app/src/main/res/drawable/ic_drag_handle.xml @@ -5,8 +5,8 @@ android:viewportHeight="24"> + android:fillColor="#514D64"/> + android:fillColor="#514D64"/> diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml index 8d3892ee43..702a030fb5 100644 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -2,26 +2,20 @@ xmlns:aapt="http://schemas.android.com/aapt" android:width="108dp" android:height="108dp" - android:viewportWidth="108" - android:viewportHeight="108"> - - - - - - - - - - - \ No newline at end of file + android:viewportWidth="512" + android:viewportHeight="512"> + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml index 2151571620..ce7c1f864c 100644 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -1,59 +1,26 @@ - - - - - - - - - - - - - + android:viewportWidth="512" + android:viewportHeight="512"> + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_monochrome.xml b/app/src/main/res/drawable/ic_launcher_monochrome.xml index 0e1abbe53f..4c5cf0f7dd 100644 --- a/app/src/main/res/drawable/ic_launcher_monochrome.xml +++ b/app/src/main/res/drawable/ic_launcher_monochrome.xml @@ -1,14 +1,14 @@ - + android:viewportWidth="512" + android:viewportHeight="512"> + diff --git a/app/src/main/res/drawable/ic_molly_logo.xml b/app/src/main/res/drawable/ic_molly_logo.xml deleted file mode 100644 index ba5968545c..0000000000 --- a/app/src/main/res/drawable/ic_molly_logo.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_molly_logo_large.xml b/app/src/main/res/drawable/ic_molly_logo_large.xml new file mode 100644 index 0000000000..bccced682b --- /dev/null +++ b/app/src/main/res/drawable/ic_molly_logo_large.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_phone_lock.xml b/app/src/main/res/drawable/ic_phone_lock.xml index 08817858aa..d11ab6cba7 100644 --- a/app/src/main/res/drawable/ic_phone_lock.xml +++ b/app/src/main/res/drawable/ic_phone_lock.xml @@ -5,23 +5,23 @@ android:viewportHeight="112"> + android:fillColor="#E2DCFF"/> + android:fillColor="#E2DCFF"/> + android:fillColor="#290F9F"/> diff --git a/app/src/main/res/drawable/ic_radio_button_checked.xml b/app/src/main/res/drawable/ic_radio_button_checked.xml index 6469689a2b..1094d1c29b 100644 --- a/app/src/main/res/drawable/ic_radio_button_checked.xml +++ b/app/src/main/res/drawable/ic_radio_button_checked.xml @@ -1,7 +1,7 @@ - + - + diff --git a/app/src/main/res/drawable/ic_screen_lock.xml b/app/src/main/res/drawable/ic_screen_lock.xml index 27008ac32d..1c761b5155 100644 --- a/app/src/main/res/drawable/ic_screen_lock.xml +++ b/app/src/main/res/drawable/ic_screen_lock.xml @@ -8,26 +8,26 @@ android:pathData="M18,0L54,0A18,18 0,0 1,72 18L72,54A18,18 0,0 1,54 72L18,72A18,18 0,0 1,0 54L0,18A18,18 0,0 1,18 0z"/> + android:fillColor="#CFC5FF"/> + android:fillColor="#E2DCFF" + android:strokeColor="#290F9F"/> diff --git a/app/src/main/res/drawable/ic_signal_logo_small.xml b/app/src/main/res/drawable/ic_signal_logo_small.xml deleted file mode 100644 index e3a8f4b8a9..0000000000 --- a/app/src/main/res/drawable/ic_signal_logo_small.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_splash_while_logo.xml b/app/src/main/res/drawable/ic_splash_while_logo.xml new file mode 100644 index 0000000000..37936f12af --- /dev/null +++ b/app/src/main/res/drawable/ic_splash_while_logo.xml @@ -0,0 +1,16 @@ + + + + + + diff --git a/app/src/main/res/drawable/image_folder_sheet.xml b/app/src/main/res/drawable/image_folder_sheet.xml index 8fd2f6b21b..b760a6d79c 100644 --- a/app/src/main/res/drawable/image_folder_sheet.xml +++ b/app/src/main/res/drawable/image_folder_sheet.xml @@ -16,21 +16,21 @@ android:fillType="evenOdd"/> + android:fillColor="#CFC5FF"/> + android:fillColor="#6341FF"/> + android:fillColor="#EBE7FF"/> + android:strokeColor="#8881A8"/> diff --git a/app/src/main/res/drawable/image_signal_backups.xml b/app/src/main/res/drawable/image_signal_backups.xml index 4890c6c807..64c8ea8122 100644 --- a/app/src/main/res/drawable/image_signal_backups.xml +++ b/app/src/main/res/drawable/image_signal_backups.xml @@ -4,30 +4,30 @@ android:viewportWidth="80" android:viewportHeight="80"> diff --git a/app/src/main/res/drawable/image_signal_backups_key.xml b/app/src/main/res/drawable/image_signal_backups_key.xml index 94d8a43aa2..5d987b06a5 100644 --- a/app/src/main/res/drawable/image_signal_backups_key.xml +++ b/app/src/main/res/drawable/image_signal_backups_key.xml @@ -4,14 +4,14 @@ android:viewportWidth="80" android:viewportHeight="80"> diff --git a/app/src/main/res/drawable/image_signal_backups_lock.xml b/app/src/main/res/drawable/image_signal_backups_lock.xml index 4ae3c4425a..361fade8b4 100644 --- a/app/src/main/res/drawable/image_signal_backups_lock.xml +++ b/app/src/main/res/drawable/image_signal_backups_lock.xml @@ -4,14 +4,14 @@ android:viewportWidth="80" android:viewportHeight="80"> diff --git a/app/src/main/res/drawable/image_signal_backups_media.xml b/app/src/main/res/drawable/image_signal_backups_media.xml index 22b747aebc..40ceef48a6 100644 --- a/app/src/main/res/drawable/image_signal_backups_media.xml +++ b/app/src/main/res/drawable/image_signal_backups_media.xml @@ -14,27 +14,27 @@ android:endX="44.01" android:endY="63.97"> diff --git a/app/src/main/res/drawable/image_signal_backups_plans.xml b/app/src/main/res/drawable/image_signal_backups_plans.xml index 9e73d6c801..8be8ef81c2 100644 --- a/app/src/main/res/drawable/image_signal_backups_plans.xml +++ b/app/src/main/res/drawable/image_signal_backups_plans.xml @@ -14,60 +14,60 @@ android:endX="44.87" android:endY="71.88"> diff --git a/app/src/main/res/drawable/image_signal_backups_subscribed.xml b/app/src/main/res/drawable/image_signal_backups_subscribed.xml index 57a416971b..4171cfe338 100644 --- a/app/src/main/res/drawable/image_signal_backups_subscribed.xml +++ b/app/src/main/res/drawable/image_signal_backups_subscribed.xml @@ -5,31 +5,31 @@ android:viewportHeight="64"> diff --git a/app/src/main/res/drawable/image_transfer_phones.xml b/app/src/main/res/drawable/image_transfer_phones.xml index 942203ca09..b3eaf1145b 100644 --- a/app/src/main/res/drawable/image_transfer_phones.xml +++ b/app/src/main/res/drawable/image_transfer_phones.xml @@ -9,14 +9,14 @@ android:pathData="M0,0h138.17v156h-138.17z"/> + android:fillColor="#EBE7FF"/> + android:fillColor="#DDD7FF"/> @@ -65,14 +65,14 @@ android:endX="92.89" android:endY="190.16" android:type="linear"> - - + + + android:fillColor="#C1BBDF"/> + android:fillColor="#C1BBDF"/> + android:fillColor="#C1BBDF"/> + android:fillColor="#C1BBDF"/> + android:fillColor="#C1BBDF"/> + android:fillColor="#C1BBDF"/> + android:fillColor="#C1BBDF"/> + android:fillColor="#C1BBDF"/> + android:fillColor="#C1BBDF"/> + android:fillColor="#C1BBDF"/> + android:fillColor="#C1BBDF"/> + android:fillColor="#C1BBDF"/> + android:fillColor="#C1BBDF"/> + android:fillColor="#C1BBDF"/> + android:fillColor="#C1BBDF"/> diff --git a/app/src/main/res/drawable/sms_export_error.xml b/app/src/main/res/drawable/sms_export_error.xml deleted file mode 100644 index 1b915df4a7..0000000000 --- a/app/src/main/res/drawable/sms_export_error.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/sms_export_partial_complete.xml b/app/src/main/res/drawable/sms_export_partial_complete.xml deleted file mode 100644 index e833122b02..0000000000 --- a/app/src/main/res/drawable/sms_export_partial_complete.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/sms_message.xml b/app/src/main/res/drawable/sms_message.xml deleted file mode 100644 index c4d32b8cca..0000000000 --- a/app/src/main/res/drawable/sms_message.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/sms_small_encrypted.xml b/app/src/main/res/drawable/sms_small_encrypted.xml deleted file mode 100644 index 93f29e09ac..0000000000 --- a/app/src/main/res/drawable/sms_small_encrypted.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/sms_small_export.xml b/app/src/main/res/drawable/sms_small_export.xml deleted file mode 100644 index 0ed19621f1..0000000000 --- a/app/src/main/res/drawable/sms_small_export.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/sms_small_insecure.xml b/app/src/main/res/drawable/sms_small_insecure.xml deleted file mode 100644 index 5fd412950a..0000000000 --- a/app/src/main/res/drawable/sms_small_insecure.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/symbol_pin_16.xml b/app/src/main/res/drawable/symbol_pin_16.xml index 3ddf07c2ff..1301f07fd1 100644 --- a/app/src/main/res/drawable/symbol_pin_16.xml +++ b/app/src/main/res/drawable/symbol_pin_16.xml @@ -5,6 +5,6 @@ android:viewportHeight="16"> diff --git a/app/src/main/res/drawable/usernames_megaphone.xml b/app/src/main/res/drawable/usernames_megaphone.xml index 7dc0c7238b..43ee61cd79 100644 --- a/app/src/main/res/drawable/usernames_megaphone.xml +++ b/app/src/main/res/drawable/usernames_megaphone.xml @@ -4,10 +4,10 @@ android:viewportWidth="56" android:viewportHeight="56"> + app:srcCompat="@drawable/ic_molly_logo_large" /> diff --git a/app/src/main/res/layout/client_deprecated_activity.xml b/app/src/main/res/layout/client_deprecated_activity.xml index d289f9bc29..4fd3ccd9cb 100644 --- a/app/src/main/res/layout/client_deprecated_activity.xml +++ b/app/src/main/res/layout/client_deprecated_activity.xml @@ -24,7 +24,7 @@ + app:srcCompat="@drawable/ic_molly_logo_large" /> + app:layout_constraintTop_toTopOf="parent" /> @color/signal_light_colorErrorContainer - #1F46445C + #1FDAD2FF #991C1C1F - #61303033 - #A3303033 - #1FE3E1E6 - #80E3E1E6 - #99BEBCC4 - #99E3E1E6 - #615D5D66 + #612C2A33 + #A32C2A33 + #1FE3E1EC + #80E3E1EC + #99CFCBE5 + #99E3E1EC + #61666372 #001C1C1F diff --git a/app/src/main/res/values-v31/themes.xml b/app/src/main/res/values-v31/themes.xml index b1defa49b9..d095053d24 100644 --- a/app/src/main/res/values-v31/themes.xml +++ b/app/src/main/res/values-v31/themes.xml @@ -1,16 +1,19 @@ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 0c60e27a74..358d8ac3e5 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -42,7 +42,7 @@ #4d4d4d #400099cc - #14E3E1E6 + #14E3E1EC #FFCE4A40 diff --git a/app/src/main/res/values/core_colors.xml b/app/src/main/res/values/core_colors.xml index 4f50ce3ce8..00d7aa0410 100644 --- a/app/src/main/res/values/core_colors.xml +++ b/app/src/main/res/values/core_colors.xml @@ -1,14 +1,14 @@ - #7b68ee - #8f7ff1 - #bdb4f7 - #4c33A8 - #7663f0 - #557b68ee - #807b68ee + #7152FF + #8F77FF + #BEAFFF + #462DB9 + #7152FF + #557152FF + #807152FF - #7b68ee + #7152FF #4caf50 #ffd624 #f44336 diff --git a/app/src/main/res/values/light_colors.xml b/app/src/main/res/values/light_colors.xml index 612627c463..d6b3f2803b 100644 --- a/app/src/main/res/values/light_colors.xml +++ b/app/src/main/res/values/light_colors.xml @@ -186,7 +186,7 @@ @color/signal_colorSurface1 - #DFDCF7 + #E6E2FF @color/core_white @@ -203,5 +203,5 @@ @color/signal_colorNeutralInverse @color/core_white - #99F3F2FA + #99F4F1FF diff --git a/app/src/main/res/values/material3_colors.xml b/app/src/main/res/values/material3_colors.xml index c84bd1c386..03cf0c357d 100644 --- a/app/src/main/res/values/material3_colors.xml +++ b/app/src/main/res/values/material3_colors.xml @@ -49,16 +49,16 @@ @color/signal_dark_colorErrorContainer - #1FDFDCF7 - #99FBFAFF - #61E7E6F2 - #A3E7E6F2 - #1F171719 - #80171719 - #99585563 + #1FE6E2FF + #99F9F9FF + #61EEEEFA + #A3EEEEFA + #1F1A1920 + #801A1920 + #99514D64 #991A1A1C - #6182808A - #00FBFAFF + #617F7C8F + #00F9F9FF #D5D8DE diff --git a/app/src/main/res/values/material3_colors_dark.xml b/app/src/main/res/values/material3_colors_dark.xml index 19eb2cbf0f..452927b424 100644 --- a/app/src/main/res/values/material3_colors_dark.xml +++ b/app/src/main/res/values/material3_colors_dark.xml @@ -1,32 +1,32 @@ - #C2BDFC - #4A485E - #C8C5E0 - #46445C - #171719 - #303033 - #171719 + #C8BCFF + #DAD2FF + #36304F + #DAD2FF + #1A1823 + #2C2A33 + #1A1823 #FFB4A9 #930006 - #23203B - #DDDCFC - #2C2A42 - #DEDCFA - #E3E1E6 - #BEBCC4 - #504D59 - #E3E1E6 - #5D5D66 + #241C45 + #DAD2FF + #36304F + #DAD2FF + #E3E1EC + #CFCBE5 + #464257 + #E3E1EC + #666372 #14FFFFFF #FFFFFF #B3FFFFFF - #222229 - #272730 - #2E2D38 - #2F2D38 - #31303D + #211F29 + #2C2A36 + #363342 + #3D3A4B + #464355 #0AFFFFFF #1FFFFFFF @@ -43,7 +43,7 @@ #E0FFFFFF #A3FFFFFF - #EB171719 - #DE171719 - #EB303033 + #EB1A1823 + #DE1A1823 + #EB2C2A33 \ No newline at end of file diff --git a/app/src/main/res/values/material3_colors_light.xml b/app/src/main/res/values/material3_colors_light.xml index b3f7df3db3..d55518a610 100644 --- a/app/src/main/res/values/material3_colors_light.xml +++ b/app/src/main/res/values/material3_colors_light.xml @@ -1,32 +1,32 @@ - #523DBD - #D8D2FA - #59576E - #DFDCF7 - #FBFAFF - #E7E6F2 - #FBFAFF - #BA1B1B - #FFDAD4 + #5335DD + #DDD7FF + #5A5379 + #E6E2FF + #F9F9FF + #EEEEFA + #F9F9FF + #DB2B2E + #FFDEDF #FFFFFF - #110647 + #140654 #FFFFFF - #18152B - #171719 - #585563 - #BDBBC8 - #171719 - #82808A + #1E1641 + #1A1920 + #514D64 + #B9B4CF + #1A1920 + #7F7C8F #99FFFFFF #FFFFFF #B3FFFFFF - #F3F2FA - #EDEBF5 - #EAE9F5 - #E8E6F2 - #E7E4F2 + #F4F1FF + #ECE9F8 + #E8E4F8 + #E3DEF6 + #DFDAF2 #14FFFFFF #29FFFFFF