New favorite dialog
parent
1b80e48ed4
commit
a5199e2f06
@ -0,0 +1,150 @@
|
|||||||
|
package org.koitharu.kotatsu.favourites.ui.categories.select
|
||||||
|
|
||||||
|
import android.content.DialogInterface
|
||||||
|
import android.content.Intent
|
||||||
|
import android.content.res.ColorStateList
|
||||||
|
import android.graphics.Color
|
||||||
|
import android.graphics.drawable.ColorDrawable
|
||||||
|
import android.os.Bundle
|
||||||
|
import android.view.LayoutInflater
|
||||||
|
import android.view.View
|
||||||
|
import android.view.ViewGroup
|
||||||
|
import android.widget.Toast
|
||||||
|
import androidx.core.graphics.ColorUtils
|
||||||
|
import androidx.core.view.isVisible
|
||||||
|
import androidx.core.widget.ImageViewCompat
|
||||||
|
import androidx.fragment.app.FragmentManager
|
||||||
|
import androidx.fragment.app.viewModels
|
||||||
|
import coil3.ImageLoader
|
||||||
|
import coil3.request.allowRgb565
|
||||||
|
import coil3.request.crossfade
|
||||||
|
import coil3.request.error
|
||||||
|
import coil3.request.fallback
|
||||||
|
import coil3.request.placeholder
|
||||||
|
import com.google.android.material.checkbox.MaterialCheckBox
|
||||||
|
import com.google.android.material.dialog.MaterialAlertDialogBuilder
|
||||||
|
import dagger.hilt.android.AndroidEntryPoint
|
||||||
|
import org.koitharu.kotatsu.R
|
||||||
|
import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
|
||||||
|
import org.koitharu.kotatsu.core.ui.AlertDialogFragment
|
||||||
|
import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
|
||||||
|
import org.koitharu.kotatsu.core.util.ext.disposeImageRequest
|
||||||
|
import org.koitharu.kotatsu.core.util.ext.enqueueWith
|
||||||
|
import org.koitharu.kotatsu.core.util.ext.getAnimationDuration
|
||||||
|
import org.koitharu.kotatsu.core.util.ext.getDisplayMessage
|
||||||
|
import org.koitharu.kotatsu.core.util.ext.getThemeColor
|
||||||
|
import org.koitharu.kotatsu.core.util.ext.joinToStringWithLimit
|
||||||
|
import org.koitharu.kotatsu.core.util.ext.mangaSourceExtra
|
||||||
|
import org.koitharu.kotatsu.core.util.ext.newImageRequest
|
||||||
|
import org.koitharu.kotatsu.core.util.ext.observe
|
||||||
|
import org.koitharu.kotatsu.core.util.ext.observeEvent
|
||||||
|
import org.koitharu.kotatsu.core.util.ext.showDistinct
|
||||||
|
import org.koitharu.kotatsu.core.util.ext.withArgs
|
||||||
|
import org.koitharu.kotatsu.databinding.SheetFavoriteCategoriesBinding
|
||||||
|
import org.koitharu.kotatsu.favourites.ui.categories.FavouriteCategoriesActivity
|
||||||
|
import org.koitharu.kotatsu.favourites.ui.categories.select.adapter.MangaCategoriesAdapter
|
||||||
|
import org.koitharu.kotatsu.favourites.ui.categories.select.model.MangaCategoryItem
|
||||||
|
import org.koitharu.kotatsu.parsers.model.Manga
|
||||||
|
import javax.inject.Inject
|
||||||
|
|
||||||
|
@AndroidEntryPoint
|
||||||
|
class FavoriteDialog : AlertDialogFragment<SheetFavoriteCategoriesBinding>(),
|
||||||
|
OnListItemClickListener<MangaCategoryItem>, DialogInterface.OnClickListener {
|
||||||
|
|
||||||
|
private val viewModel by viewModels<FavoriteSheetViewModel>()
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
lateinit var coil: ImageLoader
|
||||||
|
|
||||||
|
override fun onCreateViewBinding(
|
||||||
|
inflater: LayoutInflater,
|
||||||
|
container: ViewGroup?,
|
||||||
|
) = SheetFavoriteCategoriesBinding.inflate(inflater, container, false)
|
||||||
|
|
||||||
|
override fun onBuildDialog(builder: MaterialAlertDialogBuilder): MaterialAlertDialogBuilder {
|
||||||
|
return super.onBuildDialog(builder)
|
||||||
|
.setPositiveButton(R.string.done, null)
|
||||||
|
.setNeutralButton(R.string.manage, this)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onViewBindingCreated(
|
||||||
|
binding: SheetFavoriteCategoriesBinding,
|
||||||
|
savedInstanceState: Bundle?,
|
||||||
|
) {
|
||||||
|
super.onViewBindingCreated(binding, savedInstanceState)
|
||||||
|
val adapter = MangaCategoriesAdapter(coil, viewLifecycleOwner, this)
|
||||||
|
binding.recyclerViewCategories.adapter = adapter
|
||||||
|
viewModel.content.observe(viewLifecycleOwner, adapter)
|
||||||
|
viewModel.onError.observeEvent(viewLifecycleOwner, ::onError)
|
||||||
|
bindHeader()
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onItemClick(item: MangaCategoryItem, view: View) {
|
||||||
|
viewModel.setChecked(item.category.id, item.checkedState != MaterialCheckBox.STATE_CHECKED)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onClick(dialog: DialogInterface?, which: Int) {
|
||||||
|
startActivity(Intent(context ?: return, FavouriteCategoriesActivity::class.java))
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun onError(e: Throwable) {
|
||||||
|
Toast.makeText(context ?: return, e.getDisplayMessage(resources), Toast.LENGTH_SHORT).show()
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun bindHeader() {
|
||||||
|
val manga = viewModel.manga
|
||||||
|
val binding = viewBinding ?: return
|
||||||
|
val backgroundColor = binding.root.context.getThemeColor(android.R.attr.colorBackground)
|
||||||
|
ImageViewCompat.setImageTintList(
|
||||||
|
binding.imageViewCover3,
|
||||||
|
ColorStateList.valueOf(ColorUtils.setAlphaComponent(backgroundColor, 153)),
|
||||||
|
)
|
||||||
|
ImageViewCompat.setImageTintList(
|
||||||
|
binding.imageViewCover2,
|
||||||
|
ColorStateList.valueOf(ColorUtils.setAlphaComponent(backgroundColor, 76)),
|
||||||
|
)
|
||||||
|
binding.imageViewCover2.backgroundTintList =
|
||||||
|
ColorStateList.valueOf(ColorUtils.setAlphaComponent(backgroundColor, 76))
|
||||||
|
binding.imageViewCover3.backgroundTintList =
|
||||||
|
ColorStateList.valueOf(ColorUtils.setAlphaComponent(backgroundColor, 153))
|
||||||
|
val fallback = ColorDrawable(Color.TRANSPARENT)
|
||||||
|
val coverViews = arrayOf(binding.imageViewCover1, binding.imageViewCover2, binding.imageViewCover3)
|
||||||
|
val crossFadeDuration = binding.root.context.getAnimationDuration(R.integer.config_defaultAnimTime).toInt()
|
||||||
|
|
||||||
|
binding.textViewTitle.text = manga.joinToStringWithLimit(binding.root.context, 92) { it.title }
|
||||||
|
|
||||||
|
repeat(coverViews.size) { i ->
|
||||||
|
val m = manga.getOrNull(i)
|
||||||
|
val view = coverViews[i]
|
||||||
|
view.isVisible = m != null
|
||||||
|
if (m == null) {
|
||||||
|
view.disposeImageRequest()
|
||||||
|
} else {
|
||||||
|
view.newImageRequest(viewLifecycleOwner, m.coverUrl)?.run {
|
||||||
|
placeholder(R.drawable.ic_placeholder)
|
||||||
|
fallback(fallback)
|
||||||
|
mangaSourceExtra(m.source)
|
||||||
|
crossfade(crossFadeDuration * (i + 1))
|
||||||
|
error(R.drawable.ic_error_placeholder)
|
||||||
|
allowRgb565(true)
|
||||||
|
enqueueWith(coil)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
|
||||||
|
private const val TAG = "FavoriteSheet"
|
||||||
|
const val KEY_MANGA_LIST = "manga_list"
|
||||||
|
|
||||||
|
fun show(fm: FragmentManager, manga: Manga) = show(fm, setOf(manga))
|
||||||
|
|
||||||
|
fun show(fm: FragmentManager, manga: Collection<Manga>) = FavoriteDialog().withArgs(1) {
|
||||||
|
putParcelableArrayList(
|
||||||
|
KEY_MANGA_LIST,
|
||||||
|
manga.mapTo(ArrayList(manga.size), ::ParcelableManga),
|
||||||
|
)
|
||||||
|
}.showDistinct(fm, TAG)
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,72 +0,0 @@
|
|||||||
package org.koitharu.kotatsu.favourites.ui.categories.select
|
|
||||||
|
|
||||||
import android.os.Bundle
|
|
||||||
import android.view.LayoutInflater
|
|
||||||
import android.view.View
|
|
||||||
import android.view.ViewGroup
|
|
||||||
import android.widget.Toast
|
|
||||||
import androidx.fragment.app.FragmentManager
|
|
||||||
import androidx.fragment.app.viewModels
|
|
||||||
import coil3.ImageLoader
|
|
||||||
import dagger.hilt.android.AndroidEntryPoint
|
|
||||||
import org.koitharu.kotatsu.core.model.parcelable.ParcelableManga
|
|
||||||
import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener
|
|
||||||
import org.koitharu.kotatsu.core.ui.sheet.BaseAdaptiveSheet
|
|
||||||
import org.koitharu.kotatsu.core.util.ext.getDisplayMessage
|
|
||||||
import org.koitharu.kotatsu.core.util.ext.observe
|
|
||||||
import org.koitharu.kotatsu.core.util.ext.observeEvent
|
|
||||||
import org.koitharu.kotatsu.core.util.ext.showDistinct
|
|
||||||
import org.koitharu.kotatsu.core.util.ext.withArgs
|
|
||||||
import org.koitharu.kotatsu.databinding.SheetFavoriteCategoriesBinding
|
|
||||||
import org.koitharu.kotatsu.favourites.ui.categories.select.adapter.MangaCategoriesAdapter
|
|
||||||
import org.koitharu.kotatsu.favourites.ui.categories.select.model.MangaCategoryItem
|
|
||||||
import org.koitharu.kotatsu.parsers.model.Manga
|
|
||||||
import javax.inject.Inject
|
|
||||||
|
|
||||||
@AndroidEntryPoint
|
|
||||||
class FavoriteSheet : BaseAdaptiveSheet<SheetFavoriteCategoriesBinding>(), OnListItemClickListener<MangaCategoryItem> {
|
|
||||||
|
|
||||||
private val viewModel by viewModels<FavoriteSheetViewModel>()
|
|
||||||
|
|
||||||
@Inject
|
|
||||||
lateinit var coil: ImageLoader
|
|
||||||
|
|
||||||
override fun onCreateViewBinding(
|
|
||||||
inflater: LayoutInflater,
|
|
||||||
container: ViewGroup?,
|
|
||||||
) = SheetFavoriteCategoriesBinding.inflate(inflater, container, false)
|
|
||||||
|
|
||||||
override fun onViewBindingCreated(
|
|
||||||
binding: SheetFavoriteCategoriesBinding,
|
|
||||||
savedInstanceState: Bundle?,
|
|
||||||
) {
|
|
||||||
super.onViewBindingCreated(binding, savedInstanceState)
|
|
||||||
val adapter = MangaCategoriesAdapter(coil, viewLifecycleOwner, this)
|
|
||||||
binding.recyclerViewCategories.adapter = adapter
|
|
||||||
viewModel.content.observe(viewLifecycleOwner, adapter)
|
|
||||||
viewModel.onError.observeEvent(viewLifecycleOwner, ::onError)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onItemClick(item: MangaCategoryItem, view: View) {
|
|
||||||
viewModel.setChecked(item.category.id, !item.isChecked)
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun onError(e: Throwable) {
|
|
||||||
Toast.makeText(context ?: return, e.getDisplayMessage(resources), Toast.LENGTH_SHORT).show()
|
|
||||||
}
|
|
||||||
|
|
||||||
companion object {
|
|
||||||
|
|
||||||
private const val TAG = "FavoriteSheet"
|
|
||||||
const val KEY_MANGA_LIST = "manga_list"
|
|
||||||
|
|
||||||
fun show(fm: FragmentManager, manga: Manga) = show(fm, setOf(manga))
|
|
||||||
|
|
||||||
fun show(fm: FragmentManager, manga: Collection<Manga>) = FavoriteSheet().withArgs(1) {
|
|
||||||
putParcelableArrayList(
|
|
||||||
KEY_MANGA_LIST,
|
|
||||||
manga.mapTo(ArrayList(manga.size), ::ParcelableManga),
|
|
||||||
)
|
|
||||||
}.showDistinct(fm, TAG)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,91 +0,0 @@
|
|||||||
package org.koitharu.kotatsu.favourites.ui.categories.select.adapter
|
|
||||||
|
|
||||||
import android.content.Intent
|
|
||||||
import android.content.res.ColorStateList
|
|
||||||
import android.graphics.Color
|
|
||||||
import android.graphics.drawable.ColorDrawable
|
|
||||||
import android.view.View
|
|
||||||
import androidx.core.graphics.ColorUtils
|
|
||||||
import androidx.core.view.isVisible
|
|
||||||
import androidx.core.widget.ImageViewCompat
|
|
||||||
import androidx.lifecycle.LifecycleOwner
|
|
||||||
import coil3.ImageLoader
|
|
||||||
import coil3.request.allowRgb565
|
|
||||||
import coil3.request.crossfade
|
|
||||||
import coil3.request.error
|
|
||||||
import coil3.request.fallback
|
|
||||||
import coil3.request.placeholder
|
|
||||||
import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding
|
|
||||||
import org.koitharu.kotatsu.R
|
|
||||||
import org.koitharu.kotatsu.core.util.ext.disposeImageRequest
|
|
||||||
import org.koitharu.kotatsu.core.util.ext.enqueueWith
|
|
||||||
import org.koitharu.kotatsu.core.util.ext.getAnimationDuration
|
|
||||||
import org.koitharu.kotatsu.core.util.ext.getThemeColor
|
|
||||||
import org.koitharu.kotatsu.core.util.ext.joinToStringWithLimit
|
|
||||||
import org.koitharu.kotatsu.core.util.ext.mangaSourceExtra
|
|
||||||
import org.koitharu.kotatsu.core.util.ext.newImageRequest
|
|
||||||
import org.koitharu.kotatsu.databinding.ItemCategoriesHeaderBinding
|
|
||||||
import org.koitharu.kotatsu.favourites.ui.categories.FavouriteCategoriesActivity
|
|
||||||
import org.koitharu.kotatsu.favourites.ui.categories.edit.FavouritesCategoryEditActivity
|
|
||||||
import org.koitharu.kotatsu.favourites.ui.categories.select.model.CategoriesHeaderItem
|
|
||||||
import org.koitharu.kotatsu.list.ui.model.ListModel
|
|
||||||
|
|
||||||
fun categoriesHeaderAD(
|
|
||||||
coil: ImageLoader,
|
|
||||||
lifecycleOwner: LifecycleOwner,
|
|
||||||
) = adapterDelegateViewBinding<CategoriesHeaderItem, ListModel, ItemCategoriesHeaderBinding>(
|
|
||||||
{ inflater, parent -> ItemCategoriesHeaderBinding.inflate(inflater, parent, false) },
|
|
||||||
) {
|
|
||||||
|
|
||||||
val onClickListener = View.OnClickListener { v ->
|
|
||||||
val intent = when (v.id) {
|
|
||||||
R.id.chip_create -> FavouritesCategoryEditActivity.newIntent(v.context)
|
|
||||||
R.id.chip_manage -> Intent(v.context, FavouriteCategoriesActivity::class.java)
|
|
||||||
else -> return@OnClickListener
|
|
||||||
}
|
|
||||||
v.context.startActivity(intent)
|
|
||||||
}
|
|
||||||
|
|
||||||
binding.chipCreate.setOnClickListener(onClickListener)
|
|
||||||
binding.chipManage.setOnClickListener(onClickListener)
|
|
||||||
|
|
||||||
val backgroundColor = context.getThemeColor(android.R.attr.colorBackground)
|
|
||||||
ImageViewCompat.setImageTintList(
|
|
||||||
binding.imageViewCover3,
|
|
||||||
ColorStateList.valueOf(ColorUtils.setAlphaComponent(backgroundColor, 153)),
|
|
||||||
)
|
|
||||||
ImageViewCompat.setImageTintList(
|
|
||||||
binding.imageViewCover2,
|
|
||||||
ColorStateList.valueOf(ColorUtils.setAlphaComponent(backgroundColor, 76)),
|
|
||||||
)
|
|
||||||
binding.imageViewCover2.backgroundTintList =
|
|
||||||
ColorStateList.valueOf(ColorUtils.setAlphaComponent(backgroundColor, 76))
|
|
||||||
binding.imageViewCover3.backgroundTintList =
|
|
||||||
ColorStateList.valueOf(ColorUtils.setAlphaComponent(backgroundColor, 153))
|
|
||||||
val fallback = ColorDrawable(Color.TRANSPARENT)
|
|
||||||
val coverViews = arrayOf(binding.imageViewCover1, binding.imageViewCover2, binding.imageViewCover3)
|
|
||||||
val crossFadeDuration = context.getAnimationDuration(R.integer.config_defaultAnimTime).toInt()
|
|
||||||
|
|
||||||
bind {
|
|
||||||
binding.textViewTitle.text = item.titles.joinToStringWithLimit(context, 120) { it }
|
|
||||||
|
|
||||||
repeat(coverViews.size) { i ->
|
|
||||||
val cover = item.covers.getOrNull(i)
|
|
||||||
val view = coverViews[i]
|
|
||||||
view.isVisible = cover != null
|
|
||||||
if (cover == null) {
|
|
||||||
view.disposeImageRequest()
|
|
||||||
} else {
|
|
||||||
view.newImageRequest(lifecycleOwner, cover.url)?.run {
|
|
||||||
placeholder(R.drawable.ic_placeholder)
|
|
||||||
fallback(fallback)
|
|
||||||
mangaSourceExtra(cover.mangaSource)
|
|
||||||
crossfade(crossFadeDuration * (i + 1))
|
|
||||||
error(R.drawable.ic_error_placeholder)
|
|
||||||
allowRgb565(true)
|
|
||||||
enqueueWith(coil)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
package org.koitharu.kotatsu.favourites.ui.categories.select.model
|
|
||||||
|
|
||||||
import org.koitharu.kotatsu.favourites.domain.model.Cover
|
|
||||||
import org.koitharu.kotatsu.list.ui.model.ListModel
|
|
||||||
|
|
||||||
data class CategoriesHeaderItem(
|
|
||||||
val titles: List<String>,
|
|
||||||
val covers: List<Cover>,
|
|
||||||
) : ListModel {
|
|
||||||
|
|
||||||
override fun areItemsTheSame(other: ListModel): Boolean {
|
|
||||||
return other is CategoriesHeaderItem
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun equals(other: Any?): Boolean {
|
|
||||||
if (this === other) return true
|
|
||||||
return javaClass == other?.javaClass
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun hashCode(): Int {
|
|
||||||
return javaClass.hashCode()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,135 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout
|
|
||||||
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="wrap_content">
|
|
||||||
|
|
||||||
<androidx.constraintlayout.widget.Guideline
|
|
||||||
android:id="@+id/guideline_start"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:orientation="vertical"
|
|
||||||
app:layout_constraintGuide_begin="?listPreferredItemPaddingStart" />
|
|
||||||
|
|
||||||
<com.google.android.material.imageview.ShapeableImageView
|
|
||||||
android:id="@+id/imageView_cover3"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="64dp"
|
|
||||||
android:layout_marginStart="24dp"
|
|
||||||
android:layout_marginBottom="12dp"
|
|
||||||
android:background="?attr/colorSecondaryContainer"
|
|
||||||
android:backgroundTintMode="src_atop"
|
|
||||||
android:scaleType="centerCrop"
|
|
||||||
app:layout_constraintBottom_toBottomOf="@id/guideline"
|
|
||||||
app:layout_constraintDimensionRatio="W,13:18"
|
|
||||||
app:layout_constraintStart_toStartOf="@id/guideline_start"
|
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
|
||||||
app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover.Small"
|
|
||||||
app:tintMode="src_atop"
|
|
||||||
tools:backgroundTint="#99FFFFFF"
|
|
||||||
tools:src="@tools:sample/backgrounds/scenic"
|
|
||||||
tools:tint="#99FFFFFF" />
|
|
||||||
|
|
||||||
<com.google.android.material.imageview.ShapeableImageView
|
|
||||||
android:id="@+id/imageView_cover2"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="64dp"
|
|
||||||
android:layout_marginStart="12dp"
|
|
||||||
android:background="?attr/colorSecondaryContainer"
|
|
||||||
android:backgroundTintMode="src_atop"
|
|
||||||
android:scaleType="centerCrop"
|
|
||||||
app:layout_constraintBottom_toBottomOf="@id/guideline"
|
|
||||||
app:layout_constraintDimensionRatio="W,13:18"
|
|
||||||
app:layout_constraintStart_toStartOf="@id/guideline_start"
|
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
|
||||||
app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover.Small"
|
|
||||||
app:tintMode="src_atop"
|
|
||||||
tools:backgroundTint="#4DFFFFFF"
|
|
||||||
tools:src="@tools:sample/backgrounds/scenic"
|
|
||||||
tools:tint="#4DFFFFFF" />
|
|
||||||
|
|
||||||
<com.google.android.material.imageview.ShapeableImageView
|
|
||||||
android:id="@+id/imageView_cover1"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="64dp"
|
|
||||||
android:layout_marginTop="12dp"
|
|
||||||
android:background="?attr/colorSecondaryContainer"
|
|
||||||
android:backgroundTintMode="src_atop"
|
|
||||||
android:scaleType="centerCrop"
|
|
||||||
app:layout_constraintBottom_toBottomOf="@id/imageView_cover2"
|
|
||||||
app:layout_constraintDimensionRatio="W,13:18"
|
|
||||||
app:layout_constraintStart_toStartOf="@id/guideline_start"
|
|
||||||
app:layout_constraintTop_toTopOf="@id/imageView_cover2"
|
|
||||||
app:layout_goneMarginTop="0dp"
|
|
||||||
app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover.Small"
|
|
||||||
tools:src="@tools:sample/backgrounds/scenic" />
|
|
||||||
|
|
||||||
<androidx.constraintlayout.widget.Barrier
|
|
||||||
android:id="@+id/barrier_covers"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
app:barrierDirection="end"
|
|
||||||
app:constraint_referenced_ids="imageView_cover1,imageView_cover2,imageView_cover3" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/textView_title"
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="0dp"
|
|
||||||
android:layout_marginStart="@dimen/margin_normal"
|
|
||||||
android:layout_marginEnd="?listPreferredItemPaddingEnd"
|
|
||||||
android:ellipsize="end"
|
|
||||||
android:gravity="center_vertical|start"
|
|
||||||
android:textAppearance="?attr/textAppearanceBodyLarge"
|
|
||||||
app:layout_constraintBottom_toBottomOf="@id/guideline"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toEndOf="@id/barrier_covers"
|
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
|
||||||
tools:text="@tools:sample/lorem[22]" />
|
|
||||||
|
|
||||||
<androidx.constraintlayout.widget.Guideline
|
|
||||||
android:id="@+id/guideline"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:orientation="horizontal"
|
|
||||||
app:layout_constraintGuide_begin="92dp" />
|
|
||||||
|
|
||||||
<HorizontalScrollView
|
|
||||||
android:layout_width="0dp"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="4dp"
|
|
||||||
android:clipToPadding="false"
|
|
||||||
android:paddingStart="?listPreferredItemPaddingStart"
|
|
||||||
android:paddingEnd="?listPreferredItemPaddingEnd"
|
|
||||||
android:scrollbars="none"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
|
||||||
app:layout_constraintTop_toBottomOf="@id/guideline">
|
|
||||||
|
|
||||||
<com.google.android.material.chip.ChipGroup
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
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:text="@string/create_category"
|
|
||||||
app:chipIcon="@drawable/ic_add" />
|
|
||||||
|
|
||||||
<com.google.android.material.chip.Chip
|
|
||||||
android:id="@+id/chip_manage"
|
|
||||||
style="@style/Widget.Kotatsu.Chip.Assist"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/manage_categories"
|
|
||||||
app:chipIcon="@drawable/ic_edit" />
|
|
||||||
|
|
||||||
</com.google.android.material.chip.ChipGroup>
|
|
||||||
|
|
||||||
</HorizontalScrollView>
|
|
||||||
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
||||||
@ -1,66 +1,22 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout
|
<LinearLayout
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
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"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:id="@+id/linearLayout"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:background="?selectableItemBackground"
|
android:background="?selectableItemBackground"
|
||||||
android:gravity="center_vertical"
|
|
||||||
android:minHeight="?listPreferredItemHeightSmall"
|
android:minHeight="?listPreferredItemHeightSmall"
|
||||||
android:paddingStart="?android:listPreferredItemPaddingStart"
|
android:orientation="vertical"
|
||||||
android:paddingEnd="?android:listPreferredItemPaddingEnd"
|
android:paddingStart="?listPreferredItemPaddingStart"
|
||||||
tools:ignore="RtlSymmetry">
|
android:paddingEnd="?listPreferredItemPaddingEnd">
|
||||||
|
|
||||||
<org.koitharu.kotatsu.core.ui.widgets.CheckableImageView
|
<com.google.android.material.checkbox.MaterialCheckBox
|
||||||
android:id="@+id/checkableImageView"
|
android:id="@+id/checkBox"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
android:clickable="false"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
android:gravity="center_vertical"
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
tools:checkedState="indeterminate"
|
||||||
app:srcCompat="?android:listChoiceIndicatorMultiple" />
|
tools:text="@tools:sample/cities" />
|
||||||
|
|
||||||
<TextView
|
</LinearLayout>
|
||||||
android:id="@+id/textView_title"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginStart="?listPreferredItemPaddingStart"
|
|
||||||
android:ellipsize="end"
|
|
||||||
android:singleLine="true"
|
|
||||||
android:textAppearance="?attr/textAppearanceBodyMedium"
|
|
||||||
app:layout_constrainedWidth="true"
|
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
|
||||||
app:layout_constraintEnd_toStartOf="@id/imageView_tracker"
|
|
||||||
app:layout_constraintHorizontal_bias="0"
|
|
||||||
app:layout_constraintHorizontal_chainStyle="packed"
|
|
||||||
app:layout_constraintStart_toEndOf="@id/checkableImageView"
|
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
|
||||||
tools:text="@tools:sample/lorem[1]" />
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/imageView_tracker"
|
|
||||||
android:layout_width="14dp"
|
|
||||||
android:layout_height="14dp"
|
|
||||||
android:layout_marginStart="4dp"
|
|
||||||
android:contentDescription="@string/check_for_new_chapters"
|
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
|
||||||
app:layout_constraintEnd_toStartOf="@id/imageView_hidden"
|
|
||||||
app:layout_constraintStart_toEndOf="@id/textView_title"
|
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
|
||||||
app:srcCompat="@drawable/ic_notification" />
|
|
||||||
|
|
||||||
<ImageView
|
|
||||||
android:id="@+id/imageView_hidden"
|
|
||||||
android:layout_width="14dp"
|
|
||||||
android:layout_height="14dp"
|
|
||||||
android:layout_marginStart="4dp"
|
|
||||||
android:contentDescription="@string/show_on_shelf"
|
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
|
||||||
app:layout_constraintStart_toEndOf="@id/imageView_tracker"
|
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
|
||||||
app:srcCompat="@drawable/ic_eye_off" />
|
|
||||||
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
||||||
|
|||||||
@ -1,30 +1,116 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<LinearLayout
|
<androidx.constraintlayout.widget.ConstraintLayout
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:orientation="vertical">
|
android:paddingTop="@dimen/margin_normal">
|
||||||
|
|
||||||
<org.koitharu.kotatsu.core.ui.sheet.AdaptiveSheetHeaderBar
|
<androidx.constraintlayout.widget.Guideline
|
||||||
android:id="@+id/headerBar"
|
android:id="@+id/guideline_start"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
app:layout_scrollFlags="noScroll"
|
android:orientation="vertical"
|
||||||
app:title="@string/add_to_favourites" />
|
app:layout_constraintGuide_begin="@dimen/margin_normal" />
|
||||||
|
|
||||||
|
<com.google.android.material.imageview.ShapeableImageView
|
||||||
|
android:id="@+id/imageView_cover3"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="64dp"
|
||||||
|
android:layout_marginStart="24dp"
|
||||||
|
android:layout_marginBottom="12dp"
|
||||||
|
android:background="?attr/colorSecondaryContainer"
|
||||||
|
android:backgroundTintMode="src_atop"
|
||||||
|
android:scaleType="centerCrop"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@id/guideline"
|
||||||
|
app:layout_constraintDimensionRatio="W,13:18"
|
||||||
|
app:layout_constraintStart_toStartOf="@id/guideline_start"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover.Small"
|
||||||
|
app:tintMode="src_atop"
|
||||||
|
tools:backgroundTint="#99FFFFFF"
|
||||||
|
tools:src="@tools:sample/backgrounds/scenic"
|
||||||
|
tools:tint="#99FFFFFF" />
|
||||||
|
|
||||||
|
<com.google.android.material.imageview.ShapeableImageView
|
||||||
|
android:id="@+id/imageView_cover2"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="64dp"
|
||||||
|
android:layout_marginStart="12dp"
|
||||||
|
android:background="?attr/colorSecondaryContainer"
|
||||||
|
android:backgroundTintMode="src_atop"
|
||||||
|
android:scaleType="centerCrop"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@id/guideline"
|
||||||
|
app:layout_constraintDimensionRatio="W,13:18"
|
||||||
|
app:layout_constraintStart_toStartOf="@id/guideline_start"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover.Small"
|
||||||
|
app:tintMode="src_atop"
|
||||||
|
tools:backgroundTint="#4DFFFFFF"
|
||||||
|
tools:src="@tools:sample/backgrounds/scenic"
|
||||||
|
tools:tint="#4DFFFFFF" />
|
||||||
|
|
||||||
|
<com.google.android.material.imageview.ShapeableImageView
|
||||||
|
android:id="@+id/imageView_cover1"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="64dp"
|
||||||
|
android:layout_marginTop="12dp"
|
||||||
|
android:background="?attr/colorSecondaryContainer"
|
||||||
|
android:backgroundTintMode="src_atop"
|
||||||
|
android:scaleType="centerCrop"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@id/imageView_cover2"
|
||||||
|
app:layout_constraintDimensionRatio="W,13:18"
|
||||||
|
app:layout_constraintStart_toStartOf="@id/guideline_start"
|
||||||
|
app:layout_constraintTop_toTopOf="@id/imageView_cover2"
|
||||||
|
app:layout_goneMarginTop="0dp"
|
||||||
|
app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover.Small"
|
||||||
|
tools:src="@tools:sample/backgrounds/scenic" />
|
||||||
|
|
||||||
|
<androidx.constraintlayout.widget.Barrier
|
||||||
|
android:id="@+id/barrier_covers"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
app:barrierDirection="end"
|
||||||
|
app:constraint_referenced_ids="imageView_cover1,imageView_cover2,imageView_cover3" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/textView_title"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="0dp"
|
||||||
|
android:layout_marginStart="@dimen/margin_normal"
|
||||||
|
android:layout_marginEnd="@dimen/margin_normal"
|
||||||
|
android:ellipsize="end"
|
||||||
|
android:gravity="center_vertical|start"
|
||||||
|
android:textAppearance="?attr/textAppearanceBodyLarge"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@id/guideline"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toEndOf="@id/barrier_covers"
|
||||||
|
app:layout_constraintTop_toTopOf="parent"
|
||||||
|
tools:text="@tools:sample/lorem[22]" />
|
||||||
|
|
||||||
|
<androidx.constraintlayout.widget.Guideline
|
||||||
|
android:id="@+id/guideline"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="horizontal"
|
||||||
|
app:layout_constraintGuide_begin="92dp" />
|
||||||
|
|
||||||
<androidx.recyclerview.widget.RecyclerView
|
<androidx.recyclerview.widget.RecyclerView
|
||||||
android:id="@+id/recyclerView_categories"
|
android:id="@+id/recyclerView_categories"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="0dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="4dp"
|
||||||
android:clipToPadding="false"
|
android:clipToPadding="false"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:paddingBottom="@dimen/list_spacing"
|
android:paddingBottom="@dimen/list_spacing"
|
||||||
android:scrollIndicators="top"
|
android:scrollIndicators="top"
|
||||||
android:scrollbars="vertical"
|
android:scrollbars="vertical"
|
||||||
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
|
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
|
||||||
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
app:layout_constraintTop_toBottomOf="@id/guideline"
|
||||||
tools:ignore="UnusedAttribute"
|
tools:ignore="UnusedAttribute"
|
||||||
tools:listitem="@layout/item_checkable_new" />
|
tools:listitem="@layout/item_category_checkable" />
|
||||||
|
|
||||||
</LinearLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
|||||||
Loading…
Reference in New Issue