diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterSheet.kt
index 3879e9f64e..0217e536dc 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterSheet.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterSheet.kt
@@ -16,7 +16,6 @@ import com.mikepenz.fastadapter.adapters.ItemAdapter
import com.mikepenz.fastadapter.listeners.ClickEventHook
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.databinding.ReaderChaptersSheetBinding
-import eu.kanade.tachiyomi.ui.main.SearchActivity
import eu.kanade.tachiyomi.ui.reader.ReaderActivity
import eu.kanade.tachiyomi.ui.reader.ReaderPresenter
import eu.kanade.tachiyomi.ui.reader.settings.TabbedReaderSettingsSheet
@@ -73,11 +72,6 @@ class ReaderChapterSheet @JvmOverloads constructor(context: Context, attrs: Attr
TabbedReaderSettingsSheet(activity).show()
}
- binding.fullSettings.setOnClickListener {
- val intent = SearchActivity.openReaderSettings(activity)
- activity.startActivity(intent)
- }
-
post {
binding.chapterRecycler.alpha = if (sheetBehavior.isExpanded()) 1f else 0f
binding.chapterRecycler.isClickable = sheetBehavior.isExpanded()
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/TabbedReaderSettingsSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/TabbedReaderSettingsSheet.kt
index 18decea969..f077afc538 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/TabbedReaderSettingsSheet.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/settings/TabbedReaderSettingsSheet.kt
@@ -3,6 +3,7 @@ package eu.kanade.tachiyomi.ui.reader.settings
import android.view.View
import com.google.android.material.tabs.TabLayout
import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.ui.main.SearchActivity
import eu.kanade.tachiyomi.ui.reader.ReaderActivity
import eu.kanade.tachiyomi.util.view.gone
import eu.kanade.tachiyomi.util.view.visInvisIf
@@ -53,7 +54,23 @@ class TabbedReaderSettingsSheet(val readerActivity: ReaderActivity) : TabbedBott
filterView.activity = readerActivity
generalView.sheet = this
- binding.menu.gone()
+ sheetBehavior = BottomSheetBehavior.from(binding.root.parent as ViewGroup)
+ binding.menu.visible()
+ if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
+ binding.menu.tooltipText = context.getString(R.string.reader_settings)
+ }
+ binding.menu.setImageDrawable(
+ ContextCompat.getDrawable(
+ context,
+ R.drawable.ic_settings_24dp
+ )
+ )
+ binding.menu.setOnClickListener {
+ val intent = SearchActivity.openReaderSettings(readerActivity)
+ readerActivity.startActivity(intent)
+ dismiss()
+ }
+
val attrs = window?.attributes
val ogDim = attrs?.dimAmount ?: 0.25f
binding.pager.adapter?.notifyDataSetChanged()
diff --git a/app/src/main/res/layout/reader_chapters_sheet.xml b/app/src/main/res/layout/reader_chapters_sheet.xml
index d84cd01482..144442f9ae 100644
--- a/app/src/main/res/layout/reader_chapters_sheet.xml
+++ b/app/src/main/res/layout/reader_chapters_sheet.xml
@@ -74,27 +74,10 @@
app:layout_constraintHorizontal_chainStyle="spread"
android:tooltipText="@string/display_options"
app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toStartOf="@id/full_settings"
app:layout_constraintStart_toEndOf="@id/webview_button"
app:layout_constraintTop_toTopOf="parent"
- app:srcCompat="@drawable/ic_tune_24dp" />
-
-
+ app:srcCompat="@drawable/ic_tune_24dp" />