From df4422369d554849ac02eb7e9847c3b8fee99c0d Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Wed, 4 Mar 2020 08:14:21 -0500 Subject: [PATCH] Update icons and colors. --- .../securesms/ExperienceUpgradeActivity.java | 8 +-- .../securesms/InviteActivity.java | 6 +-- .../securesms/PassphrasePromptActivity.java | 6 +-- .../securesms/TransportOptions.java | 2 +- .../contacts/ContactSelectionListAdapter.java | 2 +- .../conversation/ConversationActivity.java | 2 +- .../conversation/ConversationFragment.java | 2 +- .../securesms/giph/ui/GiphyActivity.java | 2 +- .../securesms/jobs/FcmRefreshJob.java | 2 +- .../securesms/jobs/PushDecryptMessageJob.java | 2 +- .../securesms/mediasend/CameraXFragment.java | 2 +- .../mediasend/MediaSendActivity.java | 2 +- .../FailedNotificationBuilder.java | 2 +- .../MultipleRecipientNotificationBuilder.java | 4 +- .../PendingMessageNotificationBuilder.java | 4 +- .../SingleRecipientNotificationBuilder.java | 4 +- .../widgets/ContactPreference.java | 2 +- .../service/ApplicationMigrationService.java | 6 +-- .../service/UpdateApkReadyListener.java | 4 +- .../stickers/StickerManagementAdapter.java | 2 +- .../res/color/help_fragment_next_dark.xml | 2 +- .../res/color/help_fragment_next_light.xml | 2 +- .../res/drawable-hdpi/icon_notification.webp | Bin 676 -> 0 bytes .../res/drawable-hdpi/icon_transparent.webp | Bin 5618 -> 0 bytes .../res/drawable-mdpi/icon_notification.webp | Bin 412 -> 0 bytes .../res/drawable-mdpi/icon_transparent.webp | Bin 2940 -> 0 bytes .../camera_send_button_background.xml | 2 +- .../conversation_list_item_background.xml | 4 +- ...conversation_list_item_background_dark.xml | 4 +- .../drawable-v21/cta_button_background.xml | 6 +-- .../media_continue_button_background.xml | 2 +- .../res/drawable-xhdpi/icon_notification.webp | Bin 858 -> 0 bytes .../res/drawable-xhdpi/icon_transparent.webp | Bin 6658 -> 0 bytes .../drawable-xxhdpi/icon_notification.webp | Bin 1262 -> 0 bytes .../res/drawable-xxhdpi/icon_transparent.webp | Bin 11572 -> 0 bytes .../drawable-xxxhdpi/icon_notification.webp | Bin 1684 -> 0 bytes .../drawable-xxxhdpi/icon_transparent.webp | Bin 15418 -> 0 bytes .../camera_send_button_background.xml | 2 +- .../drawable/conversation_item_background.xml | 4 +- .../conversation_item_background_animated.xml | 4 +- .../conversation_list_item_background.xml | 6 +-- ...conversation_list_item_background_dark.xml | 6 +-- .../res/drawable/cta_button_background.xml | 4 +- ...p_fragment_emoji_radio_background_dark.xml | 2 +- ..._fragment_emoji_radio_background_light.xml | 2 +- .../res/drawable/ic_check_circle_solid_20.xml | 2 +- .../res/drawable/ic_kbs_splash_light_svg.xml | 2 +- .../res/drawable/ic_launcher_foreground.xml | 11 +++++ app/src/main/res/drawable/ic_map_marker.xml | 2 +- app/src/main/res/drawable/ic_notification.xml | 9 ++++ app/src/main/res/drawable/ic_send_lock_24.xml | 2 +- .../main/res/drawable/ic_send_unlock_24.xml | 2 +- .../main/res/drawable/ic_share_outline_24.xml | 2 +- .../main/res/drawable/ic_share_solid_24.xml | 2 +- app/src/main/res/drawable/info_round.xml | 2 +- .../insights_cta_button_background.xml | 2 +- .../labeled_edit_text_background_active.xml | 2 +- .../media_continue_button_background.xml | 2 +- .../media_count_button_background.xml | 2 +- .../res/drawable/mediarail_media_outline.xml | 2 +- app/src/main/res/drawable/pill.xml | 2 +- .../res/drawable/progress_button_state.xml | 8 +-- .../main/res/drawable/read_receipt_vector.xml | 2 +- .../drawable/reminder_background_normal.xml | 6 +-- .../drawable/touch_highlight_background.xml | 2 +- .../drawable/unread_count_background_dark.xml | 2 +- .../unread_count_background_light.xml | 2 +- .../res/layout/account_locked_fragment.xml | 1 - .../activity_shared_contact_details.xml | 8 +-- .../main/res/layout/base_kbs_pin_fragment.xml | 1 - app/src/main/res/layout/color_fragment.xml | 2 +- .../contact_selection_list_fragment.xml | 6 +-- .../res/layout/conversation_search_nav.xml | 4 +- .../res/layout/create_passphrase_activity.xml | 46 +++++++++--------- .../main/res/layout/device_list_fragment.xml | 4 +- ...erience_upgrade_link_previews_fragment.xml | 4 +- ...experience_upgrade_preference_fragment.xml | 2 +- .../experience_upgrade_stickers_fragment.xml | 4 +- ...nce_upgrade_typing_indicators_fragment.xml | 8 +-- .../layout/fragment_registration_blank.xml | 4 +- .../res/layout/fragment_registration_lock.xml | 3 +- .../layout/fragment_registration_welcome.xml | 2 +- .../fragment_registration_welcome_rereg.xml | 4 +- app/src/main/res/layout/help_fragment.xml | 4 +- .../main/res/layout/insights_dashboard.xml | 3 +- .../insights_dashboard_adapter_item.xml | 1 - app/src/main/res/layout/invite_activity.xml | 5 +- .../main/res/layout/item_editable_contact.xml | 2 +- .../main/res/layout/kbs_splash_fragment.xml | 3 +- app/src/main/res/layout/labeled_edit_text.xml | 2 +- app/src/main/res/layout/link_preview.xml | 2 +- .../res/layout/media_overview_activity.xml | 4 +- .../media_overview_detail_item_audio.xml | 2 +- .../res/layout/mediapicker_media_item.xml | 2 +- .../res/layout/mediasend_count_button.xml | 2 +- .../layout/permissions_rationale_dialog.xml | 2 +- .../preference_right_summary_widget.xml | 2 +- .../layout/preference_storage_category.xml | 2 +- .../res/layout/profile_create_fragment.xml | 6 +-- .../res/layout/prompt_passphrase_activity.xml | 6 +-- app/src/main/res/layout/quote_view.xml | 2 +- .../layout/recipient_preference_activity.xml | 2 +- .../registration_lock_reminder_view.xml | 2 +- .../main/res/layout/shared_contact_view.xml | 2 +- .../res/layout/submit_debug_log_activity.xml | 6 +-- app/src/main/res/layout/thumbnail_view.xml | 2 +- .../res/layout/transfer_controls_view.xml | 2 +- .../unidentified_delivery_learn_more.xml | 2 +- .../main/res/layout/unknown_sender_view.xml | 12 ++--- .../res/layout/username_edit_fragment.xml | 4 +- app/src/main/res/layout/video_editor_hud.xml | 2 +- .../main/res/layout/webrtc_call_screen.xml | 4 +- .../res/mipmap-anydpi-v26/ic_launcher.xml | 4 +- app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 5082 -> 2912 bytes .../mipmap-hdpi/ic_launcher_foreground.webp | Bin 4516 -> 0 bytes app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 3468 -> 1846 bytes .../mipmap-mdpi/ic_launcher_foreground.webp | Bin 2666 -> 0 bytes app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 7063 -> 3819 bytes .../mipmap-xhdpi/ic_launcher_foreground.webp | Bin 6646 -> 0 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 10975 -> 5575 bytes .../mipmap-xxhdpi/ic_launcher_foreground.webp | Bin 11682 -> 0 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 15411 -> 7322 bytes .../ic_launcher_foreground.webp | Bin 18246 -> 0 bytes app/src/main/res/values-v21/themes.xml | 2 +- app/src/main/res/values/colors.xml | 13 +---- .../main/res/values/conversation_colors.xml | 6 +-- app/src/main/res/values/core_colors.xml | 15 ++++-- .../main/res/values/registration_styles.xml | 2 +- app/src/main/res/values/styles.xml | 30 ++++++------ app/src/main/res/values/themes.xml | 46 +++++++++--------- 130 files changed, 256 insertions(+), 245 deletions(-) delete mode 100644 app/src/main/res/drawable-hdpi/icon_notification.webp delete mode 100644 app/src/main/res/drawable-hdpi/icon_transparent.webp delete mode 100644 app/src/main/res/drawable-mdpi/icon_notification.webp delete mode 100644 app/src/main/res/drawable-mdpi/icon_transparent.webp delete mode 100644 app/src/main/res/drawable-xhdpi/icon_notification.webp delete mode 100644 app/src/main/res/drawable-xhdpi/icon_transparent.webp delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_notification.webp delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_transparent.webp delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_notification.webp delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_transparent.webp create mode 100644 app/src/main/res/drawable/ic_launcher_foreground.xml create mode 100644 app/src/main/res/drawable/ic_notification.xml delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp delete mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp diff --git a/app/src/main/java/org/thoughtcrime/securesms/ExperienceUpgradeActivity.java b/app/src/main/java/org/thoughtcrime/securesms/ExperienceUpgradeActivity.java index 71f412d8dc..eaa3ee5a4b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/ExperienceUpgradeActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/ExperienceUpgradeActivity.java @@ -270,8 +270,8 @@ public class ExperienceUpgradeActivity extends BaseActionBarActivity !TextSecurePreferences.isPasswordDisabled(context)) { Notification notification = new NotificationCompat.Builder(context, NotificationChannels.OTHER) - .setSmallIcon(R.drawable.icon_notification) - .setColor(context.getResources().getColor(R.color.signal_primary)) + .setSmallIcon(R.drawable.ic_notification) + .setColor(context.getResources().getColor(R.color.core_ultramarine)) .setContentTitle(context.getString(R.string.ExperienceUpgradeActivity_unlock_to_complete_update)) .setContentText(context.getString(R.string.ExperienceUpgradeActivity_please_unlock_signal_to_complete_update)) .setStyle(new NotificationCompat.BigTextStyle().bigText(context.getString(R.string.ExperienceUpgradeActivity_please_unlock_signal_to_complete_update))) @@ -299,8 +299,8 @@ public class ExperienceUpgradeActivity extends BaseActionBarActivity dismissIntent.setAction(DISMISS_ACTION); Notification notification = new NotificationCompat.Builder(context, NotificationChannels.OTHER) - .setSmallIcon(R.drawable.icon_notification) - .setColor(context.getResources().getColor(R.color.signal_primary)) + .setSmallIcon(R.drawable.ic_notification) + .setColor(context.getResources().getColor(R.color.core_ultramarine)) .setContentTitle(context.getString(experienceUpgrade.get().getNotificationTitle())) .setContentText(context.getString(experienceUpgrade.get().getNotificationText())) .setStyle(new NotificationCompat.BigTextStyle().bigText(context.getString(experienceUpgrade.get().getNotificationBigText()))) diff --git a/app/src/main/java/org/thoughtcrime/securesms/InviteActivity.java b/app/src/main/java/org/thoughtcrime/securesms/InviteActivity.java index ab4ab8431f..0885792045 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/InviteActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/InviteActivity.java @@ -175,17 +175,17 @@ public class InviteActivity extends PassphraseRequiredActionBarActivity implemen } private void setPrimaryColorsToolbarForSms() { - primaryToolbar.setBackgroundColor(ContextCompat.getColor(this, R.color.signal_primary)); + primaryToolbar.setBackgroundColor(ContextCompat.getColor(this, R.color.core_ultramarine)); primaryToolbar.getNavigationIcon().setColorFilter(ThemeUtil.getThemedColor(this, R.attr.conversation_subtitle_color), PorterDuff.Mode.SRC_IN); primaryToolbar.setTitleTextColor(ThemeUtil.getThemedColor(this, R.attr.conversation_title_color)); if (Build.VERSION.SDK_INT >= 23) { - getWindow().setStatusBarColor(ContextCompat.getColor(this, R.color.signal_primary)); + getWindow().setStatusBarColor(ContextCompat.getColor(this, R.color.core_ultramarine)); WindowUtil.clearLightStatusBar(getWindow()); } if (Build.VERSION.SDK_INT >= 27) { - getWindow().setNavigationBarColor(ContextCompat.getColor(this, R.color.signal_primary)); + getWindow().setNavigationBarColor(ContextCompat.getColor(this, R.color.core_ultramarine)); WindowUtil.clearLightNavigationBar(getWindow()); } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java b/app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java index 51df05ed26..8a047f0712 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java @@ -238,7 +238,7 @@ public class PassphrasePromptActivity extends PassphraseActivity { EditorInfo.IME_ACTION_DONE); fingerprintPrompt.setImageResource(R.drawable.ic_fingerprint_white_48dp); - fingerprintPrompt.getBackground().setColorFilter(getResources().getColor(R.color.signal_primary), PorterDuff.Mode.SRC_IN); + fingerprintPrompt.getBackground().setColorFilter(getResources().getColor(R.color.core_ultramarine), PorterDuff.Mode.SRC_IN); lockScreenButton.setOnClickListener(v -> resumeScreenLock()); } @@ -358,7 +358,7 @@ public class PassphrasePromptActivity extends PassphraseActivity { handleAuthenticated(); fingerprintPrompt.setImageResource(R.drawable.ic_fingerprint_white_48dp); - fingerprintPrompt.getBackground().setColorFilter(getResources().getColor(R.color.signal_primary), PorterDuff.Mode.SRC_IN); + fingerprintPrompt.getBackground().setColorFilter(getResources().getColor(R.color.core_ultramarine), PorterDuff.Mode.SRC_IN); } }).start(); } @@ -381,7 +381,7 @@ public class PassphrasePromptActivity extends PassphraseActivity { @Override public void onAnimationEnd(Animation animation) { fingerprintPrompt.setImageResource(R.drawable.ic_fingerprint_white_48dp); - fingerprintPrompt.getBackground().setColorFilter(getResources().getColor(R.color.signal_primary), PorterDuff.Mode.SRC_IN); + fingerprintPrompt.getBackground().setColorFilter(getResources().getColor(R.color.core_ultramarine), PorterDuff.Mode.SRC_IN); } @Override diff --git a/app/src/main/java/org/thoughtcrime/securesms/TransportOptions.java b/app/src/main/java/org/thoughtcrime/securesms/TransportOptions.java index d4ed37c42a..5a5b3fae3a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/TransportOptions.java +++ b/app/src/main/java/org/thoughtcrime/securesms/TransportOptions.java @@ -109,7 +109,7 @@ public class TransportOptions { public static @NonNull TransportOption getPushTransportOption(@NonNull Context context) { return new TransportOption(Type.TEXTSECURE, R.drawable.ic_send_lock_24, - context.getResources().getColor(R.color.textsecure_primary), + context.getResources().getColor(R.color.core_ultramarine), context.getString(R.string.ConversationActivity_transport_signal), context.getString(R.string.conversation_activity__type_message_push), new PushCharacterCalculator()); diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java index 30407e2acf..7b07b21229 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java +++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java @@ -235,7 +235,7 @@ public class ContactSelectionListAdapter extends CursorRecyclerViewAdapter { diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java index 5b09be243f..245943f48d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java @@ -1015,7 +1015,7 @@ public class ConversationFragment extends Fragment TooltipPopup.forTarget(requireActivity().findViewById(R.id.menu_context_reply)) .setText(text) .setTextColor(getResources().getColor(R.color.core_white)) - .setBackgroundTint(getResources().getColor(R.color.core_blue)) + .setBackgroundTint(getResources().getColor(R.color.core_ultramarine)) .show(TooltipPopup.POSITION_BELOW); TextSecurePreferences.setHasSeenSwipeToReplyTooltip(requireContext(), true); diff --git a/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java b/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java index 681cf8cf32..6a8a76ff4e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java @@ -108,7 +108,7 @@ public class GiphyActivity extends PassphraseRequiredActionBarActivity } private @ColorInt int getConversationColor() { - return getIntent().getIntExtra(EXTRA_COLOR, ActivityCompat.getColor(this, R.color.signal_primary)); + return getIntent().getIntExtra(EXTRA_COLOR, ActivityCompat.getColor(this, R.color.core_ultramarine)); } @Override diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/FcmRefreshJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/FcmRefreshJob.java index 0dae4d8686..ea2637df41 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/FcmRefreshJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/FcmRefreshJob.java @@ -125,7 +125,7 @@ public class FcmRefreshJob extends BaseJob { PendingIntent pendingIntent = PendingIntent.getActivity(context, 1122, intent, PendingIntent.FLAG_CANCEL_CURRENT); NotificationCompat.Builder builder = new NotificationCompat.Builder(context, NotificationChannels.FAILURES); - builder.setSmallIcon(R.drawable.icon_notification); + builder.setSmallIcon(R.drawable.ic_notification); builder.setLargeIcon(BitmapFactory.decodeResource(context.getResources(), R.drawable.ic_action_warning_red)); builder.setContentTitle(context.getString(R.string.GcmRefreshJob_Permanent_Signal_communication_failure)); diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushDecryptMessageJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushDecryptMessageJob.java index d28ac89d75..4b7bbf72c4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushDecryptMessageJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushDecryptMessageJob.java @@ -137,7 +137,7 @@ public final class PushDecryptMessageJob extends BaseJob { // TODO [greyson] Navigation NotificationManagerCompat.from(context).notify(494949, new NotificationCompat.Builder(context, NotificationChannels.getMessagesChannel(context)) - .setSmallIcon(R.drawable.icon_notification) + .setSmallIcon(R.drawable.ic_notification) .setPriority(NotificationCompat.PRIORITY_HIGH) .setCategory(NotificationCompat.CATEGORY_MESSAGE) .setContentTitle(context.getString(R.string.PushDecryptJob_new_locked_message)) diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java index 8ea39dad91..4b73959e7b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java @@ -308,7 +308,7 @@ public class CameraXFragment extends Fragment implements CameraFragment { TooltipPopup.forTarget(captureButton) .setOnDismissListener(this::neverDisplayVideoRecordingTooltipAgain) - .setBackgroundTint(ContextCompat.getColor(requireContext(), R.color.signal_primary)) + .setBackgroundTint(ContextCompat.getColor(requireContext(), R.color.core_ultramarine)) .setTextColor(ThemeUtil.getThemedColor(requireContext(), R.attr.conversation_title_color)) .setText(R.string.CameraXFragment_tap_for_photo_hold_for_video) .show(displayRotation == Surface.ROTATION_0 || displayRotation == Surface.ROTATION_180 ? TooltipPopup.POSITION_ABOVE : TooltipPopup.POSITION_START); diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java index d04e93588c..d57e7dfb62 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java @@ -727,7 +727,7 @@ public class MediaSendActivity extends PassphraseRequiredActionBarActivity imple case VIEW_ONCE_TOOLTIP: TooltipPopup.forTarget(revealButton) .setText(R.string.MediaSendActivity_tap_here_to_make_this_message_disappear_after_it_is_viewed) - .setBackgroundTint(getResources().getColor(R.color.core_blue)) + .setBackgroundTint(getResources().getColor(R.color.core_ultramarine)) .setTextColor(getResources().getColor(R.color.core_white)) .setOnDismissListener(() -> TextSecurePreferences.setHasSeenViewOnceTooltip(this, true)) .show(TooltipPopup.POSITION_ABOVE); diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/FailedNotificationBuilder.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/FailedNotificationBuilder.java index af0508ffe2..084785932b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/FailedNotificationBuilder.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/FailedNotificationBuilder.java @@ -14,7 +14,7 @@ public class FailedNotificationBuilder extends AbstractNotificationBuilder { public FailedNotificationBuilder(Context context, NotificationPrivacyPreference privacy, Intent intent) { super(context, privacy); - setSmallIcon(R.drawable.icon_notification); + setSmallIcon(R.drawable.ic_notification); setLargeIcon(BitmapFactory.decodeResource(context.getResources(), R.drawable.ic_action_warning_red)); setContentTitle(context.getString(R.string.MessageNotifier_message_delivery_failed)); diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java index 6d6199a2b3..e455b028d8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java @@ -25,8 +25,8 @@ public class MultipleRecipientNotificationBuilder extends AbstractNotificationBu public MultipleRecipientNotificationBuilder(Context context, NotificationPrivacyPreference privacy) { super(context, privacy); - setColor(context.getResources().getColor(R.color.textsecure_primary)); - setSmallIcon(R.drawable.icon_notification); + setColor(context.getResources().getColor(R.color.core_ultramarine)); + setSmallIcon(R.drawable.ic_notification); setContentTitle(context.getString(R.string.app_name)); // TODO [greyson] Navigation setContentIntent(PendingIntent.getActivity(context, 0, new Intent(context, MainActivity.class), 0)); diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/PendingMessageNotificationBuilder.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/PendingMessageNotificationBuilder.java index dcdc9a2b62..9b58e25c78 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/PendingMessageNotificationBuilder.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/PendingMessageNotificationBuilder.java @@ -20,8 +20,8 @@ public class PendingMessageNotificationBuilder extends AbstractNotificationBuild // TODO [greyson] Navigation Intent intent = new Intent(context, MainActivity.class); - setSmallIcon(R.drawable.icon_notification); - setColor(context.getResources().getColor(R.color.textsecure_primary)); + setSmallIcon(R.drawable.ic_notification); + setColor(context.getResources().getColor(R.color.core_ultramarine)); setCategory(NotificationCompat.CATEGORY_MESSAGE); setContentTitle(context.getString(R.string.MessageNotifier_you_may_have_new_messages)); diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java index 228934167e..42f1bc16e1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java @@ -62,8 +62,8 @@ public class SingleRecipientNotificationBuilder extends AbstractNotificationBuil { super(new ContextThemeWrapper(context, R.style.TextSecure_LightTheme), privacy); - setSmallIcon(R.drawable.icon_notification); - setColor(context.getResources().getColor(R.color.textsecure_primary)); + setSmallIcon(R.drawable.ic_notification); + setColor(context.getResources().getColor(R.color.core_ultramarine)); setCategory(NotificationCompat.CATEGORY_MESSAGE); if (!NotificationChannels.supported()) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ContactPreference.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ContactPreference.java index 727e4ae5b0..121ea1de94 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ContactPreference.java +++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ContactPreference.java @@ -68,7 +68,7 @@ public class ContactPreference extends Preference { int color; if (secure) { - color = getContext().getResources().getColor(R.color.textsecure_primary); + color = getContext().getResources().getColor(R.color.core_ultramarine); } else { color = getContext().getResources().getColor(R.color.grey_600); } diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/ApplicationMigrationService.java b/app/src/main/java/org/thoughtcrime/securesms/service/ApplicationMigrationService.java index 2ac6442db5..44b7b36655 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/ApplicationMigrationService.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/ApplicationMigrationService.java @@ -128,8 +128,8 @@ public class ApplicationMigrationService extends Service private NotificationCompat.Builder initializeBackgroundNotification() { NotificationCompat.Builder builder = new NotificationCompat.Builder(this, NotificationChannels.OTHER); - builder.setSmallIcon(R.drawable.icon_notification); - builder.setLargeIcon(BitmapFactory.decodeResource(getResources(), R.drawable.icon_notification)); + builder.setSmallIcon(R.drawable.ic_notification); + builder.setLargeIcon(BitmapFactory.decodeResource(getResources(), R.drawable.ic_notification)); builder.setContentTitle(getString(R.string.ApplicationMigrationService_importing_text_messages)); builder.setContentText(getString(R.string.ApplicationMigrationService_import_in_progress)); builder.setOngoing(true); @@ -183,7 +183,7 @@ public class ApplicationMigrationService extends Service @Override public void onReceive(Context context, Intent intent) { NotificationCompat.Builder builder = new NotificationCompat.Builder(context, NotificationChannels.OTHER); - builder.setSmallIcon(R.drawable.icon_notification); + builder.setSmallIcon(R.drawable.ic_notification); builder.setContentTitle(context.getString(R.string.ApplicationMigrationService_import_complete)); builder.setContentText(context.getString(R.string.ApplicationMigrationService_system_database_import_is_complete)); // TODO [greyson] Navigation diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java b/app/src/main/java/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java index e1d1f7280d..5406c9c5d8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java @@ -67,8 +67,8 @@ public class UpdateApkReadyListener extends BroadcastReceiver { .setOngoing(true) .setContentTitle(context.getString(R.string.UpdateApkReadyListener_Signal_update)) .setContentText(context.getString(R.string.UpdateApkReadyListener_a_new_version_of_signal_is_available_tap_to_update)) - .setSmallIcon(R.drawable.icon_notification) - .setColor(context.getResources().getColor(R.color.textsecure_primary)) + .setSmallIcon(R.drawable.ic_notification) + .setColor(context.getResources().getColor(R.color.core_ultramarine)) .setPriority(NotificationCompat.PRIORITY_HIGH) .setCategory(NotificationCompat.CATEGORY_REMINDER) .setContentIntent(pendingIntent) diff --git a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java index 2886689ef5..b602eb09f5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java +++ b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java @@ -302,7 +302,7 @@ final class StickerManagementAdapter extends SectionedRecyclerViewAdapter - + \ No newline at end of file diff --git a/app/src/main/res/color/help_fragment_next_light.xml b/app/src/main/res/color/help_fragment_next_light.xml index 6ecdc9eb3c..84421ed12b 100644 --- a/app/src/main/res/color/help_fragment_next_light.xml +++ b/app/src/main/res/color/help_fragment_next_light.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable-hdpi/icon_notification.webp b/app/src/main/res/drawable-hdpi/icon_notification.webp deleted file mode 100644 index 819e144ff103d0afa6c611d27555c5e51c47659a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 676 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 M)HSM$1iWnr0C2kg5C8xG diff --git a/app/src/main/res/drawable-mdpi/icon_notification.webp b/app/src/main/res/drawable-mdpi/icon_notification.webp deleted file mode 100644 index 76e4af9b988d5c60f15c3089098a74a1f7976823..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 412 zcmV;N0b~ABNk&GL0RRA3MM6+kP&iD80RR9m7r+G&kA$FY+n7J;Yi)H5^FRLx)3$A{ zcG7N&+_r6y+iK}=VBUZfL;-~T03hH~f#8=@Q1^;L(86lOg$NN?#!zAl>-sokWr3V3 zXmr>k*$C}pCtml)7Qh7p$sPv+2$Ce5w))w&ZTo%Owr$(Can}5Bwh+<(2|#gEOTP7b zGcw$!NBN@Z%ZB=^h2Z*i7pELnXUj|mh3tI&_zy&Z1G)p`tCJxd(H)|$YiAkTbenj7x_LoAT?e-2YTDqZ`d4eKZHC?o zY|%91xQ!$3`4SmE%3DL~QwK0tst|lHXBeIVKLD@>hpLamLR8 diff --git a/app/src/main/res/drawable-mdpi/icon_transparent.webp b/app/src/main/res/drawable-mdpi/icon_transparent.webp deleted file mode 100644 index 2e92a8b495bf1899a8f3b2d7c232c0d778d160d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2940 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 - + diff --git a/app/src/main/res/drawable-v21/conversation_list_item_background.xml b/app/src/main/res/drawable-v21/conversation_list_item_background.xml index 642879178e..6ef38ac5e1 100644 --- a/app/src/main/res/drawable-v21/conversation_list_item_background.xml +++ b/app/src/main/res/drawable-v21/conversation_list_item_background.xml @@ -1,10 +1,10 @@ + android:color="@color/core_ultramarine"> - + diff --git a/app/src/main/res/drawable-v21/conversation_list_item_background_dark.xml b/app/src/main/res/drawable-v21/conversation_list_item_background_dark.xml index 642879178e..6ef38ac5e1 100644 --- a/app/src/main/res/drawable-v21/conversation_list_item_background_dark.xml +++ b/app/src/main/res/drawable-v21/conversation_list_item_background_dark.xml @@ -1,10 +1,10 @@ + android:color="@color/core_ultramarine"> - + diff --git a/app/src/main/res/drawable-v21/cta_button_background.xml b/app/src/main/res/drawable-v21/cta_button_background.xml index faa6232f9d..059e9cc259 100644 --- a/app/src/main/res/drawable-v21/cta_button_background.xml +++ b/app/src/main/res/drawable-v21/cta_button_background.xml @@ -1,18 +1,18 @@ + android:color="@color/core_ultramarine"> - + - + diff --git a/app/src/main/res/drawable-v21/media_continue_button_background.xml b/app/src/main/res/drawable-v21/media_continue_button_background.xml index bc0ce271cb..df91cfd220 100644 --- a/app/src/main/res/drawable-v21/media_continue_button_background.xml +++ b/app/src/main/res/drawable-v21/media_continue_button_background.xml @@ -11,7 +11,7 @@ - + diff --git a/app/src/main/res/drawable-xhdpi/icon_notification.webp b/app/src/main/res/drawable-xhdpi/icon_notification.webp deleted file mode 100644 index 67529804f1039a308ec9acec3182916d2eccf535..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 858 zcmV-g1Eu^@Nk&Fe0{{S5MM6+kP&iCQ0{{RoFTe{BzowvV8!7xr-HqR5+unsZL6Mb+qV6_ZQHhO+qP}nwto-k>YOuzi2hFi21Zc7+LnG;8DL1uXPQksMz)t8HX6`JI#7&lY}>Ibb{{^tbLp5iu{M;S zkox+#vQ(M^;MQT!8#(!AcLz6snNqYXr+@bVs6Q*0&(;IxOr8vs`1sgFgoHr)Z?pbpga3uSK;GwBz+#!c91^5dVkc=A zguXZLT?nk!u<)+u)Dzmtf-Rtr_P1W}UwJUg3R9p=T6J3g;$fQ=)u)3+w8Ack|DkQ$^(zThSYa*{ z>c^~w|CIwHtk4Sv>U5|6x77_QEbuK3R%lF2!CH+2zo+Ky0)mDnLUsptV3v91P(8&T zAbxlpr2I5%HE>0JZMJF#FxsRS{?I~iLu~5x)*n2toARd)yzgoVb`NMd5dXl8mcVXZ zbhDTHTm6CjSBCxQ2(agUArAZhwITVnK^Jp@u2Vx2aWW@!UYE2t z9b>&h0D?Q8ksf=jest@({zR_R%O#Z<-Ti562zn^p-#pCyhV=jImCUFXffzqs#~1Go kICHPJ9}ruVofv`12|uL&sh(a~caJt?dST_hhib4Q0NOgI-~a#s diff --git a/app/src/main/res/drawable-xhdpi/icon_transparent.webp b/app/src/main/res/drawable-xhdpi/icon_transparent.webp deleted file mode 100644 index 13fcd84183b2f6187b13bcf7934f269e81436934..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6658 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 YT(uZ`R?&YKD0rmt|G=QkTU)9tnpD1fQvd(} diff --git a/app/src/main/res/drawable-xxhdpi/icon_transparent.webp b/app/src/main/res/drawable-xxhdpi/icon_transparent.webp deleted file mode 100644 index 044d8a15b597cfd02d645c6eb126fdd144ddd340..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11572 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 diff --git a/app/src/main/res/drawable-xxxhdpi/icon_notification.webp b/app/src/main/res/drawable-xxxhdpi/icon_notification.webp deleted file mode 100644 index 9011939c36dd02c9b00cfbac76025ff17293cd28..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1684 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�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 - + \ No newline at end of file diff --git a/app/src/main/res/drawable/conversation_item_background.xml b/app/src/main/res/drawable/conversation_item_background.xml index d4cbc9d842..31d6730d5f 100644 --- a/app/src/main/res/drawable/conversation_item_background.xml +++ b/app/src/main/res/drawable/conversation_item_background.xml @@ -1,5 +1,5 @@ - - + + diff --git a/app/src/main/res/drawable/conversation_item_background_animated.xml b/app/src/main/res/drawable/conversation_item_background_animated.xml index 3664c2a1d7..0116af86c6 100644 --- a/app/src/main/res/drawable/conversation_item_background_animated.xml +++ b/app/src/main/res/drawable/conversation_item_background_animated.xml @@ -1,5 +1,5 @@ - - + + diff --git a/app/src/main/res/drawable/conversation_list_item_background.xml b/app/src/main/res/drawable/conversation_list_item_background.xml index 92908acc6a..2b88d4b9cb 100644 --- a/app/src/main/res/drawable/conversation_list_item_background.xml +++ b/app/src/main/res/drawable/conversation_list_item_background.xml @@ -1,6 +1,6 @@ - - - + + + diff --git a/app/src/main/res/drawable/conversation_list_item_background_dark.xml b/app/src/main/res/drawable/conversation_list_item_background_dark.xml index 92908acc6a..2b88d4b9cb 100644 --- a/app/src/main/res/drawable/conversation_list_item_background_dark.xml +++ b/app/src/main/res/drawable/conversation_list_item_background_dark.xml @@ -1,6 +1,6 @@ - - - + + + diff --git a/app/src/main/res/drawable/cta_button_background.xml b/app/src/main/res/drawable/cta_button_background.xml index 4695736fd2..44e80001f2 100644 --- a/app/src/main/res/drawable/cta_button_background.xml +++ b/app/src/main/res/drawable/cta_button_background.xml @@ -3,13 +3,13 @@ - + - + \ No newline at end of file diff --git a/app/src/main/res/drawable/help_fragment_emoji_radio_background_dark.xml b/app/src/main/res/drawable/help_fragment_emoji_radio_background_dark.xml index d6f235e65f..9145b1ce56 100644 --- a/app/src/main/res/drawable/help_fragment_emoji_radio_background_dark.xml +++ b/app/src/main/res/drawable/help_fragment_emoji_radio_background_dark.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/res/drawable/help_fragment_emoji_radio_background_light.xml b/app/src/main/res/drawable/help_fragment_emoji_radio_background_light.xml index c648a10f86..ce03a64abf 100644 --- a/app/src/main/res/drawable/help_fragment_emoji_radio_background_light.xml +++ b/app/src/main/res/drawable/help_fragment_emoji_radio_background_light.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/res/drawable/ic_check_circle_solid_20.xml b/app/src/main/res/drawable/ic_check_circle_solid_20.xml index 5e5b0a250a..9a0af2a0bb 100644 --- a/app/src/main/res/drawable/ic_check_circle_solid_20.xml +++ b/app/src/main/res/drawable/ic_check_circle_solid_20.xml @@ -4,7 +4,7 @@ android:viewportWidth="20" android:viewportHeight="20"> + android:fillColor="@color/core_ultramarine"/> diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000000..b59070865f --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,11 @@ + + + diff --git a/app/src/main/res/drawable/ic_map_marker.xml b/app/src/main/res/drawable/ic_map_marker.xml index 29967a6390..a2c1b00d83 100644 --- a/app/src/main/res/drawable/ic_map_marker.xml +++ b/app/src/main/res/drawable/ic_map_marker.xml @@ -4,6 +4,6 @@ android:viewportWidth="438.536" android:viewportHeight="438.536"> diff --git a/app/src/main/res/drawable/ic_notification.xml b/app/src/main/res/drawable/ic_notification.xml new file mode 100644 index 0000000000..b6be281331 --- /dev/null +++ b/app/src/main/res/drawable/ic_notification.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_send_lock_24.xml b/app/src/main/res/drawable/ic_send_lock_24.xml index 3e61677967..23f5573e8a 100644 --- a/app/src/main/res/drawable/ic_send_lock_24.xml +++ b/app/src/main/res/drawable/ic_send_lock_24.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_send_unlock_24.xml b/app/src/main/res/drawable/ic_send_unlock_24.xml index cedd90d5f4..9632084904 100644 --- a/app/src/main/res/drawable/ic_send_unlock_24.xml +++ b/app/src/main/res/drawable/ic_send_unlock_24.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_share_outline_24.xml b/app/src/main/res/drawable/ic_share_outline_24.xml index e0d004e64b..3018fe04d5 100644 --- a/app/src/main/res/drawable/ic_share_outline_24.xml +++ b/app/src/main/res/drawable/ic_share_outline_24.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_share_solid_24.xml b/app/src/main/res/drawable/ic_share_solid_24.xml index 75a92502b7..06458017ca 100644 --- a/app/src/main/res/drawable/ic_share_solid_24.xml +++ b/app/src/main/res/drawable/ic_share_solid_24.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/info_round.xml b/app/src/main/res/drawable/info_round.xml index 668eaf3bee..4dc3e2fadc 100644 --- a/app/src/main/res/drawable/info_round.xml +++ b/app/src/main/res/drawable/info_round.xml @@ -10,7 +10,7 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/insights_cta_button_background.xml b/app/src/main/res/drawable/insights_cta_button_background.xml index 5d8a5c7ee1..8992c530ee 100644 --- a/app/src/main/res/drawable/insights_cta_button_background.xml +++ b/app/src/main/res/drawable/insights_cta_button_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/labeled_edit_text_background_active.xml b/app/src/main/res/drawable/labeled_edit_text_background_active.xml index 00a2dc992e..3bb9c5f1a1 100644 --- a/app/src/main/res/drawable/labeled_edit_text_background_active.xml +++ b/app/src/main/res/drawable/labeled_edit_text_background_active.xml @@ -7,7 +7,7 @@ diff --git a/app/src/main/res/drawable/media_continue_button_background.xml b/app/src/main/res/drawable/media_continue_button_background.xml index f612f8c4f3..7bcb1e9d44 100644 --- a/app/src/main/res/drawable/media_continue_button_background.xml +++ b/app/src/main/res/drawable/media_continue_button_background.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/media_count_button_background.xml b/app/src/main/res/drawable/media_count_button_background.xml index be4d965cfc..febeaab9f7 100644 --- a/app/src/main/res/drawable/media_count_button_background.xml +++ b/app/src/main/res/drawable/media_count_button_background.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/res/drawable/mediarail_media_outline.xml b/app/src/main/res/drawable/mediarail_media_outline.xml index 8b6e4ec97f..54e19058e8 100644 --- a/app/src/main/res/drawable/mediarail_media_outline.xml +++ b/app/src/main/res/drawable/mediarail_media_outline.xml @@ -4,5 +4,5 @@ + android:color="@color/core_ultramarine"/> \ No newline at end of file diff --git a/app/src/main/res/drawable/pill.xml b/app/src/main/res/drawable/pill.xml index be4d965cfc..febeaab9f7 100644 --- a/app/src/main/res/drawable/pill.xml +++ b/app/src/main/res/drawable/pill.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/res/drawable/progress_button_state.xml b/app/src/main/res/drawable/progress_button_state.xml index 7e6bcc024a..1db6b41dc0 100644 --- a/app/src/main/res/drawable/progress_button_state.xml +++ b/app/src/main/res/drawable/progress_button_state.xml @@ -1,11 +1,11 @@ + android:color="@color/core_ultramarine"/> + android:color="@color/core_ultramarine"/> + android:color="@color/core_ultramarine"/> + android:color="@color/core_ultramarine"/> \ No newline at end of file diff --git a/app/src/main/res/drawable/read_receipt_vector.xml b/app/src/main/res/drawable/read_receipt_vector.xml index 8184b984ea..7e9f8f6031 100644 --- a/app/src/main/res/drawable/read_receipt_vector.xml +++ b/app/src/main/res/drawable/read_receipt_vector.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/reminder_background_normal.xml b/app/src/main/res/drawable/reminder_background_normal.xml index 349f949c23..45628500ee 100644 --- a/app/src/main/res/drawable/reminder_background_normal.xml +++ b/app/src/main/res/drawable/reminder_background_normal.xml @@ -1,6 +1,6 @@ - - - + + + diff --git a/app/src/main/res/drawable/touch_highlight_background.xml b/app/src/main/res/drawable/touch_highlight_background.xml index 8089a02808..b5a98171b8 100644 --- a/app/src/main/res/drawable/touch_highlight_background.xml +++ b/app/src/main/res/drawable/touch_highlight_background.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/drawable/unread_count_background_dark.xml b/app/src/main/res/drawable/unread_count_background_dark.xml index 8666e43f67..ddaf847ecc 100644 --- a/app/src/main/res/drawable/unread_count_background_dark.xml +++ b/app/src/main/res/drawable/unread_count_background_dark.xml @@ -5,7 +5,7 @@ - + - + diff --git a/app/src/main/res/layout/activity_shared_contact_details.xml b/app/src/main/res/layout/activity_shared_contact_details.xml index 38f3afd8dc..33c73f92ff 100644 --- a/app/src/main/res/layout/activity_shared_contact_details.xml +++ b/app/src/main/res/layout/activity_shared_contact_details.xml @@ -97,14 +97,14 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="6dp" - android:tint="@color/signal_primary" + android:tint="@color/core_ultramarine" android:src="@drawable/message_24dp"/> + android:textColor="@color/core_ultramarine"/> @@ -121,14 +121,14 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="6dp" - android:tint="@color/signal_primary" + android:tint="@color/core_ultramarine" android:src="@drawable/phone_24dp"/> + android:textColor="@color/core_ultramarine"/> diff --git a/app/src/main/res/layout/base_kbs_pin_fragment.xml b/app/src/main/res/layout/base_kbs_pin_fragment.xml index 5d31925f06..8acfc0533c 100644 --- a/app/src/main/res/layout/base_kbs_pin_fragment.xml +++ b/app/src/main/res/layout/base_kbs_pin_fragment.xml @@ -88,7 +88,6 @@ android:layout_height="wrap_content" android:layout_marginStart="32dp" android:layout_marginEnd="32dp" - android:textColor="@color/signal_primary" app:layout_constraintTop_toBottomOf="@id/edit_kbs_pin_input_label" app:layout_constraintBottom_toTopOf="@id/edit_kbs_pin_confirm" app:layout_constraintVertical_bias="1.0" diff --git a/app/src/main/res/layout/color_fragment.xml b/app/src/main/res/layout/color_fragment.xml index de2f5f2ed6..a069e491f8 100644 --- a/app/src/main/res/layout/color_fragment.xml +++ b/app/src/main/res/layout/color_fragment.xml @@ -4,7 +4,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - tools:background="#FF2090ea"> + tools:background="@color/core_ultramarine"> @@ -84,7 +84,7 @@ android:layout_height="wrap_content" android:layout_marginTop="20dp" android:layout_gravity="center_horizontal" - android:background="@color/signal_primary" + style="@style/Button.Primary" android:textColor="@color/white" android:padding="10dp" android:text="@string/contact_selection_list_fragment__show_contacts"/> diff --git a/app/src/main/res/layout/conversation_search_nav.xml b/app/src/main/res/layout/conversation_search_nav.xml index e3d97456d7..5ceab13471 100644 --- a/app/src/main/res/layout/conversation_search_nav.xml +++ b/app/src/main/res/layout/conversation_search_nav.xml @@ -34,7 +34,7 @@ android:background="?selectableItemBackgroundBorderless" android:padding="8dp" android:src="@drawable/ic_keyboard_arrow_up_white_36dp" - android:tint="@color/signal_primary" + android:tint="@color/core_ultramarine" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/conversation_search_down" app:layout_constraintTop_toTopOf="parent" /> @@ -49,7 +49,7 @@ android:background="?selectableItemBackgroundBorderless" android:padding="8dp" android:src="@drawable/ic_keyboard_arrow_down_white_24dp" - android:tint="@color/signal_primary" + android:tint="@color/core_ultramarine" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/create_passphrase_activity.xml b/app/src/main/res/layout/create_passphrase_activity.xml index fbffc48422..4ef7856041 100644 --- a/app/src/main/res/layout/create_passphrase_activity.xml +++ b/app/src/main/res/layout/create_passphrase_activity.xml @@ -1,27 +1,29 @@ + - + - - - - + diff --git a/app/src/main/res/layout/device_list_fragment.xml b/app/src/main/res/layout/device_list_fragment.xml index 163b1b5865..82e6c8c690 100644 --- a/app/src/main/res/layout/device_list_fragment.xml +++ b/app/src/main/res/layout/device_list_fragment.xml @@ -52,7 +52,7 @@ android:focusable="true" android:contentDescription="@string/device_list_fragment__link_new_device" fab:fab_colorNormal="?fab_color" - fab:fab_colorPressed="@color/textsecure_primary_dark" - fab:fab_colorRipple="@color/textsecure_primary_dark" /> + fab:fab_colorPressed="@color/core_ultramarine_dark" + fab:fab_colorRipple="@color/core_ultramarine_dark" /> \ No newline at end of file diff --git a/app/src/main/res/layout/experience_upgrade_link_previews_fragment.xml b/app/src/main/res/layout/experience_upgrade_link_previews_fragment.xml index 8a9812a527..d39b1a5851 100644 --- a/app/src/main/res/layout/experience_upgrade_link_previews_fragment.xml +++ b/app/src/main/res/layout/experience_upgrade_link_previews_fragment.xml @@ -5,7 +5,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:background="#FF2090ea"> + tools:background="@color/core_ultramarine"> + tools:background="@color/core_ultramarine"> + tools:background="@color/core_ultramarine"> + android:tint="@color/core_ultramarine" /> + app:backgroundTint="@color/core_ultramarine_dark" /> diff --git a/app/src/main/res/layout/fragment_registration_blank.xml b/app/src/main/res/layout/fragment_registration_blank.xml index af7599fad4..e24c3b5a5b 100644 --- a/app/src/main/res/layout/fragment_registration_blank.xml +++ b/app/src/main/res/layout/fragment_registration_blank.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/signal_primary"> + android:background="@color/core_ultramarine"> @@ -79,7 +79,6 @@ android:layout_height="wrap_content" android:layout_marginStart="32dp" android:layout_marginEnd="32dp" - android:textColor="@color/signal_primary" app:layout_constraintBottom_toTopOf="@id/kbs_lock_pin_confirm" app:layout_constraintTop_toBottomOf="@id/kbs_lock_forgot_pin" app:layout_constraintVertical_bias="1.0" diff --git a/app/src/main/res/layout/fragment_registration_welcome.xml b/app/src/main/res/layout/fragment_registration_welcome.xml index 3af1a43222..4d1ce5459b 100644 --- a/app/src/main/res/layout/fragment_registration_welcome.xml +++ b/app/src/main/res/layout/fragment_registration_welcome.xml @@ -35,7 +35,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="24dp" android:text="@string/RegistrationActivity_terms_and_privacy" - android:textColor="@color/signal_primary" + android:textColor="@color/core_ultramarine" app:layout_constraintBottom_toTopOf="@+id/welcome_continue_button" app:layout_constraintEnd_toEndOf="@+id/welcome_continue_button" app:layout_constraintStart_toStartOf="@+id/welcome_continue_button" /> diff --git a/app/src/main/res/layout/fragment_registration_welcome_rereg.xml b/app/src/main/res/layout/fragment_registration_welcome_rereg.xml index af7599fad4..e24c3b5a5b 100644 --- a/app/src/main/res/layout/fragment_registration_welcome_rereg.xml +++ b/app/src/main/res/layout/fragment_registration_welcome_rereg.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/signal_primary"> + android:background="@color/core_ultramarine"> diff --git a/app/src/main/res/layout/insights_dashboard_adapter_item.xml b/app/src/main/res/layout/insights_dashboard_adapter_item.xml index 5409c23717..43aaa18dcb 100644 --- a/app/src/main/res/layout/insights_dashboard_adapter_item.xml +++ b/app/src/main/res/layout/insights_dashboard_adapter_item.xml @@ -39,7 +39,6 @@ android:paddingEnd="16dp" android:text="@string/conversation_insecure__invite" android:textAppearance="@style/TextAppearance.Signal.Caption.Insights" - android:textColor="@color/signal_primary" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/invite_activity.xml b/app/src/main/res/layout/invite_activity.xml index 170b5f4b2c..4894008fbb 100644 --- a/app/src/main/res/layout/invite_activity.xml +++ b/app/src/main/res/layout/invite_activity.xml @@ -96,7 +96,7 @@ android:layout_height="?attr/actionBarSize" android:layout_width="match_parent" android:minHeight="?attr/actionBarSize" - android:background="@color/signal_primary" + android:background="@color/core_ultramarine" android:elevation="4dp" app:searchTextStyle="@style/TextSecure.TitleTextStyle.Light" /> @@ -120,8 +120,7 @@ android:text="@string/InviteActivity_cancel" />