Skip to content

Commit 5227e7e

Browse files
committed
Merge remote-tracking branch 'origin/develop' into develop
2 parents 1d7b464 + 016dba5 commit 5227e7e

2 files changed

Lines changed: 9 additions & 0 deletions

File tree

feature/mypage/src/main/kotlin/com/anddd/nevera/feature/mypage/main/component/ProfileCard.kt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.anddd.nevera.feature.mypage.main.component
22

33
import androidx.compose.foundation.Image
4+
import androidx.compose.foundation.border
45
import androidx.compose.foundation.layout.Arrangement
56
import androidx.compose.foundation.layout.Box
67
import androidx.compose.foundation.layout.Column
@@ -19,6 +20,7 @@ import androidx.compose.ui.res.painterResource
1920
import androidx.compose.ui.res.stringResource
2021
import androidx.compose.ui.tooling.preview.Preview
2122
import androidx.compose.ui.unit.dp
23+
import com.anddd.nevera.core.designsystem.ui.theme.shadow.neveraShadow
2224
import coil3.compose.AsyncImage
2325
import com.anddd.nevera.core.designsystem.R
2426
import com.anddd.nevera.core.designsystem.ui.theme.NeveraTheme
@@ -33,6 +35,7 @@ internal fun ProfileContent(
3335
Row(
3436
modifier = modifier
3537
.fillMaxWidth()
38+
.border(1.dp, NeveraTheme.colors.borderNormal)
3639
.padding(NeveraTheme.spacing.padding16),
3740
verticalAlignment = Alignment.CenterVertically,
3841
horizontalArrangement = Arrangement.spacedBy(NeveraTheme.spacing.gap12)
@@ -130,6 +133,10 @@ private fun ProfileWithWish(
130133
painter = painterResource(MyPageR.drawable.ic_avatar_wish),
131134
contentDescription = "Has Wish Status",
132135
modifier = Modifier
136+
.neveraShadow(
137+
layers = NeveraTheme.shadow.large,
138+
cornerRadius = NeveraTheme.radius.xLarge,
139+
)
133140
.size(40.dp)
134141
.align(Alignment.TopEnd)
135142
)

feature/mypage/src/main/kotlin/com/anddd/nevera/feature/mypage/main/component/SettingsContent.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import androidx.compose.material3.Text
1414
import androidx.compose.runtime.Composable
1515
import androidx.compose.ui.Alignment
1616
import androidx.compose.ui.Modifier
17+
import androidx.compose.ui.graphics.ColorFilter
1718
import androidx.compose.ui.res.painterResource
1819
import androidx.compose.ui.res.stringResource
1920
import androidx.compose.ui.tooling.preview.Preview
@@ -93,6 +94,7 @@ private fun SettingItem(
9394
modifier = Modifier.size(NeveraTheme.iconSize.xSmall),
9495
painter = painterResource(DesignSystemR.drawable.ic_chevron_right),
9596
contentDescription = null,
97+
colorFilter = ColorFilter.tint(NeveraTheme.colors.iconCaption),
9698
)
9799
}
98100
}

0 commit comments

Comments
 (0)