diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index d7428f4..19dd8c7 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="deploymentTargetDropDown">
-    <targetSelectedWithDropDown>
+    <runningDeviceTargetSelectedWithDropDown>
       <Target>
-        <type value="QUICK_BOOT_TARGET" />
+        <type value="RUNNING_DEVICE_TARGET" />
         <deviceKey>
           <Key>
-            <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="$USER_HOME$/.android/avd/iPhone_11_Pro_Max_API_30.avd" />
+            <type value="SERIAL_NUMBER" />
+            <value value="ce011711b55a9b3905" />
           </Key>
         </deviceKey>
       </Target>
-    </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2022-01-28T14:08:10.772760Z" />
+    </runningDeviceTargetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2022-02-04T06:58:51.158314600Z" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index d8ffe8d..65a9760 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -14,7 +14,11 @@
         <entry key="..\:/Users/1p2h3/Desktop/mechelin/app/src/main/res/drawable/mypage_card_small.xml" value="0.15683760683760684" />
         <entry key="..\:/Users/1p2h3/Desktop/mechelin/app/src/main/res/font/font.xml" value="0.3333333333333333" />
         <entry key="..\:/Users/1p2h3/Desktop/mechelin/app/src/main/res/layout/activity_main.xml" value="0.22" />
+<<<<<<< HEAD
+        <entry key="..\:/Users/1p2h3/Desktop/mechelin/app/src/main/res/layout/activity_mypage.xml" value="0.13333333333333333" />
+=======
         <entry key="..\:/Users/1p2h3/Desktop/mechelin/app/src/main/res/layout/activity_mypage.xml" value="0.22" />
+>>>>>>> main
         <entry key="..\:/Users/1p2h3/Desktop/mechelin/app/src/main/res/layout/activity_popup_score.xml" value="0.6462093862815884" />
         <entry key="..\:/Users/1p2h3/Desktop/mechelin/app/src/main/res/layout/activity_resign.xml" value="0.13333333333333333" />
         <entry key="..\:/Users/1p2h3/Desktop/mechelin/app/src/main/res/layout/activity_save_restaurant.xml" value="0.22" />
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9149285..a2401ab 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -5,26 +5,25 @@
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-
     <!--갤러리 권한-->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-    
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:usesCleartextTraffic="true"
         android:theme="@style/Theme.Mechelin"
+        android:usesCleartextTraffic="true"
         tools:replace="android:theme">
+
         <activity
             android:name="com.example.mechelin.ui.splash.SplashActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
@@ -35,9 +34,9 @@
         </activity>
         <activity android:name=".ui.search.SearchPlaceActivity"/>
         <activity android:name=".ui.main.WritingActivity"
-                  android:windowSoftInputMode="adjustPan"/>
+            android:windowSoftInputMode="adjustPan"/>
+
         <activity android:name=".ui.main.SearchActivity"/>
         <activity android:name=".ui.main.PopupScoreActivity" android:theme="@style/Transparent"/>
     </application>
-
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/example/mechelin/ui/main/WritingActivity.kt b/app/src/main/java/com/example/mechelin/ui/main/WritingActivity.kt
index 97604b6..d8ee9b0 100644
--- a/app/src/main/java/com/example/mechelin/ui/main/WritingActivity.kt
+++ b/app/src/main/java/com/example/mechelin/ui/main/WritingActivity.kt
@@ -279,8 +279,8 @@ class WritingActivity: AppCompatActivity(){
                             .setMessage("식당 저장 및 리뷰 작성을 실패하였습니다.")
                             .create()
                             .show()
+                        }
                     }
-                }
             }
 
 
diff --git a/app/src/main/java/com/example/mechelin/ui/mypage/MypageActivity.kt b/app/src/main/java/com/example/mechelin/ui/mypage/MypageActivity.kt
new file mode 100644
index 0000000..de2cbf0
--- /dev/null
+++ b/app/src/main/java/com/example/mechelin/ui/mypage/MypageActivity.kt
@@ -0,0 +1,8 @@
+package com.example.mechelin.ui.mypage
+
+import androidx.appcompat.app.AppCompatActivity
+
+class MypageActivity: AppCompatActivity() {
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/mechelin/ui/resign/ResignActivity.kt b/app/src/main/java/com/example/mechelin/ui/resign/ResignActivity.kt
new file mode 100644
index 0000000..ba0c070
--- /dev/null
+++ b/app/src/main/java/com/example/mechelin/ui/resign/ResignActivity.kt
@@ -0,0 +1,5 @@
+package com.example.mechelin.ui.resign
+
+class ResignActivity {
+
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/category_item_toggle_selector.xml b/app/src/main/res/drawable/category_item_toggle_selector.xml
index d02aaca..8ab7c83 100644
--- a/app/src/main/res/drawable/category_item_toggle_selector.xml
+++ b/app/src/main/res/drawable/category_item_toggle_selector.xml
@@ -14,7 +14,6 @@
             <stroke android:color="#d5cece"
                 android:width="1dp"/>
         </shape>
-
     </item>
 
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_writing.xml b/app/src/main/res/layout/activity_writing.xml
index 7c4cdf8..7465c4d 100644
--- a/app/src/main/res/layout/activity_writing.xml
+++ b/app/src/main/res/layout/activity_writing.xml
@@ -1,428 +1,429 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:paddingTop="20dp">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <TextView
-            android:id="@+id/writing_complete_button_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="완료"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            android:layout_marginTop="20dp"
-            android:layout_marginEnd="20dp"
-            android:textSize="14dp"
-            android:fontFamily="@font/scdream3"
-            />
-
-        <androidx.appcompat.widget.AppCompatToggleButton
-            android:id="@+id/writing_category_select_tb"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:checked="false"
-            android:drawableEnd="@drawable/arrow_down_gray"
-            android:textOn="카테고리"
-            android:textOff="카테고리"
-            android:fontFamily="@font/scdream4"
-            android:textSize="10sp"
-            app:layout_constraintTop_toBottomOf="@id/writing_complete_button_tv"
-            android:layout_marginTop="20dp"
-            android:background="@color/white"
-            android:textAlignment="textStart"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"/>
-
-        <androidx.cardview.widget.CardView
-            android:id="@+id/writing_search_cardview"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_constraintTop_toBottomOf="@id/writing_category_select_tb"
-            app:cardCornerRadius="15dp"
-            app:cardElevation="0dp"
-            android:layout_marginHorizontal="20dp"
-            android:layout_marginTop="20dp"
-            app:layout_constraintStart_toStartOf="parent">
-            <View
-                android:id="@+id/writing_search_view"
-                android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:background="@color/mechelin_gray_background"
-                />
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/writing_search_tv"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="식당 검색"
-                android:fontFamily="@font/scdream4"
-                android:textColor="#766c6c"
-                android:layout_marginStart="10dp"
-                android:layout_marginTop="13dp"/>
-
-        </androidx.cardview.widget.CardView>
-
-
-
-        <TextView
-            android:id="@+id/writing_address_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="주소"
-            android:textColor="@color/mechelin_gray_font"
-            android:textSize="10sp"
-            app:layout_constraintTop_toBottomOf="@id/writing_search_cardview"
-            app:layout_constraintStart_toStartOf="@id/writing_search_cardview"
-            android:layout_marginTop="20dp"
-            android:fontFamily="@font/scdream4"
-            />
-
-        <EditText
-            android:id="@+id/writing_address_et"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text=""
-            android:fontFamily="@font/scdream4"
-            app:layout_constraintStart_toEndOf="@id/writing_address_tv"
-            app:layout_constraintTop_toTopOf="@id/writing_address_tv"
-            app:layout_constraintBottom_toBottomOf="@id/writing_address_tv"
-            android:textSize="10sp"
-            android:textColor="@color/mechelin_gray_font2"
-            android:background="@null"
-            android:paddingStart="20dp"/>
-
-        <View
-            android:id="@+id/writing_address_line"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            app:layout_constraintTop_toBottomOf="@id/writing_address_tv"
-            android:background="@color/mechelin_gray_font"
-            android:layout_marginTop="10dp"
-            android:layout_marginHorizontal="20dp"
-            />
-
-        <TextView
-            android:id="@+id/writing_phone_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="전화번호"
-            android:fontFamily="@font/scdream4"
-            android:textColor="@color/mechelin_gray_font"
-            android:textSize="10sp"
-            app:layout_constraintTop_toBottomOf="@id/writing_address_line"
-            app:layout_constraintStart_toStartOf="@id/writing_address_tv"
-            android:layout_marginTop="20dp"
-            />
-
-        <EditText
-            android:id="@+id/writing_phone_et"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text=""
-            app:layout_constraintStart_toEndOf="@id/writing_phone_tv"
-            app:layout_constraintTop_toTopOf="@id/writing_phone_tv"
-            app:layout_constraintBottom_toBottomOf="@id/writing_phone_tv"
-            android:textSize="10sp"
-            android:textColor="@color/mechelin_gray_font2"
-            android:background="@null"
-            android:paddingStart="20dp"/>
-
-        <View
-            android:id="@+id/writing_phone_line"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            app:layout_constraintTop_toBottomOf="@id/writing_phone_tv"
-            android:background="@color/mechelin_gray_font"
-            android:layout_marginTop="10dp"
-            android:layout_marginHorizontal="20dp"
-            />
-
-
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/writing_category_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:visibility="gone"
-            android:background="@color/white"
-            app:layout_constraintTop_toBottomOf="@id/writing_category_select_tb">
-
-
-            <androidx.appcompat.widget.AppCompatToggleButton
-                style="@style/Widget.AppCompat.Button.Borderless"
-                android:id="@+id/writing_category_koreanfood_tb"
-                android:layout_width="65dp"
-                android:layout_height="65dp"
-                android:checked="false"
-                android:background="@drawable/category_item_toggle_selector"
-                android:textOff="@string/한식"
-                android:textOn="@string/한식"
-                android:fontFamily="@font/scdream4"
-                android:textSize="6dp"
-                android:drawableTop="@drawable/korean_food_writing_page_choose_category"
-                android:padding="10dp"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/writing_category_weternfood_tb"
-                android:layout_marginStart="30dp"
-                android:layout_marginTop="20dp"
-                android:tag="1"
-                />
-
-            <androidx.appcompat.widget.AppCompatToggleButton
-                style="@style/Widget.AppCompat.Button.Borderless"
-                android:id="@+id/writing_category_weternfood_tb"
-                android:layout_width="65dp"
-                android:layout_height="65dp"
-                android:checked="false"
-                android:background="@drawable/category_item_toggle_selector"
-                android:textOff="@string/양식"
-                android:textOn="@string/양식"
-                android:fontFamily="@font/scdream4"
-                android:textSize="6dp"
-                android:drawableTop="@drawable/western_food_writing_page_choose_category"
-                android:padding="10dp"
-                app:layout_constraintTop_toTopOf="@id/writing_category_koreanfood_tb"
-                app:layout_constraintStart_toEndOf="@id/writing_category_koreanfood_tb"
-                app:layout_constraintEnd_toStartOf="@id/writing_category_chinese_tb"
-                android:layout_marginStart="20dp"
-                android:onClick="onClick"
-                android:tag="2"
-                />
-
-            <androidx.appcompat.widget.AppCompatToggleButton
-                style="@style/Widget.AppCompat.Button.Borderless"
-                android:id="@+id/writing_category_chinese_tb"
-                android:layout_width="65dp"
-                android:layout_height="65dp"
-                android:checked="false"
-                android:background="@drawable/category_item_toggle_selector"
-                android:textOff="@string/중식"
-                android:textOn="@string/중식"
-                android:fontFamily="@font/scdream4"
-                android:textSize="6dp"
-                android:drawableTop="@drawable/chinese_food_writing_food_choose_category"
-                android:padding="10dp"
-                app:layout_constraintTop_toTopOf="@id/writing_category_koreanfood_tb"
-                app:layout_constraintStart_toEndOf="@id/writing_category_weternfood_tb"
-                app:layout_constraintEnd_toStartOf="@id/writing_category_japanese_tb"
-                android:layout_marginStart="20dp"
-                android:tag="4"
-                />
-
-            <androidx.appcompat.widget.AppCompatToggleButton
-                style="@style/Widget.AppCompat.Button.Borderless"
-                android:id="@+id/writing_category_japanese_tb"
-                android:layout_width="65dp"
-                android:layout_height="65dp"
-                android:checked="false"
-                android:background="@drawable/category_item_toggle_selector"
-                android:textOff="@string/일식"
-                android:textOn="@string/일식"
-                android:fontFamily="@font/scdream4"
-                android:textSize="6dp"
-                android:drawableTop="@drawable/japanese_food_writing_page_choose_category"
-                android:padding="10dp"
-                app:layout_constraintTop_toTopOf="@id/writing_category_koreanfood_tb"
-                app:layout_constraintStart_toEndOf="@id/writing_category_chinese_tb"
-                app:layout_constraintEnd_toEndOf="parent"
-                android:layout_marginStart="20dp"
-                android:layout_marginEnd="30dp"
-                android:tag="3"
-                />
-
-            <androidx.appcompat.widget.AppCompatToggleButton
-                style="@style/Widget.AppCompat.Button.Borderless"
-                android:id="@+id/writing_category_basedfood_tb"
-                android:layout_width="65dp"
-                android:layout_height="65dp"
-                android:checked="false"
-                android:background="@drawable/category_item_toggle_selector"
-                android:textOff="@string/분식"
-                android:textOn="@string/분식"
-                android:fontFamily="@font/scdream4"
-                android:textSize="6dp"
-                android:drawableTop="@drawable/flour_based_food_writing_page_choose_category"
-                android:padding="10dp"
-                app:layout_constraintTop_toBottomOf="@id/writing_category_koreanfood_tb"
-                app:layout_constraintStart_toStartOf="@id/writing_category_koreanfood_tb"
-                app:layout_constraintBottom_toBottomOf="parent"
-                android:layout_marginTop="10dp"
-                android:layout_marginBottom="20dp"
-                android:tag="5"
-                />
-
-            <androidx.appcompat.widget.AppCompatToggleButton
-                style="@style/Widget.AppCompat.Button.Borderless"
-                android:id="@+id/writing_category_pub_tb"
-                android:layout_width="65dp"
-                android:layout_height="65dp"
-                android:checked="false"
-                android:background="@drawable/category_item_toggle_selector"
-                android:textOff="@string/술집"
-                android:textOn="@string/술집"
-                android:fontFamily="@font/scdream4"
-                android:textSize="6dp"
-                android:drawableTop="@drawable/pub_writing_page_choose_catergory"
-                android:padding="10dp"
-                app:layout_constraintTop_toTopOf="@id/writing_category_basedfood_tb"
-                app:layout_constraintStart_toStartOf="@id/writing_category_weternfood_tb"
-                android:tag="6"
-                />
-
-            <androidx.appcompat.widget.AppCompatToggleButton
-                style="@style/Widget.AppCompat.Button.Borderless"
-                android:id="@+id/writing_category_dessert_tb"
-                android:layout_width="65dp"
-                android:layout_height="65dp"
-                android:checked="false"
-                android:background="@drawable/category_item_toggle_selector"
-                android:textOff="@string/디저트"
-                android:textOn="@string/디저트"
-                android:fontFamily="@font/scdream4"
-                android:textSize="6dp"
-                android:drawableTop="@drawable/dessert_writing_page_choose_category"
-                android:padding="10dp"
-                app:layout_constraintTop_toTopOf="@id/writing_category_basedfood_tb"
-                app:layout_constraintStart_toStartOf="@id/writing_category_chinese_tb"
-                android:tag="7"
-                />
-
-            <androidx.appcompat.widget.AppCompatToggleButton
-                style="@style/Widget.AppCompat.Button.Borderless"
-                android:id="@+id/writing_delivery_tb"
-                android:layout_width="65dp"
-                android:layout_height="65dp"
-                android:checked="false"
-                android:background="@drawable/category_item_toggle_selector"
-                android:textOff="배달 가능"
-                android:textOn="배달 가능"
-                android:fontFamily="@font/scdream4"
-                android:textColor="@color/black"
-                android:textSize="6dp"
-                android:drawableTop="@drawable/delivery_writing_page_choose_category"
-                android:padding="10dp"
-                app:layout_constraintTop_toTopOf="@id/writing_category_basedfood_tb"
-                app:layout_constraintStart_toStartOf="@id/writing_category_japanese_tb"
-                />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-        <!--    나중에 변경-->
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="400dp"
-            android:layout_marginBottom="20dp"
-            android:background="#fcfafa"
-            android:elevation="10dp"
-            app:layout_constraintTop_toBottomOf="@id/writing_phone_line"
-            tools:layout_editor_absoluteX="178dp"
-            android:layout_marginTop="34dp">
-
-            <ImageView
-                android:id="@+id/writing_score_iv"
-                android:layout_width="80dp"
-                android:layout_height="50dp"
-                android:src="@drawable/writingpage_rating_gray_xxhdpi"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                android:layout_marginStart="115dp"/>
-
-            <androidx.cardview.widget.CardView
-                android:id="@+id/writing_upload_picture_cv"
-                android:layout_width="50dp"
-                android:layout_height="50dp"
-                app:cardBackgroundColor="#f0eeee"
-                app:cardCornerRadius="15dp"
-                app:layout_constraintStart_toStartOf="parent"
-                android:layout_marginStart="27dp"
-                app:layout_constraintTop_toTopOf="parent"
-                android:layout_marginTop="39dp"
-                android:textAlignment="center"
-                app:cardElevation="0dp"
-                >
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/writing_page_upload_photo_camera_alt"
-                    android:layout_marginStart="15dp"
-                    android:layout_marginTop="12dp"/>
-
-            </androidx.cardview.widget.CardView>
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/writing_upload_iv"
-                android:layout_width="50dp"
-                android:layout_height="50dp"
-                android:src="@drawable/logo_splash_login_sighup"
-                android:visibility="gone"
-                android:layout_marginStart="5dp"
-                app:layout_constraintTop_toTopOf="@id/writing_upload_picture_cv"
-                app:layout_constraintStart_toEndOf="@id/writing_upload_picture_cv"/>
-
-
-            <EditText
-                android:id="@+id/writing_tag_et"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:hint="해시태그 추가"
-                android:layout_marginTop="12dp"
-                app:layout_constraintStart_toStartOf="@id/writing_upload_picture_cv"
-                app:layout_constraintTop_toBottomOf="@id/writing_upload_picture_cv"
-                android:textSize="8sp"
-                android:fontFamily="@font/scdream4"
-                android:textColor="@color/mechelin_gray_font2"
-                android:background="@null"
-                />
-
-            <View
-                android:id="@+id/writing_tag_line"
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                app:layout_constraintStart_toStartOf="@id/writing_tag_et"
-                app:layout_constraintTop_toBottomOf="@id/writing_tag_et"
-                android:background="@color/mechelin_gray_font"
-                android:layout_marginHorizontal="20dp"
-                />
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/writing_tag_explain_tv"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="해시태그는 8개까지 입력 가능합니다."
-                android:textSize="5sp"
-                app:layout_constraintStart_toStartOf="@id/writing_tag_et"
-                app:layout_constraintTop_toBottomOf="@id/writing_tag_line"
-                android:layout_marginTop="3dp"
-                android:fontFamily="@font/scdream4"/>
-
-            <EditText
-                android:id="@+id/writing_review_content_et"
-                android:layout_width="306dp"
-                android:layout_height="146dp"
-                android:hint="리뷰를 남겨주세요"
-                android:textSize="10sp"
-                android:background="@color/white"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/writing_tag_explain_tv"
-                app:layout_constraintStart_toStartOf="parent"
-                android:layout_marginTop="15dp"
-                android:inputType="text|textMultiLine"
-                android:scrollbars="vertical"
-                android:lines="30"
-                android:gravity="top|left"
-                android:padding="10dp"/>
-
-
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
+<?xml version="1.0" encoding="utf-8"?>
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:paddingTop="20dp">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/writing_complete_button_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="완료"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            android:layout_marginTop="20dp"
+            android:layout_marginEnd="20dp"
+            android:textSize="14dp"
+            android:fontFamily="@font/scdream3"
+            />
+
+        <androidx.appcompat.widget.AppCompatToggleButton
+            android:id="@+id/writing_category_select_tb"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:checked="false"
+            android:drawableEnd="@drawable/arrow_down_gray"
+            android:textOn="카테고리"
+            android:textOff="카테고리"
+            android:fontFamily="@font/scdream4"
+            android:textSize="10sp"
+            app:layout_constraintTop_toBottomOf="@id/writing_complete_button_tv"
+            android:layout_marginTop="20dp"
+            android:background="@color/white"
+            android:textAlignment="textStart"
+            android:paddingStart="20dp"
+            android:paddingEnd="20dp"/>
+
+        <androidx.cardview.widget.CardView
+            android:id="@+id/writing_search_cardview"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toBottomOf="@id/writing_category_select_tb"
+            app:cardCornerRadius="15dp"
+            app:cardElevation="0dp"
+            android:layout_marginHorizontal="20dp"
+            android:layout_marginTop="20dp"
+            app:layout_constraintStart_toStartOf="parent">
+            <View
+                android:id="@+id/writing_search_view"
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:background="@color/mechelin_gray_background"
+                />
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/writing_search_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="식당 검색"
+                android:fontFamily="@font/scdream4"
+                android:textColor="#766c6c"
+                android:layout_marginStart="10dp"
+                android:layout_marginTop="13dp"/>
+
+        </androidx.cardview.widget.CardView>
+
+
+
+        <TextView
+            android:id="@+id/writing_address_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="주소"
+            android:textColor="@color/mechelin_gray_font"
+            android:textSize="10sp"
+            app:layout_constraintTop_toBottomOf="@id/writing_search_cardview"
+            app:layout_constraintStart_toStartOf="@id/writing_search_cardview"
+            android:layout_marginTop="20dp"
+            android:fontFamily="@font/scdream4"
+            />
+
+        <EditText
+            android:id="@+id/writing_address_et"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text=""
+            android:fontFamily="@font/scdream4"
+            app:layout_constraintStart_toEndOf="@id/writing_address_tv"
+            app:layout_constraintTop_toTopOf="@id/writing_address_tv"
+            app:layout_constraintBottom_toBottomOf="@id/writing_address_tv"
+            android:textSize="10sp"
+            android:textColor="@color/mechelin_gray_font2"
+            android:background="@null"
+            android:paddingStart="20dp"/>
+
+        <View
+            android:id="@+id/writing_address_line"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            app:layout_constraintTop_toBottomOf="@id/writing_address_tv"
+            android:background="@color/mechelin_gray_font"
+            android:layout_marginTop="10dp"
+            android:layout_marginHorizontal="20dp"
+            />
+
+        <TextView
+            android:id="@+id/writing_phone_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="전화번호"
+            android:fontFamily="@font/scdream4"
+            android:textColor="@color/mechelin_gray_font"
+            android:textSize="10sp"
+            app:layout_constraintTop_toBottomOf="@id/writing_address_line"
+            app:layout_constraintStart_toStartOf="@id/writing_address_tv"
+            android:layout_marginTop="20dp"
+            />
+
+        <EditText
+            android:id="@+id/writing_phone_et"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text=""
+            app:layout_constraintStart_toEndOf="@id/writing_phone_tv"
+            app:layout_constraintTop_toTopOf="@id/writing_phone_tv"
+            app:layout_constraintBottom_toBottomOf="@id/writing_phone_tv"
+            android:textSize="10sp"
+            android:textColor="@color/mechelin_gray_font2"
+            android:background="@null"
+            android:paddingStart="20dp"/>
+
+        <View
+            android:id="@+id/writing_phone_line"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            app:layout_constraintTop_toBottomOf="@id/writing_phone_tv"
+            android:background="@color/mechelin_gray_font"
+            android:layout_marginTop="10dp"
+            android:layout_marginHorizontal="20dp"
+            />
+
+
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/writing_category_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            android:background="@color/white"
+            app:layout_constraintTop_toBottomOf="@id/writing_category_select_tb">
+
+
+            <androidx.appcompat.widget.AppCompatToggleButton
+                style="@style/Widget.AppCompat.Button.Borderless"
+                android:id="@+id/writing_category_koreanfood_tb"
+                android:layout_width="65dp"
+                android:layout_height="65dp"
+                android:checked="false"
+                android:background="@drawable/category_item_toggle_selector"
+                android:textOff="@string/한식"
+                android:textOn="@string/한식"
+                android:fontFamily="@font/scdream4"
+                android:textSize="6dp"
+                android:drawableTop="@drawable/korean_food_writing_page_choose_category"
+                android:padding="10dp"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/writing_category_weternfood_tb"
+                android:layout_marginStart="30dp"
+                android:layout_marginTop="20dp"
+                android:tag="1"
+                />
+
+            <androidx.appcompat.widget.AppCompatToggleButton
+                style="@style/Widget.AppCompat.Button.Borderless"
+                android:id="@+id/writing_category_weternfood_tb"
+                android:layout_width="65dp"
+                android:layout_height="65dp"
+                android:checked="false"
+                android:background="@drawable/category_item_toggle_selector"
+                android:textOff="@string/양식"
+                android:textOn="@string/양식"
+                android:fontFamily="@font/scdream4"
+                android:textSize="6dp"
+                android:drawableTop="@drawable/western_food_writing_page_choose_category"
+                android:padding="10dp"
+                app:layout_constraintTop_toTopOf="@id/writing_category_koreanfood_tb"
+                app:layout_constraintStart_toEndOf="@id/writing_category_koreanfood_tb"
+                app:layout_constraintEnd_toStartOf="@id/writing_category_chinese_tb"
+                android:layout_marginStart="20dp"
+                android:onClick="onClick"
+                android:tag="2"
+                />
+
+            <androidx.appcompat.widget.AppCompatToggleButton
+                style="@style/Widget.AppCompat.Button.Borderless"
+                android:id="@+id/writing_category_chinese_tb"
+                android:layout_width="65dp"
+                android:layout_height="65dp"
+                android:checked="false"
+                android:background="@drawable/category_item_toggle_selector"
+                android:textOff="@string/중식"
+                android:textOn="@string/중식"
+                android:fontFamily="@font/scdream4"
+                android:textSize="6dp"
+                android:drawableTop="@drawable/chinese_food_writing_food_choose_category"
+                android:padding="10dp"
+                app:layout_constraintTop_toTopOf="@id/writing_category_koreanfood_tb"
+                app:layout_constraintStart_toEndOf="@id/writing_category_weternfood_tb"
+                app:layout_constraintEnd_toStartOf="@id/writing_category_japanese_tb"
+                android:layout_marginStart="20dp"
+                android:tag="4"
+                />
+
+            <androidx.appcompat.widget.AppCompatToggleButton
+                style="@style/Widget.AppCompat.Button.Borderless"
+                android:id="@+id/writing_category_japanese_tb"
+                android:layout_width="65dp"
+                android:layout_height="65dp"
+                android:checked="false"
+                android:background="@drawable/category_item_toggle_selector"
+                android:textOff="@string/일식"
+                android:textOn="@string/일식"
+                android:fontFamily="@font/scdream4"
+                android:textSize="6dp"
+                android:drawableTop="@drawable/japanese_food_writing_page_choose_category"
+                android:padding="10dp"
+                app:layout_constraintTop_toTopOf="@id/writing_category_koreanfood_tb"
+                app:layout_constraintStart_toEndOf="@id/writing_category_chinese_tb"
+                app:layout_constraintEnd_toEndOf="parent"
+                android:layout_marginStart="20dp"
+                android:layout_marginEnd="30dp"
+                android:tag="3"
+                />
+
+            <androidx.appcompat.widget.AppCompatToggleButton
+                style="@style/Widget.AppCompat.Button.Borderless"
+                android:id="@+id/writing_category_basedfood_tb"
+                android:layout_width="65dp"
+                android:layout_height="65dp"
+                android:checked="false"
+                android:background="@drawable/category_item_toggle_selector"
+                android:textOff="@string/분식"
+                android:textOn="@string/분식"
+                android:fontFamily="@font/scdream4"
+                android:textSize="6dp"
+                android:drawableTop="@drawable/flour_based_food_writing_page_choose_category"
+                android:padding="10dp"
+                app:layout_constraintTop_toBottomOf="@id/writing_category_koreanfood_tb"
+                app:layout_constraintStart_toStartOf="@id/writing_category_koreanfood_tb"
+                app:layout_constraintBottom_toBottomOf="parent"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="20dp"
+                android:tag="5"
+                />
+
+            <androidx.appcompat.widget.AppCompatToggleButton
+                style="@style/Widget.AppCompat.Button.Borderless"
+                android:id="@+id/writing_category_pub_tb"
+                android:layout_width="65dp"
+                android:layout_height="65dp"
+                android:checked="false"
+                android:background="@drawable/category_item_toggle_selector"
+                android:textOff="@string/술집"
+                android:textOn="@string/술집"
+                android:fontFamily="@font/scdream4"
+                android:textSize="6dp"
+                android:drawableTop="@drawable/pub_writing_page_choose_catergory"
+                android:padding="10dp"
+                app:layout_constraintTop_toTopOf="@id/writing_category_basedfood_tb"
+                app:layout_constraintStart_toStartOf="@id/writing_category_weternfood_tb"
+                android:tag="6"
+                />
+
+            <androidx.appcompat.widget.AppCompatToggleButton
+                style="@style/Widget.AppCompat.Button.Borderless"
+                android:id="@+id/writing_category_dessert_tb"
+                android:layout_width="65dp"
+                android:layout_height="65dp"
+                android:checked="false"
+                android:background="@drawable/category_item_toggle_selector"
+                android:textOff="@string/디저트"
+                android:textOn="@string/디저트"
+                android:fontFamily="@font/scdream4"
+                android:textSize="6dp"
+                android:drawableTop="@drawable/dessert_writing_page_choose_category"
+                android:padding="10dp"
+                app:layout_constraintTop_toTopOf="@id/writing_category_basedfood_tb"
+                app:layout_constraintStart_toStartOf="@id/writing_category_chinese_tb"
+                android:tag="7"
+                />
+
+            <androidx.appcompat.widget.AppCompatToggleButton
+                style="@style/Widget.AppCompat.Button.Borderless"
+                android:id="@+id/writing_delivery_tb"
+                android:layout_width="65dp"
+                android:layout_height="65dp"
+                android:checked="false"
+                android:background="@drawable/category_item_toggle_selector"
+                android:textOff="배달 가능"
+                android:textOn="배달 가능"
+                android:fontFamily="@font/scdream4"
+                android:textColor="@color/black"
+                android:textSize="6dp"
+                android:drawableTop="@drawable/delivery_writing_page_choose_category"
+                android:padding="10dp"
+                app:layout_constraintTop_toTopOf="@id/writing_category_basedfood_tb"
+                app:layout_constraintStart_toStartOf="@id/writing_category_japanese_tb"
+                />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+        <!--    나중에 변경-->
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="400dp"
+            android:layout_marginBottom="20dp"
+            android:background="#fcfafa"
+            android:elevation="10dp"
+            app:layout_constraintTop_toBottomOf="@id/writing_phone_line"
+            tools:layout_editor_absoluteX="178dp"
+            android:layout_marginTop="34dp">
+
+            <ImageView
+                android:id="@+id/writing_score_iv"
+                android:layout_width="80dp"
+                android:layout_height="50dp"
+                android:src="@drawable/writingpage_rating_gray_xxhdpi"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                android:layout_marginStart="115dp"/>
+
+            <androidx.cardview.widget.CardView
+                android:id="@+id/writing_upload_picture_cv"
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                app:cardBackgroundColor="#f0eeee"
+                app:cardCornerRadius="15dp"
+                app:layout_constraintStart_toStartOf="parent"
+                android:layout_marginStart="27dp"
+                app:layout_constraintTop_toTopOf="parent"
+                android:layout_marginTop="39dp"
+                android:textAlignment="center"
+                app:cardElevation="0dp"
+                >
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/writing_page_upload_photo_camera_alt"
+                    android:layout_marginStart="15dp"
+                    android:layout_marginTop="12dp"/>
+
+            </androidx.cardview.widget.CardView>
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/writing_upload_iv"
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                android:src="@drawable/logo_splash_login_sighup"
+                android:visibility="gone"
+                android:layout_marginStart="5dp"
+                app:layout_constraintTop_toTopOf="@id/writing_upload_picture_cv"
+                app:layout_constraintStart_toEndOf="@id/writing_upload_picture_cv"/>
+
+
+            <EditText
+                android:id="@+id/writing_tag_et"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:hint="해시태그 추가"
+                android:layout_marginTop="12dp"
+                app:layout_constraintStart_toStartOf="@id/writing_upload_picture_cv"
+                app:layout_constraintTop_toBottomOf="@id/writing_upload_picture_cv"
+                android:textSize="8sp"
+                android:fontFamily="@font/scdream4"
+                android:textColor="@color/mechelin_gray_font2"
+                android:background="@null"
+                />
+
+            <View
+                android:id="@+id/writing_tag_line"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                app:layout_constraintStart_toStartOf="@id/writing_tag_et"
+                app:layout_constraintTop_toBottomOf="@id/writing_tag_et"
+                android:background="@color/mechelin_gray_font"
+                android:layout_marginHorizontal="20dp"
+                />
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/writing_tag_explain_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="해시태그는 8개까지 입력 가능합니다."
+                android:textSize="5sp"
+                app:layout_constraintStart_toStartOf="@id/writing_tag_et"
+                app:layout_constraintTop_toBottomOf="@id/writing_tag_line"
+                android:layout_marginTop="3dp"
+                android:fontFamily="@font/scdream4"/>
+
+            <EditText
+                android:id="@+id/writing_review_content_et"
+                android:layout_width="306dp"
+                android:layout_height="146dp"
+                android:hint="리뷰를 남겨주세요"
+                android:textSize="10sp"
+                android:background="@color/white"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/writing_tag_explain_tv"
+                app:layout_constraintStart_toStartOf="parent"
+                android:layout_marginTop="15dp"
+                android:inputType="text|textMultiLine"
+                android:scrollbars="vertical"
+                android:lines="30"
+                android:gravity="top|left"
+                android:padding="10dp"/>
+
+
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+>>>>>>> main
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/menu/main_bnv_menu.xml b/app/src/main/res/menu/main_bnv_menu.xml
index eccb378..5fddccc 100644
--- a/app/src/main/res/menu/main_bnv_menu.xml
+++ b/app/src/main/res/menu/main_bnv_menu.xml
@@ -4,7 +4,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/homeFragment"
-        android:icon="@drawable/main_btm_home_selector"
+        android:icon="@drawable/main_btn_home_selector"
         android:enabled="true"
         app:showAsAction="always"
         android:title="홈"
@@ -20,7 +20,7 @@
 
     <item
         android:id="@+id/mapFragment"
-        android:icon="@drawable/main_btm_map_selector"
+        android:icon="@drawable/main_btn_map_selector"
         android:enabled="true"
         app:showAsAction="always"
         android:title="지도"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index b1974a6..dddfdba 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -22,4 +22,5 @@
     <color name="mechelin_gray_font2">#766c6c</color>
 
     <color name="popup_transparent">#33000000</color>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 580abf4..971534b 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -18,6 +18,27 @@
         <!-- Status bar color. -->
         <item name="android:statusBarColor" tools:ignore="DuplicateDefinition">@color/transparent</item>
         <item name="android:windowTranslucentStatus">true</item>
+
+    </style>
+
+    <style name="AppTheme.Base" parent="Theme.AppCompat.Light.NoActionBar">
+        <!-- enable window content transitions -->
+        <item name="android:windowContentTransitions">true</item>
+
+        <item name="android:windowTranslucentStatus">true</item>
+
+        <item name="android:fitsSystemWindows">true</item>
+    </style>
+
+    <style name="Transparent" parent="@style/Theme.AppCompat">
+        <item name="windowNoTitle">true</item>
+        <item name="windowActionBar">false</item>
+        <item name="colorPrimaryDark">@color/popup_transparent</item>
+        <item name="android:windowBackground">@color/popup_transparent</item>
+        <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation</item>
+        <item name="android:backgroundDimEnabled">true</item>
     </style>
 
     <style name="AppTheme.Base" parent="Theme.AppCompat.Light.NoActionBar">