Skip to content

Commit

Permalink
기본 프로필사진 아이콘 2차 수정 (#99)
Browse files Browse the repository at this point in the history 
* 임시커밋

* ic_rice_bowl 최종수정

* ic_rice_bowl_new 제거

* UserProfileFragment의 기본이미지를 Glide 대신 setImageResource로 표시
  • Loading branch information
@eastshine2741
eastshine2741 authored Aug 31, 2024
1 parent d82aca9 commit 8ce30bf
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 69 deletions.
2 changes: 1 addition & 1 deletion app/src/main/java/com/wafflestudio/siksha2/compose/ui/community/CommunityProfilePicture.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ fun CommunityProfilePicture(
) {
if (model == null) {
Image(
painter = painterResource(R.drawable.ic_rice_bowl_new),
painter = painterResource(R.drawable.ic_rice_bowl),
contentDescription = "",
modifier = modifier.size(30.dp)
)
Expand Down
11 changes: 9 additions & 2 deletions ...src/main/java/com/wafflestudio/siksha2/ui/main/setting/userAccount/UserProfileFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.view.inputmethod.InputMethodManager
import android.widget.ImageView
import androidx.activity.result.contract.ActivityResultContracts
import androidx.fragment.app.Fragment
import androidx.fragment.app.activityViewModels
Expand Down Expand Up @@ -98,7 +99,10 @@ class UserProfileFragment : Fragment() {
if (imageUrl != null) {
Glide.with(this).load(imageUrl).circleCrop().into(imageView)
} else {
Glide.with(this).load(R.drawable.ic_rice_bowl).circleCrop().into(imageView)
imageView.apply {
setImageResource(R.drawable.ic_rice_bowl)
scaleType = ImageView.ScaleType.CENTER_CROP
}
}
}
}
Expand Down Expand Up @@ -160,7 +164,10 @@ class UserProfileFragment : Fragment() {

private fun changeToDefaultImage() {
userSettingViewModel.updateImageUri(null)
Glide.with(this).load(R.drawable.ic_rice_bowl).circleCrop().into(imageView)
imageView.apply {
setImageResource(R.drawable.ic_rice_bowl)
scaleType = ImageView.ScaleType.CENTER_CROP
}
imageChanged = true
}
}
63 changes: 28 additions & 35 deletions app/src/main/res/drawable/ic_rice_bowl.xml
View file
Original file line number Diff line number Diff line change
@@ -1,38 +1,31 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="73dp"
android:height="73dp"
android:viewportWidth="73"
android:viewportHeight="73">
<path
android:pathData="M36.5,36.5m-36.5,0a36.5,36.5 0,1 1,73 0a36.5,36.5 0,1 1,-73 0">
<aapt:attr name="android:fillColor">
<gradient
android:startY="0"
android:startX="0"
android:endY="73"
android:endX="73"
android:type="linear">
<item android:offset="0" android:color="#FFFF9A44"/>
<item android:offset="1" android:color="#FFFD7878"/>
</gradient>
</aapt:attr>
</path>
<path
android:pathData="M57.9292,30.7072C57.6564,30.0618 57.2596,29.4735 56.7636,28.9833C56.2593,28.485 55.6723,28.0928 55.0109,27.8314C54.7381,27.717 54.4653,27.6353 54.1842,27.5699C54.2586,27.2268 54.2917,26.8673 54.2917,26.5079C54.2917,25.8052 54.1512,25.119 53.8783,24.4735C53.6055,23.8281 53.2087,23.2399 52.7127,22.7497C52.2084,22.2513 51.6214,21.8592 50.96,21.5977C50.3069,21.3281 49.6042,21.1892 48.8932,21.1892C48.1823,21.1892 47.4878,21.3281 46.8264,21.5977C46.7355,21.6386 46.6446,21.6794 46.5536,21.7203C46.5454,21.0422 46.4048,20.3722 46.1485,19.7432C45.8757,19.0977 45.4789,18.5095 44.9829,18.0193C44.4786,17.5128 43.8833,17.1206 43.2302,16.8592C42.5771,16.5896 41.8744,16.4507 41.1634,16.4507C40.4525,16.4507 39.758,16.5896 39.0966,16.8592C38.4435,17.1288 37.8483,17.5209 37.344,18.0111C37.1208,18.2317 36.9224,18.4605 36.7488,18.7138C36.5669,18.4605 36.3685,18.2317 36.1535,18.0111C35.6658,17.5128 35.0705,17.1206 34.4174,16.8592C33.7643,16.5896 33.0616,16.4507 32.3506,16.4507C31.6397,16.4507 30.9452,16.5896 30.2839,16.8592C29.6307,17.1288 29.0355,17.5209 28.5312,18.0111C28.0269,18.5013 27.6301,19.0896 27.3655,19.735C27.101,20.3641 26.9687,21.034 26.9605,21.7121C26.2412,21.369 25.4393,21.1811 24.6208,21.1811C23.9099,21.1811 23.2154,21.32 22.5541,21.5896C21.9092,21.8592 21.314,22.2513 20.8097,22.7415C20.3054,23.2399 19.9086,23.82 19.644,24.4654C19.3712,25.1108 19.2307,25.8052 19.2307,26.4997C19.2307,26.8592 19.2637,27.2105 19.3381,27.5618C19.057,27.6271 18.776,27.717 18.5114,27.8232C17.8583,28.0928 17.2631,28.485 16.7588,28.9752C16.2545,29.4735 15.8577,30.0536 15.5931,30.699C15.3203,31.3445 15.1797,32.0389 15.1797,32.7333C15.1797,34.1467 15.7502,35.5029 16.7588,36.4997C17.7674,37.4964 19.1397,38.0601 20.5699,38.0601C22.0002,38.0601 23.3725,37.4964 24.3811,36.4997C24.4638,36.418 24.5464,36.3363 24.6208,36.2464V36.6631H48.8932V36.2464C48.9676,36.3363 49.0503,36.418 49.133,36.4997C50.1416,37.4964 51.5139,38.0601 52.9441,38.0601C54.3744,38.0601 55.7467,37.4964 56.7553,36.4997C57.7639,35.5029 58.3343,34.1467 58.3343,32.7333C58.3426,32.0471 58.2021,31.3608 57.9292,30.7072Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M47.4135,57.2186C47.6945,57.2186 47.8847,56.949 47.802,56.6794L47.4796,55.6909C47.4217,55.5111 47.4961,55.3069 47.6615,55.217C47.8764,55.0945 48.1988,54.9147 48.6039,54.6696C49.3232,54.2448 50.2987,53.632 51.3486,52.8804C51.5966,52.7088 51.8364,52.5373 52.0761,52.3575C52.5556,52.0062 53.0351,51.6141 53.5146,51.1892C53.6221,51.0994 53.7213,51.0095 53.8288,50.9196H53.8122C56.5983,48.3134 59.1198,44.4245 59.1198,39.0978V33.7546C59.1198,33.3461 58.756,33.0357 58.3509,33.0929C55.6558,33.5014 46.2726,34.8167 36.8315,34.8167C27.3739,34.8167 17.8584,33.5014 15.1467,33.0929C14.7582,33.0357 14.3944,33.3461 14.3944,33.7546V39.0978C14.3944,44.4082 16.8911,48.2889 19.7185,50.9196H19.6937C19.8755,51.083 20.0574,51.2383 20.2393,51.3853C20.9089,51.9654 21.5868,52.4883 22.2482,52.9376C23.108,53.5504 23.9099,54.0569 24.5548,54.4572C25.1417,54.8085 25.6047,55.07 25.8775,55.217C26.0428,55.3069 26.1255,55.503 26.0676,55.6909L25.7618,56.6794C25.6791,56.9409 25.8692,57.2186 26.1503,57.2186H47.4135Z">
<aapt:attr name="android:fillColor">
<gradient
android:startY="34.0393"
android:startX="19.671"
android:endY="57.3778"
android:endX="53.4385"
android:type="linear">
<item android:offset="0" android:color="#FFF7ECD1"/>
<item android:offset="1" android:color="#FFF4B59E"/>
</gradient>
</aapt:attr>
</path>
android:width="24dp"
android:height="25dp"
android:viewportWidth="24"
android:viewportHeight="25">
<group>
<clip-path
android:pathData="M12,0.668L12,0.668A12,12 0,0 1,24 12.668L24,12.668A12,12 0,0 1,12 24.668L12,24.668A12,12 0,0 1,0 12.668L0,12.668A12,12 0,0 1,12 0.668z"/>
<path
android:pathData="M12,0.668L12,0.668A12,12 0,0 1,24 12.668L24,12.668A12,12 0,0 1,12 24.668L12,24.668A12,12 0,0 1,0 12.668L0,12.668A12,12 0,0 1,12 0.668z"
android:fillColor="#FF9522"/>
<path
android:pathData="M17.794,10.937C17.719,10.754 17.611,10.588 17.475,10.45C17.337,10.309 17.176,10.198 16.995,10.124C16.921,10.092 16.846,10.069 16.769,10.05C16.789,9.953 16.799,9.852 16.799,9.75C16.799,9.552 16.76,9.358 16.685,9.175C16.611,8.993 16.502,8.827 16.366,8.688C16.228,8.547 16.068,8.437 15.887,8.363C15.708,8.286 15.516,8.247 15.321,8.247C15.127,8.247 14.936,8.286 14.755,8.363C14.731,8.374 14.706,8.386 14.681,8.397C14.679,8.206 14.64,8.016 14.57,7.839C14.495,7.656 14.387,7.49 14.251,7.351C14.113,7.208 13.95,7.098 13.771,7.024C13.593,6.947 13.4,6.908 13.206,6.908C13.011,6.908 12.821,6.947 12.64,7.024C12.461,7.1 12.299,7.211 12.16,7.349C12.099,7.411 12.045,7.476 11.998,7.548C11.948,7.476 11.894,7.411 11.835,7.349C11.701,7.208 11.538,7.098 11.359,7.024C11.181,6.947 10.988,6.908 10.794,6.908C10.599,6.908 10.409,6.947 10.228,7.024C10.05,7.1 9.887,7.211 9.749,7.349C9.611,7.488 9.502,7.654 9.43,7.836C9.357,8.014 9.321,8.203 9.319,8.395C9.122,8.298 8.902,8.245 8.678,8.245C8.484,8.245 8.294,8.284 8.113,8.36C7.936,8.437 7.773,8.547 7.635,8.686C7.497,8.827 7.389,8.991 7.317,9.173C7.242,9.355 7.203,9.552 7.203,9.748C7.203,9.849 7.212,9.949 7.233,10.048C7.156,10.066 7.079,10.092 7.006,10.122C6.828,10.198 6.665,10.309 6.527,10.447C6.389,10.588 6.28,10.752 6.208,10.934C6.133,11.117 6.095,11.313 6.095,11.509C6.095,11.909 6.251,12.292 6.527,12.573C6.803,12.855 7.178,13.014 7.57,13.014C7.961,13.014 8.337,12.855 8.613,12.573C8.636,12.55 8.658,12.527 8.678,12.502V12.62H15.321V12.502C15.342,12.527 15.364,12.55 15.387,12.573C15.663,12.855 16.038,13.014 16.43,13.014C16.821,13.014 17.197,12.855 17.473,12.573C17.749,12.292 17.905,11.909 17.905,11.509C17.907,11.315 17.869,11.121 17.794,10.937Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M14.916,18.428C14.993,18.428 15.045,18.352 15.023,18.276L14.934,17.997C14.918,17.946 14.939,17.888 14.984,17.862C15.043,17.828 15.131,17.777 15.242,17.708C15.439,17.588 15.706,17.415 15.993,17.202C16.061,17.154 16.127,17.105 16.192,17.055C16.323,16.955 16.455,16.844 16.586,16.724C16.615,16.699 16.642,16.674 16.672,16.648H16.667C17.43,15.912 18.12,14.813 18.12,13.308V11.798C18.12,11.682 18.02,11.595 17.91,11.611C17.172,11.726 14.604,12.098 12.02,12.098C9.432,12.098 6.828,11.726 6.086,11.611C5.979,11.595 5.88,11.682 5.88,11.798V13.308C5.88,14.808 6.563,15.905 7.337,16.648H7.33C7.38,16.694 7.43,16.738 7.479,16.78C7.663,16.944 7.848,17.091 8.029,17.219C8.265,17.392 8.484,17.535 8.66,17.648C8.821,17.747 8.948,17.821 9.022,17.862C9.068,17.888 9.09,17.943 9.075,17.997L8.991,18.276C8.968,18.35 9.02,18.428 9.097,18.428H14.916Z">
<aapt:attr name="android:fillColor">
<gradient
android:startX="7.324"
android:startY="11.878"
android:endX="16.754"
android:endY="18.191"
android:type="linear">
<item android:offset="0" android:color="#FFF7ECD1"/>
<item android:offset="1" android:color="#FFF4B59E"/>
</gradient>
</aapt:attr>
</path>
</group>
</vector>
31 changes: 0 additions & 31 deletions app/src/main/res/drawable/ic_rice_bowl_new.xml
View file

This file was deleted.

0 comments on commit 8ce30bf

Please sign in to comment.