From a767c84f74812032fa88b67eef99e0e1f720433e Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Mon, 22 Jul 2019 14:05:51 +1000
Subject: [PATCH] Fix remaining UI issues

---
 res/layout/activity_new_conversation.xml                 | 2 --
 res/values/colors.xml                                    | 9 +++++++--
 res/values/themes.xml                                    | 4 ++--
 .../securesms/loki/NewConversationActivity.kt            | 9 +++++++++
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/res/layout/activity_new_conversation.xml b/res/layout/activity_new_conversation.xml
index f2f28a1b80..e929910b48 100644
--- a/res/layout/activity_new_conversation.xml
+++ b/res/layout/activity_new_conversation.xml
@@ -6,7 +6,6 @@
     android:layout_height="match_parent"
     android:layout_marginStart="32dp"
     android:layout_marginEnd="32dp"
-    android:background="@color/white"
     android:orientation="vertical">
 
     <org.thoughtcrime.securesms.components.LabeledEditText
@@ -14,7 +13,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_new_conversation_public_key_edit_text_label"/>
 
     <TextView
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 6b2d60cb49..17f461878a 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -1,7 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-    <color name="signal_primary">#ff5bca5b</color>
-    <color name="signal_primary_dark">#ff5bca5b</color>
+    <!-- Loki -->
+    <color name="loki_green">#78be20</color>
+    <color name="loki_darkest_gray">#0a0a0a</color>
+    <!-- Loki -->
+
+    <color name="signal_primary">@color/loki_green</color>
+    <color name="signal_primary_dark">@color/loki_green</color>
     <color name="signal_primary_alpha33">#555bca5b</color>
     <color name="signal_primary_alpha_focus">#882090ea</color>
 
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 093d7a6139..9ce3781a0a 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -281,7 +281,7 @@
         <item name="colorAccent">@color/textsecure_primary_dark</item>
         <item name="colorControlActivated">@color/signal_primary_dark</item>
         <item name="colorControlHighlight">@color/signal_primary_dark</item>
-        <item name="android:windowBackground">@color/core_grey_95</item>
+        <item name="android:windowBackground">@color/loki_darkest_gray</item>
         <item name="alertDialogTheme">@style/AppCompatAlertDialogStyleDark</item>
         <item name="android:alertDialogTheme">@style/AppCompatDialogStyleDark</item>
 
@@ -339,7 +339,7 @@
         <item name="fab_color">@color/textsecure_primary_dark</item>
         <item name="lower_right_divet">@drawable/divet_lower_right_light</item>
 
-        <item name="conversation_background">@color/core_grey_95</item>
+        <item name="conversation_background">@color/loki_darkest_gray</item>
         <item name="conversation_editor_background">#22ffffff</item>
         <item name="conversation_editor_text_color">#ffeeeeee</item>
         <item name="conversation_input_background">@drawable/compose_background_dark</item>
diff --git a/src/org/thoughtcrime/securesms/loki/NewConversationActivity.kt b/src/org/thoughtcrime/securesms/loki/NewConversationActivity.kt
index f4a044c164..3942d300e4 100644
--- a/src/org/thoughtcrime/securesms/loki/NewConversationActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/NewConversationActivity.kt
@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.loki
 
 import android.content.Intent
 import android.os.Bundle
+import android.view.MenuItem
 import android.widget.Toast
 import kotlinx.android.synthetic.main.activity_new_conversation.*
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
@@ -33,6 +34,14 @@ class NewConversationActivity : PassphraseRequiredActionBarActivity() {
         dynamicTheme.onResume(this)
     }
 
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == android.R.id.home) {
+            onBackPressed()
+            return true
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
     private fun startNewConversationIfPossible() {
         val hexEncodedPublicKey = publicKeyEditText.text.toString().trim()
         if (PublicKeyValidation.isValid(hexEncodedPublicKey)) {