Browse Source

Add Black theme

Resolves #92.
master
Trevor Slocum 2 months ago
parent
commit
c95ce28245
  1. 3
      CHANGELOG
  2. 10
      MeditationAssistant/src/main/java/sh/ftp/rocketninelabs/meditationassistant/MeditationAssistant.java
  3. 2
      MeditationAssistant/src/main/res/values/arrays.xml
  4. 1
      MeditationAssistant/src/main/res/values/strings.xml
  5. 9
      MeditationAssistant/src/main/res/values/styles.xml
  6. 2
      build.gradle
  7. 2
      gradle/wrapper/gradle-wrapper.properties

3
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)

10
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;
}

2
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>

1
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>

9
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 -->

2
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'
}
}

2
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
Loading…
Cancel
Save