UI adjust part 2

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

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

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.PAGE_THUMB -> outRect.set(spacingNormal)
-			ListItemType.MANGA_GRID,
+			ListItemType.MANGA_GRID -> outRect.set(0)
-			-> outRect.set(spacingNormal)
 
 			ListItemType.EXPLORE_BUTTONS -> outRect.set(spacingNormal)
 

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

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<ListModel>()
 		.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)
 	}

app/src/main/res/drawable/custom_selectable_item_background.xml

@@ -2,9 +2,7 @@
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
 	android:color="?android:attr/colorControlHighlight">
 	<item
-		android:id="@android:id/mask"
+		android:id="@android:id/mask">
-		android:left="8dp"
-		android:right="8dp">
 		<shape android:shape="rectangle">
 			<corners android:radius="@dimen/list_selector_corner" />
 			<solid android:color="@color/selector_overlay" />

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" />
 
 			<TextView

app/src/main/res/layout/item_feed.xml

@@ -19,7 +19,7 @@
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
-		app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover.Small"
+		app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover.Medium"
 		tools:src="@tools:sample/backgrounds/scenic" />
 
 	<TextView

app/src/main/res/layout/item_manga_grid.xml

@@ -5,6 +5,9 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
+	android:background="@drawable/custom_selectable_item_background"
+	android:layout_margin="2dp"
+	android:padding="6dp"
 	android:clipChildren="false"
 	android:orientation="vertical"
 	tools:layout_width="140dp">

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">
 

app/src/main/res/layout/item_recommendation.xml

@@ -10,7 +10,8 @@
 	<androidx.viewpager2.widget.ViewPager2
 		android:id="@+id/pager"
 		android:layout_width="match_parent"
-		android:layout_height="@dimen/recommendation_item_height" />
+		android:layout_height="@dimen/recommendation_item_height"
+		android:nestedScrollingEnabled="false" />
 
 	<org.koitharu.kotatsu.core.ui.widgets.DotsIndicator
 		android:id="@+id/dots"

app/src/main/res/layout/item_recommendation_manga.xml

@@ -17,7 +17,7 @@
 		android:scaleType="centerCrop"
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
-		app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover.Small"
+		app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover.Medium"
 		tools:src="@tools:sample/backgrounds/scenic" />
 
 	<TextView

app/src/main/res/values/colors.xml

@@ -29,11 +29,11 @@
 	<color name="common_red">#D32F2F</color>
 
 	<!-- Color schemes colors -->
-	<color name="background_miku">#E4FFFA</color>
+	<color name="background_miku">#F7FAF8</color>
-	<color name="background_asuka">#FFEDEB</color>
+	<color name="background_asuka">#FFF8F7</color>
-	<color name="background_mion">#E8FFEF</color>
+	<color name="background_mion">#F8FAF6</color>
-	<color name="background_rikka">#F6F2FF</color>
+	<color name="background_rikka">#FCF8FD</color>
 	<color name="background_sakura">#FFF8F8</color>
-	<color name="background_mamimi">#FFF0F0</color>
+	<color name="background_mamimi">#FFF8F7</color>
-	<color name="background_kanade">#E6E6E6</color>
+	<color name="background_kanade">#F3F3F3</color>
 </resources>

app/src/main/res/values/dimens.xml

@@ -88,4 +88,6 @@
 	<dimen name="m3_side_sheet_width">400dp</dimen>
 
 	<dimen name="reader_scroll_delta_min">200dp</dimen>
+
+	<dimen name="badge_offset">12dp</dimen>
 </resources>