From 043f8fbe0f3022359e1b7a935cf698a17ac904ea Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Sun, 3 May 2020 19:52:05 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/legado/app/data/AppDatabase.kt    | 38 ++++++++++++-------
 .../io/legado/app/data/entities/RssSource.kt  |  2 +
 .../book/read/config/ReadAloudConfigDialog.kt |  5 ++-
 3 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/io/legado/app/data/AppDatabase.kt b/app/src/main/java/io/legado/app/data/AppDatabase.kt
index 023e1dffb..55978fe2f 100644
--- a/app/src/main/java/io/legado/app/data/AppDatabase.kt
+++ b/app/src/main/java/io/legado/app/data/AppDatabase.kt
@@ -19,7 +19,7 @@ import kotlinx.coroutines.launch
         ReplaceRule::class, SearchBook::class, SearchKeyword::class, Cookie::class,
         RssSource::class, Bookmark::class, RssArticle::class, RssReadRecord::class,
         RssStar::class, TxtTocRule::class],
-    version = 11,
+    version = 12,
     exportSchema = true
 )
 abstract class AppDatabase : RoomDatabase() {
@@ -31,18 +31,7 @@ abstract class AppDatabase : RoomDatabase() {
         fun createDatabase(context: Context): AppDatabase {
             return Room.databaseBuilder(context, AppDatabase::class.java, DATABASE_NAME)
                 .fallbackToDestructiveMigration()
-                .addMigrations(object : Migration(10, 11) {
-                    override fun migrate(database: SupportSQLiteDatabase) {
-                        database.execSQL("DROP TABLE txtTocRules")
-                        database.execSQL(
-                            """
-                            CREATE TABLE txtTocRules(id INTEGER NOT NULL, 
-                            name TEXT NOT NULL, rule TEXT NOT NULL, serialNumber INTEGER NOT NULL, 
-                            enable INTEGER NOT NULL, PRIMARY KEY (id))
-                            """
-                        )
-                    }
-                })
+                .addMigrations(migration_10_11, migration_11_12)
                 .addCallback(object : Callback() {
                     override fun onDestructiveMigration(db: SupportSQLiteDatabase) {
                         GlobalScope.launch { Restore.restoreDatabase(Backup.backupPath) }
@@ -50,6 +39,29 @@ abstract class AppDatabase : RoomDatabase() {
                 })
                 .build()
         }
+
+        private val migration_10_11 = object : Migration(10, 11) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.execSQL("DROP TABLE txtTocRules")
+                database.execSQL(
+                    """
+                    CREATE TABLE txtTocRules(id INTEGER NOT NULL, 
+                    name TEXT NOT NULL, rule TEXT NOT NULL, serialNumber INTEGER NOT NULL, 
+                    enable INTEGER NOT NULL, PRIMARY KEY (id))
+                    """
+                )
+            }
+        }
+
+        private val migration_11_12 = object : Migration(11, 12) {
+            override fun migrate(database: SupportSQLiteDatabase) {
+                database.execSQL(
+                    """
+                    ALTER TABLE rssSources ADD css TEXT
+                    """
+                )
+            }
+        }
     }
 
     abstract fun bookDao(): BookDao
diff --git a/app/src/main/java/io/legado/app/data/entities/RssSource.kt b/app/src/main/java/io/legado/app/data/entities/RssSource.kt
index e9a58ee98..e9a25c58c 100644
--- a/app/src/main/java/io/legado/app/data/entities/RssSource.kt
+++ b/app/src/main/java/io/legado/app/data/entities/RssSource.kt
@@ -34,9 +34,11 @@ data class RssSource(
     var ruleImage: String? = null,
     var ruleLink: String? = null,
     var ruleContent: String? = null,
+    var css: String? = null,
     var header: String? = null,
     var enableJs: Boolean = false,
     var loadWithBaseUrl: Boolean = false,
+
     var customOrder: Int = 0
 ) : Parcelable, JsExtensions {
 
diff --git a/app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudConfigDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudConfigDialog.kt
index 294a1c127..cdb10159e 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudConfigDialog.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudConfigDialog.kt
@@ -16,6 +16,7 @@ import io.legado.app.constant.EventBus
 import io.legado.app.constant.PreferKey
 import io.legado.app.help.AppConfig
 import io.legado.app.lib.theme.ATH
+import io.legado.app.lib.theme.backgroundColor
 import io.legado.app.service.BaseReadAloudService
 import io.legado.app.service.help.ReadAloud
 import io.legado.app.ui.book.read.Help
@@ -42,8 +43,8 @@ class ReadAloudConfigDialog : DialogFragment() {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        val view = LinearLayout(context)
-        view.setBackgroundResource(R.color.background)
+        val view = LinearLayout(requireContext())
+        view.setBackgroundColor(requireContext().backgroundColor)
         view.id = R.id.tag1
         container?.addView(view)
         return view