Skip to content

Commit

Permalink
#14 / 코드리뷰 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
@l2zh
l2zh committed Jul 12, 2023
1 parent 8910c87 commit 82af4f7
Show file tree
Hide file tree
Showing 4 changed files with 75 additions and 69 deletions.
9 changes: 1 addition & 8 deletions app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,8 @@
android:theme="@style/Theme.UNIAOS"
android:usesCleartextTraffic="true"
tools:targetApi="31">

<!-- <activity-->
<!-- android:name=".presentation.SubHistoryActivity"-->
<!-- android:exported="false" />-->
<!-- <activity-->
<!-- android:name=".presentation.MainHistoryActivity"-->
<!-- android:exported="false" />-->
<activity
android:name=".presentation.MainActivity"
android:name=".presentation.SplashActivity"
android:exported="true"
android:screenOrientation="portrait">
<intent-filter>
Expand Down
65 changes: 33 additions & 32 deletions app/src/main/res/layout/activity_mission_detail_create.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,12 @@

<TextView
android:id="@+id/mission_detail_create_tiltle"
style="@style/Title1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:text="미션 카테고리 설명"
android:textAppearance="@style/Title1"
android:text="@string/mission_detatil_create_title"
android:textColor="@color/Gray_600"
app:layout_constraintBottom_toBottomOf="@+id/mission_detail_create_back"
app:layout_constraintStart_toEndOf="@id/mission_detail_create_back"
app:layout_constraintTop_toTopOf="@+id/mission_detail_create_back" />
Expand All @@ -58,7 +59,7 @@

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">

<ImageView
Expand All @@ -73,98 +74,98 @@

<TextView
android:id="@+id/mission_detail_create_subtitle"
style="@style/Subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:text="내 연인의 모든것"
android:textAppearance="@style/Subtitle"
android:text="@string/mission_detatil_create_game_title"
android:textColor="@color/Gray_600"
app:layout_constraintStart_toEndOf="@+id/mission_detail_create_image"
app:layout_constraintTop_toTopOf="parent" />

<TextView
android:id="@+id/mission_detail_create_description"
style="@style/Body2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="16dp"
android:lineSpacingExtra="6dp"
android:text="상대의 취향, 신체 사이즈 등 제시된 주제에 대한 답을 맞추며 서로를 알아가는 게임"
android:textAppearance="@style/Body2"
android:text="@string/mission_detatil_create_game_description"
android:textColor="@color/Gray_350"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/mission_detail_create_image"
app:layout_constraintTop_toBottomOf="@+id/mission_detail_create_subtitle" />

<TextView
android:id="@+id/mission_detail_create_rule_title"
style="@style/Subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="32dp"
android:text="룰 소개"
android:textAppearance="@style/Subtitle"
android:text="@string/mission_detatil_create_rule_title"
android:textColor="@color/Gray_600"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/mission_detail_create_image" />


<TextView
android:id="@+id/mission_detail_create_ruletext"
style="@style/Body2_long"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="16dp"
android:background="@drawable/bg_mission_detail_textbox"
android:lineSpacingExtra="10dp"
android:paddingHorizontal="12dp"
android:paddingVertical="12dp"
android:text=" 1. 본인에게 할당된 주제의 답변을 상대방이 맞춰야하는 게임입니다.
2. 단순 주제가 나와있는 미션이라면, 상대의 입장에서 해당 주제에 대한 답을 해주세요.
3. 2지선다로 이루어진 미션이라면, 상대가 어떤 선지를 더 좋아할지에 대해 예상하여 답을 해주세요."
android:textAppearance="@style/Body2_long"
android:text="@string/mission_detatil_create_rule_description"
android:textColor="@color/Gray_600"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/mission_detail_create_rule_title" />


<TextView
android:id="@+id/mission_detail_create_tiptitle"
style="@style/Subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="32dp"
android:text="공략 팁"
android:textAppearance="@style/Subtitle"
android:text="@string/mission_detatil_create_tip_title"
android:textColor="@color/Gray_600"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/mission_detail_create_ruletext" />


<TextView
android:id="@+id/mission_detail_create_tiptext"
style="@style/Body2_long"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="16dp"
android:background="@drawable/bg_mission_detail_textbox"
android:lineSpacingExtra="10dp"
android:paddingHorizontal="12dp"
android:paddingVertical="12dp"
android:text=" • 평소에 하나씩 연인에 대한 셀프 100문 100답을 해보세요!"
android:textAppearance="@style/Body2_long"
android:text="@string/mission_detatil_create_tip_description"
android:textColor="@color/Gray_600"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/mission_detail_create_tiptitle" />


<TextView
android:id="@+id/mission_detail_create_mission_example"
style="@style/Subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="32dp"
android:text="미션 예시"
android:textAppearance="@style/Subtitle"
android:text="@string/mission_detatil_create_example_title"
android:textColor="@color/Gray_600"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/mission_detail_create_tiptext" />

Expand All @@ -180,46 +181,46 @@

<TextView
android:id="@+id/mission_detail_create_mission_example_1"
style="@style/Btn2"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginBottom="16dp"
android:layout_weight="1"
android:background="@drawable/bg_mission_detail_textbox"
android:lineSpacingExtra="6dp"
android:paddingHorizontal="20dp"
android:paddingVertical="20dp"
android:text="시력"
android:textAppearance="@style/Btn2" />
android:text="@string/mission_detatil_create_example1"
android:textColor="@color/Gray_600" />

<Space
android:layout_width="8dp"
android:layout_height="match_parent" />

<TextView
android:id="@+id/mission_detail_create_mission_example_2"
style="@style/Btn2"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginBottom="16dp"
android:layout_weight="1"
android:background="@drawable/bg_mission_detail_textbox"
android:lineSpacingExtra="6dp"
android:paddingHorizontal="20dp"
android:paddingVertical="20dp"
android:text="아메리카노 vs \n카페라떼"
android:textAppearance="@style/Btn2" />
android:text="@string/mission_detatil_create_example2"
android:textColor="@color/Gray_600" />
</LinearLayout>

<android.widget.Button
android:id="@+id/mission_detail_create_mission_btn_pick"
style="@style/Btn1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginVertical="16dp"
android:background="@drawable/bg_mission_detail_button_rounded"
android:fontFamily="@font/pretendard_semibold"
android:paddingVertical="12dp"
android:text="선택하기"
android:textAppearance="@style/Btn1"
android:text="@string/mission_detatil_create_btn_text"
android:textColor="@color/Gray_000"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
Expand Down
52 changes: 23 additions & 29 deletions app/src/main/res/layout/activity_mission_detail_record.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,21 @@
android:id="@+id/mission_detail_record_back"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginVertical="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:src="@drawable/ic_backarrow"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<TextView
android:id="@+id/mission_detail_record_tiltle"
style="@style/Title1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:text="미션 카테고리 설명"
android:textAppearance="@style/Title1"
android:text="@string/mission_detatil_record_title"
android:textColor="@color/Gray_600"
app:layout_constraintBottom_toBottomOf="@+id/mission_detail_record_back"
app:layout_constraintStart_toEndOf="@id/mission_detail_record_back"
app:layout_constraintTop_toTopOf="@+id/mission_detail_record_back" />
Expand All @@ -58,7 +58,7 @@

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">

<ImageView
Expand All @@ -73,83 +73,77 @@

<TextView
android:id="@+id/mission_detail_record_subtitle"
android:layout_width="0dp"
style="@style/Subtitle"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:text="내 연인의 모든것"
android:textAppearance="@style/Subtitle"
android:text="@string/mission_detatil_record_game_title"
android:textColor="@color/Gray_600"
app:layout_constraintStart_toEndOf="@+id/mission_detail_record_image"
app:layout_constraintTop_toTopOf="parent" />

<TextView
android:id="@+id/mission_detail_record_description"
android:layout_width="0dp"
style="@style/Body2"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="12dp"
android:layout_marginEnd="16dp"
android:lineSpacingExtra="6dp"
android:text="상대의 취향, 신체 사이즈 등 제시된 주제에 대한 답을 맞추며 서로를 알아가는 게임"
android:textAppearance="@style/Body2"
android:text="@string/mission_detatil_record_game_description"
android:textColor="@color/Gray_350"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/mission_detail_record_image"
app:layout_constraintTop_toBottomOf="@+id/mission_detail_record_subtitle" />

<TextView
android:id="@+id/mission_detail_record_rule_title"
android:layout_width="0dp"
style="@style/Subtitle"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="32dp"
android:text="룰 소개"
android:textAppearance="@style/Subtitle"
android:text="@string/mission_detatil_record_rule_title"
android:textColor="@color/Gray_600"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/mission_detail_record_image" />


<TextView
android:id="@+id/mission_detail_record_ruletext"
android:layout_width="0dp"
style="@style/Body2_long"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:background="@drawable/bg_mission_detail_textbox"
android:lineSpacingExtra="10dp"
android:paddingHorizontal="12dp"
android:paddingVertical="12dp"
android:text=" 1. 본인에게 할당된 주제의 답변을 상대방이 맞춰야하는 게임입니다.
2. 단순 주제가 나와있는 미션이라면, 상대의 입장에서 해당 주제에 대한 답을 해주세요.
3. 2지선다로 이루어진 미션이라면, 상대가 어떤 선지를 더 좋아할지에 대해 예상하여 답을 해주세요."
android:textAppearance="@style/Body2_long"
android:text="@string/mission_detatil_record_rule_description"
android:textColor="@color/Gray_600"
app:layout_constraintEnd_toEndOf="@+id/mission_detail_record_description"
app:layout_constraintStart_toStartOf="@+id/mission_detail_record_rule_title"
app:layout_constraintTop_toBottomOf="@+id/mission_detail_record_rule_title" />


<TextView
android:id="@+id/mission_detail_record_tiptitle"
android:layout_width="0dp"
style="@style/Subtitle"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="32dp"
android:text="공략 팁"
android:textAppearance="@style/Subtitle"
android:text="@string/mission_detatil_record_tip_title"
android:textColor="@color/Gray_600"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/mission_detail_record_ruletext" />


<TextView
android:id="@+id/mission_detail_record_tiptext"
style="@style/Body2_long"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:background="@drawable/bg_mission_detail_textbox"
android:lineSpacingExtra="10dp"
android:paddingHorizontal="12dp"
android:paddingVertical="12dp"
android:text=" • 평소에 하나씩 연인에 대한 셀프 100문 100답을 해보세요!"
android:textAppearance="@style/Body2_long"
android:text="@string/mission_detatil_record_tip_description"
android:textColor="@color/Gray_600"
app:layout_constraintEnd_toEndOf="@+id/mission_detail_record_ruletext"
app:layout_constraintStart_toStartOf="@+id/mission_detail_record_tiptitle"
app:layout_constraintTop_toBottomOf="@+id/mission_detail_record_tiptitle" />
Expand Down
Loading

0 comments on commit 82af4f7

Please sign in to comment.