From d3e895eac6fadbdfa80bc2c8af0357cd4336b880 Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Fri, 4 Sep 2020 10:58:57 +1000
Subject: [PATCH 01/33] Don't append short IDs to display names

---
 .../loki/protocol/SessionMetaProtocol.kt        | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/loki/protocol/SessionMetaProtocol.kt b/src/org/thoughtcrime/securesms/loki/protocol/SessionMetaProtocol.kt
index a7acaa25fe..9f9a38427d 100644
--- a/src/org/thoughtcrime/securesms/loki/protocol/SessionMetaProtocol.kt
+++ b/src/org/thoughtcrime/securesms/loki/protocol/SessionMetaProtocol.kt
@@ -10,7 +10,6 @@ import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.whispersystems.signalservice.api.messages.SignalServiceContent
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage
-import org.whispersystems.signalservice.loki.protocol.shelved.multidevice.MultiDeviceProtocol
 import java.security.MessageDigest
 
 object SessionMetaProtocol {
@@ -37,24 +36,16 @@ object SessionMetaProtocol {
 
     @JvmStatic
     fun handleProfileUpdateIfNeeded(context: Context, content: SignalServiceContent) {
-        val rawDisplayName = content.senderDisplayName.orNull() ?: return
-        if (rawDisplayName.isBlank()) { return }
+        val displayName = content.senderDisplayName.orNull() ?: return
+        if (displayName.isBlank()) { return }
         val userPublicKey = TextSecurePreferences.getLocalNumber(context)
         val userMasterPublicKey = TextSecurePreferences.getMasterHexEncodedPublicKey(context)
         val sender = content.sender.toLowerCase()
         if (userMasterPublicKey == sender) {
             // Update the user's local name if the message came from their master device
-            TextSecurePreferences.setProfileName(context, rawDisplayName)
-        }
-        // Don't overwrite if the message came from a linked device; the device name is
-        // stored as a user name
-        val allUserDevices = MultiDeviceProtocol.shared.getAllLinkedDevices(userPublicKey)
-        if (!allUserDevices.contains(sender)) {
-            val displayName = rawDisplayName + " (..." + sender.substring(sender.length - 8) + ")"
-            DatabaseFactory.getLokiUserDatabase(context).setDisplayName(sender, displayName)
-        } else {
-            DatabaseFactory.getLokiUserDatabase(context).setDisplayName(sender, rawDisplayName)
+            TextSecurePreferences.setProfileName(context, displayName)
         }
+        DatabaseFactory.getLokiUserDatabase(context).setDisplayName(sender, displayName)
     }
 
     @JvmStatic

From 31916a95d52b72f5186d9b52e1179522ae08f78e Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Fri, 4 Sep 2020 11:32:43 +1000
Subject: [PATCH 02/33] Don't show Session ID in conversation title view

---
 res/values-small/dimens.xml                        |  2 +-
 res/values/dimens.xml                              |  2 +-
 .../conversation/ConversationActivity.java         | 14 +-------------
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/res/values-small/dimens.xml b/res/values-small/dimens.xml
index 4775251f06..81c5c4100b 100644
--- a/res/values-small/dimens.xml
+++ b/res/values-small/dimens.xml
@@ -8,7 +8,7 @@
     <dimen name="small_font_size">13sp</dimen>
     <dimen name="medium_font_size">15sp</dimen>
     <dimen name="large_font_size">20sp</dimen>
-    <dimen name="very_large_font_size">25sp</dimen>
+    <dimen name="very_large_font_size">24sp</dimen>
     <dimen name="massive_font_size">50sp</dimen>
 
     <!-- Session -->
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index d255ee2585..1c0282a999 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -8,7 +8,7 @@
     <dimen name="small_font_size">15sp</dimen>
     <dimen name="medium_font_size">17sp</dimen>
     <dimen name="large_font_size">22sp</dimen>
-    <dimen name="very_large_font_size">27sp</dimen>
+    <dimen name="very_large_font_size">26sp</dimen>
     <dimen name="massive_font_size">50sp</dimen>
 
     <!-- Element Sizes -->
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index 4a06575a30..02a68f3e2c 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -3103,15 +3103,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   private void updateSubtitleTextView() {
     muteIndicatorImageView.setVisibility(View.GONE);
     subtitleTextView.setVisibility(View.VISIBLE);
-    if (messageStatus != null) {
-      switch (messageStatus) {
-        case "calculatingPoW": subtitleTextView.setText("Encrypting message"); break;
-        case "contactingNetwork": subtitleTextView.setText("Tracing a path"); break;
-        case "sendingMessage": subtitleTextView.setText("Sending message"); break;
-        case "messageSent": subtitleTextView.setText("Message sent securely"); break;
-        case "messageFailed": subtitleTextView.setText("Message failed to send"); break;
-      }
-    } else if (recipient.isMuted()) {
+    if (recipient.isMuted()) {
       muteIndicatorImageView.setVisibility(View.VISIBLE);
       subtitleTextView.setText("Muted until " + DateUtils.getFormattedDateTime(recipient.mutedUntil, "EEE, MMM d, yyyy HH:mm", Locale.getDefault()));
     } else if (recipient.isGroupRecipient() && recipient.getName() != null && !recipient.getName().equals("Session Updates") && !recipient.getName().equals("Loki News")) {
@@ -3125,10 +3117,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       } else {
         subtitleTextView.setVisibility(View.GONE);
       }
-    } else if (PublicKeyValidation.isValid(recipient.getAddress().toString())) {
-      String ourMasterHexEncodedPublicKey = TextSecurePreferences.getMasterHexEncodedPublicKey(this);
-      String hexEncodedPublicKey = (recipient.isLocalNumber() && ourMasterHexEncodedPublicKey != null) ? ourMasterHexEncodedPublicKey : recipient.getAddress().toPhoneString();
-      subtitleTextView.setText(hexEncodedPublicKey);
     } else {
       subtitleTextView.setVisibility(View.GONE);
     }

From db0fd21097c3ed66e9633c6aef745dbb0e0e2b3b Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Fri, 4 Sep 2020 14:58:45 +1000
Subject: [PATCH 03/33] Make text bubbles a bit smaller

---
 res/layout/conversation_item_received.xml     | 42 +++++++++----------
 res/layout/conversation_item_sent.xml         | 36 ++++++++--------
 res/layout/document_view.xml                  |  1 +
 res/layout/quote_view.xml                     |  3 +-
 .../conversation/ConversationItem.java        | 11 ++---
 5 files changed, 48 insertions(+), 45 deletions(-)

diff --git a/res/layout/conversation_item_received.xml b/res/layout/conversation_item_received.xml
index 5b7d503cdf..063b5dd939 100644
--- a/res/layout/conversation_item_received.xml
+++ b/res/layout/conversation_item_received.xml
@@ -59,8 +59,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="@dimen/massive_spacing"
                 android:layout_marginStart="12dp"
-                android:paddingTop="@dimen/medium_spacing"
-                android:paddingBottom="@dimen/medium_spacing"
+                android:paddingTop="12dp"
+                android:paddingBottom="12dp"
                 android:orientation="vertical"
                 android:clipToPadding="false"
                 android:clipChildren="false"
@@ -71,9 +71,9 @@
                     android:id="@+id/group_sender_holder"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
-                    android:layout_marginBottom="@dimen/medium_spacing"
-                    android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginBottom="12dp"
+                    android:layout_marginEnd="12dp"
                     android:orientation="horizontal"
                     android:visibility="gone"
                     tools:visibility="visible">
@@ -113,9 +113,9 @@
                     android:id="@+id/quote_view"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/large_spacing"
-                    android:layout_marginBottom="@dimen/medium_spacing"
-                    android:layout_marginEnd="@dimen/large_spacing"
+                    android:layout_marginStart="20dp"
+                    android:layout_marginBottom="12dp"
+                    android:layout_marginEnd="20dp"
                     android:visibility="gone"
                     app:message_type="incoming"
                     app:quote_colorPrimary="@color/text"
@@ -127,7 +127,7 @@
                     android:layout="@layout/conversation_item_received_shared_contact"
                     android:layout_width="@dimen/media_bubble_default_dimens"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/message_bubble_top_padding"
+                    android:layout_marginTop="12dp"
                     android:visibility="gone"/>
 
                 <ViewStub
@@ -153,9 +153,9 @@
                     android:layout="@layout/conversation_item_received_audio"
                     android:layout_width="210dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
-                    android:layout_marginBottom="6dp"
-                    android:layout_marginEnd="@dimen/message_bubble_horizontal_padding" />
+                    android:layout_marginStart="12dp"
+                    android:layout_marginBottom="4dp"
+                    android:layout_marginEnd="12dp" />
 
                 <ViewStub
                     android:id="@+id/document_view_stub"
@@ -163,15 +163,15 @@
                     android:layout_width="210dp"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="4dp"
-                    android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
-                    android:layout_marginEnd="@dimen/message_bubble_horizontal_padding" />
+                    android:layout_marginStart="12dp"
+                    android:layout_marginEnd="12dp" />
 
                 <org.thoughtcrime.securesms.components.emoji.EmojiTextView
                     android:id="@+id/conversation_item_body"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
-                    android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginEnd="12dp"
                     style="@style/Signal.Text.Body"
                     android:textColor="?conversation_item_received_text_primary_color"
                     android:textColorLink="?conversation_item_received_text_primary_color"
@@ -185,8 +185,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="4dp"
-                    android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
-                    android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginEnd="12dp"
                     android:clipChildren="false"
                     android:clipToPadding="false"
                     android:alpha="0.6"
@@ -197,9 +197,9 @@
                     android:id="@+id/conversation_item_sticker_footer"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="6dp"
-                    android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
-                    android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
+                    android:layout_marginTop="4dp"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginEnd="12dp"
                     android:clipChildren="false"
                     android:clipToPadding="false"
                     android:visibility="gone"
diff --git a/res/layout/conversation_item_sent.xml b/res/layout/conversation_item_sent.xml
index 60f032ea8a..a6fecbf89a 100644
--- a/res/layout/conversation_item_sent.xml
+++ b/res/layout/conversation_item_sent.xml
@@ -37,8 +37,8 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:layout_marginStart="@dimen/massive_spacing"
-                android:paddingTop="@dimen/medium_spacing"
-                android:paddingBottom="@dimen/medium_spacing"
+                android:paddingTop="12dp"
+                android:paddingBottom="12dp"
                 android:layout_gravity="end"
                 android:clipToPadding="false"
                 android:clipChildren="false"
@@ -49,9 +49,9 @@
                     android:id="@+id/quote_view"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/large_spacing"
-                    android:layout_marginBottom="@dimen/medium_spacing"
-                    android:layout_marginEnd="@dimen/large_spacing"
+                    android:layout_marginStart="20dp"
+                    android:layout_marginBottom="12dp"
+                    android:layout_marginEnd="20dp"
                     android:visibility="gone"
                     app:message_type="outgoing"
                     app:quote_colorPrimary="@color/text"
@@ -63,7 +63,7 @@
                     android:layout="@layout/conversation_item_sent_shared_contact"
                     android:layout_width="@dimen/media_bubble_default_dimens"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="@dimen/medium_spacing"
+                    android:layout_marginBottom="12dp"
                     android:visibility="gone"/>
 
                 <ViewStub
@@ -89,25 +89,25 @@
                     android:layout="@layout/conversation_item_sent_audio"
                     android:layout_width="210dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
-                    android:layout_marginBottom="6dp"
-                    android:layout_marginEnd="@dimen/message_bubble_horizontal_padding" />
+                    android:layout_marginStart="12dp"
+                    android:layout_marginBottom="4dp"
+                    android:layout_marginEnd="12dp" />
 
                 <ViewStub
                     android:id="@+id/document_view_stub"
                     android:layout="@layout/conversation_item_sent_document"
                     android:layout_width="210dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+                    android:layout_marginStart="12dp"
                     android:layout_marginBottom="4dp"
-                    android:layout_marginEnd="@dimen/message_bubble_horizontal_padding" />
+                    android:layout_marginEnd="12dp" />
 
                 <org.thoughtcrime.securesms.components.emoji.EmojiTextView
                     android:id="@+id/conversation_item_body"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
-                    android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginEnd="12dp"
                     style="@style/Signal.Text.Body"
                     android:textColor="?conversation_item_sent_text_primary_color"
                     android:textColorLink="?conversation_item_sent_text_primary_color"
@@ -139,8 +139,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="4dp"
-                    android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
-                    android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginEnd="12dp"
                     android:clipChildren="false"
                     android:clipToPadding="false"
                     app:footer_text_color="?attr/conversation_item_sent_text_secondary_color"
@@ -150,9 +150,9 @@
                     android:id="@+id/conversation_item_sticker_footer"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="6dp"
-                    android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
-                    android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
+                    android:layout_marginTop="4dp"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginEnd="12dp"
                     android:clipChildren="false"
                     android:clipToPadding="false"
                     android:visibility="gone"
diff --git a/res/layout/document_view.xml b/res/layout/document_view.xml
index 428375f087..a61a54cb4d 100644
--- a/res/layout/document_view.xml
+++ b/res/layout/document_view.xml
@@ -9,6 +9,7 @@
                       android:layout_height="wrap_content"
                       android:clickable="false"
                       android:focusable="false"
+                      android:layout_marginBottom="-4dp"
                       android:gravity="center_vertical"
                       android:orientation="horizontal">
 
diff --git a/res/layout/quote_view.xml b/res/layout/quote_view.xml
index 50b270b500..8b1fa969df 100644
--- a/res/layout/quote_view.xml
+++ b/res/layout/quote_view.xml
@@ -73,7 +73,7 @@
                         android:layout_height="wrap_content"
                         style="@style/Signal.Text.Body"
                         android:textColor="@color/text"
-                        android:textSize="@dimen/medium_font_size"
+                        android:textSize="@dimen/small_font_size"
                         android:maxLines="1"
                         android:ellipsize="end"
                         tools:text="The-Amazing-Spider-Man.cba" />
@@ -99,6 +99,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="4dp"
                     style="@style/Signal.Text.Body"
+                    android:textSize="@dimen/small_font_size"
                     android:ellipsize="end"
                     android:maxLines="2"
                     tools:text="With great power comes great responsibility."
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationItem.java b/src/org/thoughtcrime/securesms/conversation/ConversationItem.java
index ca3d10db17..385c0fa9ab 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationItem.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationItem.java
@@ -87,6 +87,7 @@ import org.thoughtcrime.securesms.jobs.SmsSendJob;
 import org.thoughtcrime.securesms.linkpreview.LinkPreview;
 import org.thoughtcrime.securesms.linkpreview.LinkPreviewUtil;
 import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.loki.utilities.GeneralUtilitiesKt;
 import org.thoughtcrime.securesms.loki.utilities.MentionUtilities;
 import org.thoughtcrime.securesms.loki.views.ProfilePictureView;
 import org.thoughtcrime.securesms.mms.GlideRequests;
@@ -502,23 +503,23 @@ public class ConversationItem extends LinearLayout
     if (hasOnlyThumbnail(messageRecord)) {
       int topPadding = 0;
       if (groupSenderHolder.getVisibility() == VISIBLE) {
-        topPadding = (int)getResources().getDimension(R.dimen.medium_spacing);
+        topPadding = GeneralUtilitiesKt.toPx(12, getResources());
       }
       int bottomPadding = 0;
       if (messageRecord.getBody().length() > 0) {
-        bodyTextLayoutParams.topMargin = (int)getResources().getDimension(R.dimen.medium_spacing);
-        bottomPadding = (int)getResources().getDimension(R.dimen.medium_spacing);
+        bodyTextLayoutParams.topMargin = GeneralUtilitiesKt.toPx(12, getResources());
+        bottomPadding = GeneralUtilitiesKt.toPx(12, getResources());
       }
       bodyBubble.setPadding(0, topPadding, 0, bottomPadding);
     } else {
-      bodyBubble.setPadding(0, (int)getResources().getDimension(R.dimen.medium_spacing), 0, (int)getResources().getDimension(R.dimen.medium_spacing));
+      bodyBubble.setPadding(0, GeneralUtilitiesKt.toPx(12, getResources()), 0, GeneralUtilitiesKt.toPx(12, getResources()));
     }
     bodyText.setLayoutParams(bodyTextLayoutParams);
     LinearLayout.LayoutParams senderHolderLayoutParams = (LinearLayout.LayoutParams)groupSenderHolder.getLayoutParams();
     if (groupSenderHolder.getVisibility() == VISIBLE && hasOnlyText(messageRecord)) {
       senderHolderLayoutParams.bottomMargin = (int)(getResources().getDisplayMetrics().density * 4);
     } else {
-      senderHolderLayoutParams.bottomMargin = (int)getResources().getDimension(R.dimen.medium_spacing);
+      senderHolderLayoutParams.bottomMargin = GeneralUtilitiesKt.toPx(12, getResources());
     }
     groupSenderHolder.setLayoutParams(senderHolderLayoutParams);
     if (documentViewStub.resolved()) {

From efbce3afa3f962102b8e5237881e820889b6ea17 Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Fri, 4 Sep 2020 15:52:32 +1000
Subject: [PATCH 04/33] Fix inconsistent button styles

---
 res/layout-sw400dp/fragment_enter_chat_url.xml   | 2 +-
 res/layout-sw400dp/fragment_enter_public_key.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/layout-sw400dp/fragment_enter_chat_url.xml b/res/layout-sw400dp/fragment_enter_chat_url.xml
index 564580c481..f1a0feb4a0 100644
--- a/res/layout-sw400dp/fragment_enter_chat_url.xml
+++ b/res/layout-sw400dp/fragment_enter_chat_url.xml
@@ -23,7 +23,7 @@
         android:layout_weight="1" />
 
     <Button
-        style="@style/Widget.Session.Button.Common.ProminentFilled"
+        style="@style/Widget.Session.Button.Common.ProminentOutline"
         android:id="@+id/joinPublicChatButton"
         android:layout_width="196dp"
         android:layout_height="@dimen/medium_button_height"
diff --git a/res/layout-sw400dp/fragment_enter_public_key.xml b/res/layout-sw400dp/fragment_enter_public_key.xml
index ae996d2411..4c4bca1c3b 100644
--- a/res/layout-sw400dp/fragment_enter_public_key.xml
+++ b/res/layout-sw400dp/fragment_enter_public_key.xml
@@ -90,7 +90,7 @@
         android:layout_weight="1" />
 
     <Button
-        style="@style/Widget.Session.Button.Common.ProminentFilled"
+        style="@style/Widget.Session.Button.Common.ProminentOutline"
         android:id="@+id/createPrivateChatButton"
         android:layout_width="196dp"
         android:layout_height="@dimen/medium_button_height"

From 082e806c847ab1ecd87ec73ddf180b811317a731 Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Fri, 4 Sep 2020 16:55:19 +1000
Subject: [PATCH 05/33] Fix mentions

---
 .../thoughtcrime/securesms/loki/activities/HomeActivity.kt    | 4 ++--
 .../thoughtcrime/securesms/loki/utilities/MentionUtilities.kt | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
index 43e0647d2d..8731e3dd9a 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
@@ -202,7 +202,7 @@ class HomeActivity : PassphraseRequiredActionBarActivity, ConversationClickListe
             seedReminderView.visibility = View.GONE
         }
 
-        // Multiple device removal notification
+        // Multi device removal sheet
         if (!TextSecurePreferences.getHasSeenMultiDeviceRemovalSheet(this)) {
             TextSecurePreferences.setHasSeenMultiDeviceRemovalSheet(this)
             val userPublicKey = TextSecurePreferences.getLocalNumber(this)
@@ -223,7 +223,7 @@ class HomeActivity : PassphraseRequiredActionBarActivity, ConversationClickListe
             }
         }
 
-        // Light theme introduction
+        // Light theme introduction sheet
         if (!TextSecurePreferences.hasSeenLightThemeIntroSheet(this) &&
                 UiModeUtilities.isDayUiMode(this)) {
             TextSecurePreferences.setHasSeenLightThemeIntroSheet(this)
diff --git a/src/org/thoughtcrime/securesms/loki/utilities/MentionUtilities.kt b/src/org/thoughtcrime/securesms/loki/utilities/MentionUtilities.kt
index 203e74a478..bf32a41183 100644
--- a/src/org/thoughtcrime/securesms/loki/utilities/MentionUtilities.kt
+++ b/src/org/thoughtcrime/securesms/loki/utilities/MentionUtilities.kt
@@ -53,7 +53,9 @@ object MentionUtilities {
         }
         val result = SpannableString(text)
         for (mention in mentions) {
-            result.setSpan(ForegroundColorSpan(context.resources.getColorWithID(R.color.accent, context.theme)), mention.first.lower, mention.first.upper, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+            val isLightMode = UiModeUtilities.isDayUiMode(context)
+            val colorID = if (isLightMode && isOutgoingMessage) R.color.black else R.color.accent
+            result.setSpan(ForegroundColorSpan(context.resources.getColorWithID(colorID, context.theme)), mention.first.lower, mention.first.upper, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
             result.setSpan(StyleSpan(Typeface.BOLD), mention.first.lower, mention.first.upper, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
         }
         return result

From 2d29ef9dc8037b3ace125fb4429d26892a90e05d Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Fri, 4 Sep 2020 17:16:54 +1000
Subject: [PATCH 06/33] Clean up seed dialog

---
 res/layout/dialog_seed.xml                                | 6 ++++--
 res/values/strings.xml                                    | 2 +-
 src/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt | 7 ++++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/res/layout/dialog_seed.xml b/res/layout/dialog_seed.xml
index 718f902507..35fe564c20 100644
--- a/res/layout/dialog_seed.xml
+++ b/res/layout/dialog_seed.xml
@@ -21,10 +21,12 @@
         android:textSize="@dimen/medium_font_size" />
 
     <TextView
+        style="@style/SessionIDTextView"
         android:id="@+id/seedTextView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/large_spacing"
+        android:padding="@dimen/small_spacing"
         android:text="habitat kiwi amply iceberg dog nerves spiderman soft match partial awakened maximum degrees"
         android:textColor="@color/text"
         android:textSize="@dimen/small_font_size"
@@ -70,9 +72,9 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/large_spacing"
         android:text="@string/dialog_seed_disclaimer"
-        android:textStyle="bold"
         android:textColor="@color/text"
-        android:textSize="@dimen/very_small_font_size"
+        android:alpha="0.6"
+        android:textSize="10sp"
         android:textAlignment="center" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 674ce114f2..1dbc88c0e7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1851,7 +1851,7 @@
 
     <string name="activity_select_contacts_title">Select Contacts</string>
 
-    <string name="dialog_seed_disclaimer">*Please note that it is not possible to use the same Session ID on multiple devices simultaneously</string>
+    <string name="dialog_seed_disclaimer">It is not possible to use the same Session ID on multiple devices simultaneously</string>
 
     <string name="view_reset_secure_session_done_message">Secure session reset done</string>
     
diff --git a/src/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt b/src/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt
index a52e08f606..097342332c 100644
--- a/src/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt
+++ b/src/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt
@@ -7,17 +7,18 @@ import android.content.Context
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
-import androidx.fragment.app.DialogFragment
-import androidx.appcompat.app.AlertDialog
 import android.view.LayoutInflater
+import android.view.WindowManager
 import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
 import kotlinx.android.synthetic.main.dialog_seed.view.*
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
 import org.thoughtcrime.securesms.loki.utilities.MnemonicUtilities
 import org.whispersystems.signalservice.loki.crypto.MnemonicCodec
 import org.whispersystems.signalservice.loki.utilities.hexEncodedPrivateKey
-import java.io.File
+
 
 class SeedDialog : DialogFragment() {
 

From d84373fa192c45e933ae77d920edacfa05cac018 Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Fri, 4 Sep 2020 17:22:41 +1000
Subject: [PATCH 07/33] Deal with legacy display names

---
 .../securesms/loki/database/LokiUserDatabase.kt           | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/org/thoughtcrime/securesms/loki/database/LokiUserDatabase.kt b/src/org/thoughtcrime/securesms/loki/database/LokiUserDatabase.kt
index 236ffb6fe3..634ec24556 100644
--- a/src/org/thoughtcrime/securesms/loki/database/LokiUserDatabase.kt
+++ b/src/org/thoughtcrime/securesms/loki/database/LokiUserDatabase.kt
@@ -33,8 +33,14 @@ class LokiUserDatabase(context: Context, helper: SQLCipherOpenHelper) : Database
             return TextSecurePreferences.getProfileName(context)
         } else {
             val database = databaseHelper.readableDatabase
-            return database.get(displayNameTable, "${Companion.publicKey} = ?", arrayOf( publicKey )) { cursor ->
+            val result = database.get(displayNameTable, "${Companion.publicKey} = ?", arrayOf( publicKey )) { cursor ->
                 cursor.getString(cursor.getColumnIndexOrThrow(displayName))
+            } ?: return null
+            val suffix = " (...${publicKey.substring(publicKey.count() - 8)})"
+            if (result.endsWith(suffix)) {
+                return result.substring(0..(result.count() - suffix.count()))
+            } else {
+                return result
             }
         }
     }

From 10e9d9d1d16fcf29fc011fc60a3668c5e64686da Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Fri, 4 Sep 2020 17:28:54 +1000
Subject: [PATCH 08/33] Fix quote line

---
 .../thoughtcrime/securesms/components/QuoteView.java  | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/components/QuoteView.java b/src/org/thoughtcrime/securesms/components/QuoteView.java
index 2354b88959..112f522ce8 100644
--- a/src/org/thoughtcrime/securesms/components/QuoteView.java
+++ b/src/org/thoughtcrime/securesms/components/QuoteView.java
@@ -6,9 +6,6 @@ import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.os.Build;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
@@ -17,11 +14,16 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+
 import com.annimon.stream.Stream;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 
 import org.thoughtcrime.securesms.attachments.Attachment;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.loki.utilities.UiModeUtilities;
 import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.mms.Slide;
@@ -209,7 +211,8 @@ public class QuoteView extends FrameLayout implements RecipientModifiedListener
     authorView.setText(isOwnNumber ? getContext().getString(R.string.QuoteView_you) : quoteeDisplayName);
 
     // We use the raw color resource because Android 4.x was struggling with tints here
-    quoteBarView.setImageResource(R.color.accent);
+    int colorID = UiModeUtilities.isDayUiMode(getContext()) ? R.color.black : R.color.accent;
+    quoteBarView.setImageResource(colorID);
     mainView.setBackgroundColor(ThemeUtil.getThemedColor(getContext(),
             outgoing ? R.attr.message_received_background_color : R.attr.message_sent_background_color));
   }

From 4b8609ea5a0b840c7889e9cf1aefd6fdd8a0d744 Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Fri, 4 Sep 2020 18:45:00 +1000
Subject: [PATCH 09/33] Revert "Make text bubbles a bit smaller"

This reverts commit db0fd21097c3ed66e9633c6aef745dbb0e0e2b3b.
---
 res/layout/conversation_item_received.xml     | 42 +++++++++----------
 res/layout/conversation_item_sent.xml         | 36 ++++++++--------
 res/layout/document_view.xml                  |  1 -
 res/layout/quote_view.xml                     |  3 +-
 .../conversation/ConversationItem.java        | 11 +++--
 5 files changed, 45 insertions(+), 48 deletions(-)

diff --git a/res/layout/conversation_item_received.xml b/res/layout/conversation_item_received.xml
index 063b5dd939..5b7d503cdf 100644
--- a/res/layout/conversation_item_received.xml
+++ b/res/layout/conversation_item_received.xml
@@ -59,8 +59,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="@dimen/massive_spacing"
                 android:layout_marginStart="12dp"
-                android:paddingTop="12dp"
-                android:paddingBottom="12dp"
+                android:paddingTop="@dimen/medium_spacing"
+                android:paddingBottom="@dimen/medium_spacing"
                 android:orientation="vertical"
                 android:clipToPadding="false"
                 android:clipChildren="false"
@@ -71,9 +71,9 @@
                     android:id="@+id/group_sender_holder"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="12dp"
-                    android:layout_marginBottom="12dp"
-                    android:layout_marginEnd="12dp"
+                    android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+                    android:layout_marginBottom="@dimen/medium_spacing"
+                    android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
                     android:orientation="horizontal"
                     android:visibility="gone"
                     tools:visibility="visible">
@@ -113,9 +113,9 @@
                     android:id="@+id/quote_view"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="20dp"
-                    android:layout_marginBottom="12dp"
-                    android:layout_marginEnd="20dp"
+                    android:layout_marginStart="@dimen/large_spacing"
+                    android:layout_marginBottom="@dimen/medium_spacing"
+                    android:layout_marginEnd="@dimen/large_spacing"
                     android:visibility="gone"
                     app:message_type="incoming"
                     app:quote_colorPrimary="@color/text"
@@ -127,7 +127,7 @@
                     android:layout="@layout/conversation_item_received_shared_contact"
                     android:layout_width="@dimen/media_bubble_default_dimens"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="12dp"
+                    android:layout_marginTop="@dimen/message_bubble_top_padding"
                     android:visibility="gone"/>
 
                 <ViewStub
@@ -153,9 +153,9 @@
                     android:layout="@layout/conversation_item_received_audio"
                     android:layout_width="210dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="12dp"
-                    android:layout_marginBottom="4dp"
-                    android:layout_marginEnd="12dp" />
+                    android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+                    android:layout_marginBottom="6dp"
+                    android:layout_marginEnd="@dimen/message_bubble_horizontal_padding" />
 
                 <ViewStub
                     android:id="@+id/document_view_stub"
@@ -163,15 +163,15 @@
                     android:layout_width="210dp"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="4dp"
-                    android:layout_marginStart="12dp"
-                    android:layout_marginEnd="12dp" />
+                    android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+                    android:layout_marginEnd="@dimen/message_bubble_horizontal_padding" />
 
                 <org.thoughtcrime.securesms.components.emoji.EmojiTextView
                     android:id="@+id/conversation_item_body"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="12dp"
-                    android:layout_marginEnd="12dp"
+                    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"
@@ -185,8 +185,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="4dp"
-                    android:layout_marginStart="12dp"
-                    android:layout_marginEnd="12dp"
+                    android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+                    android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
                     android:clipChildren="false"
                     android:clipToPadding="false"
                     android:alpha="0.6"
@@ -197,9 +197,9 @@
                     android:id="@+id/conversation_item_sticker_footer"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
-                    android:layout_marginStart="12dp"
-                    android:layout_marginEnd="12dp"
+                    android:layout_marginTop="6dp"
+                    android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+                    android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
                     android:clipChildren="false"
                     android:clipToPadding="false"
                     android:visibility="gone"
diff --git a/res/layout/conversation_item_sent.xml b/res/layout/conversation_item_sent.xml
index a6fecbf89a..60f032ea8a 100644
--- a/res/layout/conversation_item_sent.xml
+++ b/res/layout/conversation_item_sent.xml
@@ -37,8 +37,8 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:layout_marginStart="@dimen/massive_spacing"
-                android:paddingTop="12dp"
-                android:paddingBottom="12dp"
+                android:paddingTop="@dimen/medium_spacing"
+                android:paddingBottom="@dimen/medium_spacing"
                 android:layout_gravity="end"
                 android:clipToPadding="false"
                 android:clipChildren="false"
@@ -49,9 +49,9 @@
                     android:id="@+id/quote_view"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="20dp"
-                    android:layout_marginBottom="12dp"
-                    android:layout_marginEnd="20dp"
+                    android:layout_marginStart="@dimen/large_spacing"
+                    android:layout_marginBottom="@dimen/medium_spacing"
+                    android:layout_marginEnd="@dimen/large_spacing"
                     android:visibility="gone"
                     app:message_type="outgoing"
                     app:quote_colorPrimary="@color/text"
@@ -63,7 +63,7 @@
                     android:layout="@layout/conversation_item_sent_shared_contact"
                     android:layout_width="@dimen/media_bubble_default_dimens"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="12dp"
+                    android:layout_marginBottom="@dimen/medium_spacing"
                     android:visibility="gone"/>
 
                 <ViewStub
@@ -89,25 +89,25 @@
                     android:layout="@layout/conversation_item_sent_audio"
                     android:layout_width="210dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="12dp"
-                    android:layout_marginBottom="4dp"
-                    android:layout_marginEnd="12dp" />
+                    android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+                    android:layout_marginBottom="6dp"
+                    android:layout_marginEnd="@dimen/message_bubble_horizontal_padding" />
 
                 <ViewStub
                     android:id="@+id/document_view_stub"
                     android:layout="@layout/conversation_item_sent_document"
                     android:layout_width="210dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="12dp"
+                    android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
                     android:layout_marginBottom="4dp"
-                    android:layout_marginEnd="12dp" />
+                    android:layout_marginEnd="@dimen/message_bubble_horizontal_padding" />
 
                 <org.thoughtcrime.securesms.components.emoji.EmojiTextView
                     android:id="@+id/conversation_item_body"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="12dp"
-                    android:layout_marginEnd="12dp"
+                    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_sent_text_primary_color"
                     android:textColorLink="?conversation_item_sent_text_primary_color"
@@ -139,8 +139,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="4dp"
-                    android:layout_marginStart="12dp"
-                    android:layout_marginEnd="12dp"
+                    android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+                    android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
                     android:clipChildren="false"
                     android:clipToPadding="false"
                     app:footer_text_color="?attr/conversation_item_sent_text_secondary_color"
@@ -150,9 +150,9 @@
                     android:id="@+id/conversation_item_sticker_footer"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
-                    android:layout_marginStart="12dp"
-                    android:layout_marginEnd="12dp"
+                    android:layout_marginTop="6dp"
+                    android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+                    android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
                     android:clipChildren="false"
                     android:clipToPadding="false"
                     android:visibility="gone"
diff --git a/res/layout/document_view.xml b/res/layout/document_view.xml
index a61a54cb4d..428375f087 100644
--- a/res/layout/document_view.xml
+++ b/res/layout/document_view.xml
@@ -9,7 +9,6 @@
                       android:layout_height="wrap_content"
                       android:clickable="false"
                       android:focusable="false"
-                      android:layout_marginBottom="-4dp"
                       android:gravity="center_vertical"
                       android:orientation="horizontal">
 
diff --git a/res/layout/quote_view.xml b/res/layout/quote_view.xml
index 8b1fa969df..50b270b500 100644
--- a/res/layout/quote_view.xml
+++ b/res/layout/quote_view.xml
@@ -73,7 +73,7 @@
                         android:layout_height="wrap_content"
                         style="@style/Signal.Text.Body"
                         android:textColor="@color/text"
-                        android:textSize="@dimen/small_font_size"
+                        android:textSize="@dimen/medium_font_size"
                         android:maxLines="1"
                         android:ellipsize="end"
                         tools:text="The-Amazing-Spider-Man.cba" />
@@ -99,7 +99,6 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="4dp"
                     style="@style/Signal.Text.Body"
-                    android:textSize="@dimen/small_font_size"
                     android:ellipsize="end"
                     android:maxLines="2"
                     tools:text="With great power comes great responsibility."
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationItem.java b/src/org/thoughtcrime/securesms/conversation/ConversationItem.java
index 385c0fa9ab..ca3d10db17 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationItem.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationItem.java
@@ -87,7 +87,6 @@ import org.thoughtcrime.securesms.jobs.SmsSendJob;
 import org.thoughtcrime.securesms.linkpreview.LinkPreview;
 import org.thoughtcrime.securesms.linkpreview.LinkPreviewUtil;
 import org.thoughtcrime.securesms.logging.Log;
-import org.thoughtcrime.securesms.loki.utilities.GeneralUtilitiesKt;
 import org.thoughtcrime.securesms.loki.utilities.MentionUtilities;
 import org.thoughtcrime.securesms.loki.views.ProfilePictureView;
 import org.thoughtcrime.securesms.mms.GlideRequests;
@@ -503,23 +502,23 @@ public class ConversationItem extends LinearLayout
     if (hasOnlyThumbnail(messageRecord)) {
       int topPadding = 0;
       if (groupSenderHolder.getVisibility() == VISIBLE) {
-        topPadding = GeneralUtilitiesKt.toPx(12, getResources());
+        topPadding = (int)getResources().getDimension(R.dimen.medium_spacing);
       }
       int bottomPadding = 0;
       if (messageRecord.getBody().length() > 0) {
-        bodyTextLayoutParams.topMargin = GeneralUtilitiesKt.toPx(12, getResources());
-        bottomPadding = GeneralUtilitiesKt.toPx(12, getResources());
+        bodyTextLayoutParams.topMargin = (int)getResources().getDimension(R.dimen.medium_spacing);
+        bottomPadding = (int)getResources().getDimension(R.dimen.medium_spacing);
       }
       bodyBubble.setPadding(0, topPadding, 0, bottomPadding);
     } else {
-      bodyBubble.setPadding(0, GeneralUtilitiesKt.toPx(12, getResources()), 0, GeneralUtilitiesKt.toPx(12, getResources()));
+      bodyBubble.setPadding(0, (int)getResources().getDimension(R.dimen.medium_spacing), 0, (int)getResources().getDimension(R.dimen.medium_spacing));
     }
     bodyText.setLayoutParams(bodyTextLayoutParams);
     LinearLayout.LayoutParams senderHolderLayoutParams = (LinearLayout.LayoutParams)groupSenderHolder.getLayoutParams();
     if (groupSenderHolder.getVisibility() == VISIBLE && hasOnlyText(messageRecord)) {
       senderHolderLayoutParams.bottomMargin = (int)(getResources().getDisplayMetrics().density * 4);
     } else {
-      senderHolderLayoutParams.bottomMargin = GeneralUtilitiesKt.toPx(12, getResources());
+      senderHolderLayoutParams.bottomMargin = (int)getResources().getDimension(R.dimen.medium_spacing);
     }
     groupSenderHolder.setLayoutParams(senderHolderLayoutParams);
     if (documentViewStub.resolved()) {

From 16a5799da2fa5dbaeb6ca8020b6602295aee0de6 Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Fri, 4 Sep 2020 19:00:35 +1000
Subject: [PATCH 10/33] Update version number

---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index ea141a6d88..ced0327e39 100644
--- a/build.gradle
+++ b/build.gradle
@@ -182,8 +182,8 @@ dependencies {
     implementation "com.opencsv:opencsv:4.6"
 }
 
-def canonicalVersionCode = 84
-def canonicalVersionName = "1.5.0"
+def canonicalVersionCode = 85
+def canonicalVersionName = "1.5.1"
 
 def postFixSize = 10
 def abiPostFix = ['armeabi-v7a' : 1,

From 590e960117b06b429fc45399a11b7830999faf53 Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Sun, 6 Sep 2020 07:00:41 +1000
Subject: [PATCH 11/33] Revert "Disable multi dex"

This reverts commit 4661e7b4ca8f1e50c260fd892b33e2bdd868edb6.
---
 build.gradle                                     |  4 ++++
 .../securesms/ApplicationContext.java            | 16 ++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index ced0327e39..dea3f313db 100644
--- a/build.gradle
+++ b/build.gradle
@@ -81,6 +81,7 @@ dependencies {
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
     implementation 'androidx.exifinterface:exifinterface:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation 'androidx.lifecycle:lifecycle-common-java8:2.2.0'
 
@@ -151,6 +152,8 @@ dependencies {
     testImplementation 'org.powermock:powermock-classloading-xstream:1.6.1'
 
     testImplementation 'androidx.test:core:1.3.0-rc03'
+    androidTestImplementation 'androidx.multidex:multidex:2.0.1'
+    androidTestImplementation 'androidx.multidex:multidex-instrumentation:2.0.0'
     androidTestImplementation 'com.google.dexmaker:dexmaker:1.2'
     androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'
     androidTestImplementation ('org.assertj:assertj-core:1.7.1') {
@@ -208,6 +211,7 @@ android {
 
         minSdkVersion 21
         targetSdkVersion 29
+        multiDexEnabled true
 
         vectorDrawables.useSupportLibrary = true
         project.ext.set("archivesBaseName", "Signal")
diff --git a/src/org/thoughtcrime/securesms/ApplicationContext.java b/src/org/thoughtcrime/securesms/ApplicationContext.java
index e1d44b7ceb..685894dcd9 100644
--- a/src/org/thoughtcrime/securesms/ApplicationContext.java
+++ b/src/org/thoughtcrime/securesms/ApplicationContext.java
@@ -16,18 +16,17 @@
  */
 package org.thoughtcrime.securesms;
 
-import android.app.Application;
+import androidx.lifecycle.DefaultLifecycleObserver;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.ProcessLifecycleOwner;
 import android.content.Context;
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Handler;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.lifecycle.DefaultLifecycleObserver;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.lifecycle.ProcessLifecycleOwner;
+import androidx.multidex.MultiDexApplication;
 
 import com.google.firebase.iid.FirebaseInstanceId;
 
@@ -116,10 +115,10 @@ import org.whispersystems.signalservice.loki.protocol.closedgroups.SharedSenderK
 import org.whispersystems.signalservice.loki.protocol.mentions.MentionsManager;
 import org.whispersystems.signalservice.loki.protocol.meta.SessionMetaProtocol;
 import org.whispersystems.signalservice.loki.protocol.meta.TTLUtilities;
-import org.whispersystems.signalservice.loki.protocol.sessionmanagement.SessionManagementProtocol;
-import org.whispersystems.signalservice.loki.protocol.sessionmanagement.SessionManagementProtocolDelegate;
 import org.whispersystems.signalservice.loki.protocol.shelved.multidevice.DeviceLink;
 import org.whispersystems.signalservice.loki.protocol.shelved.multidevice.MultiDeviceProtocol;
+import org.whispersystems.signalservice.loki.protocol.sessionmanagement.SessionManagementProtocol;
+import org.whispersystems.signalservice.loki.protocol.sessionmanagement.SessionManagementProtocolDelegate;
 import org.whispersystems.signalservice.loki.protocol.shelved.syncmessages.SyncMessagesProtocol;
 
 import java.io.File;
@@ -145,10 +144,11 @@ import static nl.komponents.kovenant.android.KovenantAndroid.stopKovenant;
  *
  * @author Moxie Marlinspike
  */
-public class ApplicationContext extends Application implements DependencyInjector, DefaultLifecycleObserver, LokiP2PAPIDelegate,
+public class ApplicationContext extends MultiDexApplication implements DependencyInjector, DefaultLifecycleObserver, LokiP2PAPIDelegate,
       SessionManagementProtocolDelegate, SharedSenderKeysImplementationDelegate {
 
   private static final String TAG = ApplicationContext.class.getSimpleName();
+  private final static int OK_HTTP_CACHE_SIZE = 10 * 1024 * 1024; // 10 MB
 
   private ExpiringMessageManager  expiringMessageManager;
   private TypingStatusRepository  typingStatusRepository;

From 3de2f875146b1b2944a6b422e9869418dc9b2207 Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Sun, 6 Sep 2020 07:03:16 +1000
Subject: [PATCH 12/33] Revert image cropper version

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index dea3f313db..f72de0f957 100644
--- a/build.gradle
+++ b/build.gradle
@@ -108,7 +108,7 @@ dependencies {
     implementation 'com.pnikosis:materialish-progress:1.5'
     implementation 'org.greenrobot:eventbus:3.0.0'
     implementation 'pl.tajchert:waitingdots:0.1.0'
-    implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0'
+    implementation 'com.theartofdev.edmodo:android-image-cropper:2.7.0'
     implementation 'com.melnykov:floatingactionbutton:1.3.0'
     implementation 'com.google.zxing:android-integration:3.1.0'
     implementation 'com.squareup.dagger:dagger:1.2.2'

From a05a03313aa44bee82145d2f732c724e76c35949 Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Sun, 6 Sep 2020 07:03:44 +1000
Subject: [PATCH 13/33] Update version number

---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index f72de0f957..82e8824a86 100644
--- a/build.gradle
+++ b/build.gradle
@@ -185,8 +185,8 @@ dependencies {
     implementation "com.opencsv:opencsv:4.6"
 }
 
-def canonicalVersionCode = 85
-def canonicalVersionName = "1.5.1"
+def canonicalVersionCode = 87
+def canonicalVersionName = "1.5.1.2"
 
 def postFixSize = 10
 def abiPostFix = ['armeabi-v7a' : 1,

From e6ef8e22e9599b8890fad4a1ca6e17af975a086c Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Mon, 7 Sep 2020 09:43:01 +1000
Subject: [PATCH 14/33] Update Kotlin & Gradle

---
 build.gradle                             | 71 ++++++++++++------------
 buildSrc/build.gradle                    |  2 +-
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 3 files changed, 36 insertions(+), 39 deletions(-)

diff --git a/build.gradle b/build.gradle
index 82e8824a86..595d3c0649 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,16 +1,15 @@
-import java.security.MessageDigest
-
 buildscript {
-    ext.kotlin_version = "1.3.31"
+    ext.kotlin_version = "1.4.0"
     ext.kovenant_version = "3.3.0"
 
     repositories {
         mavenLocal()
         google()
         mavenCentral()
+        jcenter()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:3.4.1"
+        classpath "com.android.tools.build:gradle:4.0.1"
         classpath files('libs/gradle-witness.jar')
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "com.google.gms:google-services:4.3.3"
@@ -18,8 +17,8 @@ buildscript {
 }
 
 apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 apply plugin: 'witness'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'com.google.gms.google-services'
@@ -73,14 +72,14 @@ configurations.all {
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    implementation 'com.google.android.material:material:1.2.0'
+    implementation 'com.google.android.material:material:1.2.1'
     implementation 'androidx.legacy:legacy-support-v13:1.0.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.preference:preference:1.1.1'
     implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
     implementation 'androidx.exifinterface:exifinterface:1.2.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation 'androidx.lifecycle:lifecycle-common-java8:2.2.0'
@@ -90,7 +89,6 @@ dependencies {
         exclude group: 'com.google.firebase', module: 'firebase-analytics'
         exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
     }
-
     implementation 'com.google.android.exoplayer:exoplayer-core:2.9.1'
     implementation 'com.google.android.exoplayer:exoplayer-ui:2.9.1'
     implementation 'org.conscrypt:conscrypt-android:2.0.0'
@@ -108,7 +106,7 @@ dependencies {
     implementation 'com.pnikosis:materialish-progress:1.5'
     implementation 'org.greenrobot:eventbus:3.0.0'
     implementation 'pl.tajchert:waitingdots:0.1.0'
-    implementation 'com.theartofdev.edmodo:android-image-cropper:2.7.0'
+    implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0'
     implementation 'com.melnykov:floatingactionbutton:1.3.0'
     implementation 'com.google.zxing:android-integration:3.1.0'
     implementation 'com.squareup.dagger:dagger:1.2.2'
@@ -142,30 +140,6 @@ dependencies {
         exclude group: 'com.fasterxml.jackson.core'
         exclude group: 'org.freemarker'
     }
-
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'org.assertj:assertj-core:3.11.1'
-    testImplementation 'org.mockito:mockito-core:1.9.5'
-    testImplementation 'org.powermock:powermock-api-mockito:1.6.1'
-    testImplementation 'org.powermock:powermock-module-junit4:1.6.1'
-    testImplementation 'org.powermock:powermock-module-junit4-rule:1.6.1'
-    testImplementation 'org.powermock:powermock-classloading-xstream:1.6.1'
-
-    testImplementation 'androidx.test:core:1.3.0-rc03'
-    androidTestImplementation 'androidx.multidex:multidex:2.0.1'
-    androidTestImplementation 'androidx.multidex:multidex-instrumentation:2.0.0'
-    androidTestImplementation 'com.google.dexmaker:dexmaker:1.2'
-    androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'
-    androidTestImplementation ('org.assertj:assertj-core:1.7.1') {
-        exclude group: 'org.hamcrest', module: 'hamcrest-core'
-    }
-    androidTestImplementation ('com.squareup.assertj:assertj-android:1.1.1') {
-        exclude group: 'org.hamcrest',        module: 'hamcrest-core'
-        exclude group: 'com.android.support', module: 'support-annotations'
-    }
-    testImplementation 'org.robolectric:robolectric:4.2'
-    testImplementation 'org.robolectric:shadows-multidex:4.2'
-
     // Loki
     // Local:
     implementation "org.whispersystems:signal-service-android:2.13.2" // Run ./gradlew install from session-android-service to install
@@ -183,6 +157,28 @@ dependencies {
     implementation "com.github.tbruyelle:rxpermissions:0.10.2"
     implementation "com.github.ybq:Android-SpinKit:1.4.0"
     implementation "com.opencsv:opencsv:4.6"
+
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.assertj:assertj-core:3.11.1'
+    testImplementation 'org.mockito:mockito-core:1.9.5'
+    testImplementation 'org.powermock:powermock-api-mockito:1.6.1'
+    testImplementation 'org.powermock:powermock-module-junit4:1.6.1'
+    testImplementation 'org.powermock:powermock-module-junit4-rule:1.6.1'
+    testImplementation 'org.powermock:powermock-classloading-xstream:1.6.1'
+    testImplementation 'androidx.test:core:1.3.0'
+    androidTestImplementation 'androidx.multidex:multidex:2.0.1'
+    androidTestImplementation 'androidx.multidex:multidex-instrumentation:2.0.0'
+    androidTestImplementation 'com.google.dexmaker:dexmaker:1.2'
+    androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'
+    androidTestImplementation ('org.assertj:assertj-core:1.7.1') {
+        exclude group: 'org.hamcrest', module: 'hamcrest-core'
+    }
+    androidTestImplementation ('com.squareup.assertj:assertj-android:1.1.1') {
+        exclude group: 'org.hamcrest',        module: 'hamcrest-core'
+        exclude group: 'com.android.support', module: 'support-annotations'
+    }
+    testImplementation 'org.robolectric:robolectric:4.2'
+    testImplementation 'org.robolectric:shadows-multidex:4.2'
 }
 
 def canonicalVersionCode = 87
@@ -211,10 +207,10 @@ android {
 
         minSdkVersion 21
         targetSdkVersion 29
-        multiDexEnabled true
+        multiDexEnabled true // Even though we're running API 21+, this is still needed for release builds
 
         vectorDrawables.useSupportLibrary = true
-        project.ext.set("archivesBaseName", "Signal")
+        project.ext.set("archivesBaseName", "session")
 
         buildConfigField "long", "BUILD_TIMESTAMP", getLastCommitTimestamp() + "L"
         buildConfigField "String", "SIGNAL_URL", "\"\""
@@ -283,7 +279,7 @@ android {
                           'proguard-ez-vcard.pro',
                           'proguard.cfg'
             testProguardFiles 'proguard-automation.pro',
-                          'proguard.cfg'
+                              'proguard.cfg'
         }
         release {
             minifyEnabled true
@@ -353,6 +349,7 @@ android {
     }
 }
 
+/*
 def assembleWebsiteDescriptor = { variant, file ->
     if (file.exists()) {
         MessageDigest md = MessageDigest.getInstance("SHA-256")
@@ -376,7 +373,7 @@ def assembleWebsiteDescriptor = { variant, file ->
         descriptorFile.write(descriptor)
     }
 }
-/*
+
 def signProductionRelease = { variant ->
     variant.outputs.collect { output ->
         String apkName    = output.outputFile.name
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 889ee1d68a..f05084afb7 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -5,5 +5,5 @@ repositories {
 }
 
 dependencies {
-    compile 'com.android.tools.build:apksig:3.3.2'
+    implementation 'com.android.tools.build:apksig:4.0.1'
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1b2b07cfb0..33682bbbf9 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From be788738dcc718a7f4524ef8db37e214e5bf0248 Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Mon, 7 Sep 2020 10:57:25 +1000
Subject: [PATCH 15/33] Implement user details sheet

---
 .../fragment_conversation_bottom_sheet.xml    | 11 +++-
 .../fragment_user_details_bottom_sheet.xml    | 50 +++++++++++++++++++
 res/values/strings.xml                        |  1 +
 .../securesms/loki/activities/HomeActivity.kt |  6 +++
 .../dialogs/ConversationOptionsBottomSheet.kt | 13 +++--
 .../loki/dialogs/UserDetailsBottomSheet.kt    | 19 +++++++
 6 files changed, 91 insertions(+), 9 deletions(-)
 create mode 100644 res/layout/fragment_user_details_bottom_sheet.xml
 create mode 100644 src/org/thoughtcrime/securesms/loki/dialogs/UserDetailsBottomSheet.kt

diff --git a/res/layout/fragment_conversation_bottom_sheet.xml b/res/layout/fragment_conversation_bottom_sheet.xml
index 274417418a..4cd4708573 100644
--- a/res/layout/fragment_conversation_bottom_sheet.xml
+++ b/res/layout/fragment_conversation_bottom_sheet.xml
@@ -9,13 +9,20 @@
     app:behavior_hideable="true"
     app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
+    <TextView
+        android:id="@+id/detailsTextView"
+        style="@style/BottomSheetActionItem"
+        android:drawableStart="@drawable/ic_info_outline_white_24dp"
+        android:drawableTint="?attr/colorControlNormal"
+        android:text="@string/details" />
+
     <TextView
         android:id="@+id/blockTextView"
         style="@style/BottomSheetActionItem"
         android:drawableStart="?attr/menu_block_icon"
         android:text="@string/RecipientPreferenceActivity_block"
         android:visibility="gone"
-        tools:visibility="visible"/>
+        tools:visibility="visible" />
 
     <TextView
         android:id="@+id/unblockTextView"
@@ -23,7 +30,7 @@
         android:drawableStart="?attr/menu_accept_icon"
         android:text="@string/RecipientPreferenceActivity_unblock"
         android:visibility="gone"
-        tools:visibility="visible"/>
+        tools:visibility="visible" />
 
     <TextView
         android:id="@+id/deleteTextView"
diff --git a/res/layout/fragment_user_details_bottom_sheet.xml b/res/layout/fragment_user_details_bottom_sheet.xml
new file mode 100644
index 0000000000..cb87ca86e3
--- /dev/null
+++ b/res/layout/fragment_user_details_bottom_sheet.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:gravity="center_horizontal"
+    android:paddingLeft="@dimen/large_spacing"
+    android:paddingRight="@dimen/large_spacing"
+    android:paddingBottom="@dimen/large_spacing"
+    app:behavior_hideable="true"
+    app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
+
+    <org.thoughtcrime.securesms.loki.views.ProfilePictureView
+        android:id="@+id/profilePictureView"
+        android:layout_width="@dimen/large_profile_picture_size"
+        android:layout_height="@dimen/large_profile_picture_size"
+        android:layout_marginTop="@dimen/large_spacing" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/large_spacing"
+        android:textSize="@dimen/very_large_font_size"
+        android:textStyle="bold"
+        android:textColor="@color/text"
+        android:text="Spiderman" />
+
+    <TextView
+        style="@style/SessionIDTextView"
+        android:id="@+id/publicKeyTextView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="@dimen/large_font_size"
+        android:layout_marginTop="@dimen/large_spacing"
+        android:textIsSelectable="true"
+        android:text="05987d601943c267879be41830888066c6a024cbdc9a548d06813924bf3372ea78" />
+
+    <Button
+        style="@style/Widget.Session.Button.Common.ProminentOutline"
+        android:id="@+id/copyButton"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/medium_button_height"
+        android:layout_marginTop="@dimen/medium_spacing"
+        android:paddingLeft="@dimen/large_spacing"
+        android:paddingRight="@dimen/large_spacing"
+        android:text="@string/copy" />
+
+</LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1dbc88c0e7..9899172b5f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1864,5 +1864,6 @@
 
     <string name="attachment">Attachment</string>
     <string name="attachment_type_voice_message">Voice Message</string>
+    <string name="details">Details</string>
 
 </resources>
diff --git a/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
index 8731e3dd9a..4dd163af49 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
@@ -34,6 +34,7 @@ import org.thoughtcrime.securesms.jobs.MultiDeviceBlockedUpdateJob
 import org.thoughtcrime.securesms.loki.dialogs.ConversationOptionsBottomSheet
 import org.thoughtcrime.securesms.loki.dialogs.LightThemeFeatureIntroBottomSheet
 import org.thoughtcrime.securesms.loki.dialogs.MultiDeviceRemovalBottomSheet
+import org.thoughtcrime.securesms.loki.dialogs.UserDetailsBottomSheet
 import org.thoughtcrime.securesms.loki.protocol.ClosedGroupsProtocol
 import org.thoughtcrime.securesms.loki.protocol.SessionResetImplementation
 import org.thoughtcrime.securesms.loki.utilities.*
@@ -271,6 +272,11 @@ class HomeActivity : PassphraseRequiredActionBarActivity, ConversationClickListe
         val thread = view.thread ?: return
         val bottomSheet = ConversationOptionsBottomSheet()
         bottomSheet.recipient = thread.recipient
+        bottomSheet.onViewDetailsTapped = {
+            bottomSheet.dismiss()
+            val userDetailsBottomSheet = UserDetailsBottomSheet()
+            userDetailsBottomSheet.show(supportFragmentManager, userDetailsBottomSheet.tag)
+        }
         bottomSheet.onBlockTapped = {
             bottomSheet.dismiss()
             if (!thread.recipient.isBlocked) {
diff --git a/src/org/thoughtcrime/securesms/loki/dialogs/ConversationOptionsBottomSheet.kt b/src/org/thoughtcrime/securesms/loki/dialogs/ConversationOptionsBottomSheet.kt
index 828a67fa87..f803e0fced 100644
--- a/src/org/thoughtcrime/securesms/loki/dialogs/ConversationOptionsBottomSheet.kt
+++ b/src/org/thoughtcrime/securesms/loki/dialogs/ConversationOptionsBottomSheet.kt
@@ -20,6 +20,7 @@ public class ConversationOptionsBottomSheet : BottomSheetDialogFragment() {
     // if we want to use dialog fragments properly.
     lateinit var recipient: Recipient
 
+    var onViewDetailsTapped: (() -> Unit?)? = null
     var onBlockTapped: (() -> Unit)? = null
     var onUnblockTapped: (() -> Unit)? = null
     var onDeleteTapped: (() -> Unit)? = null
@@ -30,18 +31,16 @@ public class ConversationOptionsBottomSheet : BottomSheetDialogFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-
-        if (!this::recipient.isInitialized) {
-            dismiss()
-            return
-        }
-
+        if (!this::recipient.isInitialized) { return dismiss() }
         if (!recipient.isGroupRecipient && !recipient.isLocalNumber) {
+            detailsTextView.visibility = View.VISIBLE
             unblockTextView.visibility = if (recipient.isBlocked) View.VISIBLE else View.GONE
             blockTextView.visibility = if (recipient.isBlocked) View.GONE else View.VISIBLE
-
+            detailsTextView.setOnClickListener { onViewDetailsTapped?.invoke() }
             blockTextView.setOnClickListener { onBlockTapped?.invoke() }
             unblockTextView.setOnClickListener { onUnblockTapped?.invoke() }
+        } else {
+            detailsTextView.visibility = View.GONE
         }
         deleteTextView.setOnClickListener { onDeleteTapped?.invoke() }
     }
diff --git a/src/org/thoughtcrime/securesms/loki/dialogs/UserDetailsBottomSheet.kt b/src/org/thoughtcrime/securesms/loki/dialogs/UserDetailsBottomSheet.kt
new file mode 100644
index 0000000000..aef13c98b2
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/dialogs/UserDetailsBottomSheet.kt
@@ -0,0 +1,19 @@
+package org.thoughtcrime.securesms.loki.dialogs
+
+import android.os.Bundle
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import network.loki.messenger.R
+
+public class UserDetailsBottomSheet : BottomSheetDialogFragment() {
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_user_details_bottom_sheet, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+    }
+}
\ No newline at end of file

From 485ca0c2ebb7642c94476f84bd1d96afc60893ae Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Mon, 7 Sep 2020 15:04:27 +1000
Subject: [PATCH 16/33] Update version number

---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 595d3c0649..dfb88a97d7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -181,8 +181,8 @@ dependencies {
     testImplementation 'org.robolectric:shadows-multidex:4.2'
 }
 
-def canonicalVersionCode = 87
-def canonicalVersionName = "1.5.1.2"
+def canonicalVersionCode = 91
+def canonicalVersionName = "1.5.1.6"
 
 def postFixSize = 10
 def abiPostFix = ['armeabi-v7a' : 1,

From 3f208383f3cfa2147f54ffdf7075c25e9acc5bbc Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Mon, 7 Sep 2020 15:20:32 +1000
Subject: [PATCH 17/33] Hook everything up

---
 .../fragment_user_details_bottom_sheet.xml    |  5 +++--
 .../securesms/loki/activities/HomeActivity.kt |  3 +++
 .../loki/dialogs/UserDetailsBottomSheet.kt    | 21 +++++++++++++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/res/layout/fragment_user_details_bottom_sheet.xml b/res/layout/fragment_user_details_bottom_sheet.xml
index cb87ca86e3..705317e32d 100644
--- a/res/layout/fragment_user_details_bottom_sheet.xml
+++ b/res/layout/fragment_user_details_bottom_sheet.xml
@@ -19,10 +19,11 @@
         android:layout_marginTop="@dimen/large_spacing" />
 
     <TextView
+        android:id="@+id/nameTextView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/large_spacing"
-        android:textSize="@dimen/very_large_font_size"
+        android:layout_marginTop="@dimen/medium_spacing"
+        android:textSize="@dimen/massive_font_size"
         android:textStyle="bold"
         android:textColor="@color/text"
         android:text="Spiderman" />
diff --git a/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
index 4dd163af49..90a9ffe9eb 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
@@ -275,6 +275,9 @@ class HomeActivity : PassphraseRequiredActionBarActivity, ConversationClickListe
         bottomSheet.onViewDetailsTapped = {
             bottomSheet.dismiss()
             val userDetailsBottomSheet = UserDetailsBottomSheet()
+            val bundle = Bundle()
+            bundle.putString("publicKey", thread.recipient.address.toPhoneString())
+            userDetailsBottomSheet.arguments = bundle
             userDetailsBottomSheet.show(supportFragmentManager, userDetailsBottomSheet.tag)
         }
         bottomSheet.onBlockTapped = {
diff --git a/src/org/thoughtcrime/securesms/loki/dialogs/UserDetailsBottomSheet.kt b/src/org/thoughtcrime/securesms/loki/dialogs/UserDetailsBottomSheet.kt
index aef13c98b2..ca1fabcec9 100644
--- a/src/org/thoughtcrime/securesms/loki/dialogs/UserDetailsBottomSheet.kt
+++ b/src/org/thoughtcrime/securesms/loki/dialogs/UserDetailsBottomSheet.kt
@@ -1,11 +1,19 @@
 package org.thoughtcrime.securesms.loki.dialogs
 
+import android.content.ClipData
+import android.content.ClipboardManager
+import android.content.Context
 import android.os.Bundle
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Toast
+import kotlinx.android.synthetic.main.fragment_user_details_bottom_sheet.*
+import kotlinx.android.synthetic.main.view_conversation.view.*
 import network.loki.messenger.R
+import org.thoughtcrime.securesms.database.DatabaseFactory
+import org.thoughtcrime.securesms.mms.GlideApp
 
 public class UserDetailsBottomSheet : BottomSheetDialogFragment() {
 
@@ -15,5 +23,18 @@ public class UserDetailsBottomSheet : BottomSheetDialogFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        val publicKey = arguments?.getString("publicKey") ?: return dismiss()
+        profilePictureView.publicKey = publicKey
+        profilePictureView.glide = GlideApp.with(this)
+        profilePictureView.isLarge = true
+        profilePictureView.update()
+        nameTextView.text = DatabaseFactory.getLokiUserDatabase(requireContext()).getDisplayName(publicKey) ?: publicKey
+        publicKeyTextView.text = publicKey
+        copyButton.setOnClickListener {
+            val clipboard = requireContext().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+            val clip = ClipData.newPlainText("Session ID", publicKey)
+            clipboard.setPrimaryClip(clip)
+            Toast.makeText(requireContext(), R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show()
+        }
     }
 }
\ No newline at end of file

From 7209686322c03fb43486111010e7684c3ee92281 Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Mon, 7 Sep 2020 16:13:34 +1000
Subject: [PATCH 18/33] Show profile picture in conversation screen

---
 res/layout/conversation_activity.xml          |  6 ++++
 .../conversation/ConversationActivity.java    | 12 ++++++++
 .../securesms/loki/views/ConversationView.kt  | 24 +---------------
 .../loki/views/ProfilePictureView.kt          | 28 +++++++++++++++++++
 4 files changed, 47 insertions(+), 23 deletions(-)

diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml
index 5a3f3aaed3..eb4c4891a9 100644
--- a/res/layout/conversation_activity.xml
+++ b/res/layout/conversation_activity.xml
@@ -20,9 +20,15 @@
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
+            <org.thoughtcrime.securesms.loki.views.ProfilePictureView
+                android:id="@+id/profilePictureView"
+                android:layout_width="@dimen/medium_profile_picture_size"
+                android:layout_height="@dimen/medium_profile_picture_size" />
+
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/medium_spacing"
                 android:orientation="vertical">
 
                 <TextView
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index 02a68f3e2c..40ca0e4391 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -160,6 +160,7 @@ import org.thoughtcrime.securesms.loki.protocol.ClosedGroupsProtocol;
 import org.thoughtcrime.securesms.loki.protocol.SessionManagementProtocol;
 import org.thoughtcrime.securesms.loki.utilities.MentionManagerUtilities;
 import org.thoughtcrime.securesms.loki.views.MentionCandidateSelectionView;
+import org.thoughtcrime.securesms.loki.views.ProfilePictureView;
 import org.thoughtcrime.securesms.loki.views.SessionRestoreBannerView;
 import org.thoughtcrime.securesms.mediasend.Media;
 import org.thoughtcrime.securesms.mediasend.MediaSendActivity;
@@ -234,6 +235,7 @@ import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
@@ -300,6 +302,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   private   AnimatingToggle             buttonToggle;
   private   SendButton                  sendButton;
   private   ImageButton                 attachButton;
+  private   ProfilePictureView          profilePictureView;
   private   TextView                    titleTextView;
   private   TextView                    charactersLeft;
   private   ConversationFragment        fragment;
@@ -527,6 +530,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     composeText.setTransport(sendButton.getSelectedTransport());
 
     updateTitleTextView(recipient);
+    updateProfilePicture();
     updateSubtitleTextView();
     setActionBarColor(recipient.getColor());
     updateInputUI(recipient, isSecureText, isDefaultSms);
@@ -621,6 +625,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       recipient = Recipient.from(this, data.getParcelableExtra(GroupCreateActivity.GROUP_ADDRESS_EXTRA), true);
       recipient.addListener(this);
       updateTitleTextView(recipient);
+      updateProfilePicture();
       updateSubtitleTextView();
       NotificationChannels.updateContactChannelName(this, recipient);
       updateInputUI(recipient, isSecureText, isDefaultSms);
@@ -1654,6 +1659,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   }
 
   private void initializeViews() {
+    profilePictureView                     = findViewById(R.id.profilePictureView);
     titleTextView                          = findViewById(R.id.titleTextView);
     buttonToggle                           = ViewUtil.findById(this, R.id.button_toggle);
     sendButton                             = ViewUtil.findById(this, R.id.send_button);
@@ -1872,6 +1878,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     Util.runOnMain(() -> {
       Log.i(TAG, "onModifiedRun(): " + recipient.getRegistered());
       updateTitleTextView(recipient);
+      updateProfilePicture();
       updateSubtitleTextView();
 //      titleView.setVerified(identityRecords.isVerified());
       updateInputUI(recipient, isSecureText, isDefaultSms);
@@ -3100,6 +3107,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     }
   }
 
+  private void updateProfilePicture() {
+    profilePictureView.glide = GlideApp.with(this);
+    profilePictureView.update(recipient, threadId);
+  }
+
   private void updateSubtitleTextView() {
     muteIndicatorImageView.setVisibility(View.GONE);
     subtitleTextView.setVisibility(View.VISIBLE);
diff --git a/src/org/thoughtcrime/securesms/loki/views/ConversationView.kt b/src/org/thoughtcrime/securesms/loki/views/ConversationView.kt
index 382ac63a84..ebc6c679be 100644
--- a/src/org/thoughtcrime/securesms/loki/views/ConversationView.kt
+++ b/src/org/thoughtcrime/securesms/loki/views/ConversationView.kt
@@ -55,30 +55,8 @@ class ConversationView : LinearLayout {
             accentView.setBackgroundResource(R.color.accent)
             accentView.visibility = if (thread.unreadCount > 0) View.VISIBLE else View.INVISIBLE
         }
-        if (thread.recipient.isGroupRecipient) {
-            if ("Session Public Chat" == thread.recipient.name) {
-                profilePictureView.publicKey = ""
-                profilePictureView.additionalPublicKey = null
-                profilePictureView.isRSSFeed = true
-            } else {
-                val users = MentionsManager.shared.userPublicKeyCache[thread.threadId]?.toMutableList() ?: mutableListOf()
-                users.remove(TextSecurePreferences.getLocalNumber(context))
-                val masterPublicKey = TextSecurePreferences.getMasterHexEncodedPublicKey(context)
-                if (masterPublicKey != null) {
-                    users.remove(masterPublicKey)
-                }
-                val randomUsers = users.sorted() // Sort to provide a level of stability
-                profilePictureView.publicKey = randomUsers.getOrNull(0) ?: ""
-                profilePictureView.additionalPublicKey = randomUsers.getOrNull(1) ?: ""
-                profilePictureView.isRSSFeed = thread.recipient.name == "Loki News" || thread.recipient.name == "Session Updates"
-            }
-        } else {
-            profilePictureView.publicKey = thread.recipient.address.toString()
-            profilePictureView.additionalPublicKey = null
-            profilePictureView.isRSSFeed = false
-        }
         profilePictureView.glide = glide
-        profilePictureView.update()
+        profilePictureView.update(thread.recipient, thread.threadId)
         val senderDisplayName = if (thread.recipient.isLocalNumber) context.getString(R.string.note_to_self) else if (!thread.recipient.name.isNullOrEmpty()) thread.recipient.name else thread.recipient.address.toString()
         btnGroupNameDisplay.text = senderDisplayName
         timestampTextView.text = DateUtils.getBriefRelativeTimeSpanString(context, Locale.getDefault(), thread.date)
diff --git a/src/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt b/src/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt
index 362f5ff35d..de93c4b81d 100644
--- a/src/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt
+++ b/src/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt
@@ -8,6 +8,7 @@ import android.view.View
 import android.widget.ImageView
 import android.widget.RelativeLayout
 import com.bumptech.glide.load.engine.DiskCacheStrategy
+import kotlinx.android.synthetic.main.view_conversation.view.*
 import kotlinx.android.synthetic.main.view_profile_picture.view.*
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.contacts.avatars.ProfileContactPhoto
@@ -16,6 +17,7 @@ import org.thoughtcrime.securesms.loki.todo.JazzIdenticonDrawable
 import org.thoughtcrime.securesms.mms.GlideRequests
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.TextSecurePreferences
+import org.whispersystems.signalservice.loki.protocol.mentions.MentionsManager
 
 // TODO: Look into a better way of handling different sizes. Maybe an enum (with associated values) encapsulating the different modes?
 
@@ -51,6 +53,32 @@ class ProfilePictureView : RelativeLayout {
     // endregion
 
     // region Updating
+    fun update(recipient: Recipient, threadID: Long) {
+        if (recipient.isGroupRecipient) {
+            if ("Session Public Chat" == recipient.name) {
+                publicKey = ""
+                additionalPublicKey = null
+                isRSSFeed = true
+            } else {
+                val users = MentionsManager.shared.userPublicKeyCache[threadID]?.toMutableList() ?: mutableListOf()
+                users.remove(TextSecurePreferences.getLocalNumber(context))
+                val masterPublicKey = TextSecurePreferences.getMasterHexEncodedPublicKey(context)
+                if (masterPublicKey != null) {
+                    users.remove(masterPublicKey)
+                }
+                val randomUsers = users.sorted() // Sort to provide a level of stability
+                publicKey = randomUsers.getOrNull(0) ?: ""
+                additionalPublicKey = randomUsers.getOrNull(1) ?: ""
+                isRSSFeed = recipient.name == "Loki News" || recipient.name == "Session Updates"
+            }
+        } else {
+            publicKey = recipient.address.toString()
+            additionalPublicKey = null
+            isRSSFeed = false
+        }
+        update()
+    }
+
     fun update() {
         val publicKey = publicKey ?: return
         val additionalPublicKey = additionalPublicKey

From 580b8d199928347855e3c362ad6c9033ee2b7ed8 Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Mon, 7 Sep 2020 15:04:27 +1000
Subject: [PATCH 19/33] Update version number

---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 595d3c0649..dfb88a97d7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -181,8 +181,8 @@ dependencies {
     testImplementation 'org.robolectric:shadows-multidex:4.2'
 }
 
-def canonicalVersionCode = 87
-def canonicalVersionName = "1.5.1.2"
+def canonicalVersionCode = 91
+def canonicalVersionName = "1.5.1.6"
 
 def postFixSize = 10
 def abiPostFix = ['armeabi-v7a' : 1,

From cf62395162a1b7a129ad5608efe90c09f9a7f4a3 Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Mon, 7 Sep 2020 17:53:00 +1000
Subject: [PATCH 20/33] Update version number

---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index dfb88a97d7..630cfcb1eb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -181,8 +181,8 @@ dependencies {
     testImplementation 'org.robolectric:shadows-multidex:4.2'
 }
 
-def canonicalVersionCode = 91
-def canonicalVersionName = "1.5.1.6"
+def canonicalVersionCode = 92
+def canonicalVersionName = "1.5.1.7"
 
 def postFixSize = 10
 def abiPostFix = ['armeabi-v7a' : 1,

From cced7d3df192625b692a7a251a204e549497a53a Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Tue, 8 Sep 2020 10:42:21 +1000
Subject: [PATCH 21/33] Fix crash the brutalist way

---
 res/layout/prompt_passphrase_activity.xml     | 86 +++++++++----------
 .../securesms/PassphrasePromptActivity.java   | 24 +++---
 2 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/res/layout/prompt_passphrase_activity.xml b/res/layout/prompt_passphrase_activity.xml
index 32e1069959..fd88069b91 100644
--- a/res/layout/prompt_passphrase_activity.xml
+++ b/res/layout/prompt_passphrase_activity.xml
@@ -90,53 +90,53 @@
                       android:paddingStart="10dp"
                       android:paddingEnd="40dp"/>
 
-            <org.thoughtcrime.securesms.components.AnimatingToggle
-                    android:id="@+id/button_toggle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignRight="@+id/passphrase_edit"
-                    android:layout_centerVertical="true"
-                    android:layout_gravity="center"
-                    android:gravity="center">
+<!--            <org.thoughtcrime.securesms.components.AnimatingToggle-->
+<!--                    android:id="@+id/button_toggle"-->
+<!--                    android:layout_width="wrap_content"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:layout_alignRight="@+id/passphrase_edit"-->
+<!--                    android:layout_centerVertical="true"-->
+<!--                    android:layout_gravity="center"-->
+<!--                    android:gravity="center">-->
 
-                <ImageButton android:id="@+id/passphrase_visibility"
-                             android:src="?ic_visibility"
-                             android:background="@drawable/touch_highlight_background"
-                             android:layout_width="wrap_content"
-                             android:layout_height="wrap_content"
-                             android:paddingStart="8dp"
-                             android:paddingEnd="8dp"
-                             android:paddingTop="3dp"
-                             android:paddingBottom="3dp"
-                             android:layout_centerVertical="true" />
+<!--                <ImageButton android:id="@+id/passphrase_visibility"-->
+<!--                             android:src="?ic_visibility"-->
+<!--                             android:background="@drawable/touch_highlight_background"-->
+<!--                             android:layout_width="wrap_content"-->
+<!--                             android:layout_height="wrap_content"-->
+<!--                             android:paddingStart="8dp"-->
+<!--                             android:paddingEnd="8dp"-->
+<!--                             android:paddingTop="3dp"-->
+<!--                             android:paddingBottom="3dp"-->
+<!--                             android:layout_centerVertical="true" />-->
 
-                <ImageButton android:id="@+id/passphrase_visibility_off"
-                             android:src="?ic_visibility_off"
-                             android:background="@drawable/touch_highlight_background"
-                             android:layout_width="wrap_content"
-                             android:layout_height="wrap_content"
-                             android:paddingStart="8dp"
-                             android:paddingEnd="8dp"
-                             android:paddingTop="3dp"
-                             android:paddingBottom="3dp"
-                             android:layout_centerVertical="true" />
+<!--                <ImageButton android:id="@+id/passphrase_visibility_off"-->
+<!--                             android:src="?ic_visibility_off"-->
+<!--                             android:background="@drawable/touch_highlight_background"-->
+<!--                             android:layout_width="wrap_content"-->
+<!--                             android:layout_height="wrap_content"-->
+<!--                             android:paddingStart="8dp"-->
+<!--                             android:paddingEnd="8dp"-->
+<!--                             android:paddingTop="3dp"-->
+<!--                             android:paddingBottom="3dp"-->
+<!--                             android:layout_centerVertical="true" />-->
 
-            </org.thoughtcrime.securesms.components.AnimatingToggle>
+<!--            </org.thoughtcrime.securesms.components.AnimatingToggle>-->
 
-            <ImageButton android:id="@+id/ok_button"
-                         android:src="?ic_arrow_forward"
-                         android:contentDescription="@string/PassphrasePromptActivity_ok_button_content_description"
-                         android:background="@null"
-                         android:text="@string/prompt_passphrase_activity__unlock"
-                         android:layout_width="wrap_content"
-                         android:layout_height="wrap_content"
-                         android:layout_alignParentEnd="true"
-                         android:layout_centerVertical="true"
-                         android:textAppearance="?android:attr/textAppearanceMedium"
-                         android:paddingStart="5dp"
-                         android:paddingTop="5dp"
-                         android:paddingEnd="10dp"
-                         android:paddingBottom="5dp"/>
+<!--            <ImageButton android:id="@+id/ok_button"-->
+<!--                         android:src="?ic_arrow_forward"-->
+<!--                         android:contentDescription="@string/PassphrasePromptActivity_ok_button_content_description"-->
+<!--                         android:background="@null"-->
+<!--                         android:text="@string/prompt_passphrase_activity__unlock"-->
+<!--                         android:layout_width="wrap_content"-->
+<!--                         android:layout_height="wrap_content"-->
+<!--                         android:layout_alignParentEnd="true"-->
+<!--                         android:layout_centerVertical="true"-->
+<!--                         android:textAppearance="?android:attr/textAppearanceMedium"-->
+<!--                         android:paddingStart="5dp"-->
+<!--                         android:paddingTop="5dp"-->
+<!--                         android:paddingEnd="10dp"-->
+<!--                         android:paddingBottom="5dp"/>-->
         </RelativeLayout>
 
     </LinearLayout>
diff --git a/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java b/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java
index 1e8f089d72..fedb1649c0 100644
--- a/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java
+++ b/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java
@@ -76,8 +76,8 @@ public class PassphrasePromptActivity extends PassphraseActivity {
   private Button                 lockScreenButton;
 
   private EditText        passphraseText;
-  private ImageButton     showButton;
-  private ImageButton     hideButton;
+//  private ImageButton     showButton;
+//  private ImageButton     hideButton;
   private AnimatingToggle visibilityToggle;
 
   private FingerprintManagerCompat fingerprintManager;
@@ -203,11 +203,11 @@ public class PassphrasePromptActivity extends PassphraseActivity {
 
   private void initializeResources() {
 
-    ImageButton okButton = findViewById(R.id.ok_button);
+//    ImageButton okButton = findViewById(R.id.ok_button);
     Toolbar     toolbar  = findViewById(R.id.toolbar);
 
-    showButton                    = findViewById(R.id.passphrase_visibility);
-    hideButton                    = findViewById(R.id.passphrase_visibility_off);
+//    showButton                    = findViewById(R.id.passphrase_visibility);
+//    hideButton                    = findViewById(R.id.passphrase_visibility_off);
     visibilityToggle              = findViewById(R.id.button_toggle);
     passphraseText                = findViewById(R.id.passphrase_edit);
     passphraseAuthContainer       = findViewById(R.id.password_auth_container);
@@ -217,17 +217,17 @@ public class PassphrasePromptActivity extends PassphraseActivity {
     fingerprintCancellationSignal = new CancellationSignal();
     fingerprintListener           = new FingerprintListener();
 
-    setSupportActionBar(toolbar);
-    getSupportActionBar().setTitle("");
+//    setSupportActionBar(toolbar);
+//    getSupportActionBar().setTitle("");
 
     SpannableString hint = new SpannableString("  " + getString(R.string.PassphrasePromptActivity_enter_passphrase));
     hint.setSpan(new RelativeSizeSpan(0.9f), 0, hint.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
     hint.setSpan(new TypefaceSpan("sans-serif"), 0, hint.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
 
     passphraseText.setHint(hint);
-    okButton.setOnClickListener(new OkButtonClickListener());
-    showButton.setOnClickListener(new ShowButtonOnClickListener());
-    hideButton.setOnClickListener(new HideButtonOnClickListener());
+//    okButton.setOnClickListener(new OkButtonClickListener());
+//    showButton.setOnClickListener(new ShowButtonOnClickListener());
+//    hideButton.setOnClickListener(new HideButtonOnClickListener());
     passphraseText.setOnEditorActionListener(new PassphraseActionListener());
     passphraseText.setImeActionLabel(getString(R.string.prompt_passphrase_activity__unlock),
                                      EditorInfo.IME_ACTION_DONE);
@@ -316,7 +316,7 @@ public class PassphrasePromptActivity extends PassphraseActivity {
   private class ShowButtonOnClickListener implements OnClickListener {
     @Override
     public void onClick(View v) {
-      visibilityToggle.display(hideButton);
+//      visibilityToggle.display(hideButton);
       setPassphraseVisibility(true);
     }
   }
@@ -324,7 +324,7 @@ public class PassphrasePromptActivity extends PassphraseActivity {
   private class HideButtonOnClickListener implements OnClickListener {
     @Override
     public void onClick(View v) {
-      visibilityToggle.display(showButton);
+//      visibilityToggle.display(showButton);
       setPassphraseVisibility(false);
     }
   }

From cc199b402257b8e10f71d581fcf5be95003a549e Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Tue, 8 Sep 2020 10:43:29 +1000
Subject: [PATCH 22/33] Update version number

---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 630cfcb1eb..8d5a6f88ab 100644
--- a/build.gradle
+++ b/build.gradle
@@ -181,8 +181,8 @@ dependencies {
     testImplementation 'org.robolectric:shadows-multidex:4.2'
 }
 
-def canonicalVersionCode = 92
-def canonicalVersionName = "1.5.1.7"
+def canonicalVersionCode = 93
+def canonicalVersionName = "1.5.2"
 
 def postFixSize = 10
 def abiPostFix = ['armeabi-v7a' : 1,

From 4ed791762558721e22574e783cd1bbb3bbdbcf75 Mon Sep 17 00:00:00 2001
From: Anton Chekulaev <metaphore@bk.ru>
Date: Tue, 8 Sep 2020 12:04:51 +1000
Subject: [PATCH 23/33] Fixed passphrase prompt activity theming attributes.

---
 AndroidManifest.xml                           |   3 +-
 res/drawable-hdpi/ic_arrow_forward_dark.png   | Bin 186 -> 0 bytes
 res/drawable-hdpi/ic_arrow_forward_light.png  | Bin 178 -> 0 bytes
 .../ic_visibility_grey600_24dp.png            | Bin 366 -> 0 bytes
 .../ic_visibility_off_grey600_24dp.png        | Bin 560 -> 0 bytes
 .../ic_visibility_off_white_24dp.png          | Bin 528 -> 0 bytes
 .../ic_visibility_white_24dp.png              | Bin 472 -> 0 bytes
 res/drawable-mdpi/ic_arrow_forward_dark.png   | Bin 203 -> 0 bytes
 res/drawable-mdpi/ic_arrow_forward_light.png  | Bin 186 -> 0 bytes
 .../ic_visibility_grey600_24dp.png            | Bin 250 -> 0 bytes
 .../ic_visibility_off_grey600_24dp.png        | Bin 387 -> 0 bytes
 .../ic_visibility_off_white_24dp.png          | Bin 356 -> 0 bytes
 .../ic_visibility_white_24dp.png              | Bin 310 -> 0 bytes
 res/drawable-xhdpi/ic_arrow_forward_dark.png  | Bin 263 -> 0 bytes
 res/drawable-xhdpi/ic_arrow_forward_light.png | Bin 239 -> 0 bytes
 .../ic_visibility_grey600_24dp.png            | Bin 458 -> 0 bytes
 .../ic_visibility_off_grey600_24dp.png        | Bin 706 -> 0 bytes
 .../ic_visibility_off_white_24dp.png          | Bin 652 -> 0 bytes
 .../ic_visibility_white_24dp.png              | Bin 581 -> 0 bytes
 res/drawable-xxhdpi/ic_arrow_forward_dark.png | Bin 261 -> 0 bytes
 .../ic_arrow_forward_light.png                | Bin 250 -> 0 bytes
 .../ic_visibility_grey600_24dp.png            | Bin 650 -> 0 bytes
 .../ic_visibility_off_grey600_24dp.png        | Bin 1019 -> 0 bytes
 .../ic_visibility_off_white_24dp.png          | Bin 919 -> 0 bytes
 .../ic_visibility_white_24dp.png              | Bin 846 -> 0 bytes
 res/drawable/ic_baseline_arrow_forward_24.xml |  10 ++
 res/drawable/ic_baseline_visibility_24.xml    |  10 ++
 .../ic_baseline_visibility_off_24.xml         |  10 ++
 res/layout/prompt_passphrase_activity.xml     |  96 +++++++++---------
 res/values/attrs.xml                          |   3 +-
 res/values/themes.xml                         |   4 +
 .../securesms/PassphrasePromptActivity.java   |  35 +++----
 32 files changed, 100 insertions(+), 71 deletions(-)
 delete mode 100644 res/drawable-hdpi/ic_arrow_forward_dark.png
 delete mode 100644 res/drawable-hdpi/ic_arrow_forward_light.png
 delete mode 100644 res/drawable-hdpi/ic_visibility_grey600_24dp.png
 delete mode 100644 res/drawable-hdpi/ic_visibility_off_grey600_24dp.png
 delete mode 100644 res/drawable-hdpi/ic_visibility_off_white_24dp.png
 delete mode 100644 res/drawable-hdpi/ic_visibility_white_24dp.png
 delete mode 100644 res/drawable-mdpi/ic_arrow_forward_dark.png
 delete mode 100644 res/drawable-mdpi/ic_arrow_forward_light.png
 delete mode 100644 res/drawable-mdpi/ic_visibility_grey600_24dp.png
 delete mode 100644 res/drawable-mdpi/ic_visibility_off_grey600_24dp.png
 delete mode 100644 res/drawable-mdpi/ic_visibility_off_white_24dp.png
 delete mode 100644 res/drawable-mdpi/ic_visibility_white_24dp.png
 delete mode 100644 res/drawable-xhdpi/ic_arrow_forward_dark.png
 delete mode 100644 res/drawable-xhdpi/ic_arrow_forward_light.png
 delete mode 100644 res/drawable-xhdpi/ic_visibility_grey600_24dp.png
 delete mode 100644 res/drawable-xhdpi/ic_visibility_off_grey600_24dp.png
 delete mode 100644 res/drawable-xhdpi/ic_visibility_off_white_24dp.png
 delete mode 100644 res/drawable-xhdpi/ic_visibility_white_24dp.png
 delete mode 100644 res/drawable-xxhdpi/ic_arrow_forward_dark.png
 delete mode 100644 res/drawable-xxhdpi/ic_arrow_forward_light.png
 delete mode 100644 res/drawable-xxhdpi/ic_visibility_grey600_24dp.png
 delete mode 100644 res/drawable-xxhdpi/ic_visibility_off_grey600_24dp.png
 delete mode 100644 res/drawable-xxhdpi/ic_visibility_off_white_24dp.png
 delete mode 100644 res/drawable-xxhdpi/ic_visibility_white_24dp.png
 create mode 100644 res/drawable/ic_baseline_arrow_forward_24.xml
 create mode 100644 res/drawable/ic_baseline_visibility_24.xml
 create mode 100644 res/drawable/ic_baseline_visibility_off_24.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a65c1bdfb0..166b896dc6 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -342,7 +342,8 @@
         <activity
             android:name="org.thoughtcrime.securesms.PassphrasePromptActivity"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-            android:launchMode="singleTask" />
+            android:launchMode="singleTask"
+            android:theme="@style/Theme.Session.DayNight.NoActionBar"/>
         <activity
             android:name="org.thoughtcrime.securesms.NewConversationActivity"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
diff --git a/res/drawable-hdpi/ic_arrow_forward_dark.png b/res/drawable-hdpi/ic_arrow_forward_dark.png
deleted file mode 100644
index 03568e6a0806b78220c61a0e67377fc103698882..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 186
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0DMo$;VkP61PS8TbM90gnw`=9uy
zEV<{Ip*E54`0iB-8Gp=P6&!Trj#=@Z;j0u|T58(jjFzH*Tn?+AH4Du;FiToheD;lk
z|C3vUZ~F`T*<9(oThNr>V#TnMuOwGtYyX{k`~A;X?)i7%^k-v>syZ?CuYamLKewv=
k7U4?2`L*@*k3BPer^#9*R<x=z0Ug8O>FVdQ&MBb@05S$i9smFU

diff --git a/res/drawable-hdpi/ic_arrow_forward_light.png b/res/drawable-hdpi/ic_arrow_forward_light.png
deleted file mode 100644
index b55688a81f332c2ac5ae8324fbc843cbc5132659..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 178
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0DN>3NZkcwMxuNZPQ7znsrv~1^U
zk~<=LM{Rk~MYZMEoP1IROC}uH^Y*(w3zOhUvqKId0_O`SNIWuS>*D%6_d}BKRw1t`
z(<5$ls@V(1_iSX!oFmI|r=eKh@<Fj~*t4&)W^3y&W&iDe{hjH$y7KE_kG2xq(=6>B
bDOL=3E&CT$o~W<|I)cH|)z4*}Q$iB}3N=9>

diff --git a/res/drawable-hdpi/ic_visibility_grey600_24dp.png b/res/drawable-hdpi/ic_visibility_grey600_24dp.png
deleted file mode 100644
index 619b076ea4aa5adfc3dc262972a4c3e7af8d3afc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 366
zcmV-!0g?WRP)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0003sNkl<ZcmeHI
zHDUrm6pg#Pdvb-P<{H#Ux$@sEB^O{zYU)S_Egct#RPm&W=K@ju&&Knc$e(89eV3{G
zr{71aJH9{$8Sw?x{Urfby9!Yndw8f>dz4lotNp`5Fa{4-cz9)9!Nb_QLK016;|34!
ztQ)cuO>c;ChLH2IY`}v@8$R(lXXq6%_6iOe^jyUv&E?lfvx?!Iy&u{uFXd+nrwq2^
z%=#>z#SX)qswoXZo!DZK3wNgUV!(n$M)Bm%;DX_{sFMjoibsH=1-4$5Dc`7!+glJE
z<w&Gz?Fr(ZJ>C{$gDktv7Gs55c6(33s-V1P&srgB0X^+1P(ZI~=zP^4ogrDcxAl9n
z3ks6H`=FR0QP%{5EtGz-f)r{Ip{5lYBSM2sWYmfbe}V7lx6wa60!S2;i(vnJYXATM
M07*qoM6N<$f*hZpHUIzs

diff --git a/res/drawable-hdpi/ic_visibility_off_grey600_24dp.png b/res/drawable-hdpi/ic_visibility_off_grey600_24dp.png
deleted file mode 100644
index e6bddf2ef74062c9f17cdc2bc520de3371b9705a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 560
zcmV-00?+-4P)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0005^Nkl<ZcmeIy
zHGJJb3<mI5W@cuFskoIH=X5Qztxrz2xBo&*8K*MCm`vqPWoBk(u0oc44sWe)dy@b5
z`+Vob|0;b2{nA=g1~ULpakdgD<lq;6MX6+MuY*6BhNgDq2Bm`1THvgvXgb#527ZOs
zb=u4+%j=YpqM7)DUyk(xnP^=$YPyS(^@_Y?_2MJ{p{S{Nid~$6OxlfC2FvxE$1q+`
z+>{Y#>~m`HJUms@Ew878;r4hWZAIzwJK=(wxyS9z$l`|i`8cR#O<q7l^Z$HDJX160
zsGfp&y+K}wDNMj8J`^;P+~%6el_7>k;b*u>@2CsTS_+5rvchWx{iIQa5Kfu99Efg)
zU_3tZFuCncJxxdR86F);CtLWX_+_a1GM{1R^Ph=E*#>9G?_MPKx-rn0f{c!u#!k6l
zn0qr|kAY6dhK<*AYRDyr9aI%O)nW6<@MmPDd8WCNN+UiLrD(D`gBudzqIx)|sAoaP
z{LWA;$5Nb)q0T1jM~}!oMP2Ya*)M~o_#t(1AKF`rddl-8D=F%NSDNB0=$3Go-yFG-
zFVAjdA{+bZoy{u#izH3*<j(G;sgeq<k%<=-r=*tG;S}18>*njTm1d!vj=hw{4N|+(
yP#R7H7dLdj!3tI7Q&0WA6@-M!2?iwoh58MBOQggVNiGKf0000<MNUMnLSTZsq7T~u

diff --git a/res/drawable-hdpi/ic_visibility_off_white_24dp.png b/res/drawable-hdpi/ic_visibility_off_white_24dp.png
deleted file mode 100644
index e03a5d234914977992ff3441c607678fc7eeca3e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 528
zcmV+r0`L8aP)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0005kNkl<Zcmd_s
zGn`ye6oBy)+qSJXw%x|6WA(qNPRiI$9Xm~&%zB$x8{7G!TikPg_r2YnnQp$*4gSv%
z(li+Xb*ElBpkBP-7WGnxP6Gs}dh}ud{pd;Ul0o&jZK$an;xT>?Ilv66$3sGW5{jD4
zH$r`215M%}p+N~L_{d7iMMFYQeky7b5820R*0P`H=q}JW3hKr~fQa2*fjK<G?=Brf
zP)CaJyN#uUrexvwh}IUWMIk_ts?0+Ax!*N2i_4~(hW4U+si<*$;e<Pr=Aql{Lu1fA
zrzr_6b=>VMyW0ohpfV)T?MG-3p!y;R2hm-@L1VG4K@e7gqv|_q0fMj&+pz!8Xl!c{
zgcV?@$`R0T+@{?OY?{yyH09=S)TRl;u{*m0f^a-QmEjq>f&Ss&fo=|hP@7``YNEOZ
zHz7V$gFO76(bRp@hh;1!p{PlYf`mOGg?2o_FN<dC&Y&oFXLv}<&_&ys`}h?xj|zyJ
z7Q8l8A?>4XBTczvcRL4J$2yMi1{VoOm5+NIm1iX%iB3}%GSigxye};!gr_>w*=P3I
zL-sSBcI1R8A%1Gnoxb#^hxa&YNVcL<cw{Ro6-a167Enajlpsf)rbkA+AN>YLWU`s@
S+q;nf0000<MNUMnLSTY<GxIqB

diff --git a/res/drawable-hdpi/ic_visibility_white_24dp.png b/res/drawable-hdpi/ic_visibility_white_24dp.png
deleted file mode 100644
index d531d666fc23732a3d75f62411e6009bbd80e44a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 472
zcmV;}0Vn>6P)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0004>Nkl<ZcmeIx
z1L$2*9KiA46rNw0ZReiCyk&D%=8Rmk6=!cZ*A(Y4{=KEycK)tT_x8^3+~+ua^6?Kx
z{yzVaW;_K7j3+IPAi-QbUSfN}S>_U#TG5w%{Ggog?4^%XLs!=Fi)wzdny!`Kaue+n
z9$Q(@Y2Kk-r&qaS#_$~5TNcwzd~{<zZ?HXOq=YfdS=LH_anPF<Y_Av`uF^wnZ-ZmV
zv6K}Q#Gnsvv2_p=8^_TWo6!^(2wWm%#ulO-wvU+>O0mfe7qDIQbM+2wa&Sy1?xT5r
zP_CRAKZ|xJIA{j0t!8{Fu4QI?1Fq@i4q9)<SClzuBd%#dX!p=goACm!tQq&vZcBhE
zXz%=FU&40YPxgDXiBiN7wE2GdFBXp>X~q_#9S|FFI<UQ=w;1GD#xk<OZ*+>^MpQJ0
z@CsWCeZrrbHf%2#C}E7`DYmyPRG)US^P0yDm(u9X^-$W+vVo0wyhpo24=InXtmFsP
zd}ldbq#Am&i*J<kjh*zAS`lLwr<|NU;S{roNh3%ymOOdJkdXiWI==xr9J3-CL_xX$
O0000<MNUMnLSTZF8rTW|

diff --git a/res/drawable-mdpi/ic_arrow_forward_dark.png b/res/drawable-mdpi/ic_arrow_forward_dark.png
deleted file mode 100644
index 92b6aebecae976633f4b41b9a263375ab39bef39..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 203
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UlRRA<Ln>~)z2eB#<RH@iQE*qE
z!WFeciq0=snyz=f61Z7-tE!dD>u%jghw1x{_B6BnyZ7t=*}OAK7C}MtE8V=^-^p1h
z+P#Tk7EE_JebBaWrryM}vvz#z+?&5BP$)-piuOvue6!@nuEuo-*|?58IVD@UqF7e@
zU5EJV$Y)pW&*vY$^W6DoQm?eoyidFCFV8xwv_<~eX^pQ%GdykqUB}?*>gTe~DWM4f
D_WoAM

diff --git a/res/drawable-mdpi/ic_arrow_forward_light.png b/res/drawable-mdpi/ic_arrow_forward_light.png
deleted file mode 100644
index 1df381e4b51a36410d90b8996cfe36156d1028a2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 186
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4Ujh-%!Ar*|t3v4A=yBs_i1JW{B
zokBnHen@`7bSRCDwTL$%g@Zx*;;98j8a)AW0m@7(Q(d_2l%Gg``QX6ZR<uE|m&a%a
zPY0uyFmtrTl#G-HmS!!v6~_WtuKTeiBz3g59%#tumppZA@xxmund&}tC<}WSnl$7t
iXV75EU2ZDD%HSDkznNj#A4i~L7(8A5T-G@yGywoE6FR>D

diff --git a/res/drawable-mdpi/ic_visibility_grey600_24dp.png b/res/drawable-mdpi/ic_visibility_grey600_24dp.png
deleted file mode 100644
index 9d554fe3de950c6e216efd0135cd02929f464ae9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 250
zcmV<W00sYvP)<h;3K|Lk000e1NJLTq000;O000;W1ONa4N`Cco0002NNkl<ZcmZP=
zj-Y|1*tjgQtP}_ni;Wvt@G34<E}2~VzVts5d=C^+#;Q1twY0VLCqgL#0!3TXSkaUh
z2$UXxE7(-#Si)VxUFKN22`+Y^Kmgg@T%{*qQYF>M29;F9wVY_+f(w_;L6{EI&Q{u4
z`V<H|8`u~a5Vn-fftlijaBrC-P)R$S-wrg)5g}XR1PPl%NE&#7N}j=a&wxB$B<~+0
zSp&&VBGJ<%2P=sYM_$q(ocKy7l`4~#yoVtG0Q(3oFoJWRM*si-07*qoM6N<$g3+5^
Au>b%7

diff --git a/res/drawable-mdpi/ic_visibility_off_grey600_24dp.png b/res/drawable-mdpi/ic_visibility_off_grey600_24dp.png
deleted file mode 100644
index 08dcac59fa2be04157001d75797c630e7d7185b2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 387
zcmV-}0et?6P)<h;3K|Lk000e1NJLTq000;O000;W1ONa4N`Cco0003>Nkl<Zcmd6l
zC0GPO7={;j>+yQpic7^wxK?E68{FNk;81Ye=i(Mz`a@4>x`w2)m6^pIzDd8lGrx@R
zPeqd;w*-CwfDAhn6>0I5MC4J4f)+|*i}$lYOCS^-!6fY5v5|3DUPa1$$U5w%^MKAW
zpGQDV1omN9krr=6ksuO8<6t$Q-HLGY{ikX`MOcK?8~#(yPZkXKor+|6VF<k~zJkDB
zp)+i#cEgzp#Xy$O?Tp5;D2Z3^KVYuvu$DmF>j)im0wFAleK&x8?u8I%$|dYNVg|^8
z`a(Ph#5phM=G&K|xoCpk#f;&!I%npKUR<!ku%^Z4pB*cyXRG88b*xMk;n-!b&^QuQ
z9Y#{vkZFs$I8J3g=)?o;{NZ|eUa*jH*i6YcIAh4OYVnptT1Y{vNRA}7cyd4az0wew
hdESG_G)ed+IRFE6J(Qz|H>dyr002ovPDHLkV1gSguPFck

diff --git a/res/drawable-mdpi/ic_visibility_off_white_24dp.png b/res/drawable-mdpi/ic_visibility_off_white_24dp.png
deleted file mode 100644
index fb21efe6d9e33ca059a00d2924f9c04ecffd7f35..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 356
zcmV-q0h|7bP)<h;3K|Lk000e1NJLTq000;O000;W1ONa4N`Cco0003iNkl<ZcmciC
z#eo(<5P;EM-}x7Z6gCCiU86t)z}?}BySv*7cb6k!ASav$3)6+We06>^-93{0;`}c#
z$T7vQfa5q-l6pN&Fv|?%bXWIvP&gZ83q+5s)BLqPRGcYEtwTQTg(d1f2c6sirxogS
z)u2%?hvhD5_c3Vg9t24-ljLqF0@x$>v?R4QTA@L5RBlrS!$k%=6J(#|lHMZy-h<mB
z4GJ%C<{eolsfb*94{nGwN*+^^8cEZaV6aFp$x4EJx}?5&)7#|^OB$^3$g`5v#o=z2
zGH4R}FiC#;XFeg<6#^t3T$MYjw~C5U;x6WE`}yl#Z>bl))>(zGe-E0i^$4Pe?gt6*
z>D20KjOk_=ql;P<XM_CQ7gv%K0e*^{(Eoq^1l|D3Wcn-ee(`(&0000<MNUMnLSTX>
Cgq$w`

diff --git a/res/drawable-mdpi/ic_visibility_white_24dp.png b/res/drawable-mdpi/ic_visibility_white_24dp.png
deleted file mode 100644
index 0e8e507f213398e3d59540a950821f0f513aef84..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 310
zcmV-60m=S}P)<h;3K|Lk000e1NJLTq000;O000;W1ONa4N`Cco0002}Nkl<Zcmdtg
zwOy=16hQHLhC3bL9pJ8gU@>kn?(Pl|P6g=0DP=7~4;Q(=^(|okpPrFyOfVvZT<YnP
zt4{v@1zw!N5_VkKStQ-};!p;8#g`Wb2=QE=$Te!0Ji_G4XCHM*f^i~>M^vM6K?~}R
zNTb+B?Mj6)g9AHLgi0Nv)^&LmPI=NZs7a{;oXX56u5k*JcA#uh5jg$#y}^#M`rc51
zQ@->RYD}sSr&9Bc4b;9=D3jQ*GDe8hF>1vqBDq7g7#Fmou8A;CByfp3q<{#y3OPod
z66byB`gp;YXL|5`2uWoQ8?LO(kZc0sFIm*kDOZjB{WU@81L^a(3*?i%`Tzg`07*qo
IM6N<$f{NvaivR!s

diff --git a/res/drawable-xhdpi/ic_arrow_forward_dark.png b/res/drawable-xhdpi/ic_arrow_forward_dark.png
deleted file mode 100644
index 70057432f3099e57d750713d145d0fdc5b48831e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 263
zcmV+i0r>ujP)<h;3K|Lk000e1NJLTq002M$002M;1ONa40ARUQ0002aNkl<Zc-rll
zI|{-;6h#9Tnh)Y<Ggj`xCAko_v#?Y#iHe1VzZHqcM#x}0GB22WW&!8S<H5j0LI@%J
zAS1QZ54drrYp1^h7$q>|0brKE6qjT0U7*DRz@35;l+fsexe}D{Nth|&KN1*|dz}L>
zug97RKckw0SwNLw8*rr`IKX2I7_sy^E1tMq=tbe6%^H^jsq}%M^QGTg>yt+5H+9mN
z(%b2ahUvF;(&r?WUo<DOC@dtD&h6tUJR}rW`YIu3M{NC7D})fji#HdPDp`Sxovr`?
N002ovPDHLkV1k|)ZEpYo

diff --git a/res/drawable-xhdpi/ic_arrow_forward_light.png b/res/drawable-xhdpi/ic_arrow_forward_light.png
deleted file mode 100644
index ad50cf2741292a8c589ab5b4e76d2e413e9968da..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 239
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I0wfs{c7_7UZJsWUAr*{oXB^}_<RHSzZrHt%
zgI_E`wrm0W#|3JEM{cy`UFC}VQ}Jhm{S5Q<4Krhz8eKUQTPA;rQz))lcjnQTa-*9n
zEH4fVU3;>AuBS-ap>N9O+ZV8?YB+Lw-OzaGFEq_$U8zm2{cF*i`|n40a2RlIWV9`P
z$#6V;L&Ec0^V%=oU!i$oO7q2Xm6z_T*SjsX=kvVp70>n3-}#bx$V7h=aiP|g8OeV6
nLQY@Q7Jhu)JU^>dz-bS|<yrq1PY^jaALJ2FS3j3^P6<r_SW;h>

diff --git a/res/drawable-xhdpi/ic_visibility_grey600_24dp.png b/res/drawable-xhdpi/ic_visibility_grey600_24dp.png
deleted file mode 100644
index b121c9ae2967d12a6f905c37e49ec1abd2ea1e34..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 458
zcmV;*0X6=KP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0004zNkl<ZcmeHJ
zB|tP`5dGa1;x*jsHC%hz?eYA+x029)y(cuH1$S$>J0#ql^BWvKY~QqzH!EZBG-%N9
zEFk~2=SW4ULLa8Fc`DQBLzPry&yoM$liK)|iBba&a7+shqy{D$zut*F@0V1Bl>kag
zR-~f5U$<j_4?&uz>1a9i7T&$TA-fukIvn3Y>eS#H(6a=L5y87CfnbkfKiN-v6a<uD
zm+%^63D?o5v-QA0R<4Bkdn#e9obX&{=~vO~u}M@4F7uZ_RM;ldUsmt&SSEfSP47+-
z7=dLuo^Z8(#~|Tc;V#=R%!D><oJt!r<$ZbQ1S*KALF@OxXK@gYdkA%=*P+kH(r48<
z6NF-qcyEUvJ(6%lBq(urbbr9_?00oAN{GlKB>5)jq$-<<POFi!!ssjwk+gPt(`VAH
zV~cRw+emxch1C{8M<dgdppkZwemm`Jq<zi#_kPpSXylQA!zbeKlR1<rheqQtDjt2<
zaTwPe77mA%$zkbpI9u+1c=10Sc^tnQG-%*}6Mz?b4T?vbI{*Lx07*qoM6N<$g1vas
AbN~PV

diff --git a/res/drawable-xhdpi/ic_visibility_off_grey600_24dp.png b/res/drawable-xhdpi/ic_visibility_off_grey600_24dp.png
deleted file mode 100644
index a666da5cd6428b31ce07650c1b9eb93f73e5d3da..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 706
zcmV;z0zLhSP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0007sNkl<ZcmeH}
z1F#)U5QXQDZKoL9wq1&yGM~3k@4cn47&~PnEXKBT-z&w=AKRX29;bKr*{92MX1>Mg
znpUMMRc<Q2DGsA$ULJo98V~Xefy2<yd5AzuJdhDiJ)VqZ*v(h*65sFv_YlEuUgC^(
zYvuw1Yw#T!a((BcG&8zlju1{gM4)}^882B-EeD8jUA`26(EJcH)PLDV#Mi+^=)l?^
zuB(ET&=rrMGa^E@X+6*4)>M_MI&ClmTku6d+@wy*UpyRdjX5B+p%%2=M$kJNp}a-I
zgy)hFMhqcgAE>wTdM3QG?12cu|J3a$S*z1^%W5IqnmB;d6tkd$GQtkQe<i-M1;7Tu
z_yhk7h*Qvr#5Xnjn&Ybw+m#uQAB>*@V6PNfw<ev0ro`k9#uj1cPYhOR^dFMM_L--Y
zHv-Wn8Z)7VI+r#*<DsQ;JDb*flMxYJ11E6WbWSU1u|}l=jzb32RDXrn&;nw2ay%dd
zj->!_Otx@!v;I~}6j%2L(D78jDA|(G%B-LE>kDoTE!G5;Dx4FaVWwG)_G>+!Cmx@q
z{tJ%j7W2I;Qld8k8^xIR&)CT;1>09NPZ<d!UWm9_IB)ITWKR{9aYaDvP(}+XPz+Av
zJznE&AmU1N4Q0#ih^Io55O5{gh}WSON*49T2jODR8sZ}jQ{JKx^iD|A_D~B8@xO?8
zOGA{us1t752z<d7%y8OJRkx<w8FR58Kg8eNO$94l7yF^JQdyq{|HBM^n70VEpc*g1
zvphtY4xY(JeMZM0e3TNb-<?&tHJ!1%1iKNzJ$%4dyyUCAi&tV2H8A(VgFK(iiy7ju
oQhABEW(Jx(LL4^7m#Pry7yD_Fl9c5L{r~^~07*qoM6N<$g3oq9YybcN

diff --git a/res/drawable-xhdpi/ic_visibility_off_white_24dp.png b/res/drawable-xhdpi/ic_visibility_off_white_24dp.png
deleted file mode 100644
index 03d0e65b1891adc28c667e903911272a5fda39df..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 652
zcmV;70(1R|P)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+00070Nkl<ZcmeI#
zGn`ye07mf_+qP{dUF;@S9kZ`vvy7c8ZEV}N&B2aNbbqV+<<5(F25<adU986sKK*0B
zf1oTosQKf7vRnf0QS(OuI{*yvLx7sx*94^*!aTNfowp>2@`@{LVKxIP;S(^YT9Q~q
z0v#mS$4CnJ0u1rMB8qSfcQ2VjVSj)}ZAly@S<e_o77f_MeFu?nAX_Qz2WZ1Xu!zFU
zr8nisLJlg@o0WvIdq~S<Ku<yd7Ga;tu>rdPU0pyoQUEj|PNRvFxiB5k08I&?auas1
zsIPz`+yqEM6k-oYnLsW)b5cL3D-^JSwb(_(UsPd^0H-Nu?w2P8yCs={Zm8B$lY5%r
z6gkcPRjAsL29S;OsQThLi1FrLUsNZ^k_HSxSJ6y^0ZAM&w=1LTmj)a`m(6@c1O&0$
z+{%USKpJomT@LdRVf`0njycdBP6PToe?%TfK@z@yL|Hh6s<-)w3E&_GqB>31G{B<+
zs+Flf<<kygA*%M72ih|1!l}cl9H%}@6c+2nQhOv9;3{_O@ysa~<2gc*Ag_}WS14!$
z9u0Vf-DvZy-X5rhRZVv0)KM%WaY58_5Fy&T7M!jGu-ia+i+CuB0G*R9nJsyMT?(t{
zOJ#DAgQ^T>BQdauqBQlh`7O;>d?g5<yX!0r<Jos0G+<7JnZ%24Cp=uI{0wI=33L!=
zH{->6ApqB@I0Kl;W-jrP2ytF>mCekiAI0(XlH?z7pXAW{5r7_g2KfHOj_(MF&HqKp
m{3yVqHajT&yZxX1A9x37W9dUQW?0Dp0000<MNUMnLSTZYPa8J?

diff --git a/res/drawable-xhdpi/ic_visibility_white_24dp.png b/res/drawable-xhdpi/ic_visibility_white_24dp.png
deleted file mode 100644
index a42cab7109d1bdab2bc49420f53915abd663bd56..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 581
zcmV-L0=oT)P)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0006ENkl<ZcmeI!
zGniaa7{>8$8QV_E*s5Yz>)kfC`YLw%C${_8ww*HOdhpErqqDl_8^@Vn`yS(-D{*mg
ze*~J6$6Ai^gnYbs$>#}2SxX*GBsSD#1{d%Xh@bOJr;bE}hAbzaaC~AZ^(7J{FpZBy
z;saAiknqrw<3!^a%_TGj@*10qEu_<y6jEqQI@@qzdqsZ<j&YP?+eJ%ppcQ+ul`uM3
z^P_R&<YTG?zzlpixfm`wx>1P5YTns}EuSv>nSX|Dml#xMKG$&J;wp2gCWg9DPn5gC
zHf%1;+S7)+RCb$ICTWcu+eT;eBhYLqAN^gNZjoxz?P!Kb1roW9Cf(%o(abSvCYl>m
zTs(5nwKe%QG*?X89$l7{;Uc;ele^HAn6w(Y3%{^~?BGkpRWz4P+5uf=<*(<hpqo4w
z%`B5<p}9_iRA3mIZRLw_+dd`b$8;x}!BQ2QvAN2xQ!8#cnm1RFwz#pa7boiQ6x$v#
zsKy+wP(lfpnMJA?9KiO7+G3+C`PgPi5X{E*iB6(pI4+!gfxBQ1KAcJz68uFd#<rK%
z;y_z<af%or!O@SG*xYO<llD}j8Xd@DCvI#n=q;hqoTEhJFipe%ZJEq_BJqw15*g~V
zn2&_x0}H7q(V#X{IE$Y^e4Jr2wInt)CWloV<`JLp;NcUGIK(QlX(WGwxVX5_?$uY2
Tfba~h00000NkvXXu0mjf$wLkq

diff --git a/res/drawable-xxhdpi/ic_arrow_forward_dark.png b/res/drawable-xxhdpi/ic_arrow_forward_dark.png
deleted file mode 100644
index 67c757ae26b6ab2daf7b74382023274c27f813cc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 261
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcg&Um^whEy=Vy=I+v$U(yO;mbuT
zL1CQP5`iD5yB)~8^l?FQbo;TAbrW=6M?H@|Xj_-DEK_chisz&o7o+v~7(z}T5mYd1
z6n4mAN^iKqV&?PGk}>`dGs}L~eLH6)G;wBo?pUV&XN}^+v?flqHL4H!fMRMNJp6y0
z^)NWdGVRi3<^`9ah|ONH{*iy^H%GHAEPp<xcv;^6d9Hll=eh4|o>xCFgfOh@1#^o1
y?+V&}d%1t(`MLIs)SkJkg`9RhYZ?!7Q`|v`rG|D1Jgb2IV(@hJb6Mw<&;$Tg8*OL+

diff --git a/res/drawable-xxhdpi/ic_arrow_forward_light.png b/res/drawable-xxhdpi/ic_arrow_forward_light.png
deleted file mode 100644
index 44956477ad76a3765b842cb7142afcad5caf760d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 250
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcg4tlychEy=Vy|z*Ckb!{9Mc#&m
zN*=BSoeMab3LMnKO&ghoHJ-R_p7;OCfx2WjF`y0xk)10~MucmL8kL4?)e6g<nlF6s
z^IIXkQwK9Q6<#QwA+V|NO13_y$^?f)vs?ZvHnIqLM0}g*z{IIC$3x+uilX}5XOaOQ
zw3k#n?NUF(`(lsNpHA&((lIHqV&{JGJZJwr^L))S<M}_&q}$!M0TN*T`NGnDrQv74
qzRW*V`A=)l^L$Rl<Umt-kZbm7e6fpNQ_?#F#PM|Xb6Mw<&;$TmXkz04

diff --git a/res/drawable-xxhdpi/ic_visibility_grey600_24dp.png b/res/drawable-xxhdpi/ic_visibility_grey600_24dp.png
deleted file mode 100644
index 503497dda83eac7ca38f4146b7d4724be30419ba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 650
zcmV;50(Jd~P)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0006}Nkl<ZcmeE|
zC43!05QpcXE0ao8V#~~E;}TU+W$w*?4%DimiVXXbS7p#;W^iT3YhCuyP8jbS`^_xx
zZzy31k&uv(kdP2ez)Y!=Eqp+H@%eykkvhx_CeQ$r@@EKe8qW|{h-Wx0@Mlnp`WtVa
zG|FqlT?=_Fjov)!A5300;X2|T#C6$Z@_jp*tZcz6#Jz}Dvc+VnZ;*AkgSZdkj;y2J
zvVS5v@E36(#b0#npV*tdS%_zd`#7G-!k$iN2YxEWfAd8!FXE{tZ}L2q7lHXAek)l&
zvAqX>4UQ>gzw%L@N@d`wd=y`m>|@>fqv|v0a2Mngel<DptNDa7rH=Ycmv@KTou&RD
zqLf|*5&k$A)!xNj!Xfud;Rfm=+@QSBL!=|yl&y}a8z6F5lWp2`=HiF5#L41qmUYsM
zJNW!R?nraV*O$UcXT2XXmnyS+EFL=3za6NuebnM?iE|dUwsW8g-<&lc?jBotf0~u!
zI%3=2a=a~Tz4eyc9*!u-)=cHWGUW>Xj;2}7Sq<J*G~Wd^on|ym`6~Zn8I@wvT64h{
zZ69Zy_F3EIi&}$X(xu0>L2b7@%U+|}Yb@JS?F}Uz4<2ht{$gu?S~MFi*1x@2wI7>o
z@fQ|r5l*otbVv2?blTw*y?W7ii>rEy-G<_$>VLG`U%fi64!H>p?IZiwo}Ci_0Du4p
z?BALiH$Vk{<dT{zd#f=5qXQkT{`$c!Xy6J9F8SaYBpr&tDGkU5K*wOhic)%*^rW;f
kFV2D20`Pp9nVA`Y0BbGxT)G+GVE_OC07*qoM6N<$f*(LP5C8xG

diff --git a/res/drawable-xxhdpi/ic_visibility_off_grey600_24dp.png b/res/drawable-xxhdpi/ic_visibility_off_grey600_24dp.png
deleted file mode 100644
index 63914559f44514579fba8eea8a2e3502a9282d60..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1019
zcmV<X0|fkuP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj000BRNkl<ZcmeI#
z1C(S(6b9gG#<p$SPL5*R$(rxo|2Cqx2eA)h8^=a$bIq|mYqMH)Uo{u+ucMjSy8Ugr
zRgfS-f&>vVB!>6-y7h=dpI|8#@OA4GXX$!F!uzW^>kEmm!vY%;ZIw8NuizmV%Lz`9
z!$bHA9G~2w>Lfar#^HU;!qNh5Ha=%0j#Hs3kT`|uSn98FBfsFDQejf!7_?%kRr{Oo
z^x~By9fcMwwQLPM#EVvp<Q|D;EVXVE`I3r}_y{x=L0W=0#_w3EQ92wASXxAz&8HU$
z!bmK{(!wO?P|W79IOU$phtXDEoOY!%K=ch338V!WZm$X9#ns&nBrmM;gm$GTF({y(
zvO1%#kKir6yZwcd*q1&LNN-#p@jp86tnMU`geqw)Hj(IcpQD854P|Udif+IXW2MKG
z93CcctVl=;m&-6|?$5@2EVU=m0r(FS`Q@CWFN9Bxb>{QQ2F~bh4L7(*THW^x9HO*1
z`(UoI&a~0n76j3o!T^6|Ix3U<W9G`=ce>{)EqFqx`m)L&zCc)li{1VBI$xx&<iTof
z(z^*q<r18ehvP-@pD;;Z__$E^TTS{xX`yeV2TGnJ7WatHEhy!SG-KtzzDOH;SFC+|
z_V~mxQ|d(LD`i1?Mccb)O0_W~>$SwU%KK{E9@-@QY1(m#eK8#q)!L+Xk*m`UN)LXJ
zyLg*x|Gpbb%_RC$AAh+zey|6{wSV6$olDL>+W2oHSEp~XZXLNxY8MSO(dI&N4wb9p
zvg}PiL+X+^Qv<zXbI0)oBIoa%o1br&I<c$$>x*ozU3y5Iu-jC2yfFT@nPq(8pM)O;
z&~JGkYdA-^Iu@mO)2@kw(dCciMNwz2ixXA;@XNyg<O!w4Jr|w+NH_%bhNbX~>G?6u
z2%78cll4JgluVjITdBg~lZ6M`r`fxKFX5Ll5&h`KUszyG8gNc1^$DA{_-ZMUmf(6N
z2alOwFLXoMNE4K=gy?niLk(#aDxHK^RLK7q#W#dA>6661rIGkKnWHC!r_3Y_(v!5S
z$`d+(z7coa1Z5u{fdv9;5q$%qGiX;Y?ro0U>3k5rz#{1o7`MGDE_^y>V`(u>A{CwS
zJK_y2SwBeH(T9oa8Oe+C5HwVmB%|VdC;qN7NsfC8zrc;YKfVr6yC>02SSXN6Oek?2
z1D_jq;2eBPV{p6|HXW4}NOA`p&sXpeayY>WjK)2D6&>qsX?uECAsZ_xAib~DdPJg6
phQyRwPe>A{`lR=3#R(E5$TFX;5a+#nS_l9D002ovPDHLkV1oKH=b``r

diff --git a/res/drawable-xxhdpi/ic_visibility_off_white_24dp.png b/res/drawable-xxhdpi/ic_visibility_off_white_24dp.png
deleted file mode 100644
index f88d24ff5ff7cb6691bd23c233a2cadb03254e0b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 919
zcmV;I18Dq-P)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj000ACNkl<ZcmeI&
z1B`4*7=Y0lulE_j+P3XrZQHhO+qP}nw(V$*!Fy-JP1m66HU>%h`-4Hx)amYvRxre-
z4yuFdpgL&ifm+;b?V$r|aR)jEkJKASOd3qk%@C6Y7qpI!vPdH=W<9$&$Po^;w;io%
ze#5H;#iY(Gslh@Hbgv)u)z|K{zj<l_%99TBqoRH9Obb>E%8};qv+{b==31%&1?$$B
z#J9H9R5>VEujVA)vs`h|z>p@o)KukzvIl`GNPK3&N<lm6AW8bp{dTp85gN4`Z85vK
zM~8Inwk;pj;7mR1uugQTMxmD(<w(CucU*a(Cf7oOl$)_`mhK`AML~@*r$SP&t1hW7
zC<;0oYC>8+LprJmXjiBiX&31>%Yl~ENd=^7ec}^WTeS!2W~u%$cM3GjH&792Cf|Y=
z%_iQwf0gP3ll2X{M!Ls!%9H-EeDw39r8}!H&??e(8gIRVq}ik6QioI%EYusQ*@x0S
zBnSmbFGWASPr6rn1MMW&o<bR<)k=Q0hg|E4L0Wwy*P=ohq-&#nH`hlRW6+lJjVf8<
zGcu$vOTHf?-x@LKHQAz5X{Wf(9;8xGn|x2kpqJ!pEm@+S3~2_XJ50W3V$eqNjV@W@
zbF!rJ?y_}bP_r-PTC8M=Ybk@YMEM(au!UT^l`OFuWsvrfYhytS(&%03?uiz8sSMKN
z(!HvoCn#9TM5)@N9e;Lz6eKnKL8^%s>+9rtiF8LsmtMXQDgO-RT%j+}R6djHS7W2g
z&+dh)NuQ)1egq3?m+EFgJgd6eXa3dh1D$1){xM(fA?$Y2?JEClw>W9@A`kLUk*dr3
zH6tA>6ah83JVV;0CZr3CKT&LSrF1tNTbQ(NucZ7F#b_FwEZwh;HcIGaru7UN((zTi
z*pR5hefF@VG1@d6Yiav=(gaA7hFAL5!Xmy>MF~=cpkSCQ29{Jry`m2WjuaG`CfoUL
zU`RpHX|aX3`kxe(Hw!w;_lowdvn^y(UByX3B{R4E+@9D2zjK%U%=iDHuMAR9%?vZ2
zHSAz7hd9FicC?O#4eRBSn-nDl12r2LBLzc@6b$5SlqUrPI~zu%8wMW~Y@icxtLC8q
t3f9*daRwa}tmj6}^^aQAL3PmJ%zx{}%V?bo;luy{002ovPDHLkV1nQ#wKxC(

diff --git a/res/drawable-xxhdpi/ic_visibility_white_24dp.png b/res/drawable-xxhdpi/ic_visibility_white_24dp.png
deleted file mode 100644
index 987af79f8b6e6b922788b3179b60ffdb3c2a6cfa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 846
zcmV-U1F`&xP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0009ONkl<ZcmeI$
z1CTsN6vy#*j&nv?v2EM7Z99M4wrz!F$F`F*N->Y$Y`ItO4a50#d3$Dl)!vpwB9TZW
z68|7natIf42M;qSRUYOJF63Y;<*!8n2k`{Y(ndaQJj)XtNP)zSBbh}PUUe~(!zCV+
zaSI<4#7EpjsYHol?xK@0I=F*ki3X?h1yT5%Qza}aSV5GQQz5}|6fH!pnIj|^?xPo7
zH_vhpM^Zy+s?=~K_wpP)=z6$I{GyQQ=)PkJRgweM4C4oMlPK^PXBE1&)QEyQHlSNZ
zq4zi|(DZSKc)&fWnwljZTZt(~oQuUHE;AyH7aMn=yF+~7ZgjVZj>C;PvNmg@J)6}u
z(nB}ju!=J!gE5x6IYf)ID~-m?su2hK@FtmFXRq|(ZOpi@*je&n3A!QT;1qr#m!COF
z9E?CWUvlFFblp_Bt>eVWj<lD%E*ZmMfMaq`_K(p$n>KddMDwaRcmdr9Io2d@#Bz^Q
z`)n*{IJNJ`a&7jBry0wUPW{zbRyehf!O}>vxVQ>ijZ?o7%hyirT5Ok#i`TK0I`w<7
z{E>G2wY?TDP<PycuJqYu-(dMFT$dHo<ZDo`!m`}gp#Fv;NyqhA?saOPiRCn>_5)b1
z$+a+kgzh;XqwZyK@FKeRDUfU&%Yd<UR6Diz;%D;tiQS!=HS`)=$5E0S3(*Y|2Pg4!
zo;W9ngHh<_N<Qqu*JysAP8{sTtJ$5!?&6?<pU`~4PLdyo(v4<=WZ(=|@HKy=%2zDs
zw5;E^p!tJ?M8~c67V91Nqq|XTOf(Mpmx)JQK|h)?UN5AU7?JMw);dO<1r&JyXSNL8
z2I@pX16$B7vg0@?U;?@y7(un<Kn<h#3EdbwP8RO8uMK#C`#FYM%2K74V|aiU?JEjy
zm0&oWW}?=}p%NVBEG0^dDVMM~g-?mXC!8eFpom*(CyZ8Zrbwbh3D@&JLA=Yglt?@{
zgz0qPRR>c!NaDwSJjxbj1~##UN7z^XYLs&z=W{y`@^q>^$Zed@fs{)kkw_#GiGPki
Y0k;+P7Z|;w(*OVf07*qoM6N<$f&zJt!2kdN

diff --git a/res/drawable/ic_baseline_arrow_forward_24.xml b/res/drawable/ic_baseline_arrow_forward_24.xml
new file mode 100644
index 0000000000..702e70c537
--- /dev/null
+++ b/res/drawable/ic_baseline_arrow_forward_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,4l-1.41,1.41L16.17,11H4v2h12.17l-5.58,5.59L12,20l8,-8z"/>
+</vector>
diff --git a/res/drawable/ic_baseline_visibility_24.xml b/res/drawable/ic_baseline_visibility_24.xml
new file mode 100644
index 0000000000..a3e222a2d1
--- /dev/null
+++ b/res/drawable/ic_baseline_visibility_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>
+</vector>
diff --git a/res/drawable/ic_baseline_visibility_off_24.xml b/res/drawable/ic_baseline_visibility_off_24.xml
new file mode 100644
index 0000000000..92c48569fd
--- /dev/null
+++ b/res/drawable/ic_baseline_visibility_off_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,7c2.76,0 5,2.24 5,5 0,0.65 -0.13,1.26 -0.36,1.83l2.92,2.92c1.51,-1.26 2.7,-2.89 3.43,-4.75 -1.73,-4.39 -6,-7.5 -11,-7.5 -1.4,0 -2.74,0.25 -3.98,0.7l2.16,2.16C10.74,7.13 11.35,7 12,7zM2,4.27l2.28,2.28 0.46,0.46C3.08,8.3 1.78,10.02 1,12c1.73,4.39 6,7.5 11,7.5 1.55,0 3.03,-0.3 4.38,-0.84l0.42,0.42L19.73,22 21,20.73 3.27,3 2,4.27zM7.53,9.8l1.55,1.55c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.66 1.34,3 3,3 0.22,0 0.44,-0.03 0.65,-0.08l1.55,1.55c-0.67,0.33 -1.41,0.53 -2.2,0.53 -2.76,0 -5,-2.24 -5,-5 0,-0.79 0.2,-1.53 0.53,-2.2zM11.84,9.02l3.15,3.15 0.02,-0.16c0,-1.66 -1.34,-3 -3,-3l-0.17,0.01z"/>
+</vector>
diff --git a/res/layout/prompt_passphrase_activity.xml b/res/layout/prompt_passphrase_activity.xml
index fd88069b91..372a67663b 100644
--- a/res/layout/prompt_passphrase_activity.xml
+++ b/res/layout/prompt_passphrase_activity.xml
@@ -6,7 +6,8 @@
                 android:id="@+id/prompt_layout"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                tools:context="org.thoughtcrime.securesms.PassphrasePromptActivity">
 
     <View android:id="@+id/shim"
           android:layout_width="match_parent"
@@ -25,7 +26,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:layout_marginTop="20dp">
+            android:layout_alignParentTop="true">
 
         <ImageView
             android:layout_width="wrap_content"
@@ -78,7 +79,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginBottom="60dp"
-                        tools:visibility="gone">
+                        tools:visibility="visible">
 
             <EditText android:id="@+id/passphrase_edit"
                       android:layout_width="match_parent"
@@ -88,55 +89,56 @@
                       android:layout_marginEnd="50dp"
                       android:singleLine="true"
                       android:paddingStart="10dp"
-                      android:paddingEnd="40dp"/>
+                      android:paddingEnd="40dp"
+                      tools:text="password"/>
 
-<!--            <org.thoughtcrime.securesms.components.AnimatingToggle-->
-<!--                    android:id="@+id/button_toggle"-->
-<!--                    android:layout_width="wrap_content"-->
-<!--                    android:layout_height="wrap_content"-->
-<!--                    android:layout_alignRight="@+id/passphrase_edit"-->
-<!--                    android:layout_centerVertical="true"-->
-<!--                    android:layout_gravity="center"-->
-<!--                    android:gravity="center">-->
+            <org.thoughtcrime.securesms.components.AnimatingToggle
+                    android:id="@+id/button_toggle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignRight="@+id/passphrase_edit"
+                    android:layout_centerVertical="true"
+                    android:layout_gravity="center"
+                    android:gravity="center">
 
-<!--                <ImageButton android:id="@+id/passphrase_visibility"-->
-<!--                             android:src="?ic_visibility"-->
-<!--                             android:background="@drawable/touch_highlight_background"-->
-<!--                             android:layout_width="wrap_content"-->
-<!--                             android:layout_height="wrap_content"-->
-<!--                             android:paddingStart="8dp"-->
-<!--                             android:paddingEnd="8dp"-->
-<!--                             android:paddingTop="3dp"-->
-<!--                             android:paddingBottom="3dp"-->
-<!--                             android:layout_centerVertical="true" />-->
+                <ImageButton android:id="@+id/passphrase_visibility"
+                             android:src="?ic_visibility_on"
+                             android:background="@drawable/touch_highlight_background"
+                             android:layout_width="wrap_content"
+                             android:layout_height="wrap_content"
+                             android:paddingStart="8dp"
+                             android:paddingEnd="8dp"
+                             android:paddingTop="3dp"
+                             android:paddingBottom="3dp"
+                             android:layout_centerVertical="true" />
 
-<!--                <ImageButton android:id="@+id/passphrase_visibility_off"-->
-<!--                             android:src="?ic_visibility_off"-->
-<!--                             android:background="@drawable/touch_highlight_background"-->
-<!--                             android:layout_width="wrap_content"-->
-<!--                             android:layout_height="wrap_content"-->
-<!--                             android:paddingStart="8dp"-->
-<!--                             android:paddingEnd="8dp"-->
-<!--                             android:paddingTop="3dp"-->
-<!--                             android:paddingBottom="3dp"-->
-<!--                             android:layout_centerVertical="true" />-->
+                <ImageButton android:id="@+id/passphrase_visibility_off"
+                             android:src="?ic_visibility_off"
+                             android:background="@drawable/touch_highlight_background"
+                             android:layout_width="wrap_content"
+                             android:layout_height="wrap_content"
+                             android:paddingStart="8dp"
+                             android:paddingEnd="8dp"
+                             android:paddingTop="3dp"
+                             android:paddingBottom="3dp"
+                             android:layout_centerVertical="true" />
 
-<!--            </org.thoughtcrime.securesms.components.AnimatingToggle>-->
+            </org.thoughtcrime.securesms.components.AnimatingToggle>
 
-<!--            <ImageButton android:id="@+id/ok_button"-->
-<!--                         android:src="?ic_arrow_forward"-->
-<!--                         android:contentDescription="@string/PassphrasePromptActivity_ok_button_content_description"-->
-<!--                         android:background="@null"-->
-<!--                         android:text="@string/prompt_passphrase_activity__unlock"-->
-<!--                         android:layout_width="wrap_content"-->
-<!--                         android:layout_height="wrap_content"-->
-<!--                         android:layout_alignParentEnd="true"-->
-<!--                         android:layout_centerVertical="true"-->
-<!--                         android:textAppearance="?android:attr/textAppearanceMedium"-->
-<!--                         android:paddingStart="5dp"-->
-<!--                         android:paddingTop="5dp"-->
-<!--                         android:paddingEnd="10dp"-->
-<!--                         android:paddingBottom="5dp"/>-->
+            <ImageButton android:id="@+id/ok_button"
+                         android:src="?ic_arrow_forward"
+                         android:contentDescription="@string/PassphrasePromptActivity_ok_button_content_description"
+                         android:background="@null"
+                         android:text="@string/prompt_passphrase_activity__unlock"
+                         android:layout_width="wrap_content"
+                         android:layout_height="wrap_content"
+                         android:layout_alignParentEnd="true"
+                         android:layout_centerVertical="true"
+                         android:textAppearance="?android:attr/textAppearanceMedium"
+                         android:paddingStart="5dp"
+                         android:paddingTop="5dp"
+                         android:paddingEnd="10dp"
+                         android:paddingBottom="5dp"/>
         </RelativeLayout>
 
     </LinearLayout>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index f4239b0104..4bc4d4db39 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -26,9 +26,8 @@
     <attr name="fab_color" format="reference|color" />
     <attr name="lower_right_divet" format="reference" />
 
-    <attr name="centered_app_title_color" format="reference|color" />
     <attr name="ic_arrow_forward" format="reference" />
-    <attr name="ic_visibility" format="reference" />
+    <attr name="ic_visibility_on" format="reference" />
     <attr name="ic_visibility_off" format="reference" />
 
     <attr name="conversation_background" format="reference|color"/>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 8a8e9e240a..59c0ffd766 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -43,6 +43,10 @@
         <item name="dividerHorizontal">?dividerVertical</item>
 
         <!-- App specific attributes -->
+        <item name="ic_visibility_on">@drawable/ic_baseline_visibility_24</item>
+        <item name="ic_visibility_off">@drawable/ic_baseline_visibility_off_24</item>
+        <item name="ic_arrow_forward">@drawable/ic_baseline_arrow_forward_24</item>
+
         <item name="search_toolbar_background">@color/black</item>
         <item name="search_background">@color/black</item>
 
diff --git a/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java b/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java
index fedb1649c0..475c097647 100644
--- a/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java
+++ b/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java
@@ -23,9 +23,6 @@ import android.content.Intent;
 import android.graphics.PorterDuff;
 import android.os.Build;
 import android.os.Bundle;
-import androidx.core.hardware.fingerprint.FingerprintManagerCompat;
-import androidx.core.os.CancellationSignal;
-import androidx.appcompat.widget.Toolbar;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.SpannableString;
@@ -49,6 +46,9 @@ import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.core.hardware.fingerprint.FingerprintManagerCompat;
+import androidx.core.os.CancellationSignal;
+
 import org.thoughtcrime.securesms.animation.AnimationCompleteListener;
 import org.thoughtcrime.securesms.components.AnimatingToggle;
 import org.thoughtcrime.securesms.crypto.InvalidPassphraseException;
@@ -76,8 +76,8 @@ public class PassphrasePromptActivity extends PassphraseActivity {
   private Button                 lockScreenButton;
 
   private EditText        passphraseText;
-//  private ImageButton     showButton;
-//  private ImageButton     hideButton;
+  private ImageButton     showButton;
+  private ImageButton     hideButton;
   private AnimatingToggle visibilityToggle;
 
   private FingerprintManagerCompat fingerprintManager;
@@ -91,8 +91,6 @@ public class PassphrasePromptActivity extends PassphraseActivity {
   public void onCreate(Bundle savedInstanceState) {
     Log.i(TAG, "onCreate()");
     dynamicLanguage.onCreate(this);
-    getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
-    getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
     super.onCreate(savedInstanceState);
 
     setContentView(R.layout.prompt_passphrase_activity);
@@ -203,11 +201,10 @@ public class PassphrasePromptActivity extends PassphraseActivity {
 
   private void initializeResources() {
 
-//    ImageButton okButton = findViewById(R.id.ok_button);
-    Toolbar     toolbar  = findViewById(R.id.toolbar);
+    ImageButton okButton = findViewById(R.id.ok_button);
 
-//    showButton                    = findViewById(R.id.passphrase_visibility);
-//    hideButton                    = findViewById(R.id.passphrase_visibility_off);
+    showButton                    = findViewById(R.id.passphrase_visibility);
+    hideButton                    = findViewById(R.id.passphrase_visibility_off);
     visibilityToggle              = findViewById(R.id.button_toggle);
     passphraseText                = findViewById(R.id.passphrase_edit);
     passphraseAuthContainer       = findViewById(R.id.password_auth_container);
@@ -217,20 +214,16 @@ public class PassphrasePromptActivity extends PassphraseActivity {
     fingerprintCancellationSignal = new CancellationSignal();
     fingerprintListener           = new FingerprintListener();
 
-//    setSupportActionBar(toolbar);
-//    getSupportActionBar().setTitle("");
-
     SpannableString hint = new SpannableString("  " + getString(R.string.PassphrasePromptActivity_enter_passphrase));
     hint.setSpan(new RelativeSizeSpan(0.9f), 0, hint.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
     hint.setSpan(new TypefaceSpan("sans-serif"), 0, hint.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
 
     passphraseText.setHint(hint);
-//    okButton.setOnClickListener(new OkButtonClickListener());
-//    showButton.setOnClickListener(new ShowButtonOnClickListener());
-//    hideButton.setOnClickListener(new HideButtonOnClickListener());
+    okButton.setOnClickListener(new OkButtonClickListener());
+    showButton.setOnClickListener(new ShowButtonOnClickListener());
+    hideButton.setOnClickListener(new HideButtonOnClickListener());
     passphraseText.setOnEditorActionListener(new PassphraseActionListener());
-    passphraseText.setImeActionLabel(getString(R.string.prompt_passphrase_activity__unlock),
-                                     EditorInfo.IME_ACTION_DONE);
+    passphraseText.setImeActionLabel(getString(R.string.prompt_passphrase_activity__unlock), EditorInfo.IME_ACTION_DONE);
 
     fingerprintPrompt.setImageResource(R.drawable.ic_fingerprint_white_48dp);
     fingerprintPrompt.getBackground().setColorFilter(getResources().getColor(R.color.signal_primary), PorterDuff.Mode.SRC_IN);
@@ -316,7 +309,7 @@ public class PassphrasePromptActivity extends PassphraseActivity {
   private class ShowButtonOnClickListener implements OnClickListener {
     @Override
     public void onClick(View v) {
-//      visibilityToggle.display(hideButton);
+      visibilityToggle.display(hideButton);
       setPassphraseVisibility(true);
     }
   }
@@ -324,7 +317,7 @@ public class PassphrasePromptActivity extends PassphraseActivity {
   private class HideButtonOnClickListener implements OnClickListener {
     @Override
     public void onClick(View v) {
-//      visibilityToggle.display(showButton);
+      visibilityToggle.display(showButton);
       setPassphraseVisibility(false);
     }
   }

From 819494d1fe60cebcc893abb7df5e529aaede94cd Mon Sep 17 00:00:00 2001
From: Anton Chekulaev <metaphore@bk.ru>
Date: Tue, 8 Sep 2020 13:29:36 +1000
Subject: [PATCH 24/33] Theme attributes cleanup.

---
 res/drawable/ic_baseline_add_24.xml           | 10 +++
 res/drawable/ic_baseline_mic_24.xml           | 10 +++
 .../conversation_item_sent_document.xml       |  2 +-
 res/layout/fragment_search.xml                |  2 +-
 res/layout/invite_activity.xml                |  3 +-
 res/layout/media_keyboard.xml                 |  4 +-
 res/values-notnight-v21/themes.xml            | 44 +----------
 res/values-notnight-v23/themes.xml            |  2 +-
 res/values-v23/themes.xml                     |  2 +-
 res/values/attrs.xml                          | 73 +------------------
 res/values/styles.xml                         |  1 -
 res/values/themes.xml                         | 56 +-------------
 res/xml/recipient_preferences.xml             |  2 +-
 13 files changed, 34 insertions(+), 177 deletions(-)
 create mode 100644 res/drawable/ic_baseline_add_24.xml
 create mode 100644 res/drawable/ic_baseline_mic_24.xml

diff --git a/res/drawable/ic_baseline_add_24.xml b/res/drawable/ic_baseline_add_24.xml
new file mode 100644
index 0000000000..eb232541d8
--- /dev/null
+++ b/res/drawable/ic_baseline_add_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+</vector>
diff --git a/res/drawable/ic_baseline_mic_24.xml b/res/drawable/ic_baseline_mic_24.xml
new file mode 100644
index 0000000000..791b475704
--- /dev/null
+++ b/res/drawable/ic_baseline_mic_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,14c1.66,0 2.99,-1.34 2.99,-3L15,5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v6c0,1.66 1.34,3 3,3zM17.3,11c0,3 -2.54,5.1 -5.3,5.1S6.7,14 6.7,11L5,11c0,3.41 2.72,6.23 6,6.72L11,21h2v-3.28c3.28,-0.48 6,-3.3 6,-6.72h-1.7z"/>
+</vector>
diff --git a/res/layout/conversation_item_sent_document.xml b/res/layout/conversation_item_sent_document.xml
index ce627e27a6..2145cfdbf2 100644
--- a/res/layout/conversation_item_sent_document.xml
+++ b/res/layout/conversation_item_sent_document.xml
@@ -9,5 +9,5 @@
         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_downloadButtonTint="?android:colorControlNormal"
         tools:visibility="visible"/>
diff --git a/res/layout/fragment_search.xml b/res/layout/fragment_search.xml
index ae8401c6e8..18766af64e 100644
--- a/res/layout/fragment_search.xml
+++ b/res/layout/fragment_search.xml
@@ -9,7 +9,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:gravity="center"
-        android:background="?attr/search_background"
+        android:background="?android:windowBackground"
         android:visibility="gone" />
 
     <androidx.recyclerview.widget.RecyclerView
diff --git a/res/layout/invite_activity.xml b/res/layout/invite_activity.xml
index fccfa91128..e7f574cca3 100644
--- a/res/layout/invite_activity.xml
+++ b/res/layout/invite_activity.xml
@@ -13,8 +13,7 @@
                       android:layout_height="wrap_content"
                       android:layout_width="match_parent"
                       android:orientation="vertical"
-                      android:padding="10dp"
-                      android:background="?attr/invite_background">
+                      android:padding="10dp">
 
             <ImageView android:id="@+id/heart"
                        android:layout_width="wrap_content"
diff --git a/res/layout/media_keyboard.xml b/res/layout/media_keyboard.xml
index 8203d8f6c7..76a6281074 100644
--- a/res/layout/media_keyboard.xml
+++ b/res/layout/media_keyboard.xml
@@ -17,7 +17,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="6dp"
             android:padding="6dp"
-            android:src="@drawable/ic_search_white_24dp"
+            android:src="@drawable/ic_baseline_search_24"
             android:tint="?media_keyboard_button_color"
             android:background="?selectableItemBackgroundBorderless"
             android:visibility="invisible"
@@ -98,7 +98,7 @@
             android:tint="?media_keyboard_button_color"
             android:visibility="gone"
             android:background="?selectableItemBackground"
-            app:srcCompat="@drawable/ic_plus_24"
+            app:srcCompat="@drawable/ic_baseline_add_24"
             app:layout_constraintBottom_toBottomOf="@id/media_keyboard_tabs"
             app:layout_constraintTop_toTopOf="@id/media_keyboard_tabs"
             app:layout_constraintEnd_toStartOf="@id/media_keyboard_backspace_backup"
diff --git a/res/values-notnight-v21/themes.xml b/res/values-notnight-v21/themes.xml
index 5b2bb7ee65..3743b4fc5a 100644
--- a/res/values-notnight-v21/themes.xml
+++ b/res/values-notnight-v21/themes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
 
     <style name="Theme.Session.Light" parent="Base.Theme.Session">
         <item name="android:navigationBarColor">?android:navigationBarColor</item>
@@ -23,6 +23,8 @@
         <item name="conversation_input_background">@drawable/compose_background_light</item>
 
         <item name="quick_camera_icon">@drawable/ic_outline_photo_camera_24</item>
+
+        <item name="media_keyboard_button_color">@color/core_grey_60</item>
     </style>
 
     <style name="Theme.Session.DayNight" parent="Theme.Session.Light">
@@ -39,8 +41,6 @@
         <item name="alertDialogTheme">@style/AppCompatAlertDialogStyleLight</item>
         <item name="android:alertDialogTheme">@style/AppCompatDialogStyleLight</item>
 
-        <item name="compose_icon_tint">@color/core_grey_60</item>
-
         <item name="conversation_list_item_background">@drawable/conversation_list_item_background</item>
         <item name="conversation_list_item_contact_color">@color/core_grey_90</item>
         <item name="conversation_list_item_subject_color">@color/core_grey_60</item>
@@ -74,8 +74,6 @@
         <item name="conversation_sticker_footer_icon_color">@color/core_grey_60</item>
         <item name="conversation_sticker_author_color">@color/core_grey_95</item>
 
-        <item name="contact_list_divider">@drawable/contact_list_divider_light</item>
-
         <item name="verification_background">@color/core_grey_05</item>
 
         <item name="emoji_tab_strip_background">@color/cell_background</item>
@@ -101,21 +99,13 @@
         <item name="conversation_item_sent_text_primary_color">@color/core_grey_90</item>
         <item name="conversation_item_sent_text_secondary_color">@color/transparent_black_90</item>
         <item name="conversation_item_sent_icon_color">@color/core_grey_60</item>
-        <item name="conversation_item_sent_download_icon_color">@color/core_grey_60</item>
         <item name="conversation_item_sent_text_indicator_tab_color">#99000000</item>
         <item name="conversation_item_received_text_primary_color">@color/text</item>
         <item name="conversation_item_received_text_secondary_color">@color/text</item>
-        <item name="conversation_item_update_text_color">@color/core_grey_60</item>
-        <item name="conversation_item_last_seen_text_color">@color/core_grey_90</item>
-        <item name="conversation_item_last_seen_line_color">@color/core_grey_60</item>
-        <item name="conversation_item_date_line_color">@color/core_grey_25</item>
-        <item name="conversation_item_quote_text_color">@color/core_grey_90</item>
         <item name="conversation_item_sticky_date_background">@drawable/sticky_date_header_background_light</item>
         <item name="conversation_item_sticky_date_text_color">@color/core_grey_60</item>
         <item name="conversation_item_image_outline_color">@color/transparent_black_30</item>
 
-        <item name="quick_mic_icon">@drawable/ic_mic_grey600_24dp</item>
-
         <item name="conversation_item_sent_indicator_text_background">@drawable/conversation_item_sent_indicator_text_shape</item>
 
         <item name="dialog_info_icon">@drawable/ic_info_outline_light</item>
@@ -124,34 +114,14 @@
 
         <item name="device_link_item_card_background">@color/device_link_item_background_light</item>
 
-        <item name="mediapicker_image_outline">@drawable/mediapicker_item_border_light</item>
-
-        <item name="import_export_item_background_color">@color/import_export_item_background_light</item>
-        <item name="import_export_item_background_shadow_color">@color/import_export_item_background_shadow_light</item>
-        <item name="import_export_item_card_background">@drawable/clickable_card_light</item>
-
         <item name="linkpreview_background_color">@color/core_white</item>
         <item name="linkpreview_primary_text_color">@color/core_black</item>
         <item name="linkpreview_secondary_text_color">@color/core_grey_60</item>
         <item name="linkpreview_divider_color">@color/core_grey_25</item>
 
-        <item name="media_keyboard_button_color">@color/core_grey_60</item>
-
-        <item name="menu_new_conversation_icon">@drawable/ic_add_white_24dp</item>
-        <item name="menu_group_icon">@drawable/ic_group_white_24dp</item>
-        <item name="menu_search_icon">@drawable/ic_search_white_24dp</item>
-        <item name="menu_call_icon">@drawable/ic_call_white_24dp</item>
-        <item name="menu_unlock_icon">@drawable/ic_unlocked_white_24dp</item>
-        <item name="menu_lock_icon">@drawable/ic_lock_white_24dp</item>
-        <item name="menu_lock_icon_small">@drawable/ic_lock_white_18dp</item>
-        <item name="menu_refresh_directory">@drawable/ic_refresh_white_24dp</item>
-        <item name="menu_info_icon">@drawable/ic_info_outline_white_24dp</item>
-
         <item name="conversation_icon_attach_audio">@drawable/ic_audio_light</item>
         <item name="conversation_icon_attach_video">@drawable/ic_video_light</item>
 
-        <item name="reminder_header_background">#ff1d85d7</item>
-
         <item name="sticker_management_icon">@drawable/sticker_button_light</item>
         <item name="sticker_management_divider_color">@color/core_grey_15</item>
         <item name="sticker_management_empty_background_color">@color/core_grey_05</item>
@@ -165,17 +135,9 @@
 
         <item name="pref_icon_tint">@color/textsecure_primary_dark</item>
 
-        <item name="pref_divider">@drawable/preference_divider_light</item>
-
-        <item name="quote_missing_icon_color">@color/core_grey_60</item>
-
         <item name="group_members_dialog_icon">@drawable/ic_group_grey600_24dp</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.Fix</item>
 
-        <item name="search_toolbar_background">@color/white</item>
-        <item name="search_background">@color/white</item>
-        <item name="invite_background">@color/signal_primary</item>
-
         <item name="shared_contact_details_header_background">@color/grey_100</item>
         <item name="shared_contact_details_titlebar">@color/grey_400</item>
         <item name="shared_contact_item_button_color">@color/core_grey_02</item>
diff --git a/res/values-notnight-v23/themes.xml b/res/values-notnight-v23/themes.xml
index 69b65c8699..bc819dec94 100644
--- a/res/values-notnight-v23/themes.xml
+++ b/res/values-notnight-v23/themes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
 
     <style name="Theme.Session.DayNight" parent="Theme.Session.Light">
         <item name="android:statusBarColor">@color/transparent</item>
diff --git a/res/values-v23/themes.xml b/res/values-v23/themes.xml
index b01826f0e3..e3b453170b 100644
--- a/res/values-v23/themes.xml
+++ b/res/values-v23/themes.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
 
     <style name="Theme.Session.ForceDark" parent="Base.Theme.Session.ForceDark">
         <item name="android:windowLightStatusBar">false</item>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 4bc4d4db39..1f6b2e1635 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -19,9 +19,7 @@
     <attr name="conversation_list_toolbar_background" format="reference"/>
     <attr name="conversation_list_typing_tint" format="color"/>
 
-    <attr name="conversation_sent_card_background" format="reference|color"/>
     <attr name="conversation_group_member_name" format="reference|color"/>
-    <attr name="conversation_received_card_background" format="reference|color"/>
 
     <attr name="fab_color" format="reference|color" />
     <attr name="lower_right_divet" format="reference" />
@@ -75,9 +73,6 @@
     <attr name="quick_camera_icon" format="reference"/>
     <attr name="quick_mic_icon" format="reference"/>
 
-    <attr name="compose_icon_tint" />
-
-    <attr name="conversation_item_background" format="reference"/>
     <attr name="conversation_item_bubble_background" format="reference|color"/>
     <attr name="conversation_item_sent_text_primary_color" format="reference|color"/>
     <attr name="conversation_item_sent_text_secondary_color" format="reference|color"/>
@@ -86,12 +81,6 @@
     <attr name="conversation_item_sent_text_indicator_tab_color" format="reference|color"/>
     <attr name="conversation_item_sent_indicator_text_background" format="reference" />
     <attr name="conversation_item_sent_icon_color" format="color" />
-    <attr name="conversation_item_sent_download_icon_color" format="reference|color"/>
-    <attr name="conversation_item_update_text_color" format="reference"/>
-    <attr name="conversation_item_last_seen_text_color" format="reference"/>
-    <attr name="conversation_item_last_seen_line_color" format="reference"/>
-    <attr name="conversation_item_date_line_color" format="reference"/>
-    <attr name="conversation_item_quote_text_color" format="reference"/>
     <attr name="conversation_item_sticky_date_background" format="reference" />
     <attr name="conversation_item_sticky_date_text_color" format="color" />
     <attr name="conversation_item_image_outline_color" format="color" />
@@ -103,45 +92,21 @@
     <attr name="conversation_icon_attach_audio" format="reference"/>
     <attr name="conversation_icon_attach_video" format="reference" />
 
-    <attr name="contact_selection_push_user" format="reference|color" />
-    <attr name="contact_selection_lay_user" format="reference|color" />
-    <attr name="contact_selection_label_text" format="reference|color" />
-    <attr name="contact_selection_header_text" format="reference|color" />
-
     <attr name="device_link_item_card_background" format="reference|color" />
 
-    <attr name="mediapicker_image_outline" format="reference" />
-
-    <attr name="import_export_item_background_color" format="reference|color" />
-    <attr name="import_export_item_background_shadow_color" format="reference|color" />
-    <attr name="import_export_item_card_background" format="reference" />
-
-    <attr name="invite_background" format="color"/>
-
     <attr name="linkpreview_background_color" format="color" />
     <attr name="linkpreview_primary_text_color" format="color" />
     <attr name="linkpreview_secondary_text_color" format="color" />
     <attr name="linkpreview_divider_color" format="color" />
 
-    <attr name="reminder_header_background" format="color"/>
-
     <attr name="media_keyboard_button_color" format="color" />
 
-    <attr name="menu_new_conversation_icon" format="reference" />
-    <attr name="menu_search_icon" format="reference" />
-    <attr name="menu_call_icon" format="reference" />
     <attr name="menu_popup_expand" format="reference"/>
-    <attr name="menu_unlock_icon" format="reference" />
-    <attr name="menu_lock_icon" format="reference" />
-    <attr name="menu_lock_icon_small" format="reference" />
     <attr name="menu_trash_icon" format="reference" />
     <attr name="menu_selectall_icon" format="reference" />
-    <attr name="menu_group_icon" format="reference" />
     <attr name="menu_split_icon" format="reference" />
     <attr name="menu_accept_icon" format="reference" />
-    <attr name="menu_refresh_directory" format="reference" />
     <attr name="menu_copy_icon" format="reference" />
-    <attr name="menu_info_icon" format="reference" />
     <attr name="menu_forward_icon" format="reference" />
     <attr name="menu_save_icon" format="reference" />
     <attr name="menu_reply_icon" format="reference" />
@@ -151,40 +116,23 @@
 
     <attr name="pref_icon_tint" format="color"/>
 
-    <attr name="pref_divider" format="reference" />
-
-    <attr name="quote_missing_icon_color" format="color" />
-
     <attr name="home_gradient_start" format="color|reference" />
     <attr name="home_gradient_end" format="color|reference" />
 
     <attr name="message_received_background_color" format="color|reference" />
     <attr name="message_sent_background_color" format="color|reference" />
 
-    <declare-styleable name="CustomDefaultPreference">
-        <attr name="custom_pref_toggle" format="string"/>
-    </declare-styleable>
-
     <attr name="group_members_dialog_icon" format="reference"/>
-    <attr name="lockscreen_watermark" format="reference" />
-
-    <attr name="recipient_preference_blocked" format="color"/>
 
     <attr name="verification_background" format="color"/>
 
     <attr name="media_overview_toolbar_background" format="color"/>
-    <attr name="media_overview_toolbar_foreground" format="color"/>
     <attr name="media_overview_header_foreground" format="color"/>
-    <attr name="media_overview_document_primary" format="color"/>
-    <attr name="media_overview_document_secondary" format="color"/>
 
     <attr name="shared_contact_details_header_background" format="color"/>
     <attr name="shared_contact_details_titlebar" format="color"/>
     <attr name="shared_contact_item_button_color" format="color"/>
 
-    <attr name="search_toolbar_background" format="color"/>
-    <attr name="search_background" format="color"/>
-
     <attr name="sticker_management_icon" format="reference" />
     <attr name="sticker_management_divider_color" format="color" />
     <attr name="sticker_management_empty_background_color" format="color" />
@@ -196,15 +144,8 @@
 
     <attr name="tooltip_default_color" format="reference|color" />
 
-    <attr name="contact_list_divider" format="reference"/>
-
-    <attr name="login_top_background" format="color"/>
-    <attr name="login_floating_background" format="reference"/>
-
-    <declare-styleable name="ColorPreference">
-        <attr name="itemLayout" format="reference" />
-        <attr name="choices" format="reference" />
-        <attr name="numColumns" format="integer" />
+    <declare-styleable name="CustomDefaultPreference">
+        <attr name="custom_pref_toggle" format="string"/>
     </declare-styleable>
 
     <declare-styleable name="AvatarImageView">
@@ -269,22 +210,12 @@
         <attr name="emoji_maxLength" format="integer" />
     </declare-styleable>
 
-    <declare-styleable name="RingtonePreference">
-        <attr name="showAdd" format="boolean" />
-        <attr name="summaryHasRingtone" format="string|reference" />
-    </declare-styleable>
-
     <declare-styleable name="ColorPickerPreference">
         <attr name="currentColor" format="reference" />
-
         <attr name="colors" format="reference" />
-
         <attr name="sortColors" format="boolean|reference" />
-
         <attr name="colorDescriptions" format="reference" />
-
         <attr name="columns" format="integer|reference" />
-
         <attr name="colorSize" format="enum|reference">
             <enum name="large" value="1" />
             <enum name="small" value="2" />
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 478bdc22b4..cf8f4dbc7a 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -6,7 +6,6 @@
         <item name="android:background">?colorPrimary</item>
         <item name="elevation">1dp</item>
         <item name="titleTextStyle">@style/TextAppearance.Session.DarkActionBar.TitleTextStyle</item>
-        <item name="popupTheme">@style/Widget.Session.ActionBar</item>
     </style>
 
     <style name="Widget.Session.ActionBar.Flat">
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 59c0ffd766..1aa70bf8fe 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <resources>
 
     <!-- Session -->
@@ -47,16 +46,10 @@
         <item name="ic_visibility_off">@drawable/ic_baseline_visibility_off_24</item>
         <item name="ic_arrow_forward">@drawable/ic_baseline_arrow_forward_24</item>
 
-        <item name="search_toolbar_background">@color/black</item>
-        <item name="search_background">@color/black</item>
-
         <item name="dialog_background_color">@color/dialog_background</item>
 
         <item name="media_overview_toolbar_background">@color/transparent</item>
-        <item name="media_overview_toolbar_foreground">@color/white</item>
         <item name="media_overview_header_foreground">@color/text</item>
-        <item name="media_overview_document_primary">@color/core_grey_05</item>
-        <item name="media_overview_document_secondary">#99FFFFFF</item>
         <item name="media_keyboard_button_color">@color/core_grey_25</item>
         <item name="searchViewStyle">@style/TextSecure.BaseDarkTheme.SearchView</item>
 
@@ -91,6 +84,7 @@
         <item name="conversation_input_background">@drawable/compose_background_dark</item>
 
         <item name="quick_camera_icon">@drawable/ic_baseline_photo_camera_24</item>
+        <item name="quick_mic_icon">@drawable/ic_baseline_mic_24</item>
     </style>
 
     <!-- This should be the default theme for the application. -->
@@ -162,14 +156,7 @@
         <item name="colorPrimary">@color/action_bar_background</item>
         <item name="colorPrimaryDark">@color/action_bar_background</item>
 
-        <item name="recipient_preference_blocked">#d00000</item>
-        <item name="contact_selection_label_text">#66eeeeee</item>
-        <item name="contact_selection_push_user">#ffeeeeee</item>
-        <item name="contact_selection_lay_user">#afeeeeee</item>
-        <item name="contact_selection_header_text">#66eeeeee</item>
-
         <item name="media_overview_toolbar_background">@color/transparent</item>
-        <item name="media_overview_toolbar_foreground">@color/white</item>
         <item name="media_overview_header_foreground">@color/text</item>
 
         <item name="theme_type">dark</item>
@@ -179,8 +166,6 @@
         <item name="attachment_document_icon_small">@drawable/ic_document_small_dark</item>
         <item name="attachment_document_icon_large">@drawable/ic_document_large_dark</item>
 
-        <item name="compose_icon_tint">@color/core_grey_25</item>
-
         <item name="conversation_list_item_background">@drawable/conversation_list_item_background_dark</item>
         <item name="conversation_list_item_contact_color">#ffdddddd</item>
         <item name="conversation_list_item_subject_color">#ffdddddd</item>
@@ -198,22 +183,14 @@
         <item name="conversation_item_sent_text_primary_color">@color/core_grey_05</item>
         <item name="conversation_item_sent_text_secondary_color">@color/core_grey_25</item>
         <item name="conversation_item_sent_icon_color">@color/core_grey_25</item>
-        <item name="conversation_item_sent_download_icon_color">@color/core_white</item>
         <item name="conversation_item_sent_text_indicator_tab_color">#99ffffff</item>
         <item name="conversation_item_received_text_primary_color">@color/text</item>
         <item name="conversation_item_received_text_secondary_color">@color/text</item>
         <item name="conversation_item_sent_indicator_text_background">@drawable/conversation_item_sent_indicator_text_shape_dark</item>
-        <item name="conversation_item_update_text_color">@color/core_grey_45</item>
-        <item name="conversation_item_last_seen_text_color">@color/core_grey_25</item>
-        <item name="conversation_item_last_seen_line_color">@color/core_grey_25</item>
-        <item name="conversation_item_date_line_color">@color/core_grey_45</item>
-        <item name="conversation_item_quote_text_color">@color/core_grey_05</item>
         <item name="conversation_item_sticky_date_background">@drawable/sticky_date_header_background_dark</item>
         <item name="conversation_item_sticky_date_text_color">@color/core_grey_45</item>
         <item name="conversation_item_image_outline_color">@color/transparent_white_30</item>
 
-        <item name="contact_list_divider">@drawable/contact_list_divider_dark</item>
-
         <item name="verification_background">@color/core_grey_95</item>
 
         <item name="dialog_info_icon">@drawable/ic_info_outline_dark</item>
@@ -221,12 +198,6 @@
 
         <item name="device_link_item_card_background">@color/device_link_item_background_dark</item>
 
-        <item name="mediapicker_image_outline">@drawable/mediapicker_item_border_dark</item>
-
-        <item name="import_export_item_background_color">@color/import_export_item_background_dark</item>
-        <item name="import_export_item_background_shadow_color">@color/import_export_item_background_shadow_dark</item>
-        <item name="import_export_item_card_background">@drawable/clickable_card_dark</item>
-
         <item name="fab_color">@color/textsecure_primary_dark</item>
         <item name="lower_right_divet">@drawable/divet_lower_right_light</item>
 
@@ -273,27 +244,9 @@
         <item name="linkpreview_secondary_text_color">@color/text</item>
         <item name="linkpreview_divider_color">@color/transparent</item>
 
-<!--        <item name="quick_camera_icon">@drawable/ic_baseline_photo_camera_24</item>-->
-        <item name="quick_mic_icon">@drawable/ic_mic_white_24dp</item>
-
-        <item name="media_keyboard_button_color">@color/core_grey_25</item>
-
-        <item name="menu_new_conversation_icon">@drawable/ic_add_white_24dp</item>
-        <item name="menu_group_icon">@drawable/ic_group_white_24dp</item>
-        <item name="menu_search_icon">@drawable/ic_search_white_24dp</item>
-        <item name="menu_call_icon">@drawable/ic_call_white_24dp</item>
-        <item name="menu_unlock_icon">@drawable/ic_unlocked_white_24dp</item>
-        <item name="menu_lock_icon">@drawable/ic_lock_white_24dp</item>
-        <item name="menu_lock_icon_small">@drawable/ic_lock_white_18dp</item>
-        <item name="menu_accept_icon">@drawable/ic_check_white_24dp</item>
-        <item name="menu_refresh_directory">@drawable/ic_refresh_white_24dp</item>
-        <item name="menu_info_icon">@drawable/ic_info_outline_white_24dp</item>
-
         <item name="conversation_icon_attach_audio">@drawable/ic_audio_dark</item>
         <item name="conversation_icon_attach_video">@drawable/ic_video_dark</item>
 
-        <item name="reminder_header_background">@color/textsecure_primary_dark</item>
-
         <item name="sticker_management_icon">@drawable/sticker_button_dark</item>
         <item name="sticker_management_divider_color">@color/core_grey_75</item>
         <item name="sticker_management_empty_background_color">@color/core_grey_85</item>
@@ -307,15 +260,8 @@
 
         <item name="pref_icon_tint">#FFFFFF</item>
 
-        <item name="pref_divider">@drawable/preference_divider_dark</item>
-
-        <item name="quote_missing_icon_color">@color/core_grey_05</item>
-
         <item name="group_members_dialog_icon">@drawable/ic_group_white_24dp</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.Fix</item>
-        <item name="search_toolbar_background">@color/black</item>
-        <item name="search_background">@color/black</item>
-        <item name="invite_background">@color/black</item>
 
         <item name="shared_contact_details_header_background">@color/grey_800</item>
         <item name="shared_contact_details_titlebar">@color/grey_900</item>
diff --git a/res/xml/recipient_preferences.xml b/res/xml/recipient_preferences.xml
index 0b90fb0901..0dbeaf492f 100644
--- a/res/xml/recipient_preferences.xml
+++ b/res/xml/recipient_preferences.xml
@@ -44,7 +44,7 @@
                 android:negativeButtonText="@null"
                 android:positiveButtonText="@null"
                 android:persistent="false"
-                app:numColumns="5" />
+                app:columns="5" />
     </PreferenceCategory>
 
     <PreferenceCategory android:layout="@layout/preference_divider"/>

From be04246ba2a064da25e02debfea38b6b9d7c0d39 Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Tue, 8 Sep 2020 14:44:57 +1000
Subject: [PATCH 25/33] Add fake chat view elevation

---
 res/layout/view_fake_chat.xml                    |  1 +
 res/values-notnight-v21/styles.xml               | 10 ++++++++++
 res/values/dimens.xml                            |  2 +-
 res/values/styles.xml                            |  2 ++
 .../securesms/loki/views/FakeChatView.kt         | 16 +++++++++++++---
 5 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/res/layout/view_fake_chat.xml b/res/layout/view_fake_chat.xml
index 5680186dc2..654cbd86bf 100644
--- a/res/layout/view_fake_chat.xml
+++ b/res/layout/view_fake_chat.xml
@@ -5,6 +5,7 @@
     android:layout_height="wrap_content"
     android:paddingLeft="@dimen/very_large_spacing"
     android:paddingRight="@dimen/very_large_spacing"
+    android:paddingBottom="@dimen/medium_spacing"
     android:orientation="vertical">
 
     <TextView
diff --git a/res/values-notnight-v21/styles.xml b/res/values-notnight-v21/styles.xml
index 6bcd395e17..2cb9066705 100644
--- a/res/values-notnight-v21/styles.xml
+++ b/res/values-notnight-v21/styles.xml
@@ -11,4 +11,14 @@
         <item name="android:textColor">@android:color/white</item>
     </style>
 
+    <style name="FakeChatViewMessageBubble.Incoming">
+        <item name="android:background">@drawable/fake_chat_view_incoming_message_background</item>
+        <item name="android:elevation">4dp</item>
+    </style>
+
+    <style name="FakeChatViewMessageBubble.Outgoing">
+        <item name="android:background">@drawable/fake_chat_view_outgoing_message_background</item>
+        <item name="android:elevation">4dp</item>
+    </style>
+
 </resources>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 1c0282a999..083cdd33b8 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -29,7 +29,7 @@
     <dimen name="text_view_corner_radius">8dp</dimen>
     <dimen name="fake_chat_view_bubble_width">224dp</dimen>
     <dimen name="fake_chat_view_bubble_corner_radius">10dp</dimen>
-    <dimen name="fake_chat_view_height">234dp</dimen>
+    <dimen name="fake_chat_view_height">250dp</dimen>
     <dimen name="setting_button_height">56dp</dimen>
     <dimen name="dialog_corner_radius">12dp</dimen>
     <dimen name="dialog_button_corner_radius">4dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 478bdc22b4..10c311d33a 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -184,10 +184,12 @@
 
     <style name="FakeChatViewMessageBubble.Incoming">
         <item name="android:background">@drawable/fake_chat_view_incoming_message_background</item>
+        <item name="android:elevation">10dp</item>
     </style>
 
     <style name="FakeChatViewMessageBubble.Outgoing">
         <item name="android:background">@drawable/fake_chat_view_outgoing_message_background</item>
+        <item name="android:elevation">10dp</item>
     </style>
     <!-- Session -->
 
diff --git a/src/org/thoughtcrime/securesms/loki/views/FakeChatView.kt b/src/org/thoughtcrime/securesms/loki/views/FakeChatView.kt
index 60b0585715..017f55d353 100644
--- a/src/org/thoughtcrime/securesms/loki/views/FakeChatView.kt
+++ b/src/org/thoughtcrime/securesms/loki/views/FakeChatView.kt
@@ -1,14 +1,18 @@
 package org.thoughtcrime.securesms.loki.views
 
+import android.animation.FloatEvaluator
+import android.animation.ValueAnimator
 import android.content.Context
 import android.content.Context.LAYOUT_INFLATER_SERVICE
 import android.os.Handler
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
+import android.widget.LinearLayout
 import android.widget.ScrollView
 import kotlinx.android.synthetic.main.view_fake_chat.view.*
 import network.loki.messenger.R
+import org.thoughtcrime.securesms.loki.utilities.disableClipping
 
 class FakeChatView : ScrollView {
 
@@ -38,7 +42,8 @@ class FakeChatView : ScrollView {
 
     private fun setUpViewHierarchy() {
         val inflater = context.getSystemService(LAYOUT_INFLATER_SERVICE) as LayoutInflater
-        val contentView = inflater.inflate(R.layout.view_fake_chat, null)
+        val contentView = inflater.inflate(R.layout.view_fake_chat, null) as LinearLayout
+        contentView.disableClipping()
         addView(contentView)
         isVerticalScrollBarEnabled = false
     }
@@ -47,8 +52,13 @@ class FakeChatView : ScrollView {
     // region Animation
     fun startAnimating() {
         listOf( bubble1, bubble2, bubble3, bubble4, bubble5 ).forEach { it.alpha = 0.0f }
-        fun show(view: View) {
-            view.animate().alpha(1.0f).setDuration(animationDuration).start()
+        fun show(bubble: View) {
+            val animation = ValueAnimator.ofObject(FloatEvaluator(), 0.0f, 1.0f)
+            animation.duration = animationDuration
+            animation.addUpdateListener { animator ->
+                bubble.alpha = animator.animatedValue as Float
+            }
+            animation.start()
         }
         Handler().postDelayed({
             show(bubble1)

From eafd4bf5579468dab04ba4ac074857fa3bb3c5df Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Tue, 8 Sep 2020 15:10:00 +1000
Subject: [PATCH 26/33] Add PN mode screen glow

---
 res/layout-sw400dp/activity_pn_mode.xml       |  9 +-
 res/layout/activity_pn_mode.xml               |  9 +-
 .../loki/activities/PNModeActivity.kt         | 44 ++++++++-
 .../securesms/loki/views/GlowView.kt          | 92 +++++++++++++++++++
 4 files changed, 143 insertions(+), 11 deletions(-)
 create mode 100644 src/org/thoughtcrime/securesms/loki/views/GlowView.kt

diff --git a/res/layout-sw400dp/activity_pn_mode.xml b/res/layout-sw400dp/activity_pn_mode.xml
index 649ef31eae..66431151b8 100644
--- a/res/layout-sw400dp/activity_pn_mode.xml
+++ b/res/layout-sw400dp/activity_pn_mode.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/contentView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -30,7 +31,7 @@
         android:textColor="@color/text"
         android:text="There are two ways Session can notify you of new messages." />
 
-    <LinearLayout
+    <org.thoughtcrime.securesms.loki.views.PNModeView
         android:id="@+id/fcmOptionView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -66,9 +67,9 @@
             android:textStyle="bold"
             android:text="@string/activity_pn_mode_recommended_option_tag" />
 
-    </LinearLayout>
+    </org.thoughtcrime.securesms.loki.views.PNModeView>
 
-    <LinearLayout
+    <org.thoughtcrime.securesms.loki.views.PNModeView
         android:id="@+id/backgroundPollingOptionView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -95,7 +96,7 @@
             android:textColor="@color/text"
             android:text="Session will occasionally check for new messages in the background. Full metadata protection is guaranteed, but message notifications will be unreliable." />
 
-    </LinearLayout>
+    </org.thoughtcrime.securesms.loki.views.PNModeView>
 
     <View
         android:layout_width="match_parent"
diff --git a/res/layout/activity_pn_mode.xml b/res/layout/activity_pn_mode.xml
index 559c78d1f3..2ab9cc8602 100644
--- a/res/layout/activity_pn_mode.xml
+++ b/res/layout/activity_pn_mode.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/contentView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -30,7 +31,7 @@
         android:textColor="@color/text"
         android:text="There are two ways Session can notify you of new messages." />
 
-    <LinearLayout
+    <org.thoughtcrime.securesms.loki.views.PNModeView
         android:id="@+id/fcmOptionView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -66,9 +67,9 @@
             android:textStyle="bold"
             android:text="@string/activity_pn_mode_recommended_option_tag" />
 
-    </LinearLayout>
+    </org.thoughtcrime.securesms.loki.views.PNModeView>
 
-    <LinearLayout
+    <org.thoughtcrime.securesms.loki.views.PNModeView
         android:id="@+id/backgroundPollingOptionView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -95,7 +96,7 @@
             android:textColor="@color/text"
             android:text="Session will occasionally check for new messages in the background. Full metadata protection is guaranteed, but message notifications will be unreliable." />
 
-    </LinearLayout>
+    </org.thoughtcrime.securesms.loki.views.PNModeView>
 
     <View
         android:layout_width="match_parent"
diff --git a/src/org/thoughtcrime/securesms/loki/activities/PNModeActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/PNModeActivity.kt
index c36c92b5c7..75102938b9 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/PNModeActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/PNModeActivity.kt
@@ -1,5 +1,7 @@
 package org.thoughtcrime.securesms.loki.activities
 
+import android.animation.ArgbEvaluator
+import android.animation.ValueAnimator
 import android.app.AlertDialog
 import android.content.Intent
 import android.graphics.drawable.TransitionDrawable
@@ -9,27 +11,36 @@ import androidx.annotation.DrawableRes
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
-import android.widget.LinearLayout
 import android.widget.Toast
+import androidx.annotation.ColorRes
 import kotlinx.android.synthetic.main.activity_display_name.registerButton
 import kotlinx.android.synthetic.main.activity_pn_mode.*
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.BaseActionBarActivity
+import org.thoughtcrime.securesms.loki.utilities.disableClipping
+import org.thoughtcrime.securesms.loki.utilities.getColorWithID
 import org.thoughtcrime.securesms.loki.utilities.setUpActionBarSessionLogo
 import org.thoughtcrime.securesms.loki.utilities.show
+import org.thoughtcrime.securesms.loki.views.GlowViewUtilities
+import org.thoughtcrime.securesms.loki.views.PNModeView
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 
 class PNModeActivity : BaseActionBarActivity() {
-    private var selectedOptionView: LinearLayout? = null
+    private var selectedOptionView: PNModeView? = null
 
     // region Lifecycle
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setUpActionBarSessionLogo()
         setContentView(R.layout.activity_pn_mode)
+        contentView.disableClipping()
         fcmOptionView.setOnClickListener { toggleFCM() }
+        fcmOptionView.mainColor = resources.getColorWithID(R.color.pn_option_background, theme)
+        fcmOptionView.strokeColor = resources.getColorWithID(R.color.pn_option_border, theme)
         backgroundPollingOptionView.setOnClickListener { toggleBackgroundPolling() }
+        backgroundPollingOptionView.mainColor = resources.getColorWithID(R.color.pn_option_background, theme)
+        backgroundPollingOptionView.strokeColor = resources.getColorWithID(R.color.pn_option_border, theme)
         registerButton.setOnClickListener { register() }
     }
 
@@ -71,15 +82,23 @@ class PNModeActivity : BaseActionBarActivity() {
         when (selectedOptionView) {
             null -> {
                 performTransition(R.drawable.pn_option_background_select_transition, fcmOptionView)
+                GlowViewUtilities.animateShadowColorChange(this, fcmOptionView, R.color.transparent, R.color.accent)
+                animateStrokeColorChange(fcmOptionView, R.color.pn_option_border, R.color.accent)
                 selectedOptionView = fcmOptionView
             }
             fcmOptionView -> {
                 performTransition(R.drawable.pn_option_background_deselect_transition, fcmOptionView)
+                GlowViewUtilities.animateShadowColorChange(this, fcmOptionView, R.color.accent, R.color.transparent)
+                animateStrokeColorChange(fcmOptionView, R.color.accent, R.color.pn_option_border)
                 selectedOptionView = null
             }
             backgroundPollingOptionView -> {
                 performTransition(R.drawable.pn_option_background_select_transition, fcmOptionView)
+                GlowViewUtilities.animateShadowColorChange(this, fcmOptionView, R.color.transparent, R.color.accent)
+                animateStrokeColorChange(fcmOptionView, R.color.pn_option_border, R.color.accent)
                 performTransition(R.drawable.pn_option_background_deselect_transition, backgroundPollingOptionView)
+                GlowViewUtilities.animateShadowColorChange(this, backgroundPollingOptionView, R.color.accent, R.color.transparent)
+                animateStrokeColorChange(backgroundPollingOptionView, R.color.accent, R.color.pn_option_border)
                 selectedOptionView = fcmOptionView
             }
         }
@@ -89,20 +108,40 @@ class PNModeActivity : BaseActionBarActivity() {
         when (selectedOptionView) {
             null -> {
                 performTransition(R.drawable.pn_option_background_select_transition, backgroundPollingOptionView)
+                GlowViewUtilities.animateShadowColorChange(this, backgroundPollingOptionView, R.color.transparent, R.color.accent)
+                animateStrokeColorChange(backgroundPollingOptionView, R.color.pn_option_border, R.color.accent)
                 selectedOptionView = backgroundPollingOptionView
             }
             backgroundPollingOptionView -> {
                 performTransition(R.drawable.pn_option_background_deselect_transition, backgroundPollingOptionView)
+                GlowViewUtilities.animateShadowColorChange(this, backgroundPollingOptionView, R.color.accent, R.color.transparent)
+                animateStrokeColorChange(backgroundPollingOptionView, R.color.accent, R.color.pn_option_border)
                 selectedOptionView = null
             }
             fcmOptionView -> {
                 performTransition(R.drawable.pn_option_background_select_transition, backgroundPollingOptionView)
+                GlowViewUtilities.animateShadowColorChange(this, backgroundPollingOptionView, R.color.transparent, R.color.accent)
+                animateStrokeColorChange(backgroundPollingOptionView, R.color.pn_option_border, R.color.accent)
                 performTransition(R.drawable.pn_option_background_deselect_transition, fcmOptionView)
+                GlowViewUtilities.animateShadowColorChange(this, fcmOptionView, R.color.accent, R.color.transparent)
+                animateStrokeColorChange(fcmOptionView, R.color.accent, R.color.pn_option_border)
                 selectedOptionView = backgroundPollingOptionView
             }
         }
     }
 
+    private fun animateStrokeColorChange(bubble: PNModeView, @ColorRes startColorID: Int, @ColorRes endColorID: Int) {
+        val startColor = resources.getColorWithID(startColorID, theme)
+        val endColor = resources.getColorWithID(endColorID, theme)
+        val animation = ValueAnimator.ofObject(ArgbEvaluator(), startColor, endColor)
+        animation.duration = 250
+        animation.addUpdateListener { animator ->
+            val color = animator.animatedValue as Int
+            bubble.strokeColor = color
+        }
+        animation.start()
+    }
+
     private fun register() {
         if (selectedOptionView == null) {
             val dialog = AlertDialog.Builder(this)
@@ -111,7 +150,6 @@ class PNModeActivity : BaseActionBarActivity() {
             dialog.create().show()
             return
         }
-        val displayName = TextSecurePreferences.getProfileName(this)
         TextSecurePreferences.setHasSeenWelcomeScreen(this, true)
         TextSecurePreferences.setPromptedPushRegistration(this, true)
         TextSecurePreferences.setIsUsingFCM(this, (selectedOptionView == fcmOptionView))
diff --git a/src/org/thoughtcrime/securesms/loki/views/GlowView.kt b/src/org/thoughtcrime/securesms/loki/views/GlowView.kt
new file mode 100644
index 0000000000..e534cc6279
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/views/GlowView.kt
@@ -0,0 +1,92 @@
+package org.thoughtcrime.securesms.loki.views
+
+import android.animation.ArgbEvaluator
+import android.animation.ValueAnimator
+import android.content.Context
+import android.graphics.*
+import android.util.AttributeSet
+import android.view.View
+import android.view.ViewOutlineProvider
+import android.widget.LinearLayout
+import androidx.annotation.ColorInt
+import androidx.annotation.ColorRes
+import network.loki.messenger.R
+import org.thoughtcrime.securesms.loki.utilities.getColorWithID
+import org.thoughtcrime.securesms.loki.utilities.toPx
+
+interface GlowView {
+    var mainColor: Int
+    var sessionShadowColor: Int
+}
+
+object GlowViewUtilities {
+
+    fun animateColorChange(context: Context, view: GlowView, @ColorRes startColorID: Int, @ColorRes endColorID: Int) {
+        val startColor = context.resources.getColorWithID(startColorID, context.theme)
+        val endColor = context.resources.getColorWithID(endColorID, context.theme)
+        val animation = ValueAnimator.ofObject(ArgbEvaluator(), startColor, endColor)
+        animation.duration = 250
+        animation.addUpdateListener { animator ->
+            val color = animator.animatedValue as Int
+            view.mainColor = color
+        }
+        animation.start()
+    }
+
+    fun animateShadowColorChange(context: Context, view: GlowView, @ColorRes startColorID: Int, @ColorRes endColorID: Int) {
+        val startColor = context.resources.getColorWithID(startColorID, context.theme)
+        val endColor = context.resources.getColorWithID(endColorID, context.theme)
+        val animation = ValueAnimator.ofObject(ArgbEvaluator(), startColor, endColor)
+        animation.duration = 250
+        animation.addUpdateListener { animator ->
+            val color = animator.animatedValue as Int
+            view.sessionShadowColor = color
+        }
+        animation.start()
+    }
+}
+
+class PNModeView : LinearLayout, GlowView {
+    @ColorInt override var mainColor: Int = 0
+        set(newValue) { field = newValue; paint.color = newValue }
+    @ColorInt var strokeColor: Int = 0
+        set(newValue) { field = newValue; strokePaint.color = newValue }
+    @ColorInt override var sessionShadowColor: Int = 0
+        set(newValue) { field = newValue; paint.setShadowLayer(toPx(4, resources).toFloat(), 0.0f, 0.0f, newValue) }
+
+    private val paint: Paint by lazy {
+        val result = Paint()
+        result.style = Paint.Style.FILL
+        result.isAntiAlias = true
+        result
+    }
+
+    private val strokePaint: Paint by lazy {
+        val result = Paint()
+        result.style = Paint.Style.STROKE
+        result.isAntiAlias = true
+        result.strokeWidth = toPx(1, resources).toFloat()
+        result
+    }
+
+    // region Lifecycle
+    constructor(context: Context) : super(context) { }
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) { }
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) { }
+
+    init {
+        setWillNotDraw(false)
+    }
+    // endregion
+
+    // region Updating
+    override fun onDraw(c: Canvas) {
+        val w = width.toFloat()
+        val h = height.toFloat()
+        val r = resources.getDimension(R.dimen.pn_option_corner_radius)
+        c.drawRoundRect(0.0f, 0.0f, w, h, r, r, paint)
+        c.drawRoundRect(0.0f, 0.0f, w, h, r, r, strokePaint)
+        super.onDraw(c)
+    }
+    // endregion
+}

From 28db2a79a5a62cb15d50fb528f4e14cbcd3ea90a Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Tue, 8 Sep 2020 15:17:29 +1000
Subject: [PATCH 27/33] Fix display name bug

---
 .../securesms/loki/dialogs/UserDetailsBottomSheet.kt            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/thoughtcrime/securesms/loki/dialogs/UserDetailsBottomSheet.kt b/src/org/thoughtcrime/securesms/loki/dialogs/UserDetailsBottomSheet.kt
index ca1fabcec9..3d884f7440 100644
--- a/src/org/thoughtcrime/securesms/loki/dialogs/UserDetailsBottomSheet.kt
+++ b/src/org/thoughtcrime/securesms/loki/dialogs/UserDetailsBottomSheet.kt
@@ -28,7 +28,7 @@ public class UserDetailsBottomSheet : BottomSheetDialogFragment() {
         profilePictureView.glide = GlideApp.with(this)
         profilePictureView.isLarge = true
         profilePictureView.update()
-        nameTextView.text = DatabaseFactory.getLokiUserDatabase(requireContext()).getDisplayName(publicKey) ?: publicKey
+        nameTextView.text = DatabaseFactory.getLokiUserDatabase(requireContext()).getDisplayName(publicKey) ?: "Anonymous"
         publicKeyTextView.text = publicKey
         copyButton.setOnClickListener {
             val clipboard = requireContext().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager

From 70ccb976cb41da16cfd78f486e3eaa8e797e8f0b Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Tue, 8 Sep 2020 15:38:39 +1000
Subject: [PATCH 28/33] Add new conversation button set glow

---
 ...inent_outline_button_medium_background.xml |  2 +-
 res/layout/activity_home.xml                  |  3 +-
 res/values/colors.xml                         |  1 +
 .../securesms/loki/views/GlowView.kt          | 33 +++++++++++++
 .../loki/views/LabeledSeparatorView.kt        |  2 +-
 .../views/NewConversationButtonSetView.kt     | 47 ++++++++-----------
 6 files changed, 57 insertions(+), 31 deletions(-)

diff --git a/res/drawable/prominent_outline_button_medium_background.xml b/res/drawable/prominent_outline_button_medium_background.xml
index 183ed83282..f595e4f38b 100644
--- a/res/drawable/prominent_outline_button_medium_background.xml
+++ b/res/drawable/prominent_outline_button_medium_background.xml
@@ -7,5 +7,5 @@
 
     <corners android:radius="@dimen/medium_button_corner_radius" />
 
-    <stroke android:width="@dimen/border_thickness" android:color="?colorAccent" />
+    <stroke android:width="@dimen/border_thickness" android:color="@color/accent" />
 </shape>
\ No newline at end of file
diff --git a/res/layout/activity_home.xml b/res/layout/activity_home.xml
index 13eb8bda5e..53e3a9138d 100644
--- a/res/layout/activity_home.xml
+++ b/res/layout/activity_home.xml
@@ -76,7 +76,8 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:clipChildren="false">
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerView"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index c9356d308b..a7ff67af2f 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -25,6 +25,7 @@
     <color name="compose_text_view_background">#141414</color>
     <color name="quote_not_found_background">#99FFFFFF</color>
     <color name="new_conversation_button_collapsed_background">#1F1F1F</color>
+    <color name="new_conversation_button_shadow">#077C44</color>
     <color name="pn_option_background">#1B1B1B</color>
     <color name="pn_option_border">#212121</color>
     <color name="paths_building">#FFCE3A</color>
diff --git a/src/org/thoughtcrime/securesms/loki/views/GlowView.kt b/src/org/thoughtcrime/securesms/loki/views/GlowView.kt
index e534cc6279..5ecb77a5e2 100644
--- a/src/org/thoughtcrime/securesms/loki/views/GlowView.kt
+++ b/src/org/thoughtcrime/securesms/loki/views/GlowView.kt
@@ -90,3 +90,36 @@ class PNModeView : LinearLayout, GlowView {
     }
     // endregion
 }
+
+class NewConversationButtonImageView : androidx.appcompat.widget.AppCompatImageView, GlowView {
+    @ColorInt override var mainColor: Int = 0
+        set(newValue) { field = newValue; paint.color = newValue }
+    @ColorInt override var sessionShadowColor: Int = 0
+        set(newValue) { field = newValue; paint.setShadowLayer(toPx(6, resources).toFloat(), 0.0f, 0.0f, newValue) }
+
+    private val paint: Paint by lazy {
+        val result = Paint()
+        result.style = Paint.Style.FILL
+        result.isAntiAlias = true
+        result
+    }
+
+    // region Lifecycle
+    constructor(context: Context) : super(context) { }
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) { }
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) { }
+
+    init {
+        setWillNotDraw(false)
+    }
+    // endregion
+
+    // region Updating
+    override fun onDraw(c: Canvas) {
+        val w = width.toFloat()
+        val h = height.toFloat()
+        c.drawCircle(w / 2, h / 2, w / 2, paint)
+        super.onDraw(c)
+    }
+    // endregion
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/views/LabeledSeparatorView.kt b/src/org/thoughtcrime/securesms/loki/views/LabeledSeparatorView.kt
index 028dd34a49..4cbc83dc7b 100644
--- a/src/org/thoughtcrime/securesms/loki/views/LabeledSeparatorView.kt
+++ b/src/org/thoughtcrime/securesms/loki/views/LabeledSeparatorView.kt
@@ -16,7 +16,7 @@ class LabeledSeparatorView : RelativeLayout {
 
     private val path = Path()
 
-    private val paint: Paint by lazy{
+    private val paint: Paint by lazy {
         val result = Paint()
         result.style = Paint.Style.STROKE
         result.color = ThemeUtil.getThemedColor(context, R.attr.dividerHorizontal)
diff --git a/src/org/thoughtcrime/securesms/loki/views/NewConversationButtonSetView.kt b/src/org/thoughtcrime/securesms/loki/views/NewConversationButtonSetView.kt
index e46f82e376..793ae44dea 100644
--- a/src/org/thoughtcrime/securesms/loki/views/NewConversationButtonSetView.kt
+++ b/src/org/thoughtcrime/securesms/loki/views/NewConversationButtonSetView.kt
@@ -7,9 +7,7 @@ import android.animation.ValueAnimator
 import android.content.Context
 import android.content.Context.VIBRATOR_SERVICE
 import android.content.res.ColorStateList
-import android.graphics.Color
 import android.graphics.PointF
-import android.graphics.drawable.GradientDrawable
 import android.os.Build
 import android.os.VibrationEffect
 import android.os.VibrationEffect.DEFAULT_AMPLITUDE
@@ -66,24 +64,25 @@ class NewConversationButtonSetView : RelativeLayout {
         private val collapsedImageViewPosition by lazy { PointF((expandedSize - collapsedSize) / 2, (expandedSize - collapsedSize) / 2) }
 
         private val imageView by lazy {
-            val result = ImageView(context)
+            val result = NewConversationButtonImageView(context)
             val size = collapsedSize.toInt()
             result.layoutParams = LayoutParams(size, size)
             result.setBackgroundResource(R.drawable.new_conversation_button_background)
-            val background = result.background as GradientDrawable
-            @ColorRes val backgroundColorID = if (isMain)
-                R.color.accent else
-                R.color.new_conversation_button_collapsed_background
-            background.color = ColorStateList.valueOf(resources.getColorWithID(backgroundColorID, context.theme))
+            @ColorRes val backgroundColorID = if (isMain) R.color.accent else R.color.new_conversation_button_collapsed_background
+            @ColorRes val shadowColorID = if (isMain) {
+                R.color.new_conversation_button_shadow
+            } else {
+                if (UiModeUtilities.isDayUiMode(context)) R.color.transparent_black_30 else R.color.black
+            }
+            result.mainColor = resources.getColorWithID(backgroundColorID, context.theme)
+            result.sessionShadowColor = resources.getColorWithID(shadowColorID, context.theme)
             result.scaleType = ImageView.ScaleType.CENTER
             result.setImageResource(iconID)
-
-            result.imageTintList = if (isMain)
-                // Always use white icon for the main button.
+            result.imageTintList = if (isMain) {
                 ColorStateList.valueOf(resources.getColorWithID(android.R.color.white, context.theme))
-            else
+            } else {
                 ColorStateList.valueOf(resources.getColorWithID(R.color.text, context.theme))
-
+            }
             result
         }
 
@@ -106,30 +105,21 @@ class NewConversationButtonSetView : RelativeLayout {
         }
 
         fun expand() {
-            animateImageViewColorChange(R.color.new_conversation_button_collapsed_background, R.color.accent)
+            GlowViewUtilities.animateColorChange(context, imageView, R.color.new_conversation_button_collapsed_background, R.color.accent)
+            @ColorRes val startShadowColorID = if (UiModeUtilities.isDayUiMode(context)) R.color.transparent_black_30 else R.color.black
+            GlowViewUtilities.animateShadowColorChange(context, imageView, startShadowColorID, R.color.new_conversation_button_shadow)
             imageView.animateSizeChange(R.dimen.new_conversation_button_collapsed_size, R.dimen.new_conversation_button_expanded_size, animationDuration)
             animateImageViewPositionChange(collapsedImageViewPosition, expandedImageViewPosition)
         }
 
         fun collapse() {
-            animateImageViewColorChange(R.color.accent, R.color.new_conversation_button_collapsed_background)
+            GlowViewUtilities.animateColorChange(context, imageView, R.color.accent, R.color.new_conversation_button_collapsed_background)
+            @ColorRes val endShadowColorID = if (UiModeUtilities.isDayUiMode(context)) R.color.transparent_black_30 else R.color.black
+            GlowViewUtilities.animateShadowColorChange(context, imageView, R.color.new_conversation_button_shadow, endShadowColorID)
             imageView.animateSizeChange(R.dimen.new_conversation_button_expanded_size, R.dimen.new_conversation_button_collapsed_size, animationDuration)
             animateImageViewPositionChange(expandedImageViewPosition, collapsedImageViewPosition)
         }
 
-        private fun animateImageViewColorChange(@ColorRes startColorID: Int, @ColorRes endColorID: Int) {
-            val drawable = imageView.background as GradientDrawable
-            val startColor = resources.getColorWithID(startColorID, context.theme)
-            val endColor = resources.getColorWithID(endColorID, context.theme)
-            val animation = ValueAnimator.ofObject(ArgbEvaluator(), startColor, endColor)
-            animation.duration = animationDuration
-            animation.addUpdateListener { animator ->
-                val color = animator.animatedValue as Int
-                drawable.color = ColorStateList.valueOf(color)
-            }
-            animation.start()
-        }
-
         private fun animateImageViewPositionChange(startPosition: PointF, endPosition: PointF) {
             val animation = ValueAnimator.ofObject(PointFEvaluator(), startPosition, endPosition)
             animation.duration = animationDuration
@@ -170,6 +160,7 @@ class NewConversationButtonSetView : RelativeLayout {
     constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) { setUpViewHierarchy() }
 
     private fun setUpViewHierarchy() {
+        disableClipping()
         // Set up session button
         addView(sessionButton)
         sessionButton.alpha = 0.0f

From b57e94b943234e355fb7db91bf91508c979d35f9 Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Tue, 8 Sep 2020 15:48:32 +1000
Subject: [PATCH 29/33] Fix progress bar background color

---
 res/values-notnight-v21/colors.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/values-notnight-v21/colors.xml b/res/values-notnight-v21/colors.xml
index b9ab4d5c39..ba4b118eb6 100644
--- a/res/values-notnight-v21/colors.xml
+++ b/res/values-notnight-v21/colors.xml
@@ -28,7 +28,7 @@
 
 
     <color name="app_icon_background">#333132</color>
-    <color name="progress_bar_background">#0AFFFFFF</color>
+    <color name="progress_bar_background">#0A000000</color>
     <color name="quote_not_found_background">#99FFFFFF</color>
 
 </resources>
\ No newline at end of file

From b3e672a9ed4f31af8a4b3501d18cc3af14e7895d Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Tue, 8 Sep 2020 16:21:50 +1000
Subject: [PATCH 30/33] Add path status indicator glow

---
 .../securesms/loki/activities/HomeActivity.kt |  1 +
 .../securesms/loki/views/PathStatusView.kt    | 28 +++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
index 90a9ffe9eb..2764601dcf 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
@@ -101,6 +101,7 @@ class HomeActivity : PassphraseRequiredActionBarActivity, ConversationClickListe
         profileButton.publicKey = publicKey
         profileButton.update()
         profileButton.setOnClickListener { openSettings() }
+        pathStatusViewContainer.disableClipping()
         pathStatusViewContainer.setOnClickListener { showPath() }
         // Set up seed reminder view
         val isMasterDevice = (TextSecurePreferences.getMasterHexEncodedPublicKey(this) == null)
diff --git a/src/org/thoughtcrime/securesms/loki/views/PathStatusView.kt b/src/org/thoughtcrime/securesms/loki/views/PathStatusView.kt
index 3fd4158b89..e65630c144 100644
--- a/src/org/thoughtcrime/securesms/loki/views/PathStatusView.kt
+++ b/src/org/thoughtcrime/securesms/loki/views/PathStatusView.kt
@@ -4,14 +4,30 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
+import android.graphics.Canvas
+import android.graphics.Paint
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import android.util.AttributeSet
 import android.view.View
+import androidx.annotation.ColorInt
 import network.loki.messenger.R
+import org.thoughtcrime.securesms.loki.utilities.getColorWithID
+import org.thoughtcrime.securesms.loki.utilities.toPx
 import org.whispersystems.signalservice.loki.api.onionrequests.OnionRequestAPI
 
 class PathStatusView : View {
     private val broadcastReceivers = mutableListOf<BroadcastReceiver>()
+    @ColorInt var mainColor: Int = 0
+        set(newValue) { field = newValue; paint.color = newValue }
+    @ColorInt var sessionShadowColor: Int = 0
+        set(newValue) { field = newValue; paint.setShadowLayer(toPx(8, resources).toFloat(), 0.0f, 0.0f, newValue) }
+
+    private val paint: Paint by lazy {
+        val result = Paint()
+        result.style = Paint.Style.FILL
+        result.isAntiAlias = true
+        result
+    }
 
     constructor(context: Context) : super(context) {
         initialize()
@@ -31,6 +47,7 @@ class PathStatusView : View {
 
     private fun initialize() {
         update()
+        setWillNotDraw(false)
     }
 
     override fun onAttachedToWindow() {
@@ -70,8 +87,19 @@ class PathStatusView : View {
     private fun update() {
         if (OnionRequestAPI.paths.count() >= OnionRequestAPI.pathCount) {
             setBackgroundResource(R.drawable.accent_dot)
+            mainColor = resources.getColorWithID(R.color.accent, context.theme)
+            sessionShadowColor = resources.getColorWithID(R.color.accent, context.theme)
         } else {
             setBackgroundResource(R.drawable.paths_building_dot)
+            mainColor = resources.getColorWithID(R.color.paths_building, context.theme)
+            sessionShadowColor = resources.getColorWithID(R.color.paths_building, context.theme)
         }
     }
+
+    override fun onDraw(c: Canvas) {
+        val w = width.toFloat()
+        val h = height.toFloat()
+        c.drawCircle(w / 2, h / 2, w / 2, paint)
+        super.onDraw(c)
+    }
 }
\ No newline at end of file

From 8a8fdb4c541b0b73c53149a60fbc8f81fa95a75a Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Tue, 8 Sep 2020 16:36:24 +1000
Subject: [PATCH 31/33] Add path dot glow

---
 res/layout/activity_path.xml                  |  3 +-
 .../securesms/loki/activities/PathActivity.kt | 13 ++++++-
 .../securesms/loki/views/GlowView.kt          | 35 ++++++++++++++++++-
 3 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/res/layout/activity_path.xml b/res/layout/activity_path.xml
index a0fa1c20a8..6c2db06239 100644
--- a/res/layout/activity_path.xml
+++ b/res/layout/activity_path.xml
@@ -23,7 +23,8 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
-        android:layout_margin="@dimen/large_spacing">
+        android:layout_margin="@dimen/large_spacing"
+        android:clipChildren="false">
 
         <LinearLayout
             android:id="@+id/pathRowsContainer"
diff --git a/src/org/thoughtcrime/securesms/loki/activities/PathActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/PathActivity.kt
index 7e3b641b12..fa96d6b2a1 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/PathActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/PathActivity.kt
@@ -16,10 +16,13 @@ import android.widget.LinearLayout
 import android.widget.RelativeLayout
 import android.widget.TextView
 import android.widget.Toast
+import androidx.annotation.ColorRes
 import kotlinx.android.synthetic.main.activity_path.*
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
 import org.thoughtcrime.securesms.loki.utilities.*
+import org.thoughtcrime.securesms.loki.views.GlowViewUtilities
+import org.thoughtcrime.securesms.loki.views.PathDotView
 import org.whispersystems.signalservice.loki.api.Snode
 import org.whispersystems.signalservice.loki.api.onionrequests.OnionRequestAPI
 
@@ -31,6 +34,7 @@ class PathActivity : PassphraseRequiredActionBarActivity() {
         super.onCreate(savedInstanceState, isReady)
         setContentView(R.layout.activity_path)
         supportActionBar!!.title = resources.getString(R.string.activity_path_title)
+        pathRowsContainer.disableClipping()
         learnMoreButton.setOnClickListener { learnMore() }
         update(false)
         registerObservers()
@@ -111,6 +115,7 @@ class PathActivity : PassphraseRequiredActionBarActivity() {
         val mainContainer = LinearLayout(this)
         mainContainer.orientation = LinearLayout.HORIZONTAL
         mainContainer.gravity = Gravity.CENTER_VERTICAL
+        mainContainer.disableClipping()
         val mainContainerLayoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT)
         mainContainer.layoutParams = mainContainerLayoutParams
         val lineView = LineView(this, location, dotAnimationStartDelay, dotAnimationRepeatInterval)
@@ -170,8 +175,9 @@ class PathActivity : PassphraseRequiredActionBarActivity() {
         private var dotAnimationRepeatInterval: Long = 0
 
         private val dotView by lazy {
-            val result = View(context)
+            val result = PathDotView(context)
             result.setBackgroundResource(R.drawable.accent_dot)
+            result.mainColor = resources.getColorWithID(R.color.accent, context.theme)
             result
         }
 
@@ -203,6 +209,7 @@ class PathActivity : PassphraseRequiredActionBarActivity() {
         }
 
         private fun setUpViewHierarchy() {
+            disableClipping()
             val lineView = View(context)
             lineView.setBackgroundColor(resources.getColorWithID(R.color.text, context.theme))
             val lineViewHeight = when (location) {
@@ -239,10 +246,14 @@ class PathActivity : PassphraseRequiredActionBarActivity() {
 
         private fun expand() {
             dotView.animateSizeChange(R.dimen.path_row_dot_size, R.dimen.path_row_expanded_dot_size)
+            @ColorRes val startColorID = if (UiModeUtilities.isDayUiMode(context)) R.color.transparent_black_30 else R.color.black
+            GlowViewUtilities.animateShadowColorChange(context, dotView, startColorID, R.color.accent)
         }
 
         private fun collapse() {
             dotView.animateSizeChange(R.dimen.path_row_expanded_dot_size, R.dimen.path_row_dot_size)
+            @ColorRes val endColorID = if (UiModeUtilities.isDayUiMode(context)) R.color.transparent_black_30 else R.color.black
+            GlowViewUtilities.animateShadowColorChange(context, dotView, R.color.accent, endColorID)
         }
     }
     // endregion
diff --git a/src/org/thoughtcrime/securesms/loki/views/GlowView.kt b/src/org/thoughtcrime/securesms/loki/views/GlowView.kt
index 5ecb77a5e2..e48a67fbc9 100644
--- a/src/org/thoughtcrime/securesms/loki/views/GlowView.kt
+++ b/src/org/thoughtcrime/securesms/loki/views/GlowView.kt
@@ -92,10 +92,43 @@ class PNModeView : LinearLayout, GlowView {
 }
 
 class NewConversationButtonImageView : androidx.appcompat.widget.AppCompatImageView, GlowView {
+    @ColorInt override var mainColor: Int = 0
+    set(newValue) { field = newValue; paint.color = newValue }
+    @ColorInt override var sessionShadowColor: Int = 0
+    set(newValue) { field = newValue; paint.setShadowLayer(toPx(6, resources).toFloat(), 0.0f, 0.0f, newValue) }
+
+    private val paint: Paint by lazy {
+        val result = Paint()
+        result.style = Paint.Style.FILL
+        result.isAntiAlias = true
+        result
+    }
+
+    // region Lifecycle
+    constructor(context: Context) : super(context) { }
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) { }
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) { }
+
+    init {
+        setWillNotDraw(false)
+    }
+    // endregion
+
+    // region Updating
+    override fun onDraw(c: Canvas) {
+        val w = width.toFloat()
+        val h = height.toFloat()
+        c.drawCircle(w / 2, h / 2, w / 2, paint)
+        super.onDraw(c)
+    }
+    // endregion
+}
+
+class PathDotView : View, GlowView {
     @ColorInt override var mainColor: Int = 0
         set(newValue) { field = newValue; paint.color = newValue }
     @ColorInt override var sessionShadowColor: Int = 0
-        set(newValue) { field = newValue; paint.setShadowLayer(toPx(6, resources).toFloat(), 0.0f, 0.0f, newValue) }
+        set(newValue) { field = newValue; paint.setShadowLayer(toPx(4, resources).toFloat(), 0.0f, 0.0f, newValue) }
 
     private val paint: Paint by lazy {
         val result = Paint()

From 4c9fd557160a47babbe95b914c025e3ed0f4482a Mon Sep 17 00:00:00 2001
From: Ryan ZHAO <ryanzhaors@qq.com>
Date: Tue, 8 Sep 2020 16:57:35 +1000
Subject: [PATCH 32/33] fix other platform can't get Android's profile picture

---
 src/org/thoughtcrime/securesms/database/ThreadDatabase.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/org/thoughtcrime/securesms/database/ThreadDatabase.java b/src/org/thoughtcrime/securesms/database/ThreadDatabase.java
index 41903ae23e..f58471b9ba 100644
--- a/src/org/thoughtcrime/securesms/database/ThreadDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/ThreadDatabase.java
@@ -528,6 +528,7 @@ public class ThreadDatabase extends Database {
       if (cursor != null && cursor.moveToFirst()) {
         return cursor.getLong(cursor.getColumnIndexOrThrow(ID));
       } else {
+        DatabaseFactory.getRecipientDatabase(context).setProfileSharing(recipient, true);
         return createThreadForRecipient(recipient.getAddress(), recipient.isGroupRecipient(), distributionType);
       }
     } finally {

From 9345df82835841c0ee5cfa461cb85ae31b2666e7 Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Wed, 9 Sep 2020 12:58:18 +1000
Subject: [PATCH 33/33] Minor UI tweaks

---
 res/values/dimens.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 083cdd33b8..ec41c48aec 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -31,7 +31,7 @@
     <dimen name="fake_chat_view_bubble_corner_radius">10dp</dimen>
     <dimen name="fake_chat_view_height">250dp</dimen>
     <dimen name="setting_button_height">56dp</dimen>
-    <dimen name="dialog_corner_radius">12dp</dimen>
+    <dimen name="dialog_corner_radius">8dp</dimen>
     <dimen name="dialog_button_corner_radius">4dp</dimen>
     <dimen name="pn_option_corner_radius">8dp</dimen>
     <dimen name="path_status_view_size">8dp</dimen>