blallo
/
Signal-Android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update icons and colors.

master
Greyson Parrelli 2020-03-04 08:14:21 -05:00
parent a62183c9e0
commit df4422369d
130 changed files with 256 additions and 245 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/thoughtcrime/securesms/ExperienceUpgradeActivity.java
View File

@ -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())))

6
app/src/main/java/org/thoughtcrime/securesms/InviteActivity.java
View File

@ -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());
}
}

6
app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java
View File

@ -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

2
app/src/main/java/org/thoughtcrime/securesms/TransportOptions.java
View File

@ -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());

2
app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java
View File

@ -235,7 +235,7 @@ public class ContactSelectionListAdapter extends CursorRecyclerViewAdapter<ViewH
final String headerString = getHeaderString(position);
if (isPush(position)) {
SpannableString spannable = new SpannableString(headerString);
spannable.setSpan(new ForegroundColorSpan(getContext().getResources().getColor(R.color.signal_primary)), 0, headerString.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
spannable.setSpan(new ForegroundColorSpan(getContext().getResources().getColor(R.color.core_ultramarine)), 0, headerString.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
return spannable;
} else {
return headerString;

2
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
View File

@ -1787,7 +1787,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
inputPanel.setMediaKeyboardToggleMode(true);
TooltipPopup.forTarget(inputPanel.getMediaKeyboardToggleAnchorView())
.setBackgroundTint(getResources().getColor(R.color.core_blue))
.setBackgroundTint(getResources().getColor(R.color.core_ultramarine))
.setTextColor(getResources().getColor(R.color.core_white))
.setText(R.string.ConversationActivity_new_say_it_with_stickers)
.setOnDismissListener(() -> {

2
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
View File

@ -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);

2
app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java
View File

@ -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

2
app/src/main/java/org/thoughtcrime/securesms/jobs/FcmRefreshJob.java
View File

@ -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));

2
app/src/main/java/org/thoughtcrime/securesms/jobs/PushDecryptMessageJob.java
View File

@ -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))

2
app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java
View File

@ -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);

2
app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
View File

@ -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);

2
app/src/main/java/org/thoughtcrime/securesms/notifications/FailedNotificationBuilder.java
View File

@ -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));

4
app/src/main/java/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java
View File

@ -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));

4
app/src/main/java/org/thoughtcrime/securesms/notifications/PendingMessageNotificationBuilder.java
View File

@ -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));

4
app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java
View File

@ -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()) {

2
app/src/main/java/org/thoughtcrime/securesms/preferences/widgets/ContactPreference.java
View File

@ -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);
}

6
app/src/main/java/org/thoughtcrime/securesms/service/ApplicationMigrationService.java
View File

@ -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

4
app/src/main/java/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java
View File

@ -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)

2
app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java
View File

@ -302,7 +302,7 @@ final class StickerManagementAdapter extends SectionedRecyclerViewAdapter<String
Drawable badge = ContextCompat.getDrawable(context, R.drawable.ic_check_circle_white_18dp);
badge.setBounds(0, 0, badge.getIntrinsicWidth(), badge.getIntrinsicHeight());
badge.setColorFilter(ContextCompat.getColor(context, R.color.core_blue), PorterDuff.Mode.MULTIPLY);
badge.setColorFilter(ContextCompat.getColor(context, R.color.core_ultramarine), PorterDuff.Mode.MULTIPLY);
badgeSpan.setSpan(new ImageSpan(badge), 1, badgeSpan.length(), 0);
return badgeSpan;

2
app/src/main/res/color/help_fragment_next_dark.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/signal_primary" android:state_enabled="true" />
<item android:color="@color/core_ultramarine" android:state_enabled="true" />
<item android:color="@color/core_grey_75" />
</selector>

2
app/src/main/res/color/help_fragment_next_light.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/signal_primary" android:state_enabled="true" />
<item android:color="@color/core_ultramarine" android:state_enabled="true" />
<item android:color="@color/core_grey_25" />
</selector>

BIN
app/src/main/res/drawable-hdpi/icon_notification.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 676 B

BIN
app/src/main/res/drawable-hdpi/icon_transparent.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.5 KiB

BIN
app/src/main/res/drawable-mdpi/icon_notification.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 412 B

BIN
app/src/main/res/drawable-mdpi/icon_transparent.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.9 KiB

2
app/src/main/res/drawable-v21/camera_send_button_background.xml
View File

@ -11,7 +11,7 @@
<item>
<shape android:shape="oval" >
<solid android:color="@color/signal_primary"/>
<solid android:color="@color/core_ultramarine"/>
</shape>
</item>
</ripple>

4
app/src/main/res/drawable-v21/conversation_list_item_background.xml
View File

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/textsecure_primary">
android:color="@color/core_ultramarine">
<item android:id="@android:id/mask" android:drawable="@android:color/black" />
<item>
<selector>
<item android:drawable="@color/textsecure_primary_alpha33" android:state_selected="true" />
<item android:drawable="@color/core_ultramarine_33" android:state_selected="true" />
</selector>
</item>
</ripple>

4
app/src/main/res/drawable-v21/conversation_list_item_background_dark.xml
View File

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/textsecure_primary">
android:color="@color/core_ultramarine">
<item android:id="@android:id/mask" android:drawable="@android:color/black" />
<item>
<selector>
<item android:drawable="@color/textsecure_primary_alpha33" android:state_selected="true" />
<item android:drawable="@color/core_ultramarine_33" android:state_selected="true" />
</selector>
</item>
</ripple>

6
app/src/main/res/drawable-v21/cta_button_background.xml
View File

@ -1,18 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/signal_primary_dark">
android:color="@color/core_ultramarine">
<item android:id="@android:id/mask">
<shape android:shape="rectangle">
<corners android:radius="4dp" />
<solid android:color="@color/signal_primary_dark" />
<solid android:color="@color/core_ultramarine_dark" />
</shape>
</item>
<item android:id="@android:id/background">
<shape android:shape="rectangle">
<corners android:radius="4dp" />
<solid android:color="@color/signal_primary" />
<solid android:color="@color/core_ultramarine" />
</shape>
</item>

2
app/src/main/res/drawable-v21/media_continue_button_background.xml
View File

@ -11,7 +11,7 @@
<item>
<shape android:shape="oval" >
<solid android:color="@color/signal_primary"/>
<solid android:color="@color/core_ultramarine"/>
</shape>
</item>
</ripple>

BIN
app/src/main/res/drawable-xhdpi/icon_notification.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 858 B

BIN
app/src/main/res/drawable-xhdpi/icon_transparent.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.5 KiB

BIN
app/src/main/res/drawable-xxhdpi/icon_notification.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
app/src/main/res/drawable-xxhdpi/icon_transparent.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 11 KiB

BIN
app/src/main/res/drawable-xxxhdpi/icon_notification.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.6 KiB

BIN
app/src/main/res/drawable-xxxhdpi/icon_transparent.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 15 KiB

2
app/src/main/res/drawable/camera_send_button_background.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval" >
<solid android:color="@color/signal_primary"/>
<solid android:color="@color/core_ultramarine"/>
</shape>

4
app/src/main/res/drawable/conversation_item_background.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/textsecure_primary_alpha33" android:state_selected="true" />
<item android:drawable="@color/signal_primary_alpha_focus" android:state_focused="true" />
<item android:drawable="@color/core_ultramarine_33" android:state_selected="true" />
<item android:drawable="@color/core_ultramarine_50" android:state_focused="true" />
</selector>

4
app/src/main/res/drawable/conversation_item_background_animated.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" android:exitFadeDuration="1000">
<item android:drawable="@color/textsecure_primary_alpha33" android:state_selected="true" />
<item android:drawable="@color/signal_primary_alpha_focus" android:state_focused="true" />
<item android:drawable="@color/core_ultramarine_33" android:state_selected="true" />
<item android:drawable="@color/core_ultramarine_50" android:state_focused="true" />
</selector>

6
app/src/main/res/drawable/conversation_list_item_background.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/textsecure_primary_alpha33" android:state_selected="true" />
<item android:drawable="@color/textsecure_primary_alpha33" android:state_pressed="true" />
<item android:drawable="@color/signal_primary_alpha_focus" android:state_focused="true" />
<item android:drawable="@color/core_ultramarine_33" android:state_selected="true" />
<item android:drawable="@color/core_ultramarine_33" android:state_pressed="true" />
<item android:drawable="@color/core_ultramarine_50" android:state_focused="true" />
</selector>

6
app/src/main/res/drawable/conversation_list_item_background_dark.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/textsecure_primary_alpha33" android:state_selected="true" />
<item android:drawable="@color/textsecure_primary_alpha33" android:state_pressed="true" />
<item android:drawable="@color/signal_primary_alpha_focus" android:state_focused="true" />
<item android:drawable="@color/core_ultramarine_33" android:state_selected="true" />
<item android:drawable="@color/core_ultramarine_33" android:state_pressed="true" />
<item android:drawable="@color/core_ultramarine_50" android:state_focused="true" />
</selector>

4
app/src/main/res/drawable/cta_button_background.xml
View File

@ -3,13 +3,13 @@
<item android:state_pressed="true">
<shape android:shape="rectangle">
<corners android:radius="4dp" />
<solid android:color="@color/signal_primary_dark" />
<solid android:color="@color/core_ultramarine_dark" />
</shape>
</item>
<item>
<shape android:shape="rectangle">
<corners android:radius="4dp" />
<solid android:color="@color/signal_primary" />
<solid android:color="@color/core_ultramarine" />
</shape>
</item>
</selector>

2
app/src/main/res/drawable/help_fragment_emoji_radio_background_dark.xml
View File

@ -2,7 +2,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true">
<shape android:shape="oval">
<solid android:color="@color/signal_primary" />
<solid android:color="@color/core_ultramarine" />
</shape>
</item>
<item>

2
app/src/main/res/drawable/help_fragment_emoji_radio_background_light.xml
View File

@ -2,7 +2,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true">
<shape android:shape="oval">
<solid android:color="@color/signal_primary" />
<solid android:color="@color/core_ultramarine" />
</shape>
</item>
<item>

2
app/src/main/res/drawable/ic_check_circle_solid_20.xml
View File

@ -4,7 +4,7 @@
android:viewportWidth="20"
android:viewportHeight="20">
<path
android:fillColor="@color/core_blue"
android:fillColor="@color/core_ultramarine"
android:pathData="M10,10m-9,0a9,9 0,1 1,18 0a9,9 0,1 1,-18 0" />
<path
android:fillColor="@color/core_white"

2
app/src/main/res/drawable/ic_kbs_splash_light_svg.xml
View File

File diff suppressed because one or more lines are too long

11
app/src/main/res/drawable/ic_launcher_foreground.xml 100644
View File

File diff suppressed because one or more lines are too long

2
app/src/main/res/drawable/ic_map_marker.xml
View File

File diff suppressed because one or more lines are too long

9
app/src/main/res/drawable/ic_notification.xml 100644
View File

File diff suppressed because one or more lines are too long

2
app/src/main/res/drawable/ic_send_lock_24.xml
View File

@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@color/signal_primary"
android:fillColor="@color/core_ultramarine"
android:pathData="M12.694,18.461 L5.286,22.694A1.25,1.25 0,0 1,3.433 21.4L4.69,13.862 14,12 4.69,10.138 3.433,2.6A1.25,1.25 0,0 1,5.286 1.306L22.1,10.915a1.25,1.25 0,0 1,0 2.17l-1.194,0.682A3.99,3.99 0,0 0,14 16.5v0.416A3.017,3.017 0,0 0,12.694 18.461ZM22,19.5v3A1.5,1.5 0,0 1,20.5 24h-5A1.5,1.5 0,0 1,14 22.5v-3a1.5,1.5 0,0 1,1.25 -1.475L15.25,16.75a2.75,2.75 0,0 1,5.5 0v1.275A1.5,1.5 0,0 1,22 19.5ZM16.75,16.75L16.75,18h2.5L19.25,16.75a1.25,1.25 0,0 0,-2.5 0Z"/>
</vector>

2
app/src/main/res/drawable/ic_send_unlock_24.xml
View File

@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@color/signal_primary"
android:fillColor="@color/core_ultramarine"
android:pathData="M9.5,20.286 L5.286,22.694A1.25,1.25 0,0 1,3.433 21.4L4.69,13.862 14,12 4.69,10.138 3.433,2.6A1.25,1.25 0,0 1,5.286 1.306L22.1,10.915a1.25,1.25 0,0 1,0 2.17l-0.581,0.332A3.979,3.979 0,0 0,15 16.5H12.5a3,3 0,0 0,-3 3ZM19,14a2.75,2.75 0,0 0,-2.75 2.75V18H12.5A1.5,1.5 0,0 0,11 19.5v3A1.5,1.5 0,0 0,12.5 24h5A1.5,1.5 0,0 0,19 22.5v-3a1.5,1.5 0,0 0,-1.25 -1.475V16.75a1.25,1.25 0,0 1,2.5 0V18h1.5V16.75A2.75,2.75 0,0 0,19 14Z"/>
</vector>

2
app/src/main/res/drawable/ic_share_outline_24.xml
View File

@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@color/signal_primary"
android:fillColor="@color/core_ultramarine"
android:pathData="M17,15a2.98,2.98 0,0 0,-2.184 0.955L8.9,12.728a2.726,2.726 0,0 0,0 -1.456l5.915,-3.227A3.1,3.1 0,1 0,14.1 6.728L8.184,9.955a3,3 0,1 0,0 4.09L14.1,17.272A2.995,2.995 0,1 0,17 15ZM17,4.5A1.5,1.5 0,1 1,15.5 6,1.5 1.5,0 0,1 17,4.5ZM6,13.5A1.5,1.5 0,1 1,7.5 12,1.5 1.5,0 0,1 6,13.5ZM17,19.5A1.5,1.5 0,1 1,18.5 18,1.5 1.5,0 0,1 17,19.5Z"/>
</vector>

2
app/src/main/res/drawable/ic_share_solid_24.xml
View File

@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@color/signal_primary"
android:fillColor="@color/core_ultramarine"
android:pathData="M17,15a2.98,2.98 0,0 0,-2.184 0.955L8.9,12.728a2.726,2.726 0,0 0,0 -1.456l5.915,-3.227A3.1,3.1 0,1 0,14.1 6.728L8.184,9.955a3,3 0,1 0,0 4.09L14.1,17.272A2.995,2.995 0,1 0,17 15Z"/>
</vector>

2
app/src/main/res/drawable/info_round.xml
View File

@ -10,7 +10,7 @@
<item>
<shape>
<corners android:radius="2dp" />
<solid android:color="#ff2090ea" />
<solid android:color="@color/core_ultramarine" />
</shape>
</item>
</selector>

2
app/src/main/res/drawable/insights_cta_button_background.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/signal_primary" />
<solid android:color="@color/core_ultramarine" />
<corners android:radius="2dp" />
</shape>

2
app/src/main/res/drawable/labeled_edit_text_background_active.xml
View File

@ -7,7 +7,7 @@
<corners android:radius="4dp" />
<stroke
android:color="@color/signal_primary"
android:color="@color/core_ultramarine"
android:width="2dp" />
</shape>

2
app/src/main/res/drawable/media_continue_button_background.xml
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval" >
<solid android:color="@color/signal_primary"/>
<solid android:color="@color/core_ultramarine"/>
</shape>

2
app/src/main/res/drawable/media_count_button_background.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="1000dp" />
<solid android:color="@color/signal_primary" />
<solid android:color="@color/core_ultramarine" />
</shape>

2
app/src/main/res/drawable/mediarail_media_outline.xml
View File

@ -4,5 +4,5 @@
<stroke
android:width="3dp"
android:color="@color/signal_primary"/>
android:color="@color/core_ultramarine"/>
</shape>

2
app/src/main/res/drawable/pill.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="1000dp" />
<solid android:color="@color/signal_primary" />
<solid android:color="@color/core_ultramarine" />
</shape>

8
app/src/main/res/drawable/progress_button_state.xml
View File

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true"
android:color="@color/textsecure_primary"/>
android:color="@color/core_ultramarine"/>
<item android:state_focused="true"
android:color="@color/textsecure_primary"/>
android:color="@color/core_ultramarine"/>
<item android:state_enabled="false"
android:color="@color/textsecure_primary"/>
android:color="@color/core_ultramarine"/>
<item android:state_enabled="true"
android:color="@color/textsecure_primary"/>
android:color="@color/core_ultramarine"/>
</selector>

2
app/src/main/res/drawable/read_receipt_vector.xml
View File

@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/textsecure_primary"
android:fillColor="@color/core_ultramarine"
android:pathData="M18,7l-1.41,-1.41 -6.34,6.34 1.41,1.41L18,7zM22.24,5.59L11.66,16.17 7.48,12l-1.41,1.41L11.66,19l12,-12 -1.42,-1.41zM0.41,13.41L6,19l1.41,-1.41L1.83,12 0.41,13.41z"/>
</vector>

6
app/src/main/res/drawable/reminder_background_normal.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" android:drawable="@color/signal_primary" />
<item android:state_focused="true" android:drawable="@color/signal_primary" />
<item android:drawable="@color/signal_primary_dark" />
<item android:state_pressed="true" android:drawable="@color/core_ultramarine_dark" />
<item android:state_focused="true" android:drawable="@color/core_ultramarine" />
<item android:drawable="@color/core_ultramarine" />
</selector>

2
app/src/main/res/drawable/touch_highlight_background.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" android:drawable="@color/touch_highlight" />
<item android:state_focused="true" android:drawable="@color/signal_primary" />
<item android:state_focused="true" android:drawable="@color/core_ultramarine" />
<item android:drawable="@android:color/transparent" />
</selector>

2
app/src/main/res/drawable/unread_count_background_dark.xml
View File

@ -5,7 +5,7 @@
<corners android:radius="@dimen/unread_count_bubble_radius" />
<solid android:color="@color/core_blue" />
<solid android:color="@color/core_ultramarine" />
<stroke
android:color="@color/core_grey_95"

2
app/src/main/res/drawable/unread_count_background_light.xml
View File

@ -5,7 +5,7 @@
<corners android:radius="@dimen/unread_count_bubble_radius" />
<solid android:color="@color/core_blue" />
<solid android:color="@color/core_ultramarine" />
<stroke
android:color="@color/core_white"

1
app/src/main/res/layout/account_locked_fragment.xml
View File

@ -55,7 +55,6 @@
android:layout_marginEnd="32dp"
android:layout_marginBottom="16dp"
android:text="@string/AccountLockedFragment__learn_more"
android:textColor="@color/signal_primary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />

8
app/src/main/res/layout/activity_shared_contact_details.xml
View File

@ -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"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/SharedContactDetailsActivity_signal_message"
android:textColor="@color/signal_primary"/>
android:textColor="@color/core_ultramarine"/>
</LinearLayout>
@ -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"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/SharedContactDetailsActivity_signal_call"
android:textColor="@color/signal_primary"/>
android:textColor="@color/core_ultramarine"/>
</LinearLayout>

1
app/src/main/res/layout/base_kbs_pin_fragment.xml
View File

@ -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"

2
app/src/main/res/layout/color_fragment.xml
View File

@ -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">
<TextView android:layout_width="match_parent"
android:layout_height="0dp"

6
app/src/main/res/layout/contact_selection_list_fragment.xml
View File

@ -54,8 +54,8 @@
android:visibility="invisible"
app:matProg_circleRadius="145dp"
app:matProg_barWidth="6dp"
app:matProg_rimColor="@color/signal_primary"
app:matProg_barColor="@color/signal_primary_dark"
app:matProg_rimColor="@color/core_ultramarine"
app:matProg_barColor="@color/core_ultramarine_dark"
app:matProg_progressIndeterminate="true"
tools:visibility="visible"
/>
@ -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"/>

4
app/src/main/res/layout/conversation_search_nav.xml
View File

@ -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" />

46
app/src/main/res/layout/create_passphrase_activity.xml
View File

@ -1,27 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/prompt_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/core_ultramarine">
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/prompt_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/signal_primary">
<ProgressBar
android:id="@+id/passphrase_edit"
style="?android:attr/progressBarStyleLargeInverse"
android:layout_width="75dp"
android:layout_height="75dp"
android:layout_centerInParent="true"
android:indeterminate="true"
android:padding="10dp" />
<ProgressBar android:id="@+id/passphrase_edit"
android:layout_width="75dp"
android:layout_height="75dp"
android:indeterminate="true"
android:padding="10dp"
android:layout_centerInParent="true"
style="?android:attr/progressBarStyleLargeInverse"/>
<ImageView android:id="@+id/watermark"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginBottom="20dp"
android:layout_above="@id/passphrase_edit"
android:src="@drawable/icon_transparent"
android:contentDescription="@string/PassphrasePromptActivity_watermark_content_description"/>
<ImageView
android:id="@+id/watermark"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@id/passphrase_edit"
android:layout_centerHorizontal="true"
android:layout_marginBottom="20dp"
android:contentDescription="@string/PassphrasePromptActivity_watermark_content_description"
app:srcCompat="@drawable/ic_launcher_foreground" />
</RelativeLayout>

4
app/src/main/res/layout/device_list_fragment.xml
View File

@ -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" />
</LinearLayout>

4
app/src/main/res/layout/experience_upgrade_link_previews_fragment.xml
View File

@ -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">
<TextView
android:id="@+id/blurb"
@ -93,7 +93,7 @@
android:layout_marginEnd="24dp"
android:layout_marginBottom="24dp"
android:text="@string/ExperienceUpgradeActivity_got_it"
android:textColor="@color/core_blue"
android:textColor="@color/core_ultramarine"
app:backgroundTint="@color/core_white"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"

2
app/src/main/res/layout/experience_upgrade_preference_fragment.xml
View File

@ -5,7 +5,7 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:background="#FF2090ea">
tools:background="@color/core_ultramarine">
<TextView android:layout_width="match_parent"
android:layout_height="wrap_content"

4
app/src/main/res/layout/experience_upgrade_stickers_fragment.xml
View File

@ -57,11 +57,11 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="32dp"
android:background="@color/signal_primary"
android:background="@color/core_ultramarine"
android:textColor="@color/white"
android:elevation="4dp"
app:cpb_colorIndicator="@color/white"
app:cpb_colorProgress="@color/textsecure_primary"
app:cpb_colorProgress="@color/core_ultramarine"
app:cpb_cornerRadius="4dp"
app:cpb_selectorIdle="@drawable/progress_button_state"
app:cpb_textIdle="@string/ExperienceUpgradeActivity_lets_go"

8
app/src/main/res/layout/experience_upgrade_typing_indicators_fragment.xml
View File

@ -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">
<LinearLayout
android:layout_width="match_parent"
@ -45,7 +45,7 @@
android:layout_height="70dp"
android:layout_gravity="center"
android:src="@drawable/message_bubble_background"
android:tint="@color/signal_primary" />
android:tint="@color/core_ultramarine" />
<org.thoughtcrime.securesms.components.TypingIndicatorView
android:id="@+id/typing_indicator"
@ -90,7 +90,7 @@
android:layout_gravity="center_horizontal"
android:layout_marginTop="8dp"
android:text="@string/ExperienceUpgradeActivity_turn_on_typing_indicators"
android:textColor="@color/core_blue"
android:textColor="@color/core_ultramarine"
app:backgroundTint="@color/core_white" />
<androidx.appcompat.widget.AppCompatButton
@ -100,7 +100,7 @@
android:layout_gravity="center_horizontal"
android:text="@string/ExperienceUpgradeActivity_no_thanks"
android:textColor="@color/core_white"
app:backgroundTint="@color/conversation_blue" />
app:backgroundTint="@color/core_ultramarine_dark" />
</LinearLayout>

4
app/src/main/res/layout/fragment_registration_blank.xml
View File

@ -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">
<ImageView
android:id="@+id/watermark"
@ -11,7 +11,7 @@
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:importantForAccessibility="no"
android:src="@drawable/icon_transparent"
app:srcCompat="@drawable/ic_launcher_foreground"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"

3
app/src/main/res/layout/fragment_registration_lock.xml
View File

@ -67,7 +67,7 @@
android:layout_marginStart="32dp"
android:layout_marginEnd="32dp"
android:text="@string/RegistrationLockFragment__forgot_pin"
android:textColor="@color/signal_primary"
android:textColor="@color/core_ultramarine"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/kbs_lock_pin_input_label" />
@ -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"

2
app/src/main/res/layout/fragment_registration_welcome.xml
View File

@ -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" />

4
app/src/main/res/layout/fragment_registration_welcome_rereg.xml
View File

@ -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">
<ImageView
android:id="@+id/watermark"
@ -11,7 +11,7 @@
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:importantForAccessibility="no"
android:src="@drawable/icon_transparent"
app:srcCompat="@drawable/ic_launcher_foreground"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"

4
app/src/main/res/layout/help_fragment.xml
View File

@ -77,7 +77,7 @@
android:text="@string/HelpFragment__whats_this"
android:textAllCaps="false"
android:textAppearance="@style/Signal.Text.Body"
android:textColor="@color/signal_primary"
android:textColor="@color/core_ultramarine"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0"
@ -198,7 +198,7 @@
android:enabled="false"
android:textColor="@color/white"
app:cpb_colorIndicator="@color/white"
app:cpb_colorProgress="@color/signal_primary"
app:cpb_colorProgress="@color/core_ultramarine"
app:cpb_cornerRadius="4dp"
app:cpb_selectorIdle="?attr/help_next_background"
app:cpb_textIdle="@string/HelpFragment__next"

3
app/src/main/res/layout/insights_dashboard.xml
View File

@ -109,7 +109,7 @@
<Button
android:id="@+id/insights_dashboard_start_a_conversation"
style="@style/Widget.AppCompat.Button.Borderless"
style="@style/Button.Borderless"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginStart="16dp"
@ -117,7 +117,6 @@
android:layout_marginEnd="16dp"
android:text="@string/InsightsDashboardFragment__start_a_conversation"
android:textAppearance="@style/TextAppearance.Signal.Caption.Insights"
android:textColor="@color/signal_primary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/insights_dashboard_tagline" />

1
app/src/main/res/layout/insights_dashboard_adapter_item.xml
View File

@ -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" />

5
app/src/main/res/layout/invite_activity.xml
View File

@ -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" />
<Button android:id="@+id/send_sms_button"
style="@style/Widget.AppCompat.Button.Borderless"
android:textColor="@color/signal_primary"
style="@style/Button.Borderless"
android:enabled="false"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

2
app/src/main/res/layout/item_editable_contact.xml
View File

@ -30,7 +30,7 @@
android:padding="16dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:src="@drawable/ic_create_white_24dp"
android:tint="@color/signal_primary"/>
android:tint="@color/core_ultramarine"/>
</LinearLayout>

3
app/src/main/res/layout/kbs_splash_fragment.xml
View File

@ -59,14 +59,13 @@
<Button
android:id="@+id/kbs_splash_secondary_action"
style="@style/Widget.AppCompat.Button.Borderless.Colored"
style="@style/Button.Borderless"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginEnd="32dp"
android:layout_marginBottom="16dp"
android:text="@string/KbsSplashFragment__learn_more"
android:textColor="@color/signal_primary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />

2
app/src/main/res/layout/labeled_edit_text.xml
View File

@ -27,7 +27,7 @@
android:paddingStart="4dp"
android:paddingEnd="4dp"
android:background="@color/white"
android:textColor="@color/signal_primary"
android:textColor="@color/core_ultramarine"
style="@style/Signal.Text.Caption"
tools:text="Profile Name"/>

2
app/src/main/res/layout/link_preview.xml
View File

@ -94,7 +94,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:matProg_barColor="@color/core_blue"
app:matProg_barColor="@color/core_ultramarine"
app:matProg_progressIndeterminate="true" />
</androidx.constraintlayout.widget.ConstraintLayout>

4
app/src/main/res/layout/media_overview_activity.xml
View File

@ -26,9 +26,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/media_overview_toolbar_background"
app:tabIndicatorColor="@color/textsecure_primary"
app:tabIndicatorColor="@color/core_ultramarine"
app:tabMode="scrollable"
app:tabSelectedTextColor="@color/textsecure_primary" />
app:tabSelectedTextColor="@color/core_ultramarine" />
</com.google.android.material.appbar.AppBarLayout>

2
app/src/main/res/layout/media_overview_detail_item_audio.xml
View File

@ -18,7 +18,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:autoRewind="true"
app:foregroundTintColor="@color/core_blue"
app:foregroundTintColor="@color/core_ultramarine"
app:small="true" />
<include layout="@layout/media_overview_selected_overlay" />

2
app/src/main/res/layout/mediapicker_media_item.xml
View File

@ -37,7 +37,7 @@
android:layout_height="18dp"
android:layout_gravity="center"
android:layout_marginStart="2dp"
android:tint="@color/core_blue"
android:tint="@color/core_ultramarine"
android:scaleType="fitXY"
app:srcCompat="@drawable/triangle_right" />

2
app/src/main/res/layout/mediasend_count_button.xml
View File

@ -21,7 +21,7 @@
android:paddingBottom="2dp"
android:gravity="center"
android:background="@drawable/media_count_number_background"
android:textColor="@color/signal_primary"
android:textColor="@color/core_ultramarine"
android:textSize="18dp"
tools:text="3" />

2
app/src/main/res/layout/permissions_rationale_dialog.xml
View File

@ -6,7 +6,7 @@
android:layout_height="wrap_content">
<LinearLayout android:id="@+id/header_container"
android:background="@color/signal_primary"
android:background="@color/core_ultramarine"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"

2
app/src/main/res/layout/preference_right_summary_widget.xml
View File

@ -10,6 +10,6 @@
android:layout_gravity="right|center_vertical"
android:gravity="right|center_vertical"
android:textSize="16sp"
android:textColor="@color/signal_primary_dark"/>
android:textColor="@color/core_ultramarine"/>
</FrameLayout>

2
app/src/main/res/layout/preference_storage_category.xml
View File

@ -87,7 +87,7 @@
android:layout_marginBottom="16dp"
android:text="@string/preferences_storage__review_storage"
android:textAllCaps="true"
android:textColor="@color/signal_primary_dark"
android:textColor="@color/core_ultramarine"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"

6
app/src/main/res/layout/profile_create_fragment.xml
View File

@ -225,12 +225,12 @@
android:layout_marginStart="32dp"
android:layout_marginEnd="32dp"
android:layout_marginBottom="16dp"
android:background="@color/signal_primary"
android:background="@color/core_ultramarine"
android:enabled="false"
android:textAllCaps="true"
android:textColor="@color/white"
app:cpb_colorIndicator="@color/white"
app:cpb_colorProgress="@color/textsecure_primary"
app:cpb_colorProgress="@color/core_ultramarine"
app:cpb_cornerRadius="4dp"
app:cpb_selectorIdle="@drawable/progress_button_state"
app:cpb_textIdle="@string/CreateProfileActivity_next" />
@ -241,7 +241,7 @@
android:id="@+id/reveal"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/textsecure_primary"
android:background="@color/core_ultramarine"
android:visibility="invisible"
tools:visibility="gone" />

6
app/src/main/res/layout/prompt_passphrase_activity.xml
View File

@ -31,7 +31,7 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/icon_transparent"
app:srcCompat="@drawable/ic_launcher_foreground"
android:layout_gravity="center"/>
</androidx.appcompat.widget.Toolbar>
@ -58,7 +58,7 @@
<ImageView android:id="@+id/fingerprint_auth_container"
android:src="@drawable/ic_fingerprint_white_48dp"
android:background="@drawable/circle_tintable"
android:backgroundTint="@color/signal_primary"
android:backgroundTint="@color/core_ultramarine"
android:padding="20dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -70,7 +70,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/rounded_rectangle_dark"
android:backgroundTint="@color/signal_primary"
android:backgroundTint="@color/core_ultramarine"
android:textColor="@color/white"
android:gravity="center_horizontal"
android:elevation="3dp"

Some files were not shown because too many files have changed in this diff Show More