From 730d664b912f52d26d91113edfe5080d0a7e77ce Mon Sep 17 00:00:00 2001 From: Koitharu Date: Wed, 11 May 2022 17:05:49 +0300 Subject: [PATCH] Tune ui --- .../kotatsu/base/ui/widgets/ListItemTextView.kt | 7 +++---- .../select/FavouriteCategoriesBottomSheet.kt | 13 ++++++++++--- .../{MangaCaegoryAD.kt => MangaCategoryAD.kt} | 0 .../ui/suggestion/SearchSuggestionFragment.kt | 8 ++++---- .../res/layout/dialog_favorite_categories.xml | 17 ++++++++++++++--- app/src/main/res/layout/item_checkable_new.xml | 2 -- app/src/main/res/menu/opt_favourites_bs.xml | 13 ------------- app/src/main/res/values-v27/styles.xml | 1 + app/src/main/res/values/attrs.xml | 3 +-- app/src/main/res/values/styles.xml | 3 ++- 10 files changed, 35 insertions(+), 32 deletions(-) rename app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/adapter/{MangaCaegoryAD.kt => MangaCategoryAD.kt} (100%) delete mode 100644 app/src/main/res/menu/opt_favourites_bs.xml diff --git a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ListItemTextView.kt b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ListItemTextView.kt index 18d7262dc..bdaf8f476 100644 --- a/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ListItemTextView.kt +++ b/app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ListItemTextView.kt @@ -36,8 +36,7 @@ class ListItemTextView @JvmOverloads constructor( init { context.withStyledAttributes(attrs, R.styleable.ListItemTextView, defStyleAttr) { - val itemRippleColor = getColorStateList(R.styleable.ListItemTextView_rippleColor) - ?: getRippleColorFallback(context) + val itemRippleColor = getRippleColor(context) val shape = createShapeDrawable(this) background = RippleDrawable( RippleUtils.sanitizeRippleDrawableColor(itemRippleColor), @@ -108,7 +107,7 @@ class ListItemTextView @JvmOverloads constructor( ta.getResourceId(R.styleable.ListItemTextView_shapeAppearanceOverlay, 0), ).build() val shapeDrawable = MaterialShapeDrawable(shapeAppearance) - shapeDrawable.fillColor = ta.getColorStateList(R.styleable.ListItemTextView_backgroundTint) + shapeDrawable.fillColor = ta.getColorStateList(R.styleable.ListItemTextView_backgroundFillColor) return InsetDrawable( shapeDrawable, ta.getDimensionPixelOffset(R.styleable.ListItemTextView_android_insetLeft, 0), @@ -118,7 +117,7 @@ class ListItemTextView @JvmOverloads constructor( ) } - private fun getRippleColorFallback(context: Context): ColorStateList { + private fun getRippleColor(context: Context): ColorStateList { return context.getThemeColorStateList(android.R.attr.colorControlHighlight) ?: ColorStateList.valueOf(Color.TRANSPARENT) } diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/FavouriteCategoriesBottomSheet.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/FavouriteCategoriesBottomSheet.kt index 9eb9b8d04..aa2bacbbe 100644 --- a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/FavouriteCategoriesBottomSheet.kt +++ b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/FavouriteCategoriesBottomSheet.kt @@ -28,7 +28,7 @@ class FavouriteCategoriesBottomSheet : BaseBottomSheet(), OnListItemClickListener, CategoriesEditDelegate.CategoriesEditCallback, - Toolbar.OnMenuItemClickListener { + Toolbar.OnMenuItemClickListener, View.OnClickListener { private val viewModel by viewModel { parametersOf(requireNotNull(arguments?.getParcelableArrayList(KEY_MANGA_LIST)).map { it.manga }) @@ -46,6 +46,7 @@ class FavouriteCategoriesBottomSheet : adapter = MangaCategoriesAdapter(this) binding.recyclerViewCategories.adapter = adapter binding.toolbar.setOnMenuItemClickListener(this) + binding.itemCreate.setOnClickListener(this) viewModel.content.observe(viewLifecycleOwner, this::onContentChanged) viewModel.onError.observe(viewLifecycleOwner, ::onError) @@ -58,14 +59,20 @@ class FavouriteCategoriesBottomSheet : override fun onMenuItemClick(item: MenuItem): Boolean { return when (item.itemId) { - R.id.action_create -> { - startActivity(FavouritesCategoryEditActivity.newIntent(requireContext())) + R.id.action_done -> { + dismiss() true } else -> false } } + override fun onClick(v: View) { + when (v.id) { + R.id.item_create -> startActivity(FavouritesCategoryEditActivity.newIntent(requireContext())) + } + } + override fun onItemClick(item: MangaCategoryItem, view: View) { viewModel.setChecked(item.id, !item.isChecked) } diff --git a/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/adapter/MangaCaegoryAD.kt b/app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/adapter/MangaCategoryAD.kt similarity index 100% rename from app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/adapter/MangaCaegoryAD.kt rename to app/src/main/java/org/koitharu/kotatsu/favourites/ui/categories/select/adapter/MangaCategoryAD.kt diff --git a/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionFragment.kt b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionFragment.kt index 9a1ffba8f..7d9a3b6cb 100644 --- a/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionFragment.kt +++ b/app/src/main/java/org/koitharu/kotatsu/search/ui/suggestion/SearchSuggestionFragment.kt @@ -9,6 +9,7 @@ import androidx.core.view.updatePadding import androidx.recyclerview.widget.ItemTouchHelper import org.koin.android.ext.android.get import org.koin.androidx.viewmodel.ext.android.sharedViewModel +import org.koitharu.kotatsu.R import org.koitharu.kotatsu.base.ui.BaseFragment import org.koitharu.kotatsu.databinding.FragmentSearchSuggestionBinding import org.koitharu.kotatsu.main.ui.AppBarOwner @@ -43,11 +44,10 @@ class SearchSuggestionFragment : override fun onWindowInsetsChanged(insets: Insets) { val headerHeight = (activity as? AppBarOwner)?.appBar?.measureHeight() ?: insets.top + val extraPadding = resources.getDimensionPixelOffset(R.dimen.list_spacing) binding.root.updatePadding( - top = headerHeight, - // left = insets.left, - // right = insets.right, - bottom = insets.bottom, + top = headerHeight + extraPadding, + bottom = insets.bottom + extraPadding, ) } diff --git a/app/src/main/res/layout/dialog_favorite_categories.xml b/app/src/main/res/layout/dialog_favorite_categories.xml index a808907bf..91cc561aa 100644 --- a/app/src/main/res/layout/dialog_favorite_categories.xml +++ b/app/src/main/res/layout/dialog_favorite_categories.xml @@ -5,13 +5,14 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical"> + android:orientation="vertical" + android:paddingBottom="@dimen/list_spacing"> + + diff --git a/app/src/main/res/layout/item_checkable_new.xml b/app/src/main/res/layout/item_checkable_new.xml index 9ec3eacf1..6e523dad8 100644 --- a/app/src/main/res/layout/item_checkable_new.xml +++ b/app/src/main/res/layout/item_checkable_new.xml @@ -1,7 +1,6 @@ \ No newline at end of file diff --git a/app/src/main/res/menu/opt_favourites_bs.xml b/app/src/main/res/menu/opt_favourites_bs.xml deleted file mode 100644 index 56e7d5723..000000000 --- a/app/src/main/res/menu/opt_favourites_bs.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml index 88dc7707b..370045cf3 100644 --- a/app/src/main/res/values-v27/styles.xml +++ b/app/src/main/res/values-v27/styles.xml @@ -3,5 +3,6 @@ \ No newline at end of file diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index c14ddff76..348cff5e0 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -26,8 +26,7 @@ - - + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index b16f50044..7f96a0bef 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -24,6 +24,7 @@ @@ -86,7 +87,7 @@