diff --git a/app/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java b/app/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java index 60b5368cf3..fc7fdc57cf 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java @@ -26,6 +26,7 @@ import android.os.Bundle; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.preference.Preference; @@ -194,7 +195,7 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActivity if (Build.VERSION.SDK_INT >= 21) return; Preference preference = this.findPreference(PREFERENCE_CATEGORY_SMS_MMS); - preference.getIcon().setColorFilter(ThemeUtil.getThemedColor(requireContext(), R.attr.icon_tint), PorterDuff.Mode.SRC_IN); + preference.getIcon().setColorFilter(ContextCompat.getColor(requireContext(), R.color.signal_icon_tint_primary), PorterDuff.Mode.SRC_IN); } @Override diff --git a/app/src/main/java/org/thoughtcrime/securesms/GroupMembersDialog.java b/app/src/main/java/org/thoughtcrime/securesms/GroupMembersDialog.java index a5d7ea0cb9..0d11e111d8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/GroupMembersDialog.java +++ b/app/src/main/java/org/thoughtcrime/securesms/GroupMembersDialog.java @@ -28,7 +28,7 @@ public final class GroupMembersDialog { public void display() { AlertDialog dialog = new AlertDialog.Builder(fragmentActivity) .setTitle(R.string.ConversationActivity_group_members) - .setIconAttribute(R.attr.group_members_dialog_icon) + .setIcon(R.drawable.ic_group_24) .setCancelable(true) .setView(R.layout.dialog_group_members) .setPositiveButton(android.R.string.ok, null) diff --git a/app/src/main/java/org/thoughtcrime/securesms/InviteActivity.java b/app/src/main/java/org/thoughtcrime/securesms/InviteActivity.java index 73d3512e9d..a74bdc8a21 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/InviteActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/InviteActivity.java @@ -164,7 +164,7 @@ public class InviteActivity extends PassphraseRequiredActivity implements Contac private void setPrimaryColorsToolbarNormal() { primaryToolbar.setBackgroundColor(0); primaryToolbar.getNavigationIcon().setColorFilter(null); - primaryToolbar.setTitleTextColor(ThemeUtil.getThemedColor(this, R.attr.title_text_color_primary)); + primaryToolbar.setTitleTextColor(ContextCompat.getColor(this, R.color.signal_text_primary)); if (Build.VERSION.SDK_INT >= 23) { getWindow().setStatusBarColor(ThemeUtil.getThemedColor(this, android.R.attr.statusBarColor)); @@ -177,8 +177,8 @@ public class InviteActivity extends PassphraseRequiredActivity implements Contac private void setPrimaryColorsToolbarForSms() { 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)); + primaryToolbar.getNavigationIcon().setColorFilter(ContextCompat.getColor(this, R.color.signal_text_toolbar_subtitle), PorterDuff.Mode.SRC_IN); + primaryToolbar.setTitleTextColor(ContextCompat.getColor(this, R.color.signal_text_toolbar_title)); if (Build.VERSION.SDK_INT >= 23) { getWindow().setStatusBarColor(ContextCompat.getColor(this, R.color.core_ultramarine)); diff --git a/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java b/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java index a7ac1e50e8..af9ef7834e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java @@ -39,6 +39,7 @@ import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatDelegate; import androidx.core.app.ShareCompat; import androidx.core.util.Pair; import androidx.core.view.ViewCompat; @@ -142,6 +143,12 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity return intent; } + @Override + protected void attachBaseContext(@NonNull Context newBase) { + getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_YES); + super.attachBaseContext(newBase); + } + @SuppressWarnings("ConstantConditions") @Override protected void onCreate(Bundle bundle, boolean ready) { @@ -442,7 +449,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity } AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setIconAttribute(R.attr.dialog_alert_icon); + builder.setIcon(R.drawable.ic_warning); builder.setTitle(R.string.MediaPreviewActivity_media_delete_confirmation_title); builder.setMessage(R.string.MediaPreviewActivity_media_delete_confirmation_message); builder.setCancelable(true); diff --git a/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java b/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java index 8393d2929d..b775b0d897 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java @@ -428,7 +428,7 @@ public class WebRtcCallActivity extends AppCompatActivity implements SafetyNumbe if (isFinishing()) return; // XXX Stuart added this check above, not sure why, so I'm repeating in ignorance. - moxie new AlertDialog.Builder(this) .setTitle(R.string.RedPhone_number_not_registered) - .setIconAttribute(R.attr.dialog_alert_icon) + .setIcon(R.drawable.ic_warning) .setMessage(R.string.RedPhone_the_number_you_dialed_does_not_support_secure_voice) .setCancelable(true) .setPositiveButton(R.string.RedPhone_got_it, (d, w) -> handleTerminate(event.getRecipient(), HangupMessage.Type.NORMAL)) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java b/app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java index 2115c7705a..cdcb54b9d6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java @@ -21,6 +21,7 @@ import android.view.inputmethod.InputConnection; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.core.view.inputmethod.EditorInfoCompat; import androidx.core.view.inputmethod.InputConnectionCompat; import androidx.core.view.inputmethod.InputContentInfoCompat; @@ -257,7 +258,7 @@ public class ComposeText extends EmojiEditText { setImeOptions(getImeOptions() | 16777216); } - mentionRendererDelegate = new MentionRendererDelegate(getContext(), ThemeUtil.getThemedColor(getContext(), R.attr.conversation_mention_background_color)); + mentionRendererDelegate = new MentionRendererDelegate(getContext(), ContextCompat.getColor(getContext(), R.color.conversation_mention_background_color)); addTextChangedListener(new MentionDeleter()); mentionValidatorWatcher = new MentionValidatorWatcher(); diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java index 95c8fe6ba4..a93722111a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java @@ -7,6 +7,8 @@ import androidx.annotation.ColorInt; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.UiThread; +import androidx.core.content.ContextCompat; + import android.util.AttributeSet; import android.widget.FrameLayout; import android.widget.ImageView; @@ -57,7 +59,7 @@ public class ConversationItemThumbnail extends FrameLayout { this.cornerMask = new CornerMask(this); this.outliner = new Outliner(); - outliner.setColor(ThemeUtil.getThemedColor(getContext(), R.attr.conversation_item_image_outline_color)); + outliner.setColor(ContextCompat.getColor(getContext(), R.color.signal_inverse_transparent_20)); if (attrs != null) { TypedArray typedArray = getContext().getTheme().obtainStyledAttributes(attrs, R.styleable.ConversationItemThumbnail, 0, 0); diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/DarkSearchView.java b/app/src/main/java/org/thoughtcrime/securesms/components/DarkSearchView.java index c163fd9293..fa77e79116 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/DarkSearchView.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/DarkSearchView.java @@ -30,6 +30,6 @@ public class DarkSearchView extends androidx.appcompat.widget.SearchView { super(context, attrs, defStyleAttr); EditText searchText = findViewById(androidx.appcompat.R.id.search_src_text); - searchText.setTextColor(ThemeUtil.getThemedColor(context, R.attr.conversation_subtitle_color)); + searchText.setTextColor(ContextCompat.getColor(context, R.color.signal_text_toolbar_subtitle)); } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ImageDivet.java b/app/src/main/java/org/thoughtcrime/securesms/components/ImageDivet.java deleted file mode 100644 index ab4970f2bc..0000000000 --- a/app/src/main/java/org/thoughtcrime/securesms/components/ImageDivet.java +++ /dev/null @@ -1,105 +0,0 @@ -package org.thoughtcrime.securesms.components; - -import android.content.Context; -import android.content.res.TypedArray; -import android.graphics.Canvas; -import android.graphics.drawable.Drawable; -import androidx.appcompat.widget.AppCompatImageView; -import android.util.AttributeSet; - -import org.thoughtcrime.securesms.R; - -public class ImageDivet extends AppCompatImageView { - private static final float CORNER_OFFSET = 12F; - private static final String[] POSITIONS = new String[] {"bottom_right"}; - - private Drawable drawable; - - private int drawableIntrinsicWidth; - private int drawableIntrinsicHeight; - private int position; - private float density; - - public ImageDivet(Context context, AttributeSet attrs, int defStyle) { - super(context, attrs, defStyle); - initialize(attrs); - } - - public ImageDivet(Context context, AttributeSet attrs) { - super(context, attrs); - initialize(attrs); - } - - public ImageDivet(Context context) { - super(context); - initialize(null); - } - - private void initialize(AttributeSet attrs) { - if (attrs != null) { - position = attrs.getAttributeListValue(null, "position", POSITIONS, -1); - } - - density = getContext().getResources().getDisplayMetrics().density; - setDrawable(); - } - - private void setDrawable() { - int attributes[] = new int[] {R.attr.lower_right_divet}; - - TypedArray drawables = getContext().obtainStyledAttributes(attributes); - - switch (position) { - case 0: - drawable = drawables.getDrawable(0); - break; - } - - drawableIntrinsicWidth = drawable.getIntrinsicWidth(); - drawableIntrinsicHeight = drawable.getIntrinsicHeight(); - - drawables.recycle(); - } - - @Override - public void onDraw(Canvas c) { - super.onDraw(c); - c.save(); - computeBounds(c); - drawable.draw(c); - c.restore(); - } - - public void setPosition(int position) { - this.position = position; - setDrawable(); - invalidate(); - } - - public int getPosition() { - return position; - } - - public float getCloseOffset() { - return CORNER_OFFSET * density; - } - - public float getFarOffset() { - return getCloseOffset() + drawableIntrinsicHeight; - } - - private void computeBounds(Canvas c) { - final int right = getWidth(); - final int bottom = getHeight(); - - switch (position) { - case 0: - drawable.setBounds( - right - drawableIntrinsicWidth, - bottom - drawableIntrinsicHeight, - right, - bottom); - break; - } - } -} diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/LinkPreviewView.java b/app/src/main/java/org/thoughtcrime/securesms/components/LinkPreviewView.java index 86060b3e6d..46333fa88c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/LinkPreviewView.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/LinkPreviewView.java @@ -13,6 +13,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.StringRes; +import androidx.core.content.ContextCompat; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.linkpreview.LinkPreview; @@ -79,7 +80,7 @@ public class LinkPreviewView extends FrameLayout { cornerMask = new CornerMask(this); outliner = new Outliner(); - outliner.setColor(ThemeUtil.getThemedColor(getContext(), R.attr.conversation_item_image_outline_color)); + outliner.setColor(ContextCompat.getColor(getContext(), R.color.signal_inverse_transparent_20)); if (attrs != null) { TypedArray typedArray = getContext().getTheme().obtainStyledAttributes(attrs, R.styleable.LinkPreviewView, 0, 0); diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/OutlinedThumbnailView.java b/app/src/main/java/org/thoughtcrime/securesms/components/OutlinedThumbnailView.java index ef5221bd9f..5099974b9f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/OutlinedThumbnailView.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/OutlinedThumbnailView.java @@ -7,6 +7,7 @@ import android.graphics.Canvas; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.UiThread; +import androidx.core.content.ContextCompat; import android.graphics.Color; import android.util.AttributeSet; @@ -37,7 +38,7 @@ public class OutlinedThumbnailView extends ThumbnailView { cornerMask = new CornerMask(this); outliner = new Outliner(); - outliner.setColor(ThemeUtil.getThemedColor(getContext(), R.attr.conversation_item_image_outline_color)); + outliner.setColor(ContextCompat.getColor(getContext(), R.color.signal_inverse_transparent_20)); int radius = 0; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/TooltipPopup.java b/app/src/main/java/org/thoughtcrime/securesms/components/TooltipPopup.java index 1a83dc6708..c2218ebdfc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/TooltipPopup.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/TooltipPopup.java @@ -7,6 +7,8 @@ import androidx.annotation.ColorInt; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.StringRes; +import androidx.core.content.ContextCompat; + import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -76,8 +78,8 @@ public class TooltipPopup extends PopupWindow { View bubble = getContentView().findViewById(R.id.tooltip_bubble); if (backgroundTint == 0) { - bubble.getBackground().setColorFilter(ThemeUtil.getThemedColor(anchor.getContext(), R.attr.tooltip_default_color), PorterDuff.Mode.MULTIPLY); - arrow.setColorFilter(ThemeUtil.getThemedColor(anchor.getContext(), R.attr.tooltip_default_color), PorterDuff.Mode.MULTIPLY); + bubble.getBackground().setColorFilter(ContextCompat.getColor(anchor.getContext(), R.color.tooltip_default_color), PorterDuff.Mode.MULTIPLY); + arrow.setColorFilter(ContextCompat.getColor(anchor.getContext(), R.color.tooltip_default_color), PorterDuff.Mode.MULTIPLY); } else { bubble.getBackground().setColorFilter(backgroundTint, PorterDuff.Mode.MULTIPLY); arrow.setColorFilter(backgroundTint, PorterDuff.Mode.MULTIPLY); diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/AsciiEmojiView.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/AsciiEmojiView.java index 1364017f48..d362a17e31 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/AsciiEmojiView.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/AsciiEmojiView.java @@ -4,6 +4,8 @@ import android.content.Context; import android.graphics.Canvas; import android.graphics.Paint; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; + import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; @@ -38,7 +40,7 @@ public class AsciiEmojiView extends View { float targetFontSize = 0.75f * getHeight() - getPaddingTop() - getPaddingBottom(); paint.setTextSize(targetFontSize); - paint.setColor(ResUtil.getColor(getContext(), R.attr.emoji_text_color)); + paint.setColor(ContextCompat.getColor(getContext(), R.color.signal_inverse_primary)); paint.setTextAlign(Paint.Align.CENTER); int xPos = (getWidth() / 2); diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiKeyboardProvider.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiKeyboardProvider.java index 02e376e941..312b70f0c9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiKeyboardProvider.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiKeyboardProvider.java @@ -81,9 +81,9 @@ public class EmojiKeyboardProvider implements MediaKeyboardProvider, @Override public int getProviderIconView(boolean selected) { if (selected) { - return ThemeUtil.isDarkTheme(context) ? R.layout.emoji_keyboard_icon_dark_selected : R.layout.emoji_keyboard_icon_light_selected; + return R.layout.emoji_keyboard_icon_selected; } else { - return ThemeUtil.isDarkTheme(context) ? R.layout.emoji_keyboard_icon_dark : R.layout.emoji_keyboard_icon_light; + return R.layout.emoji_keyboard_icon; } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java index ad189cd1f8..56ad02572f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java @@ -4,6 +4,8 @@ import android.content.Context; import android.graphics.drawable.Drawable; import androidx.annotation.NonNull; import androidx.appcompat.widget.AppCompatImageButton; +import androidx.core.content.ContextCompat; + import android.util.AttributeSet; import org.thoughtcrime.securesms.R; @@ -44,9 +46,9 @@ public class EmojiToggle extends AppCompatImageButton implements MediaKeyboard.M } private void initialize() { - this.emojiToggle = ResUtil.getDrawable(getContext(), R.attr.conversation_emoji_toggle); - this.stickerToggle = ResUtil.getDrawable(getContext(), R.attr.conversation_sticker_toggle); - this.imeToggle = ResUtil.getDrawable(getContext(), R.attr.conversation_keyboard_toggle); + this.emojiToggle = ContextCompat.getDrawable(getContext(), R.drawable.ic_emoji_smiley_24); + this.stickerToggle = ContextCompat.getDrawable(getContext(), R.drawable.ic_sticker_24); + this.imeToggle = ContextCompat.getDrawable(getContext(), R.drawable.ic_keyboard_24); this.mediaToggle = emojiToggle; setToMedia(); diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiVariationSelectorPopup.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiVariationSelectorPopup.java index 69e78337ef..47844d055f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiVariationSelectorPopup.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiVariationSelectorPopup.java @@ -3,6 +3,8 @@ package org.thoughtcrime.securesms.components.emoji; import android.content.Context; import android.os.Build; import androidx.annotation.NonNull; +import androidx.core.content.ContextCompat; + import android.view.LayoutInflater; import android.view.ViewGroup; import android.widget.ImageView; @@ -28,7 +30,7 @@ public class EmojiVariationSelectorPopup extends PopupWindow { this.listener = listener; this.list = (ViewGroup) getContentView().findViewById(R.id.emoji_variation_container); - setBackgroundDrawable(ThemeUtil.getThemedDrawable(context, R.attr.emoji_variation_selector_background)); + setBackgroundDrawable(ContextCompat.getDrawable(context, R.drawable.emoji_variation_selector_background)); setOutsideTouchable(true); if (Build.VERSION.SDK_INT >= 21) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/identity/UntrustedSendDialog.java b/app/src/main/java/org/thoughtcrime/securesms/components/identity/UntrustedSendDialog.java index 89dcf57e9c..b96ca2947b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/identity/UntrustedSendDialog.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/identity/UntrustedSendDialog.java @@ -31,7 +31,7 @@ public class UntrustedSendDialog extends AlertDialog.Builder implements DialogIn this.resendListener = resendListener; setTitle(R.string.UntrustedSendDialog_send_message); - setIconAttribute(R.attr.dialog_alert_icon); + setIcon(R.drawable.ic_warning); setMessage(message); setPositiveButton(R.string.UntrustedSendDialog_send, this); setNegativeButton(android.R.string.cancel, null); diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/identity/UnverifiedSendDialog.java b/app/src/main/java/org/thoughtcrime/securesms/components/identity/UnverifiedSendDialog.java index d1c7485efb..ea02bb5302 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/identity/UnverifiedSendDialog.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/identity/UnverifiedSendDialog.java @@ -30,7 +30,7 @@ public class UnverifiedSendDialog extends AlertDialog.Builder implements DialogI this.resendListener = resendListener; setTitle(R.string.UnverifiedSendDialog_send_message); - setIconAttribute(R.attr.dialog_alert_icon); + setIcon(R.drawable.ic_warning); setMessage(message); setPositiveButton(R.string.UnverifiedSendDialog_send, this); setNegativeButton(android.R.string.cancel, null); 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 13333b7ff2..f8687782ab 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java +++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java @@ -30,6 +30,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.RecyclerView; import org.thoughtcrime.securesms.R; @@ -62,14 +63,10 @@ public class ContactSelectionListAdapter extends CursorRecyclerViewAdapter currentContacts; @@ -181,7 +178,6 @@ public class ContactSelectionListAdapter extends CursorRecyclerViewAdapter onBackPressed()); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - int[] attrs = {R.attr.shared_contact_details_titlebar}; - TypedArray array = obtainStyledAttributes(attrs); - int color = array.getResourceId(0, android.R.color.black); - - array.recycle(); - - getWindow().setStatusBarColor(getResources().getColor(color)); + if (Build.VERSION.SDK_INT >= 21) { + getWindow().setStatusBarColor(ContextCompat.getColor(this, R.color.shared_contact_details_titlebar)); } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java index 85dc840b4e..1bd6cedb8c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java @@ -25,7 +25,6 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.res.Configuration; -import android.content.res.TypedArray; import android.graphics.Bitmap; import android.graphics.Color; import android.graphics.PorterDuff; @@ -69,6 +68,7 @@ import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AlertDialog; import androidx.appcompat.widget.SearchView; import androidx.appcompat.widget.Toolbar; +import androidx.core.content.ContextCompat; import androidx.core.content.pm.ShortcutInfoCompat; import androidx.core.content.pm.ShortcutManagerCompat; import androidx.core.graphics.drawable.DrawableCompat; @@ -239,6 +239,7 @@ import org.thoughtcrime.securesms.util.Base64; import org.thoughtcrime.securesms.util.BitmapUtil; import org.thoughtcrime.securesms.util.CharacterCalculator.CharacterState; import org.thoughtcrime.securesms.util.CommunicationActions; +import org.thoughtcrime.securesms.util.ContextUtil; import org.thoughtcrime.securesms.util.DrawableUtil; import org.thoughtcrime.securesms.util.DynamicDarkToolbarTheme; import org.thoughtcrime.securesms.util.DynamicLanguage; @@ -253,7 +254,6 @@ import org.thoughtcrime.securesms.util.SmsUtil; import org.thoughtcrime.securesms.util.SpanUtil; import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.thoughtcrime.securesms.util.TextSecurePreferences.MediaKeyboardMode; -import org.thoughtcrime.securesms.util.ThemeUtil; import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.ViewUtil; import org.thoughtcrime.securesms.util.concurrent.AssertedSuccessListener; @@ -437,11 +437,7 @@ public class ConversationActivity extends PassphraseRequiredActivity setContentView(R.layout.conversation_activity); - TypedArray typedArray = obtainStyledAttributes(new int[] {R.attr.conversation_background}); - int color = typedArray.getColor(0, Color.WHITE); - typedArray.recycle(); - - getWindow().getDecorView().setBackgroundColor(color); + getWindow().getDecorView().setBackgroundResource(R.color.signal_background_primary); fragment = initFragment(R.id.fragment_content, new ConversationFragment(), dynamicLanguage.getCurrentLocale()); @@ -1165,7 +1161,7 @@ public class ConversationActivity extends PassphraseRequiredActivity private void handleResetSecureSession() { AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setTitle(R.string.ConversationActivity_reset_secure_session_question); - builder.setIconAttribute(R.attr.dialog_alert_icon); + builder.setIcon(R.drawable.ic_warning); builder.setCancelable(true); builder.setMessage(R.string.ConversationActivity_this_may_help_if_youre_having_encryption_problems); builder.setPositiveButton(R.string.ConversationActivity_reset, (dialog, which) -> { @@ -2269,7 +2265,7 @@ public class ConversationActivity extends PassphraseRequiredActivity } AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setIconAttribute(R.attr.conversation_attach_contact_info); + builder.setIcon(R.drawable.ic_account_box); builder.setTitle(R.string.ConversationActivity_select_contact_info); builder.setItems(numberItems, (dialog, which) -> composeText.append(numbers[which])); @@ -2981,7 +2977,7 @@ public class ConversationActivity extends PassphraseRequiredActivity Permissions.with(ConversationActivity.this) .request(Manifest.permission.CAMERA) .ifNecessary() - .withRationaleDialog(getString(R.string.ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera), R.drawable.ic_camera_solid_24) + .withRationaleDialog(getString(R.string.ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera), R.drawable.ic_camera_24) .withPermanentDenialDialog(getString(R.string.ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video)) .onAllGranted(() -> { composeText.clearFocus(); @@ -3129,8 +3125,8 @@ public class ConversationActivity extends PassphraseRequiredActivity reviewBanner.get().setBannerMessage(message); - Drawable drawable = Objects.requireNonNull(ThemeUtil.getThemedDrawable(this, R.attr.menu_info_icon)).mutate(); - DrawableCompat.setTint(drawable, ThemeUtil.getThemedColor(this, R.attr.icon_tint)); + Drawable drawable = ContextUtil.requireDrawable(this, R.drawable.ic_info_white_24).mutate(); + DrawableCompat.setTint(drawable, ContextCompat.getColor(this, R.color.signal_icon_tint_primary)); reviewBanner.get().setBannerIcon(drawable); reviewBanner.get().setOnClickListener(unused -> handleReviewRequest(recipient.getId())); @@ -3513,7 +3509,7 @@ public class ConversationActivity extends PassphraseRequiredActivity } AlertDialog.Builder builder = new AlertDialog.Builder(ConversationActivity.this); - builder.setIconAttribute(R.attr.dialog_alert_icon); + builder.setIcon(R.drawable.ic_warning); builder.setTitle("No longer verified"); builder.setItems(unverifiedNames, (dialog, which) -> { startActivity(VerifyIdentityActivity.newIntent(ConversationActivity.this, unverifiedIdentities.get(which), false)); diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java index 81665bbffe..3088277551 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java @@ -394,11 +394,7 @@ public class ConversationItem extends LinearLayout implements BindableConversati } private void initializeAttributes() { - final int[] attributes = new int[] {R.attr.conversation_item_bubble_background}; - final TypedArray attrs = context.obtainStyledAttributes(attributes); - - defaultBubbleColor = attrs.getColor(0, Color.WHITE); - attrs.recycle(); + defaultBubbleColor = ContextCompat.getColor(context, R.color.signal_background_secondary); } @Override @@ -421,24 +417,24 @@ public class ConversationItem extends LinearLayout implements BindableConversati private void setBubbleState(MessageRecord messageRecord) { if (messageRecord.isOutgoing() && !messageRecord.isRemoteDelete()) { bodyBubble.getBackground().setColorFilter(defaultBubbleColor, PorterDuff.Mode.MULTIPLY); - footer.setTextColor(ThemeUtil.getThemedColor(context, R.attr.conversation_item_sent_text_secondary_color)); - footer.setIconColor(ThemeUtil.getThemedColor(context, R.attr.conversation_item_sent_icon_color)); + footer.setTextColor(ContextCompat.getColor(context, R.color.signal_text_secondary)); + footer.setIconColor(ContextCompat.getColor(context, R.color.signal_icon_tint_secondary)); footer.setOnlyShowSendingStatus(false, messageRecord); } else if (messageRecord.isRemoteDelete() || (isViewOnceMessage(messageRecord) && ViewOnceUtil.isViewed((MmsMessageRecord) messageRecord))) { - bodyBubble.getBackground().setColorFilter(ThemeUtil.getThemedColor(context, R.attr.conversation_item_reveal_viewed_background_color), PorterDuff.Mode.MULTIPLY); - footer.setTextColor(ThemeUtil.getThemedColor(context, R.attr.conversation_item_sent_text_secondary_color)); - footer.setIconColor(ThemeUtil.getThemedColor(context, R.attr.conversation_item_sent_icon_color)); + bodyBubble.getBackground().setColorFilter(ContextCompat.getColor(context, R.color.signal_background_primary), PorterDuff.Mode.MULTIPLY); + footer.setTextColor(ContextCompat.getColor(context, R.color.signal_text_secondary)); + footer.setIconColor(ContextCompat.getColor(context, R.color.signal_icon_tint_secondary)); footer.setOnlyShowSendingStatus(messageRecord.isRemoteDelete(), messageRecord); } else { bodyBubble.getBackground().setColorFilter(messageRecord.getRecipient().getColor().toConversationColor(context), PorterDuff.Mode.MULTIPLY); - footer.setTextColor(ThemeUtil.getThemedColor(context, R.attr.conversation_item_received_text_secondary_color)); - footer.setIconColor(ThemeUtil.getThemedColor(context, R.attr.conversation_item_received_text_secondary_color)); + footer.setTextColor(ContextCompat.getColor(context, R.color.conversation_item_received_text_secondary_color)); + footer.setIconColor(ContextCompat.getColor(context, R.color.conversation_item_received_text_secondary_color)); footer.setOnlyShowSendingStatus(false, messageRecord); } - outliner.setColor(ThemeUtil.getThemedColor(getContext(), R.attr.conversation_item_sent_text_secondary_color)); + outliner.setColor(ContextCompat.getColor(context, R.color.signal_text_secondary)); - pulseOutliner.setColor(ThemeUtil.getThemedColor(getContext(), R.attr.conversation_item_mention_pulse_color)); + pulseOutliner.setColor(ContextCompat.getColor(getContext(), R.color.signal_inverse_transparent)); pulseOutliner.setStrokeWidth(ViewUtil.dpToPx(4)); outliners.clear(); @@ -619,7 +615,7 @@ public class ConversationItem extends LinearLayout implements BindableConversati String deletedMessage = context.getString(messageRecord.isOutgoing() ? R.string.ConversationItem_you_deleted_this_message : R.string.ConversationItem_this_message_was_deleted); SpannableString italics = new SpannableString(deletedMessage); italics.setSpan(new StyleSpan(android.graphics.Typeface.ITALIC), 0, deletedMessage.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); - italics.setSpan(new ForegroundColorSpan(ThemeUtil.getThemedColor(context, R.attr.conversation_item_delete_for_everyone_text_color)), + italics.setSpan(new ForegroundColorSpan(ContextCompat.getColor(context, R.color.signal_text_primary)), 0, deletedMessage.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); @@ -1135,7 +1131,7 @@ public class ConversationItem extends LinearLayout implements BindableConversati private void setGroupAuthorColor(@NonNull MessageRecord messageRecord) { if (groupSender != null && groupSenderProfileName != null) { - int stickerAuthorColor = ThemeUtil.getThemedColor(context, R.attr.conversation_sticker_author_color); + int stickerAuthorColor = ContextCompat.getColor(context, R.color.signal_text_primary); if (shouldDrawBodyBubbleOutline(messageRecord)) { groupSender.setTextColor(stickerAuthorColor); groupSenderProfileName.setTextColor(stickerAuthorColor); @@ -1143,8 +1139,8 @@ public class ConversationItem extends LinearLayout implements BindableConversati groupSender.setTextColor(stickerAuthorColor); groupSenderProfileName.setTextColor(stickerAuthorColor); } else { - groupSender.setTextColor(ThemeUtil.getThemedColor(context, R.attr.conversation_item_received_text_primary_color)); - groupSenderProfileName.setTextColor(ThemeUtil.getThemedColor(context, R.attr.conversation_item_received_text_primary_color)); + groupSender.setTextColor(ContextCompat.getColor(context, R.color.conversation_item_received_text_primary_color)); + groupSenderProfileName.setTextColor(ContextCompat.getColor(context, R.color.conversation_item_received_text_primary_color)); } } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java index 6aaf0b7ffa..7622b50708 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java @@ -22,6 +22,7 @@ import androidx.annotation.Nullable; import androidx.appcompat.widget.Toolbar; import androidx.constraintlayout.widget.ConstraintLayout; import androidx.constraintlayout.widget.ConstraintSet; +import androidx.core.content.ContextCompat; import androidx.vectordrawable.graphics.drawable.AnimatorInflaterCompat; import com.annimon.stream.Stream; @@ -199,7 +200,7 @@ public final class ConversationReactionOverlay extends RelativeLayout { if (Build.VERSION.SDK_INT >= 21) { this.activity = activity; originalStatusBarColor = activity.getWindow().getStatusBarColor(); - activity.getWindow().setStatusBarColor(ThemeUtil.getThemedColor(getContext(), R.attr.reactions_overlay_toolbar_background_color)); + activity.getWindow().setStatusBarColor(ContextCompat.getColor(getContext(), R.color.reactions_overlay_toolbar_background_color)); if (!ThemeUtil.isDarkTheme(getContext()) && Build.VERSION.SDK_INT >= 23) { activity.getWindow().getDecorView().setSystemUiVisibility(activity.getWindow().getDecorView().getSystemUiVisibility() | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); @@ -405,7 +406,7 @@ public final class ConversationReactionOverlay extends RelativeLayout { view.setImageEmoji(SignalStore.emojiValues().getPreferredVariation(ReactionEmoji.values()[i].emoji)); } } else if (isAtCustomIndex) { - view.setImageDrawable(ThemeUtil.getThemedDrawable(getContext(), R.attr.reactions_overlay_custom_emoji_icon)); + view.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.ic_any_emoji_32)); view.setTag(null); } else { view.setImageEmoji(SignalStore.emojiValues().getPreferredVariation(ReactionEmoji.values()[i].emoji)); diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java index f02a36e7cd..31687a061b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java @@ -232,7 +232,7 @@ public class ConversationListFragment extends MainFragment implements ActionMode Permissions.with(requireActivity()) .request(Manifest.permission.CAMERA) .ifNecessary() - .withRationaleDialog(getString(R.string.ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera), R.drawable.ic_camera_solid_24) + .withRationaleDialog(getString(R.string.ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera), R.drawable.ic_camera_24) .withPermanentDenialDialog(getString(R.string.ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video)) .onAllGranted(() -> startActivity(MediaSendActivity.buildCameraFirstIntent(requireActivity()))) .onAnyDenied(() -> Toast.makeText(requireContext(), R.string.ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video, Toast.LENGTH_LONG).show()) @@ -718,7 +718,7 @@ public class ConversationListFragment extends MainFragment implements ActionMode private void handleDeleteAllSelected() { int conversationsCount = defaultAdapter.getBatchSelectionIds().size(); AlertDialog.Builder alert = new AlertDialog.Builder(getActivity()); - alert.setIconAttribute(R.attr.dialog_alert_icon); + alert.setIcon(R.drawable.ic_warning); alert.setTitle(getActivity().getResources().getQuantityString(R.plurals.ConversationListFragment_delete_selected_conversations, conversationsCount, conversationsCount)); alert.setMessage(getActivity().getResources().getQuantityString(R.plurals.ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations, diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java index fc27074fd8..f8d566116c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java @@ -29,9 +29,9 @@ import android.view.View; import android.widget.RelativeLayout; import android.widget.TextView; -import androidx.annotation.DrawableRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.lifecycle.LiveData; import androidx.lifecycle.Observer; import androidx.lifecycle.Transformations; @@ -63,7 +63,6 @@ import org.thoughtcrime.securesms.util.Debouncer; import org.thoughtcrime.securesms.util.ExpirationUtil; import org.thoughtcrime.securesms.util.MediaUtil; import org.thoughtcrime.securesms.util.SearchUtil; -import org.thoughtcrime.securesms.util.ThemeUtil; import org.thoughtcrime.securesms.util.ViewUtil; import org.thoughtcrime.securesms.util.livedata.LiveDataUtil; @@ -185,15 +184,15 @@ public final class ConversationListItem extends RelativeLayout observeDisplayBody(getThreadDisplayBody(getContext(), thread)); this.subjectView.setTypeface(thread.isRead() ? LIGHT_TYPEFACE : BOLD_TYPEFACE); - this.subjectView.setTextColor(thread.isRead() ? ThemeUtil.getThemedColor(getContext(), R.attr.conversation_list_item_subject_color) - : ThemeUtil.getThemedColor(getContext(), R.attr.conversation_list_item_unread_color)); + this.subjectView.setTextColor(thread.isRead() ? ContextCompat.getColor(getContext(), R.color.signal_text_secondary) + : ContextCompat.getColor(getContext(), R.color.signal_inverse_primary)); if (thread.getDate() > 0) { CharSequence date = DateUtils.getBriefRelativeTimeSpanString(getContext(), locale, thread.getDate()); dateView.setText(date); dateView.setTypeface(thread.isRead() ? LIGHT_TYPEFACE : BOLD_TYPEFACE); - dateView.setTextColor(thread.isRead() ? ThemeUtil.getThemedColor(getContext(), R.attr.conversation_list_item_date_color) - : ThemeUtil.getThemedColor(getContext(), R.attr.conversation_list_item_unread_color)); + dateView.setTextColor(thread.isRead() ? ContextCompat.getColor(getContext(), R.color.signal_icon_tint_secondary) + : ContextCompat.getColor(getContext(), R.color.signal_inverse_primary)); } if (thread.isArchived()) { @@ -508,7 +507,7 @@ public final class ConversationListItem extends RelativeLayout } private static @NonNull LiveData emphasisAdded(@NonNull Context context, @NonNull String string) { - return emphasisAdded(context, UpdateDescription.staticDescription(string, 0, 0)); + return emphasisAdded(context, UpdateDescription.staticDescription(string, 0)); } private static @NonNull LiveData emphasisAdded(@NonNull Context context, @NonNull UpdateDescription description) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupsV2UpdateMessageProducer.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupsV2UpdateMessageProducer.java index d6d9bb6395..79d43778e1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupsV2UpdateMessageProducer.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupsV2UpdateMessageProducer.java @@ -64,22 +64,22 @@ final class GroupsV2UpdateMessageProducer { UpdateDescription describeNewGroup(@NonNull DecryptedGroup group, @NonNull DecryptedGroupChange decryptedGroupChange) { Optional selfPending = DecryptedGroupUtil.findPendingByUuid(group.getPendingMembersList(), selfUuid); if (selfPending.isPresent()) { - return updateDescription(selfPending.get().getAddedByUuid(), inviteBy -> context.getString(R.string.MessageRecord_s_invited_you_to_the_group, inviteBy), R.drawable.ic_update_group_add_light_16, R.drawable.ic_update_group_add_dark_16); + return updateDescription(selfPending.get().getAddedByUuid(), inviteBy -> context.getString(R.string.MessageRecord_s_invited_you_to_the_group, inviteBy), R.drawable.ic_update_group_add_16); } ByteString foundingMemberUuid = decryptedGroupChange.getEditor(); if (!foundingMemberUuid.isEmpty()) { if (selfUuidBytes.equals(foundingMemberUuid)) { - return updateDescription(context.getString(R.string.MessageRecord_you_created_the_group), R.drawable.ic_update_group_light_16, R.drawable.ic_update_group_dark_16); + return updateDescription(context.getString(R.string.MessageRecord_you_created_the_group), R.drawable.ic_update_group_16); } else { - return updateDescription(foundingMemberUuid, creator -> context.getString(R.string.MessageRecord_s_added_you, creator), R.drawable.ic_update_group_add_light_16, R.drawable.ic_update_group_add_dark_16); + return updateDescription(foundingMemberUuid, creator -> context.getString(R.string.MessageRecord_s_added_you, creator), R.drawable.ic_update_group_add_16); } } if (DecryptedGroupUtil.findMemberByUuid(group.getMembersList(), selfUuid).isPresent()) { - return updateDescription(context.getString(R.string.MessageRecord_you_joined_the_group), R.drawable.ic_update_group_add_light_16, R.drawable.ic_update_group_add_dark_16); + return updateDescription(context.getString(R.string.MessageRecord_you_joined_the_group), R.drawable.ic_update_group_add_16); } else { - return updateDescription(context.getString(R.string.MessageRecord_group_updated), R.drawable.ic_update_group_light_16, R.drawable.ic_update_group_dark_16); + return updateDescription(context.getString(R.string.MessageRecord_group_updated), R.drawable.ic_update_group_16); } } @@ -147,14 +147,14 @@ final class GroupsV2UpdateMessageProducer { boolean editorIsYou = change.getEditor().equals(selfUuidBytes); if (editorIsYou) { - updates.add(updateDescription(context.getString(R.string.MessageRecord_you_updated_group), R.drawable.ic_update_group_light_16, R.drawable.ic_update_group_dark_16)); + updates.add(updateDescription(context.getString(R.string.MessageRecord_you_updated_group), R.drawable.ic_update_group_16)); } else { - updates.add(updateDescription(change.getEditor(), (editor) -> context.getString(R.string.MessageRecord_s_updated_group, editor), R.drawable.ic_update_group_light_16, R.drawable.ic_update_group_dark_16)); + updates.add(updateDescription(change.getEditor(), (editor) -> context.getString(R.string.MessageRecord_s_updated_group, editor), R.drawable.ic_update_group_16)); } } private void describeUnknownEditorUnknownChange(@NonNull List updates) { - updates.add(updateDescription(context.getString(R.string.MessageRecord_the_group_was_updated), R.drawable.ic_update_group_light_16, R.drawable.ic_update_group_dark_16)); + updates.add(updateDescription(context.getString(R.string.MessageRecord_the_group_was_updated), R.drawable.ic_update_group_16)); } private void describeMemberAdditions(@NonNull DecryptedGroupChange change, @NonNull List updates) { @@ -165,18 +165,18 @@ final class GroupsV2UpdateMessageProducer { if (editorIsYou) { if (newMemberIsYou) { - updates.add(0, updateDescription(context.getString(R.string.MessageRecord_you_joined_the_group_via_the_group_link), R.drawable.ic_update_group_accept_light_16, R.drawable.ic_update_group_accept_dark_16)); + updates.add(0, updateDescription(context.getString(R.string.MessageRecord_you_joined_the_group_via_the_group_link), R.drawable.ic_update_group_accept_16)); } else { - updates.add(updateDescription(member.getUuid(), added -> context.getString(R.string.MessageRecord_you_added_s, added), R.drawable.ic_update_group_add_light_16, R.drawable.ic_update_group_add_dark_16)); + updates.add(updateDescription(member.getUuid(), added -> context.getString(R.string.MessageRecord_you_added_s, added), R.drawable.ic_update_group_add_16)); } } else { if (newMemberIsYou) { - updates.add(0, updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_added_you, editor), R.drawable.ic_update_group_add_light_16, R.drawable.ic_update_group_add_dark_16)); + updates.add(0, updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_added_you, editor), R.drawable.ic_update_group_add_16)); } else { if (member.getUuid().equals(change.getEditor())) { - updates.add(updateDescription(member.getUuid(), newMember -> context.getString(R.string.MessageRecord_s_joined_the_group_via_the_group_link, newMember), R.drawable.ic_update_group_accept_light_16, R.drawable.ic_update_group_accept_dark_16)); + updates.add(updateDescription(member.getUuid(), newMember -> context.getString(R.string.MessageRecord_s_joined_the_group_via_the_group_link, newMember), R.drawable.ic_update_group_accept_16)); } else { - updates.add(updateDescription(change.getEditor(), member.getUuid(), (editor, newMember) -> context.getString(R.string.MessageRecord_s_added_s, editor, newMember), R.drawable.ic_update_group_add_light_16, R.drawable.ic_update_group_add_dark_16)); + updates.add(updateDescription(change.getEditor(), member.getUuid(), (editor, newMember) -> context.getString(R.string.MessageRecord_s_added_s, editor, newMember), R.drawable.ic_update_group_add_16)); } } } @@ -188,9 +188,9 @@ final class GroupsV2UpdateMessageProducer { boolean newMemberIsYou = member.getUuid().equals(selfUuidBytes); if (newMemberIsYou) { - updates.add(0, updateDescription(context.getString(R.string.MessageRecord_you_joined_the_group), R.drawable.ic_update_group_add_light_16, R.drawable.ic_update_group_add_dark_16)); + updates.add(0, updateDescription(context.getString(R.string.MessageRecord_you_joined_the_group), R.drawable.ic_update_group_add_16)); } else { - updates.add(updateDescription(member.getUuid(), newMember -> context.getString(R.string.MessageRecord_s_joined_the_group, newMember), R.drawable.ic_update_group_add_light_16, R.drawable.ic_update_group_add_dark_16)); + updates.add(updateDescription(member.getUuid(), newMember -> context.getString(R.string.MessageRecord_s_joined_the_group, newMember), R.drawable.ic_update_group_add_16)); } } } @@ -203,18 +203,18 @@ final class GroupsV2UpdateMessageProducer { if (editorIsYou) { if (removedMemberIsYou) { - updates.add(updateDescription(context.getString(R.string.MessageRecord_you_left_the_group), R.drawable.ic_update_group_leave_light_16, R.drawable.ic_update_group_leave_dark_16)); + updates.add(updateDescription(context.getString(R.string.MessageRecord_you_left_the_group), R.drawable.ic_update_group_leave_16)); } else { - updates.add(updateDescription(member, removedMember -> context.getString(R.string.MessageRecord_you_removed_s, removedMember), R.drawable.ic_update_group_remove_light_16, R.drawable.ic_update_group_remove_dark_16)); + updates.add(updateDescription(member, removedMember -> context.getString(R.string.MessageRecord_you_removed_s, removedMember), R.drawable.ic_update_group_remove_16)); } } else { if (removedMemberIsYou) { - updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_removed_you_from_the_group, editor), R.drawable.ic_update_group_remove_light_16, R.drawable.ic_update_group_remove_dark_16)); + updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_removed_you_from_the_group, editor), R.drawable.ic_update_group_remove_16)); } else { if (member.equals(change.getEditor())) { - updates.add(updateDescription(member, leavingMember -> context.getString(R.string.MessageRecord_s_left_the_group, leavingMember), R.drawable.ic_update_group_leave_light_16, R.drawable.ic_update_group_leave_dark_16)); + updates.add(updateDescription(member, leavingMember -> context.getString(R.string.MessageRecord_s_left_the_group, leavingMember), R.drawable.ic_update_group_leave_16)); } else { - updates.add(updateDescription(change.getEditor(), member, (editor, removedMember) -> context.getString(R.string.MessageRecord_s_removed_s, editor, removedMember), R.drawable.ic_update_group_remove_light_16, R.drawable.ic_update_group_remove_dark_16)); + updates.add(updateDescription(change.getEditor(), member, (editor, removedMember) -> context.getString(R.string.MessageRecord_s_removed_s, editor, removedMember), R.drawable.ic_update_group_remove_16)); } } } @@ -226,9 +226,9 @@ final class GroupsV2UpdateMessageProducer { boolean removedMemberIsYou = member.equals(selfUuidBytes); if (removedMemberIsYou) { - updates.add(updateDescription(context.getString(R.string.MessageRecord_you_are_no_longer_in_the_group), R.drawable.ic_update_group_leave_light_16, R.drawable.ic_update_group_leave_dark_16)); + updates.add(updateDescription(context.getString(R.string.MessageRecord_you_are_no_longer_in_the_group), R.drawable.ic_update_group_leave_16)); } else { - updates.add(updateDescription(member, oldMember -> context.getString(R.string.MessageRecord_s_is_no_longer_in_the_group, oldMember), R.drawable.ic_update_group_leave_light_16, R.drawable.ic_update_group_leave_dark_16)); + updates.add(updateDescription(member, oldMember -> context.getString(R.string.MessageRecord_s_is_no_longer_in_the_group, oldMember), R.drawable.ic_update_group_leave_16)); } } } @@ -240,23 +240,23 @@ final class GroupsV2UpdateMessageProducer { boolean changedMemberIsYou = roleChange.getUuid().equals(selfUuidBytes); if (roleChange.getRole() == Member.Role.ADMINISTRATOR) { if (editorIsYou) { - updates.add(updateDescription(roleChange.getUuid(), newAdmin -> context.getString(R.string.MessageRecord_you_made_s_an_admin, newAdmin), R.drawable.ic_update_group_role_light_16, R.drawable.ic_update_group_role_dark_16)); + updates.add(updateDescription(roleChange.getUuid(), newAdmin -> context.getString(R.string.MessageRecord_you_made_s_an_admin, newAdmin), R.drawable.ic_update_group_role_16)); } else { if (changedMemberIsYou) { - updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_made_you_an_admin, editor), R.drawable.ic_update_group_role_light_16, R.drawable.ic_update_group_role_dark_16)); + updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_made_you_an_admin, editor), R.drawable.ic_update_group_role_16)); } else { - updates.add(updateDescription(change.getEditor(), roleChange.getUuid(), (editor, newAdmin) -> context.getString(R.string.MessageRecord_s_made_s_an_admin, editor, newAdmin), R.drawable.ic_update_group_role_light_16, R.drawable.ic_update_group_role_dark_16)); + updates.add(updateDescription(change.getEditor(), roleChange.getUuid(), (editor, newAdmin) -> context.getString(R.string.MessageRecord_s_made_s_an_admin, editor, newAdmin), R.drawable.ic_update_group_role_16)); } } } else { if (editorIsYou) { - updates.add(updateDescription(roleChange.getUuid(), oldAdmin -> context.getString(R.string.MessageRecord_you_revoked_admin_privileges_from_s, oldAdmin), R.drawable.ic_update_group_role_light_16, R.drawable.ic_update_group_role_dark_16)); + updates.add(updateDescription(roleChange.getUuid(), oldAdmin -> context.getString(R.string.MessageRecord_you_revoked_admin_privileges_from_s, oldAdmin), R.drawable.ic_update_group_role_16)); } else { if (changedMemberIsYou) { - updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_revoked_your_admin_privileges, editor), R.drawable.ic_update_group_role_light_16, R.drawable.ic_update_group_role_dark_16)); + updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_revoked_your_admin_privileges, editor), R.drawable.ic_update_group_role_16)); } else { - updates.add(updateDescription(change.getEditor(), roleChange.getUuid(), (editor, oldAdmin) -> context.getString(R.string.MessageRecord_s_revoked_admin_privileges_from_s, editor, oldAdmin), R.drawable.ic_update_group_role_light_16, R.drawable.ic_update_group_role_dark_16)); + updates.add(updateDescription(change.getEditor(), roleChange.getUuid(), (editor, oldAdmin) -> context.getString(R.string.MessageRecord_s_revoked_admin_privileges_from_s, editor, oldAdmin), R.drawable.ic_update_group_role_16)); } } } @@ -269,15 +269,15 @@ final class GroupsV2UpdateMessageProducer { if (roleChange.getRole() == Member.Role.ADMINISTRATOR) { if (changedMemberIsYou) { - updates.add(updateDescription(context.getString(R.string.MessageRecord_you_are_now_an_admin), R.drawable.ic_update_group_role_light_16, R.drawable.ic_update_group_role_dark_16)); + updates.add(updateDescription(context.getString(R.string.MessageRecord_you_are_now_an_admin), R.drawable.ic_update_group_role_16)); } else { - updates.add(updateDescription(roleChange.getUuid(), newAdmin -> context.getString(R.string.MessageRecord_s_is_now_an_admin, newAdmin), R.drawable.ic_update_group_role_light_16, R.drawable.ic_update_group_role_dark_16)); + updates.add(updateDescription(roleChange.getUuid(), newAdmin -> context.getString(R.string.MessageRecord_s_is_now_an_admin, newAdmin), R.drawable.ic_update_group_role_16)); } } else { if (changedMemberIsYou) { - updates.add(updateDescription(context.getString(R.string.MessageRecord_you_are_no_longer_an_admin), R.drawable.ic_update_group_role_light_16, R.drawable.ic_update_group_role_dark_16)); + updates.add(updateDescription(context.getString(R.string.MessageRecord_you_are_no_longer_an_admin), R.drawable.ic_update_group_role_16)); } else { - updates.add(updateDescription(roleChange.getUuid(), oldAdmin -> context.getString(R.string.MessageRecord_s_is_no_longer_an_admin, oldAdmin), R.drawable.ic_update_group_role_light_16, R.drawable.ic_update_group_role_dark_16)); + updates.add(updateDescription(roleChange.getUuid(), oldAdmin -> context.getString(R.string.MessageRecord_s_is_no_longer_an_admin, oldAdmin), R.drawable.ic_update_group_role_16)); } } } @@ -291,10 +291,10 @@ final class GroupsV2UpdateMessageProducer { boolean newMemberIsYou = invitee.getUuid().equals(selfUuidBytes); if (newMemberIsYou) { - updates.add(0, updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_invited_you_to_the_group, editor), R.drawable.ic_update_group_add_light_16, R.drawable.ic_update_group_add_dark_16)); + updates.add(0, updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_invited_you_to_the_group, editor), R.drawable.ic_update_group_add_16)); } else { if (editorIsYou) { - updates.add(updateDescription(invitee.getUuid(), newInvitee -> context.getString(R.string.MessageRecord_you_invited_s_to_the_group, newInvitee), R.drawable.ic_update_group_add_light_16, R.drawable.ic_update_group_add_dark_16)); + updates.add(updateDescription(invitee.getUuid(), newInvitee -> context.getString(R.string.MessageRecord_you_invited_s_to_the_group, newInvitee), R.drawable.ic_update_group_add_16)); } else { notYouInviteCount++; } @@ -303,7 +303,7 @@ final class GroupsV2UpdateMessageProducer { if (notYouInviteCount > 0) { final int notYouInviteCountFinalCopy = notYouInviteCount; - updates.add(updateDescription(change.getEditor(), editor -> context.getResources().getQuantityString(R.plurals.MessageRecord_s_invited_members, notYouInviteCountFinalCopy, editor, notYouInviteCountFinalCopy), R.drawable.ic_update_group_add_light_16, R.drawable.ic_update_group_add_dark_16)); + updates.add(updateDescription(change.getEditor(), editor -> context.getResources().getQuantityString(R.plurals.MessageRecord_s_invited_members, notYouInviteCountFinalCopy, editor, notYouInviteCountFinalCopy), R.drawable.ic_update_group_add_16)); } } @@ -317,9 +317,9 @@ final class GroupsV2UpdateMessageProducer { UUID uuid = UuidUtil.fromByteStringOrUnknown(invitee.getAddedByUuid()); if (UuidUtil.UNKNOWN_UUID.equals(uuid)) { - updates.add(0, updateDescription(context.getString(R.string.MessageRecord_you_were_invited_to_the_group), R.drawable.ic_update_group_add_light_16, R.drawable.ic_update_group_add_dark_16)); + updates.add(0, updateDescription(context.getString(R.string.MessageRecord_you_were_invited_to_the_group), R.drawable.ic_update_group_add_16)); } else { - updates.add(0, updateDescription(invitee.getAddedByUuid(), editor -> context.getString(R.string.MessageRecord_s_invited_you_to_the_group, editor), R.drawable.ic_update_group_add_light_16, R.drawable.ic_update_group_add_dark_16)); + updates.add(0, updateDescription(invitee.getAddedByUuid(), editor -> context.getString(R.string.MessageRecord_s_invited_you_to_the_group, editor), R.drawable.ic_update_group_add_16)); } } else { notYouInviteCount++; @@ -327,7 +327,7 @@ final class GroupsV2UpdateMessageProducer { } if (notYouInviteCount > 0) { - updates.add(updateDescription(context.getResources().getQuantityString(R.plurals.MessageRecord_d_people_were_invited_to_the_group, notYouInviteCount, notYouInviteCount), R.drawable.ic_update_group_add_light_16, R.drawable.ic_update_group_add_dark_16)); + updates.add(updateDescription(context.getResources().getQuantityString(R.plurals.MessageRecord_d_people_were_invited_to_the_group, notYouInviteCount, notYouInviteCount), R.drawable.ic_update_group_add_16)); } } @@ -339,12 +339,12 @@ final class GroupsV2UpdateMessageProducer { boolean decline = invitee.getUuid().equals(change.getEditor()); if (decline) { if (editorIsYou) { - updates.add(updateDescription(context.getString(R.string.MessageRecord_you_declined_the_invitation_to_the_group), R.drawable.ic_update_group_decline_light_16, R.drawable.ic_update_group_decline_dark_16)); + updates.add(updateDescription(context.getString(R.string.MessageRecord_you_declined_the_invitation_to_the_group), R.drawable.ic_update_group_decline_16)); } else { - updates.add(updateDescription(context.getString(R.string.MessageRecord_someone_declined_an_invitation_to_the_group), R.drawable.ic_update_group_decline_light_16, R.drawable.ic_update_group_decline_dark_16)); + updates.add(updateDescription(context.getString(R.string.MessageRecord_someone_declined_an_invitation_to_the_group), R.drawable.ic_update_group_decline_16)); } } else if (invitee.getUuid().equals(selfUuidBytes)) { - updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_revoked_your_invitation_to_the_group, editor), R.drawable.ic_update_group_decline_light_16, R.drawable.ic_update_group_decline_dark_16)); + updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_revoked_your_invitation_to_the_group, editor), R.drawable.ic_update_group_decline_16)); } else { notDeclineCount++; } @@ -352,10 +352,10 @@ final class GroupsV2UpdateMessageProducer { if (notDeclineCount > 0) { if (editorIsYou) { - updates.add(updateDescription(context.getResources().getQuantityString(R.plurals.MessageRecord_you_revoked_invites, notDeclineCount, notDeclineCount), R.drawable.ic_update_group_decline_light_16, R.drawable.ic_update_group_decline_dark_16)); + updates.add(updateDescription(context.getResources().getQuantityString(R.plurals.MessageRecord_you_revoked_invites, notDeclineCount, notDeclineCount), R.drawable.ic_update_group_decline_16)); } else { final int notDeclineCountFinalCopy = notDeclineCount; - updates.add(updateDescription(change.getEditor(), editor -> context.getResources().getQuantityString(R.plurals.MessageRecord_s_revoked_invites, notDeclineCountFinalCopy, editor, notDeclineCountFinalCopy), R.drawable.ic_update_group_decline_light_16, R.drawable.ic_update_group_decline_dark_16)); + updates.add(updateDescription(change.getEditor(), editor -> context.getResources().getQuantityString(R.plurals.MessageRecord_s_revoked_invites, notDeclineCountFinalCopy, editor, notDeclineCountFinalCopy), R.drawable.ic_update_group_decline_16)); } } } @@ -367,14 +367,14 @@ final class GroupsV2UpdateMessageProducer { boolean inviteeWasYou = invitee.getUuid().equals(selfUuidBytes); if (inviteeWasYou) { - updates.add(updateDescription(context.getString(R.string.MessageRecord_an_admin_revoked_your_invitation_to_the_group), R.drawable.ic_update_group_decline_light_16, R.drawable.ic_update_group_decline_dark_16)); + updates.add(updateDescription(context.getString(R.string.MessageRecord_an_admin_revoked_your_invitation_to_the_group), R.drawable.ic_update_group_decline_16)); } else { notDeclineCount++; } } if (notDeclineCount > 0) { - updates.add(updateDescription(context.getResources().getQuantityString(R.plurals.MessageRecord_d_invitations_were_revoked, notDeclineCount, notDeclineCount), R.drawable.ic_update_group_decline_light_16, R.drawable.ic_update_group_decline_dark_16)); + updates.add(updateDescription(context.getResources().getQuantityString(R.plurals.MessageRecord_d_invitations_were_revoked, notDeclineCount, notDeclineCount), R.drawable.ic_update_group_decline_16)); } } @@ -387,18 +387,18 @@ final class GroupsV2UpdateMessageProducer { if (editorIsYou) { if (newMemberIsYou) { - updates.add(updateDescription(context.getString(R.string.MessageRecord_you_accepted_invite), R.drawable.ic_update_group_accept_light_16, R.drawable.ic_update_group_accept_dark_16)); + updates.add(updateDescription(context.getString(R.string.MessageRecord_you_accepted_invite), R.drawable.ic_update_group_accept_16)); } else { - updates.add(updateDescription(uuid, newPromotedMember -> context.getString(R.string.MessageRecord_you_added_invited_member_s, newPromotedMember), R.drawable.ic_update_group_add_light_16, R.drawable.ic_update_group_add_dark_16)); + updates.add(updateDescription(uuid, newPromotedMember -> context.getString(R.string.MessageRecord_you_added_invited_member_s, newPromotedMember), R.drawable.ic_update_group_add_16)); } } else { if (newMemberIsYou) { - updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_added_you, editor), R.drawable.ic_update_group_add_light_16, R.drawable.ic_update_group_add_light_16)); + updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_added_you, editor), R.drawable.ic_update_group_add_16)); } else { if (uuid.equals(change.getEditor())) { - updates.add(updateDescription(uuid, newAcceptedMember -> context.getString(R.string.MessageRecord_s_accepted_invite, newAcceptedMember), R.drawable.ic_update_group_accept_light_16, R.drawable.ic_update_group_accept_dark_16)); + updates.add(updateDescription(uuid, newAcceptedMember -> context.getString(R.string.MessageRecord_s_accepted_invite, newAcceptedMember), R.drawable.ic_update_group_accept_16)); } else { - updates.add(updateDescription(change.getEditor(), uuid, (editor, newAcceptedMember) -> context.getString(R.string.MessageRecord_s_added_invited_member_s, editor, newAcceptedMember), R.drawable.ic_update_group_add_light_16, R.drawable.ic_update_group_add_dark_16)); + updates.add(updateDescription(change.getEditor(), uuid, (editor, newAcceptedMember) -> context.getString(R.string.MessageRecord_s_added_invited_member_s, editor, newAcceptedMember), R.drawable.ic_update_group_add_16)); } } } @@ -411,9 +411,9 @@ final class GroupsV2UpdateMessageProducer { boolean newMemberIsYou = uuid.equals(selfUuidBytes); if (newMemberIsYou) { - updates.add(updateDescription(context.getString(R.string.MessageRecord_you_joined_the_group), R.drawable.ic_update_group_add_light_16, R.drawable.ic_update_group_add_dark_16)); + updates.add(updateDescription(context.getString(R.string.MessageRecord_you_joined_the_group), R.drawable.ic_update_group_add_16)); } else { - updates.add(updateDescription(uuid, newMemberName -> context.getString(R.string.MessageRecord_s_joined_the_group, newMemberName), R.drawable.ic_update_group_add_light_16, R.drawable.ic_update_group_add_dark_16)); + updates.add(updateDescription(uuid, newMemberName -> context.getString(R.string.MessageRecord_s_joined_the_group, newMemberName), R.drawable.ic_update_group_add_16)); } } } @@ -424,16 +424,16 @@ final class GroupsV2UpdateMessageProducer { if (change.hasNewTitle()) { String newTitle = StringUtil.isolateBidi(change.getNewTitle().getValue()); if (editorIsYou) { - updates.add(updateDescription(context.getString(R.string.MessageRecord_you_changed_the_group_name_to_s, newTitle), R.drawable.ic_update_group_name_light_16, R.drawable.ic_update_group_name_dark_16)); + updates.add(updateDescription(context.getString(R.string.MessageRecord_you_changed_the_group_name_to_s, newTitle), R.drawable.ic_update_group_name_16)); } else { - updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_changed_the_group_name_to_s, editor, newTitle), R.drawable.ic_update_group_name_light_16, R.drawable.ic_update_group_name_dark_16)); + updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_changed_the_group_name_to_s, editor, newTitle), R.drawable.ic_update_group_name_16)); } } } private void describeUnknownEditorNewTitle(@NonNull DecryptedGroupChange change, @NonNull List updates) { if (change.hasNewTitle()) { - updates.add(updateDescription(context.getString(R.string.MessageRecord_the_group_name_has_changed_to_s, StringUtil.isolateBidi(change.getNewTitle().getValue())), R.drawable.ic_update_group_name_light_16, R.drawable.ic_update_group_name_dark_16)); + updates.add(updateDescription(context.getString(R.string.MessageRecord_the_group_name_has_changed_to_s, StringUtil.isolateBidi(change.getNewTitle().getValue())), R.drawable.ic_update_group_name_16)); } } @@ -442,16 +442,16 @@ final class GroupsV2UpdateMessageProducer { if (change.hasNewAvatar()) { if (editorIsYou) { - updates.add(updateDescription(context.getString(R.string.MessageRecord_you_changed_the_group_avatar), R.drawable.ic_update_group_avatar_light_16, R.drawable.ic_update_group_avatar_dark_16)); + updates.add(updateDescription(context.getString(R.string.MessageRecord_you_changed_the_group_avatar), R.drawable.ic_update_group_avatar_16)); } else { - updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_changed_the_group_avatar, editor), R.drawable.ic_update_group_avatar_light_16, R.drawable.ic_update_group_avatar_dark_16)); + updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_changed_the_group_avatar, editor), R.drawable.ic_update_group_avatar_16)); } } } private void describeUnknownEditorNewAvatar(@NonNull DecryptedGroupChange change, @NonNull List updates) { if (change.hasNewAvatar()) { - updates.add(updateDescription(context.getString(R.string.MessageRecord_the_group_group_avatar_has_been_changed), R.drawable.ic_update_group_avatar_light_16, R.drawable.ic_update_group_avatar_dark_16)); + updates.add(updateDescription(context.getString(R.string.MessageRecord_the_group_group_avatar_has_been_changed), R.drawable.ic_update_group_avatar_16)); } } @@ -461,9 +461,9 @@ final class GroupsV2UpdateMessageProducer { if (change.hasNewTimer()) { String time = ExpirationUtil.getExpirationDisplayValue(context, change.getNewTimer().getDuration()); if (editorIsYou) { - updates.add(updateDescription(context.getString(R.string.MessageRecord_you_set_disappearing_message_time_to_s, time), R.drawable.ic_update_timer_light_16, R.drawable.ic_update_timer_dark_16)); + updates.add(updateDescription(context.getString(R.string.MessageRecord_you_set_disappearing_message_time_to_s, time), R.drawable.ic_update_timer_16)); } else { - updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_set_disappearing_message_time_to_s, editor, time), R.drawable.ic_update_timer_light_16, R.drawable.ic_update_timer_dark_16)); + updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_set_disappearing_message_time_to_s, editor, time), R.drawable.ic_update_timer_16)); } } } @@ -471,7 +471,7 @@ final class GroupsV2UpdateMessageProducer { private void describeUnknownEditorNewTimer(@NonNull DecryptedGroupChange change, @NonNull List updates) { if (change.hasNewTimer()) { String time = ExpirationUtil.getExpirationDisplayValue(context, change.getNewTimer().getDuration()); - updates.add(updateDescription(context.getString(R.string.MessageRecord_disappearing_message_time_set_to_s, time), R.drawable.ic_update_timer_light_16, R.drawable.ic_update_timer_dark_16)); + updates.add(updateDescription(context.getString(R.string.MessageRecord_disappearing_message_time_set_to_s, time), R.drawable.ic_update_timer_16)); } } @@ -481,9 +481,9 @@ final class GroupsV2UpdateMessageProducer { if (change.getNewAttributeAccess() != AccessControl.AccessRequired.UNKNOWN) { String accessLevel = GV2AccessLevelUtil.toString(context, change.getNewAttributeAccess()); if (editorIsYou) { - updates.add(updateDescription(context.getString(R.string.MessageRecord_you_changed_who_can_edit_group_info_to_s, accessLevel), R.drawable.ic_update_group_role_light_16, R.drawable.ic_update_group_role_dark_16)); + updates.add(updateDescription(context.getString(R.string.MessageRecord_you_changed_who_can_edit_group_info_to_s, accessLevel), R.drawable.ic_update_group_role_16)); } else { - updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_changed_who_can_edit_group_info_to_s, editor, accessLevel), R.drawable.ic_update_group_role_light_16, R.drawable.ic_update_group_role_dark_16)); + updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_changed_who_can_edit_group_info_to_s, editor, accessLevel), R.drawable.ic_update_group_role_16)); } } } @@ -491,7 +491,7 @@ final class GroupsV2UpdateMessageProducer { private void describeUnknownEditorNewAttributeAccess(@NonNull DecryptedGroupChange change, @NonNull List updates) { if (change.getNewAttributeAccess() != AccessControl.AccessRequired.UNKNOWN) { String accessLevel = GV2AccessLevelUtil.toString(context, change.getNewAttributeAccess()); - updates.add(updateDescription(context.getString(R.string.MessageRecord_who_can_edit_group_info_has_been_changed_to_s, accessLevel), R.drawable.ic_update_group_role_light_16, R.drawable.ic_update_group_role_dark_16)); + updates.add(updateDescription(context.getString(R.string.MessageRecord_who_can_edit_group_info_has_been_changed_to_s, accessLevel), R.drawable.ic_update_group_role_16)); } } @@ -501,9 +501,9 @@ final class GroupsV2UpdateMessageProducer { if (change.getNewMemberAccess() != AccessControl.AccessRequired.UNKNOWN) { String accessLevel = GV2AccessLevelUtil.toString(context, change.getNewMemberAccess()); if (editorIsYou) { - updates.add(updateDescription(context.getString(R.string.MessageRecord_you_changed_who_can_edit_group_membership_to_s, accessLevel), R.drawable.ic_update_group_role_light_16, R.drawable.ic_update_group_role_dark_16)); + updates.add(updateDescription(context.getString(R.string.MessageRecord_you_changed_who_can_edit_group_membership_to_s, accessLevel), R.drawable.ic_update_group_role_16)); } else { - updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_changed_who_can_edit_group_membership_to_s, editor, accessLevel), R.drawable.ic_update_group_role_light_16, R.drawable.ic_update_group_role_dark_16)); + updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_changed_who_can_edit_group_membership_to_s, editor, accessLevel), R.drawable.ic_update_group_role_16)); } } } @@ -511,7 +511,7 @@ final class GroupsV2UpdateMessageProducer { private void describeUnknownEditorNewMembershipAccess(@NonNull DecryptedGroupChange change, @NonNull List updates) { if (change.getNewMemberAccess() != AccessControl.AccessRequired.UNKNOWN) { String accessLevel = GV2AccessLevelUtil.toString(context, change.getNewMemberAccess()); - updates.add(updateDescription(context.getString(R.string.MessageRecord_who_can_edit_group_membership_has_been_changed_to_s, accessLevel), R.drawable.ic_update_group_role_light_16, R.drawable.ic_update_group_role_dark_16)); + updates.add(updateDescription(context.getString(R.string.MessageRecord_who_can_edit_group_membership_has_been_changed_to_s, accessLevel), R.drawable.ic_update_group_role_16)); } } @@ -533,15 +533,15 @@ final class GroupsV2UpdateMessageProducer { groupLinkEnabled = true; if (editorIsYou) { if (previousAccessControl == AccessControl.AccessRequired.ADMINISTRATOR) { - updates.add(updateDescription(context.getString(R.string.MessageRecord_you_turned_off_admin_approval_for_the_group_link), R.drawable.ic_update_group_role_light_16, R.drawable.ic_update_group_role_dark_16)); + updates.add(updateDescription(context.getString(R.string.MessageRecord_you_turned_off_admin_approval_for_the_group_link), R.drawable.ic_update_group_role_16)); } else { - updates.add(updateDescription(context.getString(R.string.MessageRecord_you_turned_on_the_group_link_with_admin_approval_off), R.drawable.ic_update_group_role_light_16, R.drawable.ic_update_group_role_dark_16)); + updates.add(updateDescription(context.getString(R.string.MessageRecord_you_turned_on_the_group_link_with_admin_approval_off), R.drawable.ic_update_group_role_16)); } } else { if (previousAccessControl == AccessControl.AccessRequired.ADMINISTRATOR) { - updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_turned_off_admin_approval_for_the_group_link, editor), R.drawable.ic_update_group_role_light_16, R.drawable.ic_update_group_role_dark_16)); + updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_turned_off_admin_approval_for_the_group_link, editor), R.drawable.ic_update_group_role_16)); } else { - updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_turned_on_the_group_link_with_admin_approval_off, editor), R.drawable.ic_update_group_role_light_16, R.drawable.ic_update_group_role_dark_16)); + updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_turned_on_the_group_link_with_admin_approval_off, editor), R.drawable.ic_update_group_role_16)); } } break; @@ -549,32 +549,32 @@ final class GroupsV2UpdateMessageProducer { groupLinkEnabled = true; if (editorIsYou) { if (previousAccessControl == AccessControl.AccessRequired.ANY) { - updates.add(updateDescription(context.getString(R.string.MessageRecord_you_turned_on_admin_approval_for_the_group_link), R.drawable.ic_update_group_role_light_16, R.drawable.ic_update_group_role_dark_16)); + updates.add(updateDescription(context.getString(R.string.MessageRecord_you_turned_on_admin_approval_for_the_group_link), R.drawable.ic_update_group_role_16)); } else { - updates.add(updateDescription(context.getString(R.string.MessageRecord_you_turned_on_the_group_link_with_admin_approval_on), R.drawable.ic_update_group_role_light_16, R.drawable.ic_update_group_role_dark_16)); + updates.add(updateDescription(context.getString(R.string.MessageRecord_you_turned_on_the_group_link_with_admin_approval_on), R.drawable.ic_update_group_role_16)); } } else { if (previousAccessControl == AccessControl.AccessRequired.ANY) { - updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_turned_on_admin_approval_for_the_group_link, editor), R.drawable.ic_update_group_role_light_16, R.drawable.ic_update_group_role_dark_16)); + updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_turned_on_admin_approval_for_the_group_link, editor), R.drawable.ic_update_group_role_16)); } else { - updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_turned_on_the_group_link_with_admin_approval_on, editor), R.drawable.ic_update_group_role_light_16, R.drawable.ic_update_group_role_dark_16)); + updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_turned_on_the_group_link_with_admin_approval_on, editor), R.drawable.ic_update_group_role_16)); } } break; case UNSATISFIABLE: if (editorIsYou) { - updates.add(updateDescription(context.getString(R.string.MessageRecord_you_turned_off_the_group_link), R.drawable.ic_update_group_role_light_16, R.drawable.ic_update_group_role_dark_16)); + updates.add(updateDescription(context.getString(R.string.MessageRecord_you_turned_off_the_group_link), R.drawable.ic_update_group_role_16)); } else { - updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_turned_off_the_group_link, editor), R.drawable.ic_update_group_role_light_16, R.drawable.ic_update_group_role_dark_16)); + updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_turned_off_the_group_link, editor), R.drawable.ic_update_group_role_16)); } break; } if (!groupLinkEnabled && change.getNewInviteLinkPassword().size() > 0) { if (editorIsYou) { - updates.add(updateDescription(context.getString(R.string.MessageRecord_you_reset_the_group_link), R.drawable.ic_update_group_role_light_16, R.drawable.ic_update_group_role_dark_16)); + updates.add(updateDescription(context.getString(R.string.MessageRecord_you_reset_the_group_link), R.drawable.ic_update_group_role_16)); } else { - updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_reset_the_group_link, editor), R.drawable.ic_update_group_role_light_16, R.drawable.ic_update_group_role_dark_16)); + updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_reset_the_group_link, editor), R.drawable.ic_update_group_role_16)); } } } @@ -592,25 +592,25 @@ final class GroupsV2UpdateMessageProducer { switch (change.getNewInviteLinkAccess()) { case ANY: if (previousAccessControl == AccessControl.AccessRequired.ADMINISTRATOR) { - updates.add(updateDescription(context.getString(R.string.MessageRecord_the_admin_approval_for_the_group_link_has_been_turned_off), R.drawable.ic_update_group_role_light_16, R.drawable.ic_update_group_role_dark_16)); + updates.add(updateDescription(context.getString(R.string.MessageRecord_the_admin_approval_for_the_group_link_has_been_turned_off), R.drawable.ic_update_group_role_16)); } else { - updates.add(updateDescription(context.getString(R.string.MessageRecord_the_group_link_has_been_turned_on_with_admin_approval_off), R.drawable.ic_update_group_role_light_16, R.drawable.ic_update_group_role_dark_16)); + updates.add(updateDescription(context.getString(R.string.MessageRecord_the_group_link_has_been_turned_on_with_admin_approval_off), R.drawable.ic_update_group_role_16)); } break; case ADMINISTRATOR: if (previousAccessControl == AccessControl.AccessRequired.ANY) { - updates.add(updateDescription(context.getString(R.string.MessageRecord_the_admin_approval_for_the_group_link_has_been_turned_on), R.drawable.ic_update_group_role_light_16, R.drawable.ic_update_group_role_dark_16)); + updates.add(updateDescription(context.getString(R.string.MessageRecord_the_admin_approval_for_the_group_link_has_been_turned_on), R.drawable.ic_update_group_role_16)); } else { - updates.add(updateDescription(context.getString(R.string.MessageRecord_the_group_link_has_been_turned_on_with_admin_approval_on), R.drawable.ic_update_group_role_light_16, R.drawable.ic_update_group_role_dark_16)); + updates.add(updateDescription(context.getString(R.string.MessageRecord_the_group_link_has_been_turned_on_with_admin_approval_on), R.drawable.ic_update_group_role_16)); } break; case UNSATISFIABLE: - updates.add(updateDescription(context.getString(R.string.MessageRecord_the_group_link_has_been_turned_off), R.drawable.ic_update_group_role_light_16, R.drawable.ic_update_group_role_dark_16)); + updates.add(updateDescription(context.getString(R.string.MessageRecord_the_group_link_has_been_turned_off), R.drawable.ic_update_group_role_16)); break; } if (change.getNewInviteLinkPassword().size() > 0) { - updates.add(updateDescription(context.getString(R.string.MessageRecord_the_group_link_has_been_reset), R.drawable.ic_update_group_role_light_16, R.drawable.ic_update_group_role_dark_16)); + updates.add(updateDescription(context.getString(R.string.MessageRecord_the_group_link_has_been_reset), R.drawable.ic_update_group_role_16)); } } @@ -619,9 +619,9 @@ final class GroupsV2UpdateMessageProducer { boolean requestingMemberIsYou = member.getUuid().equals(selfUuidBytes); if (requestingMemberIsYou) { - updates.add(updateDescription(context.getString(R.string.MessageRecord_you_sent_a_request_to_join_the_group), R.drawable.ic_update_group_light_16, R.drawable.ic_update_group_dark_16)); + updates.add(updateDescription(context.getString(R.string.MessageRecord_you_sent_a_request_to_join_the_group), R.drawable.ic_update_group_16)); } else { - updates.add(updateDescription(member.getUuid(), requesting -> context.getString(R.string.MessageRecord_s_requested_to_join_via_the_group_link, requesting), R.drawable.ic_update_group_light_16, R.drawable.ic_update_group_dark_16)); + updates.add(updateDescription(member.getUuid(), requesting -> context.getString(R.string.MessageRecord_s_requested_to_join_via_the_group_link, requesting), R.drawable.ic_update_group_16)); } } } @@ -631,14 +631,14 @@ final class GroupsV2UpdateMessageProducer { boolean requestingMemberIsYou = requestingMember.getUuid().equals(selfUuidBytes); if (requestingMemberIsYou) { - updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_approved_your_request_to_join_the_group, editor), R.drawable.ic_update_group_accept_light_16, R.drawable.ic_update_group_accept_dark_16)); + updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_approved_your_request_to_join_the_group, editor), R.drawable.ic_update_group_accept_16)); } else { boolean editorIsYou = change.getEditor().equals(selfUuidBytes); if (editorIsYou) { - updates.add(updateDescription(requestingMember.getUuid(), requesting -> context.getString(R.string.MessageRecord_you_approved_a_request_to_join_the_group_from_s, requesting), R.drawable.ic_update_group_accept_light_16, R.drawable.ic_update_group_accept_dark_16)); + updates.add(updateDescription(requestingMember.getUuid(), requesting -> context.getString(R.string.MessageRecord_you_approved_a_request_to_join_the_group_from_s, requesting), R.drawable.ic_update_group_accept_16)); } else { - updates.add(updateDescription(change.getEditor(), requestingMember.getUuid(), (editor, requesting) -> context.getString(R.string.MessageRecord_s_approved_a_request_to_join_the_group_from_s, editor, requesting), R.drawable.ic_update_group_accept_light_16, R.drawable.ic_update_group_accept_dark_16)); + updates.add(updateDescription(change.getEditor(), requestingMember.getUuid(), (editor, requesting) -> context.getString(R.string.MessageRecord_s_approved_a_request_to_join_the_group_from_s, editor, requesting), R.drawable.ic_update_group_accept_16)); } } } @@ -649,9 +649,9 @@ final class GroupsV2UpdateMessageProducer { boolean requestingMemberIsYou = requestingMember.getUuid().equals(selfUuidBytes); if (requestingMemberIsYou) { - updates.add(updateDescription(context.getString(R.string.MessageRecord_your_request_to_join_the_group_has_been_approved), R.drawable.ic_update_group_accept_light_16, R.drawable.ic_update_group_accept_dark_16)); + updates.add(updateDescription(context.getString(R.string.MessageRecord_your_request_to_join_the_group_has_been_approved), R.drawable.ic_update_group_accept_16)); } else { - updates.add(updateDescription(requestingMember.getUuid(), requesting -> context.getString(R.string.MessageRecord_a_request_to_join_the_group_from_s_has_been_approved, requesting), R.drawable.ic_update_group_accept_light_16, R.drawable.ic_update_group_accept_dark_16)); + updates.add(updateDescription(requestingMember.getUuid(), requesting -> context.getString(R.string.MessageRecord_a_request_to_join_the_group_from_s_has_been_approved, requesting), R.drawable.ic_update_group_accept_16)); } } } @@ -664,17 +664,17 @@ final class GroupsV2UpdateMessageProducer { if (requestingMemberIsYou) { if (editorIsYou) { - updates.add(updateDescription(context.getString(R.string.MessageRecord_you_canceled_your_request_to_join_the_group), R.drawable.ic_update_group_decline_light_16, R.drawable.ic_update_group_decline_dark_16)); + updates.add(updateDescription(context.getString(R.string.MessageRecord_you_canceled_your_request_to_join_the_group), R.drawable.ic_update_group_decline_16)); } else { - updates.add(updateDescription(context.getString(R.string.MessageRecord_your_request_to_join_the_group_has_been_denied_by_an_admin), R.drawable.ic_update_group_decline_light_16, R.drawable.ic_update_group_decline_dark_16)); + updates.add(updateDescription(context.getString(R.string.MessageRecord_your_request_to_join_the_group_has_been_denied_by_an_admin), R.drawable.ic_update_group_decline_16)); } } else { boolean editorIsCanceledMember = change.getEditor().equals(requestingMember); if (editorIsCanceledMember) { - updates.add(updateDescription(requestingMember, editorRequesting -> context.getString(R.string.MessageRecord_s_canceled_their_request_to_join_the_group, editorRequesting), R.drawable.ic_update_group_decline_light_16, R.drawable.ic_update_group_decline_dark_16)); + updates.add(updateDescription(requestingMember, editorRequesting -> context.getString(R.string.MessageRecord_s_canceled_their_request_to_join_the_group, editorRequesting), R.drawable.ic_update_group_decline_16)); } else { - updates.add(updateDescription(change.getEditor(), requestingMember, (editor, requesting) -> context.getString(R.string.MessageRecord_s_denied_a_request_to_join_the_group_from_s, editor, requesting), R.drawable.ic_update_group_decline_light_16, R.drawable.ic_update_group_decline_dark_16)); + updates.add(updateDescription(change.getEditor(), requestingMember, (editor, requesting) -> context.getString(R.string.MessageRecord_s_denied_a_request_to_join_the_group_from_s, editor, requesting), R.drawable.ic_update_group_decline_16)); } } } @@ -685,9 +685,9 @@ final class GroupsV2UpdateMessageProducer { boolean requestingMemberIsYou = requestingMember.equals(selfUuidBytes); if (requestingMemberIsYou) { - updates.add(updateDescription(context.getString(R.string.MessageRecord_your_request_to_join_the_group_has_been_denied_by_an_admin), R.drawable.ic_update_group_decline_light_16, R.drawable.ic_update_group_decline_dark_16)); + updates.add(updateDescription(context.getString(R.string.MessageRecord_your_request_to_join_the_group_has_been_denied_by_an_admin), R.drawable.ic_update_group_decline_16)); } else { - updates.add(updateDescription(requestingMember, requesting -> context.getString(R.string.MessageRecord_a_request_to_join_the_group_from_s_has_been_denied, requesting), R.drawable.ic_update_group_decline_light_16, R.drawable.ic_update_group_decline_dark_16)); + updates.add(updateDescription(requestingMember, requesting -> context.getString(R.string.MessageRecord_a_request_to_join_the_group_from_s_has_been_denied, requesting), R.drawable.ic_update_group_decline_16)); } } } @@ -711,31 +711,28 @@ final class GroupsV2UpdateMessageProducer { } private static UpdateDescription updateDescription(@NonNull String string, - @DrawableRes int lightIconResource, - @DrawableRes int darkIconResource) + @DrawableRes int iconResource) { - return UpdateDescription.staticDescription(string, lightIconResource, darkIconResource); + return UpdateDescription.staticDescription(string, iconResource); } private UpdateDescription updateDescription(@NonNull ByteString uuid1Bytes, @NonNull StringFactory1Arg stringFactory, - @DrawableRes int lightIconResource, - @DrawableRes int darkIconResource) + @DrawableRes int iconResource) { UUID uuid1 = UuidUtil.fromByteStringOrUnknown(uuid1Bytes); - return UpdateDescription.mentioning(Collections.singletonList(uuid1), () -> stringFactory.create(descriptionStrategy.describe(uuid1)), lightIconResource, darkIconResource); + return UpdateDescription.mentioning(Collections.singletonList(uuid1), () -> stringFactory.create(descriptionStrategy.describe(uuid1)), iconResource); } private UpdateDescription updateDescription(@NonNull ByteString uuid1Bytes, @NonNull ByteString uuid2Bytes, @NonNull StringFactory2Args stringFactory, - @DrawableRes int lightIconResource, - @DrawableRes int darkIconResource) + @DrawableRes int iconResource) { UUID uuid1 = UuidUtil.fromByteStringOrUnknown(uuid1Bytes); UUID uuid2 = UuidUtil.fromByteStringOrUnknown(uuid2Bytes); - return UpdateDescription.mentioning(Arrays.asList(uuid1, uuid2), () -> stringFactory.create(descriptionStrategy.describe(uuid1), descriptionStrategy.describe(uuid2)), lightIconResource, darkIconResource); + return UpdateDescription.mentioning(Arrays.asList(uuid1, uuid2), () -> stringFactory.create(descriptionStrategy.describe(uuid1), descriptionStrategy.describe(uuid2)), iconResource); } } \ No newline at end of file diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/LiveUpdateMessage.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/LiveUpdateMessage.java index b84ece1c34..45437a6a6a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/model/LiveUpdateMessage.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/LiveUpdateMessage.java @@ -17,6 +17,7 @@ import com.annimon.stream.Stream; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.RecipientId; +import org.thoughtcrime.securesms.util.ContextUtil; import org.thoughtcrime.securesms.util.SpanUtil; import org.thoughtcrime.securesms.util.ThemeUtil; import org.thoughtcrime.securesms.util.livedata.LiveDataUtil; @@ -57,17 +58,17 @@ public final class LiveUpdateMessage { private static @NonNull Spannable toSpannable(@NonNull Context context, @NonNull UpdateDescription updateDescription, @NonNull String string) { boolean isDarkTheme = ThemeUtil.isDarkTheme(context); - int drawableResource = isDarkTheme ? updateDescription.getDarkIconResource() : updateDescription.getLightIconResource(); + int drawableResource = updateDescription.getIconResource(); int tint = isDarkTheme ? updateDescription.getDarkTint() : updateDescription.getLightTint(); if (tint == 0) { - tint = ThemeUtil.getThemedColor(context, R.attr.conversation_item_update_text_color); + tint = ContextCompat.getColor(context, R.color.conversation_item_update_text_color); } if (drawableResource == 0) { return new SpannableString(string); } else { - Drawable drawable = ContextCompat.getDrawable(context, drawableResource); + Drawable drawable = ContextUtil.requireDrawable(context, drawableResource); drawable.setBounds(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight()); drawable.setColorFilter(tint, PorterDuff.Mode.SRC_ATOP); diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java index 893976212c..8e59ed60d1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java @@ -133,55 +133,55 @@ public abstract class MessageRecord extends DisplayRecord { if (isGroupUpdate() && isGroupV2()) { return getGv2ChangeDescription(context, getBody()); } else if (isGroupUpdate() && isOutgoing()) { - return staticUpdateDescription(context.getString(R.string.MessageRecord_you_updated_group), R.drawable.ic_update_group_light_16, R.drawable.ic_update_group_dark_16); + return staticUpdateDescription(context.getString(R.string.MessageRecord_you_updated_group), R.drawable.ic_update_group_16); } else if (isGroupUpdate()) { - return fromRecipient(getIndividualRecipient(), r -> GroupUtil.getNonV2GroupDescription(context, getBody()).toString(r), R.drawable.ic_update_group_light_16, R.drawable.ic_update_group_dark_16); + return fromRecipient(getIndividualRecipient(), r -> GroupUtil.getNonV2GroupDescription(context, getBody()).toString(r), R.drawable.ic_update_group_16); } else if (isGroupQuit() && isOutgoing()) { - return staticUpdateDescription(context.getString(R.string.MessageRecord_left_group), R.drawable.ic_update_group_leave_light_16, R.drawable.ic_update_group_leave_dark_16); + return staticUpdateDescription(context.getString(R.string.MessageRecord_left_group), R.drawable.ic_update_group_leave_16); } else if (isGroupQuit()) { - return fromRecipient(getIndividualRecipient(), r -> context.getString(R.string.ConversationItem_group_action_left, r.getDisplayName(context)), R.drawable.ic_update_group_leave_light_16, R.drawable.ic_update_group_leave_dark_16); + return fromRecipient(getIndividualRecipient(), r -> context.getString(R.string.ConversationItem_group_action_left, r.getDisplayName(context)), R.drawable.ic_update_group_leave_16); } else if (isIncomingAudioCall()) { - return fromRecipient(getIndividualRecipient(), r -> context.getString(R.string.MessageRecord_s_called_you_date, r.getDisplayName(context), getCallDateString(context)), R.drawable.ic_update_audio_call_incoming_light_16, R.drawable.ic_update_audio_call_incoming_dark_16); + return fromRecipient(getIndividualRecipient(), r -> context.getString(R.string.MessageRecord_s_called_you_date, r.getDisplayName(context), getCallDateString(context)), R.drawable.ic_update_audio_call_incoming_16); } else if (isIncomingVideoCall()) { - return fromRecipient(getIndividualRecipient(), r -> context.getString(R.string.MessageRecord_s_called_you_date, r.getDisplayName(context), getCallDateString(context)), R.drawable.ic_update_video_call_incomg_light_16, R.drawable.ic_update_video_call_incoming_dark_16); + return fromRecipient(getIndividualRecipient(), r -> context.getString(R.string.MessageRecord_s_called_you_date, r.getDisplayName(context), getCallDateString(context)), R.drawable.ic_update_video_call_incoming_16); } else if (isOutgoingAudioCall()) { - return staticUpdateDescription(context.getString(R.string.MessageRecord_you_called_date, getCallDateString(context)), R.drawable.ic_update_audio_call_outgoing_light_16, R.drawable.ic_update_audio_call_outgoing_dark_16); + return staticUpdateDescription(context.getString(R.string.MessageRecord_you_called_date, getCallDateString(context)), R.drawable.ic_update_audio_call_outgoing_16); } else if (isOutgoingVideoCall()) { - return staticUpdateDescription(context.getString(R.string.MessageRecord_you_called_date, getCallDateString(context)), R.drawable.ic_update_video_call_outgoing_light_16, R.drawable.ic_update_video_call_outgoing_dark_16); + return staticUpdateDescription(context.getString(R.string.MessageRecord_you_called_date, getCallDateString(context)), R.drawable.ic_update_video_call_outgoing_16); } else if (isMissedAudioCall()) { - return staticUpdateDescription(context.getString(R.string.MessageRecord_missed_audio_call_date, getCallDateString(context)), R.drawable.ic_update_audio_call_missed_light_16, R.drawable.ic_update_audio_call_missed_dark_16, ContextCompat.getColor(context, R.color.core_red_shade), ContextCompat.getColor(context, R.color.core_red)); + return staticUpdateDescription(context.getString(R.string.MessageRecord_missed_audio_call_date, getCallDateString(context)), R.drawable.ic_update_audio_call_missed_16, ContextCompat.getColor(context, R.color.core_red_shade), ContextCompat.getColor(context, R.color.core_red)); } else if (isMissedVideoCall()) { - return staticUpdateDescription(context.getString(R.string.MessageRecord_missed_video_call_date, getCallDateString(context)), R.drawable.ic_update_video_call_missed_light_16, R.drawable.ic_update_video_call_missed_dark_16, ContextCompat.getColor(context, R.color.core_red_shade), ContextCompat.getColor(context, R.color.core_red)); + return staticUpdateDescription(context.getString(R.string.MessageRecord_missed_video_call_date, getCallDateString(context)), R.drawable.ic_update_video_call_missed_16, ContextCompat.getColor(context, R.color.core_red_shade), ContextCompat.getColor(context, R.color.core_red)); } else if (isJoined()) { - return staticUpdateDescription(context.getString(R.string.MessageRecord_s_joined_signal, getIndividualRecipient().getDisplayName(context)), R.drawable.ic_update_group_add_light_16, R.drawable.ic_update_group_add_dark_16); + return staticUpdateDescription(context.getString(R.string.MessageRecord_s_joined_signal, getIndividualRecipient().getDisplayName(context)), R.drawable.ic_update_group_add_16); } else if (isExpirationTimerUpdate()) { int seconds = (int)(getExpiresIn() / 1000); if (seconds <= 0) { - return isOutgoing() ? staticUpdateDescription(context.getString(R.string.MessageRecord_you_disabled_disappearing_messages), R.drawable.ic_update_timer_disabled_light_16, R.drawable.ic_update_timer_disabled_dark_16) - : fromRecipient(getIndividualRecipient(), r -> context.getString(R.string.MessageRecord_s_disabled_disappearing_messages, r.getDisplayName(context)), R.drawable.ic_update_timer_disabled_light_16, R.drawable.ic_update_timer_disabled_dark_16); + return isOutgoing() ? staticUpdateDescription(context.getString(R.string.MessageRecord_you_disabled_disappearing_messages), R.drawable.ic_update_timer_disabled_16) + : fromRecipient(getIndividualRecipient(), r -> context.getString(R.string.MessageRecord_s_disabled_disappearing_messages, r.getDisplayName(context)), R.drawable.ic_update_timer_disabled_16); } String time = ExpirationUtil.getExpirationDisplayValue(context, seconds); - return isOutgoing() ? staticUpdateDescription(context.getString(R.string.MessageRecord_you_set_disappearing_message_time_to_s, time), R.drawable.ic_update_timer_light_16, R.drawable.ic_update_timer_dark_16) - : fromRecipient(getIndividualRecipient(), r -> context.getString(R.string.MessageRecord_s_set_disappearing_message_time_to_s, r.getDisplayName(context), time), R.drawable.ic_update_timer_light_16, R.drawable.ic_update_timer_dark_16); + return isOutgoing() ? staticUpdateDescription(context.getString(R.string.MessageRecord_you_set_disappearing_message_time_to_s, time), R.drawable.ic_update_timer_16) + : fromRecipient(getIndividualRecipient(), r -> context.getString(R.string.MessageRecord_s_set_disappearing_message_time_to_s, r.getDisplayName(context), time), R.drawable.ic_update_timer_16); } else if (isIdentityUpdate()) { - return fromRecipient(getIndividualRecipient(), r -> context.getString(R.string.MessageRecord_your_safety_number_with_s_has_changed, r.getDisplayName(context)), R.drawable.ic_update_safety_number_light_16, R.drawable.ic_update_safety_number_dark_16); + return fromRecipient(getIndividualRecipient(), r -> context.getString(R.string.MessageRecord_your_safety_number_with_s_has_changed, r.getDisplayName(context)), R.drawable.ic_update_safety_number_16); } else if (isIdentityVerified()) { - if (isOutgoing()) return fromRecipient(getIndividualRecipient(), r -> context.getString(R.string.MessageRecord_you_marked_your_safety_number_with_s_verified, r.getDisplayName(context)), R.drawable.ic_update_verified_light_16, R.drawable.ic_update_verified_dark_16); - else return fromRecipient(getIndividualRecipient(), r -> context.getString(R.string.MessageRecord_you_marked_your_safety_number_with_s_verified_from_another_device, r.getDisplayName(context)), R.drawable.ic_update_verified_light_16, R.drawable.ic_update_verified_dark_16); + if (isOutgoing()) return fromRecipient(getIndividualRecipient(), r -> context.getString(R.string.MessageRecord_you_marked_your_safety_number_with_s_verified, r.getDisplayName(context)), R.drawable.ic_update_verified_16); + else return fromRecipient(getIndividualRecipient(), r -> context.getString(R.string.MessageRecord_you_marked_your_safety_number_with_s_verified_from_another_device, r.getDisplayName(context)), R.drawable.ic_update_verified_16); } else if (isIdentityDefault()) { - if (isOutgoing()) return fromRecipient(getIndividualRecipient(), r -> context.getString(R.string.MessageRecord_you_marked_your_safety_number_with_s_unverified, r.getDisplayName(context)), R.drawable.ic_update_info_light_16, R.drawable.ic_update_info_dark_16); - else return fromRecipient(getIndividualRecipient(), r -> context.getString(R.string.MessageRecord_you_marked_your_safety_number_with_s_unverified_from_another_device, r.getDisplayName(context)), R.drawable.ic_update_info_light_16, R.drawable.ic_update_info_dark_16); + if (isOutgoing()) return fromRecipient(getIndividualRecipient(), r -> context.getString(R.string.MessageRecord_you_marked_your_safety_number_with_s_unverified, r.getDisplayName(context)), R.drawable.ic_update_info_16); + else return fromRecipient(getIndividualRecipient(), r -> context.getString(R.string.MessageRecord_you_marked_your_safety_number_with_s_unverified_from_another_device, r.getDisplayName(context)), R.drawable.ic_update_info_16); } else if (isProfileChange()) { - return staticUpdateDescription(getProfileChangeDescription(context), R.drawable.ic_update_profile_light_16, R.drawable.ic_update_profile_dark_16); + return staticUpdateDescription(getProfileChangeDescription(context), R.drawable.ic_update_profile_16); } else if (isEndSession()) { - if (isOutgoing()) return staticUpdateDescription(context.getString(R.string.SmsMessageRecord_secure_session_reset), R.drawable.ic_update_info_light_16, R.drawable.ic_update_info_dark_16); - else return fromRecipient(getIndividualRecipient(), r-> context.getString(R.string.SmsMessageRecord_secure_session_reset_s, r.getDisplayName(context)), R.drawable.ic_update_info_light_16, R.drawable.ic_update_info_dark_16); + if (isOutgoing()) return staticUpdateDescription(context.getString(R.string.SmsMessageRecord_secure_session_reset), R.drawable.ic_update_info_16); + else return fromRecipient(getIndividualRecipient(), r-> context.getString(R.string.SmsMessageRecord_secure_session_reset_s, r.getDisplayName(context)), R.drawable.ic_update_info_16); } else if (isGroupV1MigrationEvent()) { if (Util.isEmpty(getBody())) { - return staticUpdateDescription(context.getString(R.string.MessageRecord_this_group_was_updated_to_a_new_group), R.drawable.ic_update_group_role_light_16, R.drawable.ic_update_group_role_dark_16); + return staticUpdateDescription(context.getString(R.string.MessageRecord_this_group_was_updated_to_a_new_group), R.drawable.ic_update_group_role_16); } else { int count = getGroupV1MigrationEventInvites().size(); - return staticUpdateDescription(context.getResources().getQuantityString(R.plurals.MessageRecord_members_couldnt_be_added_to_the_new_group_and_have_been_invited, count, count), R.drawable.ic_update_group_add_light_16, R.drawable.ic_update_group_add_dark_16); + return staticUpdateDescription(context.getResources().getQuantityString(R.plurals.MessageRecord_members_couldnt_be_added_to_the_new_group_and_have_been_invited, count, count), R.drawable.ic_update_group_add_16); } } @@ -202,7 +202,7 @@ public abstract class MessageRecord extends DisplayRecord { } } catch (IOException e) { Log.w(TAG, "GV2 Message update detail could not be read", e); - return staticUpdateDescription(context.getString(R.string.MessageRecord_group_updated), R.drawable.ic_update_group_light_16, R.drawable.ic_update_group_dark_16); + return staticUpdateDescription(context.getString(R.string.MessageRecord_group_updated), R.drawable.ic_update_group_16); } } @@ -235,29 +235,25 @@ public abstract class MessageRecord extends DisplayRecord { private static @NonNull UpdateDescription fromRecipient(@NonNull Recipient recipient, @NonNull Function stringGenerator, - @DrawableRes int lightIconResource, - @DrawableRes int darkIconResource) + @DrawableRes int iconResource) { return UpdateDescription.mentioning(Collections.singletonList(recipient.getUuid().or(UuidUtil.UNKNOWN_UUID)), () -> stringGenerator.apply(recipient.resolve()), - lightIconResource, - darkIconResource); + iconResource); } private static @NonNull UpdateDescription staticUpdateDescription(@NonNull String string, - @DrawableRes int lightIconResource, - @DrawableRes int darkIconResource) + @DrawableRes int iconResource) { - return UpdateDescription.staticDescription(string, lightIconResource, darkIconResource); + return UpdateDescription.staticDescription(string, iconResource); } private static @NonNull UpdateDescription staticUpdateDescription(@NonNull String string, - @DrawableRes int lightIconResource, - @DrawableRes int darkIconResource, + @DrawableRes int iconResource, @ColorInt int lightTint, @ColorInt int darkTint) { - return UpdateDescription.staticDescription(string, lightIconResource, darkIconResource, lightTint, darkTint); + return UpdateDescription.staticDescription(string, iconResource, lightTint, darkTint); } private @NonNull String getProfileChangeDescription(@NonNull Context context) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/UpdateDescription.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/UpdateDescription.java index e39b82f6c6..eabd82fd93 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/model/UpdateDescription.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/UpdateDescription.java @@ -31,15 +31,13 @@ public final class UpdateDescription { private final StringFactory stringFactory; private final String staticString; private final int lightIconResource; - private final int darkIconResource; private final int lightTint; private final int darkTint; private UpdateDescription(@NonNull Collection mentioned, @Nullable StringFactory stringFactory, @Nullable String staticString, - @DrawableRes int lightIconResource, - @DrawableRes int darkIconResource, + @DrawableRes int iconResource, @ColorInt int lightTint, @ColorInt int darkTint) { @@ -49,8 +47,7 @@ public final class UpdateDescription { this.mentioned = mentioned; this.stringFactory = stringFactory; this.staticString = staticString; - this.lightIconResource = lightIconResource; - this.darkIconResource = darkIconResource; + this.lightIconResource = iconResource; this.lightTint = lightTint; this.darkTint = darkTint; } @@ -64,14 +61,12 @@ public final class UpdateDescription { */ public static UpdateDescription mentioning(@NonNull Collection mentioned, @NonNull StringFactory stringFactory, - @DrawableRes int lightIconResource, - @DrawableRes int darkIconResource) + @DrawableRes int iconResource) { return new UpdateDescription(UuidUtil.filterKnown(mentioned), stringFactory, null, - lightIconResource, - darkIconResource, + iconResource, 0, 0); } @@ -80,22 +75,20 @@ public final class UpdateDescription { * Create an update description that's string value is fixed. */ public static UpdateDescription staticDescription(@NonNull String staticString, - @DrawableRes int lightIconResource, - @DrawableRes int darkIconResource) + @DrawableRes int iconResource) { - return new UpdateDescription(Collections.emptyList(), null, staticString, lightIconResource, darkIconResource, 0, 0); + return new UpdateDescription(Collections.emptyList(), null, staticString, iconResource, 0, 0); } /** * Create an update description that's string value is fixed with a specific tint color. */ public static UpdateDescription staticDescription(@NonNull String staticString, - @DrawableRes int lightIconResource, - @DrawableRes int darkIconResource, + @DrawableRes int iconResource, @ColorInt int lightTint, @ColorInt int darkTint) { - return new UpdateDescription(Collections.emptyList(), null, staticString, lightIconResource, darkIconResource, lightTint, darkTint); + return new UpdateDescription(Collections.emptyList(), null, staticString, iconResource, lightTint, darkTint); } public boolean isStringStatic() { @@ -128,14 +121,10 @@ public final class UpdateDescription { return mentioned; } - public @DrawableRes int getLightIconResource() { + public @DrawableRes int getIconResource() { return lightIconResource; } - public @DrawableRes int getDarkIconResource() { - return darkIconResource; - } - public @ColorInt int getLightTint() { return lightTint; } @@ -155,8 +144,8 @@ public final class UpdateDescription { if (allAreStatic(updateDescriptions)) { return UpdateDescription.staticDescription(concatStaticLines(updateDescriptions), - updateDescriptions.get(0).getLightIconResource(), - updateDescriptions.get(0).getDarkIconResource()); + updateDescriptions.get(0).getIconResource() + ); } Set allMentioned = new HashSet<>(); @@ -167,8 +156,7 @@ public final class UpdateDescription { return UpdateDescription.mentioning(allMentioned, () -> concatLines(updateDescriptions), - updateDescriptions.get(0).getLightIconResource(), - updateDescriptions.get(0).getDarkIconResource()); + updateDescriptions.get(0).getIconResource()); } private static boolean allAreStatic(@NonNull Collection updateDescriptions) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmKbsPinFragment.java b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmKbsPinFragment.java index 1f1eee9302..876f323115 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmKbsPinFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmKbsPinFragment.java @@ -104,13 +104,13 @@ public class ConfirmKbsPinFragment extends BaseKbsPinFragment { diff --git a/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java b/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java index c5ca3500d8..d2c6c061f1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java @@ -142,7 +142,7 @@ public class LongMessageActivity extends PassphraseRequiredActivity { if (message.get().getMessageRecord().isOutgoing()) { bubble = sentBubble.get(); - bubble.getBackground().setColorFilter(ThemeUtil.getThemedColor(this, R.attr.conversation_item_bubble_background), PorterDuff.Mode.MULTIPLY); + bubble.getBackground().setColorFilter(ContextCompat.getColor(this, R.color.signal_background_secondary), PorterDuff.Mode.MULTIPLY); } else { bubble = receivedBubble.get(); bubble.getBackground().setColorFilter(message.get().getMessageRecord().getRecipient().getColor().toConversationColor(this), PorterDuff.Mode.MULTIPLY); diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaActions.java b/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaActions.java index 1cb4460c01..b4e3886679 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaActions.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaActions.java @@ -60,7 +60,7 @@ final class MediaActions { recordCount); AlertDialog.Builder builder = new AlertDialog.Builder(context) - .setIconAttribute(R.attr.dialog_alert_icon) + .setIcon(R.drawable.ic_warning) .setTitle(confirmTitle) .setMessage(confirmMessage) .setCancelable(true); diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/AvatarSelectionActivity.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/AvatarSelectionActivity.java index fd0afd1a93..267da517ec 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/AvatarSelectionActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/AvatarSelectionActivity.java @@ -10,6 +10,7 @@ import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatDelegate; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentTransaction; import androidx.lifecycle.ViewModelProviders; @@ -50,6 +51,12 @@ public class AvatarSelectionActivity extends AppCompatActivity implements Camera return intent; } + @Override + protected void attachBaseContext(@NonNull Context newBase) { + getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_YES); + super.attachBaseContext(newBase); + } + @Override protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/AvatarSelectionBottomSheetDialogFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/AvatarSelectionBottomSheetDialogFragment.java index 45095010b9..846667544e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/AvatarSelectionBottomSheetDialogFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/AvatarSelectionBottomSheetDialogFragment.java @@ -10,10 +10,12 @@ import android.view.ViewGroup; import android.widget.Toast; import androidx.annotation.AttrRes; +import androidx.annotation.DrawableRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.StringRes; import androidx.appcompat.widget.AppCompatTextView; +import androidx.core.content.ContextCompat; import androidx.core.util.Consumer; import androidx.fragment.app.DialogFragment; import androidx.recyclerview.widget.RecyclerView; @@ -153,15 +155,15 @@ public class AvatarSelectionBottomSheetDialogFragment extends BottomSheetDialogF } private enum SelectionOption { - CAPTURE("capture", R.string.AvatarSelectionBottomSheetDialogFragment__take_photo, R.attr.avatar_selection_take_photo), - GALLERY("gallery", R.string.AvatarSelectionBottomSheetDialogFragment__choose_from_gallery, R.attr.avatar_selection_pick_photo), - DELETE("delete", R.string.AvatarSelectionBottomSheetDialogFragment__remove_photo, R.attr.avatar_selection_remove_photo); + CAPTURE("capture", R.string.AvatarSelectionBottomSheetDialogFragment__take_photo, R.drawable.ic_camera_24), + GALLERY("gallery", R.string.AvatarSelectionBottomSheetDialogFragment__choose_from_gallery, R.drawable.ic_photo_24), + DELETE("delete", R.string.AvatarSelectionBottomSheetDialogFragment__remove_photo, R.drawable.ic_trash_24); - private final String code; - private final @StringRes int label; - private final @AttrRes int icon; + private final String code; + private final @StringRes int label; + private final @DrawableRes int icon; - SelectionOption(@NonNull String code, @StringRes int label, @AttrRes int icon) { + SelectionOption(@NonNull String code, @StringRes int label, @DrawableRes int icon) { this.code = code; this.label = label; this.icon = icon; @@ -198,7 +200,7 @@ public class AvatarSelectionBottomSheetDialogFragment extends BottomSheetDialogF } void bind(@NonNull SelectionOption selectionOption) { - optionView.setCompoundDrawablesWithIntrinsicBounds(ThemeUtil.getThemedDrawable(optionView.getContext(), selectionOption.icon), null, null, null); + optionView.setCompoundDrawablesWithIntrinsicBounds(ContextCompat.getDrawable(optionView.getContext(), selectionOption.icon), null, null, null); optionView.setText(selectionOption.label); } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraButtonView.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraButtonView.java index 3dc8e4f39b..c22a868f50 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraButtonView.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraButtonView.java @@ -67,7 +67,7 @@ public class CameraButtonView extends View { } public CameraButtonView(@NonNull Context context, @Nullable AttributeSet attrs) { - this(context, attrs, R.attr.camera_button_style); + this(context, attrs, 0); } public CameraButtonView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) { 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 485b884e2c..728d031321 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java @@ -290,7 +290,7 @@ public class CameraXFragment extends LoggingFragment implements CameraFragment { TooltipPopup.forTarget(captureButton) .setOnDismissListener(this::neverDisplayVideoRecordingTooltipAgain) .setBackgroundTint(ContextCompat.getColor(requireContext(), R.color.core_ultramarine)) - .setTextColor(ThemeUtil.getThemedColor(requireContext(), R.attr.conversation_title_color)) + .setTextColor(ContextCompat.getColor(requireContext(), R.color.signal_text_toolbar_title)) .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 2dbaa53480..2b2d911228 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java @@ -22,6 +22,7 @@ import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatDelegate; import androidx.appcompat.view.ContextThemeWrapper; import androidx.core.util.Pair; import androidx.core.util.Supplier; @@ -198,6 +199,12 @@ public class MediaSendActivity extends PassphraseRequiredActivity implements Med return intent; } + @Override + protected void attachBaseContext(@NonNull Context newBase) { + getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_YES); + super.attachBaseContext(newBase); + } + @Override protected void onCreate(Bundle savedInstanceState, boolean ready) { setContentView(R.layout.mediasend_activity); @@ -633,7 +640,7 @@ public class MediaSendActivity extends PassphraseRequiredActivity implements Med } else if (state.getViewOnceState() == ViewOnceState.ENABLED) { captionBackground = 0; } else if (isMentionPickerShowing){ - captionBackground = ThemeUtil.getThemedResourceId(this, R.attr.mention_picker_background_color); + captionBackground = R.color.signal_background_dialog; } captionAndRail.setBackgroundResource(captionBackground); @@ -856,7 +863,7 @@ public class MediaSendActivity extends PassphraseRequiredActivity implements Med Permissions.with(this) .request(Manifest.permission.CAMERA) .ifNecessary() - .withRationaleDialog(getString(R.string.ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera), R.drawable.ic_camera_solid_24) + .withRationaleDialog(getString(R.string.ConversationActivity_to_capture_photos_and_video_allow_signal_access_to_the_camera), R.drawable.ic_camera_24) .withPermanentDenialDialog(getString(R.string.ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video)) .onAllGranted(() -> { Fragment fragment = getOrCreateCameraFragment(); diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java b/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java index fffb47332a..ecd593ffac 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java @@ -38,6 +38,7 @@ import android.widget.Toast; import androidx.annotation.ColorInt; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import org.thoughtcrime.securesms.MediaPreviewActivity; import org.thoughtcrime.securesms.R; @@ -113,7 +114,7 @@ public class AttachmentManager { removableMediaView.setRemoveClickListener(new RemoveButtonListener()); thumbnail.setOnClickListener(new ThumbnailClickListener()); - documentView.getBackground().setColorFilter(ThemeUtil.getThemedColor(context, R.attr.conversation_item_bubble_background), PorterDuff.Mode.MULTIPLY); + documentView.getBackground().setColorFilter(ContextCompat.getColor(context, R.color.signal_background_secondary), PorterDuff.Mode.MULTIPLY); } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/AudioSlide.java b/app/src/main/java/org/thoughtcrime/securesms/mms/AudioSlide.java index ae561f0fb6..8532835bdf 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/AudioSlide.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/AudioSlide.java @@ -69,6 +69,6 @@ public class AudioSlide extends Slide { @Override public @DrawableRes int getPlaceholderRes(Theme theme) { - return ResUtil.getDrawableRes(theme, R.attr.conversation_icon_attach_audio); + return R.drawable.ic_audio; } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/VideoSlide.java b/app/src/main/java/org/thoughtcrime/securesms/mms/VideoSlide.java index 5fd0a9b48d..9973121cc7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/VideoSlide.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/VideoSlide.java @@ -23,6 +23,7 @@ import android.net.Uri; import androidx.annotation.DrawableRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.attachments.Attachment; @@ -60,7 +61,7 @@ public class VideoSlide extends Slide { @Override public @DrawableRes int getPlaceholderRes(Theme theme) { - return ResUtil.getDrawableRes(theme, R.attr.conversation_icon_attach_video); + return R.drawable.ic_video; } @Override diff --git a/app/src/main/java/org/thoughtcrime/securesms/pin/PinOptOutDialog.java b/app/src/main/java/org/thoughtcrime/securesms/pin/PinOptOutDialog.java index 9c765ffabd..8efc0657d1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/pin/PinOptOutDialog.java +++ b/app/src/main/java/org/thoughtcrime/securesms/pin/PinOptOutDialog.java @@ -3,17 +3,13 @@ package org.thoughtcrime.securesms.pin; import android.content.Context; import androidx.annotation.NonNull; -import androidx.annotation.StringRes; import androidx.appcompat.app.AlertDialog; +import androidx.core.content.ContextCompat; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.logging.Log; -import org.thoughtcrime.securesms.util.ThemeUtil; import org.thoughtcrime.securesms.util.concurrent.SimpleTask; import org.thoughtcrime.securesms.util.views.SimpleProgressDialog; -import org.whispersystems.signalservice.internal.contacts.crypto.UnauthenticatedResponseException; - -import java.io.IOException; public final class PinOptOutDialog { @@ -46,7 +42,7 @@ public final class PinOptOutDialog { .create(); dialog.setOnShowListener(dialogInterface -> { - dialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(ThemeUtil.getThemedColor(context, R.attr.dangerous_button_color)); + dialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(ContextCompat.getColor(context, R.color.signal_alert_primary)); }); dialog.show(); diff --git a/app/src/main/java/org/thoughtcrime/securesms/pin/PinRestoreActivity.java b/app/src/main/java/org/thoughtcrime/securesms/pin/PinRestoreActivity.java index 891daeebec..f871a7f51e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/pin/PinRestoreActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/pin/PinRestoreActivity.java @@ -1,10 +1,13 @@ package org.thoughtcrime.securesms.pin; +import android.content.Context; import android.content.Intent; import android.os.Bundle; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatDelegate; import org.thoughtcrime.securesms.MainActivity; import org.thoughtcrime.securesms.PassphraseRequiredActivity; @@ -13,6 +16,12 @@ import org.thoughtcrime.securesms.lock.v2.CreateKbsPinActivity; public final class PinRestoreActivity extends AppCompatActivity { + @Override + protected void attachBaseContext(@NonNull Context newBase) { + getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_NO); + super.attachBaseContext(newBase); + } + @Override protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java index 62b7d1ee10..96f12ae565 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java @@ -243,7 +243,7 @@ public class AdvancedPreferenceFragment extends CorrectedPreferenceFragment { public boolean onPreferenceChange(final Preference preference, Object newValue) { if (((CheckBoxPreference)preference).isChecked()) { AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); - builder.setIconAttribute(R.attr.dialog_info_icon); + builder.setIcon(R.drawable.ic_info_outline); builder.setTitle(R.string.ApplicationPreferencesActivity_disable_signal_messages_and_calls); builder.setMessage(R.string.ApplicationPreferencesActivity_disable_signal_messages_and_calls_by_unregistering); builder.setNegativeButton(android.R.string.cancel, null); diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java index 1029bedda1..dd75954105 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java @@ -405,7 +405,7 @@ public class AppProtectionPreferenceFragment extends CorrectedPreferenceFragment AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); builder.setTitle(R.string.ApplicationPreferencesActivity_disable_passphrase); builder.setMessage(R.string.ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications); - builder.setIconAttribute(R.attr.dialog_alert_icon); + builder.setIcon(R.drawable.ic_warning); builder.setPositiveButton(R.string.ApplicationPreferencesActivity_disable, (dialog, which) -> { MasterSecretUtil.changeMasterSecretPassphrase(getActivity(), KeyCachingService.getMasterSecret(getContext()), diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/GroupShareProfileView.java b/app/src/main/java/org/thoughtcrime/securesms/profiles/GroupShareProfileView.java index 3aeb3b09a9..e740904ed7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/profiles/GroupShareProfileView.java +++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/GroupShareProfileView.java @@ -51,7 +51,7 @@ public class GroupShareProfileView extends FrameLayout { this.container.setOnClickListener(view -> { if (this.recipient != null) { new AlertDialog.Builder(getContext()) - .setIconAttribute(R.attr.dialog_info_icon) + .setIcon(R.drawable.ic_info_outline) .setTitle(R.string.GroupShareProfileView_share_your_profile_name_and_photo_with_this_group) .setMessage(R.string.GroupShareProfileView_do_you_want_to_make_your_profile_name_and_photo_visible_to_all_current_and_future_members_of_this_group) .setPositiveButton(R.string.GroupShareProfileView_make_visible, (dialog, which) -> { diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/UnknownSenderView.java b/app/src/main/java/org/thoughtcrime/securesms/profiles/UnknownSenderView.java index 642efa67d4..bae13860de 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/profiles/UnknownSenderView.java +++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/UnknownSenderView.java @@ -42,7 +42,7 @@ public class UnknownSenderView extends FrameLayout { final Context context = getContext(); new AlertDialog.Builder(getContext()) - .setIconAttribute(R.attr.dialog_alert_icon) + .setIcon(R.drawable.ic_warning) .setTitle(getContext().getString(R.string.UnknownSenderView_block_s, recipient.getDisplayName(context))) .setMessage(R.string.UnknownSenderView_blocked_contacts_will_no_longer_be_able_to_send_you_messages_or_call_you) .setPositiveButton(R.string.UnknownSenderView_block, (dialog, which) -> { @@ -74,7 +74,7 @@ public class UnknownSenderView extends FrameLayout { final Context context = getContext(); new AlertDialog.Builder(getContext()) - .setIconAttribute(R.attr.dialog_info_icon) + .setIcon(R.drawable.ic_info_outline) .setTitle(getContext().getString(R.string.UnknownSenderView_share_profile_with_s, recipient.getDisplayName(context))) .setMessage(R.string.UnknownSenderView_the_easiest_way_to_share_your_profile_information_is_to_add_the_sender_to_your_contacts) .setPositiveButton(R.string.UnknownSenderView_share_profile, (dialog, which) -> { diff --git a/app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionsConversationView.java b/app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionsConversationView.java index 758211d775..989b576c34 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionsConversationView.java +++ b/app/src/main/java/org/thoughtcrime/securesms/reactions/ReactionsConversationView.java @@ -11,6 +11,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import com.annimon.stream.Stream; @@ -158,10 +159,10 @@ public class ReactionsConversationView extends LinearLayout { } if (reaction.userWasSender) { - root.setBackground(ThemeUtil.getThemedDrawable(context, R.attr.reactions_pill_selected_background)); - countView.setTextColor(ThemeUtil.getThemedColor(context, R.attr.reactions_pill_selected_text_color)); + root.setBackground(ContextCompat.getDrawable(context, R.drawable.reaction_pill_background_selected)); + countView.setTextColor(ContextCompat.getColor(context, R.color.reactions_pill_selected_text_color)); } else { - root.setBackground(ThemeUtil.getThemedDrawable(context, R.attr.reactions_pill_background)); + root.setBackground(ContextCompat.getDrawable(context, R.drawable.reaction_pill_background)); } return root; diff --git a/app/src/main/java/org/thoughtcrime/securesms/reactions/any/ReactWithAnyEmojiBottomSheetDialogFragment.java b/app/src/main/java/org/thoughtcrime/securesms/reactions/any/ReactWithAnyEmojiBottomSheetDialogFragment.java index c34c837c83..8a1db5b557 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/reactions/any/ReactWithAnyEmojiBottomSheetDialogFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/reactions/any/ReactWithAnyEmojiBottomSheetDialogFragment.java @@ -15,6 +15,7 @@ import android.widget.TextSwitcher; import androidx.annotation.AttrRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.core.view.ViewCompat; import androidx.fragment.app.DialogFragment; import androidx.lifecycle.ViewModelProviders; @@ -99,7 +100,7 @@ public final class ReactWithAnyEmojiBottomSheetDialogFragment extends BottomShee .build(); MaterialShapeDrawable dialogBackground = new MaterialShapeDrawable(shapeAppearanceModel); - dialogBackground.setTint(ThemeUtil.getThemedColor(requireContext(), R.attr.dialog_background_color)); + dialogBackground.setTint(ContextCompat.getColor(requireContext(), R.color.signal_background_dialog)); dialog.getBehavior().addBottomSheetCallback(new BottomSheetBehavior.BottomSheetCallback() { @Override diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.java index 31489d3322..9f46e354fa 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.java @@ -15,6 +15,7 @@ import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.core.widget.TextViewCompat; import androidx.fragment.app.DialogFragment; import androidx.fragment.app.FragmentManager; @@ -154,7 +155,7 @@ public final class RecipientBottomSheetDialogFragment extends BottomSheetDialogF if (recipient.isSystemContact() && !recipient.isSelf()) { fullName.setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, R.drawable.ic_profile_circle_outline_16, 0); fullName.setCompoundDrawablePadding(ViewUtil.dpToPx(4)); - TextViewCompat.setCompoundDrawableTintList(fullName, ColorStateList.valueOf(ThemeUtil.getThemedColor(requireContext(), R.attr.title_text_color_primary))); + TextViewCompat.setCompoundDrawableTintList(fullName, ColorStateList.valueOf(ContextCompat.getColor(requireContext(), R.color.signal_text_primary))); } String usernameNumberString = recipient.hasAUserSetDisplayName(requireContext()) && !recipient.isSelf() diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationNavigationActivity.java b/app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationNavigationActivity.java index a1edfa6199..75f4d17e26 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationNavigationActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationNavigationActivity.java @@ -8,6 +8,7 @@ import android.os.Bundle; import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatDelegate; import com.google.android.gms.auth.api.phone.SmsRetriever; import com.google.android.gms.common.api.CommonStatusCodes; @@ -39,6 +40,12 @@ public final class RegistrationNavigationActivity extends AppCompatActivity { return intent; } + @Override + protected void attachBaseContext(@NonNull Context newBase) { + getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_NO); + super.attachBaseContext(newBase); + } + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); diff --git a/app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageActivity.java b/app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageActivity.java index d1ffd24fc1..7ae4ba82ad 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageActivity.java @@ -13,6 +13,7 @@ import android.widget.ImageView; import android.widget.TextView; import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatDelegate; import androidx.lifecycle.ViewModelProviders; import org.thoughtcrime.securesms.PassphraseRequiredActivity; @@ -59,6 +60,12 @@ public class ViewOnceMessageActivity extends PassphraseRequiredActivity implemen return intent; } + @Override + protected void attachBaseContext(@NonNull Context newBase) { + getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_YES); + super.attachBaseContext(newBase); + } + @Override protected void onCreate(Bundle savedInstanceState, boolean ready) { super.onCreate(savedInstanceState, ready); diff --git a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardProvider.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardProvider.java index 5b47fc8ade..59d8db3987 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardProvider.java +++ b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardProvider.java @@ -7,6 +7,7 @@ import android.widget.ImageView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; import androidx.fragment.app.FragmentManager; @@ -22,8 +23,6 @@ import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader; import org.thoughtcrime.securesms.mms.GlideRequests; import org.thoughtcrime.securesms.stickers.StickerKeyboardPageFragment.EventListener; import org.thoughtcrime.securesms.stickers.StickerKeyboardRepository.PackListResult; -import org.thoughtcrime.securesms.util.ResUtil; -import org.thoughtcrime.securesms.util.ThemeUtil; import org.thoughtcrime.securesms.util.Throttler; import java.util.ArrayList; @@ -63,9 +62,9 @@ public final class StickerKeyboardProvider implements MediaKeyboardProvider, @Override public int getProviderIconView(boolean selected) { if (selected) { - return ThemeUtil.isDarkTheme(context) ? R.layout.sticker_keyboard_icon_dark_selected : R.layout.sticker_keyboard_icon_light_selected; + return R.layout.sticker_keyboard_icon_selected; } else { - return ThemeUtil.isDarkTheme(context) ? R.layout.sticker_keyboard_icon_dark : R.layout.sticker_keyboard_icon_light; + return R.layout.sticker_keyboard_icon; } } @@ -240,7 +239,7 @@ public final class StickerKeyboardProvider implements MediaKeyboardProvider, @Override public void loadCategoryTabIcon(@NonNull GlideRequests glideRequests, @NonNull ImageView imageView, int index) { if (index == 0) { - Drawable icon = ResUtil.getDrawable(context, R.attr.emoji_category_recent); + Drawable icon = ContextCompat.getDrawable(context, R.drawable.ic_recent_20); imageView.setImageDrawable(icon); } else { Uri uri = packs.get(index - 1).getCover().getUri(); diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/Dialogs.java b/app/src/main/java/org/thoughtcrime/securesms/util/Dialogs.java index 570b19f1fe..3392735aae 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/Dialogs.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/Dialogs.java @@ -26,7 +26,7 @@ public class Dialogs { AlertDialog.Builder dialog = new AlertDialog.Builder(context); dialog.setTitle(title); dialog.setMessage(message); - dialog.setIconAttribute(R.attr.dialog_alert_icon); + dialog.setIcon(R.drawable.ic_warning); dialog.setPositiveButton(android.R.string.ok, null); dialog.show(); } @@ -35,7 +35,7 @@ public class Dialogs { AlertDialog.Builder dialog = new AlertDialog.Builder(context); dialog.setTitle(title); dialog.setMessage(message); - dialog.setIconAttribute(R.attr.dialog_info_icon); + dialog.setIcon(R.drawable.ic_info_outline); dialog.setPositiveButton(android.R.string.ok, null); dialog.show(); } diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.java b/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.java index 48e6851255..28e3fc5a5c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.java @@ -250,7 +250,7 @@ public class SaveAttachmentTask extends ProgressDialogAsyncTask + + + + \ No newline at end of file diff --git a/app/src/main/res/color/signal_button_secondary_text_selector.xml b/app/src/main/res/color/signal_button_secondary_text_selector.xml new file mode 100644 index 0000000000..92f6557944 --- /dev/null +++ b/app/src/main/res/color/signal_button_secondary_text_selector.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/color/text_color_accent_enabled_selector.xml b/app/src/main/res/color/text_color_accent_enabled_selector.xml index 4a6da29d08..e9d6beac4f 100644 --- a/app/src/main/res/color/text_color_accent_enabled_selector.xml +++ b/app/src/main/res/color/text_color_accent_enabled_selector.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/color/text_color_primary_enabled_selector.xml b/app/src/main/res/color/text_color_primary_enabled_selector.xml index 2fad5b76ea..84a7fdf432 100644 --- a/app/src/main/res/color/text_color_primary_enabled_selector.xml +++ b/app/src/main/res/color/text_color_primary_enabled_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/color/text_color_secondary_enabled_selector.xml b/app/src/main/res/color/text_color_secondary_enabled_selector.xml index 199eca0802..ec930105b2 100644 --- a/app/src/main/res/color/text_color_secondary_enabled_selector.xml +++ b/app/src/main/res/color/text_color_secondary_enabled_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/color/ultramarine_text_button.xml b/app/src/main/res/color/ultramarine_text_button.xml index 7020a542a8..62c6643045 100644 --- a/app/src/main/res/color/ultramarine_text_button.xml +++ b/app/src/main/res/color/ultramarine_text_button.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable-hdpi/divet_lower_right_dark.webp b/app/src/main/res/drawable-hdpi/divet_lower_right_dark.webp deleted file mode 100644 index ca18cd6b6a..0000000000 Binary files a/app/src/main/res/drawable-hdpi/divet_lower_right_dark.webp and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/divet_lower_right_light.webp b/app/src/main/res/drawable-hdpi/divet_lower_right_light.webp deleted file mode 100644 index eb92bfa782..0000000000 Binary files a/app/src/main/res/drawable-hdpi/divet_lower_right_light.webp and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_account_box_light.webp b/app/src/main/res/drawable-hdpi/ic_account_box.webp similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_account_box_light.webp rename to app/src/main/res/drawable-hdpi/ic_account_box.webp diff --git a/app/src/main/res/drawable-hdpi/ic_arrow_forward_light.webp b/app/src/main/res/drawable-hdpi/ic_arrow_forward.webp similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_arrow_forward_light.webp rename to app/src/main/res/drawable-hdpi/ic_arrow_forward.webp diff --git a/app/src/main/res/drawable-hdpi/ic_attach_grey600_24dp.png b/app/src/main/res/drawable-hdpi/ic_attach_grey600_24dp.png deleted file mode 100644 index 13c7f0c28d..0000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_attach_grey600_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_attach_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_attach_white_24dp.png deleted file mode 100644 index a176ce207d..0000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_attach_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_audio_light.webp b/app/src/main/res/drawable-hdpi/ic_audio.webp similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_audio_light.webp rename to app/src/main/res/drawable-hdpi/ic_audio.webp diff --git a/app/src/main/res/drawable-hdpi/ic_document_large_light.webp b/app/src/main/res/drawable-hdpi/ic_document_large.webp similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_document_large_light.webp rename to app/src/main/res/drawable-hdpi/ic_document_large.webp diff --git a/app/src/main/res/drawable-hdpi/ic_document_small_light.webp b/app/src/main/res/drawable-hdpi/ic_document_small.webp similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_document_small_light.webp rename to app/src/main/res/drawable-hdpi/ic_document_small.webp diff --git a/app/src/main/res/drawable-hdpi/ic_info_outline_light.webp b/app/src/main/res/drawable-hdpi/ic_info_outline.webp similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_info_outline_light.webp rename to app/src/main/res/drawable-hdpi/ic_info_outline.webp diff --git a/app/src/main/res/drawable-hdpi/ic_video_light.webp b/app/src/main/res/drawable-hdpi/ic_video.webp similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_video_light.webp rename to app/src/main/res/drawable-hdpi/ic_video.webp diff --git a/app/src/main/res/drawable-hdpi/ic_visibility_grey600_24dp.webp b/app/src/main/res/drawable-hdpi/ic_visibility_24dp.webp similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_visibility_grey600_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_visibility_24dp.webp diff --git a/app/src/main/res/drawable-hdpi/ic_visibility_off_grey600_24dp.webp b/app/src/main/res/drawable-hdpi/ic_visibility_off_24dp.webp similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_visibility_off_grey600_24dp.webp rename to app/src/main/res/drawable-hdpi/ic_visibility_off_24dp.webp diff --git a/app/src/main/res/drawable-hdpi/ic_warning_light.webp b/app/src/main/res/drawable-hdpi/ic_warning.webp similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_warning_light.webp rename to app/src/main/res/drawable-hdpi/ic_warning.webp diff --git a/app/src/main/res/drawable-mdpi/divet_lower_right_dark.webp b/app/src/main/res/drawable-mdpi/divet_lower_right_dark.webp deleted file mode 100644 index 5e835bc7f7..0000000000 Binary files a/app/src/main/res/drawable-mdpi/divet_lower_right_dark.webp and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/divet_lower_right_light.webp b/app/src/main/res/drawable-mdpi/divet_lower_right_light.webp deleted file mode 100644 index f333cb919e..0000000000 Binary files a/app/src/main/res/drawable-mdpi/divet_lower_right_light.webp and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_account_box_light.webp b/app/src/main/res/drawable-mdpi/ic_account_box.webp similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_account_box_light.webp rename to app/src/main/res/drawable-mdpi/ic_account_box.webp diff --git a/app/src/main/res/drawable-mdpi/ic_arrow_forward_light.webp b/app/src/main/res/drawable-mdpi/ic_arrow_forward.webp similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_arrow_forward_light.webp rename to app/src/main/res/drawable-mdpi/ic_arrow_forward.webp diff --git a/app/src/main/res/drawable-mdpi/ic_attach_grey600_24dp.png b/app/src/main/res/drawable-mdpi/ic_attach_grey600_24dp.png deleted file mode 100644 index 0ea546b1f9..0000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_attach_grey600_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_attach_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_attach_white_24dp.png deleted file mode 100644 index bfe8b2891d..0000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_attach_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_audio_light.png b/app/src/main/res/drawable-mdpi/ic_audio.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_audio_light.png rename to app/src/main/res/drawable-mdpi/ic_audio.png diff --git a/app/src/main/res/drawable-mdpi/ic_document_large_light.webp b/app/src/main/res/drawable-mdpi/ic_document_large.webp similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_document_large_light.webp rename to app/src/main/res/drawable-mdpi/ic_document_large.webp diff --git a/app/src/main/res/drawable-mdpi/ic_document_small_light.webp b/app/src/main/res/drawable-mdpi/ic_document_small.webp similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_document_small_light.webp rename to app/src/main/res/drawable-mdpi/ic_document_small.webp diff --git a/app/src/main/res/drawable-mdpi/ic_info_outline_light.webp b/app/src/main/res/drawable-mdpi/ic_info_outline.webp similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_info_outline_light.webp rename to app/src/main/res/drawable-mdpi/ic_info_outline.webp diff --git a/app/src/main/res/drawable-mdpi/ic_message_outline_24.webp b/app/src/main/res/drawable-mdpi/ic_message_24.webp similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_message_outline_24.webp rename to app/src/main/res/drawable-mdpi/ic_message_24.webp diff --git a/app/src/main/res/drawable-mdpi/ic_video_light.webp b/app/src/main/res/drawable-mdpi/ic_video.webp similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_video_light.webp rename to app/src/main/res/drawable-mdpi/ic_video.webp diff --git a/app/src/main/res/drawable-mdpi/ic_visibility_off_grey600_24dp.webp b/app/src/main/res/drawable-mdpi/ic_visibility_off_24dp.webp similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_visibility_off_grey600_24dp.webp rename to app/src/main/res/drawable-mdpi/ic_visibility_off_24dp.webp diff --git a/app/src/main/res/drawable-mdpi/ic_warning_light.webp b/app/src/main/res/drawable-mdpi/ic_warning.webp similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_warning_light.webp rename to app/src/main/res/drawable-mdpi/ic_warning.webp diff --git a/app/src/main/res/drawable-hdpi/ic_account_box_dark.webp b/app/src/main/res/drawable-night-hdpi/ic_account_box.webp similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_account_box_dark.webp rename to app/src/main/res/drawable-night-hdpi/ic_account_box.webp diff --git a/app/src/main/res/drawable-hdpi/ic_arrow_forward_dark.webp b/app/src/main/res/drawable-night-hdpi/ic_arrow_forward.webp similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_arrow_forward_dark.webp rename to app/src/main/res/drawable-night-hdpi/ic_arrow_forward.webp diff --git a/app/src/main/res/drawable-hdpi/ic_audio_dark.webp b/app/src/main/res/drawable-night-hdpi/ic_audio.webp similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_audio_dark.webp rename to app/src/main/res/drawable-night-hdpi/ic_audio.webp diff --git a/app/src/main/res/drawable-hdpi/ic_document_large_dark.webp b/app/src/main/res/drawable-night-hdpi/ic_document_large.webp similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_document_large_dark.webp rename to app/src/main/res/drawable-night-hdpi/ic_document_large.webp diff --git a/app/src/main/res/drawable-hdpi/ic_document_small_dark.webp b/app/src/main/res/drawable-night-hdpi/ic_document_small.webp similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_document_small_dark.webp rename to app/src/main/res/drawable-night-hdpi/ic_document_small.webp diff --git a/app/src/main/res/drawable-hdpi/ic_info_outline_dark.webp b/app/src/main/res/drawable-night-hdpi/ic_info_outline.webp similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_info_outline_dark.webp rename to app/src/main/res/drawable-night-hdpi/ic_info_outline.webp diff --git a/app/src/main/res/drawable-hdpi/ic_video_dark.webp b/app/src/main/res/drawable-night-hdpi/ic_video.webp similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_video_dark.webp rename to app/src/main/res/drawable-night-hdpi/ic_video.webp diff --git a/app/src/main/res/drawable-hdpi/ic_visibility_white_24dp.webp b/app/src/main/res/drawable-night-hdpi/ic_visibility_24dp.webp similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_visibility_white_24dp.webp rename to app/src/main/res/drawable-night-hdpi/ic_visibility_24dp.webp diff --git a/app/src/main/res/drawable-hdpi/ic_visibility_off_white_24dp.webp b/app/src/main/res/drawable-night-hdpi/ic_visibility_off_24dp.webp similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_visibility_off_white_24dp.webp rename to app/src/main/res/drawable-night-hdpi/ic_visibility_off_24dp.webp diff --git a/app/src/main/res/drawable-hdpi/ic_warning_dark.webp b/app/src/main/res/drawable-night-hdpi/ic_warning.webp similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_warning_dark.webp rename to app/src/main/res/drawable-night-hdpi/ic_warning.webp diff --git a/app/src/main/res/drawable-mdpi/ic_account_box_dark.webp b/app/src/main/res/drawable-night-mdpi/ic_account_box.webp similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_account_box_dark.webp rename to app/src/main/res/drawable-night-mdpi/ic_account_box.webp diff --git a/app/src/main/res/drawable-mdpi/ic_arrow_forward_dark.webp b/app/src/main/res/drawable-night-mdpi/ic_arrow_forward.webp similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_arrow_forward_dark.webp rename to app/src/main/res/drawable-night-mdpi/ic_arrow_forward.webp diff --git a/app/src/main/res/drawable-mdpi/ic_audio_dark.webp b/app/src/main/res/drawable-night-mdpi/ic_audio.webp similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_audio_dark.webp rename to app/src/main/res/drawable-night-mdpi/ic_audio.webp diff --git a/app/src/main/res/drawable-mdpi/ic_document_large_dark.webp b/app/src/main/res/drawable-night-mdpi/ic_document_large.webp similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_document_large_dark.webp rename to app/src/main/res/drawable-night-mdpi/ic_document_large.webp diff --git a/app/src/main/res/drawable-mdpi/ic_document_small_dark.webp b/app/src/main/res/drawable-night-mdpi/ic_document_small.webp similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_document_small_dark.webp rename to app/src/main/res/drawable-night-mdpi/ic_document_small.webp diff --git a/app/src/main/res/drawable-mdpi/ic_info_outline_dark.webp b/app/src/main/res/drawable-night-mdpi/ic_info_outline.webp similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_info_outline_dark.webp rename to app/src/main/res/drawable-night-mdpi/ic_info_outline.webp diff --git a/app/src/main/res/drawable-mdpi/ic_message_solid_24.webp b/app/src/main/res/drawable-night-mdpi/ic_message_24.webp similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_message_solid_24.webp rename to app/src/main/res/drawable-night-mdpi/ic_message_24.webp diff --git a/app/src/main/res/drawable-mdpi/ic_video_dark.webp b/app/src/main/res/drawable-night-mdpi/ic_video.webp similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_video_dark.webp rename to app/src/main/res/drawable-night-mdpi/ic_video.webp diff --git a/app/src/main/res/drawable-mdpi/ic_visibility_white_24dp.webp b/app/src/main/res/drawable-night-mdpi/ic_visibility_24dp.webp similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_visibility_white_24dp.webp rename to app/src/main/res/drawable-night-mdpi/ic_visibility_24dp.webp diff --git a/app/src/main/res/drawable-mdpi/ic_visibility_off_white_24dp.webp b/app/src/main/res/drawable-night-mdpi/ic_visibility_off_24dp.webp similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_visibility_off_white_24dp.webp rename to app/src/main/res/drawable-night-mdpi/ic_visibility_off_24dp.webp diff --git a/app/src/main/res/drawable-mdpi/ic_warning_dark.webp b/app/src/main/res/drawable-night-mdpi/ic_warning.webp similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_warning_dark.webp rename to app/src/main/res/drawable-night-mdpi/ic_warning.webp diff --git a/app/src/main/res/drawable-v21/attachment_keyboard_button_background_dark.xml b/app/src/main/res/drawable-night-v21/attachment_keyboard_button_background.xml similarity index 100% rename from app/src/main/res/drawable-v21/attachment_keyboard_button_background_dark.xml rename to app/src/main/res/drawable-night-v21/attachment_keyboard_button_background.xml diff --git a/app/src/main/res/drawable-v21/selectable_background_dark.xml b/app/src/main/res/drawable-night-v21/selectable_background.xml similarity index 100% rename from app/src/main/res/drawable-v21/selectable_background_dark.xml rename to app/src/main/res/drawable-night-v21/selectable_background.xml diff --git a/app/src/main/res/drawable-v21/sticker_button_dark.xml b/app/src/main/res/drawable-night-v21/sticker_button.xml similarity index 100% rename from app/src/main/res/drawable-v21/sticker_button_dark.xml rename to app/src/main/res/drawable-night-v21/sticker_button.xml diff --git a/app/src/main/res/drawable-xhdpi/ic_account_box_dark.webp b/app/src/main/res/drawable-night-xhdpi/ic_account_box.webp similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_account_box_dark.webp rename to app/src/main/res/drawable-night-xhdpi/ic_account_box.webp diff --git a/app/src/main/res/drawable-xhdpi/ic_arrow_forward_dark.webp b/app/src/main/res/drawable-night-xhdpi/ic_arrow_forward.webp similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_arrow_forward_dark.webp rename to app/src/main/res/drawable-night-xhdpi/ic_arrow_forward.webp diff --git a/app/src/main/res/drawable-xhdpi/ic_audio_dark.webp b/app/src/main/res/drawable-night-xhdpi/ic_audio.webp similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_audio_dark.webp rename to app/src/main/res/drawable-night-xhdpi/ic_audio.webp diff --git a/app/src/main/res/drawable-xhdpi/ic_document_large_dark.webp b/app/src/main/res/drawable-night-xhdpi/ic_document_large.webp similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_document_large_dark.webp rename to app/src/main/res/drawable-night-xhdpi/ic_document_large.webp diff --git a/app/src/main/res/drawable-xhdpi/ic_document_small_dark.webp b/app/src/main/res/drawable-night-xhdpi/ic_document_small.webp similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_document_small_dark.webp rename to app/src/main/res/drawable-night-xhdpi/ic_document_small.webp diff --git a/app/src/main/res/drawable-xhdpi/ic_info_outline_dark.webp b/app/src/main/res/drawable-night-xhdpi/ic_info_outline.webp similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_info_outline_dark.webp rename to app/src/main/res/drawable-night-xhdpi/ic_info_outline.webp diff --git a/app/src/main/res/drawable-xhdpi/ic_message_solid_24.webp b/app/src/main/res/drawable-night-xhdpi/ic_message_24.webp similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_message_solid_24.webp rename to app/src/main/res/drawable-night-xhdpi/ic_message_24.webp diff --git a/app/src/main/res/drawable-xhdpi/ic_video_dark.webp b/app/src/main/res/drawable-night-xhdpi/ic_video.webp similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_video_dark.webp rename to app/src/main/res/drawable-night-xhdpi/ic_video.webp diff --git a/app/src/main/res/drawable-xhdpi/ic_visibility_white_24dp.webp b/app/src/main/res/drawable-night-xhdpi/ic_visibility_24dp.webp similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_visibility_white_24dp.webp rename to app/src/main/res/drawable-night-xhdpi/ic_visibility_24dp.webp diff --git a/app/src/main/res/drawable-xhdpi/ic_visibility_off_white_24dp.webp b/app/src/main/res/drawable-night-xhdpi/ic_visibility_off_24dp.webp similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_visibility_off_white_24dp.webp rename to app/src/main/res/drawable-night-xhdpi/ic_visibility_off_24dp.webp diff --git a/app/src/main/res/drawable-xhdpi/ic_warning_dark.webp b/app/src/main/res/drawable-night-xhdpi/ic_warning.webp similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_warning_dark.webp rename to app/src/main/res/drawable-night-xhdpi/ic_warning.webp diff --git a/app/src/main/res/drawable-xxhdpi/ic_account_box_dark.webp b/app/src/main/res/drawable-night-xxhdpi/ic_account_box.webp similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_account_box_dark.webp rename to app/src/main/res/drawable-night-xxhdpi/ic_account_box.webp diff --git a/app/src/main/res/drawable-xxhdpi/ic_arrow_forward_dark.webp b/app/src/main/res/drawable-night-xxhdpi/ic_arrow_forward.webp similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_arrow_forward_dark.webp rename to app/src/main/res/drawable-night-xxhdpi/ic_arrow_forward.webp diff --git a/app/src/main/res/drawable-xxhdpi/ic_attach_white_24dp.webp b/app/src/main/res/drawable-night-xxhdpi/ic_attach_24dp.webp similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_attach_white_24dp.webp rename to app/src/main/res/drawable-night-xxhdpi/ic_attach_24dp.webp diff --git a/app/src/main/res/drawable-xxhdpi/ic_audio_dark.webp b/app/src/main/res/drawable-night-xxhdpi/ic_audio.webp similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_audio_dark.webp rename to app/src/main/res/drawable-night-xxhdpi/ic_audio.webp diff --git a/app/src/main/res/drawable-xxhdpi/ic_document_large_dark.webp b/app/src/main/res/drawable-night-xxhdpi/ic_document_large.webp similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_document_large_dark.webp rename to app/src/main/res/drawable-night-xxhdpi/ic_document_large.webp diff --git a/app/src/main/res/drawable-xxhdpi/ic_document_small_dark.webp b/app/src/main/res/drawable-night-xxhdpi/ic_document_small.webp similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_document_small_dark.webp rename to app/src/main/res/drawable-night-xxhdpi/ic_document_small.webp diff --git a/app/src/main/res/drawable-xxhdpi/ic_info_outline_dark.webp b/app/src/main/res/drawable-night-xxhdpi/ic_info_outline.webp similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_info_outline_dark.webp rename to app/src/main/res/drawable-night-xxhdpi/ic_info_outline.webp diff --git a/app/src/main/res/drawable-xxhdpi/ic_message_solid_24.webp b/app/src/main/res/drawable-night-xxhdpi/ic_message_24.webp similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_message_solid_24.webp rename to app/src/main/res/drawable-night-xxhdpi/ic_message_24.webp diff --git a/app/src/main/res/drawable-xxhdpi/ic_video_dark.webp b/app/src/main/res/drawable-night-xxhdpi/ic_video.webp similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_video_dark.webp rename to app/src/main/res/drawable-night-xxhdpi/ic_video.webp diff --git a/app/src/main/res/drawable-xxhdpi/ic_visibility_white_24dp.webp b/app/src/main/res/drawable-night-xxhdpi/ic_visibility_24dp.webp similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_visibility_white_24dp.webp rename to app/src/main/res/drawable-night-xxhdpi/ic_visibility_24dp.webp diff --git a/app/src/main/res/drawable-xxhdpi/ic_visibility_off_white_24dp.webp b/app/src/main/res/drawable-night-xxhdpi/ic_visibility_off_24dp.webp similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_visibility_off_white_24dp.webp rename to app/src/main/res/drawable-night-xxhdpi/ic_visibility_off_24dp.webp diff --git a/app/src/main/res/drawable-xxhdpi/ic_warning_dark.webp b/app/src/main/res/drawable-night-xxhdpi/ic_warning.webp similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_warning_dark.webp rename to app/src/main/res/drawable-night-xxhdpi/ic_warning.webp diff --git a/app/src/main/res/drawable-xxxhdpi/ic_document_large_dark.webp b/app/src/main/res/drawable-night-xxxhdpi/ic_document_large.webp similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_document_large_dark.webp rename to app/src/main/res/drawable-night-xxxhdpi/ic_document_large.webp diff --git a/app/src/main/res/drawable-xxxhdpi/ic_document_small_dark.webp b/app/src/main/res/drawable-night-xxxhdpi/ic_document_small.webp similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_document_small_dark.webp rename to app/src/main/res/drawable-night-xxxhdpi/ic_document_small.webp diff --git a/app/src/main/res/drawable-xxxhdpi/ic_message_solid_24.webp b/app/src/main/res/drawable-night-xxxhdpi/ic_message_24.webp similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_message_solid_24.webp rename to app/src/main/res/drawable-night-xxxhdpi/ic_message_24.webp diff --git a/app/src/main/res/drawable/attachment_keyboard_button_background_dark.xml b/app/src/main/res/drawable-night/attachment_keyboard_button_background.xml similarity index 100% rename from app/src/main/res/drawable/attachment_keyboard_button_background_dark.xml rename to app/src/main/res/drawable-night/attachment_keyboard_button_background.xml diff --git a/app/src/main/res/drawable/compose_background_dark.xml b/app/src/main/res/drawable-night/compose_background.xml similarity index 100% rename from app/src/main/res/drawable/compose_background_dark.xml rename to app/src/main/res/drawable-night/compose_background.xml diff --git a/app/src/main/res/drawable/contact_selection_checkbox_dark.xml b/app/src/main/res/drawable-night/contact_selection_checkbox.xml similarity index 100% rename from app/src/main/res/drawable/contact_selection_checkbox_dark.xml rename to app/src/main/res/drawable-night/contact_selection_checkbox.xml diff --git a/app/src/main/res/drawable/conversation_reaction_overlay_background_dark.xml b/app/src/main/res/drawable-night/conversation_reaction_overlay_background.xml similarity index 100% rename from app/src/main/res/drawable/conversation_reaction_overlay_background_dark.xml rename to app/src/main/res/drawable-night/conversation_reaction_overlay_background.xml diff --git a/app/src/main/res/drawable/dialog_corners_dark.xml b/app/src/main/res/drawable-night/dialog_corners.xml similarity index 100% rename from app/src/main/res/drawable/dialog_corners_dark.xml rename to app/src/main/res/drawable-night/dialog_corners.xml diff --git a/app/src/main/res/drawable/emoji_variation_selector_background_dark.xml b/app/src/main/res/drawable-night/emoji_variation_selector_background.xml similarity index 100% rename from app/src/main/res/drawable/emoji_variation_selector_background_dark.xml rename to app/src/main/res/drawable-night/emoji_variation_selector_background.xml diff --git a/app/src/main/res/drawable/help_fragment_problem_background_dark.xml b/app/src/main/res/drawable-night/help_fragment_problem_background.xml similarity index 100% rename from app/src/main/res/drawable/help_fragment_problem_background_dark.xml rename to app/src/main/res/drawable-night/help_fragment_problem_background.xml diff --git a/app/src/main/res/drawable/ic_add_members_20_dark.xml b/app/src/main/res/drawable-night/ic_add_members_20.xml similarity index 100% rename from app/src/main/res/drawable/ic_add_members_20_dark.xml rename to app/src/main/res/drawable-night/ic_add_members_20.xml diff --git a/app/src/main/res/drawable/ic_add_members_circle_dark.xml b/app/src/main/res/drawable-night/ic_add_members_circle.xml similarity index 86% rename from app/src/main/res/drawable/ic_add_members_circle_dark.xml rename to app/src/main/res/drawable-night/ic_add_members_circle.xml index 23c58ed981..9ec11afa49 100644 --- a/app/src/main/res/drawable/ic_add_members_circle_dark.xml +++ b/app/src/main/res/drawable-night/ic_add_members_circle.xml @@ -7,7 +7,7 @@ diff --git a/app/src/main/res/drawable/ic_any_emoji_32_dark.xml b/app/src/main/res/drawable-night/ic_any_emoji_32.xml similarity index 100% rename from app/src/main/res/drawable/ic_any_emoji_32_dark.xml rename to app/src/main/res/drawable-night/ic_any_emoji_32.xml diff --git a/app/src/main/res/drawable/ic_appearance_solid_24.xml b/app/src/main/res/drawable-night/ic_appearance_24.xml similarity index 91% rename from app/src/main/res/drawable/ic_appearance_solid_24.xml rename to app/src/main/res/drawable-night/ic_appearance_24.xml index 3d801eb9f3..82bb4a3095 100644 --- a/app/src/main/res/drawable/ic_appearance_solid_24.xml +++ b/app/src/main/res/drawable-night/ic_appearance_24.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_archive_solid_24dp.xml b/app/src/main/res/drawable-night/ic_archive_24dp.xml similarity index 89% rename from app/src/main/res/drawable/ic_archive_solid_24dp.xml rename to app/src/main/res/drawable-night/ic_archive_24dp.xml index 81b018af42..58bb82f58e 100644 --- a/app/src/main/res/drawable/ic_archive_solid_24dp.xml +++ b/app/src/main/res/drawable-night/ic_archive_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_bell_solid_24.xml b/app/src/main/res/drawable-night/ic_bell_24.xml similarity index 88% rename from app/src/main/res/drawable/ic_bell_solid_24.xml rename to app/src/main/res/drawable-night/ic_bell_24.xml index c5130443cd..9be80269cc 100644 --- a/app/src/main/res/drawable/ic_bell_solid_24.xml +++ b/app/src/main/res/drawable-night/ic_bell_24.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_camera_solid_24.xml b/app/src/main/res/drawable-night/ic_camera_24.xml similarity index 89% rename from app/src/main/res/drawable/ic_camera_solid_24.xml rename to app/src/main/res/drawable-night/ic_camera_24.xml index 091d06efad..8f4e566ea4 100644 --- a/app/src/main/res/drawable/ic_camera_solid_24.xml +++ b/app/src/main/res/drawable-night/ic_camera_24.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_compose_solid_tinted_24.xml b/app/src/main/res/drawable-night/ic_compose_tinted_24.xml similarity index 89% rename from app/src/main/res/drawable/ic_compose_solid_tinted_24.xml rename to app/src/main/res/drawable-night/ic_compose_tinted_24.xml index 49013ba351..08d61671f2 100644 --- a/app/src/main/res/drawable/ic_compose_solid_tinted_24.xml +++ b/app/src/main/res/drawable-night/ic_compose_tinted_24.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_copy_solid_24.xml b/app/src/main/res/drawable-night/ic_copy_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_copy_solid_24.xml rename to app/src/main/res/drawable-night/ic_copy_24.xml diff --git a/app/src/main/res/drawable/ic_copy_solid_24_tinted.xml b/app/src/main/res/drawable-night/ic_copy_24_tinted.xml similarity index 87% rename from app/src/main/res/drawable/ic_copy_solid_24_tinted.xml rename to app/src/main/res/drawable-night/ic_copy_24_tinted.xml index 7f4930f711..b9ae6fe646 100644 --- a/app/src/main/res/drawable/ic_copy_solid_24_tinted.xml +++ b/app/src/main/res/drawable-night/ic_copy_24_tinted.xml @@ -5,6 +5,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_emoji_filled.xml b/app/src/main/res/drawable-night/ic_emoji.xml similarity index 100% rename from app/src/main/res/drawable/ic_emoji_filled.xml rename to app/src/main/res/drawable-night/ic_emoji.xml diff --git a/app/src/main/res/drawable/ic_emoji_activity_dark_20.xml b/app/src/main/res/drawable-night/ic_emoji_activity_20.xml similarity index 100% rename from app/src/main/res/drawable/ic_emoji_activity_dark_20.xml rename to app/src/main/res/drawable-night/ic_emoji_activity_20.xml diff --git a/app/src/main/res/drawable/ic_emoji_animal_dark_20.xml b/app/src/main/res/drawable-night/ic_emoji_animal_20.xml similarity index 100% rename from app/src/main/res/drawable/ic_emoji_animal_dark_20.xml rename to app/src/main/res/drawable-night/ic_emoji_animal_20.xml diff --git a/app/src/main/res/drawable/ic_emoji_emoticon_dark_20.xml b/app/src/main/res/drawable-night/ic_emoji_emoticon_20.xml similarity index 100% rename from app/src/main/res/drawable/ic_emoji_emoticon_dark_20.xml rename to app/src/main/res/drawable-night/ic_emoji_emoticon_20.xml diff --git a/app/src/main/res/drawable/ic_emoji_flag_dark_20.xml b/app/src/main/res/drawable-night/ic_emoji_flag_20.xml similarity index 100% rename from app/src/main/res/drawable/ic_emoji_flag_dark_20.xml rename to app/src/main/res/drawable-night/ic_emoji_flag_20.xml diff --git a/app/src/main/res/drawable/ic_emoji_food_dark_20.xml b/app/src/main/res/drawable-night/ic_emoji_food_20.xml similarity index 100% rename from app/src/main/res/drawable/ic_emoji_food_dark_20.xml rename to app/src/main/res/drawable-night/ic_emoji_food_20.xml diff --git a/app/src/main/res/drawable/ic_emoji_object_dark_20.xml b/app/src/main/res/drawable-night/ic_emoji_object_20.xml similarity index 100% rename from app/src/main/res/drawable/ic_emoji_object_dark_20.xml rename to app/src/main/res/drawable-night/ic_emoji_object_20.xml diff --git a/app/src/main/res/drawable/ic_emoji_people_dark_20.xml b/app/src/main/res/drawable-night/ic_emoji_people_20.xml similarity index 100% rename from app/src/main/res/drawable/ic_emoji_people_dark_20.xml rename to app/src/main/res/drawable-night/ic_emoji_people_20.xml diff --git a/app/src/main/res/drawable/ic_emoji_smiley_solid_24.xml b/app/src/main/res/drawable-night/ic_emoji_smiley_24.xml similarity index 91% rename from app/src/main/res/drawable/ic_emoji_smiley_solid_24.xml rename to app/src/main/res/drawable-night/ic_emoji_smiley_24.xml index cdd980226f..3781962a91 100644 --- a/app/src/main/res/drawable/ic_emoji_smiley_solid_24.xml +++ b/app/src/main/res/drawable-night/ic_emoji_smiley_24.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_emoji_symbol_dark_20.xml b/app/src/main/res/drawable-night/ic_emoji_symbol_20.xml similarity index 100% rename from app/src/main/res/drawable/ic_emoji_symbol_dark_20.xml rename to app/src/main/res/drawable-night/ic_emoji_symbol_20.xml diff --git a/app/src/main/res/drawable/ic_emoji_travel_dark_20.xml b/app/src/main/res/drawable-night/ic_emoji_travel_20.xml similarity index 100% rename from app/src/main/res/drawable/ic_emoji_travel_dark_20.xml rename to app/src/main/res/drawable-night/ic_emoji_travel_20.xml diff --git a/app/src/main/res/drawable/ic_folder_solid_24.xml b/app/src/main/res/drawable-night/ic_folder_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_folder_solid_24.xml rename to app/src/main/res/drawable-night/ic_folder_24.xml diff --git a/app/src/main/res/drawable/ic_forward_solid_24.xml b/app/src/main/res/drawable-night/ic_forward_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_forward_solid_24.xml rename to app/src/main/res/drawable-night/ic_forward_24.xml diff --git a/app/src/main/res/drawable/ic_grid_solid_20.xml b/app/src/main/res/drawable-night/ic_grid_20.xml similarity index 100% rename from app/src/main/res/drawable/ic_grid_solid_20.xml rename to app/src/main/res/drawable-night/ic_grid_20.xml diff --git a/app/src/main/res/drawable/ic_group_solid_24.xml b/app/src/main/res/drawable-night/ic_group_24.xml similarity index 92% rename from app/src/main/res/drawable/ic_group_solid_24.xml rename to app/src/main/res/drawable-night/ic_group_24.xml index 546a8dd273..5d7e9219ed 100644 --- a/app/src/main/res/drawable/ic_group_solid_24.xml +++ b/app/src/main/res/drawable-night/ic_group_24.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_heart_solid_24.xml b/app/src/main/res/drawable-night/ic_heart_24.xml similarity index 87% rename from app/src/main/res/drawable/ic_heart_solid_24.xml rename to app/src/main/res/drawable-night/ic_heart_24.xml index 8b0e33a84b..fb2ab40597 100644 --- a/app/src/main/res/drawable/ic_heart_solid_24.xml +++ b/app/src/main/res/drawable-night/ic_heart_24.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable-night/ic_help_24.xml b/app/src/main/res/drawable-night/ic_help_24.xml new file mode 100644 index 0000000000..839140229f --- /dev/null +++ b/app/src/main/res/drawable-night/ic_help_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_info_solid_tinted_24.xml b/app/src/main/res/drawable-night/ic_info_tinted_24.xml similarity index 86% rename from app/src/main/res/drawable/ic_info_solid_tinted_24.xml rename to app/src/main/res/drawable-night/ic_info_tinted_24.xml index 9fab7b7f5c..bec7681aef 100644 --- a/app/src/main/res/drawable/ic_info_solid_tinted_24.xml +++ b/app/src/main/res/drawable-night/ic_info_tinted_24.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_info_solid_24.xml b/app/src/main/res/drawable-night/ic_info_white_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_info_solid_24.xml rename to app/src/main/res/drawable-night/ic_info_white_24.xml diff --git a/app/src/main/res/drawable/ic_invite_circle_dark.xml b/app/src/main/res/drawable-night/ic_invite_circle.xml similarity index 100% rename from app/src/main/res/drawable/ic_invite_circle_dark.xml rename to app/src/main/res/drawable-night/ic_invite_circle.xml diff --git a/app/src/main/res/drawable/ic_kbs_splash_dark_svg.xml b/app/src/main/res/drawable-night/ic_kbs_splash.xml similarity index 100% rename from app/src/main/res/drawable/ic_kbs_splash_dark_svg.xml rename to app/src/main/res/drawable-night/ic_kbs_splash.xml diff --git a/app/src/main/res/drawable-night/ic_keyboard_24.xml b/app/src/main/res/drawable-night/ic_keyboard_24.xml new file mode 100644 index 0000000000..c7a54fd89b --- /dev/null +++ b/app/src/main/res/drawable-night/ic_keyboard_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_list_solid_20.xml b/app/src/main/res/drawable-night/ic_list_20.xml similarity index 100% rename from app/src/main/res/drawable/ic_list_solid_20.xml rename to app/src/main/res/drawable-night/ic_list_20.xml diff --git a/app/src/main/res/drawable/ic_lock_solid_24.xml b/app/src/main/res/drawable-night/ic_lock_24.xml similarity index 88% rename from app/src/main/res/drawable/ic_lock_solid_24.xml rename to app/src/main/res/drawable-night/ic_lock_24.xml index 6c6c64c098..faaaf87472 100644 --- a/app/src/main/res/drawable/ic_lock_solid_24.xml +++ b/app/src/main/res/drawable-night/ic_lock_24.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_message_solid_ultramarine_light_24.xml b/app/src/main/res/drawable-night/ic_message_primary_accent_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_message_solid_ultramarine_light_24.xml rename to app/src/main/res/drawable-night/ic_message_primary_accent_24.xml diff --git a/app/src/main/res/drawable/ic_message_solid_tinted_bitmap_24.xml b/app/src/main/res/drawable-night/ic_message_tinted_bitmap_24.xml similarity index 52% rename from app/src/main/res/drawable/ic_message_solid_tinted_bitmap_24.xml rename to app/src/main/res/drawable-night/ic_message_tinted_bitmap_24.xml index 9b8a9fcd0d..88903a7c28 100644 --- a/app/src/main/res/drawable/ic_message_solid_tinted_bitmap_24.xml +++ b/app/src/main/res/drawable-night/ic_message_tinted_bitmap_24.xml @@ -1,4 +1,4 @@ \ No newline at end of file + android:tint="@color/signal_icon_tint_primary" + android:src="@drawable/ic_message_24" /> \ No newline at end of file diff --git a/app/src/main/res/drawable-night/ic_mic_24.xml b/app/src/main/res/drawable-night/ic_mic_24.xml new file mode 100644 index 0000000000..bc43faea5e --- /dev/null +++ b/app/src/main/res/drawable-night/ic_mic_24.xml @@ -0,0 +1,4 @@ + + + + diff --git a/app/src/main/res/drawable/ic_new_group_circle_dark.xml b/app/src/main/res/drawable-night/ic_new_group_circle.xml similarity index 100% rename from app/src/main/res/drawable/ic_new_group_circle_dark.xml rename to app/src/main/res/drawable-night/ic_new_group_circle.xml diff --git a/app/src/main/res/drawable/ic_phone_right_solid_ultramarine_light_24.xml b/app/src/main/res/drawable-night/ic_phone_right_primary_accent_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_phone_right_solid_ultramarine_light_24.xml rename to app/src/main/res/drawable-night/ic_phone_right_primary_accent_24.xml diff --git a/app/src/main/res/drawable/ic_phone_right_unlock_solid_ultramarine_light_24.xml b/app/src/main/res/drawable-night/ic_phone_right_unlock_primary_accent_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_phone_right_unlock_solid_ultramarine_light_24.xml rename to app/src/main/res/drawable-night/ic_phone_right_unlock_primary_accent_24.xml diff --git a/app/src/main/res/drawable/ic_photo_solid_24.xml b/app/src/main/res/drawable-night/ic_photo_24.xml similarity index 89% rename from app/src/main/res/drawable/ic_photo_solid_24.xml rename to app/src/main/res/drawable-night/ic_photo_24.xml index 6859b771c9..676071b798 100644 --- a/app/src/main/res/drawable/ic_photo_solid_24.xml +++ b/app/src/main/res/drawable-night/ic_photo_24.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_pin_solid_24.xml b/app/src/main/res/drawable-night/ic_pin_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_pin_solid_24.xml rename to app/src/main/res/drawable-night/ic_pin_24.xml diff --git a/app/src/main/res/drawable/ic_recent_dark_20.xml b/app/src/main/res/drawable-night/ic_recent_20.xml similarity index 100% rename from app/src/main/res/drawable/ic_recent_dark_20.xml rename to app/src/main/res/drawable-night/ic_recent_20.xml diff --git a/app/src/main/res/drawable/ic_reply_solid_24.xml b/app/src/main/res/drawable-night/ic_reply_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_reply_solid_24.xml rename to app/src/main/res/drawable-night/ic_reply_24.xml diff --git a/app/src/main/res/drawable/ic_share_solid_24_dark.xml b/app/src/main/res/drawable-night/ic_share_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_share_solid_24_dark.xml rename to app/src/main/res/drawable-night/ic_share_24.xml diff --git a/app/src/main/res/drawable/ic_share_solid_24_tinted.xml b/app/src/main/res/drawable-night/ic_share_24_tinted.xml similarity index 90% rename from app/src/main/res/drawable/ic_share_solid_24_tinted.xml rename to app/src/main/res/drawable-night/ic_share_24_tinted.xml index c534116435..63817d8aaf 100644 --- a/app/src/main/res/drawable/ic_share_solid_24_tinted.xml +++ b/app/src/main/res/drawable-night/ic_share_24_tinted.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_sticker_solid_24.xml b/app/src/main/res/drawable-night/ic_sticker_24.xml similarity index 93% rename from app/src/main/res/drawable/ic_sticker_solid_24.xml rename to app/src/main/res/drawable-night/ic_sticker_24.xml index dcd2d4988c..6c2e76a671 100644 --- a/app/src/main/res/drawable/ic_sticker_solid_24.xml +++ b/app/src/main/res/drawable-night/ic_sticker_24.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_trash_solid_24.xml b/app/src/main/res/drawable-night/ic_trash_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_trash_solid_24.xml rename to app/src/main/res/drawable-night/ic_trash_24.xml diff --git a/app/src/main/res/drawable/ic_unpin_solid_24.xml b/app/src/main/res/drawable-night/ic_unpin_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_unpin_solid_24.xml rename to app/src/main/res/drawable-night/ic_unpin_24.xml diff --git a/app/src/main/res/drawable/ic_update_audio_call_incoming_dark_16.xml b/app/src/main/res/drawable-night/ic_update_audio_call_incoming_16.xml similarity index 100% rename from app/src/main/res/drawable/ic_update_audio_call_incoming_dark_16.xml rename to app/src/main/res/drawable-night/ic_update_audio_call_incoming_16.xml diff --git a/app/src/main/res/drawable/ic_update_audio_call_missed_dark_16.xml b/app/src/main/res/drawable-night/ic_update_audio_call_missed_16.xml similarity index 100% rename from app/src/main/res/drawable/ic_update_audio_call_missed_dark_16.xml rename to app/src/main/res/drawable-night/ic_update_audio_call_missed_16.xml diff --git a/app/src/main/res/drawable/ic_update_audio_call_outgoing_dark_16.xml b/app/src/main/res/drawable-night/ic_update_audio_call_outgoing_16.xml similarity index 100% rename from app/src/main/res/drawable/ic_update_audio_call_outgoing_dark_16.xml rename to app/src/main/res/drawable-night/ic_update_audio_call_outgoing_16.xml diff --git a/app/src/main/res/drawable/ic_update_group_dark_16.xml b/app/src/main/res/drawable-night/ic_update_group_16.xml similarity index 100% rename from app/src/main/res/drawable/ic_update_group_dark_16.xml rename to app/src/main/res/drawable-night/ic_update_group_16.xml diff --git a/app/src/main/res/drawable/ic_update_group_accept_dark_16.xml b/app/src/main/res/drawable-night/ic_update_group_accept_16.xml similarity index 100% rename from app/src/main/res/drawable/ic_update_group_accept_dark_16.xml rename to app/src/main/res/drawable-night/ic_update_group_accept_16.xml diff --git a/app/src/main/res/drawable/ic_update_group_add_dark_16.xml b/app/src/main/res/drawable-night/ic_update_group_add_16.xml similarity index 100% rename from app/src/main/res/drawable/ic_update_group_add_dark_16.xml rename to app/src/main/res/drawable-night/ic_update_group_add_16.xml diff --git a/app/src/main/res/drawable/ic_update_group_avatar_dark_16.xml b/app/src/main/res/drawable-night/ic_update_group_avatar_16.xml similarity index 100% rename from app/src/main/res/drawable/ic_update_group_avatar_dark_16.xml rename to app/src/main/res/drawable-night/ic_update_group_avatar_16.xml diff --git a/app/src/main/res/drawable/ic_update_group_decline_dark_16.xml b/app/src/main/res/drawable-night/ic_update_group_decline_16.xml similarity index 100% rename from app/src/main/res/drawable/ic_update_group_decline_dark_16.xml rename to app/src/main/res/drawable-night/ic_update_group_decline_16.xml diff --git a/app/src/main/res/drawable/ic_update_group_leave_dark_16.xml b/app/src/main/res/drawable-night/ic_update_group_leave_16.xml similarity index 100% rename from app/src/main/res/drawable/ic_update_group_leave_dark_16.xml rename to app/src/main/res/drawable-night/ic_update_group_leave_16.xml diff --git a/app/src/main/res/drawable/ic_update_group_name_dark_16.xml b/app/src/main/res/drawable-night/ic_update_group_name_16.xml similarity index 100% rename from app/src/main/res/drawable/ic_update_group_name_dark_16.xml rename to app/src/main/res/drawable-night/ic_update_group_name_16.xml diff --git a/app/src/main/res/drawable/ic_update_group_remove_dark_16.xml b/app/src/main/res/drawable-night/ic_update_group_remove_16.xml similarity index 100% rename from app/src/main/res/drawable/ic_update_group_remove_dark_16.xml rename to app/src/main/res/drawable-night/ic_update_group_remove_16.xml diff --git a/app/src/main/res/drawable/ic_update_group_role_dark_16.xml b/app/src/main/res/drawable-night/ic_update_group_role_16.xml similarity index 100% rename from app/src/main/res/drawable/ic_update_group_role_dark_16.xml rename to app/src/main/res/drawable-night/ic_update_group_role_16.xml diff --git a/app/src/main/res/drawable/ic_update_info_dark_16.xml b/app/src/main/res/drawable-night/ic_update_info_16.xml similarity index 100% rename from app/src/main/res/drawable/ic_update_info_dark_16.xml rename to app/src/main/res/drawable-night/ic_update_info_16.xml diff --git a/app/src/main/res/drawable/ic_update_profile_dark_16.xml b/app/src/main/res/drawable-night/ic_update_profile_16.xml similarity index 100% rename from app/src/main/res/drawable/ic_update_profile_dark_16.xml rename to app/src/main/res/drawable-night/ic_update_profile_16.xml diff --git a/app/src/main/res/drawable/ic_update_safety_number_dark_16.xml b/app/src/main/res/drawable-night/ic_update_safety_number_16.xml similarity index 100% rename from app/src/main/res/drawable/ic_update_safety_number_dark_16.xml rename to app/src/main/res/drawable-night/ic_update_safety_number_16.xml diff --git a/app/src/main/res/drawable/ic_update_timer_dark_16.xml b/app/src/main/res/drawable-night/ic_update_timer_16.xml similarity index 100% rename from app/src/main/res/drawable/ic_update_timer_dark_16.xml rename to app/src/main/res/drawable-night/ic_update_timer_16.xml diff --git a/app/src/main/res/drawable/ic_update_timer_disabled_dark_16.xml b/app/src/main/res/drawable-night/ic_update_timer_disabled_16.xml similarity index 100% rename from app/src/main/res/drawable/ic_update_timer_disabled_dark_16.xml rename to app/src/main/res/drawable-night/ic_update_timer_disabled_16.xml diff --git a/app/src/main/res/drawable/ic_update_verified_dark_16.xml b/app/src/main/res/drawable-night/ic_update_verified_16.xml similarity index 100% rename from app/src/main/res/drawable/ic_update_verified_dark_16.xml rename to app/src/main/res/drawable-night/ic_update_verified_16.xml diff --git a/app/src/main/res/drawable/ic_update_video_call_incoming_dark_16.xml b/app/src/main/res/drawable-night/ic_update_video_call_incoming_16.xml similarity index 100% rename from app/src/main/res/drawable/ic_update_video_call_incoming_dark_16.xml rename to app/src/main/res/drawable-night/ic_update_video_call_incoming_16.xml diff --git a/app/src/main/res/drawable/ic_update_video_call_missed_dark_16.xml b/app/src/main/res/drawable-night/ic_update_video_call_missed_16.xml similarity index 100% rename from app/src/main/res/drawable/ic_update_video_call_missed_dark_16.xml rename to app/src/main/res/drawable-night/ic_update_video_call_missed_16.xml diff --git a/app/src/main/res/drawable/ic_update_video_call_outgoing_dark_16.xml b/app/src/main/res/drawable-night/ic_update_video_call_outgoing_16.xml similarity index 100% rename from app/src/main/res/drawable/ic_update_video_call_outgoing_dark_16.xml rename to app/src/main/res/drawable-night/ic_update_video_call_outgoing_16.xml diff --git a/app/src/main/res/drawable/ic_video_solid_ultramarine_light_24.xml b/app/src/main/res/drawable-night/ic_video_primary_accent_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_video_solid_ultramarine_light_24.xml rename to app/src/main/res/drawable-night/ic_video_primary_accent_24.xml diff --git a/app/src/main/res/drawable/ic_view_all_circle_dark.xml b/app/src/main/res/drawable-night/ic_view_all_circle.xml similarity index 100% rename from app/src/main/res/drawable/ic_view_all_circle_dark.xml rename to app/src/main/res/drawable-night/ic_view_all_circle.xml diff --git a/app/src/main/res/drawable/invite_edit_text_background_dark.xml b/app/src/main/res/drawable-night/invite_edit_text_background.xml similarity index 100% rename from app/src/main/res/drawable/invite_edit_text_background_dark.xml rename to app/src/main/res/drawable-night/invite_edit_text_background.xml diff --git a/app/src/main/res/drawable/media_keyboard_selected_background_dark.xml b/app/src/main/res/drawable-night/media_keyboard_selected_background.xml similarity index 100% rename from app/src/main/res/drawable/media_keyboard_selected_background_dark.xml rename to app/src/main/res/drawable-night/media_keyboard_selected_background.xml diff --git a/app/src/main/res/drawable/message_request_button_background_dark.xml b/app/src/main/res/drawable-night/message_request_button_background.xml similarity index 100% rename from app/src/main/res/drawable/message_request_button_background_dark.xml rename to app/src/main/res/drawable-night/message_request_button_background.xml diff --git a/app/src/main/res/drawable/paragraph_marker_dark.xml b/app/src/main/res/drawable-night/paragraph_marker.xml similarity index 100% rename from app/src/main/res/drawable/paragraph_marker_dark.xml rename to app/src/main/res/drawable-night/paragraph_marker.xml diff --git a/app/src/main/res/drawable/preference_divider_dark.xml b/app/src/main/res/drawable-night/preference_divider.xml similarity index 100% rename from app/src/main/res/drawable/preference_divider_dark.xml rename to app/src/main/res/drawable-night/preference_divider.xml diff --git a/app/src/main/res/drawable/preference_username_background_dark.xml b/app/src/main/res/drawable-night/preference_username_background.xml similarity index 100% rename from app/src/main/res/drawable/preference_username_background_dark.xml rename to app/src/main/res/drawable-night/preference_username_background.xml diff --git a/app/src/main/res/drawable/progress_button_state_dark.xml b/app/src/main/res/drawable-night/progress_button_state.xml similarity index 100% rename from app/src/main/res/drawable/progress_button_state_dark.xml rename to app/src/main/res/drawable-night/progress_button_state.xml diff --git a/app/src/main/res/drawable/reaction_pill_background_dark.xml b/app/src/main/res/drawable-night/reaction_pill_background.xml similarity index 100% rename from app/src/main/res/drawable/reaction_pill_background_dark.xml rename to app/src/main/res/drawable-night/reaction_pill_background.xml diff --git a/app/src/main/res/drawable/reaction_pill_background_selected_dark.xml b/app/src/main/res/drawable-night/reaction_pill_background_selected.xml similarity index 100% rename from app/src/main/res/drawable/reaction_pill_background_selected_dark.xml rename to app/src/main/res/drawable-night/reaction_pill_background_selected.xml diff --git a/app/src/main/res/drawable/reactions_old_background_dark.xml b/app/src/main/res/drawable-night/reactions_old_background.xml similarity index 100% rename from app/src/main/res/drawable/reactions_old_background_dark.xml rename to app/src/main/res/drawable-night/reactions_old_background.xml diff --git a/app/src/main/res/drawable/review_card_outline_dark.xml b/app/src/main/res/drawable-night/review_card_outline.xml similarity index 100% rename from app/src/main/res/drawable/review_card_outline_dark.xml rename to app/src/main/res/drawable-night/review_card_outline.xml diff --git a/app/src/main/res/drawable/round_background_dark.xml b/app/src/main/res/drawable-night/round_background.xml similarity index 100% rename from app/src/main/res/drawable/round_background_dark.xml rename to app/src/main/res/drawable-night/round_background.xml diff --git a/app/src/main/res/drawable/rounded_rectangle_dark.xml b/app/src/main/res/drawable-night/rounded_rectangle.xml similarity index 100% rename from app/src/main/res/drawable/rounded_rectangle_dark.xml rename to app/src/main/res/drawable-night/rounded_rectangle.xml diff --git a/app/src/main/res/drawable/scroll_to_bottom_background_dark.xml b/app/src/main/res/drawable-night/scroll_to_bottom_background.xml similarity index 100% rename from app/src/main/res/drawable/scroll_to_bottom_background_dark.xml rename to app/src/main/res/drawable-night/scroll_to_bottom_background.xml diff --git a/app/src/main/res/drawable/sticker_button_dark.xml b/app/src/main/res/drawable-night/sticker_button.xml similarity index 100% rename from app/src/main/res/drawable/sticker_button_dark.xml rename to app/src/main/res/drawable-night/sticker_button.xml diff --git a/app/src/main/res/drawable/sticker_missing_background_dark.xml b/app/src/main/res/drawable-night/sticker_missing_background.xml similarity index 100% rename from app/src/main/res/drawable/sticker_missing_background_dark.xml rename to app/src/main/res/drawable-night/sticker_missing_background.xml diff --git a/app/src/main/res/drawable/sticky_date_header_background_dark.xml b/app/src/main/res/drawable-night/sticky_date_header_background.xml similarity index 100% rename from app/src/main/res/drawable/sticky_date_header_background_dark.xml rename to app/src/main/res/drawable-night/sticky_date_header_background.xml diff --git a/app/src/main/res/drawable/tinted_circle_dark.xml b/app/src/main/res/drawable-night/tinted_circle.xml similarity index 100% rename from app/src/main/res/drawable/tinted_circle_dark.xml rename to app/src/main/res/drawable-night/tinted_circle.xml diff --git a/app/src/main/res/drawable/unread_count_background_dark.xml b/app/src/main/res/drawable-night/unread_count_background.xml similarity index 100% rename from app/src/main/res/drawable/unread_count_background_dark.xml rename to app/src/main/res/drawable-night/unread_count_background.xml diff --git a/app/src/main/res/drawable-v21/attachment_keyboard_button_background_light.xml b/app/src/main/res/drawable-v21/attachment_keyboard_button_background.xml similarity index 100% rename from app/src/main/res/drawable-v21/attachment_keyboard_button_background_light.xml rename to app/src/main/res/drawable-v21/attachment_keyboard_button_background.xml 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 deleted file mode 100644 index 6ef38ac5e1..0000000000 --- a/app/src/main/res/drawable-v21/conversation_list_item_background_dark.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable-v21/dialog_background.xml b/app/src/main/res/drawable-v21/dialog_background.xml index d607bfc022..42fb55eb91 100644 --- a/app/src/main/res/drawable-v21/dialog_background.xml +++ b/app/src/main/res/drawable-v21/dialog_background.xml @@ -6,6 +6,6 @@ android:insetBottom="16dp"> - + \ No newline at end of file diff --git a/app/src/main/res/drawable-v21/selectable_background_light.xml b/app/src/main/res/drawable-v21/selectable_background.xml similarity index 100% rename from app/src/main/res/drawable-v21/selectable_background_light.xml rename to app/src/main/res/drawable-v21/selectable_background.xml diff --git a/app/src/main/res/drawable-v21/sticker_button_light.xml b/app/src/main/res/drawable-v21/sticker_button.xml similarity index 100% rename from app/src/main/res/drawable-v21/sticker_button_light.xml rename to app/src/main/res/drawable-v21/sticker_button.xml diff --git a/app/src/main/res/drawable-xhdpi/divet_lower_right_dark.webp b/app/src/main/res/drawable-xhdpi/divet_lower_right_dark.webp deleted file mode 100644 index 3d29b7e272..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/divet_lower_right_dark.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/divet_lower_right_light.webp b/app/src/main/res/drawable-xhdpi/divet_lower_right_light.webp deleted file mode 100644 index 0574385c5c..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/divet_lower_right_light.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_account_box_light.webp b/app/src/main/res/drawable-xhdpi/ic_account_box.webp similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_account_box_light.webp rename to app/src/main/res/drawable-xhdpi/ic_account_box.webp diff --git a/app/src/main/res/drawable-xhdpi/ic_arrow_forward_light.webp b/app/src/main/res/drawable-xhdpi/ic_arrow_forward.webp similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_arrow_forward_light.webp rename to app/src/main/res/drawable-xhdpi/ic_arrow_forward.webp diff --git a/app/src/main/res/drawable-xhdpi/ic_attach_grey600_24dp.png b/app/src/main/res/drawable-xhdpi/ic_attach_grey600_24dp.png deleted file mode 100644 index 28aef9e9b1..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_attach_grey600_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_attach_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_attach_white_24dp.png deleted file mode 100644 index ff96fffc29..0000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_attach_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_audio_light.webp b/app/src/main/res/drawable-xhdpi/ic_audio.webp similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_audio_light.webp rename to app/src/main/res/drawable-xhdpi/ic_audio.webp diff --git a/app/src/main/res/drawable-xhdpi/ic_document_large_light.webp b/app/src/main/res/drawable-xhdpi/ic_document_large.webp similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_document_large_light.webp rename to app/src/main/res/drawable-xhdpi/ic_document_large.webp diff --git a/app/src/main/res/drawable-xhdpi/ic_document_small_light.webp b/app/src/main/res/drawable-xhdpi/ic_document_small.webp similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_document_small_light.webp rename to app/src/main/res/drawable-xhdpi/ic_document_small.webp diff --git a/app/src/main/res/drawable-xhdpi/ic_info_outline_light.webp b/app/src/main/res/drawable-xhdpi/ic_info_outline.webp similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_info_outline_light.webp rename to app/src/main/res/drawable-xhdpi/ic_info_outline.webp diff --git a/app/src/main/res/drawable-xhdpi/ic_message_outline_24.webp b/app/src/main/res/drawable-xhdpi/ic_message_24.webp similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_message_outline_24.webp rename to app/src/main/res/drawable-xhdpi/ic_message_24.webp diff --git a/app/src/main/res/drawable-xhdpi/ic_video_light.webp b/app/src/main/res/drawable-xhdpi/ic_video.webp similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_video_light.webp rename to app/src/main/res/drawable-xhdpi/ic_video.webp diff --git a/app/src/main/res/drawable-xhdpi/ic_visibility_grey600_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_visibility_24dp.webp similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_visibility_grey600_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_visibility_24dp.webp diff --git a/app/src/main/res/drawable-xhdpi/ic_visibility_off_grey600_24dp.webp b/app/src/main/res/drawable-xhdpi/ic_visibility_off_24dp.webp similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_visibility_off_grey600_24dp.webp rename to app/src/main/res/drawable-xhdpi/ic_visibility_off_24dp.webp diff --git a/app/src/main/res/drawable-xhdpi/ic_warning_light.webp b/app/src/main/res/drawable-xhdpi/ic_warning.webp similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_warning_light.webp rename to app/src/main/res/drawable-xhdpi/ic_warning.webp diff --git a/app/src/main/res/drawable-xxhdpi/divet_lower_right_dark.webp b/app/src/main/res/drawable-xxhdpi/divet_lower_right_dark.webp deleted file mode 100644 index 79dcacc8ff..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/divet_lower_right_dark.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/divet_lower_right_light.webp b/app/src/main/res/drawable-xxhdpi/divet_lower_right_light.webp deleted file mode 100644 index 8903a0819a..0000000000 Binary files a/app/src/main/res/drawable-xxhdpi/divet_lower_right_light.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_account_box_light.webp b/app/src/main/res/drawable-xxhdpi/ic_account_box.webp similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_account_box_light.webp rename to app/src/main/res/drawable-xxhdpi/ic_account_box.webp diff --git a/app/src/main/res/drawable-xxhdpi/ic_arrow_forward_light.webp b/app/src/main/res/drawable-xxhdpi/ic_arrow_forward.webp similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_arrow_forward_light.webp rename to app/src/main/res/drawable-xxhdpi/ic_arrow_forward.webp diff --git a/app/src/main/res/drawable-xxhdpi/ic_attach_grey600_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_attach_24dp.webp similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_attach_grey600_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_attach_24dp.webp diff --git a/app/src/main/res/drawable-xxhdpi/ic_audio_light.webp b/app/src/main/res/drawable-xxhdpi/ic_audio.webp similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_audio_light.webp rename to app/src/main/res/drawable-xxhdpi/ic_audio.webp diff --git a/app/src/main/res/drawable-xxhdpi/ic_document_large_light.webp b/app/src/main/res/drawable-xxhdpi/ic_document_large.webp similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_document_large_light.webp rename to app/src/main/res/drawable-xxhdpi/ic_document_large.webp diff --git a/app/src/main/res/drawable-xxhdpi/ic_document_small_light.webp b/app/src/main/res/drawable-xxhdpi/ic_document_small.webp similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_document_small_light.webp rename to app/src/main/res/drawable-xxhdpi/ic_document_small.webp diff --git a/app/src/main/res/drawable-xxhdpi/ic_info_outline_light.webp b/app/src/main/res/drawable-xxhdpi/ic_info_outline.webp similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_info_outline_light.webp rename to app/src/main/res/drawable-xxhdpi/ic_info_outline.webp diff --git a/app/src/main/res/drawable-xxhdpi/ic_message_outline_24.webp b/app/src/main/res/drawable-xxhdpi/ic_message_24.webp similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_message_outline_24.webp rename to app/src/main/res/drawable-xxhdpi/ic_message_24.webp diff --git a/app/src/main/res/drawable-xxhdpi/ic_video_light.webp b/app/src/main/res/drawable-xxhdpi/ic_video.webp similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_video_light.webp rename to app/src/main/res/drawable-xxhdpi/ic_video.webp diff --git a/app/src/main/res/drawable-xxhdpi/ic_visibility_grey600_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_visibility_24dp.webp similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_visibility_grey600_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_visibility_24dp.webp diff --git a/app/src/main/res/drawable-xxhdpi/ic_visibility_off_grey600_24dp.webp b/app/src/main/res/drawable-xxhdpi/ic_visibility_off_24dp.webp similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_visibility_off_grey600_24dp.webp rename to app/src/main/res/drawable-xxhdpi/ic_visibility_off_24dp.webp diff --git a/app/src/main/res/drawable-xxhdpi/ic_warning_light.webp b/app/src/main/res/drawable-xxhdpi/ic_warning.webp similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_warning_light.webp rename to app/src/main/res/drawable-xxhdpi/ic_warning.webp diff --git a/app/src/main/res/drawable-xxxhdpi/ic_document_large_light.webp b/app/src/main/res/drawable-xxxhdpi/ic_document_large.webp similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_document_large_light.webp rename to app/src/main/res/drawable-xxxhdpi/ic_document_large.webp diff --git a/app/src/main/res/drawable-xxxhdpi/ic_document_small_light.webp b/app/src/main/res/drawable-xxxhdpi/ic_document_small.webp similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_document_small_light.webp rename to app/src/main/res/drawable-xxxhdpi/ic_document_small.webp diff --git a/app/src/main/res/drawable-xxxhdpi/ic_message_outline_24.webp b/app/src/main/res/drawable-xxxhdpi/ic_message_24.webp similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_message_outline_24.webp rename to app/src/main/res/drawable-xxxhdpi/ic_message_24.webp diff --git a/app/src/main/res/drawable/attachment_keyboard_button_background_light.xml b/app/src/main/res/drawable/attachment_keyboard_button_background.xml similarity index 100% rename from app/src/main/res/drawable/attachment_keyboard_button_background_light.xml rename to app/src/main/res/drawable/attachment_keyboard_button_background.xml diff --git a/app/src/main/res/drawable/avatar_gradient_dark.xml b/app/src/main/res/drawable/avatar_gradient.xml similarity index 62% rename from app/src/main/res/drawable/avatar_gradient_dark.xml rename to app/src/main/res/drawable/avatar_gradient.xml index 500a23e552..c21a15a741 100644 --- a/app/src/main/res/drawable/avatar_gradient_dark.xml +++ b/app/src/main/res/drawable/avatar_gradient.xml @@ -5,7 +5,7 @@ + android:startColor="@color/signal_transparent_20" + android:endColor="@color/signal_transparent" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/avatar_gradient_light.xml b/app/src/main/res/drawable/avatar_gradient_light.xml deleted file mode 100644 index 15b0f62fd3..0000000000 --- a/app/src/main/res/drawable/avatar_gradient_light.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/compose_background_light.xml b/app/src/main/res/drawable/compose_background.xml similarity index 100% rename from app/src/main/res/drawable/compose_background_light.xml rename to app/src/main/res/drawable/compose_background.xml diff --git a/app/src/main/res/drawable/contact_selection_checkbox_light.xml b/app/src/main/res/drawable/contact_selection_checkbox.xml similarity index 100% rename from app/src/main/res/drawable/contact_selection_checkbox_light.xml rename to app/src/main/res/drawable/contact_selection_checkbox.xml 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 deleted file mode 100644 index 2b88d4b9cb..0000000000 --- a/app/src/main/res/drawable/conversation_list_item_background_dark.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/conversation_reaction_overlay_background_light.xml b/app/src/main/res/drawable/conversation_reaction_overlay_background.xml similarity index 100% rename from app/src/main/res/drawable/conversation_reaction_overlay_background_light.xml rename to app/src/main/res/drawable/conversation_reaction_overlay_background.xml diff --git a/app/src/main/res/drawable/dialog_corners_light.xml b/app/src/main/res/drawable/dialog_corners.xml similarity index 100% rename from app/src/main/res/drawable/dialog_corners_light.xml rename to app/src/main/res/drawable/dialog_corners.xml diff --git a/app/src/main/res/drawable/emoji_variation_selector_background_light.xml b/app/src/main/res/drawable/emoji_variation_selector_background.xml similarity index 100% rename from app/src/main/res/drawable/emoji_variation_selector_background_light.xml rename to app/src/main/res/drawable/emoji_variation_selector_background.xml 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.xml similarity index 68% rename from app/src/main/res/drawable/help_fragment_emoji_radio_background_dark.xml rename to app/src/main/res/drawable/help_fragment_emoji_radio_background.xml index 9145b1ce56..efc885f358 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.xml @@ -2,12 +2,12 @@ - + - + \ No newline at end of file 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 deleted file mode 100644 index ce03a64abf..0000000000 --- a/app/src/main/res/drawable/help_fragment_emoji_radio_background_light.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/help_fragment_problem_background_light.xml b/app/src/main/res/drawable/help_fragment_problem_background.xml similarity index 100% rename from app/src/main/res/drawable/help_fragment_problem_background_light.xml rename to app/src/main/res/drawable/help_fragment_problem_background.xml diff --git a/app/src/main/res/drawable/ic_add_members_20_light.xml b/app/src/main/res/drawable/ic_add_members_20.xml similarity index 100% rename from app/src/main/res/drawable/ic_add_members_20_light.xml rename to app/src/main/res/drawable/ic_add_members_20.xml diff --git a/app/src/main/res/drawable/ic_add_members_circle_light.xml b/app/src/main/res/drawable/ic_add_members_circle.xml similarity index 86% rename from app/src/main/res/drawable/ic_add_members_circle_light.xml rename to app/src/main/res/drawable/ic_add_members_circle.xml index 366720386d..50991a9380 100644 --- a/app/src/main/res/drawable/ic_add_members_circle_light.xml +++ b/app/src/main/res/drawable/ic_add_members_circle.xml @@ -7,7 +7,7 @@ diff --git a/app/src/main/res/drawable/ic_advanced_24.xml b/app/src/main/res/drawable/ic_advanced_24.xml index 97eaae6143..497793155e 100644 --- a/app/src/main/res/drawable/ic_advanced_24.xml +++ b/app/src/main/res/drawable/ic_advanced_24.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_any_emoji_32_light.xml b/app/src/main/res/drawable/ic_any_emoji_32.xml similarity index 100% rename from app/src/main/res/drawable/ic_any_emoji_32_light.xml rename to app/src/main/res/drawable/ic_any_emoji_32.xml diff --git a/app/src/main/res/drawable/ic_appearance_outline_24.xml b/app/src/main/res/drawable/ic_appearance_24.xml similarity index 91% rename from app/src/main/res/drawable/ic_appearance_outline_24.xml rename to app/src/main/res/drawable/ic_appearance_24.xml index 34c5f8b72a..979485e4f9 100644 --- a/app/src/main/res/drawable/ic_appearance_outline_24.xml +++ b/app/src/main/res/drawable/ic_appearance_24.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_archive_outline_24dp.xml b/app/src/main/res/drawable/ic_archive_24dp.xml similarity index 90% rename from app/src/main/res/drawable/ic_archive_outline_24dp.xml rename to app/src/main/res/drawable/ic_archive_24dp.xml index 302209bc56..25b274837b 100644 --- a/app/src/main/res/drawable/ic_archive_outline_24dp.xml +++ b/app/src/main/res/drawable/ic_archive_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_arrow_left_24.xml b/app/src/main/res/drawable/ic_arrow_left_24.xml index d372b6f355..a87f1d8f3c 100644 --- a/app/src/main/res/drawable/ic_arrow_left_24.xml +++ b/app/src/main/res/drawable/ic_arrow_left_24.xml @@ -5,6 +5,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_arrow_left_conversation_24.xml b/app/src/main/res/drawable/ic_arrow_left_conversation_24.xml index 463fd1c557..e69b2c95ea 100644 --- a/app/src/main/res/drawable/ic_arrow_left_conversation_24.xml +++ b/app/src/main/res/drawable/ic_arrow_left_conversation_24.xml @@ -5,6 +5,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_bell_outline_24.xml b/app/src/main/res/drawable/ic_bell_24.xml similarity index 91% rename from app/src/main/res/drawable/ic_bell_outline_24.xml rename to app/src/main/res/drawable/ic_bell_24.xml index 9bfbfaaaae..dbd3fee70e 100644 --- a/app/src/main/res/drawable/ic_bell_outline_24.xml +++ b/app/src/main/res/drawable/ic_bell_24.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_block_tinted_24.xml b/app/src/main/res/drawable/ic_block_tinted_24.xml index c3084e98b0..a8e919ca3b 100644 --- a/app/src/main/res/drawable/ic_block_tinted_24.xml +++ b/app/src/main/res/drawable/ic_block_tinted_24.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_camera_outline_24.xml b/app/src/main/res/drawable/ic_camera_24.xml similarity index 91% rename from app/src/main/res/drawable/ic_camera_outline_24.xml rename to app/src/main/res/drawable/ic_camera_24.xml index efa95e1f4f..426d3e7b80 100644 --- a/app/src/main/res/drawable/ic_camera_outline_24.xml +++ b/app/src/main/res/drawable/ic_camera_24.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_check_24.xml b/app/src/main/res/drawable/ic_check_24.xml index e996c2ae94..3f70fa3fe8 100644 --- a/app/src/main/res/drawable/ic_check_24.xml +++ b/app/src/main/res/drawable/ic_check_24.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_check_28_tinted.xml b/app/src/main/res/drawable/ic_check_28_tinted.xml index 8648619e07..592e092fff 100644 --- a/app/src/main/res/drawable/ic_check_28_tinted.xml +++ b/app/src/main/res/drawable/ic_check_28_tinted.xml @@ -4,9 +4,9 @@ android:viewportWidth="28" android:viewportHeight="28"> diff --git a/app/src/main/res/drawable/ic_compose_outline_tinted_24.xml b/app/src/main/res/drawable/ic_compose_tinted_24.xml similarity index 90% rename from app/src/main/res/drawable/ic_compose_outline_tinted_24.xml rename to app/src/main/res/drawable/ic_compose_tinted_24.xml index cc22585cb4..83e360a7f2 100644 --- a/app/src/main/res/drawable/ic_compose_outline_tinted_24.xml +++ b/app/src/main/res/drawable/ic_compose_tinted_24.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_copy_outline_24.xml b/app/src/main/res/drawable/ic_copy_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_copy_outline_24.xml rename to app/src/main/res/drawable/ic_copy_24.xml diff --git a/app/src/main/res/drawable/ic_copy_outline_24_tinted.xml b/app/src/main/res/drawable/ic_copy_24_tinted.xml similarity index 90% rename from app/src/main/res/drawable/ic_copy_outline_24_tinted.xml rename to app/src/main/res/drawable/ic_copy_24_tinted.xml index 45eb5ee05c..d989fa9111 100644 --- a/app/src/main/res/drawable/ic_copy_outline_24_tinted.xml +++ b/app/src/main/res/drawable/ic_copy_24_tinted.xml @@ -5,6 +5,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_dashboard_24.xml b/app/src/main/res/drawable/ic_dashboard_24.xml index 36466e1564..5fd8e36071 100644 --- a/app/src/main/res/drawable/ic_dashboard_24.xml +++ b/app/src/main/res/drawable/ic_dashboard_24.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_deny_28_tinted.xml b/app/src/main/res/drawable/ic_deny_28_tinted.xml index f39c769f7e..986e7d1036 100644 --- a/app/src/main/res/drawable/ic_deny_28_tinted.xml +++ b/app/src/main/res/drawable/ic_deny_28_tinted.xml @@ -4,9 +4,9 @@ android:viewportWidth="28" android:viewportHeight="28"> diff --git a/app/src/main/res/drawable/ic_emoji_outline.xml b/app/src/main/res/drawable/ic_emoji.xml similarity index 100% rename from app/src/main/res/drawable/ic_emoji_outline.xml rename to app/src/main/res/drawable/ic_emoji.xml diff --git a/app/src/main/res/drawable/ic_emoji_activity_light_20.xml b/app/src/main/res/drawable/ic_emoji_activity_20.xml similarity index 100% rename from app/src/main/res/drawable/ic_emoji_activity_light_20.xml rename to app/src/main/res/drawable/ic_emoji_activity_20.xml diff --git a/app/src/main/res/drawable/ic_emoji_animal_light_20.xml b/app/src/main/res/drawable/ic_emoji_animal_20.xml similarity index 100% rename from app/src/main/res/drawable/ic_emoji_animal_light_20.xml rename to app/src/main/res/drawable/ic_emoji_animal_20.xml diff --git a/app/src/main/res/drawable/ic_emoji_emoticon_light_20.xml b/app/src/main/res/drawable/ic_emoji_emoticon_20.xml similarity index 100% rename from app/src/main/res/drawable/ic_emoji_emoticon_light_20.xml rename to app/src/main/res/drawable/ic_emoji_emoticon_20.xml diff --git a/app/src/main/res/drawable/ic_emoji_flag_light_20.xml b/app/src/main/res/drawable/ic_emoji_flag_20.xml similarity index 100% rename from app/src/main/res/drawable/ic_emoji_flag_light_20.xml rename to app/src/main/res/drawable/ic_emoji_flag_20.xml diff --git a/app/src/main/res/drawable/ic_emoji_food_light_20.xml b/app/src/main/res/drawable/ic_emoji_food_20.xml similarity index 100% rename from app/src/main/res/drawable/ic_emoji_food_light_20.xml rename to app/src/main/res/drawable/ic_emoji_food_20.xml diff --git a/app/src/main/res/drawable/ic_emoji_object_light_20.xml b/app/src/main/res/drawable/ic_emoji_object_20.xml similarity index 100% rename from app/src/main/res/drawable/ic_emoji_object_light_20.xml rename to app/src/main/res/drawable/ic_emoji_object_20.xml diff --git a/app/src/main/res/drawable/ic_emoji_people_light_20.xml b/app/src/main/res/drawable/ic_emoji_people_20.xml similarity index 100% rename from app/src/main/res/drawable/ic_emoji_people_light_20.xml rename to app/src/main/res/drawable/ic_emoji_people_20.xml diff --git a/app/src/main/res/drawable/ic_emoji_smiley_outline_24.xml b/app/src/main/res/drawable/ic_emoji_smiley_24.xml similarity index 92% rename from app/src/main/res/drawable/ic_emoji_smiley_outline_24.xml rename to app/src/main/res/drawable/ic_emoji_smiley_24.xml index f91dbdb6e8..170e8c5795 100644 --- a/app/src/main/res/drawable/ic_emoji_smiley_outline_24.xml +++ b/app/src/main/res/drawable/ic_emoji_smiley_24.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_emoji_symbol_light_20.xml b/app/src/main/res/drawable/ic_emoji_symbol_20.xml similarity index 100% rename from app/src/main/res/drawable/ic_emoji_symbol_light_20.xml rename to app/src/main/res/drawable/ic_emoji_symbol_20.xml diff --git a/app/src/main/res/drawable/ic_emoji_travel_light_20.xml b/app/src/main/res/drawable/ic_emoji_travel_20.xml similarity index 100% rename from app/src/main/res/drawable/ic_emoji_travel_light_20.xml rename to app/src/main/res/drawable/ic_emoji_travel_20.xml diff --git a/app/src/main/res/drawable/ic_error_outline_24.xml b/app/src/main/res/drawable/ic_error_outline_24.xml index db18e74c79..953583bc59 100644 --- a/app/src/main/res/drawable/ic_error_outline_24.xml +++ b/app/src/main/res/drawable/ic_error_outline_24.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_folder_outline_24.xml b/app/src/main/res/drawable/ic_folder_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_folder_outline_24.xml rename to app/src/main/res/drawable/ic_folder_24.xml diff --git a/app/src/main/res/drawable/ic_forward_outline_24.xml b/app/src/main/res/drawable/ic_forward_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_forward_outline_24.xml rename to app/src/main/res/drawable/ic_forward_24.xml diff --git a/app/src/main/res/drawable/ic_grid_outline_20.xml b/app/src/main/res/drawable/ic_grid_20.xml similarity index 100% rename from app/src/main/res/drawable/ic_grid_outline_20.xml rename to app/src/main/res/drawable/ic_grid_20.xml diff --git a/app/src/main/res/drawable/ic_group_outline_24.xml b/app/src/main/res/drawable/ic_group_24.xml similarity index 93% rename from app/src/main/res/drawable/ic_group_outline_24.xml rename to app/src/main/res/drawable/ic_group_24.xml index a5f6b82565..1763496ffd 100644 --- a/app/src/main/res/drawable/ic_group_outline_24.xml +++ b/app/src/main/res/drawable/ic_group_24.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_group_outline_20.xml b/app/src/main/res/drawable/ic_group_outline_20.xml index 417d222d0a..c8b2a5142d 100644 --- a/app/src/main/res/drawable/ic_group_outline_20.xml +++ b/app/src/main/res/drawable/ic_group_outline_20.xml @@ -4,6 +4,6 @@ android:viewportWidth="20" android:viewportHeight="20"> diff --git a/app/src/main/res/drawable/ic_group_outline_34.xml b/app/src/main/res/drawable/ic_group_outline_34.xml index 02758fb42f..36dfd96967 100644 --- a/app/src/main/res/drawable/ic_group_outline_34.xml +++ b/app/src/main/res/drawable/ic_group_outline_34.xml @@ -4,6 +4,6 @@ android:viewportWidth="40" android:viewportHeight="40"> diff --git a/app/src/main/res/drawable/ic_group_outline_40.xml b/app/src/main/res/drawable/ic_group_outline_40.xml index ea3278892c..3d8cfb77c4 100644 --- a/app/src/main/res/drawable/ic_group_outline_40.xml +++ b/app/src/main/res/drawable/ic_group_outline_40.xml @@ -4,6 +4,6 @@ android:viewportWidth="40" android:viewportHeight="40"> diff --git a/app/src/main/res/drawable/ic_group_outline_48.xml b/app/src/main/res/drawable/ic_group_outline_48.xml index 558e4026c8..cd3038ff34 100644 --- a/app/src/main/res/drawable/ic_group_outline_48.xml +++ b/app/src/main/res/drawable/ic_group_outline_48.xml @@ -4,6 +4,6 @@ android:viewportWidth="40" android:viewportHeight="40"> diff --git a/app/src/main/res/drawable/ic_group_solid_highlight_24.xml b/app/src/main/res/drawable/ic_group_solid_highlight_24.xml index ff168f5aed..c969ca0a69 100644 --- a/app/src/main/res/drawable/ic_group_solid_highlight_24.xml +++ b/app/src/main/res/drawable/ic_group_solid_highlight_24.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_heart_outline_24.xml b/app/src/main/res/drawable/ic_heart_24.xml similarity index 91% rename from app/src/main/res/drawable/ic_heart_outline_24.xml rename to app/src/main/res/drawable/ic_heart_24.xml index 0654b6e60d..262dcade13 100644 --- a/app/src/main/res/drawable/ic_heart_outline_24.xml +++ b/app/src/main/res/drawable/ic_heart_24.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_help_24.xml b/app/src/main/res/drawable/ic_help_24.xml new file mode 100644 index 0000000000..08c9d55fde --- /dev/null +++ b/app/src/main/res/drawable/ic_help_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_help_outline_24.xml b/app/src/main/res/drawable/ic_help_outline_24.xml deleted file mode 100644 index 05115e2e4c..0000000000 --- a/app/src/main/res/drawable/ic_help_outline_24.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_help_solid_24.xml b/app/src/main/res/drawable/ic_help_solid_24.xml deleted file mode 100644 index 693fc03a73..0000000000 --- a/app/src/main/res/drawable/ic_help_solid_24.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_info_outline_message_details_24.xml b/app/src/main/res/drawable/ic_info_outline_message_details_24.xml index 0cb60ff4ac..128119c3c7 100644 --- a/app/src/main/res/drawable/ic_info_outline_message_details_24.xml +++ b/app/src/main/res/drawable/ic_info_outline_message_details_24.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/res/drawable/ic_info_outline_tinted_24.xml b/app/src/main/res/drawable/ic_info_tinted_24.xml similarity index 88% rename from app/src/main/res/drawable/ic_info_outline_tinted_24.xml rename to app/src/main/res/drawable/ic_info_tinted_24.xml index e09816bf46..fb601a2e95 100644 --- a/app/src/main/res/drawable/ic_info_outline_tinted_24.xml +++ b/app/src/main/res/drawable/ic_info_tinted_24.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_info_outline_white_24.xml b/app/src/main/res/drawable/ic_info_white_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_info_outline_white_24.xml rename to app/src/main/res/drawable/ic_info_white_24.xml diff --git a/app/src/main/res/drawable/ic_invite_circle_light.xml b/app/src/main/res/drawable/ic_invite_circle.xml similarity index 100% rename from app/src/main/res/drawable/ic_invite_circle_light.xml rename to app/src/main/res/drawable/ic_invite_circle.xml diff --git a/app/src/main/res/drawable/ic_kbs_splash_light_svg.xml b/app/src/main/res/drawable/ic_kbs_splash.xml similarity index 100% rename from app/src/main/res/drawable/ic_kbs_splash_light_svg.xml rename to app/src/main/res/drawable/ic_kbs_splash.xml diff --git a/app/src/main/res/drawable/ic_keyboard_24.xml b/app/src/main/res/drawable/ic_keyboard_24.xml new file mode 100644 index 0000000000..142edd1d8a --- /dev/null +++ b/app/src/main/res/drawable/ic_keyboard_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_keyboard_outline_24.xml b/app/src/main/res/drawable/ic_keyboard_outline_24.xml deleted file mode 100644 index 1f4b6f4ff4..0000000000 --- a/app/src/main/res/drawable/ic_keyboard_outline_24.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_keyboard_solid_24.xml b/app/src/main/res/drawable/ic_keyboard_solid_24.xml deleted file mode 100644 index 0f4c43b4a2..0000000000 --- a/app/src/main/res/drawable/ic_keyboard_solid_24.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_leave_tinted_24.xml b/app/src/main/res/drawable/ic_leave_tinted_24.xml index c40f4fad20..99978fb27b 100644 --- a/app/src/main/res/drawable/ic_leave_tinted_24.xml +++ b/app/src/main/res/drawable/ic_leave_tinted_24.xml @@ -5,6 +5,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_linked_devices_24.xml b/app/src/main/res/drawable/ic_linked_devices_24.xml index 0ccf29914e..2211fd584a 100644 --- a/app/src/main/res/drawable/ic_linked_devices_24.xml +++ b/app/src/main/res/drawable/ic_linked_devices_24.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_list_outline_20.xml b/app/src/main/res/drawable/ic_list_20.xml similarity index 100% rename from app/src/main/res/drawable/ic_list_outline_20.xml rename to app/src/main/res/drawable/ic_list_20.xml diff --git a/app/src/main/res/drawable/ic_lock_outline_24.xml b/app/src/main/res/drawable/ic_lock_24.xml similarity index 90% rename from app/src/main/res/drawable/ic_lock_outline_24.xml rename to app/src/main/res/drawable/ic_lock_24.xml index 2b480fec3c..c014e057d1 100644 --- a/app/src/main/res/drawable/ic_lock_outline_24.xml +++ b/app/src/main/res/drawable/ic_lock_24.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_message_outline_ultramarine_24.xml b/app/src/main/res/drawable/ic_message_primary_accent_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_message_outline_ultramarine_24.xml rename to app/src/main/res/drawable/ic_message_primary_accent_24.xml diff --git a/app/src/main/res/drawable/ic_message_outline_tinted_bitmap_24.xml b/app/src/main/res/drawable/ic_message_tinted_bitmap_24.xml similarity index 52% rename from app/src/main/res/drawable/ic_message_outline_tinted_bitmap_24.xml rename to app/src/main/res/drawable/ic_message_tinted_bitmap_24.xml index 86d8b5cc1a..88903a7c28 100644 --- a/app/src/main/res/drawable/ic_message_outline_tinted_bitmap_24.xml +++ b/app/src/main/res/drawable/ic_message_tinted_bitmap_24.xml @@ -1,4 +1,4 @@ \ No newline at end of file + android:tint="@color/signal_icon_tint_primary" + android:src="@drawable/ic_message_24" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_mic_outline_24.xml b/app/src/main/res/drawable/ic_mic_24.xml similarity index 89% rename from app/src/main/res/drawable/ic_mic_outline_24.xml rename to app/src/main/res/drawable/ic_mic_24.xml index e8369e31f8..c598df67c7 100644 --- a/app/src/main/res/drawable/ic_mic_outline_24.xml +++ b/app/src/main/res/drawable/ic_mic_24.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_mic_solid_24.xml b/app/src/main/res/drawable/ic_mic_solid_24.xml index 5cc1005601..f83e52e9ef 100644 --- a/app/src/main/res/drawable/ic_mic_solid_24.xml +++ b/app/src/main/res/drawable/ic_mic_solid_24.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_more_vert_conversation_24.xml b/app/src/main/res/drawable/ic_more_vert_conversation_24.xml index 146768fcf1..633b8cf1e5 100644 --- a/app/src/main/res/drawable/ic_more_vert_conversation_24.xml +++ b/app/src/main/res/drawable/ic_more_vert_conversation_24.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_new_group_circle_light.xml b/app/src/main/res/drawable/ic_new_group_circle.xml similarity index 100% rename from app/src/main/res/drawable/ic_new_group_circle_light.xml rename to app/src/main/res/drawable/ic_new_group_circle.xml diff --git a/app/src/main/res/drawable/ic_number_pad_conversation_filter_24.xml b/app/src/main/res/drawable/ic_number_pad_conversation_filter_24.xml index e124c48186..b9d9ef2bbe 100644 --- a/app/src/main/res/drawable/ic_number_pad_conversation_filter_24.xml +++ b/app/src/main/res/drawable/ic_number_pad_conversation_filter_24.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/res/drawable/ic_open_20.xml b/app/src/main/res/drawable/ic_open_20.xml index ef2c78bbf8..867c529ec3 100644 --- a/app/src/main/res/drawable/ic_open_20.xml +++ b/app/src/main/res/drawable/ic_open_20.xml @@ -4,6 +4,6 @@ android:viewportWidth="20" android:viewportHeight="20"> diff --git a/app/src/main/res/drawable/ic_phone_right_outline_ultramarine_24.xml b/app/src/main/res/drawable/ic_phone_right_primary_accent_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_phone_right_outline_ultramarine_24.xml rename to app/src/main/res/drawable/ic_phone_right_primary_accent_24.xml diff --git a/app/src/main/res/drawable/ic_phone_right_unlock_outline_ultramarine_24.xml b/app/src/main/res/drawable/ic_phone_right_unlock_primary_accent_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_phone_right_unlock_outline_ultramarine_24.xml rename to app/src/main/res/drawable/ic_phone_right_unlock_primary_accent_24.xml diff --git a/app/src/main/res/drawable/ic_photo_outline_24.xml b/app/src/main/res/drawable/ic_photo_24.xml similarity index 91% rename from app/src/main/res/drawable/ic_photo_outline_24.xml rename to app/src/main/res/drawable/ic_photo_24.xml index d413c17662..ab1daaf696 100644 --- a/app/src/main/res/drawable/ic_photo_outline_24.xml +++ b/app/src/main/res/drawable/ic_photo_24.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_pin_outline_24.xml b/app/src/main/res/drawable/ic_pin_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_pin_outline_24.xml rename to app/src/main/res/drawable/ic_pin_24.xml diff --git a/app/src/main/res/drawable/ic_plus_24.xml b/app/src/main/res/drawable/ic_plus_24.xml index a3b175adac..80b31e7af9 100644 --- a/app/src/main/res/drawable/ic_plus_24.xml +++ b/app/src/main/res/drawable/ic_plus_24.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_profile_outline_20.xml b/app/src/main/res/drawable/ic_profile_outline_20.xml index 83dd435e83..9e92175e14 100644 --- a/app/src/main/res/drawable/ic_profile_outline_20.xml +++ b/app/src/main/res/drawable/ic_profile_outline_20.xml @@ -4,6 +4,6 @@ android:viewportWidth="20" android:viewportHeight="20"> diff --git a/app/src/main/res/drawable/ic_profile_outline_40.xml b/app/src/main/res/drawable/ic_profile_outline_40.xml index c323a7961a..36be61e369 100644 --- a/app/src/main/res/drawable/ic_profile_outline_40.xml +++ b/app/src/main/res/drawable/ic_profile_outline_40.xml @@ -4,6 +4,6 @@ android:viewportWidth="40" android:viewportHeight="40"> diff --git a/app/src/main/res/drawable/ic_profile_outline_48.xml b/app/src/main/res/drawable/ic_profile_outline_48.xml index b716cf4fe3..cf334cb2fa 100644 --- a/app/src/main/res/drawable/ic_profile_outline_48.xml +++ b/app/src/main/res/drawable/ic_profile_outline_48.xml @@ -4,6 +4,6 @@ android:viewportWidth="40" android:viewportHeight="40"> diff --git a/app/src/main/res/drawable/ic_qrcode_24_tinted.xml b/app/src/main/res/drawable/ic_qrcode_24_tinted.xml index 043b44cd7d..799b8c118b 100644 --- a/app/src/main/res/drawable/ic_qrcode_24_tinted.xml +++ b/app/src/main/res/drawable/ic_qrcode_24_tinted.xml @@ -4,33 +4,33 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_recent_light_20.xml b/app/src/main/res/drawable/ic_recent_20.xml similarity index 100% rename from app/src/main/res/drawable/ic_recent_light_20.xml rename to app/src/main/res/drawable/ic_recent_20.xml diff --git a/app/src/main/res/drawable/ic_reply_outline_24.xml b/app/src/main/res/drawable/ic_reply_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_reply_outline_24.xml rename to app/src/main/res/drawable/ic_reply_24.xml diff --git a/app/src/main/res/drawable/ic_reset_24_tinted.xml b/app/src/main/res/drawable/ic_reset_24_tinted.xml index b680b8911b..f074c4ccf3 100644 --- a/app/src/main/res/drawable/ic_reset_24_tinted.xml +++ b/app/src/main/res/drawable/ic_reset_24_tinted.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_search_24.xml b/app/src/main/res/drawable/ic_search_24.xml index 3e6bb3a2f6..c2818e4141 100644 --- a/app/src/main/res/drawable/ic_search_24.xml +++ b/app/src/main/res/drawable/ic_search_24.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_search_conversation_24.xml b/app/src/main/res/drawable/ic_search_conversation_24.xml index dcdd07fc94..b20bf2cf38 100644 --- a/app/src/main/res/drawable/ic_search_conversation_24.xml +++ b/app/src/main/res/drawable/ic_search_conversation_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_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_share_outline_24.xml rename to app/src/main/res/drawable/ic_share_24.xml diff --git a/app/src/main/res/drawable/ic_share_outline_24_tinted.xml b/app/src/main/res/drawable/ic_share_24_tinted.xml similarity index 92% rename from app/src/main/res/drawable/ic_share_outline_24_tinted.xml rename to app/src/main/res/drawable/ic_share_24_tinted.xml index 2945397dbc..a629ed71af 100644 --- a/app/src/main/res/drawable/ic_share_outline_24_tinted.xml +++ b/app/src/main/res/drawable/ic_share_24_tinted.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_sticker_outline_24.xml b/app/src/main/res/drawable/ic_sticker_24.xml similarity index 95% rename from app/src/main/res/drawable/ic_sticker_outline_24.xml rename to app/src/main/res/drawable/ic_sticker_24.xml index dee43bb641..94189573f9 100644 --- a/app/src/main/res/drawable/ic_sticker_outline_24.xml +++ b/app/src/main/res/drawable/ic_sticker_24.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_timer_24.xml b/app/src/main/res/drawable/ic_timer_24.xml index a21db6542f..0785f31800 100644 --- a/app/src/main/res/drawable/ic_timer_24.xml +++ b/app/src/main/res/drawable/ic_timer_24.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_timer_disabled_24.xml b/app/src/main/res/drawable/ic_timer_disabled_24.xml index f395323796..cbaff4f3e7 100644 --- a/app/src/main/res/drawable/ic_timer_disabled_24.xml +++ b/app/src/main/res/drawable/ic_timer_disabled_24.xml @@ -1,6 +1,6 @@ - - + + diff --git a/app/src/main/res/drawable/ic_trash_outline_24.xml b/app/src/main/res/drawable/ic_trash_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_trash_outline_24.xml rename to app/src/main/res/drawable/ic_trash_24.xml diff --git a/app/src/main/res/drawable/ic_unpin_outline_24.xml b/app/src/main/res/drawable/ic_unpin_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_unpin_outline_24.xml rename to app/src/main/res/drawable/ic_unpin_24.xml diff --git a/app/src/main/res/drawable/ic_update_audio_call_incoming_light_16.xml b/app/src/main/res/drawable/ic_update_audio_call_incoming_16.xml similarity index 100% rename from app/src/main/res/drawable/ic_update_audio_call_incoming_light_16.xml rename to app/src/main/res/drawable/ic_update_audio_call_incoming_16.xml diff --git a/app/src/main/res/drawable/ic_update_audio_call_missed_light_16.xml b/app/src/main/res/drawable/ic_update_audio_call_missed_16.xml similarity index 100% rename from app/src/main/res/drawable/ic_update_audio_call_missed_light_16.xml rename to app/src/main/res/drawable/ic_update_audio_call_missed_16.xml diff --git a/app/src/main/res/drawable/ic_update_audio_call_outgoing_light_16.xml b/app/src/main/res/drawable/ic_update_audio_call_outgoing_16.xml similarity index 100% rename from app/src/main/res/drawable/ic_update_audio_call_outgoing_light_16.xml rename to app/src/main/res/drawable/ic_update_audio_call_outgoing_16.xml diff --git a/app/src/main/res/drawable/ic_update_group_light_16.xml b/app/src/main/res/drawable/ic_update_group_16.xml similarity index 100% rename from app/src/main/res/drawable/ic_update_group_light_16.xml rename to app/src/main/res/drawable/ic_update_group_16.xml diff --git a/app/src/main/res/drawable/ic_update_group_accept_light_16.xml b/app/src/main/res/drawable/ic_update_group_accept_16.xml similarity index 100% rename from app/src/main/res/drawable/ic_update_group_accept_light_16.xml rename to app/src/main/res/drawable/ic_update_group_accept_16.xml diff --git a/app/src/main/res/drawable/ic_update_group_add_light_16.xml b/app/src/main/res/drawable/ic_update_group_add_16.xml similarity index 100% rename from app/src/main/res/drawable/ic_update_group_add_light_16.xml rename to app/src/main/res/drawable/ic_update_group_add_16.xml diff --git a/app/src/main/res/drawable/ic_update_group_avatar_light_16.xml b/app/src/main/res/drawable/ic_update_group_avatar_16.xml similarity index 100% rename from app/src/main/res/drawable/ic_update_group_avatar_light_16.xml rename to app/src/main/res/drawable/ic_update_group_avatar_16.xml diff --git a/app/src/main/res/drawable/ic_update_group_decline_light_16.xml b/app/src/main/res/drawable/ic_update_group_decline_16.xml similarity index 100% rename from app/src/main/res/drawable/ic_update_group_decline_light_16.xml rename to app/src/main/res/drawable/ic_update_group_decline_16.xml diff --git a/app/src/main/res/drawable/ic_update_group_leave_light_16.xml b/app/src/main/res/drawable/ic_update_group_leave_16.xml similarity index 100% rename from app/src/main/res/drawable/ic_update_group_leave_light_16.xml rename to app/src/main/res/drawable/ic_update_group_leave_16.xml diff --git a/app/src/main/res/drawable/ic_update_group_name_light_16.xml b/app/src/main/res/drawable/ic_update_group_name_16.xml similarity index 100% rename from app/src/main/res/drawable/ic_update_group_name_light_16.xml rename to app/src/main/res/drawable/ic_update_group_name_16.xml diff --git a/app/src/main/res/drawable/ic_update_group_remove_light_16.xml b/app/src/main/res/drawable/ic_update_group_remove_16.xml similarity index 100% rename from app/src/main/res/drawable/ic_update_group_remove_light_16.xml rename to app/src/main/res/drawable/ic_update_group_remove_16.xml diff --git a/app/src/main/res/drawable/ic_update_group_role_light_16.xml b/app/src/main/res/drawable/ic_update_group_role_16.xml similarity index 100% rename from app/src/main/res/drawable/ic_update_group_role_light_16.xml rename to app/src/main/res/drawable/ic_update_group_role_16.xml diff --git a/app/src/main/res/drawable/ic_update_info_light_16.xml b/app/src/main/res/drawable/ic_update_info_16.xml similarity index 100% rename from app/src/main/res/drawable/ic_update_info_light_16.xml rename to app/src/main/res/drawable/ic_update_info_16.xml diff --git a/app/src/main/res/drawable/ic_update_profile_light_16.xml b/app/src/main/res/drawable/ic_update_profile_16.xml similarity index 100% rename from app/src/main/res/drawable/ic_update_profile_light_16.xml rename to app/src/main/res/drawable/ic_update_profile_16.xml diff --git a/app/src/main/res/drawable/ic_update_safety_number_light_16.xml b/app/src/main/res/drawable/ic_update_safety_number_16.xml similarity index 100% rename from app/src/main/res/drawable/ic_update_safety_number_light_16.xml rename to app/src/main/res/drawable/ic_update_safety_number_16.xml diff --git a/app/src/main/res/drawable/ic_update_timer_light_16.xml b/app/src/main/res/drawable/ic_update_timer_16.xml similarity index 100% rename from app/src/main/res/drawable/ic_update_timer_light_16.xml rename to app/src/main/res/drawable/ic_update_timer_16.xml diff --git a/app/src/main/res/drawable/ic_update_timer_disabled_light_16.xml b/app/src/main/res/drawable/ic_update_timer_disabled_16.xml similarity index 100% rename from app/src/main/res/drawable/ic_update_timer_disabled_light_16.xml rename to app/src/main/res/drawable/ic_update_timer_disabled_16.xml diff --git a/app/src/main/res/drawable/ic_update_verified_light_16.xml b/app/src/main/res/drawable/ic_update_verified_16.xml similarity index 100% rename from app/src/main/res/drawable/ic_update_verified_light_16.xml rename to app/src/main/res/drawable/ic_update_verified_16.xml diff --git a/app/src/main/res/drawable/ic_update_video_call_incomg_light_16.xml b/app/src/main/res/drawable/ic_update_video_call_incoming_16.xml similarity index 100% rename from app/src/main/res/drawable/ic_update_video_call_incomg_light_16.xml rename to app/src/main/res/drawable/ic_update_video_call_incoming_16.xml diff --git a/app/src/main/res/drawable/ic_update_video_call_missed_light_16.xml b/app/src/main/res/drawable/ic_update_video_call_missed_16.xml similarity index 100% rename from app/src/main/res/drawable/ic_update_video_call_missed_light_16.xml rename to app/src/main/res/drawable/ic_update_video_call_missed_16.xml diff --git a/app/src/main/res/drawable/ic_update_video_call_outgoing_light_16.xml b/app/src/main/res/drawable/ic_update_video_call_outgoing_16.xml similarity index 100% rename from app/src/main/res/drawable/ic_update_video_call_outgoing_light_16.xml rename to app/src/main/res/drawable/ic_update_video_call_outgoing_16.xml diff --git a/app/src/main/res/drawable/ic_video_outline_ultramarine_24.xml b/app/src/main/res/drawable/ic_video_primary_accent_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_video_outline_ultramarine_24.xml rename to app/src/main/res/drawable/ic_video_primary_accent_24.xml diff --git a/app/src/main/res/drawable/ic_video_solid_24_tinted.xml b/app/src/main/res/drawable/ic_video_solid_24_tinted.xml index 8d2b24b0f1..d48cd6d77b 100644 --- a/app/src/main/res/drawable/ic_video_solid_24_tinted.xml +++ b/app/src/main/res/drawable/ic_video_solid_24_tinted.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_view_all_20.xml b/app/src/main/res/drawable/ic_view_all_20.xml index 47f54f4566..64481809a1 100644 --- a/app/src/main/res/drawable/ic_view_all_20.xml +++ b/app/src/main/res/drawable/ic_view_all_20.xml @@ -5,5 +5,5 @@ android:viewportHeight="20"> + android:fillColor="@color/signal_icon_tint_primary"/> diff --git a/app/src/main/res/drawable/ic_view_all_circle_light.xml b/app/src/main/res/drawable/ic_view_all_circle.xml similarity index 100% rename from app/src/main/res/drawable/ic_view_all_circle_light.xml rename to app/src/main/res/drawable/ic_view_all_circle.xml diff --git a/app/src/main/res/drawable/ic_view_stream_24.xml b/app/src/main/res/drawable/ic_view_stream_24.xml index 693b2e4135..464a732866 100644 --- a/app/src/main/res/drawable/ic_view_stream_24.xml +++ b/app/src/main/res/drawable/ic_view_stream_24.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_x_20.xml b/app/src/main/res/drawable/ic_x_20.xml index 543cff1354..46a2fedbdf 100644 --- a/app/src/main/res/drawable/ic_x_20.xml +++ b/app/src/main/res/drawable/ic_x_20.xml @@ -4,6 +4,6 @@ android:viewportWidth="20" android:viewportHeight="20"> diff --git a/app/src/main/res/drawable/ic_x_conversation.xml b/app/src/main/res/drawable/ic_x_conversation.xml index 2b4f81a4f0..17a76fceae 100644 --- a/app/src/main/res/drawable/ic_x_conversation.xml +++ b/app/src/main/res/drawable/ic_x_conversation.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_x_conversation_20.xml b/app/src/main/res/drawable/ic_x_conversation_20.xml index 9e87dd89d8..b98b331159 100644 --- a/app/src/main/res/drawable/ic_x_conversation_20.xml +++ b/app/src/main/res/drawable/ic_x_conversation_20.xml @@ -4,6 +4,6 @@ android:viewportWidth="20" android:viewportHeight="20"> diff --git a/app/src/main/res/drawable/ic_x_conversation_filter_24.xml b/app/src/main/res/drawable/ic_x_conversation_filter_24.xml index 7214e629e7..0187c8659b 100644 --- a/app/src/main/res/drawable/ic_x_conversation_filter_24.xml +++ b/app/src/main/res/drawable/ic_x_conversation_filter_24.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_x_reaction_overlay.xml b/app/src/main/res/drawable/ic_x_reaction_overlay.xml index 6113338695..67bf1c342c 100644 --- a/app/src/main/res/drawable/ic_x_reaction_overlay.xml +++ b/app/src/main/res/drawable/ic_x_reaction_overlay.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_x_tinted.xml b/app/src/main/res/drawable/ic_x_tinted.xml index a06051fb1c..0187c8659b 100644 --- a/app/src/main/res/drawable/ic_x_tinted.xml +++ b/app/src/main/res/drawable/ic_x_tinted.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/invite_edit_text_background_light.xml b/app/src/main/res/drawable/invite_edit_text_background.xml similarity index 100% rename from app/src/main/res/drawable/invite_edit_text_background_light.xml rename to app/src/main/res/drawable/invite_edit_text_background.xml diff --git a/app/src/main/res/drawable/media_keyboard_selected_background_light.xml b/app/src/main/res/drawable/media_keyboard_selected_background.xml similarity index 100% rename from app/src/main/res/drawable/media_keyboard_selected_background_light.xml rename to app/src/main/res/drawable/media_keyboard_selected_background.xml diff --git a/app/src/main/res/drawable/message_request_button_background_light.xml b/app/src/main/res/drawable/message_request_button_background.xml similarity index 100% rename from app/src/main/res/drawable/message_request_button_background_light.xml rename to app/src/main/res/drawable/message_request_button_background.xml diff --git a/app/src/main/res/drawable/paragraph_marker_light.xml b/app/src/main/res/drawable/paragraph_marker.xml similarity index 100% rename from app/src/main/res/drawable/paragraph_marker_light.xml rename to app/src/main/res/drawable/paragraph_marker.xml diff --git a/app/src/main/res/drawable/preference_divider_light.xml b/app/src/main/res/drawable/preference_divider.xml similarity index 100% rename from app/src/main/res/drawable/preference_divider_light.xml rename to app/src/main/res/drawable/preference_divider.xml diff --git a/app/src/main/res/drawable/preference_username_background_light.xml b/app/src/main/res/drawable/preference_username_background.xml similarity index 100% rename from app/src/main/res/drawable/preference_username_background_light.xml rename to app/src/main/res/drawable/preference_username_background.xml diff --git a/app/src/main/res/drawable/progress_button_state_light.xml b/app/src/main/res/drawable/progress_button_state.xml similarity index 100% rename from app/src/main/res/drawable/progress_button_state_light.xml rename to app/src/main/res/drawable/progress_button_state.xml diff --git a/app/src/main/res/drawable/reaction_pill_background_light.xml b/app/src/main/res/drawable/reaction_pill_background.xml similarity index 100% rename from app/src/main/res/drawable/reaction_pill_background_light.xml rename to app/src/main/res/drawable/reaction_pill_background.xml diff --git a/app/src/main/res/drawable/reaction_pill_background_selected_light.xml b/app/src/main/res/drawable/reaction_pill_background_selected.xml similarity index 100% rename from app/src/main/res/drawable/reaction_pill_background_selected_light.xml rename to app/src/main/res/drawable/reaction_pill_background_selected.xml diff --git a/app/src/main/res/drawable/reactions_old_background_light.xml b/app/src/main/res/drawable/reactions_old_background.xml similarity index 100% rename from app/src/main/res/drawable/reactions_old_background_light.xml rename to app/src/main/res/drawable/reactions_old_background.xml diff --git a/app/src/main/res/drawable/review_card_outline_light.xml b/app/src/main/res/drawable/review_card_outline.xml similarity index 100% rename from app/src/main/res/drawable/review_card_outline_light.xml rename to app/src/main/res/drawable/review_card_outline.xml diff --git a/app/src/main/res/drawable/round_background_light.xml b/app/src/main/res/drawable/round_background.xml similarity index 100% rename from app/src/main/res/drawable/round_background_light.xml rename to app/src/main/res/drawable/round_background.xml diff --git a/app/src/main/res/drawable/rounded_rectangle_white.xml b/app/src/main/res/drawable/rounded_rectangle.xml similarity index 100% rename from app/src/main/res/drawable/rounded_rectangle_white.xml rename to app/src/main/res/drawable/rounded_rectangle.xml diff --git a/app/src/main/res/drawable/scroll_to_bottom_background_light.xml b/app/src/main/res/drawable/scroll_to_bottom_background.xml similarity index 100% rename from app/src/main/res/drawable/scroll_to_bottom_background_light.xml rename to app/src/main/res/drawable/scroll_to_bottom_background.xml diff --git a/app/src/main/res/drawable/sticker_button_light.xml b/app/src/main/res/drawable/sticker_button.xml similarity index 100% rename from app/src/main/res/drawable/sticker_button_light.xml rename to app/src/main/res/drawable/sticker_button.xml diff --git a/app/src/main/res/drawable/sticker_missing_background_light.xml b/app/src/main/res/drawable/sticker_missing_background.xml similarity index 100% rename from app/src/main/res/drawable/sticker_missing_background_light.xml rename to app/src/main/res/drawable/sticker_missing_background.xml diff --git a/app/src/main/res/drawable/sticky_date_header_background_light.xml b/app/src/main/res/drawable/sticky_date_header_background.xml similarity index 100% rename from app/src/main/res/drawable/sticky_date_header_background_light.xml rename to app/src/main/res/drawable/sticky_date_header_background.xml diff --git a/app/src/main/res/drawable/tinted_circle_light.xml b/app/src/main/res/drawable/tinted_circle.xml similarity index 100% rename from app/src/main/res/drawable/tinted_circle_light.xml rename to app/src/main/res/drawable/tinted_circle.xml diff --git a/app/src/main/res/drawable/unread_count_background_light.xml b/app/src/main/res/drawable/unread_count_background.xml similarity index 100% rename from app/src/main/res/drawable/unread_count_background_light.xml rename to app/src/main/res/drawable/unread_count_background.xml diff --git a/app/src/main/res/layout/activity_map_bottom_sheet_view.xml b/app/src/main/res/layout/activity_map_bottom_sheet_view.xml index 4ff61d5e0f..bb6acaed2c 100755 --- a/app/src/main/res/layout/activity_map_bottom_sheet_view.xml +++ b/app/src/main/res/layout/activity_map_bottom_sheet_view.xml @@ -57,7 +57,7 @@ android:fontFamily="sans-serif-medium" android:ellipsize="end" android:maxLines="1" - android:textColor="?conversation_item_sent_text_primary_color" + android:textColor="@color/signal_text_primary" tools:text="Short address" /> 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 85f00ea8aa..be9e38a831 100644 --- a/app/src/main/res/layout/activity_shared_contact_details.xml +++ b/app/src/main/res/layout/activity_shared_contact_details.xml @@ -14,7 +14,7 @@ + android:background="@color/signal_background_tertiary"> @@ -63,13 +63,13 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" - android:background="?secondary_background" + android:background="@color/signal_background_tertiary" android:paddingStart="16dp" android:paddingTop="8dp" android:paddingEnd="16dp" android:paddingBottom="8dp" android:textAppearance="@style/TextAppearance.Signal.Body2" - android:textColor="?title_text_color_secondary" + android:textColor="@color/signal_text_secondary" android:visibility="gone" app:layout_constraintBottom_toTopOf="@id/member_list_header" app:layout_constraintTop_toBottomOf="@id/mms_warning" @@ -85,7 +85,7 @@ android:text="@string/AddGroupDetailsFragment__members" android:textAlignment="viewStart" android:textAppearance="@style/TextAppearance.Signal.Subtitle2" - android:textColor="?attr/title_text_color_secondary" + android:textColor="@color/signal_text_secondary" app:layout_constraintTop_toBottomOf="@id/gv2_warning" app:layout_goneMarginTop="30dp" /> @@ -106,7 +106,7 @@ app:cpb_colorIndicator="@color/white" app:cpb_colorProgress="?colorAccent" app:cpb_cornerRadius="28dp" - app:cpb_selectorIdle="?attr/circular_progress_button_state" + app:cpb_selectorIdle="@drawable/progress_button_state" app:cpb_textIdle="@string/AddGroupDetailsFragment__create" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" /> diff --git a/app/src/main/res/layout/add_members_activity.xml b/app/src/main/res/layout/add_members_activity.xml index 0072ab1175..1235d35540 100644 --- a/app/src/main/res/layout/add_members_activity.xml +++ b/app/src/main/res/layout/add_members_activity.xml @@ -39,7 +39,7 @@ app:cpb_colorIndicator="@color/white" app:cpb_colorProgress="?colorAccent" app:cpb_cornerRadius="28dp" - app:cpb_selectorIdle="?attr/circular_progress_button_state" + app:cpb_selectorIdle="@drawable/progress_button_state" app:cpb_textIdle="@string/AddMembersActivity__done" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" /> diff --git a/app/src/main/res/layout/album_thumbnail_view.xml b/app/src/main/res/layout/album_thumbnail_view.xml index 11af8b53fb..70155fcb48 100644 --- a/app/src/main/res/layout/album_thumbnail_view.xml +++ b/app/src/main/res/layout/album_thumbnail_view.xml @@ -9,7 +9,7 @@ android:id="@+id/album_cell_container" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="?conversation_background"/> + android:background="@color/signal_background_primary"/> + android:background="@drawable/attachment_keyboard_button_background"> \ No newline at end of file + app:drawableTint="@color/signal_icon_tint_primary" /> \ No newline at end of file diff --git a/app/src/main/res/layout/backup_choose_location_dialog.xml b/app/src/main/res/layout/backup_choose_location_dialog.xml index d474bbce5a..303da7951d 100644 --- a/app/src/main/res/layout/backup_choose_location_dialog.xml +++ b/app/src/main/res/layout/backup_choose_location_dialog.xml @@ -11,7 +11,7 @@ android:layout_gravity="center_horizontal" android:layout_marginTop="36dp" android:layout_marginBottom="36dp" - app:srcCompat="?attr/folder_icon" /> + app:srcCompat="@drawable/ic_folder_24" /> + android:background="@color/signal_divider_major" /> diff --git a/app/src/main/res/layout/basic_megaphone_view.xml b/app/src/main/res/layout/basic_megaphone_view.xml index 2d5b86f60c..3cf58407ec 100644 --- a/app/src/main/res/layout/basic_megaphone_view.xml +++ b/app/src/main/res/layout/basic_megaphone_view.xml @@ -12,7 +12,7 @@ android:paddingStart="8dp" android:paddingEnd="8dp" android:paddingBottom="8dp" - android:background="?megaphone_background" + android:background="@color/signal_background_secondary" android:clickable="true"> diff --git a/app/src/main/res/layout/choose_new_admin_activity.xml b/app/src/main/res/layout/choose_new_admin_activity.xml index 1eb449b966..1ecd1e0c75 100644 --- a/app/src/main/res/layout/choose_new_admin_activity.xml +++ b/app/src/main/res/layout/choose_new_admin_activity.xml @@ -19,7 +19,7 @@ android:layout_height="?actionBarSize" android:background="@android:color/transparent" app:title="@string/ChooseNewAdminActivity_choose_new_admin" - app:titleTextColor="?title_text_color_primary" /> + app:titleTextColor="@color/signal_text_primary" /> @@ -47,7 +47,7 @@ app:cpb_colorIndicator="@color/white" app:cpb_colorProgress="?colorAccent" app:cpb_cornerRadius="28dp" - app:cpb_selectorIdle="?attr/circular_progress_button_state" + app:cpb_selectorIdle="@drawable/progress_button_state" app:cpb_textIdle="@string/ChooseNewAdminActivity_done" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" /> diff --git a/app/src/main/res/layout/contact_filter_toolbar.xml b/app/src/main/res/layout/contact_filter_toolbar.xml index 2254780a90..7801a23972 100644 --- a/app/src/main/res/layout/contact_filter_toolbar.xml +++ b/app/src/main/res/layout/contact_filter_toolbar.xml @@ -42,7 +42,7 @@ android:gravity="center_vertical" android:clickable="true" android:focusable="true" - android:tint="?contact_filter_toolbar_icon_tint" + android:tint="@color/signal_icon_tint_primary" android:background="?actionBarItemBackground" app:srcCompat="@drawable/ic_number_pad_conversation_filter_24" /> @@ -56,9 +56,9 @@ android:clickable="true" android:visibility="gone" android:focusable="true" - android:tint="?contact_filter_toolbar_icon_tint" + android:tint="@color/signal_icon_tint_primary" android:background="?actionBarItemBackground" - app:srcCompat="?conversation_keyboard_toggle" /> + app:srcCompat="@drawable/ic_keyboard_24" /> diff --git a/app/src/main/res/layout/contact_selection_list_item.xml b/app/src/main/res/layout/contact_selection_list_item.xml index 37d6147401..8b5432a186 100644 --- a/app/src/main/res/layout/contact_selection_list_item.xml +++ b/app/src/main/res/layout/contact_selection_list_item.xml @@ -27,7 +27,7 @@ @@ -78,7 +78,7 @@ android:ellipsize="end" android:singleLine="true" android:textAppearance="@style/TextAppearance.Signal.Body2" - android:textColor="?attr/title_text_color_secondary" + android:textColor="@color/signal_text_secondary" android:fontFamily="sans-serif-light" tools:text="@sample/contacts.json/data/label" tools:ignore="RtlSymmetry" /> diff --git a/app/src/main/res/layout/contact_selection_new_group_item.xml b/app/src/main/res/layout/contact_selection_new_group_item.xml index 91492623e8..c1d67b6ef8 100644 --- a/app/src/main/res/layout/contact_selection_new_group_item.xml +++ b/app/src/main/res/layout/contact_selection_new_group_item.xml @@ -14,5 +14,5 @@ android:singleLine="true" android:text="@string/contact_selection_activity__new_group" android:textAlignment="viewStart" - app:drawableStartCompat="?attr/contact_selection_new_group_icon" + app:drawableStartCompat="@drawable/ic_new_group_circle" tools:ignore="RtlSymmetry" /> diff --git a/app/src/main/res/layout/conversation_activity.xml b/app/src/main/res/layout/conversation_activity.xml index 6d125da2d4..2ee8fc4ccf 100644 --- a/app/src/main/res/layout/conversation_activity.xml +++ b/app/src/main/res/layout/conversation_activity.xml @@ -13,7 +13,7 @@ android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" - android:background="?attr/conversation_list_toolbar_background" + android:background="@null" android:theme="@style/TextSecure.DarkActionBar.Conversation" app:contentInsetStartWithNavigation="0dp" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/conversation_activity_attachment_editor_stub.xml b/app/src/main/res/layout/conversation_activity_attachment_editor_stub.xml index b61650f16a..67a956f61b 100644 --- a/app/src/main/res/layout/conversation_activity_attachment_editor_stub.xml +++ b/app/src/main/res/layout/conversation_activity_attachment_editor_stub.xml @@ -40,7 +40,7 @@ android:paddingTop="15dp" android:paddingBottom="15dp" app:foregroundTintColor="@color/grey_500" - app:backgroundTintColor="?conversation_item_bubble_background"/> + app:backgroundTintColor="@color/signal_background_secondary"/> + app:doc_titleColor="@color/signal_text_primary" + app:doc_captionColor="@color/signal_text_secondary"/> diff --git a/app/src/main/res/layout/conversation_fragment.xml b/app/src/main/res/layout/conversation_fragment.xml index a948b137d6..326eb06941 100644 --- a/app/src/main/res/layout/conversation_fragment.xml +++ b/app/src/main/res/layout/conversation_fragment.xml @@ -15,7 +15,7 @@ android:id="@android:id/list" android:layout_width="match_parent" android:layout_height="match_parent" - android:cacheColorHint="?conversation_background" + android:cacheColorHint="@color/signal_background_primary" android:clipChildren="false" android:clipToPadding="false" android:paddingBottom="2dp" @@ -27,14 +27,14 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:background="?attr/conversation_item_sticky_date_background" + android:background="@drawable/sticky_date_header_background" android:elevation="9dp" android:gravity="center" android:paddingStart="12dp" android:paddingTop="4dp" android:paddingEnd="12dp" android:paddingBottom="4dp" - android:textColor="?attr/conversation_item_sticky_date_text_color" + android:textColor="@color/signal_text_secondary" android:visibility="gone" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/conversation_input_panel.xml b/app/src/main/res/layout/conversation_input_panel.xml index 36e0eb61d4..6d8fc15c61 100644 --- a/app/src/main/res/layout/conversation_input_panel.xml +++ b/app/src/main/res/layout/conversation_input_panel.xml @@ -14,7 +14,7 @@ android:id="@+id/input_panel_sticker_suggestion" android:layout_width="match_parent" android:layout_height="90dp" - android:background="?emoji_tab_strip_background" + android:background="@color/signal_background_secondary" android:visibility="gone" /> @@ -55,8 +55,8 @@ android:layout_marginEnd="6dp" android:visibility="gone" app:message_type="preview" - app:quote_colorPrimary="?attr/conversation_item_sent_text_primary_color" - app:quote_colorSecondary="?attr/conversation_item_sent_text_primary_color" + app:quote_colorPrimary="@color/signal_text_primary" + app:quote_colorSecondary="@color/signal_text_primary" tools:visibility="visible" /> @@ -134,8 +134,8 @@ android:background="?selectableItemBackgroundBorderless" android:contentDescription="@string/conversation_activity__quick_attachment_drawer_toggle_camera_description" android:scaleType="fitCenter" - android:tint="?compose_icon_tint" - app:srcCompat="?conversation_attach_camera" /> + android:tint="@color/signal_icon_tint_primary" + app:srcCompat="@drawable/ic_camera_24" /> @@ -217,7 +217,7 @@ android:paddingBottom="6dp" android:scaleType="fitCenter" android:tint="@color/core_white" - app:srcCompat="?conversation_transport_sms_indicator" /> + app:srcCompat="@drawable/ic_send_unlock_24" /> diff --git a/app/src/main/res/layout/conversation_item_footer.xml b/app/src/main/res/layout/conversation_item_footer.xml index b93170b212..e4c73d170b 100644 --- a/app/src/main/res/layout/conversation_item_footer.xml +++ b/app/src/main/res/layout/conversation_item_footer.xml @@ -43,7 +43,7 @@ android:layout_height="wrap_content" android:autoLink="none" android:linksClickable="false" - android:textColor="?conversation_item_sent_text_secondary_color" + android:textColor="@color/signal_text_secondary" tools:text="30m" /> diff --git a/app/src/main/res/layout/conversation_item_last_seen.xml b/app/src/main/res/layout/conversation_item_last_seen.xml index d4ead4da70..b68b5a50cb 100644 --- a/app/src/main/res/layout/conversation_item_last_seen.xml +++ b/app/src/main/res/layout/conversation_item_last_seen.xml @@ -12,7 +12,7 @@ android:layout_width="match_parent" android:layout_height="1px" android:layout_marginBottom="3dp" - android:background="?attr/conversation_item_last_seen_line_color" /> + android:background="@color/core_grey_45" /> \ No newline at end of file diff --git a/app/src/main/res/layout/conversation_item_received_document.xml b/app/src/main/res/layout/conversation_item_received_document.xml index ae72a23f0a..81a5ac835a 100644 --- a/app/src/main/res/layout/conversation_item_received_document.xml +++ b/app/src/main/res/layout/conversation_item_received_document.xml @@ -7,7 +7,7 @@ android:layout_width="210dp" android:layout_height="wrap_content" android:visibility="gone" - app:doc_titleColor="?conversation_item_received_text_primary_color" - app:doc_captionColor="?conversation_item_received_text_secondary_color" + app:doc_titleColor="@color/conversation_item_received_text_primary_color" + app:doc_captionColor="@color/conversation_item_received_text_secondary_color" app:doc_downloadButtonTint="@color/core_white" tools:visibility="visible"/> diff --git a/app/src/main/res/layout/conversation_item_received_multimedia.xml b/app/src/main/res/layout/conversation_item_received_multimedia.xml index 9593e0578b..eb6cf6c1fd 100644 --- a/app/src/main/res/layout/conversation_item_received_multimedia.xml +++ b/app/src/main/res/layout/conversation_item_received_multimedia.xml @@ -26,8 +26,8 @@ android:id="@+id/reply_icon" android:layout_width="@dimen/conversation_item_reply_size" android:layout_height="@dimen/conversation_item_reply_size" - app:srcCompat="?menu_reply_icon" - android:tint="?compose_icon_tint" + app:srcCompat="@drawable/ic_reply_24" + android:tint="@color/signal_icon_tint_primary" android:alpha="0" android:layout_alignTop="@id/body_bubble" android:layout_alignBottom="@id/body_bubble" @@ -85,7 +85,7 @@ android:layout_marginEnd="4sp" android:ellipsize="end" android:maxLines="1" - android:textColor="?conversation_item_received_text_primary_color" + android:textColor="@color/conversation_item_received_text_primary_color" android:textStyle="bold" tools:text="+14152222222" tools:visibility="visible" /> @@ -98,7 +98,7 @@ android:paddingEnd="4sp" style="@style/Signal.Text.Preview" android:fontFamily="sans-serif-regular" - android:textColor="?conversation_item_received_text_primary_color" + android:textColor="@color/conversation_item_received_text_primary_color" android:textStyle="italic" android:maxLines="1" android:ellipsize="end" @@ -115,8 +115,8 @@ android:layout_marginEnd="6dp" android:visibility="gone" app:message_type="incoming" - app:quote_colorPrimary="?attr/conversation_item_quote_text_color" - app:quote_colorSecondary="?attr/conversation_item_quote_text_color" + app:quote_colorPrimary="@color/conversation_item_quote_text_color" + app:quote_colorSecondary="@color/conversation_item_quote_text_color" tools:visibility="visible"/> + app:footer_text_color="@color/conversation_item_received_text_secondary_color" + app:footer_icon_color="@color/conversation_item_received_text_secondary_color"/> + app:footer_text_color="@color/signal_text_secondary" + app:footer_icon_color="@color/signal_icon_tint_secondary"/> diff --git a/app/src/main/res/layout/conversation_item_received_revealable.xml b/app/src/main/res/layout/conversation_item_received_revealable.xml index 9312925f5a..78a93159f3 100644 --- a/app/src/main/res/layout/conversation_item_received_revealable.xml +++ b/app/src/main/res/layout/conversation_item_received_revealable.xml @@ -7,6 +7,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:visibility="gone" - app:revealable_unopenedForegroundColor="?conversation_item_received_text_primary_color" - app:revealable_openedForegroundColor="?conversation_item_sent_text_primary_color" + app:revealable_unopenedForegroundColor="@color/conversation_item_received_text_primary_color" + app:revealable_openedForegroundColor="@color/signal_text_primary" tools:visibility="visible"/> diff --git a/app/src/main/res/layout/conversation_item_received_shared_contact.xml b/app/src/main/res/layout/conversation_item_received_shared_contact.xml index 0fec8a5bf6..ba438c7334 100644 --- a/app/src/main/res/layout/conversation_item_received_shared_contact.xml +++ b/app/src/main/res/layout/conversation_item_received_shared_contact.xml @@ -5,7 +5,7 @@ android:id="@+id/shared_contact_view" android:layout_width="@dimen/media_bubble_default_dimens" android:layout_height="wrap_content" - app:contact_titleColor="?conversation_item_received_text_primary_color" - app:contact_captionColor="?conversation_item_received_text_secondary_color" - app:contact_footerIconColor="?conversation_item_received_text_secondary_color" + app:contact_titleColor="@color/conversation_item_received_text_primary_color" + app:contact_captionColor="@color/conversation_item_received_text_secondary_color" + app:contact_footerIconColor="@color/conversation_item_received_text_secondary_color" app:contact_footerAlpha="0.7"/> diff --git a/app/src/main/res/layout/conversation_item_received_text_only.xml b/app/src/main/res/layout/conversation_item_received_text_only.xml index bbbcbf168c..245c4f88d8 100644 --- a/app/src/main/res/layout/conversation_item_received_text_only.xml +++ b/app/src/main/res/layout/conversation_item_received_text_only.xml @@ -26,8 +26,8 @@ android:id="@+id/reply_icon" android:layout_width="@dimen/conversation_item_reply_size" android:layout_height="@dimen/conversation_item_reply_size" - app:srcCompat="?menu_reply_icon" - android:tint="?compose_icon_tint" + app:srcCompat="@drawable/ic_reply_24" + android:tint="@color/signal_icon_tint_primary" android:alpha="0" android:layout_alignTop="@id/body_bubble" android:layout_alignBottom="@id/body_bubble" @@ -85,7 +85,7 @@ android:layout_marginEnd="4sp" android:ellipsize="end" android:maxLines="1" - android:textColor="?conversation_item_received_text_primary_color" + android:textColor="@color/conversation_item_received_text_primary_color" android:textStyle="bold" tools:text="+14152222222" tools:visibility="visible" /> @@ -98,7 +98,7 @@ android:paddingEnd="4sp" style="@style/Signal.Text.Preview" android:fontFamily="sans-serif-regular" - android:textColor="?conversation_item_received_text_primary_color" + android:textColor="@color/conversation_item_received_text_primary_color" android:textStyle="italic" android:maxLines="1" android:ellipsize="end" @@ -115,8 +115,8 @@ android:layout_marginStart="@dimen/message_bubble_horizontal_padding" android:layout_marginEnd="@dimen/message_bubble_horizontal_padding" style="@style/Signal.Text.Body" - android:textColor="?conversation_item_received_text_primary_color" - android:textColorLink="?conversation_item_received_text_primary_color" + android:textColor="@color/conversation_item_received_text_primary_color" + android:textColorLink="@color/conversation_item_received_text_primary_color" android:ellipsize="end" app:scaleEmojis="true" app:emoji_maxLength="1000" @@ -134,8 +134,8 @@ android:clipChildren="false" android:clipToPadding="false" android:alpha="0.7" - app:footer_text_color="?conversation_item_received_text_secondary_color" - app:footer_icon_color="?conversation_item_received_text_secondary_color"/> + app:footer_text_color="@color/conversation_item_received_text_secondary_color" + app:footer_icon_color="@color/conversation_item_received_text_secondary_color"/> + app:footer_text_color="@color/signal_text_secondary" + app:footer_icon_color="@color/signal_icon_tint_secondary"/> diff --git a/app/src/main/res/layout/conversation_item_sent_audio.xml b/app/src/main/res/layout/conversation_item_sent_audio.xml index 5d346cffab..349d3e37e7 100644 --- a/app/src/main/res/layout/conversation_item_sent_audio.xml +++ b/app/src/main/res/layout/conversation_item_sent_audio.xml @@ -7,8 +7,8 @@ android:layout_height="wrap_content" app:foregroundTintColor="@color/grey_500" app:backgroundTintColor="@color/white" - app:waveformThumbTint="?attr/audio_seek_bar_sent_played_color" - app:waveformPlayedBarsColor="?attr/audio_seek_bar_sent_played_color" - app:waveformUnplayedBarsColor="?attr/audio_seek_bar_sent_unplayed_color" - app:progressAndPlayTint="?attr/audio_play_pause_sent_background_tint" + app:waveformThumbTint="@color/audio_seek_bar_sent_played_color" + app:waveformPlayedBarsColor="@color/audio_seek_bar_sent_played_color" + app:waveformUnplayedBarsColor="@color/audio_seek_bar_sent_unplayed_color" + app:progressAndPlayTint="@color/audio_play_pause_sent_background_tint" android:visibility="gone"/> diff --git a/app/src/main/res/layout/conversation_item_sent_document.xml b/app/src/main/res/layout/conversation_item_sent_document.xml index ce627e27a6..fb1dc7456e 100644 --- a/app/src/main/res/layout/conversation_item_sent_document.xml +++ b/app/src/main/res/layout/conversation_item_sent_document.xml @@ -7,7 +7,7 @@ android:layout_width="210dp" android:layout_height="wrap_content" android:visibility="gone" - app:doc_titleColor="?conversation_item_sent_text_primary_color" - app:doc_captionColor="?conversation_item_sent_text_secondary_color" - app:doc_downloadButtonTint="?conversation_item_sent_download_icon_color" + app:doc_titleColor="@color/signal_text_primary" + app:doc_captionColor="@color/signal_text_secondary" + app:doc_downloadButtonTint="@color/signal_icon_tint_secondary" tools:visibility="visible"/> diff --git a/app/src/main/res/layout/conversation_item_sent_multimedia.xml b/app/src/main/res/layout/conversation_item_sent_multimedia.xml index 55fa3ee326..f2ce1f8ab9 100644 --- a/app/src/main/res/layout/conversation_item_sent_multimedia.xml +++ b/app/src/main/res/layout/conversation_item_sent_multimedia.xml @@ -28,8 +28,8 @@ android:layout_alignTop="@id/body_bubble" android:layout_alignBottom="@id/body_bubble" android:alpha="0" - app:srcCompat="?menu_reply_icon" - android:tint="?compose_icon_tint" /> + app:srcCompat="@drawable/ic_reply_24" + android:tint="@color/signal_icon_tint_primary" /> @@ -140,9 +140,9 @@ android:clipChildren="false" android:clipToPadding="false" android:gravity="end" - app:footer_reveal_dot_color="?attr/conversation_footer_sent_reveal_dot_color" - app:footer_icon_color="?attr/conversation_item_sent_icon_color" - app:footer_text_color="?attr/conversation_item_sent_text_secondary_color" /> + app:footer_reveal_dot_color="@color/signal_icon_tint_secondary" + app:footer_icon_color="@color/signal_icon_tint_secondary" + app:footer_text_color="@color/signal_text_secondary" /> + app:footer_icon_color="@color/signal_icon_tint_secondary" + app:footer_text_color="@color/signal_text_secondary" /> diff --git a/app/src/main/res/layout/conversation_item_sent_revealable.xml b/app/src/main/res/layout/conversation_item_sent_revealable.xml index ff7e95de49..916085d890 100644 --- a/app/src/main/res/layout/conversation_item_sent_revealable.xml +++ b/app/src/main/res/layout/conversation_item_sent_revealable.xml @@ -7,6 +7,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:visibility="gone" - app:revealable_unopenedForegroundColor="?conversation_item_sent_text_primary_color" - app:revealable_openedForegroundColor="?conversation_item_sent_text_primary_color" + app:revealable_unopenedForegroundColor="@color/signal_text_primary" + app:revealable_openedForegroundColor="@color/signal_text_primary" tools:visibility="visible"/> diff --git a/app/src/main/res/layout/conversation_item_sent_shared_contact.xml b/app/src/main/res/layout/conversation_item_sent_shared_contact.xml index e53e97f80c..e8cec047dc 100644 --- a/app/src/main/res/layout/conversation_item_sent_shared_contact.xml +++ b/app/src/main/res/layout/conversation_item_sent_shared_contact.xml @@ -5,6 +5,6 @@ android:id="@+id/shared_contact_view" android:layout_width="@dimen/media_bubble_default_dimens" android:layout_height="wrap_content" - app:contact_titleColor="?conversation_item_sent_text_primary_color" - app:contact_captionColor="?conversation_item_sent_text_secondary_color" - app:contact_footerIconColor="?conversation_item_sent_icon_color"/> + app:contact_titleColor="@color/signal_text_primary" + app:contact_captionColor="@color/signal_text_secondary" + app:contact_footerIconColor="@color/conversation_item_sent_icon_color"/> diff --git a/app/src/main/res/layout/conversation_item_sent_text_only.xml b/app/src/main/res/layout/conversation_item_sent_text_only.xml index 3989cd6962..215b1bf907 100644 --- a/app/src/main/res/layout/conversation_item_sent_text_only.xml +++ b/app/src/main/res/layout/conversation_item_sent_text_only.xml @@ -28,8 +28,8 @@ android:layout_alignTop="@id/body_bubble" android:layout_alignBottom="@id/body_bubble" android:alpha="0" - app:srcCompat="?menu_reply_icon" - android:tint="?compose_icon_tint" /> + app:srcCompat="@drawable/ic_reply_24" + android:tint="@color/signal_icon_tint_primary" /> @@ -71,8 +71,8 @@ android:clipChildren="false" android:clipToPadding="false" android:gravity="end" - app:footer_icon_color="?attr/conversation_item_sent_icon_color" - app:footer_text_color="?attr/conversation_item_sent_text_secondary_color" /> + app:footer_icon_color="@color/signal_icon_tint_secondary" + app:footer_text_color="@color/signal_text_secondary" /> + app:footer_icon_color="@color/signal_icon_tint_secondary" + app:footer_text_color="@color/signal_text_secondary" /> diff --git a/app/src/main/res/layout/conversation_item_thumbnail.xml b/app/src/main/res/layout/conversation_item_thumbnail.xml index 9581f9b9c9..7fdc5231ac 100644 --- a/app/src/main/res/layout/conversation_item_thumbnail.xml +++ b/app/src/main/res/layout/conversation_item_thumbnail.xml @@ -43,7 +43,7 @@ android:layout_marginEnd="@dimen/message_bubble_horizontal_padding" android:layout_marginBottom="@dimen/message_bubble_bottom_padding" android:gravity="end" - app:footer_text_color="?attr/conversation_subtitle_color" - app:footer_icon_color="?attr/conversation_subtitle_color"/> + app:footer_text_color="@color/signal_text_toolbar_subtitle" + app:footer_icon_color="@color/signal_text_toolbar_subtitle"/> diff --git a/app/src/main/res/layout/conversation_item_update.xml b/app/src/main/res/layout/conversation_item_update.xml index 0925af94e1..4a616fd05a 100644 --- a/app/src/main/res/layout/conversation_item_update.xml +++ b/app/src/main/res/layout/conversation_item_update.xml @@ -21,7 +21,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" - android:textColor="?attr/conversation_item_update_text_color" + android:textColor="@color/conversation_item_update_text_color" tools:text="Gwen Stacy set the disappearing message timer to 1 hour" /> diff --git a/app/src/main/res/layout/conversation_list_fragment.xml b/app/src/main/res/layout/conversation_list_fragment.xml index 8b050f0401..ab6e76d1d5 100644 --- a/app/src/main/res/layout/conversation_list_fragment.xml +++ b/app/src/main/res/layout/conversation_list_fragment.xml @@ -11,7 +11,7 @@ android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" - android:background="?attr/conversation_list_toolbar_background" + android:background="@null" android:minHeight="?attr/actionBarSize" android:theme="?attr/actionBarStyle" android:visibility="gone" @@ -43,7 +43,7 @@ android:layout_marginStart="6dp" android:text="@string/app_name" android:textAlignment="viewStart" - android:textColor="?attr/title_text_color_primary" + android:textColor="@color/signal_text_primary" android:textSize="20sp" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" @@ -58,7 +58,7 @@ android:background="?actionBarItemBackground" android:contentDescription="@string/conversation_list_search_description" android:padding="12dp" - android:tint="?icon_tint" + android:tint="@color/signal_icon_tint_primary" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -72,7 +72,7 @@ android:id="@+id/toolbar_basic" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" - android:background="?attr/conversation_list_toolbar_background" + android:background="@null" android:minHeight="?attr/actionBarSize" android:theme="?attr/actionBarStyle" android:visibility="gone" @@ -83,7 +83,7 @@ android:id="@+id/search_toolbar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/conversation_list_toolbar_background" + android:background="@null" android:elevation="4dp" android:visibility="invisible" app:layout_constraintTop_toTopOf="parent" /> @@ -110,7 +110,7 @@ android:id="@+id/search_no_results" android:layout_width="0dp" android:layout_height="0dp" - android:background="?attr/search_background" + android:background="@color/signal_background_primary" android:gravity="center" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" @@ -192,11 +192,11 @@ android:layout_marginBottom="20dp" android:contentDescription="@string/conversation_list_fragment__open_camera_description" android:focusable="true" - android:tint="?conversation_list_camera_icon_tint" - app:backgroundTint="?conversation_list_camera_button_background" + android:tint="@color/signal_icon_tint_secondary" + app:backgroundTint="@color/conversation_list_camera_button_background" app:layout_constraintBottom_toTopOf="@id/fab" app:layout_constraintEnd_toEndOf="@id/fab" - app:srcCompat="@drawable/ic_camera_solid_24" /> + app:srcCompat="@drawable/ic_camera_solid_white_24" /> \ No newline at end of file diff --git a/app/src/main/res/layout/conversation_list_item_view.xml b/app/src/main/res/layout/conversation_list_item_view.xml index fdc983227a..d32ed38eee 100644 --- a/app/src/main/res/layout/conversation_list_item_view.xml +++ b/app/src/main/res/layout/conversation_list_item_view.xml @@ -3,7 +3,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" - android:background="?attr/conversation_list_item_background" + android:background="@drawable/conversation_list_item_background" android:layout_width="match_parent" android:focusable="true" android:nextFocusRight="@+id/fab" @@ -37,7 +37,7 @@ android:fontFamily="sans-serif-medium" android:minWidth="@dimen/unread_count_bubble_diameter" android:padding="5sp" - android:background="?conversation_list_item_unread_background" + android:background="@drawable/unread_count_background" android:textColor="@color/core_white" android:gravity="center" tools:text="1"/> @@ -61,7 +61,7 @@ android:layout_toStartOf="@+id/thumbnail" style="@style/Signal.Text.Body" android:fontFamily="sans-serif-medium" - android:textColor="?attr/conversation_list_item_contact_color" + android:textColor="@color/signal_text_primary" android:maxLines="1" tools:text="Jules Bonnot" android:ellipsize="end" @@ -94,7 +94,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/Signal.Text.Preview" - android:textColor="?attr/conversation_list_item_subject_color" + android:textColor="@color/signal_text_secondary" android:maxLines="1" tools:text="Wheels arrive at 3pm flat. This is a somewhat longer message." android:ellipsize="end" /> @@ -105,7 +105,7 @@ android:layout_height="wrap_content" android:layout_marginTop="4dp" android:visibility="gone" - app:typingIndicator_tint="?conversation_list_typing_tint"/> + app:typingIndicator_tint="@color/signal_icon_tint_secondary"/> @@ -131,7 +131,7 @@ android:layout_alignParentEnd="true" android:layout_alignBaseline="@+id/from" style="@style/Signal.Text.Caption" - android:textColor="?attr/conversation_list_item_date_color" + android:textColor="@color/signal_icon_tint_secondary" tools:text="30 mins" android:singleLine="true"/> @@ -164,7 +164,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - app:iconColor="?attr/conversation_list_item_delivery_icon_color"/> + app:iconColor="@color/signal_icon_tint_secondary"/> diff --git a/app/src/main/res/layout/conversation_no_longer_a_member.xml b/app/src/main/res/layout/conversation_no_longer_a_member.xml index 1813f34771..3f78d3a339 100644 --- a/app/src/main/res/layout/conversation_no_longer_a_member.xml +++ b/app/src/main/res/layout/conversation_no_longer_a_member.xml @@ -3,11 +3,11 @@ android:id="@+id/conversation_no_longer_member_banner" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?secondary_background" + android:background="@color/signal_background_tertiary" android:gravity="center" android:paddingStart="16dp" android:paddingTop="8dp" android:paddingEnd="16dp" android:paddingBottom="8dp" android:text="@string/ConversationActivity_you_cant_send_messages_to_this_group" - android:textColor="?title_text_color_secondary" /> + android:textColor="@color/signal_text_secondary" /> diff --git a/app/src/main/res/layout/conversation_reaction_long_press_toolbar.xml b/app/src/main/res/layout/conversation_reaction_long_press_toolbar.xml index c22736ba4a..1aad43b994 100644 --- a/app/src/main/res/layout/conversation_reaction_long_press_toolbar.xml +++ b/app/src/main/res/layout/conversation_reaction_long_press_toolbar.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" - android:background="?attr/reactions_overlay_toolbar_background_color" + android:background="@color/reactions_overlay_toolbar_background_color" app:contentInsetStart="0dp" app:contentInsetStartWithNavigation="48sp" app:menu="@menu/conversation_reactions_long_press_menu" diff --git a/app/src/main/res/layout/conversation_reaction_scrubber.xml b/app/src/main/res/layout/conversation_reaction_scrubber.xml index 607b9674b9..389d648265 100644 --- a/app/src/main/res/layout/conversation_reaction_scrubber.xml +++ b/app/src/main/res/layout/conversation_reaction_scrubber.xml @@ -14,7 +14,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:alpha="0" - android:background="?reactions_screen_shade_color" /> + android:background="@color/reactions_screen_shade_color" /> @@ -43,7 +43,7 @@ android:layout_width="52dp" android:layout_height="52dp" android:alpha="0" - android:background="?attr/reactions_overlay_old_background" + android:background="@drawable/reactions_old_background" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="@id/reaction_3" app:layout_constraintRight_toRightOf="@id/reaction_3" diff --git a/app/src/main/res/layout/conversation_requesting_bottom_banner.xml b/app/src/main/res/layout/conversation_requesting_bottom_banner.xml index d1a0aa4d3f..8bfca43942 100644 --- a/app/src/main/res/layout/conversation_requesting_bottom_banner.xml +++ b/app/src/main/res/layout/conversation_requesting_bottom_banner.xml @@ -8,14 +8,14 @@ + android:textColor="@color/signal_text_secondary" />