From c95ce2824540d46bccf3965b8630addcdc7a0687 Mon Sep 17 00:00:00 2001
From: Trevor Slocum <trevor@rocketnine.space>
Date: Thu, 8 Jul 2021 23:57:38 -0700
Subject: [PATCH] Add Black theme

Resolves #92.
---
 CHANGELOG                                              |  3 +++
 .../meditationassistant/MeditationAssistant.java       | 10 +++++++---
 MeditationAssistant/src/main/res/values/arrays.xml     |  2 ++
 MeditationAssistant/src/main/res/values/strings.xml    |  1 +
 MeditationAssistant/src/main/res/values/styles.xml     |  9 +++++++++
 build.gradle                                           |  2 +-
 gradle/wrapper/gradle-wrapper.properties               |  2 +-
 7 files changed, 24 insertions(+), 5 deletions(-)

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 @@
         <item>light</item>
         <item>lightdark</item>
         <item>dark</item>
+        <item>black</item>
     </string-array>
     <string-array name="mathemes">
         <item>@string/buddhism</item>
         <item>@string/pref_theme_light</item>
         <item>@string/pref_theme_lightdark</item>
         <item>@string/pref_theme_dark</item>
+        <item>@string/pref_theme_black</item>
     </string-array>
     <string-array name="notificationcontrol_values">
         <item></item>
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 @@
     <string name="pref_theme_light">Light</string>
     <string name="pref_theme_lightdark">Light with dark action bar</string>
     <string name="pref_theme_dark">Dark</string>
+    <string name="pref_theme_black">Black</string>
     <string name="buddhism">Buddhism</string>
     <string name="pref_widgetcolor">Widget color</string>
     <string name="pref_notification">Notification</string>
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 @@
         <item name="alertDialogTheme">@style/MeditationDarkDialogTheme</item>
     </style>
 
+    <style name="MeditationBlackTheme" parent="MeditationDarkTheme">
+        <item name="android:windowBackground">@android:color/black</item>
+    </style>
+
     <style name="MeditationLightDialogTheme" parent="android:Theme.Holo.Light.Dialog">
         <item name="actionIconTime">@drawable/ic_action_time_light</item>
         <item name="actionIconVolumeOn">@drawable/ic_action_volume_on_light</item>
@@ -188,6 +192,11 @@
         <item name="numberPickerStyle">@style/NPWidget.Holo.NumberPicker</item>
     </style>
 
+    <style name="MeditationBlackDialogTheme" parent="MeditationDarkDialogTheme">
+        <item name="android:background">@android:color/black</item>
+        <item name="android:windowBackground">@android:color/black</item>
+    </style>
+
     <!-- You can also inherit from NNF_BaseTheme.Light -->
     <style name="FilePickerTheme" parent="NNF_BaseTheme">
         <!-- Need to set this also to style create folder dialog -->
diff --git a/build.gradle b/build.gradle
index 8e34b10..20aa54f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:4.2.2'
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 72d318e..0673501 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip