Optimize layout

app/src/main/java/org/koitharu/kotatsu/base/ui/widgets/ChipsView.kt

@@ -37,15 +37,15 @@ class ChipsView @JvmOverloads constructor(
 		}
 	}
 
-	fun setChips(items: List<ChipModel>) {
+	fun setChips(items: Collection<ChipModel>) {
 		suppressLayoutCompat(true)
 		try {
 			for ((i, model) in items.withIndex()) {
 				val chip = getChildAt(i) as Chip? ?: addChip()
 				bindChip(chip, model)
 			}
-			for (i in items.size until childCount) {
+			if (childCount > items.size) {
-				removeViewAt(i)
+				removeViews(items.size, childCount - items.size)
 			}
 		} finally {
 			suppressLayoutCompat(false)
@@ -60,6 +60,7 @@ class ChipsView @JvmOverloads constructor(
 			chip.isCheckedIconVisible = true
 			chip.setChipIconResource(model.icon)
 		}
+		chip.isClickable = onChipClickListener != null
 		chip.tag = model.data
 	}
 
@@ -71,7 +72,6 @@ class ChipsView @JvmOverloads constructor(
 		chip.isCloseIconVisible = false
 		chip.setEnsureMinTouchTargetSize(false)
 		chip.setOnClickListener(chipOnClickListener)
-		chip.isClickable = onChipClickListener != null
 		addView(chip)
 		return chip
 	}

app/src/main/java/org/koitharu/kotatsu/details/ui/DetailsFragment.kt

@@ -13,7 +13,6 @@ import androidx.core.view.updatePadding
 import coil.ImageLoader
 import coil.util.CoilUtils
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.koin.android.ext.android.inject
@@ -30,13 +29,13 @@ import org.koitharu.kotatsu.reader.ui.ReaderActivity
 import org.koitharu.kotatsu.reader.ui.ReaderState
 import org.koitharu.kotatsu.utils.FileSizeUtils
 import org.koitharu.kotatsu.utils.ext.*
+import kotlin.random.Random
 
 class DetailsFragment : BaseFragment<FragmentDetailsBinding>(), View.OnClickListener,
 	View.OnLongClickListener {
 
 	private val viewModel by sharedViewModel<DetailsViewModel>()
 	private val coil by inject<ImageLoader>(mode = LazyThreadSafetyMode.NONE)
-	private var tagsJob: Job? = null
 
 	override fun onInflateView(
 		inflater: LayoutInflater,
@@ -196,16 +195,13 @@ class DetailsFragment : BaseFragment<FragmentDetailsBinding>(), View.OnClickList
 	}
 
 	private fun bindTags(manga: Manga) {
-		tagsJob?.cancel()
+		binding.chipsTags.setChips(
-		tagsJob = viewLifecycleScope.launch {
+			manga.tags.map { tag ->
-			val tags = ArrayList<ChipsView.ChipModel>(manga.tags.size + 2)
+				ChipsView.ChipModel(
-			for (tag in manga.tags) {
-				tags += ChipsView.ChipModel(
 					title = tag.title,
 					icon = 0
 				)
 			}
-			binding.chipsTags.setChips(tags)
+		)
-		}
 	}
 }

app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt

@@ -13,10 +13,7 @@ import androidx.appcompat.app.ActionBarDrawerToggle
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.Insets
-import androidx.core.view.GravityCompat
+import androidx.core.view.*
-import androidx.core.view.isVisible
-import androidx.core.view.updateLayoutParams
-import androidx.core.view.updatePadding
 import androidx.drawerlayout.widget.DrawerLayout
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentTransaction
@@ -88,17 +85,18 @@ class MainActivity : BaseActivity<ActivityMainBinding>(),
 		binding.drawer.addDrawerListener(drawerToggle)
 		supportActionBar?.setDisplayHomeAsUpEnabled(true)
 
-		binding.searchView.apply {
+		with(binding.searchView) {
 			onFocusChangeListener = this@MainActivity
 			searchSuggestionListener = this@MainActivity
 		}
 
-		binding.navigationView.apply {
+		with(binding.navigationView) {
 			val menuView = findViewById<RecyclerView>(com.google.android.material.R.id.design_navigation_view)
-			navHeaderBinding.root.setOnApplyWindowInsetsListener { v, insets ->
+			ViewCompat.setOnApplyWindowInsetsListener(navHeaderBinding.root) { v, insets ->
-				v.updatePadding(top = insets.systemWindowInsetTop)
+				val systemWindowInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+				v.updatePadding(top = systemWindowInsets.top)
 				// NavigationView doesn't dispatch insets to the menu view, so pad the bottom here.
-				menuView.updatePadding(bottom = insets.systemWindowInsetBottom)
+				menuView.updatePadding(bottom = systemWindowInsets.bottom)
 				insets
 			}
 			addHeaderView(navHeaderBinding.root)
@@ -117,9 +115,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(),
 			openDefaultSection()
 		}
 		if (savedInstanceState == null) {
-			TrackWorker.setup(applicationContext)
+			onFirstStart()
-			AppUpdateChecker(this).launchIfNeeded()
-			OnboardDialogFragment.showWelcome(get(), supportFragmentManager)
 		}
 
 		viewModel.onOpenReader.observe(this, this::onOpenReader)
@@ -347,6 +343,12 @@ class MainActivity : BaseActivity<ActivityMainBinding>(),
 		binding.toolbarCard.cardElevation = searchViewElevation
 	}
 
+	private fun onFirstStart() {
+		TrackWorker.setup(applicationContext)
+		AppUpdateChecker(this@MainActivity).launchIfNeeded()
+		OnboardDialogFragment.showWelcome(get(), supportFragmentManager)
+	}
+
 	private companion object {
 
 		const val TAG_PRIMARY = "primary"

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

@@ -13,6 +13,7 @@
 		android:layout_width="98dp"
 		android:layout_height="98dp"
 		android:layout_marginBottom="16dp"
+		tools:ignore="ContentDescription"
 		tools:src="@drawable/ic_alert_outline" />
 
 	<TextView

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

@@ -3,7 +3,7 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
-	android:layout_height="@dimen/list_footer_height"
+	android:layout_height="@dimen/list_footer_height_outer"
 	android:background="?selectableItemBackground"
 	android:gravity="center"
 	android:orientation="horizontal"

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

@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:layout_width="match_parent"
-	android:layout_height="@dimen/list_footer_height"
+	android:layout_height="@dimen/list_footer_height_outer">
-	android:padding="6dp">
 
 	<com.google.android.material.progressindicator.CircularProgressIndicator
 		android:id="@+id/progressBar"
 		android:layout_width="wrap_content"
-		android:layout_height="match_parent"
+		android:layout_height="wrap_content"
 		android:layout_gravity="center"
-		android:indeterminate="true" />
+		android:indeterminate="true"
+		app:indicatorSize="@dimen/list_footer_height_inner" />
 
 </FrameLayout>

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

@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
+<LinearLayout
 	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="@drawable/list_selector">
+	android:background="@drawable/list_selector"
-
+	android:orientation="vertical">
-	<androidx.constraintlayout.widget.ConstraintLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content">
 
 	<com.google.android.material.card.MaterialCardView
 		android:id="@+id/card"
@@ -17,34 +14,28 @@
 		android:layout_height="wrap_content"
 		android:layout_margin="4dp"
 		app:cardCornerRadius="4dp"
-			app:cardElevation="4dp"
+		app:cardElevation="4dp">
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toTopOf="parent">
 
 		<org.koitharu.kotatsu.base.ui.widgets.CoverImageView
 			android:id="@+id/imageView_cover"
 			android:layout_width="match_parent"
-				android:layout_height="match_parent"
+			android:layout_height="wrap_content"
 			android:scaleType="centerCrop"
+			android:orientation="horizontal"
 			tools:ignore="ContentDescription" />
 
 	</com.google.android.material.card.MaterialCardView>
 
 	<TextView
 		android:id="@+id/textView_title"
-			style="@style/TextAppearance.AppCompat.Body1"
+		style="@style/TextAppearance.AppCompat.Body2"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:ellipsize="end"
 		android:lineSpacingExtra="-2dp"
 		android:maxLines="2"
 		android:padding="4dp"
-			android:textStyle="bold"
+		android:elegantTextHeight="false"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/card"
 		tools:text="Sample name" />
 
-	</androidx.constraintlayout.widget.ConstraintLayout>
+</LinearLayout>
-
-</FrameLayout>

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

@@ -8,11 +8,6 @@
 	android:background="@drawable/list_selector"
 	android:orientation="horizontal">
 
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:orientation="horizontal">
-
 	<com.google.android.material.card.MaterialCardView
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
@@ -85,6 +80,7 @@
 				android:drawablePadding="4dp"
 				android:paddingStart="6dp"
 				app:drawableEndCompat="@drawable/ic_star"
+				tools:ignore="RtlSymmetry"
 				tools:text="9.6" />
 
 		</LinearLayout>
@@ -92,5 +88,3 @@
 	</LinearLayout>
 
 </LinearLayout>
-
-</LinearLayout>

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

@@ -1,40 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<RelativeLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:id="@+id/navigation_header"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:fitsSystemWindows="true"
+	android:fitsSystemWindows="true">
-	android:orientation="vertical">
-
-	<LinearLayout
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:gravity="center"
-		android:orientation="horizontal">
 
 	<ImageView
+		android:id="@+id/imageView_logo"
 		android:layout_width="@dimen/nav_header_logo_size"
 		android:layout_height="@dimen/nav_header_logo_size"
+		android:layout_alignParentStart="true"
+		android:layout_alignParentTop="true"
 		android:layout_marginStart="@dimen/margin_normal"
 		android:layout_marginTop="24dp"
 		android:layout_marginBottom="24dp"
-			app:srcCompat="@drawable/ic_totoro" />
+		android:contentDescription="@string/app_name"
+		android:src="@drawable/ic_totoro" />
 
 	<TextView
+		android:id="@+id/textView_title"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
+		android:layout_alignTop="@id/imageView_logo"
+		android:layout_alignBottom="@id/imageView_logo"
 		android:layout_marginStart="@dimen/nav_item_horizontal_padding"
+		android:layout_toEndOf="@id/imageView_logo"
+		android:gravity="center_vertical"
+		android:singleLine="true"
 		android:text="@string/app_name"
 		android:textAppearance="@style/TextAppearance.AppCompat.Title" />
 
-	</LinearLayout>
-
 	<View
 		android:id="@+id/divider"
 		android:layout_width="match_parent"
 		android:layout_height="1dp"
+		android:layout_below="@id/imageView_logo"
+		android:layout_alignParentStart="true"
+		android:layout_alignParentEnd="true"
 		android:background="?android:attr/listDivider" />
 
-</LinearLayout>
+</RelativeLayout>

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

@@ -22,7 +22,8 @@
 	<dimen name="preferred_grid_width">120dp</dimen>
 	<dimen name="header_height">34dp</dimen>
 	<dimen name="elevation_large">16dp</dimen>
-	<dimen name="list_footer_height">48dp</dimen>
+	<dimen name="list_footer_height_inner">36dp</dimen>
+	<dimen name="list_footer_height_outer">48dp</dimen>
 	<dimen name="screen_padding">16dp</dimen>
 
 	<!--SearchView dimens-->