diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ae07018d1..b8261310b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -135,8 +135,7 @@
android:windowSoftInputMode="adjustResize" />
+ android:label="@string/manage_categories" />
) {
db.withTransaction {
for (id in ids) {
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/CategoriesSelectionCallback.kt b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/CategoriesSelectionCallback.kt
index c62b36b1c..d629424f7 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/CategoriesSelectionCallback.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/CategoriesSelectionCallback.kt
@@ -7,7 +7,6 @@ import androidx.recyclerview.widget.RecyclerView
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import org.koitharu.kotatsu.R
import org.koitharu.kotatsu.core.ui.list.ListSelectionController
-import org.koitharu.kotatsu.favourites.ui.categories.edit.FavouritesCategoryEditActivity
import com.google.android.material.R as materialR
class CategoriesSelectionCallback(
@@ -25,21 +24,44 @@ class CategoriesSelectionCallback(
}
override fun onPrepareActionMode(controller: ListSelectionController, mode: ActionMode, menu: Menu): Boolean {
- val isOneItem = controller.count == 1
- menu.findItem(R.id.action_edit)?.isVisible = isOneItem
+ val categories = viewModel.getCategories(controller.peekCheckedIds())
+ var canShow = categories.isNotEmpty()
+ var canHide = canShow
+ for (cat in categories) {
+ if (cat.isVisibleInLibrary) {
+ canShow = false
+ } else {
+ canHide = false
+ }
+ }
+ menu.findItem(R.id.action_show)?.isVisible = canShow
+ menu.findItem(R.id.action_hide)?.isVisible = canHide
mode.title = controller.count.toString()
return true
}
override fun onActionItemClicked(controller: ListSelectionController, mode: ActionMode, item: MenuItem): Boolean {
return when (item.itemId) {
- R.id.action_edit -> {
+ /*R.id.action_view -> {
val id = controller.peekCheckedIds().singleOrNull() ?: return false
val context = recyclerView.context
- val intent = FavouritesCategoryEditActivity.newIntent(context, id)
+ val category = viewModel.getCategory(id) ?: return false
+ val intent = FavouritesActivity.newIntent(context, category)
context.startActivity(intent)
mode.finish()
true
+ }*/
+
+ R.id.action_show -> {
+ viewModel.setIsVisible(controller.snapshot(), true)
+ mode.finish()
+ true
+ }
+
+ R.id.action_hide -> {
+ viewModel.setIsVisible(controller.snapshot(), false)
+ mode.finish()
+ true
}
R.id.action_remove -> {
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/FavouriteCategoriesActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/FavouriteCategoriesActivity.kt
index 2269e4b16..9f24171ad 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/FavouriteCategoriesActivity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/FavouriteCategoriesActivity.kt
@@ -20,9 +20,7 @@ import org.koitharu.kotatsu.core.ui.BaseActivity
import org.koitharu.kotatsu.core.ui.list.ListSelectionController
import org.koitharu.kotatsu.core.util.ext.observe
import org.koitharu.kotatsu.core.util.ext.observeEvent
-import org.koitharu.kotatsu.core.util.ext.scaleUpActivityOptionsOf
import org.koitharu.kotatsu.databinding.ActivityCategoriesBinding
-import org.koitharu.kotatsu.favourites.ui.FavouritesActivity
import org.koitharu.kotatsu.favourites.ui.categories.adapter.CategoriesAdapter
import org.koitharu.kotatsu.favourites.ui.categories.edit.FavouritesCategoryEditActivity
import org.koitharu.kotatsu.list.ui.adapter.ListStateHolderListener
@@ -66,7 +64,7 @@ class FavouriteCategoriesActivity :
attachToRecyclerView(viewBinding.recyclerView)
}
- viewModel.detalizedCategories.observe(this, ::onCategoriesChanged)
+ viewModel.categories.observe(this, ::onCategoriesChanged)
viewModel.onError.observeEvent(this, SnackbarErrorObserver(viewBinding.recyclerView, null))
}
@@ -80,9 +78,8 @@ class FavouriteCategoriesActivity :
if (selectionController.onItemClick(item.id)) {
return
}
- val intent = FavouritesActivity.newIntent(this, item)
- val options = scaleUpActivityOptionsOf(view)
- startActivity(intent, options)
+ val intent = FavouritesCategoryEditActivity.newIntent(view.context, item.id)
+ startActivity(intent)
}
override fun onItemLongClick(item: FavouriteCategory, view: View): Boolean {
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/FavouritesCategoriesViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/FavouritesCategoriesViewModel.kt
index 952c37382..e5fa046b3 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/FavouritesCategoriesViewModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/FavouritesCategoriesViewModel.kt
@@ -9,6 +9,7 @@ import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.stateIn
import kotlinx.coroutines.plus
import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.core.model.FavouriteCategory
import org.koitharu.kotatsu.core.prefs.AppSettings
import org.koitharu.kotatsu.core.ui.BaseViewModel
import org.koitharu.kotatsu.core.util.ext.requireValue
@@ -27,7 +28,7 @@ class FavouritesCategoriesViewModel @Inject constructor(
private var reorderJob: Job? = null
- val detalizedCategories = repository.observeCategoriesWithCovers()
+ val categories = repository.observeCategoriesWithCovers()
.map { list ->
list.map { (category, covers) ->
CategoryListModel(
@@ -47,14 +48,8 @@ class FavouritesCategoriesViewModel @Inject constructor(
}
}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, listOf(LoadingState))
- fun deleteCategory(id: Long) {
- launchJob {
- repository.removeCategory(id)
- }
- }
-
fun deleteCategories(ids: Set) {
- launchJob {
+ launchJob(Dispatchers.Default) {
repository.removeCategories(ids)
}
}
@@ -63,13 +58,13 @@ class FavouritesCategoriesViewModel @Inject constructor(
settings.isAllFavouritesVisible = isVisible
}
- fun isEmpty(): Boolean = detalizedCategories.value.none { it is CategoryListModel }
+ fun isEmpty(): Boolean = categories.value.none { it is CategoryListModel }
fun reorderCategories(oldPos: Int, newPos: Int) {
val prevJob = reorderJob
reorderJob = launchJob(Dispatchers.Default) {
prevJob?.join()
- val items = detalizedCategories.requireValue()
+ val items = categories.requireValue()
val ids = items.mapNotNullTo(ArrayList(items.size)) {
(it as? CategoryListModel)?.category?.id
}
@@ -78,4 +73,19 @@ class FavouritesCategoriesViewModel @Inject constructor(
repository.reorderCategories(ids)
}
}
+
+ fun setIsVisible(ids: Set, isVisible: Boolean) {
+ launchJob(Dispatchers.Default) {
+ for (id in ids) {
+ repository.updateCategory(id, isVisible)
+ }
+ }
+ }
+
+ fun getCategories(ids: Set): ArrayList {
+ val items = categories.requireValue()
+ return items.mapNotNullTo(ArrayList(ids.size)) { item ->
+ (item as? CategoryListModel)?.category?.takeIf { it.id in ids }
+ }
+ }
}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/adapter/CategoryAD.kt b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/adapter/CategoryAD.kt
index 5a89ced7c..edcf8b85b 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/adapter/CategoryAD.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/categories/adapter/CategoryAD.kt
@@ -35,8 +35,8 @@ fun categoryAD(
{ inflater, parent -> ItemCategoryBinding.inflate(inflater, parent, false) },
) {
val eventListener = object : OnClickListener, OnLongClickListener, OnTouchListener {
- override fun onClick(v: View) = clickListener.onItemClick(item.category, binding.imageViewCover1)
- override fun onLongClick(v: View) = clickListener.onItemLongClick(item.category, binding.imageViewCover1)
+ override fun onClick(v: View) = clickListener.onItemClick(item.category, itemView)
+ override fun onLongClick(v: View) = clickListener.onItemLongClick(item.category, itemView)
override fun onTouch(v: View?, event: MotionEvent): Boolean = event.actionMasked == MotionEvent.ACTION_DOWN &&
clickListener.onDragHandleTouch(this@adapterDelegateViewBinding)
}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/container/FavouritesContainerFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/container/FavouritesContainerFragment.kt
index a2c43c70d..efce0c7aa 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/container/FavouritesContainerFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/container/FavouritesContainerFragment.kt
@@ -1,22 +1,38 @@
package org.koitharu.kotatsu.favourites.ui.container
-import android.annotation.SuppressLint
import android.os.Bundle
import android.view.LayoutInflater
+import android.view.View
import android.view.ViewGroup
+import android.view.ViewStub
import androidx.appcompat.view.ActionMode
import androidx.core.graphics.Insets
+import androidx.core.view.isGone
+import androidx.core.view.isVisible
import androidx.core.view.updatePadding
import androidx.fragment.app.viewModels
+import coil.ImageLoader
import dagger.hilt.android.AndroidEntryPoint
+import org.koitharu.kotatsu.R
import org.koitharu.kotatsu.core.ui.BaseFragment
import org.koitharu.kotatsu.core.ui.util.ActionModeListener
import org.koitharu.kotatsu.core.util.ext.addMenuProvider
+import org.koitharu.kotatsu.core.util.ext.enqueueWith
+import org.koitharu.kotatsu.core.util.ext.newImageRequest
import org.koitharu.kotatsu.core.util.ext.observe
+import org.koitharu.kotatsu.core.util.ext.setTabsEnabled
+import org.koitharu.kotatsu.core.util.ext.setTextAndVisible
import org.koitharu.kotatsu.databinding.FragmentFavouritesContainerBinding
+import org.koitharu.kotatsu.databinding.ItemEmptyStateBinding
+import org.koitharu.kotatsu.favourites.ui.categories.FavouriteCategoriesActivity
+import javax.inject.Inject
@AndroidEntryPoint
-class FavouritesContainerFragment : BaseFragment(), ActionModeListener {
+class FavouritesContainerFragment : BaseFragment(), ActionModeListener,
+ ViewStub.OnInflateListener, View.OnClickListener {
+
+ @Inject
+ lateinit var coil: ImageLoader
private val viewModel: FavouritesContainerViewModel by viewModels()
@@ -31,8 +47,10 @@ class FavouritesContainerFragment : BaseFragment startActivity(
+ FavouriteCategoriesActivity.newIntent(v.context),
+ )
+ }
+ }
+
+ private fun onEmptyStateChanged(isEmpty: Boolean) {
+ viewBinding?.run {
+ pager.isGone = isEmpty
+ tabs.isGone = isEmpty
+ stubEmpty.isVisible = isEmpty
}
}
}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/container/FavouritesContainerViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/container/FavouritesContainerViewModel.kt
index b4b07eea2..b80b45cce 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/container/FavouritesContainerViewModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/favourites/ui/container/FavouritesContainerViewModel.kt
@@ -5,6 +5,8 @@ import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.stateIn
import kotlinx.coroutines.plus
import org.koitharu.kotatsu.core.ui.BaseViewModel
@@ -17,8 +19,15 @@ class FavouritesContainerViewModel @Inject constructor(
favouritesRepository: FavouritesRepository,
) : BaseViewModel() {
- val categories = favouritesRepository.observeCategoriesForLibrary()
+ private val categoriesStateFlow = favouritesRepository.observeCategoriesForLibrary()
+ .stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, null)
+
+ val categories = categoriesStateFlow.filterNotNull()
.mapItems { FavouriteTabModel(it.id, it.title) }
.distinctUntilChanged()
.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, emptyList())
+
+ val isEmpty = categoriesStateFlow.map {
+ it?.isEmpty() == true
+ }.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.Eagerly, false)
}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterAdapter.kt b/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterAdapter.kt
index e17c4b4eb..1146af48a 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterAdapter.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterAdapter.kt
@@ -16,8 +16,12 @@ class FilterAdapter(
) : BaseListAdapter(), FastScroller.SectionIndexer {
init {
- delegatesManager.addDelegate(filterSortDelegate(listener)).addDelegate(filterTagDelegate(listener))
- .addDelegate(listHeaderAD(null)).addDelegate(loadingStateAD()).addDelegate(loadingFooterAD())
+ delegatesManager
+ .addDelegate(ITEM_TYPE_SORT, filterSortDelegate(listener))
+ .addDelegate(ITEM_TYPE_TAG, filterTagDelegate(listener))
+ .addDelegate(ITEM_TYPE_HEADER, listHeaderAD(listener))
+ .addDelegate(loadingStateAD())
+ .addDelegate(loadingFooterAD())
.addDelegate(filterErrorDelegate())
differ.addListListener(listListener)
}
@@ -32,4 +36,11 @@ class FilterAdapter(
}
return null
}
+
+ companion object {
+
+ const val ITEM_TYPE_SORT = 0
+ const val ITEM_TYPE_TAG = 1
+ const val ITEM_TYPE_HEADER = 2
+ }
}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterCoordinator.kt b/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterCoordinator.kt
index 9e000f6ec..643b078b2 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterCoordinator.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterCoordinator.kt
@@ -1,5 +1,6 @@
package org.koitharu.kotatsu.filter.ui
+import android.view.View
import androidx.annotation.WorkerThread
import androidx.lifecycle.SavedStateHandle
import dagger.hilt.android.ViewModelLifecycle
@@ -95,6 +96,10 @@ class FilterCoordinator @Inject constructor(
}
}
+ override fun onListHeaderClick(item: ListHeader, view: View) {
+ reset()
+ }
+
fun observeAvailableTags(): Flow?> = flow {
if (!availableTagsDeferred.isCompleted) {
emit(emptySet())
@@ -208,7 +213,7 @@ class FilterCoordinator @Inject constructor(
}
}
if (allTags.isLoading || allTags.isError || tags.isNotEmpty()) {
- list.add(ListHeader(R.string.genres, 0, null))
+ list.add(ListHeader(R.string.genres, if (state.tags.isEmpty()) 0 else R.string.reset, null))
tags.mapTo(list) {
FilterItem.Tag(it, isChecked = it in state.tags)
}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterItemDecoration.kt b/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterItemDecoration.kt
new file mode 100644
index 000000000..f199c27f2
--- /dev/null
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterItemDecoration.kt
@@ -0,0 +1,28 @@
+package org.koitharu.kotatsu.filter.ui
+
+import android.content.Context
+import android.graphics.Rect
+import android.view.View
+import androidx.recyclerview.widget.RecyclerView
+import org.koitharu.kotatsu.R
+
+class FilterItemDecoration(
+ context: Context,
+) : RecyclerView.ItemDecoration() {
+
+ private val spacing = context.resources.getDimensionPixelOffset(R.dimen.list_spacing)
+
+ override fun getItemOffsets(
+ outRect: Rect,
+ view: View,
+ parent: RecyclerView,
+ state: RecyclerView.State
+ ) {
+ val itemType = parent.getChildViewHolder(view)?.itemViewType ?: -1
+ if (itemType == FilterAdapter.ITEM_TYPE_HEADER) {
+ outRect.set(spacing, 0, spacing, 0)
+ } else {
+ outRect.set(0, 0, 0, 0)
+ }
+ }
+}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterSheetFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterSheetFragment.kt
index 91686145a..a2e625033 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterSheetFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/FilterSheetFragment.kt
@@ -32,6 +32,7 @@ class FilterSheetFragment :
val adapter = FilterAdapter(filter, this)
binding.recyclerView.adapter = adapter
filter.filterItems.observe(viewLifecycleOwner, adapter)
+ binding.recyclerView.addItemDecoration(FilterItemDecoration(binding.root.context))
if (dialog == null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
binding.recyclerView.scrollIndicators = 0
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/OnFilterChangedListener.kt b/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/OnFilterChangedListener.kt
index bf3f15f93..b82e08a43 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/OnFilterChangedListener.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/filter/ui/OnFilterChangedListener.kt
@@ -1,8 +1,9 @@
package org.koitharu.kotatsu.filter.ui
import org.koitharu.kotatsu.filter.ui.model.FilterItem
+import org.koitharu.kotatsu.list.ui.adapter.ListHeaderClickListener
-interface OnFilterChangedListener {
+interface OnFilterChangedListener : ListHeaderClickListener {
fun onSortItemClick(item: FilterItem.Sort)
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/MangaListFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/MangaListFragment.kt
index dabdb6b7d..72559c0eb 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/MangaListFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/MangaListFragment.kt
@@ -309,7 +309,7 @@ abstract class MangaListFragment :
}
override fun onSelectionChanged(controller: ListSelectionController, count: Int) {
- requireViewBinding().recyclerView.invalidateItemDecorations()
+ viewBinding?.recyclerView?.invalidateItemDecorations()
}
override fun onFastScrollStart(fastScroller: FastScroller) {
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/ListHeaderAD.kt b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/ListHeaderAD.kt
index 51a58e2e0..dc3920031 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/ListHeaderAD.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/ListHeaderAD.kt
@@ -1,7 +1,8 @@
package org.koitharu.kotatsu.list.ui.adapter
+import androidx.core.view.isInvisible
+import androidx.core.view.isVisible
import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
-import org.koitharu.kotatsu.core.util.ext.setTextAndVisible
import org.koitharu.kotatsu.databinding.ItemHeaderButtonBinding
import org.koitharu.kotatsu.list.ui.model.ListHeader
import org.koitharu.kotatsu.list.ui.model.ListModel
@@ -19,6 +20,12 @@ fun listHeaderAD(
bind {
binding.textViewTitle.text = item.getText(context)
- binding.buttonMore.setTextAndVisible(item.buttonTextRes)
+ if (item.buttonTextRes == 0) {
+ binding.buttonMore.isInvisible = true
+ binding.buttonMore.text = null
+ } else {
+ binding.buttonMore.setText(item.buttonTextRes)
+ binding.buttonMore.isVisible = true
+ }
}
}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/preview/PreviewFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/preview/PreviewFragment.kt
index 3c30c014d..86f2f39c0 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/preview/PreviewFragment.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/preview/PreviewFragment.kt
@@ -5,6 +5,7 @@ import android.text.method.LinkMovementMethod
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
+import android.widget.TextView
import androidx.core.graphics.Insets
import androidx.core.view.isVisible
import androidx.fragment.app.viewModels
@@ -120,11 +121,11 @@ class PreviewFragment : BaseFragment(), View.OnClickList
}
private fun onDescriptionChanged(description: CharSequence?) {
- val tv = requireViewBinding().textViewDescription
- if (description.isNullOrBlank()) {
- tv.setText(R.string.no_description)
- } else {
- tv.text = description
+ val tv = viewBinding?.textViewDescription ?: return
+ when {
+ description == null -> tv.setText(R.string.loading_)
+ description.isBlank() -> tv.setText(R.string.no_description)
+ else -> tv.setText(description, TextView.BufferType.NORMAL)
}
}
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/preview/PreviewViewModel.kt b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/preview/PreviewViewModel.kt
index 753e3782c..a2856fd3f 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/preview/PreviewViewModel.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/preview/PreviewViewModel.kt
@@ -12,6 +12,7 @@ import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.distinctUntilChangedBy
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.stateIn
@@ -49,6 +50,8 @@ class PreviewViewModel @Inject constructor(
emit(description.parseAsHtml().filterSpans().sanitize())
emit(description.parseAsHtml(imageGetter = imageGetter).filterSpans())
}
+ }.combine(isLoading) { desc, loading ->
+ if (loading) null else desc ?: ""
}.stateIn(viewModelScope + Dispatchers.Default, SharingStarted.WhileSubscribed(5000), null)
val tagsChips = manga.map {
diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/MangaListActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/MangaListActivity.kt
index 25c389f23..85cf6523a 100644
--- a/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/MangaListActivity.kt
+++ b/app/src/main/kotlin/org/koitharu/kotatsu/search/ui/MangaListActivity.kt
@@ -62,7 +62,7 @@ class MangaListActivity :
finishAfterTransition()
return
}
- viewBinding.chipSort?.setOnClickListener(this)
+ viewBinding.buttonOrder?.setOnClickListener(this)
title = if (source == MangaSource.LOCAL) getString(R.string.local_storage) else source.title
initList(source, tags)
}
@@ -80,7 +80,7 @@ class MangaListActivity :
override fun onClick(v: View) {
when (v.id) {
- R.id.chip_sort -> FilterSheetFragment.show(supportFragmentManager)
+ R.id.button_order -> FilterSheetFragment.show(supportFragmentManager)
}
}
@@ -127,7 +127,7 @@ class MangaListActivity :
}
}
val filter = filterOwner.filter
- val chipSort = viewBinding.chipSort
+ val chipSort = viewBinding.buttonOrder
if (chipSort != null) {
filter.header.observe(this) {
chipSort.setTextAndVisible(it.sortOrder?.titleRes ?: 0)
diff --git a/app/src/main/res/drawable/ic_eye_off.xml b/app/src/main/res/drawable/ic_eye_off.xml
new file mode 100644
index 000000000..8a53bd92c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_eye_off.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/app/src/main/res/layout/activity_categories.xml b/app/src/main/res/layout/activity_categories.xml
index 97799592d..a16d2432d 100644
--- a/app/src/main/res/layout/activity_categories.xml
+++ b/app/src/main/res/layout/activity_categories.xml
@@ -2,6 +2,7 @@
@@ -50,7 +51,8 @@
android:paddingVertical="@dimen/list_spacing"
android:scrollbars="vertical"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
- app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
+ app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
+ tools:listitem="@layout/item_category" />
-
diff --git a/app/src/main/res/layout/fragment_favourites_container.xml b/app/src/main/res/layout/fragment_favourites_container.xml
index 6f99e5e19..53d453eb4 100644
--- a/app/src/main/res/layout/fragment_favourites_container.xml
+++ b/app/src/main/res/layout/fragment_favourites_container.xml
@@ -2,6 +2,7 @@
@@ -16,6 +17,14 @@
+ android:layout_height="match_parent"
+ tools:visibility="gone" />
+
+
diff --git a/app/src/main/res/layout/item_category.xml b/app/src/main/res/layout/item_category.xml
index d47153d96..99e0fa846 100644
--- a/app/src/main/res/layout/item_category.xml
+++ b/app/src/main/res/layout/item_category.xml
@@ -124,7 +124,6 @@
android:id="@+id/imageView_handle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="?selectableItemBackgroundBorderless"
android:contentDescription="@string/reorder"
android:padding="@dimen/margin_normal"
android:src="@drawable/ic_reorder_handle"
diff --git a/app/src/main/res/layout/item_header_button.xml b/app/src/main/res/layout/item_header_button.xml
index a0fa2d7c9..3dab28955 100644
--- a/app/src/main/res/layout/item_header_button.xml
+++ b/app/src/main/res/layout/item_header_button.xml
@@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:baselineAligned="true"
android:orientation="horizontal">
+ android:visibility="invisible"
+ tools:text="@string/manage"
+ tools:visibility="visible" />
diff --git a/app/src/main/res/menu/mode_category.xml b/app/src/main/res/menu/mode_category.xml
index 2877cfd75..b84f0c554 100644
--- a/app/src/main/res/menu/mode_category.xml
+++ b/app/src/main/res/menu/mode_category.xml
@@ -4,9 +4,15 @@
xmlns:app="http://schemas.android.com/apk/res-auto">