Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
Expand All @@ -16,6 +17,7 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import kotlinx.collections.immutable.ImmutableList
Expand All @@ -24,6 +26,7 @@ import org.sopt.certi.R
import org.sopt.certi.core.util.noRippleClickable
import org.sopt.certi.core.util.screenHeightDp
import org.sopt.certi.core.util.screenWidthDp
import org.sopt.certi.core.util.widthForScreenPercentage
import org.sopt.certi.domain.model.certification.CertificationData
import org.sopt.certi.ui.theme.CERTITheme
import org.sopt.certi.ui.theme.CertiTheme
Expand Down Expand Up @@ -69,7 +72,10 @@ fun Top3CertificationItem(
Text(
text = item.certificationType,
style = CertiTheme.typography.caption.regular_12,
color = CertiTheme.colors.gray500
color = CertiTheme.colors.gray500,
textAlign = TextAlign.End,
modifier = Modifier
.widthForScreenPercentage(73.dp)
)
}
}
Expand All @@ -87,6 +93,7 @@ private fun PreviewTop3CertificationItem() {
CertificationData(
certificationId = 1,
certificationName = "정보처리기사",
certificationType = "국가자격",
tags = listOf("시각디자인", "컴퓨터공학", "경영"),
isFavorite = true,
testType = "실기형",
Expand All @@ -97,6 +104,7 @@ private fun PreviewTop3CertificationItem() {
CertificationData(
certificationId = 2,
certificationName = "GTQ 1급 (그래픽 기술 자격)",
certificationType = "국가기술자격",
tags = listOf("시각디자인", "컴퓨터공학", "경영"),
isFavorite = false,
testType = "실기형",
Expand All @@ -107,6 +115,7 @@ private fun PreviewTop3CertificationItem() {
CertificationData(
certificationId = 3,
certificationName = "TOEIC 900+",
certificationType = "국가기술자격",
tags = listOf("경영", "시각디자인", "컴퓨터공학"),
isFavorite = true,
testType = "실기형",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,13 @@ import androidx.compose.foundation.layout.IntrinsicSize
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.ui.tooling.preview.Preview
import org.sopt.certi.ui.theme.CERTITheme
import androidx.compose.material3.VerticalDivider
import androidx.compose.ui.draw.clip
import androidx.compose.ui.layout.ContentScale
import coil.compose.rememberAsyncImagePainter
import org.sopt.certi.core.util.screenHeightDp
import org.sopt.certi.core.util.screenWidthDp

Expand All @@ -46,10 +50,17 @@ fun UserInfoSection(
verticalAlignment = Alignment.CenterVertically
) {
Image(
painter = painterResource(id = R.drawable.img_profile),
painter = if (userInfoData.profileImageUrl.isNullOrBlank()) {
painterResource(id = R.drawable.img_profile)
} else {
rememberAsyncImagePainter(userInfoData.profileImageUrl)
},
contentDescription = null,
contentScale = ContentScale.Crop,
modifier = Modifier
.width(screenWidthDp(80.dp))
.height(screenHeightDp(80.dp))
.clip(CircleShape)
)
Spacer(modifier = Modifier.width(screenWidthDp(8.dp)))

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ fun MyPageProfileImage(
.crossfade(true)
.build(),
contentDescription = null,
contentScale = ContentScale.Crop
contentScale = ContentScale.Crop,
modifier = Modifier.clip(CircleShape)
)
}
}
Loading