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() { 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/md_blue_400_50 + + @color/md_grey_50_75 + @color/md_grey_900_75 + #DE000000 #8A000000 @@ -47,10 +51,12 @@ #000000 #FAFAFA + #BFFAFAFA #F5F5F5 #E0E0E0 #424242 #212121 + #BF212121 #42A5F5 #8042A5F5