-
Notifications
You must be signed in to change notification settings - Fork 0
[Refactor/#125] 감정구슬 리디자인 적용 #126
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
Merged
Merged
Changes from 9 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
66543dd
Add: 구슬 감정 화면에 사용되는 이미지 파일 추가
l5x5l 626487e
CHORE: 기존 감정구슬 선택, 추천 루틴 화면를 emotion/component/template으로 이동
l5x5l 3ed3404
FIX: 감정구슬 이미지 데이터 클래스 및 감정구슬 이미지 Ui 분리
l5x5l ef69c1d
FEAT: 감정구슬 리디자인 화면 구현
l5x5l 55e0863
FEAT: 감정구슬 리디자인 화면 세부 조정 및 감정 구슬 데이터에 배경/텍스트 색상 변수 추가
l5x5l b3ea5cd
CHORE: ktlint 적용
l5x5l da55196
FIX: 감정 등록 중 타임아웃과 같은 에러 발생시 토스트 메세지 출력 후 이전 화면으로 이동되도록 수정
l5x5l 7c76a1a
FEAT: 감정 등록 중 표시될 로딩 UI 구현 및 해당 화면에 사용되는 리소스 추가
l5x5l 1b08cab
FIX: 기기의 높이가 600.dp를 넘지 못하는 경우, 기존 감정구슬 선택화면이 표시되도록 수정
l5x5l 15c5ba3
FIX: 일부 오타 수정, 일부 변수가 반영되지 않던 문제 수정
l5x5l 6aa82ac
FIX: EmotionUiModel내 일부 메서드명 수정
l5x5l d69bd15
FIX: 감정구슬 추천 루틴 화면에서 일부 문구 및 글자 색상 수정
l5x5l 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 hidden or 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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.47 KB
core/designsystem/src/main/res/drawable-hdpi/img_marble_pomo_left_hand.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.48 KB
core/designsystem/src/main/res/drawable-hdpi/img_marble_pomo_right_hand.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+909 Bytes
core/designsystem/src/main/res/drawable-mdpi/img_marble_pomo_left_hand.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1008 Bytes
core/designsystem/src/main/res/drawable-mdpi/img_marble_pomo_right_hand.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+2 KB
core/designsystem/src/main/res/drawable-xhdpi/img_marble_pomo_left_hand.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+2.03 KB
core/designsystem/src/main/res/drawable-xhdpi/img_marble_pomo_right_hand.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+2.9 KB
core/designsystem/src/main/res/drawable-xxhdpi/img_marble_pomo_left_hand.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+3.05 KB
core/designsystem/src/main/res/drawable-xxhdpi/img_marble_pomo_right_hand.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.
Binary file added
BIN
+4.12 KB
core/designsystem/src/main/res/drawable-xxxhdpi/img_marble_pomo_left_hand.png
Oops, something went wrong.
Binary file added
BIN
+4.2 KB
core/designsystem/src/main/res/drawable-xxxhdpi/img_marble_pomo_right_hand.png
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
20 changes: 20 additions & 0 deletions
20
core/designsystem/src/main/res/drawable/ic_double_down_arrow_24.xml
This file contains hidden or 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,20 @@ | ||
<vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
android:width="24dp" | ||
android:height="24dp" | ||
android:viewportWidth="24" | ||
android:viewportHeight="24"> | ||
<path | ||
android:pathData="M18.979,4.675C18.69,4.965 18.43,4.705 18.139,4.995C17.85,5.285 17.869,5.305 17.58,5.595C17.289,5.885 17.34,5.935 17.049,6.225C16.76,6.515 16.959,6.715 16.67,7.015C16.379,7.315 16.49,7.425 16.199,7.715C15.91,8.005 15.91,8.005 15.62,8.295C15.33,8.585 15.189,8.455 14.899,8.745C14.609,9.035 14.59,9.015 14.3,9.305C14.009,9.595 13.95,9.545 13.66,9.835C13.37,10.125 13.479,10.235 13.179,10.525C12.88,10.815 12.59,10.525 12.3,10.815C12.009,11.105 12.33,11.495 11.91,11.495C11.49,11.495 11.45,11.485 11.16,11.195C10.87,10.905 11.05,10.725 10.759,10.435C10.469,10.145 10.639,9.975 10.349,9.685C10.059,9.395 9.98,9.475 9.69,9.185C9.4,8.895 9.31,8.985 9.02,8.685C8.73,8.385 8.9,8.225 8.61,7.935C8.32,7.645 8.1,7.865 7.81,7.575C7.52,7.285 7.44,7.365 7.15,7.075C6.86,6.785 6.78,6.865 6.49,6.565C6.2,6.265 6.49,5.975 6.2,5.675C5.91,5.375 5.76,5.535 5.46,5.235C5.16,4.935 5.31,4.795 5.02,4.505" | ||
android:strokeLineJoin="round" | ||
android:strokeWidth="2" | ||
android:fillColor="#00000000" | ||
android:strokeColor="#878A93" | ||
android:strokeLineCap="round"/> | ||
<path | ||
android:pathData="M18.979,12.675C18.69,12.965 18.43,12.705 18.139,12.995C17.85,13.285 17.869,13.305 17.58,13.595C17.289,13.885 17.34,13.935 17.049,14.225C16.76,14.515 16.959,14.715 16.67,15.015C16.379,15.315 16.49,15.425 16.199,15.715C15.91,16.005 15.91,16.005 15.62,16.295C15.33,16.585 15.189,16.455 14.899,16.745C14.609,17.035 14.59,17.015 14.3,17.305C14.009,17.595 13.95,17.545 13.66,17.835C13.37,18.125 13.479,18.235 13.179,18.525C12.88,18.815 12.59,18.525 12.3,18.815C12.009,19.105 12.33,19.495 11.91,19.495C11.49,19.495 11.45,19.485 11.16,19.195C10.87,18.905 11.05,18.725 10.759,18.435C10.469,18.145 10.639,17.975 10.349,17.685C10.059,17.395 9.98,17.475 9.69,17.185C9.4,16.895 9.31,16.985 9.02,16.685C8.73,16.385 8.9,16.225 8.61,15.935C8.32,15.645 8.1,15.865 7.81,15.575C7.52,15.285 7.44,15.365 7.15,15.075C6.86,14.785 6.78,14.865 6.49,14.565C6.2,14.265 6.49,13.975 6.2,13.675C5.91,13.375 5.76,13.535 5.46,13.235C5.16,12.935 5.31,12.795 5.02,12.505" | ||
android:strokeLineJoin="round" | ||
android:strokeWidth="2" | ||
android:fillColor="#00000000" | ||
android:strokeColor="#878A93" | ||
android:strokeLineCap="round"/> | ||
</vector> |
20 changes: 20 additions & 0 deletions
20
core/designsystem/src/main/res/drawable/ic_double_left_arrow_24.xml
This file contains hidden or 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,20 @@ | ||
<vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
android:width="24dp" | ||
android:height="24dp" | ||
android:viewportWidth="24" | ||
android:viewportHeight="24"> | ||
<path | ||
android:pathData="M19.325,18.979C19.035,18.69 19.295,18.43 19.005,18.139C18.715,17.85 18.695,17.869 18.405,17.58C18.115,17.289 18.065,17.34 17.775,17.049C17.485,16.76 17.285,16.959 16.985,16.67C16.685,16.379 16.575,16.49 16.285,16.199C15.995,15.91 15.995,15.91 15.705,15.62C15.415,15.33 15.545,15.189 15.255,14.899C14.965,14.609 14.985,14.59 14.695,14.3C14.405,14.009 14.455,13.95 14.165,13.66C13.875,13.37 13.765,13.479 13.475,13.179C13.185,12.88 13.475,12.59 13.185,12.3C12.895,12.009 12.505,12.33 12.505,11.91C12.505,11.49 12.515,11.45 12.805,11.16C13.095,10.87 13.275,11.05 13.565,10.759C13.855,10.469 14.025,10.639 14.315,10.349C14.605,10.059 14.525,9.98 14.815,9.69C15.105,9.4 15.015,9.31 15.315,9.02C15.615,8.73 15.775,8.9 16.065,8.61C16.355,8.32 16.135,8.1 16.425,7.81C16.715,7.52 16.635,7.44 16.925,7.15C17.215,6.86 17.135,6.78 17.435,6.49C17.735,6.2 18.025,6.49 18.325,6.2C18.625,5.91 18.465,5.76 18.765,5.46C19.065,5.16 19.205,5.31 19.495,5.02" | ||
android:strokeLineJoin="round" | ||
android:strokeWidth="2" | ||
android:fillColor="#00000000" | ||
android:strokeColor="#878A93" | ||
android:strokeLineCap="round"/> | ||
<path | ||
android:pathData="M11.325,18.979C11.035,18.69 11.295,18.43 11.005,18.139C10.715,17.85 10.695,17.869 10.405,17.58C10.115,17.289 10.065,17.34 9.775,17.049C9.485,16.76 9.285,16.959 8.985,16.67C8.685,16.379 8.575,16.49 8.285,16.199C7.995,15.91 7.995,15.91 7.705,15.62C7.415,15.33 7.545,15.189 7.255,14.899C6.965,14.609 6.985,14.59 6.695,14.3C6.405,14.009 6.455,13.95 6.165,13.66C5.875,13.37 5.765,13.479 5.475,13.179C5.185,12.88 5.475,12.59 5.185,12.3C4.895,12.009 4.505,12.33 4.505,11.91C4.505,11.49 4.515,11.45 4.805,11.16C5.095,10.87 5.275,11.05 5.565,10.759C5.855,10.469 6.025,10.639 6.315,10.349C6.605,10.059 6.525,9.98 6.815,9.69C7.105,9.4 7.015,9.31 7.315,9.02C7.615,8.73 7.775,8.9 8.065,8.61C8.355,8.32 8.135,8.1 8.425,7.81C8.715,7.52 8.635,7.44 8.925,7.15C9.215,6.86 9.135,6.78 9.435,6.49C9.735,6.2 10.025,6.49 10.325,6.2C10.625,5.91 10.465,5.76 10.765,5.46C11.065,5.16 11.205,5.31 11.495,5.02" | ||
android:strokeLineJoin="round" | ||
android:strokeWidth="2" | ||
android:fillColor="#00000000" | ||
android:strokeColor="#878A93" | ||
android:strokeLineCap="round"/> | ||
l5x5l marked this conversation as resolved.
Show resolved
Hide resolved
|
||
</vector> |
20 changes: 20 additions & 0 deletions
20
core/designsystem/src/main/res/drawable/ic_double_right_arrow_24.xml
This file contains hidden or 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,20 @@ | ||
<vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
android:width="24dp" | ||
android:height="24dp" | ||
android:viewportWidth="24" | ||
android:viewportHeight="24"> | ||
<path | ||
android:pathData="M4.675,5.02C4.965,5.31 4.705,5.57 4.995,5.86C5.285,6.15 5.305,6.13 5.595,6.42C5.885,6.71 5.935,6.66 6.225,6.95C6.515,7.24 6.715,7.04 7.015,7.33C7.315,7.62 7.425,7.51 7.715,7.8C8.005,8.09 8.005,8.09 8.295,8.38C8.585,8.67 8.455,8.81 8.745,9.1C9.035,9.39 9.015,9.41 9.305,9.7C9.595,9.99 9.545,10.05 9.835,10.34C10.125,10.63 10.235,10.521 10.525,10.821C10.815,11.12 10.525,11.41 10.815,11.7C11.105,11.991 11.495,11.67 11.495,12.09C11.495,12.51 11.485,12.55 11.195,12.84C10.905,13.13 10.725,12.95 10.435,13.241C10.145,13.531 9.975,13.361 9.685,13.651C9.395,13.941 9.475,14.021 9.185,14.311C8.895,14.601 8.985,14.691 8.685,14.981C8.385,15.271 8.225,15.101 7.935,15.391C7.645,15.681 7.865,15.901 7.575,16.191C7.285,16.48 7.365,16.56 7.075,16.851C6.785,17.14 6.865,17.221 6.565,17.51C6.265,17.801 5.975,17.51 5.675,17.801C5.375,18.09 5.535,18.24 5.235,18.541C4.935,18.84 4.795,18.691 4.505,18.98" | ||
android:strokeLineJoin="round" | ||
android:strokeWidth="2" | ||
android:fillColor="#00000000" | ||
android:strokeColor="#878A93" | ||
android:strokeLineCap="round"/> | ||
<path | ||
android:pathData="M12.675,5.02C12.965,5.31 12.705,5.57 12.995,5.86C13.285,6.15 13.305,6.13 13.595,6.42C13.885,6.71 13.935,6.66 14.225,6.95C14.515,7.24 14.715,7.04 15.015,7.33C15.315,7.62 15.425,7.51 15.715,7.8C16.005,8.09 16.005,8.09 16.295,8.38C16.585,8.67 16.455,8.81 16.745,9.1C17.035,9.39 17.015,9.41 17.305,9.7C17.595,9.99 17.545,10.05 17.835,10.34C18.125,10.63 18.235,10.521 18.525,10.821C18.815,11.12 18.525,11.41 18.815,11.7C19.105,11.991 19.495,11.67 19.495,12.09C19.495,12.51 19.485,12.55 19.195,12.84C18.905,13.13 18.725,12.95 18.435,13.241C18.145,13.531 17.975,13.361 17.685,13.651C17.395,13.941 17.475,14.021 17.185,14.311C16.895,14.601 16.985,14.691 16.685,14.981C16.385,15.271 16.225,15.101 15.935,15.391C15.645,15.681 15.865,15.901 15.575,16.191C15.285,16.48 15.365,16.56 15.075,16.851C14.785,17.14 14.865,17.221 14.565,17.51C14.265,17.801 13.975,17.51 13.675,17.801C13.375,18.09 13.535,18.24 13.235,18.541C12.935,18.84 12.795,18.691 12.505,18.98" | ||
android:strokeLineJoin="round" | ||
android:strokeWidth="2" | ||
android:fillColor="#00000000" | ||
android:strokeColor="#878A93" | ||
android:strokeLineCap="round"/> | ||
l5x5l marked this conversation as resolved.
Show resolved
Hide resolved
|
||
</vector> |
8 changes: 8 additions & 0 deletions
8
presentation/src/main/java/com/threegap/bitnagil/presentation/common/dimension/DpToPx.kt
This file contains hidden or 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,8 @@ | ||
package com.threegap.bitnagil.presentation.common.dimension | ||
|
||
import androidx.compose.runtime.Composable | ||
import androidx.compose.ui.platform.LocalDensity | ||
import androidx.compose.ui.unit.Dp | ||
|
||
@Composable | ||
fun Dp.dpToPx() = with(LocalDensity.current) { [email protected]() } |
10 changes: 10 additions & 0 deletions
10
presentation/src/main/java/com/threegap/bitnagil/presentation/common/dimension/PxToDp.kt
This file contains hidden or 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,10 @@ | ||
package com.threegap.bitnagil.presentation.common.dimension | ||
|
||
import androidx.compose.runtime.Composable | ||
import androidx.compose.ui.platform.LocalDensity | ||
|
||
@Composable | ||
fun Float.pxToDp() = with(LocalDensity.current) { [email protected]() } | ||
|
||
@Composable | ||
fun Int.pxToDp() = with(LocalDensity.current) { [email protected]() } |
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.
Uh oh!
There was an error while loading. Please reload this page.