Migrate favorites to ViewPager2
parent
313013dccd
commit
ae8b48d733
GPG Key ID:
676DEE768C17A9D7
@ -0,0 +1,38 @@
|
||||
package org.koitharu.kotatsu.core.ui.util
|
||||
|
||||
import android.view.MenuItem
|
||||
import android.view.View
|
||||
import androidx.appcompat.widget.PopupMenu
|
||||
import androidx.core.view.MenuProvider
|
||||
import org.koitharu.kotatsu.core.util.ext.setOnContextClickListenerCompat
|
||||
|
||||
class PopupMenuMediator(
|
||||
private val provider: MenuProvider,
|
||||
) : View.OnLongClickListener, PopupMenu.OnMenuItemClickListener, PopupMenu.OnDismissListener {
|
||||
|
||||
override fun onLongClick(v: View): Boolean {
|
||||
val menu = PopupMenu(v.context, v)
|
||||
provider.onCreateMenu(menu.menu, menu.menuInflater)
|
||||
provider.onPrepareMenu(menu.menu)
|
||||
if (!menu.menu.hasVisibleItems()) {
|
||||
return false
|
||||
}
|
||||
menu.setOnMenuItemClickListener(this)
|
||||
menu.setOnDismissListener(this)
|
||||
menu.show()
|
||||
return true
|
||||
}
|
||||
|
||||
override fun onMenuItemClick(item: MenuItem): Boolean {
|
||||
return provider.onMenuItemSelected(item)
|
||||
}
|
||||
|
||||
override fun onDismiss(menu: PopupMenu) {
|
||||
provider.onMenuClosed(menu.menu)
|
||||
}
|
||||
|
||||
fun attach(view: View) {
|
||||
view.setOnLongClickListener(this)
|
||||
view.setOnContextClickListenerCompat(this)
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,54 @@
|
||||
package org.koitharu.kotatsu.favourites.ui.container
|
||||
|
||||
import android.content.Context
|
||||
import android.view.Menu
|
||||
import android.view.MenuInflater
|
||||
import android.view.MenuItem
|
||||
import androidx.core.view.MenuProvider
|
||||
import com.google.android.material.dialog.MaterialAlertDialogBuilder
|
||||
import org.koitharu.kotatsu.R
|
||||
import org.koitharu.kotatsu.favourites.ui.categories.edit.FavouritesCategoryEditActivity
|
||||
import org.koitharu.kotatsu.favourites.ui.list.FavouritesListFragment.Companion.NO_ID
|
||||
|
||||
class FavouriteTabPopupMenuProvider(
|
||||
private val context: Context,
|
||||
private val viewModel: FavouritesContainerViewModel,
|
||||
private val categoryId: Long
|
||||
) : MenuProvider {
|
||||
|
||||
override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
|
||||
val menuResId = if (categoryId == NO_ID) {
|
||||
R.menu.popup_fav_tab_all
|
||||
} else {
|
||||
R.menu.popup_fav_tab
|
||||
}
|
||||
menuInflater.inflate(menuResId, menu)
|
||||
}
|
||||
|
||||
override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
|
||||
when (menuItem.itemId) {
|
||||
R.id.action_hide -> viewModel.hide(categoryId)
|
||||
R.id.action_edit -> context.startActivity(
|
||||
FavouritesCategoryEditActivity.newIntent(context, categoryId),
|
||||
)
|
||||
|
||||
R.id.action_delete -> confirmDelete()
|
||||
|
||||
else -> return false
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
private fun confirmDelete() {
|
||||
MaterialAlertDialogBuilder(
|
||||
context,
|
||||
com.google.android.material.R.style.ThemeOverlay_Material3_MaterialAlertDialog_Centered,
|
||||
).setMessage(R.string.categories_delete_confirm)
|
||||
.setTitle(R.string.remove_category)
|
||||
.setIcon(R.drawable.ic_delete)
|
||||
.setNegativeButton(android.R.string.cancel, null)
|
||||
.setPositiveButton(R.string.remove) { _, _ ->
|
||||
viewModel.deleteCategory(categoryId)
|
||||
}.show()
|
||||
}
|
||||
}
|
||||
@ -1,33 +1,46 @@
|
||||
package org.koitharu.kotatsu.favourites.ui.container
|
||||
|
||||
import androidx.fragment.app.Fragment
|
||||
import androidx.fragment.app.FragmentManager
|
||||
import androidx.fragment.app.FragmentStatePagerAdapter
|
||||
import androidx.recyclerview.widget.AdapterListUpdateCallback
|
||||
import androidx.recyclerview.widget.AsyncDifferConfig
|
||||
import androidx.recyclerview.widget.AsyncListDiffer
|
||||
import androidx.viewpager2.adapter.FragmentStateAdapter
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.asExecutor
|
||||
import kotlinx.coroutines.flow.FlowCollector
|
||||
import org.koitharu.kotatsu.core.util.ContinuationResumeRunnable
|
||||
import org.koitharu.kotatsu.favourites.ui.list.FavouritesListFragment
|
||||
import org.koitharu.kotatsu.parsers.util.replaceWith
|
||||
import org.koitharu.kotatsu.list.ui.ListModelDiffCallback
|
||||
import kotlin.coroutines.suspendCoroutine
|
||||
|
||||
@Suppress("DEPRECATION")
|
||||
class FavouritesContainerAdapter(
|
||||
fm: FragmentManager
|
||||
) : FragmentStatePagerAdapter(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT),
|
||||
class FavouritesContainerAdapter(fragment: Fragment) : FragmentStateAdapter(fragment),
|
||||
FlowCollector<List<FavouriteTabModel>> {
|
||||
|
||||
private val dataSet = ArrayList<FavouriteTabModel>()
|
||||
private val differ = AsyncListDiffer(
|
||||
AdapterListUpdateCallback(this),
|
||||
AsyncDifferConfig.Builder(ListModelDiffCallback<FavouriteTabModel>())
|
||||
.setBackgroundThreadExecutor(Dispatchers.Default.limitedParallelism(2).asExecutor())
|
||||
.build(),
|
||||
)
|
||||
|
||||
override fun getCount(): Int = dataSet.size
|
||||
override fun getItemCount(): Int = differ.currentList.size
|
||||
|
||||
override fun getItem(position: Int): Fragment {
|
||||
val item = dataSet[position]
|
||||
return FavouritesListFragment.newInstance(item.id)
|
||||
override fun getItemId(position: Int): Long {
|
||||
return differ.currentList[position].id
|
||||
}
|
||||
|
||||
override fun getPageTitle(position: Int): CharSequence {
|
||||
return dataSet[position].title
|
||||
override fun containsItem(itemId: Long): Boolean {
|
||||
return differ.currentList.any { x -> x.id == itemId }
|
||||
}
|
||||
|
||||
override suspend fun emit(value: List<FavouriteTabModel>) {
|
||||
dataSet.replaceWith(value)
|
||||
notifyDataSetChanged()
|
||||
override fun createFragment(position: Int): Fragment {
|
||||
val item = differ.currentList[position]
|
||||
return FavouritesListFragment.newInstance(item.id)
|
||||
}
|
||||
|
||||
override suspend fun emit(value: List<FavouriteTabModel>) = suspendCoroutine { cont ->
|
||||
differ.submitList(value, ContinuationResumeRunnable(cont))
|
||||
}
|
||||
|
||||
fun getItem(position: Int): FavouriteTabModel = differ.currentList[position]
|
||||
}
|
||||
|
||||
@ -1,55 +0,0 @@
|
||||
package org.koitharu.kotatsu.favourites.ui.container
|
||||
|
||||
import androidx.fragment.app.Fragment
|
||||
import androidx.recyclerview.widget.AdapterListUpdateCallback
|
||||
import androidx.recyclerview.widget.AsyncDifferConfig
|
||||
import androidx.recyclerview.widget.AsyncListDiffer
|
||||
import androidx.viewpager2.adapter.FragmentStateAdapter
|
||||
import com.google.android.material.tabs.TabLayout
|
||||
import com.google.android.material.tabs.TabLayoutMediator.TabConfigurationStrategy
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.asExecutor
|
||||
import kotlinx.coroutines.flow.FlowCollector
|
||||
import org.koitharu.kotatsu.core.util.ContinuationResumeRunnable
|
||||
import org.koitharu.kotatsu.favourites.ui.list.FavouritesListFragment
|
||||
import org.koitharu.kotatsu.list.ui.ListModelDiffCallback
|
||||
import kotlin.coroutines.suspendCoroutine
|
||||
|
||||
// FIXME migrate to ViewPager2 in FavouritesContainerFragment
|
||||
class FavouritesContainerAdapter2(fragment: Fragment) :
|
||||
FragmentStateAdapter(fragment.childFragmentManager, fragment.viewLifecycleOwner.lifecycle),
|
||||
TabConfigurationStrategy,
|
||||
FlowCollector<List<FavouriteTabModel>> {
|
||||
|
||||
private val differ = AsyncListDiffer(
|
||||
AdapterListUpdateCallback(this),
|
||||
AsyncDifferConfig.Builder(ListModelDiffCallback<FavouriteTabModel>())
|
||||
.setBackgroundThreadExecutor(Dispatchers.Default.limitedParallelism(2).asExecutor())
|
||||
.build(),
|
||||
)
|
||||
|
||||
override fun getItemCount(): Int = differ.currentList.size
|
||||
|
||||
override fun getItemId(position: Int): Long {
|
||||
return differ.currentList[position].id
|
||||
}
|
||||
|
||||
override fun containsItem(itemId: Long): Boolean {
|
||||
return differ.currentList.any { x -> x.id == itemId }
|
||||
}
|
||||
|
||||
override fun createFragment(position: Int): Fragment {
|
||||
val item = differ.currentList[position]
|
||||
return FavouritesListFragment.newInstance(item.id)
|
||||
}
|
||||
|
||||
override fun onConfigureTab(tab: TabLayout.Tab, position: Int) {
|
||||
val item = differ.currentList[position]
|
||||
tab.text = item.title
|
||||
tab.tag = item
|
||||
}
|
||||
|
||||
override suspend fun emit(value: List<FavouriteTabModel>) = suspendCoroutine { cont ->
|
||||
differ.submitList(value, ContinuationResumeRunnable(cont))
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,19 @@
|
||||
package org.koitharu.kotatsu.favourites.ui.container
|
||||
|
||||
import com.google.android.material.tabs.TabLayout
|
||||
import com.google.android.material.tabs.TabLayoutMediator.TabConfigurationStrategy
|
||||
import org.koitharu.kotatsu.R
|
||||
import org.koitharu.kotatsu.core.ui.util.PopupMenuMediator
|
||||
|
||||
class FavouritesTabConfigurationStrategy(
|
||||
private val adapter: FavouritesContainerAdapter,
|
||||
private val viewModel: FavouritesContainerViewModel,
|
||||
) : TabConfigurationStrategy {
|
||||
|
||||
override fun onConfigureTab(tab: TabLayout.Tab, position: Int) {
|
||||
val item = adapter.getItem(position)
|
||||
tab.text = item.title ?: tab.view.context.getString(R.string.all_favourites)
|
||||
tab.tag = item
|
||||
PopupMenuMediator(FavouriteTabPopupMenuProvider(tab.view.context, viewModel, item.id)).attach(tab.view)
|
||||
}
|
||||
}
|
||||
@ -1,30 +0,0 @@
|
||||
package org.koitharu.kotatsu.favourites.ui.list
|
||||
|
||||
import android.content.Context
|
||||
import android.view.Menu
|
||||
import android.view.MenuInflater
|
||||
import android.view.MenuItem
|
||||
import androidx.core.view.MenuProvider
|
||||
import org.koitharu.kotatsu.R
|
||||
import org.koitharu.kotatsu.favourites.ui.categories.edit.FavouritesCategoryEditActivity
|
||||
|
||||
class FavouritesListMenuProvider(
|
||||
private val context: Context,
|
||||
private val viewModel: FavouritesListViewModel,
|
||||
) : MenuProvider {
|
||||
|
||||
override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
|
||||
menuInflater.inflate(R.menu.opt_favourites, menu)
|
||||
}
|
||||
|
||||
override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
|
||||
return when (menuItem.itemId) {
|
||||
R.id.action_edit -> {
|
||||
context.startActivity(FavouritesCategoryEditActivity.newIntent(context, viewModel.categoryId))
|
||||
true
|
||||
}
|
||||
|
||||
else -> false
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,18 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<item
|
||||
android:id="@+id/action_edit"
|
||||
android:title="@string/edit_category"
|
||||
android:titleCondensed="@string/edit" />
|
||||
|
||||
<item
|
||||
android:id="@+id/action_delete"
|
||||
android:title="@string/delete" />
|
||||
|
||||
<item
|
||||
android:id="@+id/action_hide"
|
||||
android:title="@string/hide" />
|
||||
|
||||
</menu>
|
||||
@ -0,0 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<item
|
||||
android:id="@+id/action_hide"
|
||||
android:title="@string/hide" />
|
||||
|
||||
</menu>
|
||||
Loading…
Reference in New Issue