Skip to content

Commit

Permalink
[FEAT/#81] Tendency Result UI 최종 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
@chattymin
chattymin committed Jan 12, 2024
1 parent c8cf44a commit 33f6605
Show file tree
Hide file tree
Showing 5 changed files with 61 additions and 36 deletions.
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@

<activity
android:name="com.going.presentation.tendency.result.TendencyResultActivity"
android:exported="true"
android:exported="false"
android:screenOrientation="portrait" />

<activity
Expand Down
4 changes: 2 additions & 2 deletions presentation/src/main/java/com/going/presentation/tendency/result/TendencyResultActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,13 @@ class TendencyResultActivity :
}

private fun initSaveImgBtnClickListener() {
binding.btnTendencyTestResultSave.setOnSingleClickListener {
binding.btnTendencyResultDownload.setOnSingleClickListener {
toast("추후 업데이트 예정")
}
}

private fun initFinishBtnClickListener() {
binding.btnTendencyTestResultFinish.setOnSingleClickListener {
binding.btnTendencyResultFinish.setOnSingleClickListener {
navigateToDashBoardScreen()
}
}
Expand Down
14 changes: 14 additions & 0 deletions presentation/src/main/res/drawable/ic_download.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="20dp"
android:height="18dp"
android:viewportWidth="20"
android:viewportHeight="18">
<path
android:pathData="M0,15.045V7.865C0,7.676 0.154,7.522 0.343,7.522H1.371C1.561,7.522 1.714,7.676 1.714,7.865V15.045C1.714,15.787 2.354,16.388 3.143,16.388H16.857C17.646,16.388 18.286,15.787 18.286,15.045V7.865C18.286,7.676 18.439,7.522 18.629,7.522H19.657C19.847,7.522 20,7.676 20,7.865V15.045C20,16.677 18.593,18 16.857,18H3.143C1.407,18 0,16.677 0,15.045Z"
android:fillColor="#4A4D63"
android:fillType="evenOdd"/>
<path
android:pathData="M10.514,0C10.704,0 10.857,0.154 10.857,0.343V9.073C10.857,9.174 10.977,9.225 11.05,9.157L14.302,6.099C14.434,5.975 14.64,5.975 14.772,6.099L15.483,6.768C15.627,6.903 15.627,7.132 15.483,7.267L10.606,11.854C10.271,12.168 9.729,12.168 9.394,11.854L4.517,7.267C4.373,7.132 4.373,6.903 4.517,6.768L5.228,6.099C5.36,5.975 5.566,5.975 5.698,6.099L8.95,9.157C9.023,9.225 9.143,9.174 9.143,9.073V0.343C9.143,0.154 9.296,0 9.486,0H10.514Z"
android:fillColor="#4A4D63"
android:fillType="evenOdd"/>
</vector>
73 changes: 42 additions & 31 deletions presentation/src/main/res/layout/activity_tendency_result.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,27 +10,56 @@
android:layout_width="match_parent"
android:layout_height="match_parent">

<androidx.appcompat.widget.Toolbar
android:id="@+id/tb_tendency_test_result"
style="@style/toolbar_style"
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/toolbar_tendency_result"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:elevation="1dp"
android:paddingStart="24dp"
android:paddingTop="32dp"
android:paddingBottom="16dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:title="@string/tendency_test_title" />
app:layout_constraintTop_toTopOf="parent">

<TextView
android:id="@+id/tv_tendency_test_title"
style="@style/TextAppearance.Doorip.Body1.Bold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="32dp"
android:layout_marginBottom="16dp"
android:text="@string/tendency_test_title"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@id/toolbar_tendency_result"/>

<ImageView
android:id="@+id/btn_tendency_result_download"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="33dp"
android:layout_marginEnd="24dp"
android:layout_marginBottom="19dp"
android:src="@drawable/ic_download"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<com.google.android.material.divider.MaterialDivider
android:layout_width="0dp"
android:layout_height="1dp"
app:dividerColor="@color/gray_200"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />

</androidx.constraintlayout.widget.ConstraintLayout>

<androidx.core.widget.NestedScrollView
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@id/btn_tendency_test_result_finish"
app:layout_constraintBottom_toTopOf="@id/btn_tendency_result_finish"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tb_tendency_test_result">
app:layout_constraintTop_toBottomOf="@id/toolbar_tendency_result">

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
Expand Down Expand Up @@ -432,29 +461,11 @@
</androidx.core.widget.NestedScrollView>

<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_tendency_test_result_save"
android:id="@+id/btn_tendency_result_finish"
style="@style/TextAppearance.Doorip.Body1.Bold"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="4dp"
android:layout_marginBottom="22dp"
android:background="@drawable/shape_rect_4_gray200_line"
android:gravity="center"
android:paddingVertical="10dp"
android:text="@string/tendency_test_result_save"
android:textColor="@color/gray_600"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/btn_tendency_test_result_finish"
app:layout_constraintStart_toStartOf="parent" />

<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_tendency_test_result_finish"
style="@style/TextAppearance.Doorip.Body1.Bold"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginEnd="24dp"
android:layout_marginBottom="22dp"
android:background="@drawable/shape_rect_4_gray500_fill"
Expand All @@ -466,7 +477,7 @@
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/btn_tendency_test_result_save" />
app:layout_constraintStart_toStartOf="parent" />

<ImageView
android:layout_width="0dp"
Expand Down
4 changes: 2 additions & 2 deletions presentation/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@

<!--tendency_test_result-->
<string name="tendency_test_result_toolbar">유형 검사 결과</string>
<string name="tendency_test_result_title">%1$s님의 여행 유형은</string>
<string name="tendency_test_result_finish_button">다음</string>
<string name="tendency_test_result_title">%1$s님의 여행 캐릭터는</string>
<string name="tendency_test_result_finish_button">doorip 시작하기</string>
<string name="tendency_test_result_restart_button"><u>다시 해볼래요</u></string>
<string name="tendency_test_result_save">이미지로 저장</string>

Expand Down

0 comments on commit 33f6605

Please sign in to comment.