From 1eb85d441919192a85777038e143859aaae427e0 Mon Sep 17 00:00:00 2001
From: Finnley Somdahl <87634197+rebelonion@users.noreply.github.com>
Date: Thu, 26 Oct 2023 02:08:35 -0500
Subject: [PATCH] new themes
---
.../dantotsu/connections/UpdateProgress.kt | 2 +-
.../java/ani/dantotsu/themes/ThemeManager.kt | 18 ++-
app/src/main/res/values-night/themes.xml | 58 ++++++++
app/src/main/res/values/colors.xml | 129 ++++++++++++++++++
app/src/main/res/values/themes.xml | 57 ++++++++
stable.md | 16 ++-
6 files changed, 272 insertions(+), 8 deletions(-)
diff --git a/app/src/main/java/ani/dantotsu/connections/UpdateProgress.kt b/app/src/main/java/ani/dantotsu/connections/UpdateProgress.kt
index 61cdd809..c930ab67 100644
--- a/app/src/main/java/ani/dantotsu/connections/UpdateProgress.kt
+++ b/app/src/main/java/ani/dantotsu/connections/UpdateProgress.kt
@@ -16,7 +16,7 @@ fun updateProgress(media: Media, number: String) {
if (Anilist.userid != null) {
CoroutineScope(Dispatchers.IO).launch {
val a = number.toFloatOrNull()?.roundToInt()
- if (a != media.userProgress) {
+ if ((a?:0) > (media.userProgress?:0)) {
Anilist.mutation.editList(
media.id,
a,
diff --git a/app/src/main/java/ani/dantotsu/themes/ThemeManager.kt b/app/src/main/java/ani/dantotsu/themes/ThemeManager.kt
index 4233f080..55f126b9 100644
--- a/app/src/main/java/ani/dantotsu/themes/ThemeManager.kt
+++ b/app/src/main/java/ani/dantotsu/themes/ThemeManager.kt
@@ -12,9 +12,6 @@ class ThemeManager(private val context: Context) {
"PURPLE" -> {
context.setTheme(R.style.Theme_Dantotsu_Purple)
}
- //"MONOCHROME" -> {
- // context.setTheme(R.style.Theme_Dantotsu_Monochrome)
- //}
"BLUE" -> {
context.setTheme(R.style.Theme_Dantotsu_Blue)
}
@@ -24,6 +21,15 @@ class ThemeManager(private val context: Context) {
"PINK" -> {
context.setTheme(R.style.Theme_Dantotsu_Pink)
}
+ "RED" -> {
+ context.setTheme(R.style.Theme_Dantotsu_Red)
+ }
+ "LAVENDER" -> {
+ context.setTheme(R.style.Theme_Dantotsu_Lavender)
+ }
+ "MONOCHROME (BETA)" -> {
+ context.setTheme(R.style.Theme_Dantotsu_Monochrome)
+ }
else -> {
context.setTheme(R.style.Theme_Dantotsu_Purple)
}
@@ -35,8 +41,10 @@ class ThemeManager(private val context: Context) {
PURPLE("PURPLE"),
BLUE("BLUE"),
GREEN("GREEN"),
- PINK("PINK");
- //MONOCHROME("MONOCHROME");
+ PINK("PINK"),
+ RED("RED"),
+ LAVENDER("LAVENDER"),
+ MONOCHROME("MONOCHROME (BETA)");
companion object {
fun fromString(value: String): Theme {
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index e9bcb89e..6fbc7a99 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -150,4 +150,62 @@
- @color/bg_white
- @color/bg_black
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 09c234f2..8c98f79e 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -20,6 +20,7 @@
#FF0000
#444444
#999999
+ #030201
#00658e
@@ -269,4 +270,132 @@
#FFAED9
#504349
#000000
+
+ #c9000b
+ #C0000A
+ #FFFFFF
+ #FFDAD5
+ #410001
+ #775652
+ #FFFFFF
+ #FFDAD5
+ #2C1512
+ #705C2E
+ #FFFFFF
+ #FCDFA6
+ #261A00
+ #BA1A1A
+ #FFDAD6
+ #FFFFFF
+ #410002
+ #FFFBFF
+ #201A19
+ #FFFBFF
+ #201A19
+ #F5DDDA
+ #534341
+ #857370
+ #FBEEEC
+ #362F2E
+ #FFB4AA
+ #000000
+ #C0000A
+ #D8C2BE
+ #000000
+ #FFB4AA
+ #690003
+ #930005
+ #FFDAD5
+ #E7BDB7
+ #442926
+ #5D3F3B
+ #FFDAD5
+ #DFC38C
+ #3E2E04
+ #574419
+ #FCDFA6
+ #FFB4AB
+ #93000A
+ #690005
+ #FFDAD6
+ #201A19
+ #EDE0DE
+ #201A19
+ #EDE0DE
+ #534341
+ #D8C2BE
+ #A08C89
+ #201A19
+ #EDE0DE
+ #C0000A
+ #000000
+ #FFB4AA
+ #534341
+ #000000
+
+ #6750A4
+ #6750A4
+ #FFFFFF
+ #E9DDFF
+ #22005D
+ #625B71
+ #FFFFFF
+ #E8DEF8
+ #1E192B
+ #7E5260
+ #FFFFFF
+ #FFD9E3
+ #31101D
+ #BA1A1A
+ #FFDAD6
+ #FFFFFF
+ #410002
+ #FFFBFF
+ #1C1B1E
+ #FFFBFF
+ #1C1B1E
+ #E7E0EB
+ #49454E
+ #7A757F
+ #F4EFF4
+ #313033
+ #CFBCFF
+ #000000
+ #6750A4
+ #CAC4CF
+ #000000
+ #CFBCFF
+ #381E72
+ #4F378A
+ #E9DDFF
+ #CBC2DB
+ #332D41
+ #4A4458
+ #E8DEF8
+ #EFB8C8
+ #4A2532
+ #633B48
+ #FFD9E3
+ #FFB4AB
+ #93000A
+ #690005
+ #FFDAD6
+ #1C1B1E
+ #E6E1E6
+ #1C1B1E
+ #E6E1E6
+ #49454E
+ #CAC4CF
+ #948F99
+ #1C1B1E
+ #E6E1E6
+ #6750A4
+ #000000
+ #CFBCFF
+ #49454E
+ #000000
+ #93DB00
+ #68AF86
+ #0096AE
+ #000000
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 0386e107..6344d4c6 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -217,5 +217,62 @@
- @color/bg_white
+
+
+
\ No newline at end of file
diff --git a/stable.md b/stable.md
index 20ea5695..8fececef 100644
--- a/stable.md
+++ b/stable.md
@@ -1,3 +1,15 @@
-# 0.1.4
+# 0.1.5
-- hotfix for those who crashed when opening an anime/manga
\ No newline at end of file
+- **Bugfixes:**
+ - Fixed very annoying bug with extension page freezing/crashing
+ - Search is now EVEN MORE likely to select the right source
+ - Fixed more softsubs not showing
+ - Fixed various crashes
+ - Fixeded anilist not working sometimes after theme switch
+ - Fixed various theme problems/annoyances
+ - Fixed manga image not loading on tap and hold
+ - Fixed Dantotsu re-setting progress on re-watching.
+
+- **New Features:**
+ - 3 themes added
+ - OLED theme (Monochrome in darkmode) -> testing
\ No newline at end of file