diff --git a/README.md b/README.md index 95cbf6f69..528785145 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ **[Kotatsu](https://github.com/KotatsuApp/Kotatsu) is a free and open-source manga reader for Android with built-in online content sources.** -![Downloads count](https://img.shields.io/github/downloads/KotatsuApp/Kotatsu/total?color=1976d2) ![Latest Stable version](https://img.shields.io/github/v/release/KotatsuApp/Kotatsu?color=2596be&label=latest) ![Android 5.0](https://img.shields.io/badge/android-5.0+-brightgreen) [![Sources count](https://img.shields.io/badge/dynamic/yaml?url=https%3A%2F%2Fraw.githubusercontent.com%2FKotatsuApp%2Fkotatsu-parsers%2Frefs%2Fheads%2Fmaster%2F.github%2Fsummary.yaml&query=total&label=manga%20sources&color=%23E9321C)](https://github.com/KotatsuApp/kotatsu-parsers) [![weblate](https://hosted.weblate.org/widgets/kotatsu/-/strings/svg-badge.svg)](https://hosted.weblate.org/engage/kotatsu/) [![Discord](https://img.shields.io/discord/898363402467045416?color=5865f2&label=discord)](https://discord.gg/NNJ5RgVBC5) [![Telegram](https://img.shields.io/badge/chat-telegram-60ACFF?)](https://t.me/kotatsuapp) [![License](https://img.shields.io/github/license/KotatsuApp/Kotatsu)](https://github.com/KotatsuApp/Kotatsu/blob/devel/LICENSE) +![Downloads count](https://img.shields.io/github/downloads/KotatsuApp/Kotatsu/total?color=1976d2) ![Latest Stable version](https://img.shields.io/github/v/release/KotatsuApp/Kotatsu?color=2596be&label=latest) ![Android 6.0](https://img.shields.io/badge/android-6.0+-brightgreen) [![Sources count](https://img.shields.io/badge/dynamic/yaml?url=https%3A%2F%2Fraw.githubusercontent.com%2FKotatsuApp%2Fkotatsu-parsers%2Frefs%2Fheads%2Fmaster%2F.github%2Fsummary.yaml&query=total&label=manga%20sources&color=%23E9321C)](https://github.com/KotatsuApp/kotatsu-parsers) [![weblate](https://hosted.weblate.org/widgets/kotatsu/-/strings/svg-badge.svg)](https://hosted.weblate.org/engage/kotatsu/) [![Discord](https://img.shields.io/discord/898363402467045416?color=5865f2&label=discord)](https://discord.gg/NNJ5RgVBC5) [![Telegram](https://img.shields.io/badge/chat-telegram-60ACFF?)](https://t.me/kotatsuapp) [![License](https://img.shields.io/github/license/KotatsuApp/Kotatsu)](https://github.com/KotatsuApp/Kotatsu/blob/devel/LICENSE) ### Download diff --git a/app/build.gradle b/app/build.gradle index d02d9e75e..ce1427211 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,7 +19,7 @@ android { defaultConfig { applicationId 'org.koitharu.kotatsu' - minSdk = 21 + minSdk = 23 targetSdk = 36 versionCode = 1028 versionName = '9.1.4' diff --git a/app/src/main/res/color-v23/bg_background_transparency.xml b/app/src/main/res/color-v23/bg_background_transparency.xml deleted file mode 100644 index 10ead35b8..000000000 --- a/app/src/main/res/color-v23/bg_background_transparency.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/src/main/res/color-v23/bg_floating_button.xml b/app/src/main/res/color-v23/bg_floating_button.xml deleted file mode 100644 index 1ebbd47ea..000000000 --- a/app/src/main/res/color-v23/bg_floating_button.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/src/main/res/color-v23/colored_button.xml b/app/src/main/res/color-v23/colored_button.xml deleted file mode 100644 index f9a6f2e61..000000000 --- a/app/src/main/res/color-v23/colored_button.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/src/main/res/color-v23/list_item_background_color.xml b/app/src/main/res/color-v23/list_item_background_color.xml deleted file mode 100644 index cfbdae9db..000000000 --- a/app/src/main/res/color-v23/list_item_background_color.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/color-v23/selector_overlay.xml b/app/src/main/res/color-v23/selector_overlay.xml deleted file mode 100644 index c2d5a252d..000000000 --- a/app/src/main/res/color-v23/selector_overlay.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/app/src/main/res/color/bg_background_transparency.xml b/app/src/main/res/color/bg_background_transparency.xml index fa68fe97f..10ead35b8 100644 --- a/app/src/main/res/color/bg_background_transparency.xml +++ b/app/src/main/res/color/bg_background_transparency.xml @@ -1,4 +1,4 @@ - + diff --git a/app/src/main/res/color/bg_floating_button.xml b/app/src/main/res/color/bg_floating_button.xml index b40058de7..1ebbd47ea 100644 --- a/app/src/main/res/color/bg_floating_button.xml +++ b/app/src/main/res/color/bg_floating_button.xml @@ -1,5 +1,4 @@ - - + diff --git a/app/src/main/res/color-v23/bottom_menu_active_indicator.xml b/app/src/main/res/color/bottom_menu_active_indicator.xml similarity index 100% rename from app/src/main/res/color-v23/bottom_menu_active_indicator.xml rename to app/src/main/res/color/bottom_menu_active_indicator.xml diff --git a/app/src/main/res/color-v23/bottom_menu_active_item.xml b/app/src/main/res/color/bottom_menu_active_item.xml similarity index 100% rename from app/src/main/res/color-v23/bottom_menu_active_item.xml rename to app/src/main/res/color/bottom_menu_active_item.xml diff --git a/app/src/main/res/color/colored_button.xml b/app/src/main/res/color/colored_button.xml index 620b39765..f9a6f2e61 100644 --- a/app/src/main/res/color/colored_button.xml +++ b/app/src/main/res/color/colored_button.xml @@ -1,4 +1,4 @@ - + diff --git a/app/src/main/res/color/list_item_background_color.xml b/app/src/main/res/color/list_item_background_color.xml index ac9526c88..5e191ef00 100644 --- a/app/src/main/res/color/list_item_background_color.xml +++ b/app/src/main/res/color/list_item_background_color.xml @@ -1,6 +1,5 @@ - - + - \ No newline at end of file + diff --git a/app/src/main/res/color/selector_overlay.xml b/app/src/main/res/color/selector_overlay.xml index a4b34206f..c2d5a252d 100644 --- a/app/src/main/res/color/selector_overlay.xml +++ b/app/src/main/res/color/selector_overlay.xml @@ -1,5 +1,4 @@ - - + diff --git a/app/src/main/res/drawable-v23/m3_popup_background.xml b/app/src/main/res/drawable-v23/m3_popup_background.xml deleted file mode 100644 index 3ede5c457..000000000 --- a/app/src/main/res/drawable-v23/m3_popup_background.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable-v23/m3_spinner_popup_background.xml b/app/src/main/res/drawable-v23/m3_spinner_popup_background.xml deleted file mode 100644 index 04ee60a0a..000000000 --- a/app/src/main/res/drawable-v23/m3_spinner_popup_background.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable-v23/tabs_background.xml b/app/src/main/res/drawable-v23/tabs_background.xml deleted file mode 100644 index e874ceea0..000000000 --- a/app/src/main/res/drawable-v23/tabs_background.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/m3_popup_background.xml b/app/src/main/res/drawable/m3_popup_background.xml index 98f60a8be..3ede5c457 100644 --- a/app/src/main/res/drawable/m3_popup_background.xml +++ b/app/src/main/res/drawable/m3_popup_background.xml @@ -2,13 +2,13 @@ - + - + diff --git a/app/src/main/res/drawable/m3_spinner_popup_background.xml b/app/src/main/res/drawable/m3_spinner_popup_background.xml index 9cb3a631a..04ee60a0a 100644 --- a/app/src/main/res/drawable/m3_spinner_popup_background.xml +++ b/app/src/main/res/drawable/m3_spinner_popup_background.xml @@ -2,13 +2,13 @@ - + - + diff --git a/app/src/main/res/drawable/tabs_background.xml b/app/src/main/res/drawable/tabs_background.xml index 6de3accf7..e874ceea0 100644 --- a/app/src/main/res/drawable/tabs_background.xml +++ b/app/src/main/res/drawable/tabs_background.xml @@ -4,7 +4,7 @@ - + @@ -12,7 +12,7 @@ android:bottom="1dp"> - + diff --git a/app/src/main/res/values-v23/bools.xml b/app/src/main/res/values-v23/bools.xml deleted file mode 100644 index 22d1802ff..000000000 --- a/app/src/main/res/values-v23/bools.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - true - diff --git a/app/src/main/res/values-v23/themes.xml b/app/src/main/res/values-v23/themes.xml deleted file mode 100644 index d2478a7f5..000000000 --- a/app/src/main/res/values-v23/themes.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/values-v27/themes.xml b/app/src/main/res/values-v27/themes.xml index b03bf93df..2ab8fde5e 100644 --- a/app/src/main/res/values-v27/themes.xml +++ b/app/src/main/res/values-v27/themes.xml @@ -1,7 +1,7 @@ - diff --git a/app/src/main/res/values/bools.xml b/app/src/main/res/values/bools.xml index dee4d7e61..dd86f6634 100644 --- a/app/src/main/res/values/bools.xml +++ b/app/src/main/res/values/bools.xml @@ -4,7 +4,6 @@ true false true - false true true diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 026a45adc..232bd1a42 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -46,8 +46,8 @@ @bool/light_status_bar - @color/dim - @color/surface_amoled + @android:color/transparent + @color/dim @null false false diff --git a/app/src/main/res/values/themes_colored.xml b/app/src/main/res/values/themes_colored.xml index fb19a23e2..4f1a12634 100644 --- a/app/src/main/res/values/themes_colored.xml +++ b/app/src/main/res/values/themes_colored.xml @@ -1,21 +1,445 @@ + + + + - + + + + + + + + + + + + diff --git a/app/src/main/res/xml/pref_appearance.xml b/app/src/main/res/xml/pref_appearance.xml index fa8f626a0..cafc23ee4 100644 --- a/app/src/main/res/xml/pref_appearance.xml +++ b/app/src/main/res/xml/pref_appearance.xml @@ -6,8 +6,7 @@ + android:title="@string/color_theme" />