Skip to content

Commit 2f454de

Browse files
committed
Spacing polish based on design spec
1 parent 47bc4a7 commit 2f454de

File tree

5 files changed

+14
-12
lines changed
  • core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui
  • feature

5 files changed

+14
-12
lines changed

core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsFeed.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import android.net.Uri
2121
import androidx.annotation.ColorInt
2222
import androidx.browser.customtabs.CustomTabColorSchemeParams
2323
import androidx.browser.customtabs.CustomTabsIntent
24+
import androidx.compose.foundation.layout.padding
2425
import androidx.compose.foundation.lazy.LazyListScope
2526
import androidx.compose.foundation.lazy.grid.GridCells
2627
import androidx.compose.foundation.lazy.grid.LazyGridScope
@@ -31,6 +32,7 @@ import androidx.compose.runtime.Composable
3132
import androidx.compose.runtime.getValue
3233
import androidx.compose.runtime.mutableStateOf
3334
import androidx.compose.runtime.remember
35+
import androidx.compose.ui.Modifier
3436
import androidx.compose.ui.graphics.toArgb
3537
import androidx.compose.ui.platform.LocalContext
3638
import androidx.compose.ui.tooling.preview.Devices
@@ -67,7 +69,8 @@ fun LazyGridScope.newsFeed(
6769
saveableNewsResource.newsResource.id,
6870
!saveableNewsResource.isSaved
6971
)
70-
}
72+
},
73+
modifier = Modifier.padding(horizontal = 8.dp)
7174
)
7275
}
7376
}

feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ private fun EmptyState(modifier: Modifier = Modifier) {
149149
contentDescription = null
150150
)
151151

152-
Spacer(modifier = Modifier.height(16.dp))
152+
Spacer(modifier = Modifier.height(48.dp))
153153

154154
Text(
155155
text = stringResource(id = R.string.bookmarks_empty_error),

feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ import androidx.compose.foundation.layout.padding
3838
import androidx.compose.foundation.layout.safeDrawing
3939
import androidx.compose.foundation.layout.size
4040
import androidx.compose.foundation.layout.width
41+
import androidx.compose.foundation.layout.widthIn
4142
import androidx.compose.foundation.layout.windowInsetsBottomHeight
4243
import androidx.compose.foundation.lazy.LazyListScope
4344
import androidx.compose.foundation.lazy.grid.GridCells
@@ -243,14 +244,13 @@ private fun LazyGridScope.onboarding(
243244
text = stringResource(R.string.onboarding_guidance_subtitle),
244245
modifier = Modifier
245246
.fillMaxWidth()
246-
.padding(top = 8.dp, start = 16.dp, end = 16.dp),
247+
.padding(top = 8.dp, start = 24.dp, end = 24.dp),
247248
textAlign = TextAlign.Center,
248249
style = MaterialTheme.typography.bodyMedium
249250
)
250251
TopicSelection(
251252
onboardingUiState,
252253
onTopicCheckedChanged,
253-
Modifier.padding(bottom = 8.dp)
254254
)
255255
// Done button
256256
Row(
@@ -261,8 +261,9 @@ private fun LazyGridScope.onboarding(
261261
onClick = saveFollowedTopics,
262262
enabled = onboardingUiState.isDismissable,
263263
modifier = Modifier
264-
.padding(horizontal = 40.dp)
265-
.width(364.dp)
264+
.padding(horizontal = 24.dp)
265+
.widthIn(364.dp)
266+
.fillMaxWidth()
266267
) {
267268
Text(
268269
text = stringResource(R.string.done)
@@ -381,9 +382,7 @@ fun TopicIcon(
381382
model = imageUrl,
382383
contentDescription = null, // decorative
383384
colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.primary),
384-
modifier = modifier
385-
.padding(10.dp)
386-
.size(32.dp)
385+
modifier = modifier.size(32.dp)
387386
)
388387
}
389388

feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsItem.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ fun InterestsItem(
6666
.padding(vertical = itemSeparation)
6767
) {
6868
InterestsIcon(topicImageUrl, iconModifier.size(64.dp))
69-
Spacer(modifier = Modifier.width(16.dp))
69+
Spacer(modifier = Modifier.width(24.dp))
7070
InterestContent(name, description)
7171
}
7272
NiaIconToggleButton(

feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/TabContent.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ fun TopicsTabContent(
3838
) {
3939
LazyColumn(
4040
modifier = modifier
41-
.padding(horizontal = 16.dp)
41+
.padding(horizontal = 24.dp)
4242
.testTag("interests:topics"),
43-
contentPadding = PaddingValues(top = 8.dp)
43+
contentPadding = PaddingValues(vertical = 16.dp)
4444
) {
4545
topics.forEach { followableTopic ->
4646
val topicId = followableTopic.topic.id

0 commit comments

Comments
 (0)