From fe588c08e21ee7d265d7ec50a578df6ede35dd78 Mon Sep 17 00:00:00 2001 From: Zakhar Timoshenko Date: Sun, 14 Apr 2024 15:13:39 +0300 Subject: [PATCH] UI adjust part 2 --- .../koitharu/kotatsu/details/ui/DetailsActivity.kt | 4 +--- .../koitharu/kotatsu/list/ui/adapter/BadgeADUtil.kt | 3 +-- .../list/ui/adapter/TypedListSpacingDecoration.kt | 5 ++--- .../koitharu/kotatsu/tracker/ui/feed/FeedFragment.kt | 1 - .../tracker/ui/feed/adapter/UpdatedMangaAD.kt | 3 --- .../drawable/custom_selectable_item_background.xml | 4 +--- app/src/main/res/layout/activity_details.xml | 1 + app/src/main/res/layout/item_feed.xml | 2 +- app/src/main/res/layout/item_manga_grid.xml | 3 +++ app/src/main/res/layout/item_manga_list_details.xml | 2 +- app/src/main/res/layout/item_recommendation.xml | 3 ++- .../main/res/layout/item_recommendation_manga.xml | 2 +- app/src/main/res/values/colors.xml | 12 ++++++------ app/src/main/res/values/dimens.xml | 2 ++ 14 files changed, 22 insertions(+), 25 deletions(-) diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsActivity.kt index fa075822a..d352bf830 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsActivity.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsActivity.kt @@ -149,9 +149,6 @@ class DetailsActivity : viewBinding.textViewDescription.viewTreeObserver.addOnDrawListener(this) viewBinding.textViewDescription.movementMethod = LinkMovementMethodCompat.getInstance() viewBinding.chipsTags.onChipClickListener = this - viewBinding.recyclerViewRelated.addItemDecoration( - SpacingItemDecoration(resources.getDimensionPixelOffset(R.dimen.grid_spacing)), - ) TitleScrollCoordinator(viewBinding.textViewTitle).attach(viewBinding.scrollView) chaptersBadge = ViewBadge(viewBinding.buttonChapters ?: viewBinding.buttonRead, this) @@ -457,6 +454,7 @@ class DetailsActivity : manga.state?.let { state -> textViewState.textAndVisible = resources.getString(state.titleResId) imageViewState.setImageResource(state.iconResId) + imageViewState.isVisible = true } ?: run { textViewState.isVisible = false imageViewState.isVisible = false diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/BadgeADUtil.kt b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/BadgeADUtil.kt index ab67bf9e5..a2e65e65b 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/BadgeADUtil.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/BadgeADUtil.kt @@ -10,7 +10,6 @@ import com.google.android.material.badge.BadgeDrawable import com.google.android.material.badge.BadgeUtils import com.google.android.material.badge.ExperimentalBadgeUtils import org.koitharu.kotatsu.R -import com.google.android.material.R as materialR @CheckResult fun View.bindBadge(badge: BadgeDrawable?, counter: Int): BadgeDrawable? { @@ -60,7 +59,7 @@ private fun BadgeDrawable.align(anchor: View) { val extraOffset = if (anchor is CardView) { (anchor.radius / 2f).toInt() } else { - anchor.resources.getDimensionPixelOffset(materialR.dimen.m3_badge_offset) + anchor.resources.getDimensionPixelOffset(R.dimen.badge_offset) } horizontalOffset = intrinsicWidth + extraOffset verticalOffset = intrinsicHeight + extraOffset diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/TypedListSpacingDecoration.kt b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/TypedListSpacingDecoration.kt index 9c4c90592..a69464c25 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/TypedListSpacingDecoration.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/list/ui/adapter/TypedListSpacingDecoration.kt @@ -46,9 +46,8 @@ class TypedListSpacingDecoration( ListItemType.MANGA_LIST_DETAILED, -> outRect.set(spacingNormal) - ListItemType.PAGE_THUMB, - ListItemType.MANGA_GRID, - -> outRect.set(spacingNormal) + ListItemType.PAGE_THUMB -> outRect.set(spacingNormal) + ListItemType.MANGA_GRID -> outRect.set(0) ListItemType.EXPLORE_BUTTONS -> outRect.set(spacingNormal) diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/feed/FeedFragment.kt b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/feed/FeedFragment.kt index 11f0d0aa5..474087f86 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/feed/FeedFragment.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/feed/FeedFragment.kt @@ -19,7 +19,6 @@ import org.koitharu.kotatsu.core.ui.list.PaginationScrollListener import org.koitharu.kotatsu.core.ui.list.RecyclerScrollKeeper import org.koitharu.kotatsu.core.ui.util.MenuInvalidator import org.koitharu.kotatsu.core.ui.widgets.TipView -import org.koitharu.kotatsu.core.util.RecyclerViewScrollCallback import org.koitharu.kotatsu.core.util.ext.addMenuProvider import org.koitharu.kotatsu.core.util.ext.observe import org.koitharu.kotatsu.core.util.ext.observeEvent diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/feed/adapter/UpdatedMangaAD.kt b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/feed/adapter/UpdatedMangaAD.kt index 13c59d044..cb30a3c1f 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/feed/adapter/UpdatedMangaAD.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/tracker/ui/feed/adapter/UpdatedMangaAD.kt @@ -6,7 +6,6 @@ import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding import org.koitharu.kotatsu.R import org.koitharu.kotatsu.core.ui.BaseListAdapter import org.koitharu.kotatsu.core.ui.list.OnListItemClickListener -import org.koitharu.kotatsu.core.ui.list.decor.SpacingItemDecoration import org.koitharu.kotatsu.databinding.ItemListGroupBinding import org.koitharu.kotatsu.list.ui.adapter.ListHeaderClickListener import org.koitharu.kotatsu.list.ui.adapter.ListItemType @@ -30,8 +29,6 @@ fun updatedMangaAD( val adapter = BaseListAdapter() .addDelegate(ListItemType.MANGA_GRID, mangaGridItemAD(coil, lifecycleOwner, sizeResolver, listener)) binding.recyclerView.adapter = adapter - val spacing = context.resources.getDimensionPixelOffset(R.dimen.grid_spacing) - binding.recyclerView.addItemDecoration(SpacingItemDecoration(spacing)) binding.buttonMore.setOnClickListener { v -> headerClickListener.onListHeaderClick(ListHeader(0, payload = item), v) } diff --git a/app/src/main/res/drawable/custom_selectable_item_background.xml b/app/src/main/res/drawable/custom_selectable_item_background.xml index 79f1a09ca..50bdb2347 100644 --- a/app/src/main/res/drawable/custom_selectable_item_background.xml +++ b/app/src/main/res/drawable/custom_selectable_item_background.xml @@ -2,9 +2,7 @@ + android:id="@android:id/mask"> diff --git a/app/src/main/res/layout/activity_details.xml b/app/src/main/res/layout/activity_details.xml index a35045cac..0a3bb8330 100644 --- a/app/src/main/res/layout/activity_details.xml +++ b/app/src/main/res/layout/activity_details.xml @@ -113,6 +113,7 @@ app:layout_constraintDimensionRatio="1" app:layout_constraintStart_toEndOf="@id/imageView_cover" app:layout_constraintTop_toTopOf="@id/textView_state" + app:tint="?colorTertiary" tools:src="@drawable/ic_state_ongoing" /> diff --git a/app/src/main/res/layout/item_manga_list_details.xml b/app/src/main/res/layout/item_manga_list_details.xml index f75b8c361..ed493de8a 100644 --- a/app/src/main/res/layout/item_manga_list_details.xml +++ b/app/src/main/res/layout/item_manga_list_details.xml @@ -3,7 +3,7 @@ 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:background="?attr/selectableItemBackground" + android:background="@drawable/custom_selectable_item_background" android:layout_width="match_parent" android:layout_height="wrap_content"> diff --git a/app/src/main/res/layout/item_recommendation.xml b/app/src/main/res/layout/item_recommendation.xml index 350a311d1..42d6dd36d 100644 --- a/app/src/main/res/layout/item_recommendation.xml +++ b/app/src/main/res/layout/item_recommendation.xml @@ -10,7 +10,8 @@ + android:layout_height="@dimen/recommendation_item_height" + android:nestedScrollingEnabled="false" /> #D32F2F - #E4FFFA - #FFEDEB - #E8FFEF - #F6F2FF + #F7FAF8 + #FFF8F7 + #F8FAF6 + #FCF8FD #FFF8F8 - #FFF0F0 - #E6E6E6 + #FFF8F7 + #F3F3F3 diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 70b16d5d4..99d5165fe 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -88,4 +88,6 @@ 400dp 200dp + + 12dp