Skip to content

Commit a513ab5

Browse files
committed
[UI/#182] BottomSheet 상단 stroke 색상 변경
1 parent d5c0288 commit a513ab5

File tree

2 files changed

+55
-66
lines changed

2 files changed

+55
-66
lines changed

core/ui/src/main/java/com/yapp/ui/component/OrbitBottomSheet.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ fun OrbitBottomSheet(
4242
onDismissRequest: () -> Unit = {},
4343
shape: Shape = RoundedCornerShape(topStart = 30.dp, topEnd = 30.dp),
4444
containerColor: Color = OrbitTheme.colors.gray_800,
45-
strokeColor: Color = OrbitTheme.colors.gray_600,
46-
strokeThickness: Dp = 2.dp,
45+
strokeColor: Color = OrbitTheme.colors.gray_700,
46+
strokeThickness: Dp = 1.dp,
4747
content: @Composable () -> Unit,
4848
) {
4949
val scope = rememberCoroutineScope()

feature/home/src/main/java/com/yapp/home/component/bottomsheet/AlarmListBottomSheet.kt

+53-64
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ import com.yapp.alarm.component.AlarmListItem
5151
import com.yapp.designsystem.theme.OrbitTheme
5252
import com.yapp.domain.model.Alarm
5353
import com.yapp.home.component.AlarmListDropDownMenu
54-
import com.yapp.ui.component.BottomSheetTopRoundedStroke
5554
import com.yapp.ui.component.checkbox.OrbitCheckBox
5655
import com.yapp.ui.utils.OnLoadMore
5756
import feature.home.R
@@ -196,75 +195,65 @@ internal fun AlarmBottomSheetContent(
196195
onLoadMore()
197196
}
198197

199-
Box {
200-
Column(
201-
modifier = modifier
202-
.fillMaxSize()
203-
.background(
204-
color = OrbitTheme.colors.gray_900,
205-
shape = RoundedCornerShape(topStart = cornerRadius, topEnd = cornerRadius),
206-
),
207-
horizontalAlignment = Alignment.CenterHorizontally,
208-
) {
209-
Spacer(modifier = Modifier.height(topPadding))
198+
Column(
199+
modifier = modifier
200+
.fillMaxSize()
201+
.background(
202+
color = OrbitTheme.colors.gray_900,
203+
shape = RoundedCornerShape(topStart = cornerRadius, topEnd = cornerRadius),
204+
),
205+
horizontalAlignment = Alignment.CenterHorizontally,
206+
) {
207+
Spacer(modifier = Modifier.height(topPadding))
210208

211-
if (isSelectionMode) {
212-
AlarmSelectionTopBar(
213-
checked = isAllSelected,
214-
onClickCheckAll = onClickCheckAll,
215-
onClickClose = onClickClose,
216-
)
217-
} else {
218-
AlarmListTopBar(
219-
menuExpanded = menuExpanded,
220-
onClickAdd = onClickAdd,
221-
onClickMore = onClickMore,
222-
onDismissRequest = onDismissRequest,
223-
onClickEdit = onClickEdit,
224-
)
225-
}
209+
if (isSelectionMode) {
210+
AlarmSelectionTopBar(
211+
checked = isAllSelected,
212+
onClickCheckAll = onClickCheckAll,
213+
onClickClose = onClickClose,
214+
)
215+
} else {
216+
AlarmListTopBar(
217+
menuExpanded = menuExpanded,
218+
onClickAdd = onClickAdd,
219+
onClickMore = onClickMore,
220+
onDismissRequest = onDismissRequest,
221+
onClickEdit = onClickEdit,
222+
)
223+
}
226224

227-
LazyColumn(
228-
state = listState,
229-
) {
230-
itemsIndexed(alarms) { index, alarm ->
231-
AlarmListItem(
232-
id = alarm.id,
233-
repeatDays = alarm.repeatDays,
234-
isHolidayAlarmOff = alarm.isHolidayAlarmOff,
235-
selectable = isSelectionMode,
236-
selected = selectedAlarmIds.contains(alarm.id),
237-
onClick = onClickAlarm,
238-
onToggleSelect = onToggleSelect,
239-
isAm = alarm.isAm,
240-
hour = alarm.hour,
241-
minute = alarm.minute,
242-
isActive = alarm.isAlarmActive,
243-
onToggleActive = onToggleActive,
225+
LazyColumn(
226+
state = listState,
227+
) {
228+
itemsIndexed(alarms) { index, alarm ->
229+
AlarmListItem(
230+
id = alarm.id,
231+
repeatDays = alarm.repeatDays,
232+
isHolidayAlarmOff = alarm.isHolidayAlarmOff,
233+
selectable = isSelectionMode,
234+
selected = selectedAlarmIds.contains(alarm.id),
235+
onClick = onClickAlarm,
236+
onToggleSelect = onToggleSelect,
237+
isAm = alarm.isAm,
238+
hour = alarm.hour,
239+
minute = alarm.minute,
240+
isActive = alarm.isAlarmActive,
241+
onToggleActive = onToggleActive,
242+
)
243+
if (index != alarms.size - 1) {
244+
Spacer(
245+
modifier = Modifier
246+
.fillMaxWidth()
247+
.height(1.dp)
248+
.background(OrbitTheme.colors.gray_800)
249+
.padding(horizontal = 24.dp),
244250
)
245-
if (index != alarms.size - 1) {
246-
Spacer(
247-
modifier = Modifier
248-
.fillMaxWidth()
249-
.height(1.dp)
250-
.background(OrbitTheme.colors.gray_800)
251-
.padding(horizontal = 24.dp),
252-
)
253-
}
254-
}
255-
256-
item {
257-
Spacer(modifier = Modifier.height(104.dp))
258251
}
259252
}
260-
}
261253

262-
if (cornerRadius > 0.dp) {
263-
BottomSheetTopRoundedStroke(
264-
strokeColor = OrbitTheme.colors.gray_600,
265-
strokeThickness = 1.dp,
266-
radius = cornerRadius,
267-
)
254+
item {
255+
Spacer(modifier = Modifier.height(104.dp))
256+
}
268257
}
269258
}
270259
}

0 commit comments

Comments
 (0)