From 8d9e120e5f4c1b34e3824fd07de9699876277639 Mon Sep 17 00:00:00 2001
From: tzxdtc10 <tzxdtc10@gmail.com>
Date: Thu, 21 Sep 2023 13:27:56 +0900
Subject: [PATCH] Remove some warnings (#356)

---
 .../android/showkase/ui/BackButtonHandler.kt    |  4 ++--
 .../android/showkase/ui/CommonComponents.kt     | 17 +++++++++--------
 .../showkase/ui/ShowkaseColorsInAGroupScreen.kt |  1 -
 .../ui/ShowkaseComponentDetailScreen.kt         |  2 +-
 .../ui/ShowkaseComponentsInAGroupScreen.kt      |  1 -
 .../android/showkase/ui/ShowkaseErrorScreen.kt  |  1 -
 6 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/showkase/src/main/java/com/airbnb/android/showkase/ui/BackButtonHandler.kt b/showkase/src/main/java/com/airbnb/android/showkase/ui/BackButtonHandler.kt
index dfcd4b2a..bc1d8a56 100644
--- a/showkase/src/main/java/com/airbnb/android/showkase/ui/BackButtonHandler.kt
+++ b/showkase/src/main/java/com/airbnb/android/showkase/ui/BackButtonHandler.kt
@@ -27,7 +27,7 @@ private class ComposableBackHandler(enabled: Boolean) : OnBackPressedCallback(en
 }
 
 @Composable
-internal fun handler(
+internal fun Handler(
     enabled: Boolean = true,
     onBackPressed: () -> Unit
 ) {
@@ -65,7 +65,7 @@ internal fun BackButtonHandler(
     CompositionLocalProvider(
         LocalBackPressedDispatcher provides context as ComponentActivity
     ) {
-        handler {
+        Handler {
             onBackPressed()
         }
     }
diff --git a/showkase/src/main/java/com/airbnb/android/showkase/ui/CommonComponents.kt b/showkase/src/main/java/com/airbnb/android/showkase/ui/CommonComponents.kt
index 1445b21f..484c5a8f 100644
--- a/showkase/src/main/java/com/airbnb/android/showkase/ui/CommonComponents.kt
+++ b/showkase/src/main/java/com/airbnb/android/showkase/ui/CommonComponents.kt
@@ -10,7 +10,6 @@ import androidx.compose.material.Card
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.composed
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
@@ -62,8 +61,8 @@ internal fun ComponentCard(
 ) {
     val composableModifier = Modifier.generateComposableModifier(metadata)
     val composableContainerModifier = Modifier.generateContainerModifier(onClick)
-    Card() {
-        Box() {
+    Card {
+        Box {
             Column(modifier = composableModifier) {
                 metadata.component()
             }
@@ -76,13 +75,15 @@ internal fun ComponentCard(
                 modifier = Modifier
                     .matchParentSize()
                     .then(composableContainerModifier)
-            ){}
+            ) {}
         }
 
     }
 }
 
-private fun Modifier.generateContainerModifier(onClick: (() -> Unit)?) = composed { onClick?.let {
-    fillMaxWidth()
-        .clickable(onClick = onClick)
-} ?: fillMaxWidth() }
+private fun Modifier.generateContainerModifier(onClick: (() -> Unit)?) =
+    onClick?.let {
+        fillMaxWidth()
+            .clickable(onClick = onClick)
+    } ?: fillMaxWidth()
+
diff --git a/showkase/src/main/java/com/airbnb/android/showkase/ui/ShowkaseColorsInAGroupScreen.kt b/showkase/src/main/java/com/airbnb/android/showkase/ui/ShowkaseColorsInAGroupScreen.kt
index 83535206..7f8afa05 100644
--- a/showkase/src/main/java/com/airbnb/android/showkase/ui/ShowkaseColorsInAGroupScreen.kt
+++ b/showkase/src/main/java/com/airbnb/android/showkase/ui/ShowkaseColorsInAGroupScreen.kt
@@ -27,7 +27,6 @@ import com.airbnb.android.showkase.models.ShowkaseBrowserScreenMetadata
 import com.airbnb.android.showkase.models.ShowkaseCurrentScreen
 import com.airbnb.android.showkase.models.clear
 import com.airbnb.android.showkase.models.clearActiveSearch
-import java.util.Locale
 
 @Composable
 internal fun ShowkaseColorsInAGroupScreen(
diff --git a/showkase/src/main/java/com/airbnb/android/showkase/ui/ShowkaseComponentDetailScreen.kt b/showkase/src/main/java/com/airbnb/android/showkase/ui/ShowkaseComponentDetailScreen.kt
index cb7fdb47..3c8d8024 100644
--- a/showkase/src/main/java/com/airbnb/android/showkase/ui/ShowkaseComponentDetailScreen.kt
+++ b/showkase/src/main/java/com/airbnb/android/showkase/ui/ShowkaseComponentDetailScreen.kt
@@ -73,7 +73,7 @@ internal fun ShowkaseComponentDetailScreen(
                 ShowkaseComponentCardType.values().forEach { showkaseComponentCardType ->
                     when (showkaseComponentCardType) {
                         ShowkaseComponentCardType.BASIC -> {
-                            if (!metadata.componentKDoc.isBlank()) {
+                            if (metadata.componentKDoc.isNotBlank()) {
                                 DocumentationPanel(metadata.componentKDoc)
                             }
                             BasicComponentCard(metadata)
diff --git a/showkase/src/main/java/com/airbnb/android/showkase/ui/ShowkaseComponentsInAGroupScreen.kt b/showkase/src/main/java/com/airbnb/android/showkase/ui/ShowkaseComponentsInAGroupScreen.kt
index 48be76dd..1379b923 100644
--- a/showkase/src/main/java/com/airbnb/android/showkase/ui/ShowkaseComponentsInAGroupScreen.kt
+++ b/showkase/src/main/java/com/airbnb/android/showkase/ui/ShowkaseComponentsInAGroupScreen.kt
@@ -11,7 +11,6 @@ import com.airbnb.android.showkase.models.ShowkaseCurrentScreen
 import com.airbnb.android.showkase.models.clear
 import com.airbnb.android.showkase.models.clearActiveSearch
 import com.airbnb.android.showkase.models.update
-import java.util.Locale
 
 @Composable
 internal fun ShowkaseComponentsInAGroupScreen(
diff --git a/showkase/src/main/java/com/airbnb/android/showkase/ui/ShowkaseErrorScreen.kt b/showkase/src/main/java/com/airbnb/android/showkase/ui/ShowkaseErrorScreen.kt
index f64c960d..d7874fd1 100644
--- a/showkase/src/main/java/com/airbnb/android/showkase/ui/ShowkaseErrorScreen.kt
+++ b/showkase/src/main/java/com/airbnb/android/showkase/ui/ShowkaseErrorScreen.kt
@@ -8,7 +8,6 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.Snackbar
-import androidx.compose.ui.unit.dp
 
 @Composable
 internal fun ShowkaseErrorScreen(errorText: String) {