Skip to content

[Refactor/#93] BitnagilTextButton 공통 컴포넌트 수정 #94

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Aug 10, 2025
Merged

[Refactor/#93] BitnagilTextButton 공통 컴포넌트 수정 #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion ...tem/src/main/java/com/threegap/bitnagil/designsystem/component/atom/BitnagilTextButton.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ fun BitnagilTextButton(

Box(
modifier = modifier
.fillMaxWidth()
.height(54.dp)
.clip(shape)
.background(backgroundColor)
Expand Down Expand Up @@ -122,13 +121,15 @@ private fun BitnagilTextButtonPreview() {
text = "시작하기",
onClick = {},
enabled = false,
modifier = Modifier.fillMaxWidth(),
)

Spacer(modifier = Modifier.height(12.dp))

BitnagilTextButton(
text = "시작하기",
onClick = {},
modifier = Modifier.fillMaxWidth(),
)

Spacer(modifier = Modifier.height(12.dp))
Expand All @@ -139,6 +140,7 @@ private fun BitnagilTextButtonPreview() {
colors = BitnagilTextButtonColor.skip(),
textStyle = BitnagilTheme.typography.body2Regular,
textDecoration = TextDecoration.Underline,
modifier = Modifier.fillMaxWidth(),
)
}
}
3 changes: 3 additions & 0 deletions presentation/src/main/java/com/threegap/bitnagil/presentation/emotion/EmotionScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.aspectRatio
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.statusBarsPadding
Expand Down Expand Up @@ -200,6 +201,7 @@ private fun EmotionRecommendRoutineScreen(
text = "변경하기",
onClick = onClickRegisterRecommendRoutines,
enabled = state.registerRecommendRoutinesButtonEnabled,
modifier = Modifier.fillMaxWidth(),
)

Spacer(modifier = Modifier.height(10.dp))
Expand All @@ -214,6 +216,7 @@ private fun EmotionRecommendRoutineScreen(
),
textStyle = BitnagilTheme.typography.body2Regular,
textDecoration = TextDecoration.Underline,
modifier = Modifier.fillMaxWidth(),
)
}
}
Expand Down
3 changes: 3 additions & 0 deletions .../threegap/bitnagil/presentation/onboarding/component/template/OnBoardingSelectTemplate.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package com.threegap.bitnagil.presentation.onboarding.component.template

import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState
Expand Down Expand Up @@ -76,6 +77,7 @@ fun OnBoardingSelectTemplate(
text = "다음",
onClick = onClickNextButton,
enabled = nextButtonEnable,
modifier = Modifier.fillMaxWidth(),
)

onClickSkip?.let {
Expand All @@ -87,6 +89,7 @@ fun OnBoardingSelectTemplate(
colors = BitnagilTextButtonColor.skip(),
textStyle = BitnagilTheme.typography.body2Regular,
textDecoration = TextDecoration.Underline,
modifier = Modifier.fillMaxWidth(),
)
}
}
Expand Down
3 changes: 2 additions & 1 deletion ...ation/src/main/java/com/threegap/bitnagil/presentation/writeroutine/WriteRoutineScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,8 @@ private fun WriteRoutineScreen(
onClick = onClickRegister,
enabled = state.registerButtonEnabled,
modifier = Modifier
.padding(start = 16.dp, end = 16.dp, top = 14.dp, bottom = 14.dp),
.padding(start = 16.dp, end = 16.dp, top = 14.dp, bottom = 14.dp)
.fillMaxWidth(),
)
}
}
Expand Down
5 changes: 4 additions & 1 deletion ...m/threegap/bitnagil/presentation/writeroutine/component/template/TimePickerBottomSheet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import android.view.View
import android.widget.TimePicker
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.ModalBottomSheet
Expand Down Expand Up @@ -105,7 +106,9 @@ fun TimePickerBottomSheetContent(
)

BitnagilTextButton(
modifier = Modifier.padding(start = 16.dp, end = 16.dp, bottom = 14.dp),
modifier = Modifier
.padding(start = 16.dp, end = 16.dp, bottom = 14.dp)
.fillMaxWidth(),
text = "저장",
onClick = {
onTimeSelected(currentHour, currentMinute)
Expand Down