diff --git a/business/build.gradle.kts b/business/build.gradle.kts
index 262215f2c..d3041555f 100644
--- a/business/build.gradle.kts
+++ b/business/build.gradle.kts
@@ -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"))
}
diff --git a/business/src/main/java/in/koreatech/business/ui/component/CheckSettingTimeScreen.kt b/business/src/main/java/in/koreatech/business/ui/component/CheckSettingTimeScreen.kt
index 508fd93b6..5e5d1bbdf 100644
--- a/business/src/main/java/in/koreatech/business/ui/component/CheckSettingTimeScreen.kt
+++ b/business/src/main/java/in/koreatech/business/ui/component/CheckSettingTimeScreen.kt
@@ -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
@@ -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(
@@ -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)
)
}
@@ -120,9 +120,7 @@ fun TimeItem(
Text(
text = coloredString,
- style = TextStyle(
- fontSize = 16.sp
- )
+ style = KoinTheme.typography.medium16,
)
Image(
diff --git a/business/src/main/java/in/koreatech/business/ui/component/NullSettingTimeScreen.kt b/business/src/main/java/in/koreatech/business/ui/component/NullSettingTimeScreen.kt
index ccb60ff46..68b3c2b96 100644
--- a/business/src/main/java/in/koreatech/business/ui/component/NullSettingTimeScreen.kt
+++ b/business/src/main/java/in/koreatech/business/ui/component/NullSettingTimeScreen.kt
@@ -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
@@ -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
- )
}
\ No newline at end of file
diff --git a/business/src/main/java/in/koreatech/business/ui/component/SettingTimeComponent.kt b/business/src/main/java/in/koreatech/business/ui/component/SettingTimeComponent.kt
index 0cd0df3e0..54801f899 100644
--- a/business/src/main/java/in/koreatech/business/ui/component/SettingTimeComponent.kt
+++ b/business/src/main/java/in/koreatech/business/ui/component/SettingTimeComponent.kt
@@ -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
@@ -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
@@ -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) {
@@ -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
)
}
@@ -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
)
}
}
diff --git a/business/src/main/res/drawable/ic_x.xml b/core/src/main/res/drawable/ic_x.xml
similarity index 100%
rename from business/src/main/res/drawable/ic_x.xml
rename to core/src/main/res/drawable/ic_x.xml
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index b9643d112..a1af170af 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -192,6 +192,10 @@
가게 배달비를 입력해 주세요.
가게 기타 정보를 입력해 주세요.
+ 설정시간 추가
+ 설정시간 플러스 버튼
+ 운영시간 설정
+
4. 가게 정보 확인
입력하신 정보가 맞습니까?
가게를 등록하는데 실패하였습니다.