Skip to content

Commit

Permalink
Merge pull request #149 from pknu-wap/refactor/tgyuu/#148
Browse files Browse the repository at this point in the history
Refactor/tgyuu/#148
  • Loading branch information
tgyuuAn authored Mar 5, 2024
2 parents 5abfab1 + 24ba5f8 commit e986390
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
4 changes: 4 additions & 0 deletions core/designsystem/src/main/java/com/wap/designsystem/Color.kt
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ val Gray95 = Color(0xFF959595)
val Gray82 = Color(0xFF828282)
val Gray7C = Color(0xFF7C7C7C)
val Gray4A = Color(0xFF49494A)
val Black20 = Color(0xFF202022)
val Black25 = Color(0xFF252424)
val Black42 = Color(0xFF424242)
val Black = Color(0xFF000000)
Expand All @@ -36,6 +37,7 @@ class WappColor(
white: Color = Color(0xFFFFFFFF),
black: Color = Color(0xFF000000),
backgroundBlack: Color = Color(0xFF131313),
black20: Color = Color(0xFF202022),
black25: Color = Color(0xFF252424),
black42: Color = Color(0xFF424242),
gray95: Color = Color(0xFF959595),
Expand All @@ -62,6 +64,8 @@ class WappColor(
private set
var backgroundBlack by mutableStateOf(backgroundBlack)
private set
var black20 by mutableStateOf(black20)
private set
var black25 by mutableStateOf(black25)
private set
var black42 by mutableStateOf(black42)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ internal fun NoticeScreen(
scaffoldState = scaffoldState,
sheetContainerColor = WappTheme.colors.black25,
sheetPeekHeight = defaultHeight,
sheetShadowElevation = 20.dp,
sheetContent = {
BottomSheetContent(
expandableHeight = expandableHeight,
Expand All @@ -92,7 +93,7 @@ internal fun NoticeScreen(
onCalendarMonthChanged = onCalendarMonthChanged,
measureDefaultModifier = Modifier
.fillMaxWidth()
.background(WappTheme.colors.black25)
.background(WappTheme.colors.black20)
.layout { measurable, constraints ->
val placeable = measurable.measure(constraints)

Expand Down

0 comments on commit e986390

Please sign in to comment.