Skip to content

Commit

Permalink
[Design/#109] 디자인 문구 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
ss99x2002 committed Aug 28, 2023
1 parent 147aa56 commit af76b1c
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 7 deletions.
21 changes: 18 additions & 3 deletions app/src/main/res/layout/activity_ending.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,26 @@
</androidx.constraintlayout.widget.ConstraintLayout>

<TextView
android:id="@+id/tv_title"
android:id="@+id/tv_title1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="28dp"
android:layout_marginTop="72dp"
android:text="@string/ending_title"
android:text="@string/ending_title1"
android:textAppearance="@style/AndroidHead1SemiBold24"
android:textColor="@color/umbba_black"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_title2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="28dp"
android:text="@string/ending_title2"
android:textAppearance="@style/AndroidHead2Regular24"
android:textColor="@color/umbba_black"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_title1"/>

<TextView
android:id="@+id/tv_survey_title"
Expand All @@ -46,8 +57,9 @@
android:layout_marginTop="40dp"
android:text="@string/ending_survey_title"
android:textAppearance="@style/AndroidSubHead2Regular20"
android:textColor="@color/umbba_black"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_title" />
app:layout_constraintTop_toBottomOf="@id/tv_title2" />

<TextView
android:id="@+id/tv_survey_caption"
Expand All @@ -57,6 +69,7 @@
android:layout_marginTop="8dp"
android:text="@string/ending_survey_caption"
android:textAppearance="@style/AndroidCaptionRegular10"
android:textColor="@color/umbba_black"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_survey_title" />

Expand Down Expand Up @@ -91,6 +104,7 @@
android:layout_marginTop="40dp"
android:text="@string/ending_delete_account"
android:textAppearance="@style/AndroidSubHead2Regular20"
android:textColor="@color/umbba_black"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/view_dot_line" />

Expand All @@ -102,6 +116,7 @@
android:layout_marginTop="8dp"
android:text="@string/ending_delete_account_caption"
android:textAppearance="@style/AndroidCaptionRegular10"
android:textColor="@color/umbba_black"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_delete_account_title" />

Expand Down
9 changes: 5 additions & 4 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -183,12 +183,13 @@


<!-- ending activity-->
<string name="ending_title">잠시 교신을 종료할게\n어쩌구</string>
<string name="ending_survey_title">문구문구문구</string>
<string name="ending_title1">잠시 교신을 종료할게</string>
<string name="ending_title2">즐거운 여행이 됐기를 바라</string>
<string name="ending_survey_title">함께한 여정이 어땠는지 알려줘</string>
<string name="ending_survey_caption">설문조사에 참여하여 피드백을 남겨주세요.</string>
<string name="ending_btn_survey">설문하러 가기</string>
<string name="ending_delete_account">문구문구문구</string>
<string name="ending_delete_account_caption">회원을 탈퇴하고 새로운 상대와 연결하세요.</string>
<string name="ending_delete_account">이제, 새로운 여행을 떠나자</string>
<string name="ending_delete_account_caption">회원 탈퇴 후 다른 가족과 연결하세요.</string>
<string name="ending_btn_delete_account">연결 종료하기</string>

<!-- ending activity-->
Expand Down

0 comments on commit af76b1c

Please sign in to comment.