From 047a8938b868514d1a553bc464344814ae03e0b4 Mon Sep 17 00:00:00 2001
From: l2zh <dlwnsgml0109@naver.com>
Date: Tue, 11 Jul 2023 17:36:33 +0900
Subject: [PATCH] =?UTF-8?q?#14=20/=20=EB=AF=B8=EC=85=98=20=EC=B9=B4?=
 =?UTF-8?q?=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EC=84=A4=EB=AA=85=20=EB=B7=B0=20?=
 =?UTF-8?q?=EA=B7=B8=EB=A6=AC=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              | 13 +++--
 .../layout/activity_mission_detail_record.xml | 52 +++++++++++--------
 2 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5dbb2367..3a869d57 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,8 +17,14 @@
         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.SplashActivity"
+            android:name=".presentation.MainActivity"
             android:exported="true"
             android:screenOrientation="portrait">
 
@@ -37,10 +43,9 @@
                     android:scheme="${KAKAO_APP_KEY}" />
             </intent-filter>
         </activity>
-
         <activity
-            android:name=".presentation.MainActivity"
-            android:exported="false"
+            android:name=".presentation.MissionDetailCreateActivity"
+            android:exported="true"
             android:screenOrientation="portrait" />
 
 
diff --git a/app/src/main/res/layout/activity_mission_detail_record.xml b/app/src/main/res/layout/activity_mission_detail_record.xml
index 56a52cbc..1dbb03fe 100644
--- a/app/src/main/res/layout/activity_mission_detail_record.xml
+++ b/app/src/main/res/layout/activity_mission_detail_record.xml
@@ -25,8 +25,9 @@
                 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"
@@ -34,12 +35,11 @@
 
             <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="@string/mission_detatil_record_title"
-                android:textColor="@color/Gray_600"
+                android:text="미션 카테고리 설명"
+                android:textAppearance="@style/Title1"
                 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" />
@@ -58,7 +58,7 @@
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:orientation="vertical">
 
                 <ImageView
@@ -73,22 +73,25 @@
 
                 <TextView
                     android:id="@+id/mission_detail_record_subtitle"
-                    style="@style/Subtitle"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="16dp"
                     android:layout_marginTop="16dp"
-                    android:text="@string/mission_detatil_record_game_title"
-                    android:textColor="@color/Gray_600"
+                    android:text="내 연인의 모든것"
+                    android:textAppearance="@style/Subtitle"
                     app:layout_constraintStart_toEndOf="@+id/mission_detail_record_image"
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <TextView
                     android:id="@+id/mission_detail_record_description"
-                    style="@style/Body2"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginHorizontal="16dp"
+                    android:layout_marginStart="16dp"
                     android:layout_marginTop="12dp"
-                    android:text="@string/mission_detatil_record_game_description"
+                    android:layout_marginEnd="16dp"
+                    android:lineSpacingExtra="6dp"
+                    android:text="상대의 취향, 신체 사이즈 등 제시된 주제에 대한 답을 맞추며 서로를 알아가는 게임"
+                    android:textAppearance="@style/Body2"
                     android:textColor="@color/Gray_350"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toEndOf="@+id/mission_detail_record_image"
@@ -96,26 +99,29 @@
 
                 <TextView
                     android:id="@+id/mission_detail_record_rule_title"
-                    style="@style/Subtitle"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="16dp"
                     android:layout_marginTop="32dp"
-                    android:text="@string/mission_detatil_record_rule_title"
-                    android:textColor="@color/Gray_600"
+                    android:text="룰 소개"
+                    android:textAppearance="@style/Subtitle"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/mission_detail_record_image" />
 
 
                 <TextView
                     android:id="@+id/mission_detail_record_ruletext"
-                    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="@string/mission_detatil_record_rule_description"
-                    android:textColor="@color/Gray_600"
+                    android:text=" 1. 본인에게 할당된 주제의 답변을 상대방이 맞춰야하는 게임입니다.
+2. 단순 주제가 나와있는 미션이라면, 상대의 입장에서 해당 주제에 대한 답을 해주세요.
+3. 2지선다로 이루어진 미션이라면, 상대가 어떤 선지를 더 좋아할지에 대해 예상하여 답을 해주세요."
+                    android:textAppearance="@style/Body2_long"
                     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" />
@@ -123,27 +129,27 @@
 
                 <TextView
                     android:id="@+id/mission_detail_record_tiptitle"
-                    style="@style/Subtitle"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="16dp"
                     android:layout_marginTop="32dp"
-                    android:text="@string/mission_detatil_record_tip_title"
-                    android:textColor="@color/Gray_600"
+                    android:text="공략 팁"
+                    android:textAppearance="@style/Subtitle"
                     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="@string/mission_detatil_record_tip_description"
-                    android:textColor="@color/Gray_600"
+                    android:text=" • 평소에 하나씩 연인에 대한 셀프 100문 100답을 해보세요!"
+                    android:textAppearance="@style/Body2_long"
                     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" />