Skip to content

Commit 29bc987

Browse files
ashnoheashnohe
committed
run spotless agaain
1 parent 5e52729 commit 29bc987

11 files changed

Lines changed: 68 additions & 79 deletions

‎Jetsnack/app/src/main/java/com/example/jetsnack/ui/home/Home.kt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ fun NavGraphBuilder.composableWithCompositionLocal(
128128
}
129129
}
130130

131-
132131
fun NavGraphBuilder.addHomeGraph(onSnackSelected: (Long, String, NavBackStackEntry) -> Unit, modifier: Modifier = Modifier) {
133132
composable(HomeSections.FEED.route) { from ->
134133
Feed(
@@ -145,8 +144,8 @@ fun NavGraphBuilder.addHomeGraph(onSnackSelected: (Long, String, NavBackStackEnt
145144
composable(
146145
HomeSections.CART.route,
147146
deepLinks = listOf(
148-
navDeepLink { uriPattern = "https://jetsnack.example.com/home/cart" }
149-
)
147+
navDeepLink { uriPattern = "https://jetsnack.example.com/home/cart" },
148+
),
150149
) { from ->
151150
Cart(
152151
onSnackClick = { id, origin -> onSnackSelected(id, origin, from) },

‎Jetsnack/app/src/main/java/com/example/jetsnack/widget/ActionDemonstrationActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class ActionDemonstrationActivity : ComponentActivity() {
3838
setContent {
3939
Box(
4040
modifier = Modifier.fillMaxSize(),
41-
contentAlignment = Alignment.Center
41+
contentAlignment = Alignment.Center,
4242
) {
4343
val source = intent.getStringExtra(ActionSourceMessageKey.name) ?: "Unknown"
4444
Text("Launched from $source")

‎Jetsnack/app/src/main/java/com/example/jetsnack/widget/RecentOrdersWidget.kt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ class RecentOrdersWidget : GlanceAppWidget() {
5353
override val previewSizeMode = SizeMode.Responsive(
5454
setOf(
5555
DpSize(256.dp, 115.dp), // 4x2 cell min size
56-
DpSize(260.dp, 180.dp) // Medium width layout, height with header
57-
)
56+
DpSize(260.dp, 180.dp), // Medium width layout, height with header
57+
),
5858
)
5959

6060
override suspend fun provideGlance(context: Context, id: GlanceId) {
@@ -73,13 +73,13 @@ class RecentOrdersWidget : GlanceAppWidget() {
7373
items = items,
7474
shoppingCartActionIntent = Intent(
7575
context.applicationContext,
76-
MainActivity::class.java
76+
MainActivity::class.java,
7777
)
7878
.setAction(Intent.ACTION_VIEW)
7979
.setFlags(
80-
Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK
80+
Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_NEW_TASK,
8181
)
82-
.setData("https://jetsnack.example.com/home/cart".toUri())
82+
.setData("https://jetsnack.example.com/home/cart".toUri()),
8383
)
8484
}
8585
}
@@ -96,10 +96,10 @@ class RecentOrdersWidget : GlanceAppWidget() {
9696
titleIconRes = R.drawable.widget_logo,
9797
titleBarActionIconRes = R.drawable.shopping_cart,
9898
titleBarActionIconContentDescription = context.getString(
99-
R.string.shopping_cart_button_label
99+
R.string.shopping_cart_button_label,
100100
),
101101
titleBarAction = actionStartActivity(shoppingCartActionIntent),
102-
shoppingCartActionIntent = shoppingCartActionIntent
102+
shoppingCartActionIntent = shoppingCartActionIntent,
103103
)
104104
}
105105

@@ -111,7 +111,7 @@ class RecentOrdersWidget : GlanceAppWidget() {
111111
GlanceTheme {
112112
WidgetContent(
113113
items = items,
114-
shoppingCartActionIntent = Intent()
114+
shoppingCartActionIntent = Intent(),
115115
)
116116
}
117117
}

‎Jetsnack/app/src/main/java/com/example/jetsnack/widget/data/RecentOrdersDataRepository.kt‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,7 @@ class RecentOrdersDataRepository {
5252
return data.value
5353
}
5454

55-
private fun processImagesAndBuildData(
56-
items: List<DemoDataItem>,
57-
context: Context,
58-
): List<ImageTextListItemData> {
55+
private fun processImagesAndBuildData(items: List<DemoDataItem>, context: Context): List<ImageTextListItemData> {
5956
val mappedItems =
6057
items.map { item ->
6158
return@map ImageTextListItemData(
@@ -66,7 +63,7 @@ class RecentOrdersDataRepository {
6663
trailingIconButton = R.drawable.add_shopping_cart,
6764
trailingIconButtonContentDescription =
6865
getString(context, R.string.add_to_cart_content_description),
69-
snackKeys = item.snackKeys
66+
snackKeys = item.snackKeys,
7067
)
7168
}
7269

@@ -93,35 +90,34 @@ class RecentOrdersDataRepository {
9390
private val demoItems = listOf(
9491
DemoDataItem(
9592
key = "1",
96-
snackKeys = listOf(0, 20)
93+
snackKeys = listOf(0, 20),
9794
),
9895
DemoDataItem(
9996
key = "2",
100-
snackKeys = listOf(1, 21)
97+
snackKeys = listOf(1, 21),
10198
),
10299
DemoDataItem(
103100
key = "3",
104-
snackKeys = listOf(2, 22)
101+
snackKeys = listOf(2, 22),
105102
),
106103
DemoDataItem(
107104
key = "4",
108-
snackKeys = listOf(3, 23)
105+
snackKeys = listOf(3, 23),
109106
),
110107
DemoDataItem(
111108
key = "5",
112-
snackKeys = listOf(4, 24)
113-
)
109+
snackKeys = listOf(4, 24),
110+
),
114111
)
115112

116113
private val repositories = mutableMapOf<GlanceId, RecentOrdersDataRepository>()
117114

118115
/**
119116
* Returns the repository instance for the given widget represented by [glanceId].
120117
*/
121-
fun getImageTextListDataRepo(glanceId: GlanceId): RecentOrdersDataRepository =
122-
synchronized(repositories) {
123-
repositories.getOrPut(glanceId) { RecentOrdersDataRepository() }
124-
}
118+
fun getImageTextListDataRepo(glanceId: GlanceId): RecentOrdersDataRepository = synchronized(repositories) {
119+
repositories.getOrPut(glanceId) { RecentOrdersDataRepository() }
120+
}
125121

126122
/**
127123
* Cleans up local data associated with the provided [glanceId].

‎Jetsnack/app/src/main/java/com/example/jetsnack/widget/layout/EmptyListContent.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ internal fun EmptyListContent() {
3434
noDataIconRes = R.drawable.cupcake,
3535
actionButtonText = context.getString(R.string.sample_add_button_text),
3636
actionButtonIcon = R.drawable.cupcake,
37-
actionButtonOnClick = ActionUtils.actionStartDemoActivity("on-click of add item button")
37+
actionButtonOnClick = ActionUtils.actionStartDemoActivity("on-click of add item button"),
3838
)
3939
}

‎Jetsnack/app/src/main/java/com/example/jetsnack/widget/layout/ImageTextListLayout.kt‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,9 @@ fun ImageTextListLayout(
121121
contentDescription = titleBarActionIconContentDescription,
122122
contentColor = GlanceTheme.colors.secondary,
123123
backgroundColor = null, // transparent
124-
onClick = titleBarAction
124+
onClick = titleBarAction,
125125
)
126-
}
126+
},
127127
)
128128
}
129129

@@ -137,13 +137,13 @@ fun ImageTextListLayout(
137137
backgroundColor = GlanceTheme.colors.widgetBackground,
138138
modifier = GlanceModifier.padding(
139139
top = scaffoldTopPadding,
140-
bottom = widgetPadding
140+
bottom = widgetPadding,
141141
),
142142
titleBar = if (showTitleBar()) {
143143
titleBar()
144144
} else {
145145
null
146-
}
146+
},
147147
) {
148148
Content(items, shoppingCartActionIntent)
149149
}
@@ -162,7 +162,7 @@ private fun Content(items: List<ImageTextListItemData>, shoppingCartActionIntent
162162
items = items,
163163
displayImage = false,
164164
displayTrailingIconIfPresent = displayTrailingIconIfPresent,
165-
shoppingCartActionIntent = shoppingCartActionIntent
165+
shoppingCartActionIntent = shoppingCartActionIntent,
166166
)
167167
}
168168

@@ -171,7 +171,7 @@ private fun Content(items: List<ImageTextListItemData>, shoppingCartActionIntent
171171
items = items,
172172
displayImage = true,
173173
displayTrailingIconIfPresent = displayTrailingIconIfPresent,
174-
shoppingCartActionIntent = shoppingCartActionIntent
174+
shoppingCartActionIntent = shoppingCartActionIntent,
175175
)
176176
}
177177

@@ -180,7 +180,7 @@ private fun Content(items: List<ImageTextListItemData>, shoppingCartActionIntent
180180
items = items,
181181
displayImage = true,
182182
displayTrailingIconIfPresent = displayTrailingIconIfPresent,
183-
shoppingCartActionIntent = shoppingCartActionIntent
183+
shoppingCartActionIntent = shoppingCartActionIntent,
184184
)
185185
}
186186
}
@@ -208,9 +208,9 @@ private fun ListView(
208208
displayImage = displayImage,
209209
displayTrailingIcon = displayTrailingIconIfPresent,
210210
modifier = GlanceModifier.fillMaxSize(),
211-
shoppingCartActionIntent = shoppingCartActionIntent
211+
shoppingCartActionIntent = shoppingCartActionIntent,
212212
)
213-
}
213+
},
214214
)
215215
}
216216

@@ -236,10 +236,10 @@ private fun GridView(
236236
displayImage = displayImage,
237237
displayTrailingIcon = displayTrailingIconIfPresent,
238238
modifier = GlanceModifier.fillMaxSize(),
239-
shoppingCartActionIntent = shoppingCartActionIntent
239+
shoppingCartActionIntent = shoppingCartActionIntent,
240240
)
241241
},
242-
modifier = GlanceModifier.fillMaxSize()
242+
modifier = GlanceModifier.fillMaxSize(),
243243
)
244244
}
245245

@@ -260,7 +260,7 @@ private fun FilledHorizontalListItem(
260260
Text(
261261
text = item.title,
262262
maxLines = 2,
263-
style = TextStyles.titleText
263+
style = TextStyles.titleText,
264264
)
265265
}
266266

@@ -269,7 +269,7 @@ private fun FilledHorizontalListItem(
269269
Text(
270270
text = item.supportingText,
271271
maxLines = 2,
272-
style = TextStyles.supportingText
272+
style = TextStyles.supportingText,
273273
)
274274
}
275275

@@ -284,7 +284,7 @@ private fun FilledHorizontalListItem(
284284
// Depending on your image content, you may want to select an appropriate ContentScale.
285285
contentScale = ContentScale.Crop,
286286
// Fixed size per UX spec
287-
modifier = modifier.cornerRadius(imageCornerRadius).size(Dimensions.imageSize)
287+
modifier = modifier.cornerRadius(imageCornerRadius).size(Dimensions.imageSize),
288288
)
289289
}
290290
}
@@ -300,9 +300,9 @@ private fun FilledHorizontalListItem(
300300
onClick = actionStartActivity(
301301
intent,
302302
actionParametersOf(
303-
CART_ITEMS_KEY to item.snackKeys.joinToString(separator = " ")
304-
)
305-
)
303+
CART_ITEMS_KEY to item.snackKeys.joinToString(separator = " "),
304+
),
305+
),
306306
)
307307
}
308308
}
@@ -323,7 +323,7 @@ private fun FilledHorizontalListItem(
323323
{ IconButton() }
324324
} else {
325325
null
326-
}
326+
},
327327
)
328328
}
329329

@@ -414,7 +414,7 @@ private object TextStyles {
414414
} else {
415415
16.sp // M3 Title Medium
416416
},
417-
color = GlanceTheme.colors.onSurface
417+
color = GlanceTheme.colors.onSurface,
418418
)
419419

420420
/**
@@ -425,7 +425,7 @@ private object TextStyles {
425425
TextStyle(
426426
fontWeight = FontWeight.Normal,
427427
fontSize = 12.sp, // M3 Label Medium
428-
color = GlanceTheme.colors.secondary
428+
color = GlanceTheme.colors.secondary,
429429
)
430430
}
431431

@@ -484,41 +484,41 @@ private fun ImageTextListLayoutPreview() {
484484
titleIconRes = R.drawable.widget_logo,
485485
titleBarActionIconRes = R.drawable.add_shopping_cart,
486486
titleBarActionIconContentDescription = context.getString(
487-
R.string.shopping_cart_button_label
487+
R.string.shopping_cart_button_label,
488488
),
489489
titleBarAction = actionStartDemoActivity("Title bar action click"),
490490
items = listOf(
491491
ImageTextListItemData(
492492
key = "1",
493493
snackKeys = listOf(0, 20),
494494
supportingText = "Some text",
495-
title = "Some title"
495+
title = "Some title",
496496
),
497497
ImageTextListItemData(
498498
key = "1",
499499
snackKeys = listOf(1, 21),
500500
supportingText = "Some text",
501-
title = "Some title"
501+
title = "Some title",
502502
),
503503
ImageTextListItemData(
504504
key = "1",
505505
snackKeys = listOf(2, 22),
506506
supportingText = "Some text",
507-
title = "Some title"
507+
title = "Some title",
508508
),
509509
ImageTextListItemData(
510510
key = "1",
511511
snackKeys = listOf(3, 23),
512512
supportingText = "Some text",
513-
title = "Some title"
513+
title = "Some title",
514514
),
515515
ImageTextListItemData(
516516
key = "1",
517517
snackKeys = listOf(4, 24),
518518
supportingText = "Some text",
519-
title = "Some title"
520-
)
519+
title = "Some title",
520+
),
521521
),
522-
shoppingCartActionIntent = Intent()
522+
shoppingCartActionIntent = Intent(),
523523
)
524524
}

‎Jetsnack/app/src/main/java/com/example/jetsnack/widget/layout/ListItem.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ fun ListItem(
6969

7070
Row(
7171
modifier = listItemModifier.maybeClickable(onClick),
72-
verticalAlignment = Alignment.CenterVertically
72+
verticalAlignment = Alignment.CenterVertically,
7373
) {
7474
// Leading
7575
leadingContent?.let {
@@ -79,7 +79,7 @@ fun ListItem(
7979
// Center
8080
Column(
8181
modifier = GlanceModifier.defaultWeight(),
82-
verticalAlignment = Alignment.CenterVertically
82+
verticalAlignment = Alignment.CenterVertically,
8383
) {
8484
headlineContent()
8585
supportingContent?.let { it() }

0 commit comments

Comments
 (0)