Optimize layout

This commit is contained in:
Koitharu
2021-07-28 08:03:16 +03:00
parent 7f5ef227eb
commit 6f7efa9e26
10 changed files with 142 additions and 153 deletions

View File

@@ -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) {
removeViewAt(i)
if (childCount > items.size) {
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
}

View File

@@ -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()
tagsJob = viewLifecycleScope.launch {
val tags = ArrayList<ChipsView.ChipModel>(manga.tags.size + 2)
for (tag in manga.tags) {
tags += ChipsView.ChipModel(
binding.chipsTags.setChips(
manga.tags.map { tag ->
ChipsView.ChipModel(
title = tag.title,
icon = 0
)
}
binding.chipsTags.setChips(tags)
}
)
}
}

View File

@@ -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.isVisible
import androidx.core.view.updateLayoutParams
import androidx.core.view.updatePadding
import androidx.core.view.*
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 ->
v.updatePadding(top = insets.systemWindowInsetTop)
ViewCompat.setOnApplyWindowInsetsListener(navHeaderBinding.root) { v, insets ->
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)
AppUpdateChecker(this).launchIfNeeded()
OnboardDialogFragment.showWelcome(get(), supportFragmentManager)
onFirstStart()
}
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"