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 9a08760fc..e20efd85e 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
@@ -16,7 +16,7 @@ import io.legado.app.constant.PreferKey
import io.legado.app.data.appDb
import io.legado.app.data.entities.Book
import io.legado.app.data.entities.BookGroup
-import io.legado.app.databinding.FragmentBookshelfBinding
+import io.legado.app.databinding.FragmentBookshelf1Binding
import io.legado.app.lib.theme.accentColor
import io.legado.app.lib.theme.primaryColor
import io.legado.app.ui.book.group.GroupEditDialog
@@ -30,11 +30,11 @@ import kotlin.collections.set
/**
* 书架界面
*/
-class BookshelfFragment1 : BaseBookshelfFragment(R.layout.fragment_bookshelf),
+class BookshelfFragment1 : BaseBookshelfFragment(R.layout.fragment_bookshelf1),
TabLayout.OnTabSelectedListener,
SearchView.OnQueryTextListener {
- private val binding by viewBinding(FragmentBookshelfBinding::bind)
+ private val binding by viewBinding(FragmentBookshelf1Binding::bind)
private val adapter by lazy { TabFragmentPageAdapter(childFragmentManager) }
private val tabLayout: TabLayout by lazy {
binding.titleBar.findViewById(R.id.tab_layout)
diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/style2/BookshelfFragment2.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/style2/BookshelfFragment2.kt
index 7860e8c67..0b91c60e9 100644
--- a/app/src/main/java/io/legado/app/ui/main/bookshelf/style2/BookshelfFragment2.kt
+++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/style2/BookshelfFragment2.kt
@@ -16,7 +16,7 @@ import io.legado.app.constant.PreferKey
import io.legado.app.data.appDb
import io.legado.app.data.entities.Book
import io.legado.app.data.entities.BookGroup
-import io.legado.app.databinding.FragmentBookshelf1Binding
+import io.legado.app.databinding.FragmentBookshelf2Binding
import io.legado.app.help.book.isAudio
import io.legado.app.help.config.AppConfig
import io.legado.app.lib.theme.accentColor
@@ -42,11 +42,11 @@ import kotlin.math.max
/**
* 书架界面
*/
-class BookshelfFragment2 : BaseBookshelfFragment(R.layout.fragment_bookshelf1),
+class BookshelfFragment2 : BaseBookshelfFragment(R.layout.fragment_bookshelf2),
SearchView.OnQueryTextListener,
BaseBooksAdapter.CallBack {
- private val binding by viewBinding(FragmentBookshelf1Binding::bind)
+ private val binding by viewBinding(FragmentBookshelf2Binding::bind)
private val bookshelfLayout by lazy {
getPrefInt(PreferKey.bookshelfLayout)
}
diff --git a/app/src/main/res/layout/fragment_bookshelf.xml b/app/src/main/res/layout/fragment_bookshelf.xml
deleted file mode 100644
index 91b638e02..000000000
--- a/app/src/main/res/layout/fragment_bookshelf.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_bookshelf1.xml b/app/src/main/res/layout/fragment_bookshelf1.xml
index 35ce510ec..91b638e02 100644
--- a/app/src/main/res/layout/fragment_bookshelf1.xml
+++ b/app/src/main/res/layout/fragment_bookshelf1.xml
@@ -1,7 +1,6 @@
-
@@ -11,37 +10,12 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:attachToActivity="false"
- app:layout_constraintTop_toTopOf="parent"
+ app:contentLayout="@layout/view_tab_layout_min"
app:title="@string/bookshelf" />
-
+ android:layout_height="match_parent" />
-
-
-
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_bookshelf2.xml b/app/src/main/res/layout/fragment_bookshelf2.xml
new file mode 100644
index 000000000..35ce510ec
--- /dev/null
+++ b/app/src/main/res/layout/fragment_bookshelf2.xml
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file