From 3de702ced2b463224f3e37b76b04075314ec9188 Mon Sep 17 00:00:00 2001
From: Alinson Xavier <axavier@uwaterloo.ca>
Date: Wed, 13 Apr 2016 10:44:00 -0400
Subject: [PATCH] Fix colors in About screen

---
 app/src/main/java/org/isoron/uhabits/AboutActivity.java | 8 +++++---
 app/src/main/res/layout/about.xml                       | 8 ++++----
 app/src/main/res/values-v21/styles.xml                  | 4 ++++
 app/src/main/res/values/attrs.xml                       | 1 +
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/isoron/uhabits/AboutActivity.java b/app/src/main/java/org/isoron/uhabits/AboutActivity.java
index 87ebad407..9c0bc3335 100644
--- a/app/src/main/java/org/isoron/uhabits/AboutActivity.java
+++ b/app/src/main/java/org/isoron/uhabits/AboutActivity.java
@@ -19,6 +19,7 @@
 
 package org.isoron.uhabits;
 
+import android.app.ActionBar;
 import android.app.Activity;
 import android.content.Intent;
 import android.graphics.Color;
@@ -42,11 +43,12 @@ public class AboutActivity extends Activity implements View.OnClickListener
 
         setContentView(R.layout.about);
 
-        if (android.os.Build.VERSION.SDK_INT >= 21)
+        if (android.os.Build.VERSION.SDK_INT >= 21 && !UIHelper.isNightMode())
         {
-            int color = getResources().getColor(R.color.blue_700);
+            int color = UIHelper.getStyledColor(this, R.attr.aboutScreenColor);
             int darkerColor = ColorHelper.mixColors(color, Color.BLACK, 0.75f);
-            getActionBar().setBackgroundDrawable(new ColorDrawable(color));
+            ActionBar actionBar = getActionBar();
+            if(actionBar != null) actionBar.setBackgroundDrawable(new ColorDrawable(color));
             getWindow().setStatusBarColor(darkerColor);
         }
 
diff --git a/app/src/main/res/layout/about.xml b/app/src/main/res/layout/about.xml
index d9267e95e..8907b2b9f 100644
--- a/app/src/main/res/layout/about.xml
+++ b/app/src/main/res/layout/about.xml
@@ -44,7 +44,7 @@
                 android:textStyle="bold"
                 android:textSize="16sp"
                 android:layout_margin="6dp"
-                android:textColor="@color/blue_700"
+                android:textColor="?aboutScreenColor"
                 android:text="@string/app_name"/>
 
             <TextView
@@ -63,7 +63,7 @@
             <TextView
                 style="@style/CardHeader"
                 android:text="@string/links"
-                android:textColor="@color/blue_700"/>
+                android:textColor="?aboutScreenColor"/>
 
             <TextView
                 android:id="@+id/tvRate"
@@ -89,7 +89,7 @@
             <TextView
                 style="@style/CardHeader"
                 android:text="@string/developers"
-                android:textColor="@color/blue_700"/>
+                android:textColor="?aboutScreenColor"/>
 
             <TextView
                 style="@style/About.Item"
@@ -103,7 +103,7 @@
             <TextView
                 style="@style/CardHeader"
                 android:text="@string/translators"
-                android:textColor="@color/blue_700"/>
+                android:textColor="?aboutScreenColor"/>
 
             <TextView
                 style="@style/About.Item"
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 7eaece733..32334409f 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -45,6 +45,8 @@
         <item name="highContrastTextColor">@color/grey_800</item>
         <item name="mediumContrastTextColor">@color/grey_500</item>
         <item name="lowContrastTextColor">@color/grey_300</item>
+
+        <item name="aboutScreenColor">@color/blue_700</item>
     </style>
 
     <style name="AppBaseThemeDark" parent="android:Theme.Material">
@@ -73,6 +75,8 @@
         <item name="lowContrastReverseTextColor">@color/grey_300</item>
 
         <item name="palette">@array/darkPalette</item>
+
+        <item name="aboutScreenColor">@color/blue_300</item>
     </style>
 
     <style name="AppBaseThemeDark.PureBlack">
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 6fe669dec..e7bb375b9 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -25,6 +25,7 @@
     <attr name="highlightedBackgroundColor" format="reference"/>
     <attr name="useHabitColorAsPrimary" format="boolean"/>
     <attr name="palette" format="reference"/>
+    <attr name="aboutScreenColor" format="reference"/>
 
     <attr name="highContrastTextColor" format="reference"/>
     <attr name="mediumContrastTextColor" format="reference"/>