diff --git a/app/src/main/java/org/thoughtcrime/securesms/VerifyIdentityActivity.java b/app/src/main/java/org/thoughtcrime/securesms/VerifyIdentityActivity.java index 82fc0140a..f4cb23113 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/VerifyIdentityActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/VerifyIdentityActivity.java @@ -113,7 +113,7 @@ public class VerifyIdentityActivity extends PassphraseRequiredActivity implement private static final String IDENTITY_EXTRA = "recipient_identity"; private static final String VERIFIED_EXTRA = "verified_state"; - private final DynamicTheme dynamicTheme = new DynamicDarkActionBarTheme(); + private final DynamicTheme dynamicTheme = new DynamicTheme(); private final VerifyDisplayFragment displayFragment = new VerifyDisplayFragment(); private final VerifyScanFragment scanFragment = new VerifyScanFragment(); @@ -161,11 +161,6 @@ public class VerifyIdentityActivity extends PassphraseRequiredActivity implement getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setTitle(R.string.AndroidManifest__verify_safety_number); - LiveRecipient recipient = Recipient.live(getIntent().getParcelableExtra(RECIPIENT_EXTRA)); - recipient.observe(this, r -> setActionBarNotificationBarColor(r.getColor())); - - setActionBarNotificationBarColor(recipient.get().getColor()); - Bundle extras = new Bundle(); extras.putParcelable(VerifyDisplayFragment.RECIPIENT_ID, getIntent().getParcelableExtra(RECIPIENT_EXTRA)); extras.putParcelable(VerifyDisplayFragment.REMOTE_IDENTITY, getIntent().getParcelableExtra(IDENTITY_EXTRA)); 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 0395b7f5a..2b0a7fbcb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java @@ -26,12 +26,10 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.pm.ActivityInfo; import android.content.pm.ShortcutManager; -import android.content.res.ColorStateList; import android.content.res.Configuration; import android.graphics.Bitmap; import android.graphics.Color; import android.graphics.PorterDuff; -import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.hardware.Camera; import android.net.Uri; @@ -106,7 +104,6 @@ import org.thoughtcrime.securesms.VerifyIdentityActivity; import org.thoughtcrime.securesms.attachments.Attachment; import org.thoughtcrime.securesms.attachments.TombstoneAttachment; import org.thoughtcrime.securesms.audio.AudioRecorder; -import org.thoughtcrime.securesms.color.MaterialColor; import org.thoughtcrime.securesms.components.AnimatingToggle; import org.thoughtcrime.securesms.components.ComposeText; import org.thoughtcrime.securesms.components.ConversationSearchBottomBar; @@ -255,8 +252,8 @@ import org.thoughtcrime.securesms.util.CommunicationActions; import org.thoughtcrime.securesms.util.ContextUtil; import org.thoughtcrime.securesms.util.ConversationUtil; import org.thoughtcrime.securesms.util.DrawableUtil; -import org.thoughtcrime.securesms.util.DynamicDarkToolbarTheme; import org.thoughtcrime.securesms.util.DynamicLanguage; +import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme; import org.thoughtcrime.securesms.util.DynamicTheme; import org.thoughtcrime.securesms.util.FeatureFlags; import org.thoughtcrime.securesms.util.FullscreenHelper; @@ -381,6 +378,7 @@ public class ConversationActivity extends PassphraseRequiredActivity private boolean callingTooltipShown; private ImageView wallpaper; private View wallpaperDim; + private Toolbar toolbar; private LinkPreviewViewModel linkPreviewViewModel; private ConversationSearchViewModel searchViewModel; @@ -401,7 +399,7 @@ public class ConversationActivity extends PassphraseRequiredActivity private boolean isSecurityInitialized = false; private IdentityRecordList identityRecords = new IdentityRecordList(Collections.emptyList()); - private final DynamicTheme dynamicTheme = new DynamicDarkToolbarTheme(); + private final DynamicTheme dynamicTheme = new DynamicNoActionBarTheme(); private final DynamicLanguage dynamicLanguage = new DynamicLanguage(); @Override @@ -428,7 +426,6 @@ public class ConversationActivity extends PassphraseRequiredActivity setContentView(R.layout.conversation_activity); getWindow().getDecorView().setBackgroundResource(R.color.signal_background_primary); - WindowUtil.setLightNavigationBarFromTheme(this); fragment = initFragment(R.id.fragment_content, new ConversationFragment(), dynamicLanguage.getCurrentLocale()); @@ -529,6 +526,9 @@ public class ConversationActivity extends PassphraseRequiredActivity dynamicTheme.onResume(this); dynamicLanguage.onResume(this); + WindowUtil.setLightNavigationBarFromTheme(this); + WindowUtil.setLightStatusBarFromTheme(this); + EventBus.getDefault().register(this); initializeMmsEnabledCheck(); initializeIdentityRecords(); @@ -537,7 +537,6 @@ public class ConversationActivity extends PassphraseRequiredActivity Recipient recipientSnapshot = recipient.get(); titleView.setTitle(glideRequests, recipientSnapshot); - setActionBarColor(recipientSnapshot.getColor()); setBlockedUserState(recipientSnapshot, isSecureText, isDefaultSms); calculateCharactersRemaining(); @@ -1933,7 +1932,7 @@ public class ConversationActivity extends PassphraseRequiredActivity noLongerMemberBanner = findViewById(R.id.conversation_no_longer_member_banner); requestingMemberBanner = findViewById(R.id.conversation_requesting_banner); cancelJoinRequest = findViewById(R.id.conversation_cancel_request); - joinGroupCallButton = findViewById(R.id.conversation_group_cal_join); + joinGroupCallButton = findViewById(R.id.conversation_group_call_join); container.addOnKeyboardShownListener(this); inputPanel.setListener(this); @@ -2001,6 +2000,10 @@ public class ConversationActivity extends PassphraseRequiredActivity if (attachmentKeyboardStub.resolved()) { attachmentKeyboardStub.get().setWallpaperEnabled(true); } + + int toolbarColor = getResources().getColor(R.color.conversation_toolbar_color_wallpaper); + toolbar.setBackgroundColor(toolbarColor); + WindowUtil.setStatusBarColor(getWindow(), toolbarColor); } else { wallpaper.setImageDrawable(null); wallpaperDim.setVisibility(View.GONE); @@ -2008,12 +2011,16 @@ public class ConversationActivity extends PassphraseRequiredActivity if (attachmentKeyboardStub.resolved()) { attachmentKeyboardStub.get().setWallpaperEnabled(false); } + + int toolbarColor = getResources().getColor(R.color.conversation_toolbar_color); + toolbar.setBackgroundColor(toolbarColor); + WindowUtil.setStatusBarColor(getWindow(), toolbarColor); } fragment.onWallpaperChanged(chatWallpaper); } protected void initializeActionBar() { - Toolbar toolbar = findViewById(R.id.toolbar); + toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); ActionBar supportActionBar = getSupportActionBar(); @@ -2305,7 +2312,6 @@ public class ConversationActivity extends PassphraseRequiredActivity titleView.setTitle(glideRequests, recipient); titleView.setVerified(identityRecords.isVerified()); setBlockedUserState(recipient, isSecureText, isDefaultSms); - setActionBarColor(recipient.getColor()); updateReminders(); updateDefaultSubscriptionId(recipient.getDefaultSubscriptionId()); initializeSecurity(isSecureText, isDefaultSms); @@ -2507,18 +2513,6 @@ public class ConversationActivity extends PassphraseRequiredActivity return future; } - private void setActionBarColor(MaterialColor color) { - ActionBar supportActionBar = getSupportActionBar(); - if (supportActionBar == null) throw new AssertionError(); - int actionBarColor = color.toActionBarColor(this); - supportActionBar.setBackgroundDrawable(new ColorDrawable(actionBarColor)); - WindowUtil.setStatusBarColor(getWindow(), actionBarColor); - - joinGroupCallButton.setTextColor(actionBarColor); - joinGroupCallButton.setIconTint(ColorStateList.valueOf(actionBarColor)); - joinGroupCallButton.setRippleColor(ColorStateList.valueOf(actionBarColor)); - } - private void setBlockedUserState(Recipient recipient, boolean isSecureText, boolean isDefaultSms) { if (!isSecureText && isPushGroupConversation()) { unblockButton.setVisibility(View.GONE); diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java index 1dc854ec0..41df43130 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java @@ -23,6 +23,8 @@ import android.content.ClipData; import android.content.ClipboardManager; import android.content.Context; import android.content.Intent; +import android.content.res.Configuration; +import android.graphics.Rect; import android.net.Uri; import android.os.AsyncTask; import android.os.Build; @@ -35,6 +37,7 @@ import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; +import android.view.ViewTreeObserver; import android.view.Window; import android.view.animation.Animation; import android.view.animation.AnimationUtils; @@ -196,6 +199,7 @@ public class ConversationFragment extends LoggingFragment { private OnScrollListener conversationScrollListener; private int pulsePosition = -1; private VoiceNoteMediaController voiceNoteMediaController; + private View toolbarShadow; public static void prepare(@NonNull Context context) { FrameLayout parent = new FrameLayout(context); @@ -225,6 +229,7 @@ public class ConversationFragment extends LoggingFragment { scrollToMentionButton = view.findViewById(R.id.scroll_to_mention); scrollDateHeader = view.findViewById(R.id.scroll_date_header); emptyConversationBanner = view.findViewById(R.id.empty_conversation_banner); + toolbarShadow = requireActivity().findViewById(R.id.conversation_toolbar_shadow); final LinearLayoutManager layoutManager = new SmoothScrollingLinearLayoutManager(getActivity(), true); list.setHasFixedSize(false); @@ -283,6 +288,8 @@ public class ConversationFragment extends LoggingFragment { scrollToBottomButton.setOnClickListener(v -> scrollToBottom()); scrollToMentionButton.setOnClickListener(v -> scrollToNextMention()); + updateToolbarDependentMargins(); + return view; } @@ -363,6 +370,12 @@ public class ConversationFragment extends LoggingFragment { ApplicationDependencies.getTypingStatusRepository().getTypists(threadId).removeObservers(this); } + @Override + public void onConfigurationChanged(@NonNull Configuration newConfig) { + super.onConfigurationChanged(newConfig); + updateToolbarDependentMargins(); + } + public void onNewIntent() { if (actionMode != null) { actionMode.finish(); @@ -526,6 +539,7 @@ public class ConversationFragment extends LoggingFragment { conversationScrollListener = new ConversationScrollListener(requireContext()); list.addOnScrollListener(conversationScrollListener); + list.addOnScrollListener(new ShadowScrollListener()); if (oldThreadId != threadId) { ApplicationDependencies.getTypingStatusRepository().getTypists(oldThreadId).removeObservers(this); @@ -548,6 +562,7 @@ public class ConversationFragment extends LoggingFragment { emptyConversationBanner.setVisibility(View.GONE); } else if (threadId == -1) { emptyConversationBanner.setVisibility(View.VISIBLE); + toolbarShadow.setVisibility(View.GONE); } } @@ -1127,6 +1142,22 @@ public class ConversationFragment extends LoggingFragment { } } + private void updateToolbarDependentMargins() { + Toolbar toolbar = requireActivity().findViewById(R.id.toolbar); + toolbar.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() { + @Override + public void onGlobalLayout() { + Rect rect = new Rect(); + toolbar.getGlobalVisibleRect(rect); + ViewUtil.setTopMargin(scrollDateHeader, rect.bottom + ViewUtil.dpToPx(8)); + ViewUtil.setTopMargin(conversationBanner, rect.bottom + ViewUtil.dpToPx(16)); + ViewUtil.setTopMargin(emptyConversationBanner, rect.bottom + ViewUtil.dpToPx(16)); + toolbar.getViewTreeObserver().removeOnGlobalLayoutListener(this); + } + }); + + } + public interface ConversationFragmentListener { void setThreadId(long threadId); void handleReplyMessage(ConversationMessage conversationMessage); @@ -1249,6 +1280,7 @@ public class ConversationFragment extends LoggingFragment { listener.handleReaction(maskTarget, messageRecord, new ReactionsToolbarListener(conversationMessage), () -> { isReacting = false; list.setLayoutFrozen(false); + WindowUtil.setLightStatusBarFromTheme(requireActivity()); }); } else { ((ConversationAdapter) list.getAdapter()).toggleSelection(conversationMessage); @@ -1605,7 +1637,7 @@ public class ConversationFragment extends LoggingFragment { mode.setTitle("1"); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + if (Build.VERSION.SDK_INT >= 21) { Window window = getActivity().getWindow(); statusBarColor = window.getStatusBarColor(); WindowUtil.setStatusBarColor(window, getResources().getColor(R.color.action_mode_status_bar)); @@ -1631,11 +1663,11 @@ public class ConversationFragment extends LoggingFragment { ((ConversationAdapter)list.getAdapter()).clearSelection(); list.getAdapter().notifyDataSetChanged(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + if (Build.VERSION.SDK_INT >= 21) { WindowUtil.setStatusBarColor(requireActivity().getWindow(), statusBarColor); } - WindowUtil.clearLightStatusBar(getActivity().getWindow()); + WindowUtil.setLightStatusBarFromTheme(requireActivity()); actionMode = null; } @@ -1722,4 +1754,18 @@ public class ConversationFragment extends LoggingFragment { } } + private class ShadowScrollListener extends RecyclerView.OnScrollListener { + @Override + public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) { + if (recyclerView.canScrollVertically(-1)) { + if (toolbarShadow.getVisibility() != View.VISIBLE) { + ViewUtil.fadeIn(toolbarShadow, 250); + } + } else { + if (toolbarShadow.getVisibility() != View.GONE) { + ViewUtil.fadeOut(toolbarShadow, 250); + } + } + } + } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationTitleView.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationTitleView.java index 9a268e779..25ef7cfa4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationTitleView.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationTitleView.java @@ -92,7 +92,7 @@ public class ConversationTitleView extends RelativeLayout { } title.setCompoundDrawablesRelativeWithIntrinsicBounds(startDrawable, 0, endDrawable, 0); - TextViewCompat.setCompoundDrawableTintList(title, ColorStateList.valueOf(ContextCompat.getColor(getContext(), R.color.transparent_white_90))); + TextViewCompat.setCompoundDrawableTintList(title, ColorStateList.valueOf(ContextCompat.getColor(getContext(), R.color.signal_inverse_transparent_80))); if (recipient != null) { this.avatar.setAvatar(glideRequests, recipient, false); diff --git a/app/src/main/java/org/thoughtcrime/securesms/messagedetails/MessageDetailsActivity.java b/app/src/main/java/org/thoughtcrime/securesms/messagedetails/MessageDetailsActivity.java index f51553bb0..c84178466 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/messagedetails/MessageDetailsActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/messagedetails/MessageDetailsActivity.java @@ -39,7 +39,7 @@ public final class MessageDetailsActivity extends PassphraseRequiredActivity { private MessageDetailsViewModel viewModel; private MessageDetailsAdapter adapter; - private DynamicTheme dynamicTheme = new DynamicDarkActionBarTheme(); + private DynamicTheme dynamicTheme = new DynamicTheme(); public static @NonNull Intent getIntentForMessageDetails(@NonNull Context context, @NonNull MessageRecord message, @NonNull RecipientId recipientId, long threadId) { Intent intent = new Intent(context, MessageDetailsActivity.class); @@ -116,15 +116,6 @@ public final class MessageDetailsActivity extends PassphraseRequiredActivity { private void initializeActionBar() { requireSupportActionBar().setDisplayHomeAsUpEnabled(true); requireSupportActionBar().setTitle(R.string.AndroidManifest__message_details); - - viewModel.getRecipientColor().observe(this, this::setActionBarColor); - } - - private void setActionBarColor(MaterialColor color) { - assert getSupportActionBar() != null; - getSupportActionBar().setBackgroundDrawable(new ColorDrawable(color.toActionBarColor(this))); - - WindowUtil.setStatusBarColor(getWindow(), color.toStatusBarColor(this)); } private List> convertToRows(MessageDetails details) { diff --git a/app/src/main/res/drawable-night-v21/attachment_keyboard_button_wallpaper_background.xml b/app/src/main/res/drawable-night-v21/attachment_keyboard_button_wallpaper_background.xml index cf02c88eb..4281db13e 100644 --- a/app/src/main/res/drawable-night-v21/attachment_keyboard_button_wallpaper_background.xml +++ b/app/src/main/res/drawable-night-v21/attachment_keyboard_button_wallpaper_background.xml @@ -13,7 +13,7 @@ - + diff --git a/app/src/main/res/drawable-night/attachment_keyboard_button_wallpaper_background.xml b/app/src/main/res/drawable-night/attachment_keyboard_button_wallpaper_background.xml index a51007e8b..fc6dd40ac 100644 --- a/app/src/main/res/drawable-night/attachment_keyboard_button_wallpaper_background.xml +++ b/app/src/main/res/drawable-night/attachment_keyboard_button_wallpaper_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable-night/compose_background.xml b/app/src/main/res/drawable-night/compose_background.xml index e4a6237f4..0c1f5b33f 100644 --- a/app/src/main/res/drawable-night/compose_background.xml +++ b/app/src/main/res/drawable-night/compose_background.xml @@ -3,12 +3,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - - + android:color="@color/core_grey_80" /> diff --git a/app/src/main/res/drawable-night/compose_background_wallpaper.xml b/app/src/main/res/drawable-night/compose_background_wallpaper.xml index 1a35e754f..0c1f5b33f 100644 --- a/app/src/main/res/drawable-night/compose_background_wallpaper.xml +++ b/app/src/main/res/drawable-night/compose_background_wallpaper.xml @@ -3,12 +3,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - - + android:color="@color/core_grey_80" /> diff --git a/app/src/main/res/drawable/ic_phone_right_solid_24.xml b/app/src/main/res/drawable-night/ic_phone_right_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_phone_right_solid_24.xml rename to app/src/main/res/drawable-night/ic_phone_right_24.xml diff --git a/app/src/main/res/drawable/ic_video_solid_24.xml b/app/src/main/res/drawable-night/ic_video_call_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_video_solid_24.xml rename to app/src/main/res/drawable-night/ic_video_call_24.xml diff --git a/app/src/main/res/drawable/compose_background.xml b/app/src/main/res/drawable/compose_background.xml index dc2e5b16b..93437fbfa 100644 --- a/app/src/main/res/drawable/compose_background.xml +++ b/app/src/main/res/drawable/compose_background.xml @@ -3,12 +3,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - - + android:color="#b4e9e9e9" /> diff --git a/app/src/main/res/drawable/compose_background_wallpaper.xml b/app/src/main/res/drawable/compose_background_wallpaper.xml index e8b7e6d58..9739546b5 100644 --- a/app/src/main/res/drawable/compose_background_wallpaper.xml +++ b/app/src/main/res/drawable/compose_background_wallpaper.xml @@ -3,12 +3,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - - + android:color="@color/core_white" /> diff --git a/app/src/main/res/drawable/ic_phone_right_24.xml b/app/src/main/res/drawable/ic_phone_right_24.xml new file mode 100644 index 000000000..8da23e83d --- /dev/null +++ b/app/src/main/res/drawable/ic_phone_right_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_timer_conversation_badge.xml b/app/src/main/res/drawable/ic_timer_conversation_badge.xml new file mode 100644 index 000000000..dc4c9cfbb --- /dev/null +++ b/app/src/main/res/drawable/ic_timer_conversation_badge.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_video_call_24.xml b/app/src/main/res/drawable/ic_video_call_24.xml new file mode 100644 index 000000000..bda788768 --- /dev/null +++ b/app/src/main/res/drawable/ic_video_call_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/search_toolbar_shadow.xml b/app/src/main/res/drawable/search_toolbar_shadow.xml index 5afdc2a2d..373f30d02 100644 --- a/app/src/main/res/drawable/search_toolbar_shadow.xml +++ b/app/src/main/res/drawable/search_toolbar_shadow.xml @@ -2,6 +2,6 @@ android:shape="rectangle"> \ No newline at end of file diff --git a/app/src/main/res/layout/chat_wallpaper_fragment.xml b/app/src/main/res/layout/chat_wallpaper_fragment.xml index eb61d2e63..d41eb6dde 100644 --- a/app/src/main/res/layout/chat_wallpaper_fragment.xml +++ b/app/src/main/res/layout/chat_wallpaper_fragment.xml @@ -101,7 +101,7 @@ android:layout_marginBottom="4dp" app:layout_constraintBottom_toBottomOf="@id/chat_wallpaper_preview_top_bar" app:layout_constraintEnd_toStartOf="@id/chat_wallpaper_preview_top_bar_voice" - app:srcCompat="@drawable/ic_video_solid_24" + app:srcCompat="@drawable/ic_video_call_24" app:tint="@color/core_white" /> - - - - - - - - - - - - - - - @@ -91,8 +40,7 @@ android:clipChildren="false" android:clipToPadding="false" android:gravity="bottom" - android:orientation="vertical" - android:paddingTop="?attr/actionBarSize"> + android:orientation="vertical"> + + + + + + + + + + + + + + - \ No newline at end of file + android:paddingBottom="24dp" + app:layout_constraintTop_toTopOf="parent"/> \ No newline at end of file diff --git a/app/src/main/res/layout/conversation_title_view.xml b/app/src/main/res/layout/conversation_title_view.xml index 3cfdf0457..cfeb3a7f9 100644 --- a/app/src/main/res/layout/conversation_title_view.xml +++ b/app/src/main/res/layout/conversation_title_view.xml @@ -7,7 +7,6 @@ android:layout_height="match_parent" android:layout_gravity="center_vertical" android:gravity="center_vertical" - tools:background="#007fff" tools:layout_height="?actionBarSize"> @@ -36,7 +34,7 @@ @@ -62,14 +60,14 @@ android:layout_width="12dp" android:layout_height="match_parent" android:layout_marginEnd="3dp" - android:tint="@color/signal_text_toolbar_subtitle" + android:tint="@color/signal_inverse_transparent_80" app:srcCompat="@drawable/ic_check_24" android:visibility="gone" tools:visibility="visible" /> diff --git a/app/src/main/res/layout/expiration_timer_badge.xml b/app/src/main/res/layout/expiration_timer_badge.xml index 6b08ffff5..e7b2ccf51 100644 --- a/app/src/main/res/layout/expiration_timer_badge.xml +++ b/app/src/main/res/layout/expiration_timer_badge.xml @@ -17,8 +17,7 @@ android:layout_gravity="center" android:layout_marginEnd="3dp" android:scaleType="fitCenter" - android:tint="@color/signal_text_toolbar_subtitle" - app:srcCompat="@drawable/ic_timer_60_12" /> + app:srcCompat="@drawable/ic_timer_conversation_badge" /> diff --git a/app/src/main/res/layout/recipient_preference_contact_widget.xml b/app/src/main/res/layout/recipient_preference_contact_widget.xml index 488b920d2..2707908ae 100644 --- a/app/src/main/res/layout/recipient_preference_contact_widget.xml +++ b/app/src/main/res/layout/recipient_preference_contact_widget.xml @@ -24,12 +24,12 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="20dp" - app:srcCompat="@drawable/ic_video_solid_24" /> + app:srcCompat="@drawable/ic_video_call_24" /> + app:srcCompat="@drawable/ic_phone_right_24" /> \ No newline at end of file diff --git a/app/src/main/res/menu/conversation_callable_groupv2.xml b/app/src/main/res/menu/conversation_callable_groupv2.xml index 4c8675ffc..d34cfbba3 100644 --- a/app/src/main/res/menu/conversation_callable_groupv2.xml +++ b/app/src/main/res/menu/conversation_callable_groupv2.xml @@ -4,7 +4,8 @@ \ No newline at end of file diff --git a/app/src/main/res/menu/conversation_callable_insecure.xml b/app/src/main/res/menu/conversation_callable_insecure.xml index 3c9faeb17..54b365236 100644 --- a/app/src/main/res/menu/conversation_callable_insecure.xml +++ b/app/src/main/res/menu/conversation_callable_insecure.xml @@ -4,6 +4,7 @@ diff --git a/app/src/main/res/menu/conversation_callable_secure.xml b/app/src/main/res/menu/conversation_callable_secure.xml index 12580a84a..283d10694 100644 --- a/app/src/main/res/menu/conversation_callable_secure.xml +++ b/app/src/main/res/menu/conversation_callable_secure.xml @@ -4,12 +4,14 @@ \ No newline at end of file diff --git a/app/src/main/res/menu/conversation_mms_group_options.xml b/app/src/main/res/menu/conversation_mms_group_options.xml index a2c2db517..b73b1501c 100644 --- a/app/src/main/res/menu/conversation_mms_group_options.xml +++ b/app/src/main/res/menu/conversation_mms_group_options.xml @@ -4,6 +4,7 @@ diff --git a/app/src/main/res/menu/conversation_popup.xml b/app/src/main/res/menu/conversation_popup.xml index c1129f313..148ba35f0 100644 --- a/app/src/main/res/menu/conversation_popup.xml +++ b/app/src/main/res/menu/conversation_popup.xml @@ -4,6 +4,7 @@ diff --git a/app/src/main/res/values-night/dark_colors.xml b/app/src/main/res/values-night/dark_colors.xml index aa8f3764f..2dcebd001 100644 --- a/app/src/main/res/values-night/dark_colors.xml +++ b/app/src/main/res/values-night/dark_colors.xml @@ -1,5 +1,8 @@ + @color/core_grey_95 + @color/transparent_black_90 + @color/core_ultramarine_light @color/core_grey_95 @@ -120,6 +123,6 @@ @color/core_grey_75 @color/transparent_black_60 - @color/transparent_black_80 + #f3121212 @color/core_black diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 7fe37a427..7043990a1 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -12,6 +12,7 @@ #66000000 #99000000 #CC000000 + #e6000000 #26ffffff #33ffffff @@ -20,6 +21,7 @@ #99ffffff #ccffffff #e6ffffff + #f3ffffff #32000000 diff --git a/app/src/main/res/values/light_colors.xml b/app/src/main/res/values/light_colors.xml index 731636c19..21373ff6f 100644 --- a/app/src/main/res/values/light_colors.xml +++ b/app/src/main/res/values/light_colors.xml @@ -1,5 +1,8 @@ + @color/core_white + @color/transparent_white_95 + @color/core_ultramarine @color/core_white @@ -120,6 +123,6 @@ @color/core_white @color/transparent_white_30 - @color/transparent_white_80 + #ccf6f6f6 @color/core_white