-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[FEAT/#221] 마이페이지 뷰 / 서버통신 구현 #225
Merged
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
32686a4
[FEAT/#221] 네비게이션 스택 정리
leeeyubin 3934118
Merge branch 'develop' of https://github.com/teamterning/Terning-Andr…
leeeyubin a854109
[FEAT/#221] 마이페이지 서버통신 수정사항 반영
leeeyubin e34d4d9
[FEAT/#221] 마이페이지 실패 화면 적용
leeeyubin f116f31
[FEAT/#221] 주석 수정
leeeyubin dcf7894
[FEAT/#221] 프로필 수정 뷰 서버통신 구현
leeeyubin b668696
[FEAT/#221] 코드 수정
leeeyubin 34cab10
[FEAT/#221] @DrawableRes 어노테이션 추가
leeeyubin a4f1c0c
[MOD/#221] 주석 수정
leeeyubin fdba10c
[FEAT/#221] SnackBar 구현
leeeyubin 348b2a0
[FEAT/#221] 임시 수정
leeeyubin File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
23 changes: 23 additions & 0 deletions
23
core/src/main/java/com/terning/core/designsystem/component/snackbar/TerningBasicSnackBar.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
package com.terning.core.designsystem.component.snackbar | ||
|
||
import androidx.compose.foundation.background | ||
import androidx.compose.foundation.layout.Box | ||
import androidx.compose.foundation.layout.padding | ||
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.unit.dp | ||
import com.terning.core.designsystem.theme.Grey500 | ||
|
||
@Composable | ||
fun TerningBasicSnackBar(content: @Composable () -> Unit) { | ||
Box( | ||
modifier = Modifier | ||
.clip(CircleShape) | ||
.background(Grey500) | ||
.padding(vertical = 7.dp, horizontal = 20.dp) | ||
) { | ||
content() | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
package com.terning.core.type | ||
|
||
import androidx.annotation.DrawableRes | ||
import com.terning.core.R | ||
|
||
enum class ProfileImage( | ||
@DrawableRes val drawableResId: Int, | ||
val stringValue: String | ||
) { | ||
|
||
BASIC(drawableResId = R.drawable.ic_terning_profile_00, stringValue = "basic"), | ||
LUCKY(drawableResId = R.drawable.ic_terning_profile_01, stringValue = "lucky"), | ||
SMART(drawableResId = R.drawable.ic_terning_profile_02, stringValue = "smart"), | ||
GLASS(drawableResId = R.drawable.ic_terning_profile_03, stringValue = "glass"), | ||
CALENDAR(drawableResId = R.drawable.ic_terning_profile_04, stringValue = "calendar"), | ||
PASSION(drawableResId = R.drawable.ic_terning_profile_05, stringValue = "passion"), | ||
DEFAULT(drawableResId = R.drawable.ic_terning_profile_default, stringValue = "default"); | ||
|
||
companion object { | ||
fun fromString(value: String): ProfileImage = when (value) { | ||
"basic" -> BASIC | ||
"lucky" -> LUCKY | ||
"smart" -> SMART | ||
"glass" -> GLASS | ||
"calendar" -> CALENDAR | ||
"passion" -> PASSION | ||
else -> BASIC | ||
} | ||
|
||
fun toIndex(profileImage: ProfileImage): Int = | ||
entries.indexOf(profileImage) | ||
} | ||
} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
이렇게 관리하는거 좋네요!! 배워갑니당ㅎㅎ