Update feed ui

app/src/main/java/org/koitharu/kotatsu/tracker/ui/FeedFragment.kt

@@ -4,9 +4,7 @@ import android.os.Bundle
 import android.view.*
 import androidx.core.graphics.Insets
 import androidx.core.view.updatePadding
-import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.google.android.material.divider.MaterialDividerItemDecoration
 import com.google.android.material.snackbar.Snackbar
 import org.koin.android.ext.android.get
 import org.koin.androidx.viewmodel.ext.android.viewModel
@@ -14,6 +12,7 @@ import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.base.ui.BaseFragment
 import org.koitharu.kotatsu.base.ui.list.OnListItemClickListener
 import org.koitharu.kotatsu.base.ui.list.PaginationScrollListener
+import org.koitharu.kotatsu.base.ui.list.decor.SpacingItemDecoration
 import org.koitharu.kotatsu.core.model.Manga
 import org.koitharu.kotatsu.databinding.FragmentFeedBinding
 import org.koitharu.kotatsu.details.ui.DetailsActivity
@@ -32,6 +31,8 @@ class FeedFragment : BaseFragment<FragmentFeedBinding>(), PaginationScrollListen
 
 	private var feedAdapter: FeedAdapter? = null
 	private var updateStatusSnackbar: Snackbar? = null
+	private var paddingVertical = 0
+	private var paddingHorizontal = 0
 
 	override fun getTitle() = context?.getString(R.string.updates)
 
@@ -52,9 +53,10 @@ class FeedFragment : BaseFragment<FragmentFeedBinding>(), PaginationScrollListen
 			adapter = feedAdapter
 			setHasFixedSize(true)
 			addOnScrollListener(PaginationScrollListener(4, this@FeedFragment))
-			val dividerDecoration = MaterialDividerItemDecoration(context, RecyclerView.VERTICAL)
+			val spacing = resources.getDimensionPixelOffset(R.dimen.list_spacing)
-			dividerDecoration.setDividerInsetStartResource(context, R.dimen.feed_dividers_offset)
+			paddingHorizontal = spacing
-			addItemDecoration(dividerDecoration)
+			paddingVertical = resources.getDimensionPixelOffset(R.dimen.grid_spacing_outer)
+			addItemDecoration(SpacingItemDecoration(spacing))
 		}
 
 		viewModel.content.observe(viewLifecycleOwner, this::onListChanged)
@@ -105,10 +107,10 @@ class FeedFragment : BaseFragment<FragmentFeedBinding>(), PaginationScrollListen
 	override fun onWindowInsetsChanged(insets: Insets) {
 		val headerHeight = (activity as? AppBarOwner)?.appBar?.measureHeight() ?: insets.top
 		binding.recyclerView.updatePadding(
-			top = headerHeight,
+			top = headerHeight + paddingVertical,
-			left = insets.left,
+			left = insets.left + paddingHorizontal,
-			right = insets.right,
+			right = insets.right + paddingHorizontal,
-			bottom = insets.bottom
+			bottom = insets.bottom + paddingVertical,
 		)
 	}
 

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

@@ -8,8 +8,10 @@
 	android:layout_height="match_parent"
 	android:clipToPadding="false"
 	android:orientation="vertical"
-	android:padding="@dimen/grid_spacing_outer"
+	android:paddingLeft="@dimen/list_spacing"
-	android:scrollbarStyle="outsideOverlay"
+	android:paddingRight="@dimen/list_spacing"
-	android:scrollbars="vertical"
+	android:paddingTop="@dimen/grid_spacing_outer"
+	android:paddingBottom="@dimen/grid_spacing_outer"
+	app:fastScrollEnabled="true"
 	app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
 	tools:listitem="@layout/item_tracklog" />

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

@@ -1,63 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
+<com.google.android.material.card.MaterialCardView
 	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"
-	android:background="?attr/selectableItemBackground"
+	app:cardCornerRadius="12dp">
-	android:paddingVertical="6dp"
-	android:paddingHorizontal="8dp">
 
-	<com.google.android.material.card.MaterialCardView
+	<LinearLayout
-		android:id="@+id/card_cover"
+		android:layout_width="match_parent"
-		android:layout_width="48dp"
+		android:layout_height="match_parent"
-		android:layout_height="48dp"
+		android:orientation="horizontal">
-		android:layout_margin="8dp"
-		app:layout_constraintBottom_toBottomOf="parent"
-		app:layout_constraintDimensionRatio="h,1:1"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="parent"
-		app:layout_constraintVertical_bias="0.0">
 
-		<ImageView
+		<org.koitharu.kotatsu.base.ui.widgets.CoverImageView
 			android:id="@+id/imageView_cover"
 			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
+			android:layout_height="@dimen/manga_list_details_item_height"
+			android:orientation="vertical"
 			android:scaleType="centerCrop"
+			app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover"
 			tools:src="@tools:sample/backgrounds/scenic" />
 
-	</com.google.android.material.card.MaterialCardView>
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_margin="16dp"
+			android:orientation="vertical">
 
 			<LinearLayout
-		android:id="@+id/title_container"
+				android:layout_width="match_parent"
-		android:layout_width="0dp"
 				android:layout_height="wrap_content"
-		android:layout_marginStart="16dp"
+				android:orientation="horizontal">
-		android:layout_marginTop="4dp"
-		android:layout_marginEnd="8dp"
-		android:orientation="horizontal"
-		app:layout_constraintBottom_toTopOf="@id/textView_chapters"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toEndOf="@id/card_cover"
-		app:layout_constraintTop_toTopOf="parent"
-		app:layout_constraintVertical_chainStyle="packed">
 
 				<TextView
 					android:id="@+id/textView_title"
 					android:layout_width="0dp"
 					android:layout_height="wrap_content"
+					android:layout_marginBottom="4dp"
 					android:layout_weight="1"
 					android:ellipsize="end"
-			android:maxLines="1"
+					android:maxLines="2"
-			android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+					android:textAppearance="?attr/textAppearanceTitleMedium"
-			tools:text="@tools:sample/lorem" />
+					tools:text="@tools:sample/lorem/random" />
 
 				<TextView
 					android:id="@+id/badge"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-			android:layout_gravity="center"
+					android:layout_gravity="top|end"
 					android:background="@drawable/badge"
 					android:paddingHorizontal="6dp"
 					android:paddingVertical="2dp"
@@ -70,31 +60,25 @@
 
 			<TextView
 				android:id="@+id/textView_chapters"
-		android:layout_width="0dp"
+				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-		android:layout_marginStart="16dp"
+				android:layout_weight="1"
-		android:layout_marginEnd="8dp"
-		android:layout_marginBottom="4dp"
-		android:layout_marginTop="4dp"
 				android:ellipsize="none"
 				android:lineSpacingExtra="4sp"
-		app:layout_constraintEnd_toEndOf="parent"
+				android:textAppearance="?attr/textAppearanceBodySmall"
-		app:layout_constraintStart_toEndOf="@id/card_cover"
+				tools:text="@tools:sample/lorem[10]" />
-		app:layout_constraintTop_toBottomOf="@id/title_container"
+
-		tools:text="@tools:sample/lorem[25]" />
 
 			<TextView
 				android:id="@+id/textView_truncated"
-		android:layout_width="0dp"
+				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-		android:layout_marginStart="16dp"
 				android:layout_marginTop="4dp"
-		android:layout_marginEnd="8dp"
-		android:layout_marginBottom="4dp"
 				android:textColor="?android:textColorHint"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toEndOf="@id/card_cover"
-		app:layout_constraintTop_toBottomOf="@id/textView_chapters"
 				tools:text="@string/_and_x_more" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+		</LinearLayout>
+
+	</LinearLayout>
+
+</com.google.android.material.card.MaterialCardView>