From 912687ac78a7de0ce847bfd9a7b0b3bcde9cd02c Mon Sep 17 00:00:00 2001 From: arkon Date: Sun, 2 Aug 2020 23:03:24 -0400 Subject: [PATCH] Adjust download badge color again --- .../kanade/tachiyomi/extension/api/ExtensionGithubApi.kt | 2 +- .../tachiyomi/extension/api/ExtensionGithubService.kt | 2 +- app/src/main/res/layout/library_controller.xml | 4 ++-- app/src/main/res/layout/source_comfortable_grid_item.xml | 8 ++++---- app/src/main/res/layout/source_compact_grid_item.xml | 8 ++++---- app/src/main/res/layout/source_list_item.xml | 8 ++++---- app/src/main/res/values/colors.xml | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt index 996f5de1e6..41d2499029 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt @@ -76,6 +76,6 @@ internal class ExtensionGithubApi { companion object { const val BASE_URL = "https://raw.githubusercontent.com/" - private const val REPO_URL_PREFIX = "${BASE_URL}inorichi/tachiyomi-extensions/repo/" + const val REPO_URL_PREFIX = "${BASE_URL}inorichi/tachiyomi-extensions/repo/" } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubService.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubService.kt index 37cf1040a4..052bf8d66d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubService.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/api/ExtensionGithubService.kt @@ -37,6 +37,6 @@ interface ExtensionGithubService { } } - @GET("/inorichi/tachiyomi-extensions/repo/index.json.gz") + @GET("${ExtensionGithubApi.REPO_URL_PREFIX}index.json.gz") suspend fun getRepo(): JsonArray } diff --git a/app/src/main/res/layout/library_controller.xml b/app/src/main/res/layout/library_controller.xml index 75fdb112cb..1bae7b2175 100644 --- a/app/src/main/res/layout/library_controller.xml +++ b/app/src/main/res/layout/library_controller.xml @@ -14,7 +14,7 @@ android:id="@+id/downloaded_only" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/pale_green" + android:background="@color/green" android:visibility="gone" tools:visibility="visible"> @@ -24,7 +24,7 @@ android:layout_gravity="center" android:padding="4dp" android:text="@string/label_downloaded_only" - android:textColor="@color/md_black_1000" /> + android:textColor="@color/md_white_1000" /> diff --git a/app/src/main/res/layout/source_comfortable_grid_item.xml b/app/src/main/res/layout/source_comfortable_grid_item.xml index aa07e4208f..6063c99373 100644 --- a/app/src/main/res/layout/source_comfortable_grid_item.xml +++ b/app/src/main/res/layout/source_comfortable_grid_item.xml @@ -41,13 +41,13 @@ style="@style/TextAppearance.Regular.Caption" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@color/pale_green" + android:background="@color/green" android:paddingStart="3dp" android:paddingTop="1dp" android:paddingEnd="3dp" android:paddingBottom="1dp" android:text="@string/local_source_badge" - android:textColor="@color/md_black_1000" + android:textColor="@color/md_white_1000" android:visibility="gone" tools:visibility="visible" /> @@ -56,12 +56,12 @@ style="@style/TextAppearance.Regular.Caption" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@color/pale_green" + android:background="@color/green" android:paddingStart="3dp" android:paddingTop="1dp" android:paddingEnd="3dp" android:paddingBottom="1dp" - android:textColor="@color/md_black_1000" + android:textColor="@color/md_white_1000" android:visibility="gone" tools:text="120" tools:visibility="visible" /> diff --git a/app/src/main/res/layout/source_compact_grid_item.xml b/app/src/main/res/layout/source_compact_grid_item.xml index 4a286121e1..c88bc2a148 100644 --- a/app/src/main/res/layout/source_compact_grid_item.xml +++ b/app/src/main/res/layout/source_compact_grid_item.xml @@ -41,13 +41,13 @@ style="@style/TextAppearance.Regular.Caption" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@color/pale_green" + android:background="@color/green" android:paddingStart="3dp" android:paddingTop="1dp" android:paddingEnd="3dp" android:paddingBottom="1dp" android:text="@string/local_source_badge" - android:textColor="@color/md_black_1000" + android:textColor="@color/md_white_1000" android:visibility="gone" tools:visibility="visible" /> @@ -56,12 +56,12 @@ style="@style/TextAppearance.Regular.Caption" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@color/pale_green" + android:background="@color/green" android:paddingStart="3dp" android:paddingTop="1dp" android:paddingEnd="3dp" android:paddingBottom="1dp" - android:textColor="@color/md_black_1000" + android:textColor="@color/md_white_1000" android:visibility="gone" tools:text="120" tools:visibility="visible" /> diff --git a/app/src/main/res/layout/source_list_item.xml b/app/src/main/res/layout/source_list_item.xml index 934e73382b..617748ed99 100644 --- a/app/src/main/res/layout/source_list_item.xml +++ b/app/src/main/res/layout/source_list_item.xml @@ -54,14 +54,14 @@ style="@style/TextAppearance.Regular.Caption" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@color/pale_green" + android:background="@color/green" android:maxLines="1" android:paddingStart="3dp" android:paddingTop="1dp" android:paddingEnd="3dp" android:paddingBottom="1dp" android:text="@string/local_source_badge" - android:textColor="@color/md_black_1000" + android:textColor="@color/md_white_1000" android:visibility="gone" tools:visibility="visible" /> @@ -70,13 +70,13 @@ style="@style/TextAppearance.Regular.Caption" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@color/pale_green" + android:background="@color/green" android:maxLines="1" android:paddingStart="3dp" android:paddingTop="1dp" android:paddingEnd="3dp" android:paddingBottom="1dp" - android:textColor="@color/md_black_1000" + android:textColor="@color/md_white_1000" android:visibility="gone" tools:text="122" tools:visibility="visible" /> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 04d9ea3ef7..2d7511f5c1 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -74,6 +74,6 @@ #263238 #37474F - #AAE1AA + #47a84a