From 1da6f20f18ed96a4164855218f85e067575cef5d Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Mon, 22 Jul 2019 13:08:56 +1000
Subject: [PATCH] Further Lokify UI

---
 AndroidManifest.xml                                      | 6 +++---
 res/layout/activity_account_details.xml                  | 2 --
 res/layout/activity_key_pair.xml                         | 6 ++----
 res/menu/conversation_context.xml                        | 9 +++++----
 res/values/colors.xml                                    | 6 +++---
 res/values/core_colors.xml                               | 2 +-
 .../thoughtcrime/securesms/ConversationListFragment.java | 2 ++
 .../securesms/conversation/ConversationActivity.java     | 6 ++++--
 .../securesms/conversation/ConversationFragment.java     | 8 ++++++--
 .../securesms/conversation/ConversationTitleView.java    | 2 ++
 src/org/thoughtcrime/securesms/loki/FriendRequestView.kt | 2 +-
 .../securesms/util/DynamicNoActionBarTheme.java          | 6 +-----
 .../securesms/util/DynamicRegistrationTheme.java         | 6 +-----
 src/org/thoughtcrime/securesms/util/DynamicTheme.java    | 6 +-----
 14 files changed, 32 insertions(+), 37 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 36c9f0787e..1ba77dee44 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -302,7 +302,7 @@
 
     <activity android:name=".registration.WelcomeActivity"
               android:launchMode="singleTask"
-              android:theme="@style/TextSecure.LightRegistrationTheme"
+              android:theme="@style/TextSecure.DarkRegistrationTheme"
               android:windowSoftInputMode="stateUnchanged"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
@@ -438,13 +438,13 @@
     <!-- Loki -->
     <activity android:name=".loki.AccountDetailsActivity"
               android:launchMode="singleTask"
-              android:theme="@style/TextSecure.LightRegistrationTheme"
+              android:theme="@style/TextSecure.DarkRegistrationTheme"
               android:windowSoftInputMode="stateUnchanged"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".loki.KeyPairActivity"
               android:launchMode="singleTask"
-              android:theme="@style/TextSecure.LightRegistrationTheme"
+              android:theme="@style/TextSecure.DarkRegistrationTheme"
               android:windowSoftInputMode="stateUnchanged"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
diff --git a/res/layout/activity_account_details.xml b/res/layout/activity_account_details.xml
index 730c063b95..8ac7959659 100644
--- a/res/layout/activity_account_details.xml
+++ b/res/layout/activity_account_details.xml
@@ -5,7 +5,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white"
     android:fillViewport="true"
     tools:context=".loki.AccountDetailsActivity">
 
@@ -39,7 +38,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="32dp"
-            app:labeledEditText_background="@color/white"
             app:labeledEditText_label="@string/activity_account_details_name_edit_text_label"/>
 
         <com.dd.CircularProgressButton
diff --git a/res/layout/activity_key_pair.xml b/res/layout/activity_key_pair.xml
index 2bf73eb1a5..c30a643ee2 100644
--- a/res/layout/activity_key_pair.xml
+++ b/res/layout/activity_key_pair.xml
@@ -5,7 +5,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white"
     android:fillViewport="true"
     tools:context=".loki.KeyPairActivity">
 
@@ -52,7 +51,7 @@
             android:layout_width="match_parent"
             android:layout_height="50dp"
             android:layout_marginTop="20dp"
-            android:background="@color/white"
+            android:background="@color/transparent"
             android:textColor="@color/signal_primary"
             android:text="@string/activity_key_pair_copy_button_title"
             android:elevation="0dp"
@@ -75,14 +74,13 @@
             android:layout_marginTop="16dp"
             android:layout_marginBottom="20dp"
             android:visibility="gone"
-            app:labeledEditText_background="@color/white"
             app:labeledEditText_label="@string/activity_key_pair_mnemonic_edit_text_label"/>
 
         <Button
             android:id="@+id/toggleModeButton"
             android:layout_width="match_parent"
             android:layout_height="50dp"
-            android:background="@color/white"
+            android:background="@color/transparent"
             android:textColor="@color/signal_primary"
             android:text="@string/activity_key_pair_toggle_mode_button_title_1"
             android:elevation="0dp"
diff --git a/res/menu/conversation_context.xml b/res/menu/conversation_context.xml
index f0d23d6ee8..76c7318a9d 100644
--- a/res/menu/conversation_context.xml
+++ b/res/menu/conversation_context.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:title="@string/conversation_context__menu_message_details"
+
+    <!-- <item android:title="@string/conversation_context__menu_message_details"
           android:id="@+id/menu_context_details"
           android:icon="?menu_info_icon"
-          app:showAsAction="always" />
+          app:showAsAction="always" /> -->
 
     <item android:title="@string/conversation_context__menu_delete_message"
         android:id="@+id/menu_context_delete_message"
@@ -15,10 +16,10 @@
           android:icon="?menu_copy_icon"
           app:showAsAction="always" />
 
-    <item android:title="@string/conversation_context__menu_forward_message"
+    <!-- <item android:title="@string/conversation_context__menu_forward_message"
           android:id="@+id/menu_context_forward"
           android:icon="?menu_forward_icon"
-          app:showAsAction="always" />
+          app:showAsAction="always" /> -->
 
     <item android:title="@string/conversation_context__menu_resend_message"
           android:id="@+id/menu_context_resend"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index f238c9f606..6b2d60cb49 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-    <color name="signal_primary">#ff2090ea</color>
-    <color name="signal_primary_dark">#ff1c7ac5</color>
-    <color name="signal_primary_alpha33">#552090ea</color>
+    <color name="signal_primary">#ff5bca5b</color>
+    <color name="signal_primary_dark">#ff5bca5b</color>
+    <color name="signal_primary_alpha33">#555bca5b</color>
     <color name="signal_primary_alpha_focus">#882090ea</color>
 
     <color name="textsecure_primary">@color/signal_primary</color>
diff --git a/res/values/core_colors.xml b/res/values/core_colors.xml
index abd6bb39dc..9622208f1f 100644
--- a/res/values/core_colors.xml
+++ b/res/values/core_colors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="core_blue">#2090ea</color>
+    <color name="core_blue">#5bca5b</color>
     <color name="core_green">#4caf50</color>
     <color name="core_red">#f44336</color>
     <color name="core_red_highlight">#ef5350</color>
diff --git a/src/org/thoughtcrime/securesms/ConversationListFragment.java b/src/org/thoughtcrime/securesms/ConversationListFragment.java
index e235f9062e..c5fa02996c 100644
--- a/src/org/thoughtcrime/securesms/ConversationListFragment.java
+++ b/src/org/thoughtcrime/securesms/ConversationListFragment.java
@@ -427,8 +427,10 @@ public class ConversationListFragment extends Fragment
   public boolean onCreateActionMode(ActionMode mode, Menu menu) {
     MenuInflater inflater = getActivity().getMenuInflater();
 
+    /*
     if (archive) inflater.inflate(R.menu.conversation_list_batch_unarchive, menu);
     else         inflater.inflate(R.menu.conversation_list_batch_archive, menu);
+     */
 
     inflater.inflate(R.menu.conversation_list_batch, menu);
 
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index 95a41ca8aa..bdf242292e 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -1553,8 +1553,10 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       if (manuallySelected) recordTransportPreference(newTransport);
     });
 
+    /*
     titleView.setOnClickListener(v -> handleConversationSettings());
     titleView.setOnLongClickListener(v -> handleDisplayQuickContact());
+     */
     titleView.setOnBackClickedListener(view -> super.onBackPressed());
     unblockButton.setOnClickListener(v -> handleUnblock());
     makeDefaultSmsButton.setOnClickListener(v -> handleMakeDefaultSms());
@@ -1850,8 +1852,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   private void setActionBarColor(MaterialColor color) {
     ActionBar supportActionBar = getSupportActionBar();
     if (supportActionBar == null) throw new AssertionError();
-    supportActionBar.setBackgroundDrawable(new ColorDrawable(color.toActionBarColor(this)));
-    setStatusBarColor(color.toStatusBarColor(this));
+    supportActionBar.setBackgroundDrawable(new ColorDrawable(getResources().getColor(R.color.core_grey_90)));
+    setStatusBarColor(getResources().getColor(R.color.black));
   }
 
   private void setBlockedUserState(Recipient recipient, boolean isSecureText, boolean isDefaultSms) {
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationFragment.java b/src/org/thoughtcrime/securesms/conversation/ConversationFragment.java
index 1f4c153353..e0938ea114 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationFragment.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationFragment.java
@@ -370,9 +370,9 @@ public class ConversationFragment extends Fragment
     }
 
     if (messageRecords.size() > 1) {
-      menu.findItem(R.id.menu_context_forward).setVisible(false);
+      // menu.findItem(R.id.menu_context_forward).setVisible(false);
       menu.findItem(R.id.menu_context_reply).setVisible(false);
-      menu.findItem(R.id.menu_context_details).setVisible(false);
+      // menu.findItem(R.id.menu_context_details).setVisible(false);
       menu.findItem(R.id.menu_context_save_attachment).setVisible(false);
       menu.findItem(R.id.menu_context_resend).setVisible(false);
     } else {
@@ -384,8 +384,10 @@ public class ConversationFragment extends Fragment
                                                                   !messageRecord.isMmsNotification() &&
                                                                   ((MediaMmsMessageRecord)messageRecord).containsMediaSlide());
 
+      /*
       menu.findItem(R.id.menu_context_forward).setVisible(!actionMessage && !sharedContact);
       menu.findItem(R.id.menu_context_details).setVisible(!actionMessage);
+       */
       menu.findItem(R.id.menu_context_reply).setVisible(!actionMessage             &&
                                                         !messageRecord.isPending() &&
                                                         !messageRecord.isFailed()  &&
@@ -1047,6 +1049,7 @@ public class ConversationFragment extends Fragment
           handleDeleteMessages(getListAdapter().getSelectedItems());
           actionMode.finish();
           return true;
+        /*
         case R.id.menu_context_details:
           handleDisplayDetails(getSelectedMessageRecord());
           actionMode.finish();
@@ -1055,6 +1058,7 @@ public class ConversationFragment extends Fragment
           handleForwardMessage(getSelectedMessageRecord());
           actionMode.finish();
           return true;
+         */
         case R.id.menu_context_resend:
           handleResendMessage(getSelectedMessageRecord());
           actionMode.finish();
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationTitleView.java b/src/org/thoughtcrime/securesms/conversation/ConversationTitleView.java
index 4e88960e5f..d698b9a2f2 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationTitleView.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationTitleView.java
@@ -55,6 +55,8 @@ public class ConversationTitleView extends RelativeLayout {
     this.subtitleContainer = ViewUtil.findById(this, R.id.subtitle_container);
     this.avatar            = ViewUtil.findById(this, R.id.contact_photo_image);
 
+    this.avatar.setEnabled(false);
+
     ViewUtil.setTextViewGravityStart(this.title, getContext());
     ViewUtil.setTextViewGravityStart(this.subtitle, getContext());
   }
diff --git a/src/org/thoughtcrime/securesms/loki/FriendRequestView.kt b/src/org/thoughtcrime/securesms/loki/FriendRequestView.kt
index aa1909ec77..0aeba0d7b4 100644
--- a/src/org/thoughtcrime/securesms/loki/FriendRequestView.kt
+++ b/src/org/thoughtcrime/securesms/loki/FriendRequestView.kt
@@ -26,7 +26,7 @@ class FriendRequestView(context: Context, attrs: AttributeSet?, defStyleAttr: In
 
     private val label by lazy {
         val result = TextView(context)
-        result.setTextColor(resources.getColorWithID(R.color.core_grey_90, context.theme))
+        result.setTextColor(resources.getColorWithID(R.color.white, context.theme))
         result.textAlignment = TextView.TEXT_ALIGNMENT_CENTER
         result
     }
diff --git a/src/org/thoughtcrime/securesms/util/DynamicNoActionBarTheme.java b/src/org/thoughtcrime/securesms/util/DynamicNoActionBarTheme.java
index 6c256b9439..ed6b1cabf7 100644
--- a/src/org/thoughtcrime/securesms/util/DynamicNoActionBarTheme.java
+++ b/src/org/thoughtcrime/securesms/util/DynamicNoActionBarTheme.java
@@ -7,10 +7,6 @@ import org.thoughtcrime.securesms.R;
 public class DynamicNoActionBarTheme extends DynamicTheme {
   @Override
   protected int getSelectedTheme(Activity activity) {
-    String theme = TextSecurePreferences.getTheme(activity);
-
-    if (theme.equals("dark")) return R.style.TextSecure_DarkNoActionBar;
-
-    return R.style.TextSecure_LightNoActionBar;
+    return R.style.TextSecure_DarkNoActionBar;
   }
 }
diff --git a/src/org/thoughtcrime/securesms/util/DynamicRegistrationTheme.java b/src/org/thoughtcrime/securesms/util/DynamicRegistrationTheme.java
index d4f1a9219b..dcc3881829 100644
--- a/src/org/thoughtcrime/securesms/util/DynamicRegistrationTheme.java
+++ b/src/org/thoughtcrime/securesms/util/DynamicRegistrationTheme.java
@@ -7,10 +7,6 @@ import org.thoughtcrime.securesms.R;
 public class DynamicRegistrationTheme extends DynamicTheme {
   @Override
   protected int getSelectedTheme(Activity activity) {
-    String theme = TextSecurePreferences.getTheme(activity);
-
-    if (theme.equals("dark")) return R.style.TextSecure_DarkRegistrationTheme;
-
-    return R.style.TextSecure_LightRegistrationTheme;
+    return R.style.TextSecure_DarkRegistrationTheme;
   }
 }
diff --git a/src/org/thoughtcrime/securesms/util/DynamicTheme.java b/src/org/thoughtcrime/securesms/util/DynamicTheme.java
index 9ee4e89db6..89c761cb71 100644
--- a/src/org/thoughtcrime/securesms/util/DynamicTheme.java
+++ b/src/org/thoughtcrime/securesms/util/DynamicTheme.java
@@ -28,11 +28,7 @@ public class DynamicTheme {
   }
 
   protected int getSelectedTheme(Activity activity) {
-    String theme = TextSecurePreferences.getTheme(activity);
-
-    if (theme.equals(DARK)) return R.style.TextSecure_DarkTheme;
-
-    return R.style.TextSecure_LightTheme;
+    return R.style.TextSecure_DarkTheme;
   }
 
   private static final class OverridePendingTransition {