From ce271649acc9d9451374b244c2f8700fb659eb89 Mon Sep 17 00:00:00 2001
From: len <len@kanade.eu>
Date: Mon, 21 Mar 2016 15:58:59 +0100
Subject: [PATCH] Page number indicator now transparent

---
 .../java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt    | 4 ++--
 .../tachiyomi/ui/setting/SettingsDownloadsFragment.kt       | 3 ++-
 app/src/main/res/values/colors.xml                          | 6 ++++++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
index b6ab974df..33036a09d 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
@@ -517,11 +517,11 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>() {
         if (theme == BLACK_THEME) {
             rootView.setBackgroundColor(Color.BLACK)
             page_number.setTextColor(ContextCompat.getColor(this, R.color.textColorPrimaryDark))
-            page_number.setBackgroundColor(ContextCompat.getColor(this, R.color.backgroundDark))
+            page_number.setBackgroundColor(ContextCompat.getColor(this, R.color.pageNumberBackgroundDark))
         } else {
             rootView.setBackgroundColor(Color.WHITE)
             page_number.setTextColor(ContextCompat.getColor(this, R.color.textColorPrimaryLight))
-            page_number.setBackgroundColor(ContextCompat.getColor(this, R.color.backgroundLight))
+            page_number.setBackgroundColor(ContextCompat.getColor(this, R.color.pageNumberBackgroundLight))
         }
     }
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadsFragment.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadsFragment.kt
index ad137320d..671334049 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadsFragment.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsDownloadsFragment.kt
@@ -4,6 +4,7 @@ import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import android.os.Environment
+import android.support.v4.content.ContextCompat
 import android.support.v7.widget.RecyclerView
 import android.view.View
 import android.view.ViewGroup
@@ -76,7 +77,7 @@ class SettingsDownloadsFragment : SettingsNestedFragment() {
                 File.separator + getString(R.string.app_name) +
                 File.separator + "downloads"
 
-        return mutableListOf(File(defaultDir)) + activity.getExternalFilesDirs("")
+        return mutableListOf(File(defaultDir)) + ContextCompat.getExternalFilesDirs(activity, "")
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f40013a6b..3eff8b739 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -32,6 +32,10 @@
 
     <color name="selectorColorDark">@color/md_blue_400_50</color>
 
+    <!-- Reader Theme -->
+    <color name="pageNumberBackgroundLight">@color/md_grey_50_75</color>
+    <color name="pageNumberBackgroundDark">@color/md_grey_900_75</color>
+
     <!-- Text Colors -->
     <color name="md_black_1000_87">#DE000000</color>
     <color name="md_black_1000_54">#8A000000</color>
@@ -47,10 +51,12 @@
     <color name="md_black_1000">#000000</color>
 
     <color name="md_grey_50">#FAFAFA</color>
+    <color name="md_grey_50_75">#BFFAFAFA</color>
     <color name="md_grey_100">#F5F5F5</color>
     <color name="md_grey_300">#E0E0E0</color>
     <color name="md_grey_800">#424242</color>
     <color name="md_grey_900">#212121</color>
+    <color name="md_grey_900_75">#BF212121</color>
 
     <color name="md_blue_400">#42A5F5</color>
     <color name="md_blue_400_50">#8042A5F5</color>