diff --git a/CHANGELOG b/CHANGELOG
index ed5f35c..da5dbee 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+1.6.5:
+- Add Black theme
+
1.6.4:
- Fix importing/exporting sessions and playing custom sounds (thanks MovingEarth)
- Fix crash on Android 4.3+ devices (thanks MovingEarth)
diff --git a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/MeditationAssistant.java b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/MeditationAssistant.java
index edc562f..129de43 100644
--- a/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/MeditationAssistant.java
+++ b/MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/MeditationAssistant.java
@@ -474,16 +474,20 @@ public class MeditationAssistant extends Application {
}
if (dialogue) {
- if (!theme.equals("dark")) {
- return R.style.MeditationLightDialogTheme;
- } else {
+ if (theme.equals("dark")) {
return R.style.MeditationDarkDialogTheme;
+ } else if (theme.equals("black")) {
+ return R.style.MeditationBlackDialogTheme;
+ } else {
+ return R.style.MeditationLightDialogTheme;
}
} else {
if (theme.equals("light")) {
return R.style.MeditationLightTheme;
} else if (theme.equals("lightdark")) {
return R.style.MeditationLightDarkTheme;
+ } else if (theme.equals("black")) {
+ return R.style.MeditationBlackTheme;
} else {
return R.style.MeditationDarkTheme;
}
diff --git a/MeditationAssistant/src/main/res/values/arrays.xml b/MeditationAssistant/src/main/res/values/arrays.xml
index d25d712..cbcbef9 100644
--- a/MeditationAssistant/src/main/res/values/arrays.xml
+++ b/MeditationAssistant/src/main/res/values/arrays.xml
@@ -80,12 +80,14 @@
- light
- lightdark
- dark
+ - black
- @string/buddhism
- @string/pref_theme_light
- @string/pref_theme_lightdark
- @string/pref_theme_dark
+ - @string/pref_theme_black
diff --git a/MeditationAssistant/src/main/res/values/strings.xml b/MeditationAssistant/src/main/res/values/strings.xml
index f12b837..d422d02 100644
--- a/MeditationAssistant/src/main/res/values/strings.xml
+++ b/MeditationAssistant/src/main/res/values/strings.xml
@@ -208,6 +208,7 @@
Light
Light with dark action bar
Dark
+ Black
Buddhism
Widget color
Notification
diff --git a/MeditationAssistant/src/main/res/values/styles.xml b/MeditationAssistant/src/main/res/values/styles.xml
index f670214..08e9146 100644
--- a/MeditationAssistant/src/main/res/values/styles.xml
+++ b/MeditationAssistant/src/main/res/values/styles.xml
@@ -128,6 +128,10 @@
- @style/MeditationDarkDialogTheme
+
+
+
+