Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ dependencies {
implementation(libs.androidx.material3)
implementation(libs.androidx.lifecycle.viewmodel.compose)
implementation(libs.androidx.lifecycle.runtime.compose.android)
implementation(libs.androidx.navigation.compose)
testImplementation(libs.junit)
androidTestImplementation(libs.androidx.junit)
androidTestImplementation(libs.androidx.espresso.core)
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/java/com/kuit/ourmenu/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.navigation.compose.rememberNavController
import com.kuit.ourmenu.ui.navigator.MainNavGraph
import com.kuit.ourmenu.ui.onboarding.screen.SplashScreen
import com.kuit.ourmenu.ui.theme.OurMenuTheme

Expand All @@ -17,6 +19,7 @@ class MainActivity : ComponentActivity() {
enableEdgeToEdge()
setContent {
var showSplash by remember { mutableStateOf(true) }
val navController = rememberNavController()

OurMenuTheme {
if (showSplash) {
Expand All @@ -25,6 +28,7 @@ class MainActivity : ComponentActivity() {
}
} else {
// TODO: MainNavigation 추가하기
MainNavGraph(navController = navController)
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
package com.kuit.ourmenu.ui.addmenu.component

import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.LazyRow
import androidx.compose.foundation.lazy.itemsIndexed
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Button
import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.Icon
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.kuit.ourmenu.R
import com.kuit.ourmenu.ui.addmenu.component.item.AddMenuAddedImageItem
import com.kuit.ourmenu.ui.theme.Neutral300
import com.kuit.ourmenu.ui.theme.Neutral500
import com.kuit.ourmenu.ui.theme.ourMenuTypography

@Composable
fun AddMenuAddImageComponent(
modifier: Modifier = Modifier,
imgList: List<Int>,
onDelete: (Int) -> Unit
) {
Row(
modifier = modifier
.fillMaxWidth()
) {
Button(
onClick = { /*TODO: 이미지 추가*/ },
modifier = modifier.size(88.dp, 72.dp),
shape = RoundedCornerShape(12.dp),
contentPadding = PaddingValues(0.dp),
colors = ButtonDefaults.buttonColors(
containerColor = Neutral300
)
) {
Column(
modifier = modifier.fillMaxWidth(),
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.Center
) {
Icon(
painter = painterResource(R.drawable.ic_addmenu_add_photo),
contentDescription = "add photo",
tint = Color.Unspecified
)
Text(
text = "${imgList.size}/5",
style = ourMenuTypography().pretendard_500_12,
color = Neutral500
)
}
}
Spacer(modifier = modifier.size(8.dp))
LazyRow(modifier = modifier.fillMaxWidth()) {
itemsIndexed(imgList) { index, item ->
if (index == 0) {
AddMenuAddedImageItem(img = item, isFirstItem = true) {
onDelete(index)
}
} else {
AddMenuAddedImageItem(img = item, isFirstItem = false) {
onDelete(index)
}
}
Spacer(modifier = modifier.size(8.dp))
}
}
}
}

@Preview(showBackground = true)
@Composable
private fun AddMenuAddImageComponentPreview() {
val imgList = listOf(
R.drawable.img_dummy_pizza,
R.drawable.img_dummy_pizza,
R.drawable.img_dummy_pizza,
R.drawable.img_dummy_pizza,
)
AddMenuAddImageComponent(imgList = imgList) {
//onDelete
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
package com.kuit.ourmenu.ui.addmenu.component.item

import androidx.compose.foundation.Image
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Card
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.kuit.ourmenu.R
import com.kuit.ourmenu.ui.theme.NeutralWhite
import com.kuit.ourmenu.ui.theme.Primary500Main
import com.kuit.ourmenu.ui.theme.ourMenuTypography

@Composable
fun AddMenuAddedImageItem(
modifier: Modifier = Modifier,
img: Int,
isFirstItem: Boolean,
onDelete: () -> Unit
) {
Card(
modifier = modifier
.size(88.dp, 72.dp),
shape = RoundedCornerShape(12.dp)
) {
Box(modifier = modifier.fillMaxSize()) {
Image(
modifier = modifier
.fillMaxSize()
.clip(RoundedCornerShape(12.dp)),
painter = painterResource(img),
contentDescription = "menu image",
contentScale = ContentScale.Crop
)

if (isFirstItem) {
Surface(
modifier = modifier
.align(Alignment.TopStart)
.padding(top = 4.dp, start = 6.dp)
.size(40.dp, 24.dp),
shape = RoundedCornerShape(8.dp),
color = NeutralWhite,
) {
Box(modifier = modifier.fillMaxSize()) {
Text(
text = "대표",
color = Primary500Main,
style = ourMenuTypography().pretendard_600_14,
modifier = modifier.align(Alignment.Center)
)
}
}
}

Image(
modifier = modifier
.align(Alignment.TopEnd)
.padding(top = 7.dp, end = 6.dp)
.clickable {
onDelete()
},
painter = painterResource(R.drawable.ic_addmenu_x),
contentDescription = "menu image",
contentScale = ContentScale.Crop
)
}
}
}

@Preview(showBackground = true)
@Composable
private fun AddMenuAddedImageItemPreview() {
Column {
AddMenuAddedImageItem(img = R.drawable.img_dummy_pizza, isFirstItem = true) {

}
AddMenuAddedImageItem(img = R.drawable.img_dummy_pizza, isFirstItem = false) {

}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import com.kuit.ourmenu.ui.theme.ourMenuTypography

@Composable
fun AddMenuInfoAddressFieldItem(
autoInput: Boolean,
mainAddressText: String,
detailedAddressText: String,
onMainAddressChange: (String) -> Unit,
Expand Down Expand Up @@ -107,6 +108,7 @@ private fun AddMenuInfoAddressFieldItemPreview() {
var mainAddressText by rememberSaveable { mutableStateOf("") }
var detailedAddressText by rememberSaveable { mutableStateOf("") }
AddMenuInfoAddressFieldItem(
autoInput = true,
mainAddressText = mainAddressText,
detailedAddressText = detailedAddressText,
onMainAddressChange = { mainAddressText = it },
Expand Down
Loading