A fully functional Android app built entirely with Kotlin and Jetpack Compose
Update to use NiaTopicTag, Row, and uppercase()
Caren Changd9863d7fa3ba
diff --git a/core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Tag.kt b/core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Tag.ktindex c2790c538..d45bdb226 100644--- a/core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Tag.kt+++ b/core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Tag.kt@@ -18,6 +18,7 @@ package com.google.samples.apps.nowinandroid.core.designsystem.componentimport androidx.compose.foundation.layout.Boximport androidx.compose.material3.MaterialTheme+import androidx.compose.material3.Textimport androidx.compose.material3.contentColorForimport androidx.compose.runtime.Composableimport androidx.compose.runtime.getValue@@ -26,6 +27,8 @@ import androidx.compose.runtime.rememberimport androidx.compose.runtime.setValueimport androidx.compose.ui.Modifierimport androidx.compose.ui.graphics.Color+import androidx.compose.ui.res.stringResource+import com.google.samples.apps.nowinandroid.core.designsystem.R@Composablefun NiaTopicTag(@@ -36,9 +39,9 @@ fun NiaTopicTag(modifier: Modifier = Modifier,enabled: Boolean = true,text: @Composable () -> Unit,- followText: @Composable () -> Unit,- unFollowText: @Composable () -> Unit,- browseText: @Composable () -> Unit+ followText: @Composable () -> Unit = { Text(stringResource(R.string.follow)) },+ unFollowText: @Composable () -> Unit = { Text(stringResource(R.string.unfollow)) },+ browseText: @Composable () -> Unit = { Text(stringResource(R.string.browse_topic)) }) {var expanded by remember { mutableStateOf(false) }Box(modifier = modifier) {diff --git a/core-designsystem/src/main/res/values/strings.xml b/core-designsystem/src/main/res/values/strings.xmlnew file mode 100644index 000000000..5d1158888--- /dev/null+++ b/core-designsystem/src/main/res/values/strings.xml@@ -0,0 +1,21 @@+<?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.+-->+<resources>+ <string name="follow">Follow</string>+ <string name="unfollow">Unfollow</string>+ <string name="browse_topic">Browse topic</string>+</resources>diff --git a/core-ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt b/core-ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.ktindex dcf9ecba2..82cd9537b 100644--- a/core-ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt+++ b/core-ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt@@ -17,6 +17,7 @@package com.google.samples.apps.nowinandroid.core.uiimport androidx.compose.foundation.background+import androidx.compose.foundation.horizontalScrollimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Boximport androidx.compose.foundation.layout.Column@@ -27,8 +28,7 @@ import androidx.compose.foundation.layout.heightimport androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.layout.sizeimport androidx.compose.foundation.layout.width-import androidx.compose.foundation.lazy.LazyRow-import androidx.compose.foundation.lazy.items+import androidx.compose.foundation.rememberScrollStateimport androidx.compose.foundation.shape.CircleShapeimport androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.material3.Card@@ -48,7 +48,6 @@ import androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifierimport androidx.compose.ui.draw.clipimport androidx.compose.ui.layout.ContentScale-import androidx.compose.ui.platform.LocalConfigurationimport androidx.compose.ui.platform.LocalContextimport androidx.compose.ui.platform.LocalInspectionModeimport androidx.compose.ui.res.painterResource@@ -57,10 +56,9 @@ import androidx.compose.ui.semantics.onClickimport androidx.compose.ui.semantics.semanticsimport androidx.compose.ui.tooling.preview.Previewimport androidx.compose.ui.unit.dp-import androidx.core.os.ConfigurationCompatimport coil.compose.AsyncImageimport com.google.samples.apps.nowinandroid.core.designsystem.component.NiaToggleButton-import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaTopicChip+import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaTopicTagimport com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIconsimport com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaThemeimport com.google.samples.apps.nowinandroid.core.model.data.Author@@ -69,6 +67,7 @@ import com.google.samples.apps.nowinandroid.core.model.data.Topicimport com.google.samples.apps.nowinandroid.core.model.data.previewNewsResourcesimport java.time.ZoneIdimport java.time.format.DateTimeFormatter+import java.util.Localeimport kotlinx.datetime.Instantimport kotlinx.datetime.toJavaInstant@@ -159,7 +158,7 @@ fun NewsResourceAuthors(// Only display first author for nowval author = authors[0]- val authorNameFormatted = uppercaseFormat(author.name)+ val authorNameFormatted = author.name.uppercase(Locale.getDefault())val authorImageUrl = author.imageUrl@@ -269,34 +268,22 @@ fun NewsResourceTopics(topics: List<Topic>,modifier: Modifier = Modifier) {- LazyRow(- modifier = modifier,- horizontalArrangement = Arrangement.spacedBy(4.dp)+ Row(+ modifier = modifier.horizontalScroll(rememberScrollState()), // causes narrow chips+ horizontalArrangement = Arrangement.spacedBy(4.dp),) {- items(items = topics, key = { item -> item.id }) { topic ->- NiaTopicChip(- enabled = true, // ToDo: Chip should be disabled if user is not following- onClick = { }, // ToDo: Handle topic chip interaction- ) {- Text(uppercaseFormat(topic.name))- }+ for (topic in topics) {+ NiaTopicTag(+ followed = true, // Todo+ onFollowClick = { }, // Todo+ onUnfollowClick = { }, // Todo+ onBrowseClick = { }, // Todo+ text = { Text(text = topic.name.uppercase(Locale.getDefault())) }+ )}}}-@Composable-private fun uppercaseFormat(string: String): String {- val locale = ConfigurationCompat.getLocales(LocalConfiguration.current).get(0)-- val uppercaseFormatted = if (locale != null) {- string.uppercase(locale)- } else {- string.uppercase()- }-- return uppercaseFormatted-}-@Preview("Bookmark Button")@Composablefun BookmarkButtonPreview() {