msb-public
/
nowinandroid
mirror of https://github.com/android/nowinandroid.git
1
0
Code Issues Projects Releases Wiki Activity

Merge pull request #29 from YvesKalume/main

Browse Source 
Fix distorted buttons in nia-catalog
pull/51/head
Jolanda Verhoef 2 years ago committed by GitHub
parent 93ee7587d6 b5d73bca53
commit 2234905bf4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File

1
app-nia-catalog/build.gradle.kts
Unescape View File

@ -35,4 +35,5 @@ dependencies {
implementation(project(":core-ui")) implementation(project(":core-ui"))
implementation(libs.androidx.activity.compose) implementation(libs.androidx.activity.compose)
implementation(libs.accompanist.flowlayout)
} }

34
app-nia-catalog/src/main/java/com/google/samples/apps/niacatalog/ui/Catalog.kt
Unescape View File

@ -17,7 +17,6 @@
package com.google.samples.apps.niacatalog.ui package com.google.samples.apps.niacatalog.ui
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.WindowInsets import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.add import androidx.compose.foundation.layout.add
import androidx.compose.foundation.layout.asPaddingValues import androidx.compose.foundation.layout.asPaddingValues
@ -37,6 +36,7 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.unit.dp 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.NiaDropdownMenuButton
import com.google.samples.apps.nowinandroid.core.ui.component.NiaFilledButton import com.google.samples.apps.nowinandroid.core.ui.component.NiaFilledButton
import com.google.samples.apps.nowinandroid.core.ui.component.NiaFilterChip import com.google.samples.apps.nowinandroid.core.ui.component.NiaFilterChip
@ -76,7 +76,7 @@ fun NiaCatalog() {
} }
item { Text("Buttons", Modifier.padding(top = 16.dp)) } item { Text("Buttons", Modifier.padding(top = 16.dp)) }
item { item {
Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { FlowRow(mainAxisSpacing = 16.dp) {
NiaFilledButton(onClick = {}) { NiaFilledButton(onClick = {}) {
Text(text = "Enabled") Text(text = "Enabled")
} }
@ -90,7 +90,7 @@ fun NiaCatalog() {
} }
item { Text("Disabled buttons", Modifier.padding(top = 16.dp)) } item { Text("Disabled buttons", Modifier.padding(top = 16.dp)) }
item { item {
Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { FlowRow(mainAxisSpacing = 16.dp) {
NiaFilledButton( NiaFilledButton(
onClick = {}, onClick = {},
enabled = false enabled = false
@ -113,7 +113,7 @@ fun NiaCatalog() {
} }
item { Text("Buttons with leading icons", Modifier.padding(top = 16.dp)) } item { Text("Buttons with leading icons", Modifier.padding(top = 16.dp)) }
item { item {
Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { FlowRow(mainAxisSpacing = 16.dp) {
NiaFilledButton( NiaFilledButton(
onClick = {}, onClick = {},
text = { Text(text = "Enabled") }, text = { Text(text = "Enabled") },
@ -139,7 +139,7 @@ fun NiaCatalog() {
} }
item { Text("Disabled buttons with leading icons", Modifier.padding(top = 16.dp)) } item { Text("Disabled buttons with leading icons", Modifier.padding(top = 16.dp)) }
item { item {
Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { FlowRow(mainAxisSpacing = 16.dp) {
NiaFilledButton( NiaFilledButton(
onClick = {}, onClick = {},
enabled = false, enabled = false,
@ -168,7 +168,7 @@ fun NiaCatalog() {
} }
item { Text("Buttons with trailing icons", Modifier.padding(top = 16.dp)) } item { Text("Buttons with trailing icons", Modifier.padding(top = 16.dp)) }
item { item {
Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { FlowRow(mainAxisSpacing = 16.dp) {
NiaFilledButton( NiaFilledButton(
onClick = {}, onClick = {},
text = { Text(text = "Enabled") }, text = { Text(text = "Enabled") },
@ -194,7 +194,7 @@ fun NiaCatalog() {
} }
item { Text("Disabled buttons with trailing icons", Modifier.padding(top = 16.dp)) } item { Text("Disabled buttons with trailing icons", Modifier.padding(top = 16.dp)) }
item { item {
Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { FlowRow(mainAxisSpacing = 16.dp) {
NiaFilledButton( NiaFilledButton(
onClick = {}, onClick = {},
enabled = false, enabled = false,
@ -223,7 +223,7 @@ fun NiaCatalog() {
} }
item { Text("Small buttons", Modifier.padding(top = 16.dp)) } item { Text("Small buttons", Modifier.padding(top = 16.dp)) }
item { item {
Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { FlowRow(mainAxisSpacing = 16.dp) {
NiaFilledButton( NiaFilledButton(
onClick = {}, onClick = {},
small = true small = true
@ -246,7 +246,7 @@ fun NiaCatalog() {
} }
item { Text("Disabled small buttons", Modifier.padding(top = 16.dp)) } item { Text("Disabled small buttons", Modifier.padding(top = 16.dp)) }
item { item {
Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { FlowRow(mainAxisSpacing = 16.dp) {
NiaFilledButton( NiaFilledButton(
onClick = {}, onClick = {},
enabled = false, enabled = false,
@ -272,7 +272,7 @@ fun NiaCatalog() {
} }
item { Text("Small buttons with leading icons", Modifier.padding(top = 16.dp)) } item { Text("Small buttons with leading icons", Modifier.padding(top = 16.dp)) }
item { item {
Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { FlowRow(mainAxisSpacing = 16.dp) {
NiaFilledButton( NiaFilledButton(
onClick = {}, onClick = {},
small = true, small = true,
@ -306,7 +306,7 @@ fun NiaCatalog() {
) )
} }
item { item {
Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { FlowRow(mainAxisSpacing = 16.dp) {
NiaFilledButton( NiaFilledButton(
onClick = {}, onClick = {},
enabled = false, enabled = false,
@ -338,7 +338,7 @@ fun NiaCatalog() {
} }
item { Text("Small buttons with trailing icons", Modifier.padding(top = 16.dp)) } item { Text("Small buttons with trailing icons", Modifier.padding(top = 16.dp)) }
item { item {
Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { FlowRow(mainAxisSpacing = 16.dp) {
NiaFilledButton( NiaFilledButton(
onClick = {}, onClick = {},
small = true, small = true,
@ -372,7 +372,7 @@ fun NiaCatalog() {
) )
} }
item { item {
Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { FlowRow(mainAxisSpacing = 16.dp) {
NiaFilledButton( NiaFilledButton(
onClick = {}, onClick = {},
enabled = false, enabled = false,
@ -413,7 +413,7 @@ fun NiaCatalog() {
} }
item { Text("Chips", Modifier.padding(top = 16.dp)) } item { Text("Chips", Modifier.padding(top = 16.dp)) }
item { item {
Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { FlowRow(mainAxisSpacing = 16.dp) {
var firstChecked by remember { mutableStateOf(false) } var firstChecked by remember { mutableStateOf(false) }
NiaFilterChip( NiaFilterChip(
checked = firstChecked, checked = firstChecked,
@ -437,7 +437,7 @@ fun NiaCatalog() {
} }
item { Text("Toggle buttons", Modifier.padding(top = 16.dp)) } item { Text("Toggle buttons", Modifier.padding(top = 16.dp)) }
item { item {
Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { FlowRow(mainAxisSpacing = 16.dp) {
var firstChecked by remember { mutableStateOf(false) } var firstChecked by remember { mutableStateOf(false) }
NiaToggleButton( NiaToggleButton(
checked = firstChecked, checked = firstChecked,
@ -498,7 +498,7 @@ fun NiaCatalog() {
} }
item { Text("View toggle", Modifier.padding(top = 16.dp)) } item { Text("View toggle", Modifier.padding(top = 16.dp)) }
item { item {
Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { FlowRow(mainAxisSpacing = 16.dp) {
var firstExpanded by remember { mutableStateOf(false) } var firstExpanded by remember { mutableStateOf(false) }
NiaViewToggleButton( NiaViewToggleButton(
expanded = firstExpanded, expanded = firstExpanded,
@ -517,7 +517,7 @@ fun NiaCatalog() {
} }
item { Text("Tags", Modifier.padding(top = 16.dp)) } item { Text("Tags", Modifier.padding(top = 16.dp)) }
item { item {
Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { FlowRow(mainAxisSpacing = 16.dp) {
var firstFollowed by remember { mutableStateOf(false) } var firstFollowed by remember { mutableStateOf(false) }
NiaTopicTag( NiaTopicTag(
followed = firstFollowed, followed = firstFollowed,

Write Preview
Loading…
Cancel
Save