Skip to content

Commit eacac32

Browse files
committed
[AdaptiveUiCodelab] formatting and misc fixes
1 parent 938fb1c commit eacac32

File tree

4 files changed

+28
-18
lines changed

4 files changed

+28
-18
lines changed

AdaptiveUiCodelab/app/src/main/java/com/example/reply/ui/MainActivity.kt

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ class MainActivity : ComponentActivity() {
5151
fun ReplyAppPreview() {
5252
ReplyTheme {
5353
ReplyApp(
54-
replyHomeUIState = ReplyHomeUIState(emails = LocalEmailsDataProvider.allEmails),
54+
replyHomeUIState = ReplyHomeUIState(
55+
emails = LocalEmailsDataProvider.allEmails
56+
),
5557
onEmailClick = {}
5658
)
5759
}
@@ -62,7 +64,9 @@ fun ReplyAppPreview() {
6264
fun ReplyAppPreviewTablet() {
6365
ReplyTheme {
6466
ReplyApp(
65-
replyHomeUIState = ReplyHomeUIState(emails = LocalEmailsDataProvider.allEmails),
67+
replyHomeUIState = ReplyHomeUIState(
68+
emails = LocalEmailsDataProvider.allEmails
69+
),
6670
onEmailClick = {}
6771
)
6872
}
@@ -73,7 +77,9 @@ fun ReplyAppPreviewTablet() {
7377
fun ReplyAppPreviewDesktop() {
7478
ReplyTheme {
7579
ReplyApp(
76-
replyHomeUIState = ReplyHomeUIState(emails = LocalEmailsDataProvider.allEmails),
80+
replyHomeUIState = ReplyHomeUIState(
81+
emails = LocalEmailsDataProvider.allEmails
82+
),
7783
onEmailClick = {}
7884
)
7985
}

AdaptiveUiCodelab/app/src/main/java/com/example/reply/ui/ReplyHomeViewModel.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ import kotlinx.coroutines.flow.StateFlow
2626
import kotlinx.coroutines.flow.catch
2727
import kotlinx.coroutines.launch
2828

29-
class ReplyHomeViewModel(private val emailsRepository: EmailsRepository = EmailsRepositoryImpl()): ViewModel() {
29+
class ReplyHomeViewModel(
30+
private val emailsRepository: EmailsRepository = EmailsRepositoryImpl()
31+
): ViewModel() {
3032

3133
// UI state exposed to the UI
3234
private val _uiState = MutableStateFlow(ReplyHomeUIState(loading = true))

AdaptiveUiCodelab/app/src/main/java/com/example/reply/ui/ReplyListContent.kt

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import androidx.compose.material3.Button
3535
import androidx.compose.material3.ButtonDefaults
3636
import androidx.compose.material3.Card
3737
import androidx.compose.material3.CardDefaults
38-
import androidx.compose.material3.ExperimentalMaterial3Api
3938
import androidx.compose.material3.Icon
4039
import androidx.compose.material3.IconButton
4140
import androidx.compose.material3.MaterialTheme
@@ -79,13 +78,12 @@ fun ReplyDetailPane(
7978
item {
8079
ReplyEmailThreadItem(email)
8180
}
82-
items(email.replies) {
83-
ReplyEmailThreadItem(it)
81+
items(email.replies) { reply ->
82+
ReplyEmailThreadItem(reply)
8483
}
8584
}
8685
}
8786

88-
@OptIn(ExperimentalMaterial3Api::class)
8987
@Composable
9088
fun ReplyEmailListItem(
9189
email: Email,
@@ -156,7 +154,6 @@ fun ReplyEmailListItem(
156154
}
157155
}
158156

159-
@OptIn(ExperimentalMaterial3Api::class)
160157
@Composable
161158
fun ReplyEmailThreadItem(
162159
email: Email,
@@ -255,21 +252,24 @@ fun ReplyEmailThreadItem(
255252
fun ReplyProfileImage(
256253
drawableResource: Int,
257254
description: String,
258-
modifier: Modifier = Modifier.size(40.dp),
255+
modifier: Modifier = Modifier,
259256
) {
260257
Image(
261-
modifier = modifier.clip(CircleShape),
258+
modifier = modifier
259+
.size(40.dp)
260+
.clip(CircleShape),
262261
painter = painterResource(id = drawableResource),
263262
contentDescription = description,
264263
)
265264
}
266265

267266
@Composable
268267
fun ReplySearchBar(modifier: Modifier = Modifier) {
269-
Row(modifier = modifier
270-
.fillMaxWidth()
271-
.padding(16.dp)
272-
.background(MaterialTheme.colorScheme.surface, CircleShape),
268+
Row(
269+
modifier = modifier
270+
.fillMaxWidth()
271+
.padding(16.dp)
272+
.background(MaterialTheme.colorScheme.surface, CircleShape),
273273
verticalAlignment = Alignment.CenterVertically
274274
) {
275275
Icon(
@@ -278,7 +278,8 @@ fun ReplySearchBar(modifier: Modifier = Modifier) {
278278
modifier = Modifier.padding(start = 16.dp),
279279
tint = MaterialTheme.colorScheme.outline
280280
)
281-
Text(text = stringResource(id = R.string.search_replies),
281+
Text(
282+
text = stringResource(id = R.string.search_replies),
282283
modifier = Modifier
283284
.weight(1f)
284285
.padding(16.dp),

AdaptiveUiCodelab/app/src/main/java/com/example/reply/ui/ReplyNavigation.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,18 @@ package com.example.reply.ui
1919
import androidx.annotation.StringRes
2020
import androidx.compose.material.icons.Icons
2121
import androidx.compose.material.icons.filled.Article
22-
import androidx.compose.material.icons.filled.Menu
22+
import androidx.compose.material.icons.filled.Inbox
2323
import androidx.compose.material.icons.outlined.Chat
2424
import androidx.compose.material.icons.outlined.People
2525
import androidx.compose.ui.graphics.vector.ImageVector
2626
import com.example.reply.R
2727

28+
/** Navigation destinations in the app. */
2829
enum class ReplyDestination(
2930
@StringRes val labelRes: Int,
3031
val icon: ImageVector,
3132
) {
32-
Inbox(R.string.tab_inbox, Icons.Default.Menu),
33+
Inbox(R.string.tab_inbox, Icons.Default.Inbox),
3334

3435
Articles(R.string.tab_article, Icons.Default.Article),
3536

0 commit comments

Comments
 (0)