b0n3l3sS/PIbd-33_Mochalov_D.V._Mobile
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Начинаем делать экран продуктов + ранние фиксы

Browse Source
This commit is contained in:
Данила Мочалов 2023-11-08 04:34:27 +04:00
parent 761d76d4aa
commit 58962faf89
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/example/shawarma/data/dao/OrderDao.kt
View File

@ -20,7 +20,7 @@ interface OrderDao {
@Delete @Delete
suspend fun delete(order: OrderModel) suspend fun delete(order: OrderModel)
@Query("select * from orders where orders.user_id is not null") @Query("select * from orders")
fun getAll() : Flow<List<OrderWithProducts>> fun getAll() : Flow<List<OrderWithProducts>>
@Query("select * from orders where orders.id =:id") @Query("select * from orders where orders.id =:id")
fun getById(id: Int): Flow<List<OrderWithProducts>> fun getById(id: Int): Flow<List<OrderWithProducts>>

4
app/src/main/java/com/example/shawarma/screens/discount/DiscountScreen.kt
View File

@ -36,10 +36,7 @@ import androidx.compose.ui.unit.sp
import androidx.compose.ui.zIndex import androidx.compose.ui.zIndex
import com.example.shawarma.R import com.example.shawarma.R
import com.example.shawarma.data.db.AppDatabase import com.example.shawarma.data.db.AppDatabase
import com.example.shawarma.data.models.DiscountProductModel
import com.example.shawarma.data.models.ProductModel import com.example.shawarma.data.models.ProductModel
import com.example.shawarma.data.models.getAllDiscountProducts
import com.example.shawarma.screens.home.HomeList
import com.example.shawarma.ui.theme.MarckFamily import com.example.shawarma.ui.theme.MarckFamily
import com.example.shawarma.ui.theme.MyLightYellow import com.example.shawarma.ui.theme.MyLightYellow
import com.example.shawarma.ui.theme.MyMainBackground import com.example.shawarma.ui.theme.MyMainBackground
@ -149,6 +146,7 @@ fun DiscountCard(product : ProductModel){
.size(160.dp, 36.dp) .size(160.dp, 36.dp)
) { ) {
Row( Row(
horizontalArrangement = Arrangement.SpaceBetween
){ ){
Box( Box(
modifier = Modifier.padding(start = 12.dp) modifier = Modifier.padding(start = 12.dp)

2
app/src/main/java/com/example/shawarma/utils/BottomNavItem.kt
View File

@ -7,4 +7,6 @@ sealed class BottomNavItem(var title:String, var icon:Int, var screen_route:Stri
object Discount : BottomNavItem("Discount", R.drawable.discount_icon,ScreenPaths.discount.name) object Discount : BottomNavItem("Discount", R.drawable.discount_icon,ScreenPaths.discount.name)
object Cart : BottomNavItem("Cart", R.drawable.cart_icon,ScreenPaths.cart.name) object Cart : BottomNavItem("Cart", R.drawable.cart_icon,ScreenPaths.cart.name)
object Orders: BottomNavItem("Orders", R.drawable.orders_icon,ScreenPaths.orders.name) object Orders: BottomNavItem("Orders", R.drawable.orders_icon,ScreenPaths.orders.name)
object Products: BottomNavItem("Products", R.drawable.pen_icon, ScreenPaths.products.name)
} }

2
app/src/main/java/com/example/shawarma/utils/ScreenPaths.kt
View File

@ -1,5 +1,5 @@
package com.example.shawarma.utils package com.example.shawarma.utils
enum class ScreenPaths { enum class ScreenPaths {
authorization, registration, home, discount, cart, orders authorization, registration, home, discount, cart, orders, products
} }

BIN
app/src/main/res/drawable/pen_icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.9 KiB