UI improvements

app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/adapter/CategoryAD.kt

@@ -65,10 +65,7 @@ fun categoryAD(
 	binding.imageViewEdit.setOnClickListener(eventListener)
 	binding.imageViewHandle.setOnTouchListener(eventListener)
 
-	bind { payloads ->
+	bind {
-		if (payloads.isNotEmpty()) {
-			return@bind
-		}
 		binding.textViewTitle.text = item.category.title
 		binding.textViewSubtitle.text = if (item.mangaCount == 0) {
 			getString(R.string.empty)

app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/select/adapter/CategoriesHeaderAD.kt

@@ -15,13 +15,13 @@ fun categoriesHeaderAD() = adapterDelegateViewBinding<CategoriesHeaderItem, List
 
 	val onClickListener = View.OnClickListener { v ->
 		val intent = when (v.id) {
-			R.id.button_create -> FavouritesCategoryEditActivity.newIntent(v.context)
+			R.id.chip_create -> FavouritesCategoryEditActivity.newIntent(v.context)
-			R.id.button_manage -> FavouriteCategoriesActivity.newIntent(v.context)
+			R.id.chip_manage -> FavouriteCategoriesActivity.newIntent(v.context)
 			else -> return@OnClickListener
 		}
 		v.context.startActivity(intent)
 	}
 
-	binding.buttonCreate.setOnClickListener(onClickListener)
+	binding.chipCreate.setOnClickListener(onClickListener)
-	binding.buttonManage.setOnClickListener(onClickListener)
+	binding.chipManage.setOnClickListener(onClickListener)
 }

app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/sheet/FilterSheetFragment.kt

@@ -8,6 +8,7 @@ import android.view.ViewGroup
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import androidx.core.view.isGone
+import androidx.core.view.updatePadding
 import androidx.fragment.app.FragmentManager
 import com.google.android.material.chip.Chip
 import org.koitharu.kotatsu.R
@@ -39,9 +40,12 @@ class FilterSheetFragment :
 
 	override fun onViewBindingCreated(binding: SheetFilterBinding, savedInstanceState: Bundle?) {
 		super.onViewBindingCreated(binding, savedInstanceState)
-		if (dialog == null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+		if (dialog == null) {
+			binding.layoutBody.updatePadding(top = binding.layoutBody.paddingBottom)
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
 				binding.scrollView.scrollIndicators = 0
 			}
+		}
 		val filter = requireFilter()
 		filter.filterSortOrder.observe(viewLifecycleOwner, this::onSortOrderChanged)
 		filter.filterLocale.observe(viewLifecycleOwner, this::onLocaleChanged)

app/src/main/kotlin/org/koitharu/kotatsu/list/ui/preview/PreviewFragment.kt

@@ -31,6 +31,7 @@ import org.koitharu.kotatsu.filter.ui.FilterOwner
 import org.koitharu.kotatsu.image.ui.ImageActivity
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaTag
+import org.koitharu.kotatsu.reader.ui.ReaderActivity
 import org.koitharu.kotatsu.search.ui.MangaListActivity
 import org.koitharu.kotatsu.search.ui.SearchActivity
 import javax.inject.Inject
@@ -56,8 +57,10 @@ class PreviewFragment : BaseFragment<FragmentPreviewBinding>(), View.OnClickList
 		binding.textViewAuthor.setOnClickListener(this)
 		binding.imageViewCover.setOnClickListener(this)
 		binding.buttonOpen.setOnClickListener(this)
+		binding.buttonRead.setOnClickListener(this)
 
 		viewModel.manga.observe(viewLifecycleOwner, ::onMangaUpdated)
+		viewModel.footer.observe(viewLifecycleOwner, ::onFooterUpdated)
 		viewModel.tagsChips.observe(viewLifecycleOwner, ::onTagsChipsChanged)
 		viewModel.description.observe(viewLifecycleOwner, ::onDescriptionChanged)
 	}
@@ -70,6 +73,14 @@ class PreviewFragment : BaseFragment<FragmentPreviewBinding>(), View.OnClickList
 				DetailsActivity.newIntent(v.context, manga),
 			)
 
+			R.id.button_read -> {
+				startActivity(
+					ReaderActivity.IntentBuilder(v.context)
+						.manga(manga)
+						.build(),
+				)
+			}
+
 			R.id.textView_author -> startActivity(
 				SearchActivity.newIntent(
 					context = v.context,
@@ -118,6 +129,43 @@ class PreviewFragment : BaseFragment<FragmentPreviewBinding>(), View.OnClickList
 		}
 	}
 
+	private fun onFooterUpdated(footer: PreviewViewModel.FooterInfo?) {
+		with(requireViewBinding()) {
+			toolbarBottom.isVisible = footer != null
+			if (footer == null) {
+				return
+			}
+			toolbarBottom.title = when {
+				footer.isInProgress() -> {
+					getString(R.string.chapter_d_of_d, footer.currentChapter, footer.totalChapters)
+				}
+
+				footer.totalChapters > 0 -> {
+					resources.getQuantityString(R.plurals.chapters, footer.totalChapters, footer.totalChapters)
+				}
+
+				else -> {
+					getString(R.string.no_chapters)
+				}
+			}
+			buttonRead.isEnabled = footer.totalChapters > 0
+			buttonRead.setIconResource(
+				when {
+					footer.isIncognito -> R.drawable.ic_incognito
+					footer.isInProgress() -> R.drawable.ic_play
+					else -> R.drawable.ic_read
+				},
+			)
+			buttonRead.setText(
+				if (footer.isInProgress()) {
+					R.string._continue
+				} else {
+					R.string.read
+				},
+			)
+		}
+	}
+
 	private fun onDescriptionChanged(description: CharSequence?) {
 		val tv = viewBinding?.textViewDescription ?: return
 		when {

app/src/main/kotlin/org/koitharu/kotatsu/list/ui/preview/PreviewViewModel.kt

@@ -13,11 +13,14 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.distinctUntilChangedBy
+import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.transformLatest
 import kotlinx.coroutines.plus
+import org.koitharu.kotatsu.core.model.getPreferredBranch
 import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
 import org.koitharu.kotatsu.core.parser.MangaIntent
 import org.koitharu.kotatsu.core.parser.MangaRepository
@@ -25,6 +28,7 @@ import org.koitharu.kotatsu.core.ui.BaseViewModel
 import org.koitharu.kotatsu.core.ui.widgets.ChipsView
 import org.koitharu.kotatsu.core.util.ext.require
 import org.koitharu.kotatsu.core.util.ext.sanitize
+import org.koitharu.kotatsu.history.data.HistoryRepository
 import org.koitharu.kotatsu.list.domain.ListExtraProvider
 import javax.inject.Inject
 
@@ -33,6 +37,7 @@ class PreviewViewModel @Inject constructor(
 	savedStateHandle: SavedStateHandle,
 	private val extraProvider: ListExtraProvider,
 	private val repositoryFactory: MangaRepository.Factory,
+	private val historyRepository: HistoryRepository,
 	private val imageGetter: Html.ImageGetter,
 ) : BaseViewModel() {
 
@@ -40,6 +45,26 @@ class PreviewViewModel @Inject constructor(
 		savedStateHandle.require<ParcelableManga>(MangaIntent.KEY_MANGA).manga,
 	)
 
+	val footer = combine(
+		manga,
+		historyRepository.observeOne(manga.value.id),
+		manga.flatMapLatest { historyRepository.observeShouldSkip(it) }.distinctUntilChanged(),
+	) { m, history, incognito ->
+		if (m.chapters == null) {
+			return@combine null
+		}
+		val b = m.getPreferredBranch(history)
+		val chapters = m.getChapters(b).orEmpty()
+		FooterInfo(
+			branch = b,
+			currentChapter = history?.chapterId?.let {
+				chapters.indexOfFirst { x -> x.id == it }
+			} ?: -1,
+			totalChapters = chapters.size,
+			isIncognito = incognito,
+		)
+	}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Lazily, null)
+
 	val description = manga
 		.distinctUntilChangedBy { it.description.orEmpty() }
 		.transformLatest {
@@ -82,4 +107,14 @@ class PreviewViewModel @Inject constructor(
 		}
 		return spannable.trim()
 	}
+
+	data class FooterInfo(
+		val branch: String?,
+		val currentChapter: Int,
+		val totalChapters: Int,
+		val isIncognito: Boolean,
+	) {
+
+		fun isInProgress() = currentChapter >= 0
+	}
 }

app/src/main/kotlin/org/koitharu/kotatsu/search/ui/suggestion/adapter/SearchSuggestionTagsAD.kt

@@ -1,23 +1,23 @@
 package org.koitharu.kotatsu.search.ui.suggestion.adapter
 
-import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegate
+import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
-import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.ui.widgets.ChipsView
+import org.koitharu.kotatsu.databinding.ItemSearchSuggestionTagsBinding
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.search.ui.suggestion.SearchSuggestionListener
 import org.koitharu.kotatsu.search.ui.suggestion.model.SearchSuggestionItem
 
 fun searchSuggestionTagsAD(
 	listener: SearchSuggestionListener,
-) = adapterDelegate<SearchSuggestionItem.Tags, SearchSuggestionItem>(R.layout.item_search_suggestion_tags) {
+) = adapterDelegateViewBinding<SearchSuggestionItem.Tags, SearchSuggestionItem, ItemSearchSuggestionTagsBinding>(
+	{ layoutInflater, parent -> ItemSearchSuggestionTagsBinding.inflate(layoutInflater, parent, false) },
+) {
 
-	val chipGroup = itemView as ChipsView
+	binding.chipsGenres.onChipClickListener = ChipsView.OnChipClickListener { _, data ->
-
-	chipGroup.onChipClickListener = ChipsView.OnChipClickListener { _, data ->
 		listener.onTagClick(data as? MangaTag ?: return@OnChipClickListener)
 	}
 
 	bind {
-		chipGroup.setChips(item.tags)
+		binding.chipsGenres.setChips(item.tags)
 	}
 }

app/src/main/res/layout/fragment_preview.xml

@@ -1,14 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
+<FrameLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
+	<ScrollView
+		android:id="@+id/scrollView"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:scrollIndicators="bottom">
+
 		<androidx.constraintlayout.widget.ConstraintLayout
 			android:layout_width="match_parent"
-		android:layout_height="wrap_content">
+			android:layout_height="wrap_content"
+			android:paddingBottom="?actionBarSize">
 
 			<com.google.android.material.imageview.ShapeableImageView
 				android:id="@+id/imageView_cover"
@@ -162,4 +169,29 @@
 
 		</androidx.constraintlayout.widget.ConstraintLayout>
 
-</ScrollView>
+	</ScrollView>
+
+	<com.google.android.material.appbar.MaterialToolbar
+		android:id="@+id/toolbar_bottom"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_gravity="bottom"
+		android:background="?colorBackgroundFloating">
+
+		<com.google.android.material.button.MaterialButton
+			android:id="@+id/button_read"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="end|center_vertical"
+			android:layout_marginHorizontal="@dimen/toolbar_button_margin"
+			android:enabled="false"
+			android:text="@string/read"
+			android:textAllCaps="false"
+			app:iconGravity="textStart"
+			app:iconPadding="8dp"
+			tools:enabled="true"
+			tools:icon="@drawable/ic_read" />
+
+	</com.google.android.material.appbar.MaterialToolbar>
+
+</FrameLayout>

app/src/main/res/layout/item_categories_header.xml

@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<HorizontalScrollView
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:gravity="center"
+	android:scrollbars="none">
-	android:orientation="horizontal"
-	android:paddingHorizontal="12dp"
-	android:paddingVertical="8dp"
-	app:layout_scrollFlags="scroll|exitUntilCollapsed">
 
-	<Button
+	<com.google.android.material.chip.ChipGroup
-		android:id="@+id/button_create"
+		android:layout_width="wrap_content"
-		style="@style/Widget.Material3.Button.OutlinedButton"
+		android:layout_height="wrap_content"
+		android:paddingStart="?listPreferredItemPaddingStart"
+		android:paddingEnd="?listPreferredItemPaddingEnd"
+		app:singleLine="true">
+
+		<com.google.android.material.chip.Chip
+			android:id="@+id/chip_create"
+			style="@style/Widget.Kotatsu.Chip.Assist"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-		android:ellipsize="end"
-		android:singleLine="true"
 			android:text="@string/create_category"
-		app:icon="@drawable/ic_add" />
+			app:chipIcon="@drawable/ic_add" />
 
-	<Button
+		<com.google.android.material.chip.Chip
-		android:id="@+id/button_manage"
+			android:id="@+id/chip_manage"
-		style="@style/Widget.Material3.Button.OutlinedButton"
+			style="@style/Widget.Kotatsu.Chip.Assist"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-		android:layout_marginStart="8dp"
+			android:text="@string/manage_categories"
-		android:ellipsize="end"
+			app:chipIcon="@drawable/ic_edit" />
-		android:singleLine="true"
+
-		android:text="@string/manage"
+	</com.google.android.material.chip.ChipGroup>
-		app:icon="@drawable/ic_edit" />
 
-</LinearLayout>
+</HorizontalScrollView>

app/src/main/res/layout/item_search_suggestion_tags.xml

@@ -1,9 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.koitharu.kotatsu.core.ui.widgets.ChipsView
+<HorizontalScrollView
 	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:id="@+id/scrollView"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
+	android:scrollbars="none">
+
+	<org.koitharu.kotatsu.core.ui.widgets.ChipsView
+		android:id="@+id/chips_genres"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
 		android:paddingStart="?listPreferredItemPaddingStart"
-	android:paddingTop="4dp"
 		android:paddingEnd="?listPreferredItemPaddingEnd"
-	android:paddingBottom="6dp" />
+		app:singleLine="true" />
+
+</HorizontalScrollView>

app/src/main/res/layout/sheet_filter.xml

@@ -20,6 +20,7 @@
 		android:scrollIndicators="top">
 
 		<LinearLayout
+			android:id="@+id/layout_body"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:orientation="vertical"

app/src/main/res/layout/sheet_tags.xml

@@ -17,18 +17,19 @@
 
 	<com.google.android.material.textfield.TextInputLayout
 		android:id="@+id/text_input_layout"
+		style="?textInputFilledDenseStyle"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		app:startIconDrawable="?android:actionModeWebSearchDrawable"
-		app:endIconMode="clear_text"
-		app:endIconDrawable="@drawable/abc_ic_clear_material"
-		android:hint="@string/genres_search_hint"
 		android:layout_marginHorizontal="16dp"
 		android:layout_marginBottom="4dp"
+		android:hint="@string/genres_search_hint"
+		app:endIconDrawable="@drawable/abc_ic_clear_material"
+		app:endIconMode="clear_text"
+		app:layout_constraintBottom_toTopOf="@id/recyclerView"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toBottomOf="@id/headerBar"
-		app:layout_constraintBottom_toTopOf="@id/recyclerView">
+		app:startIconDrawable="?android:actionModeWebSearchDrawable">
 
 		<com.google.android.material.textfield.TextInputEditText
 			android:id="@+id/edit_search"
@@ -36,7 +37,7 @@
 			android:layout_height="wrap_content"
 			android:imeOptions="actionSearch|flagNoFullscreen"
 			android:importantForAutofill="no"
-			android:inputType="text"/>
+			android:inputType="text" />
 
 	</com.google.android.material.textfield.TextInputLayout>