Skip to content
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.

Sign up for GitHub

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

#188[fix] 개강 업데이트 전 수정사항 반영 #189

Merged
merged 4 commits into from
Feb 21, 2023
Merged

#188[fix] 개강 업데이트 전 수정사항 반영 #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0a9af4d
[fix] 결과 로딩 뷰 지속시간 2초에서 1초로 수정
KWY0218 Feb 10, 2023
d89da57
[fix] 테스트 클릭 시 색깔 빨간색에서 파란색으로 수정
KWY0218 Feb 10, 2023
fc6b907
[fix] 스플래쉬 로티 수정
KWY0218 Feb 10, 2023
4eff852
[fix] 성향테스트 화살표 asset 수정
KWY0218 Feb 15, 2023
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
2 changes: 1 addition & 1 deletion app/src/main/assets/splash.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .../main/java/hous/release/android/presentation/personality/test/PersonalityTestViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ class PersonalityTestViewModel @Inject constructor(
smellScore = requireNotNull(sumScore[QuestionType.SMELL])
)
.onSuccess { resultColor ->
delay(2000)
delay(1000)
onEvent(PersonalityTestEvent.GoToResultView(resultColor))
}
.onFailure {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/color/selector_personality_test_text.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/hous_red" android:state_selected="true" />
<item android:color="@color/hous_blue" android:state_selected="true" />
<item android:color="@color/hous_g_7" android:state_selected="false" />
</selector>
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/ic_test_left.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
android:viewportHeight="16">
<path
android:pathData="M1,6.268C-0.333,7.038 -0.333,8.962 1,9.732L10,14.928C11.333,15.698 13,14.736 13,13.196L13,2.804C13,1.264 11.333,0.302 10,1.072L1,6.268Z"
android:fillColor="#FFD4D4"/>
android:fillColor="#EAF2FF"/>
</vector>
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/ic_test_left_click.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
android:viewportHeight="16">
<path
android:pathData="M1,6.268C-0.333,7.038 -0.333,8.962 1,9.732L10,14.928C11.333,15.698 13,14.736 13,13.196L13,2.804C13,1.264 11.333,0.302 10,1.072L1,6.268Z"
android:fillColor="#FF6666"/>
android:fillColor="#5E9EFF"/>
</vector>
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/ic_test_right.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
android:viewportHeight="16">
<path
android:pathData="M12,6.268C13.333,7.038 13.333,8.962 12,9.732L3,14.928C1.667,15.698 -0,14.736 -0,13.196L-0,2.804C-0,1.264 1.667,0.302 3,1.072L12,6.268Z"
android:fillColor="#FFD4D4"/>
android:fillColor="#EAF2FF"/>
</vector>
4 changes: 2 additions & 2 deletions app/src/main/res/drawable/ic_test_right_click.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
android:viewportWidth="13"
android:viewportHeight="16">
<path
android:pathData="M12,9.732C13.333,8.962 13.333,7.038 12,6.268L3,1.072C1.667,0.302 0,1.264 0,2.804L0,13.196C0,14.736 1.667,15.698 3,14.928L12,9.732Z"
android:fillColor="#FF6666"/>
android:pathData="M12,6.268C13.333,7.038 13.333,8.962 12,9.732L3,14.928C1.667,15.698 -0,14.736 -0,13.196L-0,2.804C-0,1.264 1.667,0.302 3,1.072L12,6.268Z"
android:fillColor="#5E9EFF"/>
</vector>
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/selector_personality_test_btn.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/shape_g_1_fill_8_rect" android:state_selected="false" />
<item android:drawable="@drawable/shape_red_b_1_fill_8_rect" android:state_selected="true" />
<item android:drawable="@drawable/shape_blue_edit_fill_8_rect" android:state_selected="true" />
</selector>
7 changes: 7 additions & 0 deletions app/src/main/res/drawable/shape_blue_edit_fill_8_rect.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">

<solid android:color="@color/hous_blue_edit" />
<corners android:radius="8dp" />
</shape>