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

Merge branch 'github/main'

Browse Source
pull/58/head
kbuilder 2 years ago
parent bd8a319cef f74103c804
commit 3a43928ef1
6 changed files with 79 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,

1
app-nia-catalog/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
Unescape View File

@ -17,4 +17,5 @@
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background"/> <background android:drawable="@drawable/ic_launcher_background"/>
<foreground android:drawable="@drawable/ic_launcher_foreground"/> <foreground android:drawable="@drawable/ic_launcher_foreground"/>
<monochrome android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon> </adaptive-icon>

25
app/src/main/res/drawable-v24/ic_launcher_background.xml
Unescape View File

@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2022 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path
android:pathData="M0,0h108v108h-108z"
android:fillColor="#FFFFFF"/>
</vector>

34
app/src/main/res/drawable-v24/ic_launcher_foreground.xml
Unescape View File

@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2022 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path
android:pathData="M108,0L108,108L0,108L0,0L108,0ZM68.25,64.93L64.32,71.73C61.31,70.36 57.94,69.59 54.33,69.59C50.73,69.59 47.35,70.36 44.34,71.73L40.41,64.93C40.19,64.54 39.69,64.41 39.31,64.63C38.92,64.85 38.79,65.35 39.01,65.73L42.89,72.44C36.22,76.07 31.67,82.81 31,90.77L77.67,90.77C77,82.8 72.44,76.06 65.77,72.44L69.66,65.73C69.88,65.35 69.74,64.85 69.36,64.63C68.97,64.41 68.48,64.54 68.25,64.93ZM62.39,46.2L60.69,46.2C59.98,46.2 59.4,46.74 59.34,47.43L59.33,47.56L59.33,51.64L58.15,51.64C57.72,51.64 57.36,51.96 57.31,52.38L57.3,52.48L57.3,53.5C57.3,53.93 57.62,54.29 58.04,54.34L58.15,54.35L61.54,54.35L61.65,54.34C62.03,54.3 62.34,53.99 62.38,53.61L62.39,53.5L62.39,46.2ZM47.42,46.2L45.72,46.2L45.72,53.5C45.72,53.93 46.04,54.29 46.46,54.34L46.57,54.35L49.97,54.35C50.43,54.35 50.81,53.97 50.81,53.5L50.81,52.48C50.81,52.02 50.43,51.64 49.97,51.64L48.78,51.64L48.78,47.56C48.78,46.81 48.17,46.2 47.42,46.2ZM45.72,43.15L44.19,43.15C43.35,43.15 42.67,43.83 42.67,44.68C42.67,45.52 43.35,46.2 44.19,46.2L45.72,46.2L45.72,43.15ZM63.92,43.15L62.39,43.15L62.39,46.2L63.92,46.2C64.76,46.2 65.44,45.52 65.44,44.68C65.44,43.83 64.76,43.15 63.92,43.15ZM49.97,35L46.57,35C46.1,35 45.72,35.38 45.72,35.85L45.72,43.15L47.42,43.15C48.17,43.15 48.78,42.54 48.78,41.79L48.78,37.72L49.97,37.72C50.43,37.72 50.81,37.34 50.81,36.87L50.81,35.85C50.81,35.38 50.43,35 49.97,35ZM61.54,35L58.15,35C57.72,35 57.36,35.32 57.31,35.74L57.3,35.85L57.3,36.87C57.3,37.3 57.62,37.66 58.04,37.71L58.15,37.72L59.33,37.72L59.33,41.79C59.33,42.5 59.87,43.08 60.56,43.14L60.69,43.15L62.39,43.15L62.39,35.85C62.39,35.38 62.01,35 61.54,35Z"
android:fillColor="#000000"
android:fillType="nonZero"/>
<path
android:pathData="M65.08,84.13C64.01,84.13 63.13,83.26 63.13,82.18C63.13,81.11 64,80.24 65.08,80.24C66.15,80.24 67.02,81.11 67.02,82.18C67.02,83.26 66.15,84.13 65.08,84.13Z"
android:fillColor="#000000"
android:fillType="nonZero"/>
<path
android:pathData="M43.6,84.13C42.53,84.13 41.65,83.26 41.65,82.18C41.65,81.11 42.52,80.24 43.6,80.24C44.66,80.24 45.54,81.11 45.54,82.18C45.54,83.26 44.67,84.13 43.6,84.13Z"
android:fillColor="#000000"
android:fillType="nonZero"/>
</vector>

1
app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
Unescape View File

@ -17,4 +17,5 @@
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background"/> <background android:drawable="@drawable/ic_launcher_background"/>
<foreground android:drawable="@drawable/ic_launcher_foreground"/> <foreground android:drawable="@drawable/ic_launcher_foreground"/>
<monochrome android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon> </adaptive-icon>
Write Preview
Loading…
Cancel
Save