Skip to content

Commit 79d11ef

Browse files
Update ItemEditViewModel.kt
Feedback Update ItemDetailsScreen.kt
1 parent e4230ca commit 79d11ef

File tree

3 files changed

+38
-40
lines changed

3 files changed

+38
-40
lines changed

app/src/main/java/com/example/inventory/ui/home/HomeScreen.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ fun HomeScreen(
9595
HomeBody(
9696
itemList = listOf(),
9797
onItemClick = navigateToItemUpdate,
98-
modifier = modifier
98+
modifier = Modifier
9999
.padding(innerPadding)
100100
.fillMaxSize()
101101
)
@@ -145,7 +145,8 @@ private fun InventoryItem(
145145
item: Item, modifier: Modifier = Modifier
146146
) {
147147
Card(
148-
modifier = modifier, elevation = CardDefaults.cardElevation(defaultElevation = 2.dp)
148+
modifier = modifier,
149+
elevation = CardDefaults.cardElevation(defaultElevation = 2.dp)
149150
) {
150151
Column(
151152
modifier = Modifier.padding(dimensionResource(id = R.dimen.padding_large)),

app/src/main/java/com/example/inventory/ui/item/ItemDetailsScreen.kt

Lines changed: 32 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -67,25 +67,26 @@ fun ItemDetailsScreen(
6767
navigateBack: () -> Unit,
6868
modifier: Modifier = Modifier
6969
) {
70-
Scaffold(topBar = {
71-
InventoryTopAppBar(
72-
title = stringResource(ItemDetailsDestination.titleRes),
73-
canNavigateBack = true,
74-
navigateUp = navigateBack
75-
)
76-
}, floatingActionButton = {
77-
FloatingActionButton(
78-
onClick = { navigateToEditItem(0) },
79-
shape = MaterialTheme.shapes.medium,
80-
modifier = Modifier.padding(dimensionResource(id = R.dimen.padding_large))
81-
82-
) {
83-
Icon(
84-
imageVector = Icons.Default.Edit,
85-
contentDescription = stringResource(R.string.edit_item_title),
70+
Scaffold(
71+
topBar = {
72+
InventoryTopAppBar(
73+
title = stringResource(ItemDetailsDestination.titleRes),
74+
canNavigateBack = true,
75+
navigateUp = navigateBack
8676
)
87-
}
88-
}, modifier = modifier
77+
}, floatingActionButton = {
78+
FloatingActionButton(
79+
onClick = { navigateToEditItem(0) },
80+
shape = MaterialTheme.shapes.medium,
81+
modifier = Modifier.padding(dimensionResource(id = R.dimen.padding_large))
82+
83+
) {
84+
Icon(
85+
imageVector = Icons.Default.Edit,
86+
contentDescription = stringResource(R.string.edit_item_title),
87+
)
88+
}
89+
}, modifier = modifier
8990
) { innerPadding ->
9091
ItemDetailsBody(
9192
itemDetailsUiState = ItemDetailsUiState(),
@@ -112,7 +113,8 @@ private fun ItemDetailsBody(
112113
var deleteConfirmationRequired by rememberSaveable { mutableStateOf(false) }
113114

114115
ItemDetails(
115-
item = itemDetailsUiState.itemDetails.toItem(), modifier = Modifier.fillMaxWidth()
116+
item = itemDetailsUiState.itemDetails.toItem(),
117+
modifier = Modifier.fillMaxWidth()
116118
)
117119
Button(
118120
onClick = onSellItem,
@@ -147,7 +149,8 @@ fun ItemDetails(
147149
item: Item, modifier: Modifier = Modifier
148150
) {
149151
Card(
150-
modifier = modifier, colors = CardDefaults.cardColors(
152+
modifier = modifier,
153+
colors = CardDefaults.cardColors(
151154
containerColor = MaterialTheme.colorScheme.primaryContainer,
152155
contentColor = MaterialTheme.colorScheme.onPrimaryContainer
153156
)
@@ -156,40 +159,32 @@ fun ItemDetails(
156159
modifier = Modifier
157160
.fillMaxWidth()
158161
.padding(dimensionResource(id = R.dimen.padding_medium)),
159-
verticalArrangement = Arrangement.spacedBy(dimensionResource(id = R.dimen.padding_medium))
162+
verticalArrangement = Arrangement.spacedBy(
163+
dimensionResource(id = R.dimen.padding_medium)
164+
)
160165
) {
161166
ItemDetailsRow(
162167
labelResID = R.string.item,
163168
itemDetail = item.name,
164169
modifier = Modifier.padding(
165-
horizontal = dimensionResource(
166-
id = R.dimen
167-
.padding_medium
168-
)
170+
horizontal = dimensionResource(id = R.dimen.padding_medium)
169171
)
170172
)
171173
ItemDetailsRow(
172174
labelResID = R.string.quantity_in_stock,
173175
itemDetail = item.quantity.toString(),
174176
modifier = Modifier.padding(
175-
horizontal = dimensionResource(
176-
id = R.dimen
177-
.padding_medium
178-
)
177+
horizontal = dimensionResource(id = R.dimen.padding_medium)
179178
)
180179
)
181180
ItemDetailsRow(
182181
labelResID = R.string.price,
183182
itemDetail = item.formatedPrice(),
184183
modifier = Modifier.padding(
185-
horizontal = dimensionResource(
186-
id = R.dimen
187-
.padding_medium
188-
)
184+
horizontal = dimensionResource(id = R.dimen.padding_medium)
189185
)
190186
)
191187
}
192-
193188
}
194189
}
195190

@@ -206,7 +201,9 @@ private fun ItemDetailsRow(
206201

207202
@Composable
208203
private fun DeleteConfirmationDialog(
209-
onDeleteConfirm: () -> Unit, onDeleteCancel: () -> Unit, modifier: Modifier = Modifier
204+
onDeleteConfirm: () -> Unit,
205+
onDeleteCancel: () -> Unit,
206+
modifier: Modifier = Modifier
210207
) {
211208
AlertDialog(onDismissRequest = { /* Do nothing */ },
212209
title = { Text(stringResource(R.string.attention)) },

app/src/main/java/com/example/inventory/ui/item/ItemEntryScreen.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ fun ItemEntryBody(
8585
modifier: Modifier = Modifier
8686
) {
8787
Column(
88-
modifier = modifier.padding(dimensionResource(id = R.dimen.padding_medium)),
89-
verticalArrangement = Arrangement.spacedBy(dimensionResource(id = R.dimen.padding_large))
90-
) {
88+
verticalArrangement = Arrangement.spacedBy(dimensionResource(id = R.dimen.padding_large)),
89+
modifier = modifier.padding(dimensionResource(id = R.dimen.padding_medium))
90+
) {
9191
ItemInputForm(
9292
itemDetails = itemUiState.itemDetails,
9393
onValueChange = onItemValueChange,

0 commit comments

Comments
 (0)