Skip to content

A fully functional Android app built entirely with Kotlin and Jetpack Compose

Spacing polish based on design spec

Chris Sinco2f454de21ce0
diff --git a/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsFeed.kt b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsFeed.kt
index fbc9c0b81..e5b35d64b 100644
--- a/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsFeed.kt
+++ b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsFeed.kt
@@ -21,6 +21,7 @@ import android.net.Uri
import androidx.annotation.ColorInt
import androidx.browser.customtabs.CustomTabColorSchemeParams
import androidx.browser.customtabs.CustomTabsIntent
+import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyListScope
import androidx.compose.foundation.lazy.grid.GridCells
import androidx.compose.foundation.lazy.grid.LazyGridScope
@@ -31,6 +32,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.toArgb
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.tooling.preview.Devices
@@ -67,7 +69,8 @@ fun LazyGridScope.newsFeed(
saveableNewsResource.newsResource.id,
!saveableNewsResource.isSaved
)
- }
+ },
+ modifier = Modifier.padding(horizontal = 8.dp)
)
}
}
diff --git a/feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.kt b/feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.kt
index 513c8fbd0..e4a0b8f41 100644
--- a/feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.kt
+++ b/feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.kt
@@ -149,7 +149,7 @@ private fun EmptyState(modifier: Modifier = Modifier) {
contentDescription = null
)
- Spacer(modifier = Modifier.height(16.dp))
+ Spacer(modifier = Modifier.height(48.dp))
Text(
text = stringResource(id = R.string.bookmarks_empty_error),
diff --git a/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt b/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt
index 1427aecff..dd42398a1 100644
--- a/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt
+++ b/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt
@@ -38,6 +38,7 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.safeDrawing
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.widthIn
import androidx.compose.foundation.layout.windowInsetsBottomHeight
import androidx.compose.foundation.lazy.LazyListScope
import androidx.compose.foundation.lazy.grid.GridCells
@@ -243,14 +244,13 @@ private fun LazyGridScope.onboarding(
text = stringResource(R.string.onboarding_guidance_subtitle),
modifier = Modifier
.fillMaxWidth()
- .padding(top = 8.dp, start = 16.dp, end = 16.dp),
+ .padding(top = 8.dp, start = 24.dp, end = 24.dp),
textAlign = TextAlign.Center,
style = MaterialTheme.typography.bodyMedium
)
TopicSelection(
onboardingUiState,
onTopicCheckedChanged,
- Modifier.padding(bottom = 8.dp)
)
// Done button
Row(
@@ -261,8 +261,9 @@ private fun LazyGridScope.onboarding(
onClick = saveFollowedTopics,
enabled = onboardingUiState.isDismissable,
modifier = Modifier
- .padding(horizontal = 40.dp)
- .width(364.dp)
+ .padding(horizontal = 24.dp)
+ .widthIn(364.dp)
+ .fillMaxWidth()
) {
Text(
text = stringResource(R.string.done)
@@ -381,9 +382,7 @@ fun TopicIcon(
model = imageUrl,
contentDescription = null, // decorative
colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.primary),
- modifier = modifier
- .padding(10.dp)
- .size(32.dp)
+ modifier = modifier.size(32.dp)
)
}
diff --git a/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsItem.kt b/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsItem.kt
index de04f59f1..b584fa4f6 100644
--- a/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsItem.kt
+++ b/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsItem.kt
@@ -66,7 +66,7 @@ fun InterestsItem(
.padding(vertical = itemSeparation)
) {
InterestsIcon(topicImageUrl, iconModifier.size(64.dp))
- Spacer(modifier = Modifier.width(16.dp))
+ Spacer(modifier = Modifier.width(24.dp))
InterestContent(name, description)
}
NiaIconToggleButton(
diff --git a/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/TabContent.kt b/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/TabContent.kt
index 0cff8c82c..71b58cdb6 100644
--- a/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/TabContent.kt
+++ b/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/TabContent.kt
@@ -38,9 +38,9 @@ fun TopicsTabContent(
) {
LazyColumn(
modifier = modifier
- .padding(horizontal = 16.dp)
+ .padding(horizontal = 24.dp)
.testTag("interests:topics"),
- contentPadding = PaddingValues(top = 8.dp)
+ contentPadding = PaddingValues(vertical = 16.dp)
) {
topics.forEach { followableTopic ->
val topicId = followableTopic.topic.id