Skip to content

Commit

Permalink
[FEAT/#206] 마이페이지 프로필 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
@leeeyubin
leeeyubin committed Sep 4, 2024
1 parent cf12689 commit 3ff3cff
Show file tree
Hide file tree
Showing 8 changed files with 402 additions and 713 deletions.
18 changes: 12 additions & 6 deletions core/src/main/java/com/terning/core/designsystem/component/bottomsheet/ProfileBottomSheet.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ import androidx.compose.foundation.border
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.aspectRatio
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.grid.GridCells
import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
import androidx.compose.foundation.lazy.grid.itemsIndexed
Expand Down Expand Up @@ -112,13 +114,15 @@ fun RadioButtonGroup(
) {
itemsIndexed(options) { index, option ->
val imageModifier = if (selectedOption == options[index]) {
modifier.border(
color = TerningMain,
width = 2.dp,
shape = CircleShape
)
} else {
modifier
.border(
color = TerningMain,
width = 2.dp,
shape = CircleShape
)
.aspectRatio(1f)
} else {
modifier.aspectRatio(1f)
}

Image(
Expand All @@ -132,6 +136,8 @@ fun RadioButtonGroup(
selectedOption = option
}
.clip(shape = CircleShape)
.size(76.dp)
.aspectRatio(1f)
)
}
}
Expand Down
10 changes: 7 additions & 3 deletions feature/src/main/java/com/terning/feature/mypage/mypage/component/MyPageProfile.kt
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
package com.terning.feature.mypage.component

import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.aspectRatio
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.unit.dp
import com.terning.core.R
import com.terning.core.designsystem.component.image.TerningImage

@Composable
fun MyPageProfile(
Expand All @@ -32,10 +34,12 @@ fun MyPageProfile(
else -> options[5]
}

TerningImage(
painter = option,
Image(
painter = painterResource(id = option),
modifier = modifier
.size(72.dp)
.clip(shape = CircleShape)
.aspectRatio(1f),
contentDescription = "profile image"
)
}
179 changes: 51 additions & 128 deletions feature/src/main/res/drawable/ic_terning_profile_00.xml
View file
Original file line number Diff line number Diff line change
@@ -1,137 +1,60 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="800dp"
android:height="800dp"
android:viewportWidth="800"
android:viewportHeight="800">
<path
android:pathData="M0.5,0.5h800v800h-800z"
android:strokeWidth="0"
android:fillColor="#fffede"/>
<path
android:pathData="M513.99,511.69c-12.05,-10.15 -38.82,-4.86 -48.7,-6.23s12.75,41.33 12.75,41.33l16.57,10.84 19.38,-45.94"
android:strokeWidth="0"
android:fillColor="#c3e4ea"/>
<path
android:pathData="M395.28,530.77c-12.05,-10.15 -38.82,-4.86 -48.7,-6.23s12.75,41.33 12.75,41.33l16.57,10.84 19.38,-45.94"
android:strokeWidth="0"
android:fillColor="#c3e4ea"/>
<path
android:pathData="M341.29,248c0.28,4.43 0,0 0,0 0,0 27.21,-41.84 49.22,-46.48s6.25,-15.03 6.25,-15.03"
android:strokeWidth="0"
android:fillColor="#292021"/>
<path
android:pathData="M354.22,140.48s-48.07,-18.68 -74.13,2.83 -11.91,42.53 -31.16,56.36 -46.42,34.84 -38.49,75.29 16.98,64.79 16.98,64.79h310.88s58.22,-16.92 54.82,-64.79c-3.4,-47.87 -22.64,-37.68 -27.17,-63.72 -4.53,-26.04 -32.27,-61.7 -67.37,-67.37s-31.49,-33.97 -73.77,-34.53 -60.96,16.42 -70.58,31.14Z"
android:strokeWidth="0"
android:fillColor="#292021"/>
<path
android:pathData="M263.9,317.75c-57.84,-1.02 -69.09,31.89 -66.02,62.61s36.85,54.1 81.38,42.33l-15.36,-104.93Z"
android:strokeWidth="0"
android:fillColor="#fec4b6"/>
<path
android:pathData="M486.58,432.36c-3.29,54.82 -18.64,92.65 4.39,107.46l23.03,14.8 -113.49,88.27s-65.24,-75.11 -64.14,-90.46 26.21,-9.14 27.96,-26.32 0,-31.25 0,-31.25l106.91,-69.08 15.35,6.58Z"
android:fillColor="#fed6ca"/>
android:width="76dp"
android:height="76dp"
android:viewportWidth="76"
android:viewportHeight="76">
<group>
<clip-path
android:pathData="M486.58,432.36c-3.29,54.82 -18.64,92.65 4.39,107.46l23.03,14.8 -113.49,88.27s-65.24,-75.11 -64.14,-90.46 26.21,-9.14 27.96,-26.32 0,-31.25 0,-31.25l106.91,-69.08 15.35,6.58Z"/>
android:pathData="M38,0L38,0A38,38 0,0 1,76 38L76,38A38,38 0,0 1,38 76L38,76A38,38 0,0 1,0 38L0,38A38,38 0,0 1,38 0z"/>
<path
android:pathData="M475.62,430.79c-12.83,45.46 -47.71,112.86 -142.55,107.38 -37.41,-2.16 17,-55.92 17,-55.92l125.56,-51.46Z"
android:strokeWidth="0"
android:fillColor="#fec4b5"/>
</group>
<path
android:pathData="M252,309.02c0,69.79 28.64,198.93 112.73,200.41 51,0.89 102.89,-48.31 118.99,-76.05 0,0 80.52,22.37 96.63,-39.37s-45.63,-100.2 -81.42,-59.94c0,0 -42.05,-134.2 -125.26,-134.2s-121.68,109.15 -121.68,109.15Z"
android:strokeWidth="0"
android:fillColor="#fed6ca"/>
<path
android:pathData="M341.88,250.04s7.91,-13.88 25.87,-6.97 19.02,26.25 16.89,45.77 7.11,35.55 7.11,35.55l12.6,-95.65 -39.54,-6.91 -23.52,17.27 0.59,10.94"
android:strokeWidth="0"
android:fillColor="#191314"/>
<path
android:pathData="M341.88,250.04c-16.14,-10.21 -53.09,22.01 -54.75,43.8 -5.9,-30.27 3.29,-62.4 3.29,-62.4l46.05,-11.91 5.41,30.52"
android:strokeWidth="0"
android:fillColor="#191314"/>
<path
android:pathData="M498.94,314.96c1.6,-25.94 30.75,-119.46 -50.6,-127.79 -24.32,-2.49 -43.61,2.13 -58.7,9.83 -7.63,-2.43 -26.03,-6.99 -43.48,-1.32 -14.25,4.64 -23.07,11.86 -27.67,16.6 -1.85,-1.45 -3.83,-2.93 -5.97,-4.45 -25.15,-17.83 -46.76,31.87 -57.64,63.99 -6.15,-13.46 -12.89,-23.44 -12.89,-23.44 -10.22,13.05 -23.9,28.86 -12.65,69.35 4.78,17.22 -9.35,29.36 -9.35,29.36 0,0 16.96,1.42 31.4,-10.23 -1.5,10.38 -4.02,17.8 -4.02,17.8 55.52,-3.22 28.4,-52.72 46.57,-83.3 31.04,-52.25 47.95,-21.31 47.95,-21.31 0,0 16.03,-31.19 39.2,-10.35 25.86,23.26 -32.96,106.66 42.35,121.25 0,0 -35.28,-30.53 -10.32,-78.33 0,0 5.44,54.45 57.65,62.77 0,0 -11.21,-4.16 -13.13,-22.1 0,0 12.81,19.22 44.52,17.94 0,0 -4.8,-0.32 -3.2,-26.26Z"
android:strokeWidth="0"
android:fillColor="#292021"/>
<path
android:pathData="M296.22,389.57m-23.91,0a23.91,23.91 0,1 1,47.82 0a23.91,23.91 0,1 1,-47.82 0"
android:strokeWidth="0"
android:fillColor="#ffc0c0"/>
<path
android:pathData="M409.93,389.57m-23.91,0a23.91,23.91 0,1 1,47.82 0a23.91,23.91 0,1 1,-47.82 0"
android:strokeWidth="0"
android:fillColor="#ffc0c0"/>
<path
android:pathData="M307.77,363.94a9.21,11.57 0,1 0,18.42 0a9.21,11.57 0,1 0,-18.42 0z"
android:strokeWidth="0"
android:fillColor="#191314"/>
<path
android:pathData="M381.45,363.94a9.21,11.57 0,1 0,18.42 0a9.21,11.57 0,1 0,-18.42 0z"
android:strokeWidth="0"
android:fillColor="#191314"/>
<path
android:pathData="M324.19,320.72s-24.5,-2.76 -41.93,6.67"
android:strokeWidth="7"
android:fillColor="#00000000"
android:strokeColor="#191314"
android:strokeLineCap="round"/>
<path
android:pathData="M375.67,321.41s24.29,-4.22 42.25,4.15"
android:strokeWidth="7"
android:fillColor="#00000000"
android:strokeColor="#191314"
android:strokeLineCap="round"/>
<path
android:pathData="M496.41,543.55c-10.03,-7.47 -7.32,-4.42 -11.94,-9.74 0,0 -80.77,80.78 -83.54,88.32s38.53,6.29 38.53,6.29l56.94,-84.87Z"
android:strokeWidth="0"
android:fillColor="#fec4b5"/>
<path
android:pathData="M400.93,622.13s-73.93,-66.94 -92.96,-64.5 -110.29,13.3 -158.22,89.61 -63.07,153.26 -63.07,153.26h713.81s-52.24,-163.35 -153.14,-209.39 -148.21,-43.52 -148.21,-43.52l-98.21,74.53"
android:fillColor="#e3faff"/>
<path
android:pathData="M422.76,646.03c10.9,-18.27 49.82,-33.92 49.82,-33.92l1.28,14.17 -45.1,36.52 -6,-16.77Z"
android:fillColor="#147c3e"/>
<group>
<clip-path
android:pathData="M422.76,646.03c10.9,-18.27 49.82,-33.92 49.82,-33.92l1.28,14.17 -45.1,36.52 -6,-16.77Z"/>
android:pathData="M76,0H0V76H76V0Z"
android:fillColor="#FBF8CB"/>
<path
android:pathData="M435.88,657.84c0.39,-5.64 -13.11,-20.83 -13.11,-20.83l-7.39,5.88 20.5,14.95"
android:strokeWidth="0"
android:fillColor="#147c3e"/>
</group>
<path
android:pathData="M382.68,650.92l-9.64,10.11s-27.93,-19.46 -29.59,-33.91l14.73,-11.67s4.15,14.54 24.5,35.47Z"
android:fillColor="#147c3e"/>
<group>
<clip-path
android:pathData="M382.68,650.92l-9.64,10.11s-27.93,-19.46 -29.59,-33.91l14.73,-11.67s4.15,14.54 24.5,35.47Z"/>
android:pathData="M57.95,77.966L67.64,49.542C68.314,47.472 67.574,45.192 65.807,43.909L41.971,26.59C40.204,25.308 37.819,25.308 36.053,26.59L12.217,43.909C10.45,45.192 9.718,47.462 10.384,49.542L19.494,77.567C20.169,79.638 22.097,81.045 24.282,81.045H53.751"
android:fillColor="#ffffff"/>
<path
android:pathData="M382.04,639.75c-9.49,5.25 -13.4,13.33 -12.16,19.73 1.32,6.81 3.5,7.83 3.5,7.83l13.83,-23.55 -5.16,-4.01Z"
android:strokeWidth="0"
android:fillColor="#147c3e"/>
</group>
<path
android:pathData="M400.93,622.13s-43.04,-40.48 -47.98,-63.82 3.79,-26.23 11.37,-32.2l0.55,-7.09s-19.05,1.22 -38,15.31 -40.91,19.03 -40.91,19.03l44.48,99.39s36.66,-50.83 70.5,-30.63"
android:strokeWidth="0"
android:fillColor="#d2f1f9"/>
<path
android:pathData="M400.93,622.13s29.23,-23.82 74.7,37.35c0,0 67.85,-72 98.34,-103.4 0,0 -48.16,-26.53 -59.99,-44.39 -11.19,-6.8 -27.17,-7.88 -35.35,-6.23 -0.02,6.8 -0.51,7.4 0.55,14.59 0,0 22.78,6.73 11.78,19.76s-75.95,69.86 -90.03,82.31Z"
android:strokeWidth="0"
android:fillColor="#d2f1f9"/>
<path
android:pathData="M385.18,695.04c-6.57,25.71 -21.64,105.46 -21.64,105.46h72.87l-20.51,-111.02 -30.73,5.56"
android:fillColor="#25a25f"/>
<group>
<clip-path
android:pathData="M385.18,695.04c-6.57,25.71 -21.64,105.46 -21.64,105.46h72.87l-20.51,-111.02 -30.73,5.56"/>
android:pathData="M57.95,77.966L67.64,49.542C68.314,47.472 67.574,45.192 65.807,43.909L41.971,26.59C40.204,25.308 37.819,25.308 36.053,26.59L12.217,43.909C10.45,45.192 9.718,47.462 10.384,49.542L19.494,77.567C20.169,79.638 22.097,81.045 24.282,81.045H53.751"
android:strokeWidth="1.425"
android:fillColor="#00000000"
android:strokeColor="#171717"
android:strokeLineCap="round"/>
<path
android:pathData="M37.506,63.441H38.599C38.988,63.441 39.321,63.707 39.397,64.077L41.762,75.8C41.829,76.2 41.705,76.608 41.42,76.902L39.017,79.372C38.504,79.895 37.649,79.914 37.126,79.401L34.618,76.979C34.314,76.684 34.172,76.257 34.248,75.839L36.718,64.077C36.794,63.707 37.126,63.441 37.516,63.441H37.506Z"
android:strokeWidth="1.425"
android:fillColor="#40A56B"
android:strokeColor="#171717"/>
<path
android:pathData="M39.168,63.907H36.955C36.518,63.907 36.147,63.603 36.053,63.185L35.54,60.952C35.407,60.373 35.853,59.812 36.442,59.812H39.701C40.299,59.812 40.745,60.373 40.603,60.952L40.071,63.185C39.976,63.603 39.596,63.897 39.168,63.897V63.907Z"
android:strokeWidth="1.425"
android:fillColor="#40A56B"
android:strokeColor="#171717"/>
<path
android:pathData="M31.663,53.447C31.663,53.779 31.616,54.131 31.502,54.416C31.388,54.701 31.036,54.872 30.808,55.1C30.58,55.328 30.409,55.623 30.105,55.746C29.801,55.869 29.488,55.841 29.155,55.841C28.823,55.841 28.509,55.822 28.224,55.699C27.939,55.575 27.654,55.395 27.426,55.167C27.198,54.938 26.999,54.682 26.875,54.378C26.752,54.074 26.638,53.761 26.638,53.438C26.638,53.114 26.837,52.811 26.961,52.526C27.084,52.241 27.274,52.003 27.502,51.775C27.73,51.547 27.939,51.319 28.234,51.195C28.528,51.072 28.832,51.072 29.165,51.072C29.497,51.072 29.801,51.082 30.086,51.205C30.371,51.328 30.647,51.509 30.875,51.728C31.103,51.946 31.293,52.212 31.416,52.507C31.54,52.801 31.682,53.105 31.682,53.438L31.663,53.447Z"
android:fillColor="#F9DBDE"/>
<path
android:pathData="M31.663,53.447C31.663,53.779 31.616,54.131 31.502,54.416C31.388,54.701 31.036,54.872 30.808,55.1C30.58,55.328 30.409,55.623 30.105,55.746C29.801,55.869 29.488,55.841 29.155,55.841C28.823,55.841 28.509,55.822 28.224,55.699C27.939,55.575 27.654,55.395 27.426,55.167C27.198,54.938 26.999,54.682 26.875,54.378C26.752,54.074 26.638,53.761 26.638,53.438C26.638,53.114 26.837,52.811 26.961,52.526C27.084,52.241 27.274,52.003 27.502,51.775C27.73,51.547 27.939,51.319 28.234,51.195C28.528,51.072 28.832,51.072 29.165,51.072C29.497,51.072 29.801,51.082 30.086,51.205C30.371,51.328 30.647,51.509 30.875,51.728C31.103,51.946 31.293,52.212 31.416,52.507C31.54,52.801 31.682,53.105 31.682,53.438L31.663,53.447Z"
android:strokeWidth="0.7315"
android:fillColor="#00000000"
android:strokeColor="#F9DBDE"/>
<path
android:pathData="M49.343,53.266C49.343,53.599 49.267,53.931 49.144,54.226C49.02,54.521 48.84,54.825 48.611,55.043C48.383,55.262 48.079,55.432 47.785,55.556C47.491,55.68 47.167,55.651 46.835,55.651C46.502,55.651 46.217,55.584 45.923,55.461C45.629,55.338 45.268,55.28 45.049,55.053C44.831,54.825 44.669,54.511 44.546,54.216C44.422,53.922 44.422,53.599 44.422,53.266C44.422,52.934 44.451,52.611 44.564,52.326C44.679,52.041 44.897,51.775 45.125,51.556C45.353,51.338 45.638,51.215 45.932,51.091C46.227,50.967 46.502,50.92 46.835,50.92C47.167,50.92 47.491,50.863 47.785,50.986C48.079,51.11 48.355,51.3 48.583,51.528C48.811,51.756 49.011,52.022 49.134,52.326C49.257,52.63 49.343,52.944 49.343,53.276V53.266Z"
android:fillColor="#F9DBDE"/>
<path
android:pathData="M49.343,53.266C49.343,53.599 49.267,53.931 49.144,54.226C49.02,54.521 48.84,54.825 48.611,55.043C48.383,55.262 48.079,55.432 47.785,55.556C47.491,55.68 47.167,55.651 46.835,55.651C46.502,55.651 46.217,55.584 45.923,55.461C45.629,55.338 45.268,55.28 45.049,55.053C44.831,54.825 44.669,54.511 44.546,54.216C44.422,53.922 44.422,53.599 44.422,53.266C44.422,52.934 44.451,52.611 44.564,52.326C44.679,52.041 44.897,51.775 45.125,51.556C45.353,51.338 45.638,51.215 45.932,51.091C46.227,50.967 46.502,50.92 46.835,50.92C47.167,50.92 47.491,50.863 47.785,50.986C48.079,51.11 48.355,51.3 48.583,51.528C48.811,51.756 49.011,52.022 49.134,52.326C49.257,52.63 49.343,52.944 49.343,53.276V53.266Z"
android:strokeWidth="0.7315"
android:fillColor="#00000000"
android:strokeColor="#F9DBDE"/>
<path
android:pathData="M34.818,52.497C35.384,52.497 35.843,51.791 35.843,50.92C35.843,50.049 35.384,49.343 34.818,49.343C34.251,49.343 33.792,50.049 33.792,50.92C33.792,51.791 34.251,52.497 34.818,52.497Z"
android:fillColor="#171717"/>
<path
android:pathData="M41.182,52.497C41.749,52.497 42.208,51.791 42.208,50.92C42.208,50.049 41.749,49.343 41.182,49.343C40.616,49.343 40.157,50.049 40.157,50.92C40.157,51.791 40.616,52.497 41.182,52.497Z"
android:fillColor="#171717"/>
<path
android:pathData="M379.74,707.57c36.05,-1.95 54.63,-18.08 54.63,-18.08l-59.03,-5.71 4.4,23.79Z"
android:strokeWidth="0"
android:fillColor="#147c3e"/>
android:pathData="M35.444,53.884C35.444,53.884 36.243,55.613 38.114,55.613C39.986,55.613 40.565,53.884 40.565,53.884"
android:strokeWidth="1.425"
android:fillColor="#00000000"
android:strokeColor="#171717"
android:strokeLineCap="round"/>
</group>
<path
android:pathData="M381.25,692.87c-1.9,0 -33.47,-49.99 16.2,-49.99 27.72,0 35.04,6.66 38.43,14.95s-10.17,30.52 -13.94,35.04 -35.04,6.03 -40.69,0Z"
android:strokeWidth="0"
android:fillColor="#25a25f"/>
</vector>
Loading

0 comments on commit 3ff3cff

Please sign in to comment.