From 884733505a5859bcfb77ac531c1d1d604a9caeb8 Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Wed, 26 Sep 2018 21:57:54 +0200
Subject: [PATCH] change color to deltagreen, closes #49

---
 res/layout/conversation_list_fragment.xml                | 1 +
 res/values/colors.xml                                    | 4 ++--
 res/values/styles.xml                                    | 8 --------
 src/org/thoughtcrime/securesms/ConversationActivity.java | 9 ---------
 .../securesms/components/AvatarImageView.java            | 2 +-
 5 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/res/layout/conversation_list_fragment.xml b/res/layout/conversation_list_fragment.xml
index 988f5189f..6b357d298 100644
--- a/res/layout/conversation_list_fragment.xml
+++ b/res/layout/conversation_list_fragment.xml
@@ -72,6 +72,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|end"
             android:layout_margin="16dp"
+            app:backgroundTint="@color/signal_primary"
             android:src="@drawable/ic_create_white_24dp"
             android:focusable="true"
             android:contentDescription="@string/conversation_list_fragment__fab_content_description"/>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 7647b7de4..0ec30daee 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -1,7 +1,7 @@
 <?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">#ff415e6b</color>
+    <color name="signal_primary_dark">#ff364e59</color>
     <color name="signal_primary_alpha33">#552090ea</color>
     <color name="signal_primary_alpha_focus">#882090ea</color>
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 1a4cbf1bf..307651a9a 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -19,23 +19,15 @@
     </style>
 
     <style name="AppCompatAlertDialogStyleLight" parent="Theme.AppCompat.Light.Dialog.Alert">
-        <item name="colorAccent">@color/signal_primary_dark</item>
     </style>
 
     <style name="AppCompatAlertDialogStyleDark" parent="Theme.AppCompat.Dialog.Alert">
-        <item name="colorAccent">@color/signal_primary</item>
-        <item name="android:textColor">@null</item>
     </style>
 
     <style name="AppCompatDialogStyleLight" parent="Theme.AppCompat.Light.Dialog">
-        <item name="colorAccent">@color/signal_primary_dark</item>
-        <item name="android:windowBackground">@drawable/dialog_background</item>
     </style>
 
     <style name="AppCompatDialogStyleDark" parent="Theme.AppCompat.Dialog">
-        <item name="colorAccent">@color/signal_primary</item>
-        <item name="android:windowBackground">@drawable/dialog_background</item>
-        <item name="android:textColor">@null</item>
     </style>
 
     <!-- ActionBar styles -->
diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index 99cfb1d5f..fa5f81ff1 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -349,7 +349,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
     titleView.setTitle(glideRequests, dcChat);
     titleView.setVerified(dcChat.isVerified());
-    setActionBarColor(recipient.getColor());
     setBlockedUserState(recipient, isSecureText, isDefaultSms);
     setGroupShareProfileReminder(recipient);
     calculateCharactersRemaining();
@@ -1122,7 +1121,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       Log.w(TAG, "onModifiedRun(): " + recipient.getRegistered());
       titleView.setTitle(glideRequests, dcChat);
       setBlockedUserState(recipient, isSecureText, isDefaultSms);
-      setActionBarColor(recipient.getColor());
       setGroupShareProfileReminder(recipient);
       updateReminders();
       updateDefaultSubscriptionId(recipient.getDefaultSubscriptionId());
@@ -1288,13 +1286,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     return future;
   }
 
-  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));
-  }
-
   private void setBlockedUserState(Recipient recipient, boolean isSecureText, boolean isDefaultSms) {
     if (false) { // TODO: do we need a unblock button here? typically, the chatlist is closed when blocked
       unblockButton.setVisibility(View.VISIBLE);
diff --git a/src/org/thoughtcrime/securesms/components/AvatarImageView.java b/src/org/thoughtcrime/securesms/components/AvatarImageView.java
index cacf4b203..20b36b474 100644
--- a/src/org/thoughtcrime/securesms/components/AvatarImageView.java
+++ b/src/org/thoughtcrime/securesms/components/AvatarImageView.java
@@ -36,7 +36,7 @@ public class AvatarImageView extends AppCompatImageView {
 
     if (attrs != null) {
       TypedArray typedArray = context.getTheme().obtainStyledAttributes(attrs, R.styleable.AvatarImageView, 0, 0);
-      inverted = typedArray.getBoolean(0, false);
+      //inverted = typedArray.getBoolean(0, false);
       typedArray.recycle();
     }
   }