Merge branch 'eink' of https://github.com/FadeApp/legado into FadeApp-eink

# Conflicts:
#	app/src/main/java/io/legado/app/lib/theme/ATH.kt
#	app/src/main/java/io/legado/app/utils/ContextExtensions.kt

app/build.gradle

@@ -20,13 +20,15 @@ def gitCommits = Integer.parseInt('git rev-list --count HEAD'.execute([], projec
 android {
     compileSdkVersion 29
     signingConfigs {
-        myConfig {
+        if (project.hasProperty("RELEASE_STORE_FILE")) {
-            storeFile file(RELEASE_STORE_FILE)
+            myConfig {
-            storePassword RELEASE_STORE_PASSWORD
+                storeFile file(RELEASE_STORE_FILE)
-            keyAlias RELEASE_KEY_ALIAS
+                storePassword RELEASE_STORE_PASSWORD
-            keyPassword RELEASE_KEY_PASSWORD
+                keyAlias RELEASE_KEY_ALIAS
-            v1SigningEnabled true
+                keyPassword RELEASE_KEY_PASSWORD
-            v2SigningEnabled true
+                v1SigningEnabled true
+                v2SigningEnabled true
+            }
         }
     }
     defaultConfig {
@@ -49,12 +51,16 @@ android {
     }
     buildTypes {
         release {
-            signingConfig signingConfigs.myConfig
+            if (project.hasProperty("RELEASE_STORE_FILE")) {
+                signingConfig signingConfigs.myConfig
+            }
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
         debug {
-            signingConfig signingConfigs.myConfig
+            if (project.hasProperty("RELEASE_STORE_FILE")) {
+                signingConfig signingConfigs.myConfig
+            }
             applicationIdSuffix '.debug'
             versionNameSuffix 'debug'
             minifyEnabled false

app/src/main/java/io/legado/app/lib/theme/ATH.kt

@@ -5,6 +5,7 @@ import android.app.Activity
 import android.app.ActivityManager
 import android.content.Context
 import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
 import android.os.Build
 import android.view.View
 import android.view.View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
@@ -205,10 +206,7 @@ object ATH {
                 .setSelectedColor(ThemeStore.accentColor(bottom_navigation_view.context)).create()
             itemIconTintList = colorStateList
             itemTextColor = colorStateList
-            itemBackgroundResource = when (AppConfig.isNightTheme) {
+            itemBackground = ColorDrawable(ThemeStore.primaryColor(bottomBar.context))
-                true -> R.drawable.item_bg_dark
-                false -> R.drawable.item_bg_light
-            }
         }
     }
 

app/src/main/java/io/legado/app/ui/config/ThemeConfigFragment.kt

@@ -20,7 +20,7 @@ import io.legado.app.utils.*
 
 class ThemeConfigFragment : PreferenceFragmentCompat(), SharedPreferences.OnSharedPreferenceChangeListener {
 
-    val items = arrayOf("极简","曜夜","经典")
+    val items = arrayOf("极简", "曜夜", "经典", "黑白", "A屏黑")
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         addPreferencesFromResource(R.xml.pref_config_theme)
@@ -124,6 +124,24 @@ class ThemeConfigFragment : PreferenceFragmentCompat(), SharedPreferences.OnShar
                                     putPrefInt("colorBackground", getCompatColor(R.color.md_grey_100))
                                     putPrefBoolean("isNightTheme", false)
                                 }
+                                3 -> {
+                                    putPrefInt("colorPrimary", getCompatColor(R.color.white))
+                                    putPrefInt("colorAccent", getCompatColor(R.color.black))
+                                    putPrefInt("colorBackground", getCompatColor(R.color.white))
+                                    putPrefBoolean("isNightTheme", false)
+                                }
+                                4 -> {
+                                    putPrefInt("colorPrimaryNight", getCompatColor(R.color.black))
+                                    putPrefInt(
+                                        "colorAccentNight",
+                                        getCompatColor(R.color.md_grey_600)
+                                    )
+                                    putPrefInt(
+                                        "colorBackgroundNight",
+                                        getCompatColor(R.color.black)
+                                    )
+                                    putPrefBoolean("isNightTheme", true)
+                                }
                             }
                             App.INSTANCE.applyDayNight()
                             recreateActivities()

app/src/main/res/values/strings.xml

@@ -77,7 +77,7 @@
     <string name="import_books_count">共%s个Text文件</string>
     <string name="is_loading">加载中…</string>
     <string name="retry">重试</string>
-    <string name="web_service">Web服务</string>
+    <string name="web_service">Web 服务</string>
     <string name="web_edit_source">web编辑书源</string>
     <string name="http_ip">http://%s:%d</string>
     <string name="download_offline">离线下载</string>
@@ -447,6 +447,7 @@
     <string name="switch_display_style">切换显示样式</string>
     <string name="import_per">导入本地书籍需存储权限</string>
     <string name="night_theme">夜间模式</string>
+    <string name="eink_theme">E-Ink 模式</string>
     <string name="get_storage_per">本软件需要存储权限来存储备份书籍信息</string>
     <string name="double_click_exit">再按一次退出程序</string>
     <string name="import_book_per">导入本地书籍需存储权限</string>

app/src/main/res/xml/pref_main.xml

@@ -18,6 +18,12 @@
         android:title="@string/night_theme"
         app:iconSpaceReserved="false" />
 
+    <io.legado.app.lib.theme.prefs.ATESwitchPreference
+        android:defaultValue="false"
+        android:key="isEInkMode"
+        android:title="@string/eink_theme"
+        app:iconSpaceReserved="false" />
+
     <io.legado.app.lib.theme.prefs.ATESwitchPreference
         android:defaultValue="false"
         android:key="webService"