Skip to content

Commit a132783

Browse files
committed
[BOOK-155] chore: 약관 동의 화면 UI figma와 다른 부분 수정
1 parent cb10efe commit a132783

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

feature/login/src/main/kotlin/com/ninecraft/booket/feature/termsagreement/TermsAgreementScreen.kt

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import androidx.compose.ui.res.stringArrayResource
2323
import androidx.compose.ui.res.stringResource
2424
import androidx.compose.ui.res.vectorResource
2525
import androidx.compose.ui.unit.dp
26-
import com.ninecraft.booket.core.common.extensions.clickableSingle
26+
import com.ninecraft.booket.core.common.extensions.noRippleClickable
2727
import com.ninecraft.booket.core.designsystem.DevicePreview
2828
import com.ninecraft.booket.core.designsystem.component.appbar.ReedBackTopAppBar
2929
import com.ninecraft.booket.core.designsystem.component.button.ReedButton
@@ -38,6 +38,7 @@ import com.ninecraft.booket.feature.screens.TermsAgreementScreen
3838
import com.slack.circuit.codegen.annotations.CircuitInject
3939
import dagger.hilt.android.components.ActivityRetainedComponent
4040
import kotlinx.collections.immutable.persistentListOf
41+
import com.ninecraft.booket.core.designsystem.R as DesignR
4142

4243
@CircuitInject(TermsAgreementScreen::class, ActivityRetainedComponent::class)
4344
@Composable
@@ -97,7 +98,7 @@ internal fun TermsAgreement(
9798
style = ReedTheme.typography.headline1SemiBold,
9899
)
99100
}
100-
Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing4))
101+
Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing5))
101102
TermItem(
102103
title = termsTitles[0],
103104
checked = state.agreedTerms[0],
@@ -108,6 +109,7 @@ internal fun TermsAgreement(
108109
state.eventSink(TermsAgreementUiEvent.OnPolicyClick)
109110
},
110111
)
112+
Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing4))
111113
TermItem(
112114
title = termsTitles[1],
113115
checked = state.agreedTerms[1],
@@ -118,12 +120,13 @@ internal fun TermsAgreement(
118120
state.eventSink(TermsAgreementUiEvent.OnTermClick)
119121
},
120122
)
123+
Spacer(modifier = Modifier.height(ReedTheme.spacing.spacing4))
121124
TermItem(
122125
title = termsTitles[2],
123126
checked = state.agreedTerms[2],
124127
hasDetailAction = false,
125128
onCheckClick = {
126-
state.eventSink(TermsAgreementUiEvent.OnTermItemClick(1))
129+
state.eventSink(TermsAgreementUiEvent.OnTermItemClick(2))
127130
},
128131
)
129132
}
@@ -158,9 +161,9 @@ private fun TermItem(
158161
Row(
159162
modifier = modifier
160163
.fillMaxWidth()
161-
.clickableSingle { onDetailClick() }
164+
.noRippleClickable { onDetailClick() }
162165
.padding(
163-
start = ReedTheme.spacing.spacing5,
166+
start = ReedTheme.spacing.spacing4 + ReedTheme.spacing.spacing05,
164167
end = ReedTheme.spacing.spacing3,
165168
top = ReedTheme.spacing.spacing2,
166169
bottom = ReedTheme.spacing.spacing2,
@@ -171,17 +174,17 @@ private fun TermItem(
171174
checked = checked,
172175
onCheckedChange = { onCheckClick() },
173176
)
174-
Spacer(modifier = Modifier.width(ReedTheme.spacing.spacing1))
177+
Spacer(modifier = Modifier.width(ReedTheme.spacing.spacing3 + ReedTheme.spacing.spacing05))
175178
Text(
176179
text = title,
177180
modifier = Modifier.weight(1f),
178181
color = ReedTheme.colors.contentPrimary,
179182
style = ReedTheme.typography.body1Medium,
180183
)
181-
184+
182185
if (hasDetailAction) {
183186
Icon(
184-
imageVector = ImageVector.vectorResource(id = com.ninecraft.booket.core.designsystem.R.drawable.ic_chevron_right),
187+
imageVector = ImageVector.vectorResource(id = DesignR.drawable.ic_chevron_right),
185188
contentDescription = "Navigation Icon",
186189
tint = Color.Unspecified,
187190
)

0 commit comments

Comments
 (0)