spageti
This commit is contained in:
parent
2ab7afecef
commit
edf344034f
@ -200,7 +200,7 @@ private fun shareOrder(context: Context, subject: String, summary: String) {
|
|||||||
context.startActivity(
|
context.startActivity(
|
||||||
Intent.createChooser(
|
Intent.createChooser(
|
||||||
intent,
|
intent,
|
||||||
context.getString(R.string.new_cupcake_order)
|
context.getString(R.string.new_spagheti_order)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -27,10 +27,10 @@ import java.util.Calendar
|
|||||||
import java.util.Locale
|
import java.util.Locale
|
||||||
|
|
||||||
/** Price for a single cupcake */
|
/** Price for a single cupcake */
|
||||||
private const val PRICE_PER_CUPCAKE = 2.00
|
private const val PRICE_PER_CUPCAKE = 2.50
|
||||||
|
|
||||||
/** Additional cost for same day pickup of an order */
|
/** Additional cost for same day pickup of an order */
|
||||||
private const val PRICE_FOR_SAME_DAY_PICKUP = 3.00
|
private const val PRICE_FOR_SAME_DAY_PICKUP = 4.00
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* [OrderViewModel] holds information about a cupcake order in terms of quantity, flavor, and
|
* [OrderViewModel] holds information about a cupcake order in terms of quantity, flavor, and
|
||||||
|
|||||||
@ -63,13 +63,13 @@ fun StartOrderScreen(
|
|||||||
) {
|
) {
|
||||||
Spacer(modifier = Modifier.height(dimensionResource(R.dimen.padding_medium)))
|
Spacer(modifier = Modifier.height(dimensionResource(R.dimen.padding_medium)))
|
||||||
Image(
|
Image(
|
||||||
painter = painterResource(R.drawable.cupcake),
|
painter = painterResource(R.drawable.spageti),
|
||||||
contentDescription = null,
|
contentDescription = null,
|
||||||
modifier = Modifier.width(300.dp)
|
modifier = Modifier.width(300.dp)
|
||||||
)
|
)
|
||||||
Spacer(modifier = Modifier.height(dimensionResource(R.dimen.padding_medium)))
|
Spacer(modifier = Modifier.height(dimensionResource(R.dimen.padding_medium)))
|
||||||
Text(
|
Text(
|
||||||
text = stringResource(R.string.order_cupcakes),
|
text = stringResource(R.string.order_spagheti),
|
||||||
style = MaterialTheme.typography.headlineSmall
|
style = MaterialTheme.typography.headlineSmall
|
||||||
)
|
)
|
||||||
Spacer(modifier = Modifier.height(dimensionResource(R.dimen.padding_small)))
|
Spacer(modifier = Modifier.height(dimensionResource(R.dimen.padding_small)))
|
||||||
|
|||||||
@ -67,7 +67,7 @@ fun OrderSummaryScreen(
|
|||||||
orderUiState.date,
|
orderUiState.date,
|
||||||
orderUiState.quantity
|
orderUiState.quantity
|
||||||
)
|
)
|
||||||
val newOrder = stringResource(R.string.new_cupcake_order)
|
val newOrder = stringResource(R.string.new_spagheti_order)
|
||||||
//Create a list of order summary to display
|
//Create a list of order summary to display
|
||||||
val items = listOf(
|
val items = listOf(
|
||||||
// Summary line 1: display selected quantity
|
// Summary line 1: display selected quantity
|
||||||
|
|||||||
@ -15,7 +15,7 @@
|
|||||||
-->
|
-->
|
||||||
<resources>
|
<resources>
|
||||||
<string name="app_name">Cupcake</string>
|
<string name="app_name">Cupcake</string>
|
||||||
<string name="order_cupcakes">Order Cupcakes</string>
|
<string name="order_spagheti">Order Spagheti</string>
|
||||||
<string name="one_cupcake">One Cupcake</string>
|
<string name="one_cupcake">One Cupcake</string>
|
||||||
<string name="six_cupcakes">Six Cupcakes</string>
|
<string name="six_cupcakes">Six Cupcakes</string>
|
||||||
<string name="twelve_cupcakes">Twelve Cupcakes</string>
|
<string name="twelve_cupcakes">Twelve Cupcakes</string>
|
||||||
@ -36,7 +36,7 @@
|
|||||||
<string name="pickup_date">Pickup date</string>
|
<string name="pickup_date">Pickup date</string>
|
||||||
<string name="subtotal_price">Subtotal %s</string>
|
<string name="subtotal_price">Subtotal %s</string>
|
||||||
<string name="total_price">Total %s</string>
|
<string name="total_price">Total %s</string>
|
||||||
<string name="new_cupcake_order">New Cupcake Order</string>
|
<string name="new_spagheti_order">New Spagheti Order</string>
|
||||||
<string name="order_details">Quantity: %1$s \nFlavor: %2$s \nPickup date: %3$s \nTotal: %4$s \n\nThank you!</string>
|
<string name="order_details">Quantity: %1$s \nFlavor: %2$s \nPickup date: %3$s \nTotal: %4$s \n\nThank you!</string>
|
||||||
<string name="back_button">Back</string>
|
<string name="back_button">Back</string>
|
||||||
<plurals name="cupcakes">
|
<plurals name="cupcakes">
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user