From aefbf8a9c0ef60016abf70fe11e371c46a150325 Mon Sep 17 00:00:00 2001 From: YvesKalume Date: Fri, 13 May 2022 17:35:10 +0200 Subject: [PATCH 1/2] fix distorted buttons in nia-catalog --- app-nia-catalog/build.gradle.kts | 1 + .../samples/apps/niacatalog/ui/Catalog.kt | 33 ++++++++++--------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/app-nia-catalog/build.gradle.kts b/app-nia-catalog/build.gradle.kts index dc8d4ffc0..8ab94c29f 100644 --- a/app-nia-catalog/build.gradle.kts +++ b/app-nia-catalog/build.gradle.kts @@ -35,4 +35,5 @@ dependencies { implementation(project(":core-ui")) implementation(libs.androidx.activity.compose) + implementation(libs.accompanist.flowlayout) } \ No newline at end of file diff --git a/app-nia-catalog/src/main/java/com/google/samples/apps/niacatalog/ui/Catalog.kt b/app-nia-catalog/src/main/java/com/google/samples/apps/niacatalog/ui/Catalog.kt index c4f66166a..0513cb690 100644 --- a/app-nia-catalog/src/main/java/com/google/samples/apps/niacatalog/ui/Catalog.kt +++ b/app-nia-catalog/src/main/java/com/google/samples/apps/niacatalog/ui/Catalog.kt @@ -37,6 +37,7 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp +import com.google.accompanist.flowlayout.FlowRow import com.google.samples.apps.nowinandroid.core.ui.component.NiaDropdownMenuButton import com.google.samples.apps.nowinandroid.core.ui.component.NiaFilledButton import com.google.samples.apps.nowinandroid.core.ui.component.NiaFilterChip @@ -76,7 +77,7 @@ fun NiaCatalog() { } item { Text("Buttons", Modifier.padding(top = 16.dp)) } item { - Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { + FlowRow(mainAxisSpacing = 16.dp) { NiaFilledButton(onClick = {}) { Text(text = "Enabled") } @@ -90,7 +91,7 @@ fun NiaCatalog() { } item { Text("Disabled buttons", Modifier.padding(top = 16.dp)) } item { - Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { + FlowRow(mainAxisSpacing = 16.dp) { NiaFilledButton( onClick = {}, enabled = false @@ -113,7 +114,7 @@ fun NiaCatalog() { } item { Text("Buttons with leading icons", Modifier.padding(top = 16.dp)) } item { - Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { + FlowRow(mainAxisSpacing = 16.dp) { NiaFilledButton( onClick = {}, text = { Text(text = "Enabled") }, @@ -139,7 +140,7 @@ fun NiaCatalog() { } item { Text("Disabled buttons with leading icons", Modifier.padding(top = 16.dp)) } item { - Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { + FlowRow(mainAxisSpacing = 16.dp) { NiaFilledButton( onClick = {}, enabled = false, @@ -168,7 +169,7 @@ fun NiaCatalog() { } item { Text("Buttons with trailing icons", Modifier.padding(top = 16.dp)) } item { - Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { + FlowRow(mainAxisSpacing = 16.dp) { NiaFilledButton( onClick = {}, text = { Text(text = "Enabled") }, @@ -194,7 +195,7 @@ fun NiaCatalog() { } item { Text("Disabled buttons with trailing icons", Modifier.padding(top = 16.dp)) } item { - Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { + FlowRow(mainAxisSpacing = 16.dp) { NiaFilledButton( onClick = {}, enabled = false, @@ -223,7 +224,7 @@ fun NiaCatalog() { } item { Text("Small buttons", Modifier.padding(top = 16.dp)) } item { - Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { + FlowRow(mainAxisSpacing = 16.dp) { NiaFilledButton( onClick = {}, small = true @@ -246,7 +247,7 @@ fun NiaCatalog() { } item { Text("Disabled small buttons", Modifier.padding(top = 16.dp)) } item { - Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { + FlowRow(mainAxisSpacing = 16.dp) { NiaFilledButton( onClick = {}, enabled = false, @@ -272,7 +273,7 @@ fun NiaCatalog() { } item { Text("Small buttons with leading icons", Modifier.padding(top = 16.dp)) } item { - Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { + FlowRow(mainAxisSpacing = 16.dp) { NiaFilledButton( onClick = {}, small = true, @@ -306,7 +307,7 @@ fun NiaCatalog() { ) } item { - Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { + FlowRow(mainAxisSpacing = 16.dp) { NiaFilledButton( onClick = {}, enabled = false, @@ -338,7 +339,7 @@ fun NiaCatalog() { } item { Text("Small buttons with trailing icons", Modifier.padding(top = 16.dp)) } item { - Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { + FlowRow(mainAxisSpacing = 16.dp) { NiaFilledButton( onClick = {}, small = true, @@ -372,7 +373,7 @@ fun NiaCatalog() { ) } item { - Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { + FlowRow(mainAxisSpacing = 16.dp) { NiaFilledButton( onClick = {}, enabled = false, @@ -413,7 +414,7 @@ fun NiaCatalog() { } item { Text("Chips", Modifier.padding(top = 16.dp)) } item { - Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { + FlowRow(mainAxisSpacing = 16.dp) { var firstChecked by remember { mutableStateOf(false) } NiaFilterChip( checked = firstChecked, @@ -437,7 +438,7 @@ fun NiaCatalog() { } item { Text("Toggle buttons", Modifier.padding(top = 16.dp)) } item { - Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { + FlowRow(mainAxisSpacing = 16.dp) { var firstChecked by remember { mutableStateOf(false) } NiaToggleButton( checked = firstChecked, @@ -498,7 +499,7 @@ fun NiaCatalog() { } item { Text("View toggle", Modifier.padding(top = 16.dp)) } item { - Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { + FlowRow(mainAxisSpacing = 16.dp) { var firstExpanded by remember { mutableStateOf(false) } NiaViewToggleButton( expanded = firstExpanded, @@ -517,7 +518,7 @@ fun NiaCatalog() { } item { Text("Tags", Modifier.padding(top = 16.dp)) } item { - Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { + FlowRow(mainAxisSpacing = 16.dp) { var firstFollowed by remember { mutableStateOf(false) } NiaTopicTag( followed = firstFollowed, From b5d73bca5344b103285ce21328d657fa4744f59b Mon Sep 17 00:00:00 2001 From: YvesKalume Date: Wed, 18 May 2022 15:10:43 +0200 Subject: [PATCH 2/2] fix spotless format violations --- .../samples/apps/niacatalog/ui/Catalog.kt | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/app-nia-catalog/src/main/java/com/google/samples/apps/niacatalog/ui/Catalog.kt b/app-nia-catalog/src/main/java/com/google/samples/apps/niacatalog/ui/Catalog.kt index 0513cb690..30e73e17b 100644 --- a/app-nia-catalog/src/main/java/com/google/samples/apps/niacatalog/ui/Catalog.kt +++ b/app-nia-catalog/src/main/java/com/google/samples/apps/niacatalog/ui/Catalog.kt @@ -17,7 +17,6 @@ package com.google.samples.apps.niacatalog.ui import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.WindowInsets import androidx.compose.foundation.layout.add import androidx.compose.foundation.layout.asPaddingValues @@ -77,7 +76,7 @@ fun NiaCatalog() { } item { Text("Buttons", Modifier.padding(top = 16.dp)) } item { - FlowRow(mainAxisSpacing = 16.dp) { + FlowRow(mainAxisSpacing = 16.dp) { NiaFilledButton(onClick = {}) { Text(text = "Enabled") } @@ -91,7 +90,7 @@ fun NiaCatalog() { } item { Text("Disabled buttons", Modifier.padding(top = 16.dp)) } item { - FlowRow(mainAxisSpacing = 16.dp) { + FlowRow(mainAxisSpacing = 16.dp) { NiaFilledButton( onClick = {}, enabled = false @@ -114,7 +113,7 @@ fun NiaCatalog() { } item { Text("Buttons with leading icons", Modifier.padding(top = 16.dp)) } item { - FlowRow(mainAxisSpacing = 16.dp) { + FlowRow(mainAxisSpacing = 16.dp) { NiaFilledButton( onClick = {}, text = { Text(text = "Enabled") }, @@ -140,7 +139,7 @@ fun NiaCatalog() { } item { Text("Disabled buttons with leading icons", Modifier.padding(top = 16.dp)) } item { - FlowRow(mainAxisSpacing = 16.dp) { + FlowRow(mainAxisSpacing = 16.dp) { NiaFilledButton( onClick = {}, enabled = false, @@ -195,7 +194,7 @@ fun NiaCatalog() { } item { Text("Disabled buttons with trailing icons", Modifier.padding(top = 16.dp)) } item { - FlowRow(mainAxisSpacing = 16.dp) { + FlowRow(mainAxisSpacing = 16.dp) { NiaFilledButton( onClick = {}, enabled = false, @@ -224,7 +223,7 @@ fun NiaCatalog() { } item { Text("Small buttons", Modifier.padding(top = 16.dp)) } item { - FlowRow(mainAxisSpacing = 16.dp) { + FlowRow(mainAxisSpacing = 16.dp) { NiaFilledButton( onClick = {}, small = true @@ -247,7 +246,7 @@ fun NiaCatalog() { } item { Text("Disabled small buttons", Modifier.padding(top = 16.dp)) } item { - FlowRow(mainAxisSpacing = 16.dp) { + FlowRow(mainAxisSpacing = 16.dp) { NiaFilledButton( onClick = {}, enabled = false, @@ -307,7 +306,7 @@ fun NiaCatalog() { ) } item { - FlowRow(mainAxisSpacing = 16.dp) { + FlowRow(mainAxisSpacing = 16.dp) { NiaFilledButton( onClick = {}, enabled = false, @@ -339,7 +338,7 @@ fun NiaCatalog() { } item { Text("Small buttons with trailing icons", Modifier.padding(top = 16.dp)) } item { - FlowRow(mainAxisSpacing = 16.dp) { + FlowRow(mainAxisSpacing = 16.dp) { NiaFilledButton( onClick = {}, small = true, @@ -373,7 +372,7 @@ fun NiaCatalog() { ) } item { - FlowRow(mainAxisSpacing = 16.dp) { + FlowRow(mainAxisSpacing = 16.dp) { NiaFilledButton( onClick = {}, enabled = false, @@ -414,7 +413,7 @@ fun NiaCatalog() { } item { Text("Chips", Modifier.padding(top = 16.dp)) } item { - FlowRow(mainAxisSpacing = 16.dp) { + FlowRow(mainAxisSpacing = 16.dp) { var firstChecked by remember { mutableStateOf(false) } NiaFilterChip( checked = firstChecked, @@ -438,7 +437,7 @@ fun NiaCatalog() { } item { Text("Toggle buttons", Modifier.padding(top = 16.dp)) } item { - FlowRow(mainAxisSpacing = 16.dp) { + FlowRow(mainAxisSpacing = 16.dp) { var firstChecked by remember { mutableStateOf(false) } NiaToggleButton( checked = firstChecked, @@ -499,7 +498,7 @@ fun NiaCatalog() { } item { Text("View toggle", Modifier.padding(top = 16.dp)) } item { - FlowRow(mainAxisSpacing = 16.dp) { + FlowRow(mainAxisSpacing = 16.dp) { var firstExpanded by remember { mutableStateOf(false) } NiaViewToggleButton( expanded = firstExpanded, @@ -518,7 +517,7 @@ fun NiaCatalog() { } item { Text("Tags", Modifier.padding(top = 16.dp)) } item { - FlowRow(mainAxisSpacing = 16.dp) { + FlowRow(mainAxisSpacing = 16.dp) { var firstFollowed by remember { mutableStateOf(false) } NiaTopicTag( followed = firstFollowed,