From 5d1715bcef55f9a3f571145a0201ecd6629c9d2a Mon Sep 17 00:00:00 2001 From: GeorgCantor Date: Fri, 4 Sep 2020 14:46:57 +0300 Subject: [PATCH 1/2] optimized code in some places --- app/src/main/java/io/plaidapp/ui/HomeActivity.kt | 9 ++++----- .../io/plaidapp/core/dribbble/data/ShotsRepository.kt | 10 ++++------ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/io/plaidapp/ui/HomeActivity.kt b/app/src/main/java/io/plaidapp/ui/HomeActivity.kt index 38403a53a..a47b46406 100644 --- a/app/src/main/java/io/plaidapp/ui/HomeActivity.kt +++ b/app/src/main/java/io/plaidapp/ui/HomeActivity.kt @@ -242,11 +242,10 @@ class HomeActivity : AppCompatActivity() { private fun initViewModelObservers() { viewModel.sources.observe(this@HomeActivity, Observer { filtersAdapter.submitList(it.sourceUiModels) - if (it.highlightSources != null) { - val highlightUiModel = (it.highlightSources as Event) - .consume() - if (highlightUiModel != null) { - highlightPosition(highlightUiModel) + it.highlightSources?.let { + val highlightUiModel = it.consume() + highlightUiModel?.let { + highlightPosition(it) } } }) diff --git a/core/src/main/java/io/plaidapp/core/dribbble/data/ShotsRepository.kt b/core/src/main/java/io/plaidapp/core/dribbble/data/ShotsRepository.kt index 1a8896e9e..01b49e456 100644 --- a/core/src/main/java/io/plaidapp/core/dribbble/data/ShotsRepository.kt +++ b/core/src/main/java/io/plaidapp/core/dribbble/data/ShotsRepository.kt @@ -36,16 +36,14 @@ class ShotsRepository constructor(private val remoteDataSource: SearchRemoteData } fun getShot(id: Long): Result { - val shot = shotCache[id] - return if (shot != null) { - Result.Success(shot) - } else { - Result.Error(IllegalStateException("Shot $id not cached")) + return when (val shot = shotCache[id]) { + null -> Result.Error(IllegalStateException("Shot $id not cached")) + else -> Result.Success(shot) } } private fun cache(shots: List) { - shots.associateTo(shotCache) { it.id to it } + shots.associateByTo(shotCache) { it.id } } companion object { From ef0f9587b395f633868acc3af5edee2877d8bf6d Mon Sep 17 00:00:00 2001 From: GeorgCantor Date: Fri, 4 Sep 2020 15:00:44 +0300 Subject: [PATCH 2/2] removed unused import --- app/src/main/java/io/plaidapp/ui/HomeActivity.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/io/plaidapp/ui/HomeActivity.kt b/app/src/main/java/io/plaidapp/ui/HomeActivity.kt index a47b46406..b47335bc7 100644 --- a/app/src/main/java/io/plaidapp/ui/HomeActivity.kt +++ b/app/src/main/java/io/plaidapp/ui/HomeActivity.kt @@ -76,7 +76,6 @@ import io.plaidapp.core.util.AnimUtils import io.plaidapp.core.util.ColorUtils import io.plaidapp.core.util.ViewUtils import io.plaidapp.core.util.drawableToBitmap -import io.plaidapp.core.util.event.Event import io.plaidapp.core.util.intentTo import io.plaidapp.dagger.inject import io.plaidapp.ui.recyclerview.FilterTouchHelperCallback