From 83011ead2cdc07618d08054d8f0208bc3520891e Mon Sep 17 00:00:00 2001
From: Iamlooker <mohit2002ss@gmail.com>
Date: Fri, 22 Apr 2022 17:50:46 +0530
Subject: [PATCH] Cleanup

---
 .../com/looker/droidify/ui/compose/utils/Chip.kt  |  9 +++++----
 .../droidify/ui/fragments/ExploreFragment.kt      | 15 +++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/main/kotlin/com/looker/droidify/ui/compose/utils/Chip.kt b/src/main/kotlin/com/looker/droidify/ui/compose/utils/Chip.kt
index accb271a..6b40ac01 100644
--- a/src/main/kotlin/com/looker/droidify/ui/compose/utils/Chip.kt
+++ b/src/main/kotlin/com/looker/droidify/ui/compose/utils/Chip.kt
@@ -2,9 +2,7 @@ package com.looker.droidify.ui.compose.utils
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.animateColor
-import androidx.compose.animation.core.animateDp
-import androidx.compose.animation.core.animateFloat
-import androidx.compose.animation.core.updateTransition
+import androidx.compose.animation.core.*
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.lazy.items
@@ -54,7 +52,10 @@ private fun categoryChipTransition(selected: Boolean): CategoryChipTransition {
             SelectionState.Selected -> MaterialTheme.colorScheme.inversePrimary.copy(alpha = 0.8f)
         }
     }
-    val checkScale = transition.animateFloat(label = "chip_check_scale") { state ->
+    val checkScale = transition.animateFloat(
+        label = "chip_check_scale",
+        transitionSpec = { spring(dampingRatio = Spring.DampingRatioHighBouncy, stiffness = Spring.StiffnessLow) }
+    ) { state ->
         when (state) {
             SelectionState.Unselected -> 0.6f
             SelectionState.Selected -> 1f
diff --git a/src/main/kotlin/com/looker/droidify/ui/fragments/ExploreFragment.kt b/src/main/kotlin/com/looker/droidify/ui/fragments/ExploreFragment.kt
index aa872b94..04c780f7 100644
--- a/src/main/kotlin/com/looker/droidify/ui/fragments/ExploreFragment.kt
+++ b/src/main/kotlin/com/looker/droidify/ui/fragments/ExploreFragment.kt
@@ -12,7 +12,6 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.rounded.Settings
 import androidx.compose.material.icons.rounded.Sync
@@ -65,15 +64,14 @@ class ExploreFragment : MainNavFragmentX() {
             // Avoid the compiler using the same class as observer
             Log.d(this::class.java.canonicalName, this.toString())
         }
-        viewModel.primaryProducts.observe(viewLifecycleOwner) {
-            redrawPage(it, viewModel.categories.value ?: emptyList())
-        }
-        viewModel.categories.observe(viewLifecycleOwner) {
-            redrawPage(viewModel.primaryProducts.value, it)
+        viewModel.primaryProducts.observe(viewLifecycleOwner) { products ->
+            viewModel.categories.observe(viewLifecycleOwner) { categories ->
+                redrawPage(products, categories)
+            }
         }
     }
 
-    @OptIn(ExperimentalMaterialApi::class, ExperimentalMaterial3Api::class)
+    @OptIn(ExperimentalMaterial3Api::class)
     private fun redrawPage(products: List<Product>?, categories: List<String> = emptyList()) {
         binding.composeView.setContent {
             AppTheme(
@@ -125,7 +123,8 @@ class ExploreFragment : MainNavFragmentX() {
                                 }
                             )
                         }
-                        ProductsVerticalRecycler(products,
+                        ProductsVerticalRecycler(
+                            products,
                             repositories,
                             Modifier
                                 .fillMaxWidth()