Merge remote-tracking branch 'upstream/master'

app/src/main/assets/updateLog.md

@@ -3,6 +3,10 @@
 * 关注合作公众号 **[小说拾遗]()** 获取好看的小说。
 * 旧版数据导入教程：先在旧版阅读(2.x)中进行备份，然后在新版阅读(3.x)【我的】->【备份与恢复】，选择【导入旧版本数据】。
 
+**2020/10/22**
+* 修复选择错误的bug
+* 修复长图最后一张不能滚动的bug
+
 **2020/10/21**
 * 默认分组无书籍时自动隐藏
 * 自定义翻页按键支持多个按键

app/src/main/java/io/legado/app/App.kt

@@ -4,10 +4,8 @@ import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.content.Context
 import android.content.res.Configuration
-import android.graphics.Color
 import android.os.Build
 import android.provider.Settings
-import android.util.Log
 import androidx.annotation.RequiresApi
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.multidex.MultiDexApplication
@@ -16,14 +14,10 @@ import io.legado.app.constant.AppConst.channelIdDownload
 import io.legado.app.constant.AppConst.channelIdReadAloud
 import io.legado.app.constant.AppConst.channelIdWeb
 import io.legado.app.constant.EventBus
-import io.legado.app.constant.PreferKey
 import io.legado.app.data.AppDatabase
-import io.legado.app.help.ActivityHelp
+import io.legado.app.help.*
-import io.legado.app.help.AppConfig
+import io.legado.app.utils.LanguageUtils
-import io.legado.app.help.CrashHandler
+import io.legado.app.utils.postEvent
-import io.legado.app.help.ReadBookConfig
-import io.legado.app.lib.theme.ThemeStore
-import io.legado.app.utils.*
 
 @Suppress("DEPRECATION")
 class App : MultiDexApplication() {
@@ -72,68 +66,9 @@ class App : MultiDexApplication() {
         }
     }
 
-    /**
-     * 更新主题
-     */
-    fun applyTheme() {
-        when {
-            AppConfig.isEInkMode -> {
-                ThemeStore.editTheme(this)
-                    .coloredNavigationBar(true)
-                    .primaryColor(Color.WHITE)
-                    .accentColor(Color.BLACK)
-                    .backgroundColor(Color.WHITE)
-                    .bottomBackground(Color.WHITE)
-                    .apply()
-            }
-            AppConfig.isNightTheme -> {
-                val primary =
-                    getPrefInt(PreferKey.cNPrimary, getCompatColor(R.color.md_blue_grey_600))
-                val accent =
-                    getPrefInt(PreferKey.cNAccent, getCompatColor(R.color.md_deep_orange_800))
-                var background =
-                    getPrefInt(PreferKey.cNBackground, getCompatColor(R.color.md_grey_900))
-                if (ColorUtils.isColorLight(background)) {
-                    background = getCompatColor(R.color.md_grey_900)
-                    putPrefInt(PreferKey.cNBackground, background)
-                }
-                val bBackground =
-                    getPrefInt(PreferKey.cNBBackground, getCompatColor(R.color.md_grey_850))
-                ThemeStore.editTheme(this)
-                    .coloredNavigationBar(true)
-                    .primaryColor(ColorUtils.withAlpha(primary, 1f))
-                    .accentColor(ColorUtils.withAlpha(accent, 1f))
-                    .backgroundColor(ColorUtils.withAlpha(background, 1f))
-                    .bottomBackground(ColorUtils.withAlpha(bBackground, 1f))
-                    .apply()
-            }
-            else -> {
-                val primary =
-                    getPrefInt(PreferKey.cPrimary, getCompatColor(R.color.md_brown_500))
-                val accent =
-                    getPrefInt(PreferKey.cAccent, getCompatColor(R.color.md_red_600))
-                var background =
-                    getPrefInt(PreferKey.cBackground, getCompatColor(R.color.md_grey_100))
-                if (!ColorUtils.isColorLight(background)) {
-                    background = getCompatColor(R.color.md_grey_100)
-                    putPrefInt(PreferKey.cBackground, background)
-                }
-                val bBackground =
-                    getPrefInt(PreferKey.cBBackground, getCompatColor(R.color.md_grey_200))
-                ThemeStore.editTheme(this)
-                    .coloredNavigationBar(true)
-                    .primaryColor(ColorUtils.withAlpha(primary, 1f))
-                    .accentColor(ColorUtils.withAlpha(accent, 1f))
-                    .backgroundColor(ColorUtils.withAlpha(background, 1f))
-                    .bottomBackground(ColorUtils.withAlpha(bBackground, 1f))
-                    .apply()
-            }
-        }
-    }
-
     fun applyDayNight() {
         ReadBookConfig.upBg()
-        applyTheme()
+        ThemeConfig.applyTheme(this)
         initNightMode()
         postEvent(EventBus.RECREATE, "")
     }

app/src/main/java/io/legado/app/help/ThemeConfig.kt

@@ -7,6 +7,7 @@ import io.legado.app.App
 import io.legado.app.R
 import io.legado.app.constant.EventBus
 import io.legado.app.constant.PreferKey
+import io.legado.app.lib.theme.ThemeStore
 import io.legado.app.utils.*
 import java.io.File
 
@@ -137,6 +138,65 @@ object ThemeConfig {
         addConfig(config)
     }
 
+    /**
+     * 更新主题
+     */
+    fun applyTheme(context: Context) = with(context) {
+        when {
+            AppConfig.isEInkMode -> {
+                ThemeStore.editTheme(this)
+                    .coloredNavigationBar(true)
+                    .primaryColor(Color.WHITE)
+                    .accentColor(Color.BLACK)
+                    .backgroundColor(Color.WHITE)
+                    .bottomBackground(Color.WHITE)
+                    .apply()
+            }
+            AppConfig.isNightTheme -> {
+                val primary =
+                    getPrefInt(PreferKey.cNPrimary, getCompatColor(R.color.md_blue_grey_600))
+                val accent =
+                    getPrefInt(PreferKey.cNAccent, getCompatColor(R.color.md_deep_orange_800))
+                var background =
+                    getPrefInt(PreferKey.cNBackground, getCompatColor(R.color.md_grey_900))
+                if (ColorUtils.isColorLight(background)) {
+                    background = getCompatColor(R.color.md_grey_900)
+                    putPrefInt(PreferKey.cNBackground, background)
+                }
+                val bBackground =
+                    getPrefInt(PreferKey.cNBBackground, getCompatColor(R.color.md_grey_850))
+                ThemeStore.editTheme(this)
+                    .coloredNavigationBar(true)
+                    .primaryColor(ColorUtils.withAlpha(primary, 1f))
+                    .accentColor(ColorUtils.withAlpha(accent, 1f))
+                    .backgroundColor(ColorUtils.withAlpha(background, 1f))
+                    .bottomBackground(ColorUtils.withAlpha(bBackground, 1f))
+                    .apply()
+            }
+            else -> {
+                val primary =
+                    getPrefInt(PreferKey.cPrimary, getCompatColor(R.color.md_brown_500))
+                val accent =
+                    getPrefInt(PreferKey.cAccent, getCompatColor(R.color.md_red_600))
+                var background =
+                    getPrefInt(PreferKey.cBackground, getCompatColor(R.color.md_grey_100))
+                if (!ColorUtils.isColorLight(background)) {
+                    background = getCompatColor(R.color.md_grey_100)
+                    putPrefInt(PreferKey.cBackground, background)
+                }
+                val bBackground =
+                    getPrefInt(PreferKey.cBBackground, getCompatColor(R.color.md_grey_200))
+                ThemeStore.editTheme(this)
+                    .coloredNavigationBar(true)
+                    .primaryColor(ColorUtils.withAlpha(primary, 1f))
+                    .accentColor(ColorUtils.withAlpha(accent, 1f))
+                    .backgroundColor(ColorUtils.withAlpha(background, 1f))
+                    .bottomBackground(ColorUtils.withAlpha(bBackground, 1f))
+                    .apply()
+            }
+        }
+    }
+
     @Keep
     class Config(
         var themeName: String,

app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeRule.kt

@@ -649,16 +649,12 @@ class AnalyzeRule(var book: BaseBook? = null) : JsExtensions {
      * 章节数转数字
      */
     fun toNumChapter(s: String?): String? {
-        if (s == null) {
+        s ?: return null
-            return null
+        val matcher = titleNumPattern.matcher(s)
-        }
+        if (matcher.find()) {
-        val pattern = Pattern.compile("(第)(.+?)(章)")
+            return "${matcher.group(1)}${StringUtils.stringToInt(matcher.group(2))}${matcher.group(3)}"
-        val matcher = pattern.matcher(s)
-        return if (matcher.find()) {
-            matcher.group(1)!! + StringUtils.stringToInt(matcher.group(2)) + matcher.group(3)
-        } else {
-            s
         }
+        return s
     }
 
     companion object {
@@ -667,6 +663,7 @@ class AnalyzeRule(var book: BaseBook? = null) : JsExtensions {
         private val evalPattern =
             Pattern.compile("@get:\\{[^}]+?\\}|\\{\\{[\\w\\W]*?\\}\\}", Pattern.CASE_INSENSITIVE)
         private val regexPattern = Pattern.compile("\\$\\d{1,2}")
+        private val titleNumPattern = Pattern.compile("(第)(.+?)(章)")
     }
 
 }

app/src/main/java/io/legado/app/ui/book/explore/ExploreShowActivity.kt

@@ -40,9 +40,9 @@ class ExploreShowActivity : VMBaseActivity<ExploreShowViewModel>(R.layout.activi
         loadMoreView.startLoad()
         loadMoreView.setOnClickListener {
             if (!isLoading) {
-                isLoading = true
                 loadMoreView.hasMore()
                 scrollToBottom()
+                isLoading = true
             }
         }
         recycler_view.addOnScrollListener(object : RecyclerView.OnScrollListener() {

app/src/main/java/io/legado/app/ui/book/read/ReadMenu.kt

@@ -26,9 +26,8 @@ import org.jetbrains.anko.sdk27.listeners.onLongClick
  */
 class ReadMenu @JvmOverloads constructor(
     context: Context,
-    attrs: AttributeSet? = null,
+    attrs: AttributeSet? = null
-    defStyleAttr: Int = 0
+) : FrameLayout(context, attrs) {
-) : FrameLayout(context, attrs, defStyleAttr) {
     var cnaShowMenu: Boolean = false
     private val callBack: CallBack? get() = activity as? CallBack
     private lateinit var menuTopIn: Animation

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

@@ -177,7 +177,7 @@ class ThemeConfigFragment : BasePreferenceFragment(),
 
     @SuppressLint("InflateParams")
     private fun saveThemeAlert(key: String) {
-        alert("主题名称") {
+        alert(R.string.theme_name) {
             var editText: AutoCompleteTextView? = null
             customView {
                 layoutInflater.inflate(R.layout.dialog_edit_text, null).apply {
@@ -203,7 +203,7 @@ class ThemeConfigFragment : BasePreferenceFragment(),
     private fun upTheme(isNightTheme: Boolean) {
         if (AppConfig.isNightTheme == isNightTheme) {
             listView.post {
-                App.INSTANCE.applyTheme()
+                ThemeConfig.applyTheme(requireContext())
                 recreateActivities()
             }
         }

app/src/main/java/io/legado/app/ui/widget/anima/explosion_field/ExplosionView.kt

@@ -30,7 +30,8 @@ import java.util.*
 
 
 @Suppress("unused")
-class ExplosionView : View {
+class ExplosionView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) :
+    View(context, attrs) {
 
     private var customDuration = ExplosionAnimator.DEFAULT_DURATION
     private var idPlayAnimationEffect = 0
@@ -40,24 +41,7 @@ class ExplosionView : View {
     private val mExplosions = ArrayList<ExplosionAnimator>()
     private val mExpandInset = IntArray(2)
 
-    constructor(context: Context) : super(context) {
+    init {
-        init()
-    }
-
-    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
-        init()
-    }
-
-    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(
-        context,
-        attrs,
-        defStyleAttr
-    ) {
-        init()
-    }
-
-    private fun init() {
-
         Arrays.fill(mExpandInset, Utils.dp2Px(32))
     }
 

app/src/main/res/values-zh-rHK/strings.xml

@@ -770,5 +770,6 @@
     <string name="rss_source_empty">关注公众号[开源阅读]获取订阅源!</string>
     <string name="explore_empty">当前没有发现源,关注公众号[开源阅读]添加带发现的书源!</string>
     <string name="page_key_set_help">将焦点放到输入框按下物理按键会自动录入键值,多个按键会自动用英文逗号隔开.</string>
+    <string name="theme_name">主题名称</string>
 
 </resources>

app/src/main/res/values-zh-rTW/strings.xml

@@ -770,5 +770,6 @@
     <string name="rss_source_empty">關注公眾號[开源阅读]獲取訂閱源!</string>
     <string name="explore_empty">目前沒有發現源,關注公眾號[开源阅读]添加包含發現的書源!</string>
     <string name="page_key_set_help">将焦点放到输入框按下物理按键会自动录入键值,多个按键会自动用英文逗号隔开.</string>
+    <string name="theme_name">主题名称</string>
 
 </resources>

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

@@ -773,5 +773,6 @@
     <string name="rss_source_empty">关注公众号[开源阅读]获取订阅源!</string>
     <string name="explore_empty">当前没有发现源,关注公众号[开源阅读]添加带发现的书源!</string>
     <string name="page_key_set_help">将焦点放到输入框按下物理按键会自动录入键值,多个按键会自动用英文逗号隔开.</string>
+    <string name="theme_name">主题名称</string>
 
 </resources>

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

@@ -776,5 +776,6 @@
     <string name="rss_source_empty">关注公众号[开源阅读]获取订阅源!</string>
     <string name="explore_empty">当前没有发现源,关注公众号[开源阅读]添加带发现的书源!</string>
     <string name="page_key_set_help">将焦点放到输入框按下物理按键会自动录入键值,多个按键会自动用英文逗号隔开.</string>
+    <string name="theme_name">主题名称</string>
 
 </resources>