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"/>
+ android:textColor="?aboutScreenColor"/>
+ android:textColor="?aboutScreenColor"/>
+ android:textColor="?aboutScreenColor"/>
@color/grey_800
- @color/grey_500
- @color/grey_300
+
+ - @color/blue_700