Skip to content

Commit

Permalink
[Chore/#12] 코드리뷰 반영
Browse files Browse the repository at this point in the history
  • Loading branch information
ss99x2002 committed Jul 6, 2023
1 parent f1240da commit 90f327b
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 21 deletions.
28 changes: 14 additions & 14 deletions app/src/main/res/layout/activity_answer.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<variable
name="title"
type="String"/>
type="String" />
</data>

<androidx.constraintlayout.widget.ConstraintLayout
Expand All @@ -37,53 +37,53 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/answer_title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/layout_appbar"
android:text="@string/answer_title" />
app:layout_constraintTop_toBottomOf="@id/layout_appbar" />

<TextView
android:id="@+id/tv_question"
style="@style/AndroidSubHead1SemiBold20"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="19dp"
android:text="@string/answer_question"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_title"
android:text="@string/answer_question" />
app:layout_constraintTop_toBottomOf="@id/tv_title" />

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="12dp"
android:background="@drawable/shape_grey_fill_r17_rect"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:background="@drawable/shape_grey_fill_r17_rect"
app:layout_constraintTop_toBottomOf="@id/tv_question">

<com.google.android.material.textfield.TextInputLayout
style="@style/AnswerTextInputLayoutStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginHorizontal="16dp"
app:hintAnimationEnabled="false"
app:hintEnabled="false"
style="@style/AnswerTextInputLayoutStyle"
android:layout_marginVertical="16dp"
app:boxStrokeWidth="0dp"
app:layout_constraintBottom_toBottomOf="parent">
app:hintAnimationEnabled="false"
app:hintEnabled="false"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">

<com.google.android.material.textfield.TextInputEditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="left"
android:hint="@string/answer_edittext_hint"
android:textAppearance="@style/AndroidBody1_2Regular16"
android:minHeight="172dp"
android:textAppearance="@style/AndroidBody1_2Regular16"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_notify_time.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:lineSpacingExtra="8dp"
android:layout_marginTop="18dp"
android:lineSpacingExtra="8dp"
android:text="@string/go_past_title"
android:textColor="@color/black"
app:layout_constraintStart_toStartOf="parent"
Expand Down
12 changes: 7 additions & 5 deletions app/src/main/res/layout/qna_appbar.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
<layout xmlns:tools="http://schemas.android.com/tools">

<data>
<import type="android.view.View"/>

<import type="android.view.View" />

<variable
name="titleText"
type="String" />
Expand Down Expand Up @@ -39,24 +41,24 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="160dp"
android:layout_height="30dp"
android:background="@drawable/shape_grey_appbar_r68_rect"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:background="@drawable/shape_grey_appbar_r68_rect">
app:layout_constraintTop_toTopOf="parent">

<TextView
android:id="@+id/tv_appbar_title"
style="@style/BrandTypeSmallSemiBold16"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="#1 나의 어린시절"
android:text="@{titleText == null ? null : titleText}"
android:textColor="@color/black"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
tools:text="#1 나의 어린시절" />

</androidx.constraintlayout.widget.ConstraintLayout>

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,6 @@

<!-- answer activity-->
<string name="answer_edittext_hint">답변을 입력해주세요.</string>
<string name="answer_title">가장 오랜된 기억</string>
<string name="answer_title">가장 오래된 기억</string>
<string name="answer_question">당신과 어머니의 꿈은 달라?</string>
</resources>

0 comments on commit 90f327b

Please sign in to comment.