Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[UI/#202] 마이페이지 뷰 / UI 수정 #205

Merged
merged 11 commits into from
Aug 31, 2024
Prev Previous commit
Next Next commit
[UI/#202] 바텀시트 수정
  • Loading branch information
leeeyubin committed Aug 26, 2024
commit 6fbbd57c462bf6c60576e56c7ccfca908157d567
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import androidx.compose.ui.unit.dp
import com.terning.core.R
import com.terning.core.designsystem.component.button.DeleteRoundButton
import com.terning.core.designsystem.component.button.RoundButton
import com.terning.core.designsystem.theme.Grey400
import com.terning.core.designsystem.theme.TerningTheme
import kotlinx.coroutines.launch

Expand Down Expand Up @@ -48,7 +49,8 @@ fun MyPageLogoutBottomSheet(
)
Text(
text = stringResource(id = R.string.my_page_logout_sub),
style = TerningTheme.typography.body3,
style = TerningTheme.typography.body4,
color = Grey400,
modifier = modifier.padding(top = 54.dp)
)
RoundButton(
Expand All @@ -63,7 +65,7 @@ fun MyPageLogoutBottomSheet(
start = 24.dp,
top = 72.dp,
end = 24.dp
)
),
)
DeleteRoundButton(
style = TerningTheme.typography.button2,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import androidx.compose.ui.unit.dp
import com.terning.core.R
import com.terning.core.designsystem.component.button.DeleteRoundButton
import com.terning.core.designsystem.component.button.RoundButton
import com.terning.core.designsystem.theme.Grey400
import com.terning.core.designsystem.theme.TerningTheme
import kotlinx.coroutines.launch

Expand Down Expand Up @@ -51,7 +52,8 @@ fun MyPageQuitBottomSheet(
text = stringResource(id = R.string.my_page_quit_sub),
style = TerningTheme.typography.body3,
modifier = modifier.padding(top = 54.dp),
textAlign = TextAlign.Center
textAlign = TextAlign.Center,
color = Grey400
)
RoundButton(
style = TerningTheme.typography.button2,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.terning.core.designsystem.component.button

import androidx.annotation.StringRes
import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.fillMaxWidth
Expand All @@ -20,9 +19,9 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import com.terning.core.R
import com.terning.core.designsystem.theme.Grey150
import com.terning.core.designsystem.theme.Grey400
import com.terning.core.designsystem.theme.TerningPointTheme
import com.terning.core.designsystem.theme.White
import com.terning.core.util.NoRippleTheme

/**
Expand Down Expand Up @@ -55,12 +54,11 @@ fun DeleteRoundButton(
interactionSource = interactionSource,
enabled = isEnabled,
colors = ButtonDefaults.buttonColors(
containerColor = White,
containerColor = Grey150,
contentColor = Grey400,
),
shape = RoundedCornerShape(cornerRadius),
onClick = { onButtonClick() },
border = BorderStroke(width = 1.dp, color = Grey400)
) {
Text(
text = stringResource(id = text),
Expand Down