Skip to content

Commit

Permalink
fix: 1차 피드백 적용
Browse files Browse the repository at this point in the history
  • Loading branch information
@hsgo2430
hsgo2430 committed Feb 7, 2025
1 parent ef9b76f commit ced4a56
Show file tree
Hide file tree
Showing 6 changed files with 77 additions and 78 deletions.
1 change: 1 addition & 0 deletions business/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,5 @@ dependencies {
implementation(project(mapOf("path" to ":domain")))
implementation(project(mapOf("path" to ":data")))
implementation(project(mapOf("path" to ":core")))
implementation(project(":core:designsystem"))
}
18 changes: 8 additions & 10 deletions business/src/main/java/in/koreatech/business/ui/component/CheckSettingTimeScreen.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import androidx.compose.material.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.SpanStyle
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.buildAnnotatedString
Expand All @@ -26,12 +27,13 @@ import androidx.compose.ui.text.withStyle
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import `in`.koreatech.business.R
import `in`.koreatech.koin.core.R
import `in`.koreatech.business.feature.insertstore.insertdetailinfo.operatingTime.OperatingTimeState
import `in`.koreatech.business.ui.theme.Black1
import `in`.koreatech.business.ui.theme.ColorPrimary
import `in`.koreatech.business.ui.theme.Gray3
import `in`.koreatech.business.ui.theme.Red2
import `in`.koreatech.koin.core.designsystem.theme.KoinTheme

@Composable
fun CheckSettingTime(
Expand Down Expand Up @@ -72,18 +74,16 @@ fun CheckSettingTime(
horizontalArrangement = Arrangement.Center
){
Text(
text = "설정시간 추가",
style = TextStyle(
fontSize = 16.sp,
textAlign = TextAlign.Center
)
text = stringResource(R.string.add_setting_time),
style = KoinTheme.typography.medium16,
textAlign = TextAlign.Center
)

Spacer(modifier = Modifier.width(8.dp))

Image(
painter = painterResource(R.drawable.fi_plus),
contentDescription = "플러스버튼"
contentDescription = stringResource(R.string.add_setting_time_plus)
)
}

Expand Down Expand Up @@ -120,9 +120,7 @@ fun TimeItem(

Text(
text = coloredString,
style = TextStyle(
fontSize = 16.sp
)
style = KoinTheme.typography.medium16,
)

Image(
Expand Down
98 changes: 50 additions & 48 deletions business/src/main/java/in/koreatech/business/ui/component/NullSettingTimeScreen.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package `in`.koreatech.business.ui.component
import androidx.compose.foundation.Image
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
Expand All @@ -17,70 +18,71 @@ import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import `in`.koreatech.business.R
import `in`.koreatech.koin.core.R
import `in`.koreatech.business.ui.theme.Gray3
import `in`.koreatech.koin.core.designsystem.theme.KoinTheme

@Composable
fun NullSettingTime(
modifier: Modifier = Modifier,
updateIsSettingScreenState: (Boolean) -> Unit = {},
) {
Divider(
modifier = Modifier
.fillMaxWidth(),
color = Gray3,
thickness = 0.5.dp
)
Column(
modifier = modifier
){
Divider(
modifier = Modifier
.fillMaxWidth(),
color = Gray3,
thickness = 0.5.dp
)

Text(
modifier = Modifier
.padding(vertical = 135.dp)
.fillMaxWidth()
,
text = "등록한 운영시간이 없습니다.",
style = TextStyle(
fontSize = 16.sp,
Text(
modifier = Modifier
.padding(vertical = 135.dp)
.fillMaxWidth()
,
text = "등록한 운영시간이 없습니다.",
style = KoinTheme.typography.medium16,
textAlign = TextAlign.Center
)
)

Divider(
modifier = Modifier
.fillMaxWidth(),
color = Gray3,
thickness = 0.5.dp
)
Divider(
modifier = Modifier
.fillMaxWidth(),
color = Gray3,
thickness = 0.5.dp
)

Row(
modifier = Modifier
.padding(vertical = 16.dp)
.fillMaxWidth()
.clickable {
updateIsSettingScreenState(true)
}
,
horizontalArrangement = Arrangement.Center
){
Text(
text = "설정시간 추가",
style = TextStyle(
fontSize = 16.sp,
Row(
modifier = Modifier
.padding(vertical = 16.dp)
.fillMaxWidth()
.clickable {
updateIsSettingScreenState(true)
}
,
horizontalArrangement = Arrangement.Center
){
Text(
text = "설정시간 추가",
style = KoinTheme.typography.medium16,
textAlign = TextAlign.Center
)
)

Spacer(modifier = Modifier.width(8.dp))
Spacer(modifier = Modifier.width(8.dp))

Image(
painter = painterResource(R.drawable.fi_plus),
contentDescription = "플러스버튼"
Image(
painter = painterResource(R.drawable.fi_plus),
contentDescription = "플러스버튼"
)
}

Divider(
modifier = Modifier
.fillMaxWidth(),
color = Gray3,
thickness = 0.5.dp
)
}

Divider(
modifier = Modifier
.fillMaxWidth(),
color = Gray3,
thickness = 0.5.dp
)
}
34 changes: 14 additions & 20 deletions business/src/main/java/in/koreatech/business/ui/component/SettingTimeComponent.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import androidx.compose.foundation.layout.Column
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.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
Expand All @@ -36,10 +37,11 @@ import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import `in`.koreatech.business.R
import `in`.koreatech.koin.core.R
import `in`.koreatech.business.feature.insertstore.insertdetailinfo.operatingTime.OperatingTimeState
import `in`.koreatech.business.ui.theme.ColorPrimary
import `in`.koreatech.business.ui.theme.Gray3
import `in`.koreatech.koin.core.designsystem.theme.KoinTheme
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.launch

Expand All @@ -57,21 +59,17 @@ fun SettingTimeDialog(
var isSettingScreen by remember { mutableStateOf(false) }

Column(
modifier = Modifier
.fillMaxWidth()
.fillMaxHeight()
modifier = modifier
.fillMaxSize()
){
Text(
modifier = Modifier
.padding(vertical = 16.dp)
.fillMaxWidth()
,
text = "운영시간 설정",
style = TextStyle(
fontSize = 16.sp,
fontWeight = FontWeight.Bold,
textAlign = TextAlign.Center
)
text = stringResource(R.string.insert_store_operating_time_setting),
style = KoinTheme.typography.bold16,
textAlign = TextAlign.Center
)

if(isSettingScreen) {
Expand Down Expand Up @@ -107,11 +105,9 @@ fun SettingTimeDialog(
) {
Text(
text = stringResource(id = R.string.cancel),
style = TextStyle(
fontSize = 16.sp,
textAlign = TextAlign.Center,
color = Gray3
)
style = KoinTheme.typography.medium16,
textAlign = TextAlign.Center,
color = Gray3
)
}

Expand All @@ -128,11 +124,9 @@ fun SettingTimeDialog(
) {
Text(
text = if(isSettingScreen)"등록하기" else "추가하기",
style = TextStyle(
fontSize = 16.sp,
textAlign = TextAlign.Center,
color = Color.White
)
style = KoinTheme.typography.medium16,
textAlign = TextAlign.Center,
color = Color.White
)
}
}
Expand Down
0 business/src/main/res/drawable/ic_x.xml → core/src/main/res/drawable/ic_x.xml
View file
File renamed without changes.
4 changes: 4 additions & 0 deletions core/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,10 @@
<string name="insert_store_null_store_delivery_fee">가게 배달비를 입력해 주세요.</string>
<string name="insert_store_null_store_other_info">가게 기타 정보를 입력해 주세요.</string>

<string name="add_setting_time">설정시간 추가</string>
<string name="add_setting_time_plus">설정시간 플러스 버튼</string>
<string name="insert_store_operating_time_setting">운영시간 설정</string>

<string name="insert_store_check_store_info">4. 가게 정보 확인</string>
<string name="insert_store_check_info">입력하신 정보가 맞습니까?</string>
<string name="insert_store_fail_register_store">가게를 등록하는데 실패하였습니다.</string>
Expand Down

0 comments on commit ced4a56

Please sign in to comment.