diff --git a/app/src/main/java/io/legado/app/ui/book/toc/ChapterListAdapter.kt b/app/src/main/java/io/legado/app/ui/book/toc/ChapterListAdapter.kt index d2bdae394..529606bd1 100644 --- a/app/src/main/java/io/legado/app/ui/book/toc/ChapterListAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/book/toc/ChapterListAdapter.kt @@ -278,22 +278,19 @@ class ChapterListAdapter( when { item.isVolume -> { ivVolume.visible() - if (isCollapsed) ivColl.visible() - else ivColl.gone() + ivVolume.isChecked = isCollapsed tvChapterName.textSize = 12f - tvChapterName.setTextColor(context.themeColor(com.google.android.material.R.attr.colorTertiary)) + tvChapterName.setTextColor(context.themeColor(com.google.android.material.R.attr.colorSecondary)) tvChapterItem.setBackgroundColor(context.themeColor(com.google.android.material.R.attr.colorSurface)) } isDur -> { - ivColl.gone() ivVolume.gone() tvChapterName.setTextColor(context.themeColor(androidx.appcompat.R.attr.colorPrimary)) tvChapterItem.setBackgroundColor(context.themeColor(com.google.android.material.R.attr.colorSurfaceContainer)) } else -> { - ivColl.gone() ivVolume.gone() tvChapterName.setTextColor(context.themeColor(com.google.android.material.R.attr.colorOnSurface)) tvChapterItem.setBackgroundColor(context.themeColor(com.google.android.material.R.attr.colorSurface)) diff --git a/app/src/main/res/layout/dialog_content_edit.xml b/app/src/main/res/layout/dialog_content_edit.xml index e3117705b..f9aeef2de 100644 --- a/app/src/main/res/layout/dialog_content_edit.xml +++ b/app/src/main/res/layout/dialog_content_edit.xml @@ -17,6 +17,7 @@ android:id="@+id/scrollView" android:layout_width="match_parent" android:layout_height="wrap_content" + android:paddingBottom="32dp" app:layout_constraintTop_toBottomOf="@id/tool_bar"> - + app:icon="@drawable/m3_split_button_chevron_avd" /> + @@ -85,23 +91,6 @@ app:layout_constraintTop_toBottomOf="@id/tv_word_count" /> - - - - -