diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/ColorScheme.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/ColorScheme.kt index 18952e81a..bd5dfa4e9 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/ColorScheme.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/ColorScheme.kt @@ -13,7 +13,7 @@ enum class ColorScheme( @StringRes val titleResId: Int, ) { - DEFAULT(R.style.ThemeOverlay_Kotatsu, R.string.system_default), + DEFAULT(R.style.ThemeOverlay_Kotatsu_Totoro, R.string.theme_name_totoro), MONET(R.style.ThemeOverlay_Kotatsu_Monet, R.string.theme_name_dynamic), EXPRESSIVE(R.style.ThemeOverlay_Kotatsu_Expressive, R.string.theme_name_expressive), MIKU(R.style.ThemeOverlay_Kotatsu_Miku, R.string.theme_name_miku), @@ -22,7 +22,8 @@ enum class ColorScheme( BLUEBERRY(R.style.ThemeOverlay_Kotatsu_Rikka, R.string.theme_name_rikka), SAKURA(R.style.ThemeOverlay_Kotatsu_Sakura, R.string.theme_name_sakura), MAMIMI(R.style.ThemeOverlay_Kotatsu_Mamimi, R.string.theme_name_mamimi), - KANADE(R.style.Theme_Kotatsu_Kanade, R.string.theme_name_kanade) + KANADE(R.style.ThemeOverlay_Kotatsu_Kanade, R.string.theme_name_kanade), + ITSUKA(R.style.ThemeOverlay_Kotatsu_Itsuka, R.string.theme_name_itsuka), ; companion object { diff --git a/app/src/main/res/values-night-v23/color_themes.xml b/app/src/main/res/values-night-v23/color_themes.xml deleted file mode 100644 index 6a4282257..000000000 --- a/app/src/main/res/values-night-v23/color_themes.xml +++ /dev/null @@ -1,262 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/values-night/colors_themed.xml b/app/src/main/res/values-night/colors_themed.xml new file mode 100644 index 000000000..bc770e10c --- /dev/null +++ b/app/src/main/res/values-night/colors_themed.xml @@ -0,0 +1,435 @@ + + + + #A6C8FF + #01315E + #224876 + #D4E3FF + #BCC7DC + #273141 + #3D4758 + #D8E3F8 + #DABDE2 + #3D2846 + #553F5D + #F7D8FF + #FFB4AB + #690005 + #93000A + #FFDAD6 + #111318 + #E1E2E9 + #111318 + #E1E2E9 + #43474E + #C3C6CF + #8D9199 + #43474E + #000000 + #E1E2E9 + #2E3035 + #3C6090 + #D4E3FF + #001C3A + #A6C8FF + #224876 + #D8E3F8 + #111C2B + #BCC7DC + #3D4758 + #F7D8FF + #271430 + #DABDE2 + #553F5D + #111318 + #37393E + #0C0E13 + #191C20 + #1D2024 + #282A2F + #32353A + + #FFB4A8 + #561E17 + #73342B + #FFDAD5 + #E7BDB6 + #442925 + #5D3F3B + #FFDAD5 + #DEC38C + #3E2E04 + #564419 + #FCDFA6 + #FFB4AB + #690005 + #93000A + #FFDAD6 + #1A1110 + #F1DEDC + #1A1110 + #F1DEDC + #534341 + #D8C2BE + #A08C89 + #534341 + #000000 + #F1DEDC + #392E2C + #904A40 + #FFDAD5 + #3B0905 + #FFB4A8 + #73342B + #FFDAD5 + #2C1512 + #E7BDB6 + #5D3F3B + #FCDFA6 + #251A00 + #DEC38C + #564419 + #1A1110 + #423735 + #140C0B + #231918 + #271D1C + #322826 + #3D3231 + + #FFBA8F + #512400 + #FE9245 + #6B3100 + #F7B993 + #4C270B + #673C1F + #E4A883 + #C8D14D + #303300 + #ACB533 + #404500 + #FFB4AB + #690005 + #93000A + #FFDAD6 + #1A110C + #F1DFD5 + #1A110C + #F1DFD5 + #554338 + #DCC1B3 + #A48C7F + #554338 + #000000 + #F1DFD5 + #392E28 + #974800 + #FFDBC7 + #311300 + #FFB689 + #733500 + #FFDBC7 + #311300 + #F7B993 + #673C1F + #E1EB64 + #1B1D00 + #C5CE4A + #464A00 + #1A110C + #423730 + #150C07 + #231A14 + #271E18 + #322822 + #3E322C + + #FFFFFF + #2F2F3D + #E3E1F3 + #474755 + #DDDCDC + #252626 + #919191 + #000000 + #DADDDD + #232627 + #A9ACAC + #1E2122 + #FFD2CC + #540003 + #FF5449 + #000000 + #141314 + #E5E1E3 + #141314 + #FFFFFF + #47464C + #DEDBE2 + #B3B1B7 + #918F96 + #000000 + #E5E1E3 + #2A2A2B + #474755 + #E3E1F3 + #0F101C + #C6C5D6 + #353543 + #E3E2E2 + #101112 + #C7C6C6 + #353636 + #E0E3E3 + #0E1212 + #C4C7C7 + #333737 + #141314 + #454445 + #070708 + #1E1D1E + #282829 + #333233 + #3E3D3E + + #AFC6FF + #142F60 + #2D4578 + #D9E2FF + #BFC6DC + #293042 + #404659 + #DBE2F9 + #DFBBDE + #412742 + #593E5A + #FDD7FB + #FFB4AB + #690005 + #93000A + #FFDAD6 + #121318 + #E2E2E9 + #121318 + #E2E2E9 + #44464F + #C5C6D0 + #8F9099 + #44464F + #000000 + #E2E2E9 + #2F3036 + #465D91 + #D9E2FF + #001944 + #AFC6FF + #2D4578 + #DBE2F9 + #141B2C + #BFC6DC + #404659 + #FDD7FB + #2A132C + #DFBBDE + #593E5A + #121318 + #38393E + #0C0E13 + #1A1B20 + #1E1F25 + #282A2F + #33353A + + #8FCEF3 + #003549 + #004C69 + #C3E8FF + #86D1E9 + #003641 + #004E5E + #B1ECFF + #80D4D6 + #003738 + #004F51 + #9CF1F2 + #FFB4AB + #690005 + #93000A + #FFDAD6 + #0F1417 + #DFE3E7 + #0F1417 + #DFE3E7 + #41484D + #C0C7CD + #8A9297 + #41484D + #000000 + #DFE3E7 + #2C3134 + #1C6585 + #C3E8FF + #001E2C + #8FCEF3 + #004C69 + #B1ECFF + #001F27 + #86D1E9 + #004E5E + #9CF1F2 + #002020 + #80D4D6 + #004F51 + #0F1417 + #353A3D + #0A0F12 + #181C1F + #1C2023 + #262B2E + #313539 + + #A1D39A + #09390F + #235024 + #BCF0B4 + #EEBF6D + #422D00 + #5E4200 + #FFDEA8 + #98D4A4 + #003919 + #16512C + #B3F1BE + #FFB4AB + #690005 + #93000A + #FFDAD6 + #10140F + #E0E4DB + #10140F + #E0E4DB + #424940 + #C2C9BD + #8C9388 + #424940 + #000000 + #E0E4DB + #2D322C + #3B693A + #BCF0B4 + #002204 + #A1D39A + #235024 + #FFDEA8 + #271900 + #EEBF6D + #5E4200 + #B3F1BE + #00210C + #98D4A4 + #16512C + #10140F + #363A34 + #0B0F0A + #191D17 + #1D211B + #272B25 + #323630 + + #D3BBFD + #39265C + #503C74 + #EBDCFF + #CDC2DB + #342D40 + #4B4358 + #EADEF7 + #E6C36C + #3E2E00 + #594400 + #FFDF95 + #FFB4AB + #690005 + #93000A + #FFDAD6 + #151218 + #E7E0E8 + #151218 + #E7E0E8 + #49454E + #CBC4CF + #948F99 + #49454E + #000000 + #E7E0E8 + #322F35 + #68548D + #EBDCFF + #230F46 + #D3BBFD + #503C74 + #EADEF7 + #1F182A + #CDC2DB + #4B4358 + #FFDF95 + #251A00 + #E6C36C + #594400 + #151218 + #3B383E + #0F0D13 + #1D1B20 + #211F24 + #2C292F + #37343A + + #FFB1C8 + #541D32 + #703348 + #FFD9E2 + #E3BDC6 + #422931 + #5B3F47 + #FFD9E2 + #99CCFA + #003351 + #074B72 + #CCE5FF + #FFB4AB + #690005 + #93000A + #FFDAD6 + #191113 + #EFDFE1 + #191113 + #EFDFE1 + #514347 + #D5C2C6 + #9E8C90 + #514347 + #000000 + #EFDFE1 + #372E30 + #8C4A60 + #FFD9E2 + #3A071D + #FFB1C8 + #703348 + #FFD9E2 + #2B151C + #E3BDC6 + #5B3F47 + #CCE5FF + #001D31 + #99CCFA + #074B72 + #191113 + #413739 + #140C0E + #22191C + #261D20 + #31282A + #3C3235 + diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml index 94b323910..9adb383b0 100644 --- a/app/src/main/res/values-night/themes.xml +++ b/app/src/main/res/values-night/themes.xml @@ -3,6 +3,7 @@ - - - - - - - - - - - - - diff --git a/app/src/main/res/values-v23/themes_colored.xml b/app/src/main/res/values-v23/themes_colored.xml new file mode 100644 index 000000000..4f1a12634 --- /dev/null +++ b/app/src/main/res/values-v23/themes_colored.xml @@ -0,0 +1,445 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/colors_themed.xml b/app/src/main/res/values/colors_themed.xml new file mode 100644 index 000000000..67a926d54 --- /dev/null +++ b/app/src/main/res/values/colors_themed.xml @@ -0,0 +1,435 @@ + + + + #3C6090 + #FFFFFF + #D4E3FF + #224876 + #545F71 + #FFFFFF + #D8E3F8 + #3D4758 + #6E5676 + #FFFFFF + #F7D8FF + #553F5D + #BA1A1A + #FFFFFF + #FFDAD6 + #93000A + #F9F9FF + #191C20 + #F9F9FF + #191C20 + #E0E2EC + #43474E + #74777F + #C3C6CF + #000000 + #2E3035 + #F0F0F7 + #A6C8FF + #D4E3FF + #001C3A + #A6C8FF + #224876 + #D8E3F8 + #111C2B + #BCC7DC + #3D4758 + #F7D8FF + #271430 + #DABDE2 + #553F5D + #D9DAE0 + #F9F9FF + #FFFFFF + #F3F3FA + #EDEDF4 + #E7E8EE + #E1E2E9 + + #904A40 + #FFFFFF + #FFDAD5 + #73342B + #775651 + #FFFFFF + #FFDAD5 + #5D3F3B + #705C2E + #FFFFFF + #FCDFA6 + #564419 + #BA1A1A + #FFFFFF + #FFDAD6 + #93000A + #FFF8F6 + #231918 + #FFF8F6 + #231918 + #F5DDDA + #534341 + #857370 + #D8C2BE + #000000 + #392E2C + #FFEDEA + #FFB4A8 + #FFDAD5 + #3B0905 + #FFB4A8 + #73342B + #FFDAD5 + #2C1512 + #E7BDB6 + #5D3F3B + #FCDFA6 + #251A00 + #DEC38C + #564419 + #E8D6D3 + #FFF8F6 + #FFFFFF + #FFF0EE + #FCEAE7 + #F7E4E1 + #F1DEDC + + #974800 + #FFFFFF + #FE9245 + #6B3100 + #825334 + #FFFFFF + #FDBF98 + #794B2D + #5D6300 + #FFFFFF + #ACB533 + #404500 + #BA1A1A + #FFFFFF + #FFDAD6 + #93000A + #FFF8F5 + #231A14 + #FFF8F5 + #231A14 + #F9DDCE + #554338 + #897366 + #DCC1B3 + #000000 + #392E28 + #FFEDE4 + #FFB689 + #FFDBC7 + #311300 + #FFB689 + #733500 + #FFDBC7 + #311300 + #F7B993 + #673C1F + #E1EB64 + #1B1D00 + #C5CE4A + #464A00 + #E9D6CD + #FFF8F5 + #FFFFFF + #FFF1EA + #FDEAE1 + #F7E5DB + #F1DFD5 + + #353543 + #FFFFFF + #6C6C7B + #FFFFFF + #353636 + #FFFFFF + #6D6D6D + #FFFFFF + #333737 + #FFFFFF + #6A6E6E + #FFFFFF + #740006 + #FFFFFF + #CF2C27 + #FFFFFF + #FCF8F9 + #1C1B1C + #FCF8F9 + #111112 + #E4E1E8 + #36363B + #535258 + #6D6C72 + #000000 + #313031 + #F4F0F1 + #C6C5D6 + #6C6C7B + #FFFFFF + #545362 + #FFFFFF + #6D6D6D + #FFFFFF + #545555 + #FFFFFF + #6A6E6E + #FFFFFF + #525556 + #FFFFFF + #C9C6C7 + #FCF8F9 + #FFFFFF + #F7F3F4 + #EBE7E8 + #DFDCDD + #D4D1D2 + + #465D91 + #FFFFFF + #D9E2FF + #2D4578 + #575E71 + #FFFFFF + #DBE2F9 + #404659 + #725572 + #FFFFFF + #FDD7FB + #593E5A + #BA1A1A + #FFFFFF + #FFDAD6 + #93000A + #FAF8FF + #1A1B20 + #FAF8FF + #1A1B20 + #E1E2EC + #44464F + #757780 + #C5C6D0 + #000000 + #2F3036 + #F1F0F7 + #AFC6FF + #D9E2FF + #001944 + #AFC6FF + #2D4578 + #DBE2F9 + #141B2C + #BFC6DC + #404659 + #FDD7FB + #2A132C + #DFBBDE + #593E5A + #DAD9E0 + #FAF8FF + #FFFFFF + #F4F3FA + #EEEDF4 + #E8E7EF + #E2E2E9 + + #1C6585 + #FFFFFF + #C3E8FF + #004C69 + #00677C + #FFFFFF + #B1ECFF + #004E5E + #00696B + #FFFFFF + #9CF1F2 + #004F51 + #BA1A1A + #FFFFFF + #FFDAD6 + #93000A + #F6FAFE + #181C1F + #F6FAFE + #181C1F + #DCE3E9 + #41484D + #71787D + #C0C7CD + #000000 + #2C3134 + #EDF1F5 + #8FCEF3 + #C3E8FF + #001E2C + #8FCEF3 + #004C69 + #B1ECFF + #001F27 + #86D1E9 + #004E5E + #9CF1F2 + #002020 + #80D4D6 + #004F51 + #D6DADF + #F6FAFE + #FFFFFF + #F0F4F8 + #EAEEF2 + #E5E9ED + #DFE3E7 + + #3B693A + #FFFFFF + #BCF0B4 + #235024 + #7B580D + #FFFFFF + #FFDEA8 + #5E4200 + #316A42 + #FFFFFF + #B3F1BE + #16512C + #BA1A1A + #FFFFFF + #FFDAD6 + #93000A + #F7FBF1 + #191D17 + #F7FBF1 + #191D17 + #DEE5D8 + #424940 + #72796F + #C2C9BD + #000000 + #2D322C + #EEF2E9 + #A1D39A + #BCF0B4 + #002204 + #A1D39A + #235024 + #FFDEA8 + #271900 + #EEBF6D + #5E4200 + #B3F1BE + #00210C + #98D4A4 + #16512C + #D8DBD2 + #F7FBF1 + #FFFFFF + #F1F5EC + #ECEFE6 + #E6E9E0 + #E0E4DB + + #68548D + #FFFFFF + #EBDCFF + #503C74 + #635B70 + #FFFFFF + #EADEF7 + #4B4358 + #755B0B + #FFFFFF + #FFDF95 + #594400 + #BA1A1A + #FFFFFF + #FFDAD6 + #93000A + #FEF7FF + #1D1B20 + #FEF7FF + #1D1B20 + #E7E0EB + #49454E + #7A757F + #CBC4CF + #000000 + #322F35 + #F5EFF7 + #D3BBFD + #EBDCFF + #230F46 + #D3BBFD + #503C74 + #EADEF7 + #1F182A + #CDC2DB + #4B4358 + #FFDF95 + #251A00 + #E6C36C + #594400 + #DED8E0 + #FEF7FF + #FFFFFF + #F8F1FA + #F2ECF4 + #EDE6EE + #E7E0E8 + + #8C4A60 + #FFFFFF + #FFD9E2 + #703348 + #74565F + #FFFFFF + #FFD9E2 + #5B3F47 + #2C638B + #FFFFFF + #CCE5FF + #074B72 + #BA1A1A + #FFFFFF + #FFDAD6 + #93000A + #FFF8F8 + #22191C + #FFF8F8 + #22191C + #F2DDE1 + #514347 + #837377 + #D5C2C6 + #000000 + #372E30 + #FDEDEF + #FFB1C8 + #FFD9E2 + #3A071D + #FFB1C8 + #703348 + #FFD9E2 + #2B151C + #E3BDC6 + #5B3F47 + #CCE5FF + #001D31 + #99CCFA + #074B72 + #E6D6D9 + #FFF8F8 + #FFFFFF + #FFF0F2 + #FAEAED + #F5E4E7 + #EFDFE1 + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 794456768..e40d729f4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -849,4 +849,6 @@ Share backup Open reader in a separate task Allows you to keep multiple readers with different manga open at the same time + Itsuka + Totoro diff --git a/app/src/main/res/values/color_themes.xml b/app/src/main/res/values/themes_colored.xml similarity index 70% rename from app/src/main/res/values/color_themes.xml rename to app/src/main/res/values/themes_colored.xml index 32040f6a3..fb19a23e2 100644 --- a/app/src/main/res/values/color_themes.xml +++ b/app/src/main/res/values/themes_colored.xml @@ -1,15 +1,21 @@ -