A fully functional Android app built entirely with Kotlin and Jetpack Compose
fix distorted buttons in nia-catalog
YvesKalumeaefbf8a9c0ef
diff --git a/app-nia-catalog/build.gradle.kts b/app-nia-catalog/build.gradle.ktsindex 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 filediff --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.ktindex 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.setValueimport androidx.compose.ui.Modifierimport androidx.compose.ui.res.painterResourceimport androidx.compose.ui.unit.dp+import com.google.accompanist.flowlayout.FlowRowimport com.google.samples.apps.nowinandroid.core.ui.component.NiaDropdownMenuButtonimport com.google.samples.apps.nowinandroid.core.ui.component.NiaFilledButtonimport 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,