From d3681bedf678dcbecb369545d808c5d20a3810a9 Mon Sep 17 00:00:00 2001
From: adhu2018 <41824074+adhu2018@users.noreply.github.com>
Date: Fri, 1 Sep 2023 11:02:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复了同时更改书架布局的分组样式和视图后崩溃闪退的问题
---
 app/src/main/java/io/legado/app/help/config/AppConfig.kt    | 6 ++++++
 .../legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt   | 2 +-
 .../app/ui/main/bookshelf/style1/BookshelfFragment1.kt      | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/io/legado/app/help/config/AppConfig.kt b/app/src/main/java/io/legado/app/help/config/AppConfig.kt
index ad3b596dd..38721e60c 100644
--- a/app/src/main/java/io/legado/app/help/config/AppConfig.kt
+++ b/app/src/main/java/io/legado/app/help/config/AppConfig.kt
@@ -137,6 +137,12 @@ object AppConfig : SharedPreferences.OnSharedPreferenceChangeListener {
             appCtx.putPrefInt(PreferKey.bookGroupStyle, value)
         }
 
+    var bookshelfLayout: Int
+        get() = appCtx.getPrefInt(PreferKey.bookshelfLayout, 0)
+        set(value) {
+            appCtx.putPrefInt(PreferKey.bookshelfLayout, value)
+        }
+
     var bookExportFileName: String?
         get() = appCtx.getPrefString(PreferKey.bookExportFileName)
         set(value) {
diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt
index 051d8613c..9fe85cf18 100644
--- a/app/src/main/java/io/legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt
+++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt
@@ -173,7 +173,7 @@ abstract class BaseBookshelfFragment(layoutId: Int) : VMBaseFragment<BookshelfVi
                         upSort()
                     }
                     if (bookshelfLayout != rgLayout.getCheckedIndex()) {
-                        putPrefInt(PreferKey.bookshelfLayout, rgLayout.getCheckedIndex())
+                        AppConfig.bookshelfLayout = rgLayout.getCheckedIndex()
                         postEvent(EventBus.RECREATE, "")
                     }
                 }
diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/style1/BookshelfFragment1.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/style1/BookshelfFragment1.kt
index c82c886d3..f49dc5a82 100644
--- a/app/src/main/java/io/legado/app/ui/main/bookshelf/style1/BookshelfFragment1.kt
+++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/style1/BookshelfFragment1.kt
@@ -109,7 +109,7 @@ class BookshelfFragment1() : BaseBookshelfFragment(R.layout.fragment_bookshelf1)
     private fun selectLastTab() {
         tabLayout.post {
             tabLayout.removeOnTabSelectedListener(this)
-            tabLayout.getTabAt(getPrefInt(PreferKey.saveTabPosition, 0))?.select()
+            tabLayout.getTabAt(0)?.select()
             tabLayout.addOnTabSelectedListener(this)
         }
     }