Экран покупок ТОЧНО готов.

This commit is contained in:
Данила Мочалов 2023-10-11 00:55:22 +04:00
parent 9c61c4599c
commit b5c8270c1c

View File

@ -2,15 +2,21 @@ package com.example.shawarma.screens.cart
import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.background import androidx.compose.foundation.background
import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.gestures.scrollable import androidx.compose.foundation.gestures.scrollable
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.verticalScroll import androidx.compose.foundation.verticalScroll
@ -25,6 +31,8 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.font.Font
import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
@ -58,10 +66,6 @@ fun CartWidget(){
.zIndex(2f), .zIndex(2f),
contentAlignment = Alignment.TopCenter contentAlignment = Alignment.TopCenter
) {
Column(
horizontalAlignment = Alignment.CenterHorizontally,
modifier = Modifier.verticalScroll(rememberScrollState())
) { ) {
Text( Text(
text = "Корзина", text = "Корзина",
@ -69,6 +73,14 @@ fun CartWidget(){
fontSize = 40.sp, fontSize = 40.sp,
modifier = Modifier.padding(top = 15.dp) modifier = Modifier.padding(top = 15.dp)
) )
Column(
horizontalAlignment = Alignment.CenterHorizontally,
modifier = Modifier
.fillMaxWidth()
.padding(top=55.dp)
.verticalScroll(rememberScrollState())
) {
Text( Text(
text = "Оплачено:", text = "Оплачено:",
fontFamily = NunitoFamily, fontFamily = NunitoFamily,
@ -76,6 +88,60 @@ fun CartWidget(){
modifier = Modifier.padding(top = 15.dp), modifier = Modifier.padding(top = 15.dp),
fontWeight = FontWeight.Bold fontWeight = FontWeight.Bold
) )
LazyColumn(
modifier = Modifier
.width(340.dp)
.height(200.dp)
) {
items(2) {
PaidItem()
}
}
Text(
text = "Ожидает оплаты:",
fontFamily = NunitoFamily,
fontSize = 20.sp,
modifier = Modifier.padding(top = 15.dp),
fontWeight = FontWeight.Bold
)
LazyColumn(
modifier = Modifier
.width(340.dp)
.height(200.dp)
) {
items(2) {
CartItem()
}
}
Spacer(modifier = Modifier.height(20.dp))
Button(
colors = ButtonDefaults.buttonColors(
backgroundColor = Color(0xFF91FF87)
),
shape = RoundedCornerShape(20.dp),
border = BorderStroke(2.dp, Color(0x66000000)),
modifier = Modifier.size(240.dp, 60.dp),
onClick = { /*TODO*/ }
) {
Text(
"Оплатить",
fontSize = 20.sp,
fontFamily = NunitoFamily,
fontWeight = FontWeight(700),
)
}
Spacer(modifier = Modifier.height(70.dp))
}
}
}
@Composable
fun PaidItem() {
Card( Card(
border = BorderStroke(width = 2.dp, color = MyOrange), border = BorderStroke(width = 2.dp, color = MyOrange),
shape = RoundedCornerShape(size = 20.dp), shape = RoundedCornerShape(size = 20.dp),
@ -137,13 +203,11 @@ fun CartWidget(){
} }
} }
} }
Text( Spacer(modifier = Modifier.height(20.dp))
text = "Ожидает оплаты:", }
fontFamily = NunitoFamily,
fontSize = 20.sp, @Composable
modifier = Modifier.padding(top = 15.dp), fun CartItem() {
fontWeight = FontWeight.Bold
)
Card( Card(
border = BorderStroke(width = 2.dp, color = MyOrange), border = BorderStroke(width = 2.dp, color = MyOrange),
shape = RoundedCornerShape(size = 20.dp), shape = RoundedCornerShape(size = 20.dp),
@ -203,9 +267,5 @@ fun CartWidget(){
} }
} }
Spacer(modifier = Modifier.height(20.dp))
}
}
} }