From ed8c3ea11ddf2d1e684e71dd1cb594e8f478e3ae Mon Sep 17 00:00:00 2001
From: NackUn <king4521@naver.com>
Date: Thu, 17 Dec 2020 18:08:42 +0900
Subject: [PATCH 01/14] [Issue-87] version update

---
 Picon/app/src/main/AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Picon/app/src/main/AndroidManifest.xml b/Picon/app/src/main/AndroidManifest.xml
index e4af199..c2cc1ec 100644
--- a/Picon/app/src/main/AndroidManifest.xml
+++ b/Picon/app/src/main/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.yapp.picon"
-    android:versionCode="001"
-    android:versionName="1.000">
+    android:versionCode="002"
+    android:versionName="1.010">
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />

From b7c1ed4705594efe8e06bfc6977437cf2e0a432d Mon Sep 17 00:00:00 2001
From: NackUn <king4521@naver.com>
Date: Wed, 30 Dec 2020 15:20:33 +0900
Subject: [PATCH 02/14] =?UTF-8?q?[Iusse-89]=20=EA=B8=B0=EC=A1=B4=20AccessT?=
 =?UTF-8?q?oken=20=EC=B2=98=EB=A6=AC=20=EB=B0=A9=EC=95=88=20=EC=A0=9C?=
 =?UTF-8?q?=EC=8B=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Picon/app/src/main/AndroidManifest.xml        |  2 +-
 .../presentation/splash/SplashViewModel.kt    | 21 +++++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/Picon/app/src/main/AndroidManifest.xml b/Picon/app/src/main/AndroidManifest.xml
index c2cc1ec..182c441 100644
--- a/Picon/app/src/main/AndroidManifest.xml
+++ b/Picon/app/src/main/AndroidManifest.xml
@@ -13,7 +13,7 @@
 
     <application
         android:name=".MainApplication"
-        android:allowBackup="true"
+        android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
diff --git a/Picon/app/src/main/java/com/yapp/picon/presentation/splash/SplashViewModel.kt b/Picon/app/src/main/java/com/yapp/picon/presentation/splash/SplashViewModel.kt
index 88a5b13..86a7d32 100644
--- a/Picon/app/src/main/java/com/yapp/picon/presentation/splash/SplashViewModel.kt
+++ b/Picon/app/src/main/java/com/yapp/picon/presentation/splash/SplashViewModel.kt
@@ -34,25 +34,34 @@ class SplashViewModel(
     fun check() {
         viewModelScope.launch {
             loadFirstUseCase().let {
-                Log.e("aa12", "loadFirstUseCase : $it")
+                Log.e(TAG, "loadFirstUseCase : $it")
                 _firstYN.value = it
             }
 
-            loadAccessTokenUseCase().let {
-                Log.e("aa12", "loadAccessTokenUseCase : $it")
-                _loginYN.value = it.isNotEmpty()
+            // AccessToken 이 있지만 인증이 안될 경우 try catch 로 처리합니다.
+            try {
+                loadAccessTokenUseCase().let {
+                    Log.e(TAG, "loadAccessTokenUseCase : $it")
+                    _loginYN.value = it.isNotEmpty()
+                }
+            } catch (e: Exception) {
+                Log.e(TAG, "Error loadAccessTokenUseCase : ${e.message}")
+                return@launch
             }
 
-            Log.e("aa12", "_checkYN CHANGE")
+            Log.e(TAG, "_checkYN CHANGE")
             _checkYN.value = true
         }
     }
 
     fun saveFirstYN(firstYN: Boolean) {
         viewModelScope.launch {
-            Log.e("aa12", "saveFirstYN")
+            Log.e(TAG, "saveFirstYN")
             saveFirstUseCase(firstYN)
         }
     }
 
+    companion object {
+        private const val TAG = "SplashViewModel"
+    }
 }
\ No newline at end of file

From 2a7c0bc8f75fb03811315c00440f3d3ae2855fd1 Mon Sep 17 00:00:00 2001
From: NackUn <king4521@naver.com>
Date: Wed, 30 Dec 2020 15:47:03 +0900
Subject: [PATCH 03/14] =?UTF-8?q?[Iusse-89]=20sns=20=EB=A1=9C=EA=B7=B8?=
 =?UTF-8?q?=EC=9D=B8=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8=20=EC=98=88?=
 =?UTF-8?q?=EC=A0=95=20=EC=95=88=EB=82=B4=20=ED=86=A0=EC=8A=A4=ED=8A=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yapp/picon/presentation/login/LoginActivity.kt     | 2 ++
 Picon/app/src/main/res/values/strings.xml                       | 1 +
 2 files changed, 3 insertions(+)

diff --git a/Picon/app/src/main/java/com/yapp/picon/presentation/login/LoginActivity.kt b/Picon/app/src/main/java/com/yapp/picon/presentation/login/LoginActivity.kt
index 7a7aa16..1d7bbd3 100644
--- a/Picon/app/src/main/java/com/yapp/picon/presentation/login/LoginActivity.kt
+++ b/Picon/app/src/main/java/com/yapp/picon/presentation/login/LoginActivity.kt
@@ -28,6 +28,8 @@ class LoginActivity : BaseActivity<LoginActivityBinding, LoginViewModel>(
     private fun setListeners() {
         binding.loginBtnLogin.setOnClickListener { vm.login() }
         binding.loginTvSimpleJoin.setOnClickListener { startSimpleJoinActivity() }
+        binding.loginIbNaver.setOnClickListener { showToast(getString(R.string.update_plan_guide_text)) }
+        binding.loginIbKakao.setOnClickListener { showToast(getString(R.string.update_plan_guide_text)) }
     }
 
     private fun startSimpleJoinActivity() {
diff --git a/Picon/app/src/main/res/values/strings.xml b/Picon/app/src/main/res/values/strings.xml
index eacf1cb..25fafc1 100644
--- a/Picon/app/src/main/res/values/strings.xml
+++ b/Picon/app/src/main/res/values/strings.xml
@@ -92,4 +92,5 @@
     <string name="collecting">모아보기</string>
     <string name="memo">메모</string>
     <string name="remove_pin">핀 삭제</string>
+    <string name="update_plan_guide_text">차후 업데이트 예정입니다.</string>
 </resources>
\ No newline at end of file

From 6bbd977b8ea123bf3494f042b15a166b4b16cc71 Mon Sep 17 00:00:00 2001
From: NackUn <king4521@naver.com>
Date: Wed, 30 Dec 2020 15:57:43 +0900
Subject: [PATCH 04/14] =?UTF-8?q?[Iusse-89]=20=ED=9A=8C=EC=9B=90=EA=B0=80?=
 =?UTF-8?q?=EC=9E=85=20=EC=8B=9C=20=ED=94=84=EB=A1=9C=EA=B7=B8=EB=9E=98?=
 =?UTF-8?q?=EC=8A=A4=EB=B0=94=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../simplejoin/SimpleJoinActivity.kt          |  23 +-
 .../main/res/layout/simple_join_activity.xml  | 200 ++++++++++--------
 2 files changed, 133 insertions(+), 90 deletions(-)

diff --git a/Picon/app/src/main/java/com/yapp/picon/presentation/simplejoin/SimpleJoinActivity.kt b/Picon/app/src/main/java/com/yapp/picon/presentation/simplejoin/SimpleJoinActivity.kt
index 08f4a24..9d7adb2 100644
--- a/Picon/app/src/main/java/com/yapp/picon/presentation/simplejoin/SimpleJoinActivity.kt
+++ b/Picon/app/src/main/java/com/yapp/picon/presentation/simplejoin/SimpleJoinActivity.kt
@@ -3,6 +3,8 @@ package com.yapp.picon.presentation.simplejoin
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
+import android.view.View
+import android.view.WindowManager
 import androidx.lifecycle.Observer
 import com.yapp.picon.BR
 import com.yapp.picon.R
@@ -23,7 +25,26 @@ class SimpleJoinActivity : BaseActivity<SimpleJoinActivityBinding, SimpleJoinVie
     }
 
     private fun setListeners() {
-        binding.simpleJoinBtnJoin.setOnClickListener { vm.joinMembership() }
+        binding.simpleJoinBtnJoin.setOnClickListener { joinMembership() }
+    }
+
+    private fun joinMembership() {
+        startLoading()
+        vm.joinMembership()
+        stopLoading()
+    }
+
+    private fun startLoading() {
+        binding.simpleJoinProgressBar.visibility = View.VISIBLE
+        window.setFlags(
+            WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE,
+            WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE
+        )
+    }
+
+    private fun stopLoading() {
+        window.clearFlags(WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE)
+        binding.simpleJoinProgressBar.visibility = View.GONE
     }
 
     override fun initViewModel() {
diff --git a/Picon/app/src/main/res/layout/simple_join_activity.xml b/Picon/app/src/main/res/layout/simple_join_activity.xml
index 2f679cb..7b189d7 100644
--- a/Picon/app/src/main/res/layout/simple_join_activity.xml
+++ b/Picon/app/src/main/res/layout/simple_join_activity.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
     <data>
@@ -9,101 +10,122 @@
             type="com.yapp.picon.presentation.simplejoin.SimpleJoinViewModel" />
     </data>
 
-    <LinearLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/dark_grey"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:gravity="center"
-        android:orientation="vertical">
+        android:layout_height="match_parent">
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="32dp"
-            android:gravity="center_horizontal"
-            android:lineSpacingExtra="4sp"
-            android:textColor="@color/very_light_pink"
-            android:textSize="16sp"
-            android:textStyle="normal"
-            tools:text="간편 로그인" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/dark_grey"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:gravity="center"
+            android:orientation="vertical"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
 
-        <EditText
-            android:id="@+id/simple_join_et_id"
-            android:layout_width="300dp"
-            android:layout_height="46dp"
-            android:layout_marginTop="44dp"
-            android:background="@drawable/bg_login_form"
-            android:hint="@string/simple_join_input_id"
-            android:inputType="textEmailAddress"
-            android:letterSpacing="-0.02"
-            android:paddingStart="14dp"
-            android:paddingEnd="14dp"
-            android:text="@={simpleJoinVM.id}"
-            android:textColor="@color/pale_grey"
-            android:textColorHint="@color/brown_grey_two"
-            android:textSize="14sp" />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="32dp"
+                android:gravity="center_horizontal"
+                android:lineSpacingExtra="4sp"
+                android:textColor="@color/very_light_pink"
+                android:textSize="16sp"
+                android:textStyle="normal"
+                tools:text="간편 로그인" />
 
-        <EditText
-            android:id="@+id/simple_join_et_pw"
-            android:layout_width="300dp"
-            android:layout_height="46dp"
-            android:layout_marginTop="48dp"
-            android:background="@drawable/bg_login_form"
-            android:hint="@string/simple_join_input_pw"
-            android:inputType="textPassword"
-            android:letterSpacing="-0.02"
-            android:paddingStart="14dp"
-            android:paddingEnd="14dp"
-            android:text="@={simpleJoinVM.pw}"
-            android:textColor="@color/pale_grey"
-            android:textColorHint="@color/brown_grey_two"
-            android:textSize="14sp" />
+            <EditText
+                android:id="@+id/simple_join_et_id"
+                android:layout_width="300dp"
+                android:layout_height="46dp"
+                android:layout_marginTop="44dp"
+                android:background="@drawable/bg_login_form"
+                android:hint="@string/simple_join_input_id"
+                android:inputType="textEmailAddress"
+                android:letterSpacing="-0.02"
+                android:paddingStart="14dp"
+                android:paddingEnd="14dp"
+                android:text="@={simpleJoinVM.id}"
+                android:textColor="@color/pale_grey"
+                android:textColorHint="@color/brown_grey_two"
+                android:textSize="14sp" />
 
-        <EditText
-            android:id="@+id/simple_join_et_pw_re"
-            android:layout_width="300dp"
-            android:layout_height="46dp"
-            android:layout_marginTop="48dp"
-            android:background="@drawable/bg_login_form"
-            android:hint="@string/simple_join_input_pw_re"
-            android:inputType="textPassword"
-            android:letterSpacing="-0.02"
-            android:paddingStart="14dp"
-            android:paddingEnd="14dp"
-            android:text="@={simpleJoinVM.pwRe}"
-            android:textColor="@color/pale_grey"
-            android:textColorHint="@color/brown_grey_two"
-            android:textSize="14sp" />
+            <EditText
+                android:id="@+id/simple_join_et_pw"
+                android:layout_width="300dp"
+                android:layout_height="46dp"
+                android:layout_marginTop="48dp"
+                android:background="@drawable/bg_login_form"
+                android:hint="@string/simple_join_input_pw"
+                android:inputType="textPassword"
+                android:letterSpacing="-0.02"
+                android:paddingStart="14dp"
+                android:paddingEnd="14dp"
+                android:text="@={simpleJoinVM.pw}"
+                android:textColor="@color/pale_grey"
+                android:textColorHint="@color/brown_grey_two"
+                android:textSize="14sp" />
 
-        <EditText
-            android:id="@+id/simple_join_et_nic"
-            android:layout_width="300dp"
-            android:layout_height="46dp"
-            android:layout_marginTop="48dp"
-            android:background="@drawable/bg_login_form"
-            android:hint="@string/simple_join_input_nic"
-            android:inputType="text"
-            android:letterSpacing="-0.02"
-            android:paddingStart="14dp"
-            android:paddingEnd="14dp"
-            android:text="@={simpleJoinVM.nic}"
-            android:textColor="@color/pale_grey"
-            android:textColorHint="@color/brown_grey_two"
-            android:textSize="14sp" />
+            <EditText
+                android:id="@+id/simple_join_et_pw_re"
+                android:layout_width="300dp"
+                android:layout_height="46dp"
+                android:layout_marginTop="48dp"
+                android:background="@drawable/bg_login_form"
+                android:hint="@string/simple_join_input_pw_re"
+                android:inputType="textPassword"
+                android:letterSpacing="-0.02"
+                android:paddingStart="14dp"
+                android:paddingEnd="14dp"
+                android:text="@={simpleJoinVM.pwRe}"
+                android:textColor="@color/pale_grey"
+                android:textColorHint="@color/brown_grey_two"
+                android:textSize="14sp" />
 
-        <Button
-            android:id="@+id/simple_join_btn_join"
-            android:layout_width="300dp"
-            android:layout_height="46dp"
-            android:layout_marginTop="170dp"
-            android:background="@drawable/bg_cornflower_radius_5dp"
-            android:gravity="center"
-            android:letterSpacing="-0.02"
-            android:text="@string/join_membership"
-            android:textColor="@color/pale_grey"
-            android:textSize="15sp" />
+            <EditText
+                android:id="@+id/simple_join_et_nic"
+                android:layout_width="300dp"
+                android:layout_height="46dp"
+                android:layout_marginTop="48dp"
+                android:background="@drawable/bg_login_form"
+                android:hint="@string/simple_join_input_nic"
+                android:inputType="text"
+                android:letterSpacing="-0.02"
+                android:paddingStart="14dp"
+                android:paddingEnd="14dp"
+                android:text="@={simpleJoinVM.nic}"
+                android:textColor="@color/pale_grey"
+                android:textColorHint="@color/brown_grey_two"
+                android:textSize="14sp" />
+
+            <Button
+                android:id="@+id/simple_join_btn_join"
+                android:layout_width="300dp"
+                android:layout_height="46dp"
+                android:layout_marginTop="170dp"
+                android:background="@drawable/bg_cornflower_radius_5dp"
+                android:gravity="center"
+                android:letterSpacing="-0.02"
+                android:text="@string/join_membership"
+                android:textColor="@color/pale_grey"
+                android:textSize="15sp" />
+
+        </LinearLayout>
+
+        <ProgressBar
+            android:id="@+id/simple_join_progress_bar"
+            style="?android:attr/progressBarStyleSmallInverse"
+            android:layout_width="52dp"
+            android:layout_height="52dp"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
-    </LinearLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file

From a40058808e8477f651c7c76b17d9681982c2b3c0 Mon Sep 17 00:00:00 2001
From: NackUn <king4521@naver.com>
Date: Wed, 30 Dec 2020 16:02:22 +0900
Subject: [PATCH 05/14] =?UTF-8?q?[Iusse-89]=20Timeout=20=EC=97=90=EB=9F=AC?=
 =?UTF-8?q?=20=EB=8C=80=EC=9D=91=20=EC=8B=9C=EA=B0=84=20=EC=97=B0=EC=9E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/src/main/java/com/yapp/picon/data/di/NetworkModule.kt | 4 ++++
 .../com/yapp/picon/presentation/profile/MyProfileViewModel.kt | 1 +
 2 files changed, 5 insertions(+)

diff --git a/Picon/app/src/main/java/com/yapp/picon/data/di/NetworkModule.kt b/Picon/app/src/main/java/com/yapp/picon/data/di/NetworkModule.kt
index 13a93b8..7523ba9 100644
--- a/Picon/app/src/main/java/com/yapp/picon/data/di/NetworkModule.kt
+++ b/Picon/app/src/main/java/com/yapp/picon/data/di/NetworkModule.kt
@@ -6,6 +6,7 @@ import org.koin.dsl.module
 import retrofit2.Converter
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
+import java.util.concurrent.TimeUnit
 
 val networkModule = module {
     factory { (baseUrl: String) ->
@@ -22,6 +23,9 @@ val networkModule = module {
 
     single {
         OkHttpClient.Builder()
+            .connectTimeout(30, TimeUnit.SECONDS)
+            .readTimeout(30, TimeUnit.SECONDS)
+            .writeTimeout(30, TimeUnit.SECONDS)
             .addNetworkInterceptor(
                 HttpLoggingInterceptor().also {
                     it.level = HttpLoggingInterceptor.Level.BODY
diff --git a/Picon/app/src/main/java/com/yapp/picon/presentation/profile/MyProfileViewModel.kt b/Picon/app/src/main/java/com/yapp/picon/presentation/profile/MyProfileViewModel.kt
index ba2e700..0126eea 100644
--- a/Picon/app/src/main/java/com/yapp/picon/presentation/profile/MyProfileViewModel.kt
+++ b/Picon/app/src/main/java/com/yapp/picon/presentation/profile/MyProfileViewModel.kt
@@ -73,6 +73,7 @@ class MyProfileViewModel(
     fun requestUserInfo() {
         viewModelScope.launch {
             try {
+                //HTTP 504 발생 Gateway Time Out
                 getUserInfoUseCase().memberDetailDto.let {
                     _myProfileTitle.value = it.member.nickName
                     _profileImageUrl.value = it.member.profileImageUrl ?: ""

From ad56e52f6e359d9c9d0af17247a5c72db2404939 Mon Sep 17 00:00:00 2001
From: NackUn <king4521@naver.com>
Date: Wed, 30 Dec 2020 16:11:10 +0900
Subject: [PATCH 06/14] =?UTF-8?q?[Iusse-89]=20=ED=94=84=EB=A1=9C=ED=95=84?=
 =?UTF-8?q?=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EB=B3=80=EA=B2=BD=20=ED=94=84?=
 =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EB=9E=98=EC=8A=A4=EB=B0=94=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../presentation/profile/MyProfileActivity.kt | 22 ++++++++++++++++++-
 .../main/res/layout/my_profile_activity.xml   | 11 ++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/Picon/app/src/main/java/com/yapp/picon/presentation/profile/MyProfileActivity.kt b/Picon/app/src/main/java/com/yapp/picon/presentation/profile/MyProfileActivity.kt
index c33481e..8096b2a 100644
--- a/Picon/app/src/main/java/com/yapp/picon/presentation/profile/MyProfileActivity.kt
+++ b/Picon/app/src/main/java/com/yapp/picon/presentation/profile/MyProfileActivity.kt
@@ -7,6 +7,7 @@ import android.graphics.Color
 import android.net.Uri
 import android.os.Bundle
 import android.view.View
+import android.view.WindowManager
 import androidx.core.content.res.ResourcesCompat
 import androidx.recyclerview.widget.GridLayoutManager
 import com.bumptech.glide.Glide
@@ -152,6 +153,25 @@ class MyProfileActivity : BaseActivity<MyProfileActivityBinding, MyProfileViewMo
             .startAlbum()
     }
 
+    private fun changeProfileImage(uri: Uri) {
+        startLoading()
+        vm.setProfileNewImageUri(uri)
+        stopLoading()
+    }
+
+    private fun startLoading() {
+        binding.myProfileProgressBar.visibility = View.VISIBLE
+        window.setFlags(
+            WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE,
+            WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE
+        )
+    }
+
+    private fun stopLoading() {
+        window.clearFlags(WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE)
+        binding.myProfileProgressBar.visibility = View.GONE
+    }
+
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
 
@@ -160,7 +180,7 @@ class MyProfileActivity : BaseActivity<MyProfileActivityBinding, MyProfileViewMo
                 if (resultCode == Activity.RESULT_OK) {
                     data?.run {
                         getParcelableArrayListExtra<Uri>(Define.INTENT_PATH)?.let {
-                            vm.setProfileNewImageUri(it[0])
+                            changeProfileImage(it[0])
                         }
                     }
                 }
diff --git a/Picon/app/src/main/res/layout/my_profile_activity.xml b/Picon/app/src/main/res/layout/my_profile_activity.xml
index 271581b..f106388 100644
--- a/Picon/app/src/main/res/layout/my_profile_activity.xml
+++ b/Picon/app/src/main/res/layout/my_profile_activity.xml
@@ -154,6 +154,17 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/my_profile_follow_linear_layout" />
 
+        <ProgressBar
+            android:id="@+id/my_profile_progress_bar"
+            style="?android:attr/progressBarStyleSmallInverse"
+            android:layout_width="52dp"
+            android:layout_height="52dp"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </layout>
\ No newline at end of file

From cb6ad6b0c59c88a44e8d101044dd03ae9aceca25 Mon Sep 17 00:00:00 2001
From: NackUn <king4521@naver.com>
Date: Fri, 15 Jan 2021 15:21:26 +0900
Subject: [PATCH 07/14] =?UTF-8?q?[Iusse-90]=20=EB=AA=A8=EC=95=84=EB=B3=B4?=
 =?UTF-8?q?=EA=B8=B0=20=ED=95=84=ED=84=B0=20=EC=82=AC=EC=A0=84=EC=9E=91?=
 =?UTF-8?q?=EC=97=85(=EB=A6=AC=EC=86=8C=EC=8A=A4,=20=EC=9D=B5=EC=8A=A4?=
 =?UTF-8?q?=ED=85=90=EC=85=98=20=EC=B6=94=EA=B0=80)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../picon/presentation/util/TextViewCode.kt   |   6 ++++
 .../picon/presentation/util/TextViewExt.kt    |  31 ++++++++++++++++++
 .../drawable-hdpi/ic_collect_mbs_check.png    | Bin 0 -> 603 bytes
 .../drawable-mdpi/ic_collect_mbs_check.png    | Bin 0 -> 476 bytes
 .../drawable-xhdpi/ic_collect_mbs_check.png   | Bin 0 -> 714 bytes
 .../drawable-xxhdpi/ic_collect_mbs_check.png  | Bin 0 -> 944 bytes
 .../drawable-xxxhdpi/ic_collect_mbs_check.png | Bin 0 -> 1221 bytes
 .../res/drawable/bg_collect_bottom_sheet.xml  |   8 +++++
 Picon/app/src/main/res/values/strings.xml     |   3 ++
 Picon/app/src/main/res/values/styles.xml      |  19 +++++++----
 10 files changed, 61 insertions(+), 6 deletions(-)
 create mode 100644 Picon/app/src/main/java/com/yapp/picon/presentation/util/TextViewCode.kt
 create mode 100644 Picon/app/src/main/java/com/yapp/picon/presentation/util/TextViewExt.kt
 create mode 100644 Picon/app/src/main/res/drawable-hdpi/ic_collect_mbs_check.png
 create mode 100644 Picon/app/src/main/res/drawable-mdpi/ic_collect_mbs_check.png
 create mode 100644 Picon/app/src/main/res/drawable-xhdpi/ic_collect_mbs_check.png
 create mode 100644 Picon/app/src/main/res/drawable-xxhdpi/ic_collect_mbs_check.png
 create mode 100644 Picon/app/src/main/res/drawable-xxxhdpi/ic_collect_mbs_check.png
 create mode 100644 Picon/app/src/main/res/drawable/bg_collect_bottom_sheet.xml

diff --git a/Picon/app/src/main/java/com/yapp/picon/presentation/util/TextViewCode.kt b/Picon/app/src/main/java/com/yapp/picon/presentation/util/TextViewCode.kt
new file mode 100644
index 0000000..3888376
--- /dev/null
+++ b/Picon/app/src/main/java/com/yapp/picon/presentation/util/TextViewCode.kt
@@ -0,0 +1,6 @@
+package com.yapp.picon.presentation.util
+
+enum class TextViewCode(val code: Int) {
+    COLLECT_MBS_EMOTION(2000),
+    COLLECT_MBS_LOCATION(2001)
+}
\ No newline at end of file
diff --git a/Picon/app/src/main/java/com/yapp/picon/presentation/util/TextViewExt.kt b/Picon/app/src/main/java/com/yapp/picon/presentation/util/TextViewExt.kt
new file mode 100644
index 0000000..5f20ae7
--- /dev/null
+++ b/Picon/app/src/main/java/com/yapp/picon/presentation/util/TextViewExt.kt
@@ -0,0 +1,31 @@
+package com.yapp.picon.presentation.util
+
+import android.graphics.Typeface
+import android.widget.TextView
+import androidx.core.content.res.ResourcesCompat
+import androidx.databinding.BindingAdapter
+import com.yapp.picon.R
+
+@BindingAdapter("isClicked", "textViewCode")
+fun TextView.isClicked(isClicked: Boolean, textViewCode: Int) {
+    when (textViewCode) {
+        TextViewCode.COLLECT_MBS_EMOTION.code -> {
+            if (isClicked) {
+                setTypeface(null, Typeface.BOLD)
+                setTextColor(ResourcesCompat.getColor(resources, R.color.pale_grey, null))
+            } else {
+                setTypeface(null, Typeface.NORMAL)
+                setTextColor(ResourcesCompat.getColor(resources, R.color.brown_grey, null))
+            }
+        }
+        TextViewCode.COLLECT_MBS_LOCATION.code -> {
+            if (isClicked) {
+                setTypeface(null, Typeface.BOLD)
+                setTextColor(ResourcesCompat.getColor(resources, R.color.pale_grey, null))
+            } else {
+                setTypeface(null, Typeface.NORMAL)
+                setTextColor(ResourcesCompat.getColor(resources, R.color.brown_grey_two, null))
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Picon/app/src/main/res/drawable-hdpi/ic_collect_mbs_check.png b/Picon/app/src/main/res/drawable-hdpi/ic_collect_mbs_check.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d45740e2d19cf165df8d067c73791f2e6e3ddbd
GIT binary patch
literal 603
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbB7>k44ofy`glX(f`xTHpSruq6Z
zXaU(A42<oW3@jieKr98s3=GT*7#Wy>G$TlC0TWzSWdSpS4N|DZ_xKM`*-=jy$B+ol
zx7YT2A9fI7|L}cXnc%^5evkGmSa5fBa~xebnWO8kVaH;NT~<3RuVk@{ubdn#E<QI_
z<_?#Vo>iBEUeWhG%Ue`@^=xlti|IQTm+yRL_w!j1XT$v(CcDP^X$;S5_qK00`FJb%
zc*BO3?Da}Q(QB>j*!ToRKHV^WwpM*TLk53`mx~F%#_fw6i<wy^m?HX_7z)gy&a;MC
zFI7^Xd?bVKfa^L1KQ_m*O9l-$BDFf3H8R#rzEv~Z#4&lAchce@$C=z25<G{GO}emQ
zM#zMD4XG}s;Vy->K}Vlw%rSc!Xuuh;R<-}juMPjp8SDc)wx)@`&r!IO9>OzU`QHuU
zoMPpC7L%n@UYVWC__#gsKtDGRzaYEf*Skuywm9xQq~hQt@~UcH{gJ~b+;$#OaX2em
zBfz>bsk^8*G2m75eT(I+s#kmGd0zgw<%2iJ##6$zG7`!i{3#2+Tn=Ybm0ot;@fMfN
zeuH9N(}fFmONxGZaa%f$y>_qB>X{1vmYbepY&$N^vB}BuP(-s)AfKU)Urpi@vBS%z
zw^YXo34E}9(=>gt&w~#(i6>u8YrV@@cH88$ZfIovoc%BQKj(d!q5qo&6vm1|KNwAC
ViauIj&XNd<SWj0!mvv4FO#r@F;hq2h

literal 0
HcmV?d00001

diff --git a/Picon/app/src/main/res/drawable-mdpi/ic_collect_mbs_check.png b/Picon/app/src/main/res/drawable-mdpi/ic_collect_mbs_check.png
new file mode 100644
index 0000000000000000000000000000000000000000..16af8537151958ae5aa399c699e020782035d2a2
GIT binary patch
literal 476
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjjKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uv49!D1}S`GTDlgf%+1rqF~oy6
zIYEMzS(d5iN{Pd*Gym80=<ujb^5R)8EhG8A;Y`}1X{?gm|GkY3{_Xzs|NQ;r^LhVc
zxs9i@9$V1DCi(CE^Zm>`|NpOcIFlICI@5h4zX4Br%AccW4utS*Zcvg>FrG89Q!}NC
z>v7o())aRmy~F9t4D#9}`4&ACOF8#1|IhdP`z^%WmQB5UNupm-+bLZ*+rmTMhVS3M
z|J!FYKCG9UU^m0?b-lr^g$8z-ZHprqd>FqwF#VVOxB1Wi|M{$D-X5khN14RTo{1!M
z+&z%WY1!6%rs+6i$7Iw0`;W|z|No8o??T3jDSr;1I3aTIz_|h@)w#@*l{B_4aM$qQ
zw{qCXpwf9(Xu*f#gbOE|OeZH;c-XeFDma#SJ0vAIEPAM58==eKnGoUB_OL?NA>vax
tAG7jeA&uYu{?1PVCj8Nm;AJe}U|{e!IQBPE%Gn+ivYxJfF6*2UngD?}rwIT6

literal 0
HcmV?d00001

diff --git a/Picon/app/src/main/res/drawable-xhdpi/ic_collect_mbs_check.png b/Picon/app/src/main/res/drawable-xhdpi/ic_collect_mbs_check.png
new file mode 100644
index 0000000000000000000000000000000000000000..9028272a81f025badaf1bb8f131923e2799a2223
GIT binary patch
literal 714
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC#^NA%Cx&(BWL^R}E~ycoX}-P;
zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyy~ySip>6gB0F2&*5QUU^4M^aSX{|
zeLH=v|6vD_1NXDJ>lwIM+1d{_9uN@W6l!kPxyixF(s=mH19qkxLL8iY&CU}VoD>8U
zJPi`WoSd4J6W>0*XP2?_-nDhH_8#xftb6}%*Zuc*-PbYfdcgyOe;)HB%)8kgI?JtO
z8tdZRroys-BkVKHw=*rBwU?1al*uUS!VlgAooikdPp4*>S2^Fj-W^&!x#L@GMcN`o
zmg?|jr{^*p=DuMoxn*U8h2HUE)eGG74hp^q6Wj2_A?&>42d4dgDLE%=cFt&g*7kN&
zPSk-2bKPXWoCo2N3ZH{J9#$ScmGG{Z``?BJ|GYD6Q?&%d=b8FkSG^lmeb)V4O}p7-
zNsi5lm1oPN&15V7g>p?fpZVjh@G{Rc7gn&AKMno!iLWbIUS&^^!yWr$40F8|X5};~
z*)7i03FZDF!9M3WpVYkjFRk4K-=5O9`K~Za;r7nR^%q6#-E=(<7<c<OFr?Q`a8c$h
zShv_qg>}7%!y@td4D3o?DxB*@6b#A(a+(}HRCw2mJos&<B>Ko}3FCRDQ^`}LuVwX$
zD%t$2R)0RN%<<2L12e*FRhP1!SBYiaVc6v|>q8^cU#}&+@?HvST4tOQE?j-**}qqp
zeuu4;6P9_qvt`d==IN8SZ(cu-$L7Cp2ID&!UnR>Q`&fTX_Ykw2<WSN1<e@S*i}w;{
zdG7_gU8+8ud9b^;$RNj3D{48*u_g=7cZ?rp1@(?-ryr{EZ2ilB*FW6>4i(Nz{$LDK
W@ICCg_rrZqI`VY&b6Mw<&;$U83lq2i

literal 0
HcmV?d00001

diff --git a/Picon/app/src/main/res/drawable-xxhdpi/ic_collect_mbs_check.png b/Picon/app/src/main/res/drawable-xxhdpi/ic_collect_mbs_check.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f34e5c1a2d2c77c65335beda6d170dd5095a42a
GIT binary patch
literal 944
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!jKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(<^v49!D1}U6i==L6{T*}kMF{Fa=
z?XA7tB8DOiANHKlEbofq5Zkt>sWs|mWXFRf#jb*=71wvpi&1_dzhQ3g+!Jfdr*f-z
zEM1`VLd<MhSd-ihxd^RCbDy6x&i|4!^X?gUwVR&Dra#J4pPcf!E+uW#Opb${tPu?u
zNI{2@WA*N5d*6O3%*r+0w>D~qt0EuAk$#2?uj8h7zuJFFYW_d&1+DHozF$A~z;cnr
z#Iyj0^Sj=@*u&?!OxxtG#lgt_`2NESBd%VsEHBo~d;KWS<bu6S<M9#(PN4^)cYkW$
z?Y!`rGrd^3Zt<}b7xzR298ip%>Bf}XJ4eZaljqSYz7>VjZ;0_diwQfd5OiSj!^aQL
z_f~bye4x?u?{Ha3)OV5WGpcD#%nJ8%?+eCWczD4h>j=lHhReI^MfdT=2faLhka_13
z&N`Nz$2g@jge(p+`EsdyEbx59!fui|XF<cO11DKuDV*B+^vAR)p&iSnP2p4SIG^?G
zOUZw^%I(FRbwSLNJxU)2<lL$hP&)MI(}UJ1_sm`ehCS0SZ@N0SSzr0NPWqKj=Y<*d
zYgV}~Y29cM!u`?WU&rsyws+jy*9G0R5ScEfAy#3jUGO#gXNR|ne1TCT%YlPB3Rcg#
zPKwX*Q4si{$$x@%lE1}G2M%r5h8(4zZO$80?T+T@@W!n&N?(yMk%h_bK#xu8r;^Wt
z?Mc_}Ey)zj{O(f{sH?SCx5+ux=e_5?M*%*!1YOiM@4kF^F8}q(nio&z&-t@I)os#w
z3z1Ac0nwt?C)R$63gRA$52i3}>J;Jf%T$o|P<$xC80si=`^lOcJ@V5lSAPF~)#u%9
z_E*!pLtd!azU$`Azq9esML*q3_k+#(z8;t8(3-6fxL4^UyUeR}RfVhrtdsOD!Wwdv
zf3_s^o)DXqZxPnGO6g}uvg`?wli@Pz4yhAsjuo<nh@32!>010@NiWxQ&+pG3{9gC+
z#hO*0y@J=TH`Bjr=6vl-rpoS5HW^EfhOq68UtD`)#kN~&yFIVAdEOG<abp_)rn0i7
kvmQE&B`{(|)=c{ucfBvTf5hu^04TS3y85}Sb4q9e0NnqK*Z=?k

literal 0
HcmV?d00001

diff --git a/Picon/app/src/main/res/drawable-xxxhdpi/ic_collect_mbs_check.png b/Picon/app/src/main/res/drawable-xxxhdpi/ic_collect_mbs_check.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5924e1aab951b01ca24b64dc51af2f0a18ce15f
GIT binary patch
literal 1221
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(;}uz(rC1}R)=9Ph`#z@qQz;uuoF
z`1X!%hH#?H@sH2zS6;n!uq?-&{oulgxupS)7x<c-1lqY;muYozHRZj1u}F+-o3HD^
zjm=6g7Oig9D}13)Qm{tBqjbYI)$;!Hm(5JB-%&lk*Y5kBzj=n=C#g?AZ@#i}r%dt;
z1qMbA2L>jA1_l-!%n9j?r#{d1e!TB){n6^{*KQi_K4P|;{l=v;thYFdc5?{0tj@eG
zt^Xr&dER+LzjVvT(_&nEUOoCGy?S{`cHWdav)p&pf{Znpf5Jnay$+WQoLYGA_138z
zAG?jSmsmN*@405K@7$2a+j?4<`)lB{3#X4QzV}_r<@Da#YacEf{r!B`ZOx6US6gl~
zye?y%^6_b?h5e`Ut2;MW=f3ymc<}bpCKG{w=eBnKSUIinn~p<+twP-9#1Gq#Jv4b@
z8u!_VCF9zM9Wqk!J*xlaM|_mHw3UM~M&{j2jUTs_1JBwfy^aZgt)w%NDe&V_?~A>Y
zQqPuLI%0glSwrjJwFyVm=J#GU?|&HE{lV_QQNh0x_uI<Y&R-uPDx}~1jpx2mH-oRr
zMw?GFt@iE7WVyk)fLWf=<gs#tz=f|T?q|lov3K0{k^3*t38uP4<`mZb6BswO#P48;
zJggtmpz}yv%^~a~Gy94&pBcN~eCAvH_)&0Q-bb@tZok*`Z%+Oa%Qx+)=II}oynin4
zczyNPjKeQGf6RI~fqPcQ-A6f}eD;6c5u<i{tKVmzYadnngBm(l{cR}zw_>ikV72*$
z@Le{c%g&bFUb^)hOHJlQ!vkko>#mf|S^wzu*1ud8@7aHQPcLydV2!UT`{T6ioyB(1
zk54O<wO4<8z0&obZhDE2+C%U8eT+x${}E<X-0Et;8?V{$Bd^#XfnjImD?y(l;amqg
z^jkS5WU&N)yvk(oOT@@QOVH<7I9I`j^RvX<ne@{Qn_m9#VtjIOuj;0CogA+tyC$&L
zEM+KKe6#SEPF-_>p|;?sCjDINeS(vvP1Qa|Ua)jK7hU+`YvZv^0{`8rHcwNp$rRUU
z*wb{5qw+Ans6%**&7*d{31uyN9=UT(2y3x<?9Ml#q-D?J<3b86Ib09)>pI*KtoyTZ
zy~baWkb4{6i@ecDy`Lx)C-@^ZWB1?A=c-y)kNEMH|B=nxEz4QaQE_{rP@H5o!_M^|
zT{?=^pRIUe{x0zi;}<sr?)WHGAqRh!&mV+&C*-jhe-!4Q;Kx$@F_?2g4$J0`!Q2yk
zSU!IY<`u|qsd=zmPGKI$&x6;66rx&c9%ge3=sErSu$7HNOmY5?OAZfj1ni77nryN9
z0ej(z)0z7p_dU^!Kf<Xmw`$%GrI~wu%B~!->*CmS`@2}>`CIwV*I5YsSYpBd{KB`H
w%T`=dJ-2;v(W&VQ+go!L31&@*f=tdo>@t1_b9(JHIzdH<r>mdKI;Vst0Ch+ZGXMYp

literal 0
HcmV?d00001

diff --git a/Picon/app/src/main/res/drawable/bg_collect_bottom_sheet.xml b/Picon/app/src/main/res/drawable/bg_collect_bottom_sheet.xml
new file mode 100644
index 0000000..45667b4
--- /dev/null
+++ b/Picon/app/src/main/res/drawable/bg_collect_bottom_sheet.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/dark_grey" />
+    <corners
+        android:topLeftRadius="30dp"
+        android:topRightRadius="30dp" />
+</shape>
\ No newline at end of file
diff --git a/Picon/app/src/main/res/values/strings.xml b/Picon/app/src/main/res/values/strings.xml
index 25fafc1..c60a86e 100644
--- a/Picon/app/src/main/res/values/strings.xml
+++ b/Picon/app/src/main/res/values/strings.xml
@@ -93,4 +93,7 @@
     <string name="memo">메모</string>
     <string name="remove_pin">핀 삭제</string>
     <string name="update_plan_guide_text">차후 업데이트 예정입니다.</string>
+    <string name="emotion">감정</string>
+    <string name="initialization">초기화</string>
+    <string name="apply">적용하기</string>
 </resources>
\ No newline at end of file
diff --git a/Picon/app/src/main/res/values/styles.xml b/Picon/app/src/main/res/values/styles.xml
index d82f181..957c0d7 100644
--- a/Picon/app/src/main/res/values/styles.xml
+++ b/Picon/app/src/main/res/values/styles.xml
@@ -13,14 +13,10 @@
         <item name="android:checkboxStyle">@style/CheckboxStyle</item>
 
         <!-- View Transition -->
-        <item
-            name="android:windowSharedElementEnterTransition"
-            tools:ignore="NewApi">
+        <item name="android:windowSharedElementEnterTransition" tools:ignore="NewApi">
             @android:transition/move
         </item>
-        <item
-            name="android:windowSharedElementExitTransition"
-            tools:ignore="NewApi">
+        <item name="android:windowSharedElementExitTransition" tools:ignore="NewApi">
             @android:transition/move
         </item>
     </style>
@@ -97,4 +93,15 @@
         <item name="android:includeFontPadding">false</item>
     </style>
 
+    <style name="TransparentStyle">
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowTitleStyle">@null</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
+        <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
+        <item name="android:background">@android:color/transparent</item>
+    </style>
+
 </resources>
\ No newline at end of file

From cd8edc282d276382deae3e7740fc74986b32f40f Mon Sep 17 00:00:00 2001
From: NackUn <king4521@naver.com>
Date: Fri, 15 Jan 2021 15:23:12 +0900
Subject: [PATCH 08/14] =?UTF-8?q?[Iusse-90]=20=EB=AA=A8=EC=95=84=EB=B3=B4?=
 =?UTF-8?q?=EA=B8=B0=20=ED=95=84=ED=84=B0=20=EA=B0=90=EC=A0=95=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../presentation/collect/CollectActivity.kt   |  31 +-
 .../collect/CollectBottomSheetDialog.kt       | 121 +++++++
 .../presentation/collect/CollectViewModel.kt  | 128 ++++++-
 .../main/res/layout/collect_bottom_sheet.xml  | 337 ++++++++++++++++++
 4 files changed, 612 insertions(+), 5 deletions(-)
 create mode 100644 Picon/app/src/main/java/com/yapp/picon/presentation/collect/CollectBottomSheetDialog.kt
 create mode 100644 Picon/app/src/main/res/layout/collect_bottom_sheet.xml

diff --git a/Picon/app/src/main/java/com/yapp/picon/presentation/collect/CollectActivity.kt b/Picon/app/src/main/java/com/yapp/picon/presentation/collect/CollectActivity.kt
index 1b353aa..61e29af 100644
--- a/Picon/app/src/main/java/com/yapp/picon/presentation/collect/CollectActivity.kt
+++ b/Picon/app/src/main/java/com/yapp/picon/presentation/collect/CollectActivity.kt
@@ -2,6 +2,7 @@ package com.yapp.picon.presentation.collect
 
 import android.content.Intent
 import android.os.Bundle
+import android.util.Log
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.GridLayoutManager
 import com.yapp.picon.BR
@@ -11,6 +12,7 @@ import com.yapp.picon.databinding.CollectItemBinding
 import com.yapp.picon.presentation.base.BaseActivity
 import com.yapp.picon.presentation.model.Pin
 import com.yapp.picon.presentation.model.Post
+import com.yapp.picon.presentation.nav.repository.EmotionDatabaseRepository
 import com.yapp.picon.presentation.postdetail.PostDetailActivity
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
@@ -28,6 +30,8 @@ class CollectActivity : BaseActivity<CollectActivityBinding, CollectViewModel>(
                 { item: Pin -> itemClicked(item) }
             ) {}
 
+    private val collectBottomSheetDialog = CollectBottomSheetDialog()
+
     private fun itemClicked(item: Pin) {
         clickItem(item)
     }
@@ -56,6 +60,7 @@ class CollectActivity : BaseActivity<CollectActivityBinding, CollectViewModel>(
         setAdapter()
         setListeners()
         setPosts()
+        setEmotions()
     }
 
     private fun setAdapter() {
@@ -65,16 +70,17 @@ class CollectActivity : BaseActivity<CollectActivityBinding, CollectViewModel>(
 
     private fun setListeners() {
         binding.collectIbBack.setOnClickListener { finish() }
-        binding.collectIbFilter.setOnClickListener {
-            //todo 필터 구현하기
-            showToast("필터는 현재 구현 중에 있습니다.")
-        }
+        binding.collectIbFilter.setOnClickListener { vm.toggleShowFilterYN() }
     }
 
     private fun setPosts() {
         vm.setPosts()
     }
 
+    private fun setEmotions() {
+        EmotionDatabaseRepository(application).getAll().observe(this, { vm.setEmotions(it) })
+    }
+
     override fun initViewModel() {
         binding.setVariable(BR.collectVM, vm)
 
@@ -82,6 +88,23 @@ class CollectActivity : BaseActivity<CollectActivityBinding, CollectViewModel>(
             showToast(it)
         }
         vm.toastMsg.observe(this, toastMsgObserver)
+
+        val showFilterYNObserver = Observer<Boolean> {
+            Log.e(TAG, "showFilterYNObserver : $it")
+
+            if (it) {
+                collectBottomSheetDialog.show(supportFragmentManager, "CollectBottomSheetDialog")
+            } else {
+                if (collectBottomSheetDialog.isVisible) {
+                    collectBottomSheetDialog.dismiss()
+                }
+            }
+        }
+        vm.showFilterYN.observe(this, showFilterYNObserver)
+    }
+
+    companion object {
+        private const val TAG = "CollectActivity"
     }
 
 }
\ No newline at end of file
diff --git a/Picon/app/src/main/java/com/yapp/picon/presentation/collect/CollectBottomSheetDialog.kt b/Picon/app/src/main/java/com/yapp/picon/presentation/collect/CollectBottomSheetDialog.kt
new file mode 100644
index 0000000..f9786dc
--- /dev/null
+++ b/Picon/app/src/main/java/com/yapp/picon/presentation/collect/CollectBottomSheetDialog.kt
@@ -0,0 +1,121 @@
+package com.yapp.picon.presentation.collect
+
+import android.graphics.Typeface
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.core.content.res.ResourcesCompat
+import androidx.databinding.DataBindingUtil
+import androidx.lifecycle.Observer
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import com.yapp.picon.BR
+import com.yapp.picon.R
+import com.yapp.picon.databinding.CollectBottomSheetBinding
+import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+
+class CollectBottomSheetDialog : BottomSheetDialogFragment() {
+
+    private lateinit var binding: CollectBottomSheetBinding
+    private val vm: CollectViewModel by sharedViewModel()
+
+    private fun initViewModel() {
+        binding.setVariable(BR.collectVM, vm)
+
+        val emotion1ClickedYNObserver = Observer<Boolean> {
+            if (it) {
+                selectedEmotion(binding.collectMbsTvEmotion1, binding.collectMbsIvEmotion1)
+            } else {
+                unselectedEmotion(binding.collectMbsTvEmotion1, binding.collectMbsIvEmotion1)
+            }
+        }
+        vm.emotion1ClickedYN.observe(this, emotion1ClickedYNObserver)
+
+        val emotion2ClickedYNObserver = Observer<Boolean> {
+            if (it) {
+                selectedEmotion(binding.collectMbsTvEmotion2, binding.collectMbsIvEmotion2)
+            } else {
+                unselectedEmotion(binding.collectMbsTvEmotion2, binding.collectMbsIvEmotion2)
+            }
+        }
+        vm.emotion2ClickedYN.observe(this, emotion2ClickedYNObserver)
+
+        val emotion3ClickedYNObserver = Observer<Boolean> {
+            if (it) {
+                selectedEmotion(binding.collectMbsTvEmotion3, binding.collectMbsIvEmotion3)
+            } else {
+                unselectedEmotion(binding.collectMbsTvEmotion3, binding.collectMbsIvEmotion3)
+            }
+        }
+        vm.emotion3ClickedYN.observe(this, emotion3ClickedYNObserver)
+
+        val emotion4ClickedYNObserver = Observer<Boolean> {
+            if (it) {
+                selectedEmotion(binding.collectMbsTvEmotion4, binding.collectMbsIvEmotion4)
+            } else {
+                unselectedEmotion(binding.collectMbsTvEmotion4, binding.collectMbsIvEmotion4)
+            }
+        }
+        vm.emotion4ClickedYN.observe(this, emotion4ClickedYNObserver)
+
+        val emotion5ClickedYNObserver = Observer<Boolean> {
+            if (it) {
+                selectedEmotion(binding.collectMbsTvEmotion5, binding.collectMbsIvEmotion5)
+            } else {
+                unselectedEmotion(binding.collectMbsTvEmotion5, binding.collectMbsIvEmotion5)
+            }
+        }
+        vm.emotion5ClickedYN.observe(this, emotion5ClickedYNObserver)
+    }
+
+    private fun selectedEmotion(textView: TextView, imageView: ImageView) {
+        textView.apply {
+            setTypeface(null, Typeface.BOLD)
+            setTextColor(ResourcesCompat.getColor(resources, R.color.pale_grey, null))
+        }
+        imageView.visibility = View.VISIBLE
+    }
+
+    private fun unselectedEmotion(textView: TextView, imageView: ImageView) {
+        textView.apply {
+            setTypeface(null, Typeface.NORMAL)
+            setTextColor(ResourcesCompat.getColor(resources, R.color.brown_grey, null))
+        }
+        imageView.visibility = View.GONE
+    }
+
+    private fun setListeners() {
+        binding.collectMbsLiEmotion1.setOnClickListener { vm.toggleEmotion1ClickedYN() }
+        binding.collectMbsLiEmotion2.setOnClickListener { vm.toggleEmotion2ClickedYN() }
+        binding.collectMbsLiEmotion3.setOnClickListener { vm.toggleEmotion3ClickedYN() }
+        binding.collectMbsLiEmotion4.setOnClickListener { vm.toggleEmotion4ClickedYN() }
+        binding.collectMbsLiEmotion5.setOnClickListener { vm.toggleEmotion5ClickedYN() }
+
+        binding.collectMbsTvApply.setOnClickListener {
+            vm.applyFilter()
+            vm.toggleShowFilterYN()
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setStyle(STYLE_NORMAL, R.style.TransparentStyle)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        binding =
+            DataBindingUtil.inflate(inflater, R.layout.collect_bottom_sheet, container, false)
+
+        initViewModel()
+        setListeners()
+
+        return binding.root
+    }
+
+}
\ No newline at end of file
diff --git a/Picon/app/src/main/java/com/yapp/picon/presentation/collect/CollectViewModel.kt b/Picon/app/src/main/java/com/yapp/picon/presentation/collect/CollectViewModel.kt
index 15f599e..01b0a47 100644
--- a/Picon/app/src/main/java/com/yapp/picon/presentation/collect/CollectViewModel.kt
+++ b/Picon/app/src/main/java/com/yapp/picon/presentation/collect/CollectViewModel.kt
@@ -1,12 +1,15 @@
 package com.yapp.picon.presentation.collect
 
+import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
 import com.yapp.picon.domain.usecase.RequestPostsUseCase
 import com.yapp.picon.presentation.base.BaseViewModel
+import com.yapp.picon.presentation.model.EmotionEntity
 import com.yapp.picon.presentation.model.Pin
 import com.yapp.picon.presentation.model.Post
+import com.yapp.picon.presentation.util.TextViewCode
 import com.yapp.picon.presentation.util.toPresentation
 import kotlinx.coroutines.launch
 
@@ -25,13 +28,49 @@ class CollectViewModel(
     private val _emotionCount = MutableLiveData<String>()
     val emotionCount: LiveData<String> get() = _emotionCount
 
-
     private val _toastMsg = MutableLiveData<String>()
     val toastMsg: LiveData<String> get() = _toastMsg
 
+    private val _textViewCodeEmotion = MutableLiveData<Int>()
+    val textViewCodeEmotion: LiveData<Int> get() = _textViewCodeEmotion
+
+    private val _textViewCodeLocation = MutableLiveData<Int>()
+    val textViewCodeLocation: LiveData<Int> get() = _textViewCodeLocation
+
+    private val _emotions = MutableLiveData<List<MutableMap<String, String>>>()
+    val emotions: LiveData<List<MutableMap<String, String>>> get() = _emotions
+
+    private val _showFilterYN = MutableLiveData<Boolean>()
+    val showFilterYN: LiveData<Boolean> get() = _showFilterYN
+
+    private val _emotion1ClickedYN = MutableLiveData<Boolean>()
+    val emotion1ClickedYN: LiveData<Boolean> get() = _emotion1ClickedYN
+
+    private val _emotion2ClickedYN = MutableLiveData<Boolean>()
+    val emotion2ClickedYN: LiveData<Boolean> get() = _emotion2ClickedYN
+
+    private val _emotion3ClickedYN = MutableLiveData<Boolean>()
+    val emotion3ClickedYN: LiveData<Boolean> get() = _emotion3ClickedYN
+
+    private val _emotion4ClickedYN = MutableLiveData<Boolean>()
+    val emotion4ClickedYN: LiveData<Boolean> get() = _emotion4ClickedYN
+
+    private val _emotion5ClickedYN = MutableLiveData<Boolean>()
+    val emotion5ClickedYN: LiveData<Boolean> get() = _emotion5ClickedYN
+
     init {
         _items.value = mutableListOf()
         _posts.value = mutableListOf()
+        _textViewCodeEmotion.value = TextViewCode.COLLECT_MBS_EMOTION.code
+        _textViewCodeLocation.value = TextViewCode.COLLECT_MBS_LOCATION.code
+        _emotions.value = mutableListOf()
+        _showFilterYN.value = false
+
+        _emotion1ClickedYN.value = false
+        _emotion2ClickedYN.value = false
+        _emotion3ClickedYN.value = false
+        _emotion4ClickedYN.value = false
+        _emotion5ClickedYN.value = false
     }
 
     private fun showToast(msg: String) {
@@ -73,4 +112,91 @@ class CollectViewModel(
         }
     }
 
+    fun toBoolean(value: String?): Boolean = value.toBoolean()
+
+    fun setEmotions(list: List<EmotionEntity>) {
+        _emotions.value = list.map {
+            mutableMapOf(
+                "color" to it.color,
+                "text" to it.emotion,
+                "clickedYN" to "false"
+            )
+        }
+    }
+
+    fun toggleShowFilterYN() {
+        _showFilterYN.value = _showFilterYN.value?.let { !it }
+    }
+
+    fun toggleEmotion1ClickedYN() {
+        _emotion1ClickedYN.value = _emotion1ClickedYN.value?.let { !it }
+    }
+
+    fun toggleEmotion2ClickedYN() {
+        _emotion2ClickedYN.value = _emotion2ClickedYN.value?.let { !it }
+    }
+
+    fun toggleEmotion3ClickedYN() {
+        _emotion3ClickedYN.value = _emotion3ClickedYN.value?.let { !it }
+    }
+
+    fun toggleEmotion4ClickedYN() {
+        _emotion4ClickedYN.value = _emotion4ClickedYN.value?.let { !it }
+    }
+
+    fun toggleEmotion5ClickedYN() {
+        _emotion5ClickedYN.value = _emotion5ClickedYN.value?.let { !it }
+    }
+
+    fun applyFilter() {
+        val filterEmotionList = arrayListOf<Boolean>()
+
+        filterEmotionList.add(_emotion1ClickedYN.value ?: false)
+        filterEmotionList.add(_emotion2ClickedYN.value ?: false)
+        filterEmotionList.add(_emotion3ClickedYN.value ?: false)
+        filterEmotionList.add(_emotion4ClickedYN.value ?: false)
+        filterEmotionList.add(_emotion5ClickedYN.value ?: false)
+
+        filterEmotionList.let {
+            val lastIndex = it.size - 1
+            _emotions.value = _emotions.value?.apply {
+                for (i in 0..lastIndex) {
+                    this[i]["clickedYN"] = it[i].toString()
+                }
+            }
+            Log.e(TAG, "Emotions Value : ${_emotions.value.toString()}")
+        }
+
+        val emotionFilter = _emotions.value?.filter {
+            it["clickedYN"] == "true"
+        }?.mapNotNull { it["color"] }
+
+        emotionFilter?.let {
+            _items.value = _posts.value?.filter { post ->
+                post.emotion?.name in emotionFilter
+            }?.let { posts ->
+                _locationCount.value = "위치(${posts.groupBy { it.address.addrGu }.keys.size})"
+                _emotionCount.value = "감정(${posts.groupBy { it.emotion }.keys.size})"
+
+                posts.map {
+                    val size = it.imageUrls?.size ?: 0
+                    val showManyYN = size > 1
+
+                    Pin(
+                        it.id,
+                        it.imageUrls?.get(0),
+                        it.emotion?.rgb,
+                        showManyYN = showManyYN,
+                        showCbYN = false,
+                        checkYN = false
+                    )
+                }
+            }
+        }
+    }
+
+    companion object {
+        private const val TAG = "CollectViewModel"
+    }
+
 }
\ No newline at end of file
diff --git a/Picon/app/src/main/res/layout/collect_bottom_sheet.xml b/Picon/app/src/main/res/layout/collect_bottom_sheet.xml
new file mode 100644
index 0000000..0f09cf3
--- /dev/null
+++ b/Picon/app/src/main/res/layout/collect_bottom_sheet.xml
@@ -0,0 +1,337 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="collectVM"
+            type="com.yapp.picon.presentation.collect.CollectViewModel" />
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/transparent"
+        android:orientation="vertical">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@drawable/bg_collect_bottom_sheet"
+            android:paddingStart="24dp"
+            android:paddingEnd="24dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="18dp"
+                android:layout_marginEnd="6dp"
+                android:text="@string/initialization"
+                android:textColor="@color/very_light_pink"
+                android:textSize="14sp"
+                android:textStyle="normal"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/collect_mbs_tv_emotion"
+                isClicked="@{collectVM.toBoolean(collectVM.emotions[0][`clickedYN`])}"
+                textViewCode="@{collectVM.textViewCodeEmotion}"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="2dp"
+                android:layout_marginTop="40dp"
+                android:text="@string/emotion"
+                android:textColor="@color/very_light_pink_two"
+                android:textSize="14sp"
+                android:textStyle="normal"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <LinearLayout
+                android:id="@+id/collect_mbs_li_emotion"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="2dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginBottom="8dp"
+                android:orientation="vertical"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/collect_mbs_tv_emotion">
+
+                <LinearLayout
+                    android:id="@+id/collect_mbs_li_emotion_1"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="22dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:layout_width="22dp"
+                        android:layout_height="22dp"
+                        android:layout_marginEnd="22dp"
+                        android:contentDescription="@string/image_description"
+                        android:src="@drawable/ic_custom_circle_soft_blue" />
+
+                    <TextView
+                        android:id="@+id/collect_mbs_tv_emotion_1"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{collectVM.emotions[0][`text`]}"
+                        android:textSize="13sp"
+                        tools:textColor="@color/brown_grey"
+                        tools:textStyle="normal" />
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_marginEnd="10dp"
+                        android:layout_weight="1"
+                        android:gravity="end"
+                        android:orientation="horizontal">
+
+                        <ImageView
+                            android:id="@+id/collect_mbs_iv_emotion_1"
+                            visibleOrGone="@{collectVM.toBoolean(collectVM.emotions[0][`clickedYN`])}"
+                            android:layout_width="24dp"
+                            android:layout_height="24dp"
+                            android:contentDescription="@string/image_description"
+                            android:src="@drawable/ic_collect_mbs_check" />
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/collect_mbs_li_emotion_2"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="22dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:layout_width="22dp"
+                        android:layout_height="22dp"
+                        android:layout_marginEnd="22dp"
+                        android:contentDescription="@string/image_description"
+                        android:src="@drawable/ic_custom_circle_cornflower" />
+
+                    <TextView
+                        android:id="@+id/collect_mbs_tv_emotion_2"
+                        isClicked="@{collectVM.toBoolean(collectVM.emotions[1][`clickedYN`])}"
+                        textViewCode="@{collectVM.textViewCodeEmotion}"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{collectVM.emotions[1][`text`]}"
+                        android:textSize="13sp"
+                        tools:textColor="@color/brown_grey"
+                        tools:textStyle="normal" />
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_marginEnd="10dp"
+                        android:layout_weight="1"
+                        android:gravity="end"
+                        android:orientation="horizontal">
+
+                        <ImageView
+                            android:id="@+id/collect_mbs_iv_emotion_2"
+                            visibleOrGone="@{collectVM.toBoolean(collectVM.emotions[1][`clickedYN`])}"
+                            android:layout_width="24dp"
+                            android:layout_height="24dp"
+                            android:contentDescription="@string/image_description"
+                            android:src="@drawable/ic_collect_mbs_check" />
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/collect_mbs_li_emotion_3"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="22dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:layout_width="22dp"
+                        android:layout_height="22dp"
+                        android:layout_marginEnd="22dp"
+                        android:contentDescription="@string/image_description"
+                        android:src="@drawable/ic_custom_circle_bluegrey" />
+
+                    <TextView
+                        android:id="@+id/collect_mbs_tv_emotion_3"
+                        isClicked="@{collectVM.toBoolean(collectVM.emotions[2][`clickedYN`])}"
+                        textViewCode="@{collectVM.textViewCodeEmotion}"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{collectVM.emotions[2][`text`]}"
+                        android:textSize="13sp"
+                        tools:textColor="@color/brown_grey"
+                        tools:textStyle="normal" />
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_marginEnd="10dp"
+                        android:layout_weight="1"
+                        android:gravity="end"
+                        android:orientation="horizontal">
+
+                        <ImageView
+                            android:id="@+id/collect_mbs_iv_emotion_3"
+                            visibleOrGone="@{collectVM.toBoolean(collectVM.emotions[2][`clickedYN`])}"
+                            android:layout_width="24dp"
+                            android:layout_height="24dp"
+                            android:contentDescription="@string/image_description"
+                            android:src="@drawable/ic_collect_mbs_check" />
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/collect_mbs_li_emotion_4"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="22dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:layout_width="22dp"
+                        android:layout_height="22dp"
+                        android:layout_marginEnd="22dp"
+                        android:contentDescription="@string/image_description"
+                        android:src="@drawable/ic_custom_circle_very_light_brown" />
+
+                    <TextView
+                        android:id="@+id/collect_mbs_tv_emotion_4"
+                        isClicked="@{collectVM.toBoolean(collectVM.emotions[3][`clickedYN`])}"
+                        textViewCode="@{collectVM.textViewCodeEmotion}"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{collectVM.emotions[3][`text`]}"
+                        android:textSize="13sp"
+                        tools:textColor="@color/brown_grey"
+                        tools:textStyle="normal" />
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_marginEnd="10dp"
+                        android:layout_weight="1"
+                        android:gravity="end"
+                        android:orientation="horizontal">
+
+                        <ImageView
+                            android:id="@+id/collect_mbs_iv_emotion_4"
+                            visibleOrGone="@{collectVM.toBoolean(collectVM.emotions[3][`clickedYN`])}"
+                            android:layout_width="24dp"
+                            android:layout_height="24dp"
+                            android:contentDescription="@string/image_description"
+                            android:src="@drawable/ic_collect_mbs_check" />
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/collect_mbs_li_emotion_5"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="30dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:layout_width="22dp"
+                        android:layout_height="22dp"
+                        android:layout_marginEnd="22dp"
+                        android:contentDescription="@string/image_description"
+                        android:src="@drawable/ic_custom_circle_warm_grey" />
+
+                    <TextView
+                        android:id="@+id/collect_mbs_tv_emotion_5"
+                        isClicked="@{collectVM.toBoolean(collectVM.emotions[4][`clickedYN`])}"
+                        textViewCode="@{collectVM.textViewCodeEmotion}"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{collectVM.emotions[4][`text`]}"
+                        android:textSize="13sp"
+                        tools:textColor="@color/brown_grey"
+                        tools:textStyle="normal" />
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_marginEnd="10dp"
+                        android:layout_weight="1"
+                        android:gravity="end"
+                        android:orientation="horizontal">
+
+                        <ImageView
+                            android:id="@+id/collect_mbs_iv_emotion_5"
+                            visibleOrGone="@{collectVM.toBoolean(collectVM.emotions[4][`clickedYN`])}"
+                            android:layout_width="24dp"
+                            android:layout_height="24dp"
+                            android:contentDescription="@string/image_description"
+                            android:src="@drawable/ic_collect_mbs_check" />
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+            <!--
+            <TextView
+                android:id="@+id/collect_mbs_tv_location"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/location"
+                android:textColor="@color/very_light_pink_two"
+                android:textSize="14sp"
+                android:textStyle="normal"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/collect_mbs_li_emotion" />
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/collect_mbs_recycler_view_location"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="14dp"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/collect_mbs_tv_location" />
+            -->
+
+            <Button
+                android:id="@+id/collect_mbs_tv_apply"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="22dp"
+                android:background="@drawable/bg_cornflower_radius_5dp"
+                android:letterSpacing="0.01"
+                android:paddingStart="18dp"
+                android:paddingTop="10dp"
+                android:paddingEnd="18dp"
+                android:paddingBottom="10dp"
+                android:text="@string/apply"
+                android:textColor="@color/pale_grey"
+                android:textSize="14sp"
+                android:textStyle="normal"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/collect_mbs_li_emotion" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </LinearLayout>
+</layout>
\ No newline at end of file

From 3df20ba46fc81842f0b1ea5430ef7ce6fa25531a Mon Sep 17 00:00:00 2001
From: NackUn <king4521@naver.com>
Date: Fri, 15 Jan 2021 18:47:33 +0900
Subject: [PATCH 09/14] =?UTF-8?q?[Iusse-92]=20=EA=B0=84=ED=8E=B8=20?=
 =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../simplejoin/SimpleJoinActivity.kt          |  36 ++
 .../simplejoin/SimpleJoinViewModel.kt         | 132 ++++++-
 .../main/res/layout/simple_join_activity.xml  | 323 ++++++++++++------
 Picon/app/src/main/res/values/strings.xml     |   8 +-
 4 files changed, 389 insertions(+), 110 deletions(-)

diff --git a/Picon/app/src/main/java/com/yapp/picon/presentation/simplejoin/SimpleJoinActivity.kt b/Picon/app/src/main/java/com/yapp/picon/presentation/simplejoin/SimpleJoinActivity.kt
index 9d7adb2..c5338b4 100644
--- a/Picon/app/src/main/java/com/yapp/picon/presentation/simplejoin/SimpleJoinActivity.kt
+++ b/Picon/app/src/main/java/com/yapp/picon/presentation/simplejoin/SimpleJoinActivity.kt
@@ -5,6 +5,7 @@ import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import android.view.WindowManager
+import android.widget.EditText
 import androidx.lifecycle.Observer
 import com.yapp.picon.BR
 import com.yapp.picon.R
@@ -26,6 +27,23 @@ class SimpleJoinActivity : BaseActivity<SimpleJoinActivityBinding, SimpleJoinVie
 
     private fun setListeners() {
         binding.simpleJoinBtnJoin.setOnClickListener { joinMembership() }
+
+        View.OnFocusChangeListener { view, hasFocus ->
+            if (!hasFocus) {
+                if ((view as EditText).text.isNullOrBlank()) {
+                    showTextEssential(view.id)
+                } else {
+                    hideTextEssential(view.id)
+                }
+            }
+        }.let {
+            binding.run {
+                simpleJoinEtId.onFocusChangeListener = it
+                simpleJoinEtPw.onFocusChangeListener = it
+                simpleJoinEtPwRe.onFocusChangeListener = it
+                simpleJoinEtNic.onFocusChangeListener = it
+            }
+        }
     }
 
     private fun joinMembership() {
@@ -47,6 +65,24 @@ class SimpleJoinActivity : BaseActivity<SimpleJoinActivityBinding, SimpleJoinVie
         binding.simpleJoinProgressBar.visibility = View.GONE
     }
 
+    private fun showTextEssential(viewId: Int) {
+        when (viewId) {
+            binding.simpleJoinEtId.id -> vm.showIdIsBlank()
+            binding.simpleJoinEtPw.id -> vm.showPwIsBlank()
+            binding.simpleJoinEtPwRe.id -> vm.showPwReIsBlank()
+            binding.simpleJoinEtNic.id -> vm.showNicIsBlank()
+        }
+    }
+
+    private fun hideTextEssential(viewId: Int) {
+        when (viewId) {
+            binding.simpleJoinEtId.id -> vm.hideIdIsBlank()
+            binding.simpleJoinEtPw.id -> vm.hidePwIsBlank()
+            binding.simpleJoinEtPwRe.id -> vm.hidePwReIsBlank()
+            binding.simpleJoinEtNic.id -> vm.hideNicIsBlank()
+        }
+    }
+
     override fun initViewModel() {
         binding.setVariable(BR.simpleJoinVM, vm)
 
diff --git a/Picon/app/src/main/java/com/yapp/picon/presentation/simplejoin/SimpleJoinViewModel.kt b/Picon/app/src/main/java/com/yapp/picon/presentation/simplejoin/SimpleJoinViewModel.kt
index a8857c9..789be14 100644
--- a/Picon/app/src/main/java/com/yapp/picon/presentation/simplejoin/SimpleJoinViewModel.kt
+++ b/Picon/app/src/main/java/com/yapp/picon/presentation/simplejoin/SimpleJoinViewModel.kt
@@ -23,56 +23,172 @@ class SimpleJoinViewModel(
     var pwRe = MutableLiveData<String>()
     var nic = MutableLiveData<String>()
 
+    private val _idIsBlank = MutableLiveData<Boolean>()
+    val idIsBlank: LiveData<Boolean> get() = _idIsBlank
+    private val _idIsError = MutableLiveData<Boolean>()
+    val idIsError: LiveData<Boolean> get() = _idIsError
+
+    private val _pwIsBlank = MutableLiveData<Boolean>()
+    val pwIsBlank: LiveData<Boolean> get() = _pwIsBlank
+    private val _pwIsError = MutableLiveData<Boolean>()
+    val pwIsError: LiveData<Boolean> get() = _pwIsError
+
+    private val _pwReIsBlank = MutableLiveData<Boolean>()
+    val pwReIsBlank: LiveData<Boolean> get() = _pwReIsBlank
+    private val _pwReIsError = MutableLiveData<Boolean>()
+    val pwReIsError: LiveData<Boolean> get() = _pwReIsError
+
+    private val _nicIsBlank = MutableLiveData<Boolean>()
+    val nicIsBlank: LiveData<Boolean> get() = _nicIsBlank
+    private val _nicIsError = MutableLiveData<Boolean>()
+    val nicIsError: LiveData<Boolean> get() = _nicIsError
+
     init {
         _joinYN.value = false
+
+        _idIsBlank.value = false
+        _idIsError.value = false
+        _pwIsBlank.value = false
+        _pwIsError.value = false
+        _pwReIsBlank.value = false
+        _pwReIsError.value = false
+        _nicIsBlank.value = false
+        _nicIsError.value = false
     }
 
     private fun showToast(msg: String) {
         _toastMsg.value = msg
     }
 
+    private fun showError(error: String) {
+        when (error) {
+            "nickName" -> {
+                hideNicIsBlank()
+                _nicIsError.value = true
+            }
+            "password" -> {
+                hidePwIsBlank()
+                _pwIsError.value = true
+            }
+        }
+    }
+
+    private fun hideErrors() {
+        _idIsError.value = false
+        _pwIsError.value = false
+        _pwReIsError.value = false
+        _nicIsError.value = false
+    }
+
     //todo 유효성 검사 가입 완료 후
     fun joinMembership() {
         viewModelScope.launch {
+            hideErrors()
             val loginId = id.value
             if (loginId.isNullOrEmpty()) {
-                showToast("아이디를 입력해주세요.")
+                showIdIsBlank()
                 return@launch
+            } else {
+                hideIdIsBlank()
             }
 
             val loginPw = pw.value
             if (loginPw.isNullOrEmpty()) {
-                showToast("비밀번호를 입력해주세요.")
+                showPwIsBlank()
                 return@launch
+            } else {
+                hidePwIsBlank()
             }
 
             val loginPwRe = pwRe.value
             if (loginPwRe.isNullOrEmpty()) {
-                showToast("비밀번호를 재입력해주세요.")
+                showPwReIsBlank()
                 return@launch
+            } else {
+                hidePwReIsBlank()
             }
 
-            if(loginPw != loginPwRe) {
-                showToast("비밀번호가 일치하지 않습니다.")
+            if (loginPw != loginPwRe) {
+                hidePwReIsBlank()
+                _pwReIsError.value = true
                 return@launch
+            } else {
+                _pwReIsError.value = false
             }
 
             val loginNic = nic.value
             if (loginNic.isNullOrEmpty()) {
-                showToast("닉네임을 재입력해주세요.")
+                showNicIsBlank()
                 return@launch
+            } else {
+                hideNicIsBlank()
             }
 
             simpleJoinUseCase(loginId, loginPw, loginNic).let {
-                Log.e("aa12", "joinMembership : $it")
+                Log.e(TAG, "joinMembership : $it")
+
                 if (it.status == 200) {
                     showToast("회원가입이 완료되었습니다!")
                     _joinYN.value = true
                 } else {
-                    showToast(it.errorMessage)
+                    if (it.status == 409) {
+                        _idIsError.value = true
+                    } else {
+                        it.errors.split(",").let { errors ->
+                            Log.e(TAG, errors.size.toString())
+                            Log.e(TAG, errors.toString())
+
+                            for (error in errors) {
+                                val startIndex = error.indexOf("error field:") + 12
+                                val endIndex = error.indexOf("message:")
+                                if ((startIndex == -1) or (endIndex == -1)) {
+                                    break
+                                }
+                                Log.e(TAG, "startIndex : $startIndex , endIndex : $endIndex")
+                                val errorField = error.substring(startIndex, endIndex).trim()
+                                showError(errorField)
+                            }
+                        }
+                    }
                 }
             }
         }
     }
 
+    fun showIdIsBlank() {
+        _idIsBlank.value = true
+    }
+
+    fun hideIdIsBlank() {
+        _idIsBlank.value = false
+    }
+
+    fun showPwIsBlank() {
+        _pwIsBlank.value = true
+    }
+
+    fun hidePwIsBlank() {
+        _pwIsBlank.value = false
+    }
+
+    fun showPwReIsBlank() {
+        _pwReIsBlank.value = true
+    }
+
+    fun hidePwReIsBlank() {
+        _pwReIsBlank.value = false
+    }
+
+    fun showNicIsBlank() {
+        _nicIsBlank.value = true
+    }
+
+    fun hideNicIsBlank() {
+        _nicIsBlank.value = false
+    }
+
+    companion object {
+        private const val TAG = "SimpleJoinViewModel"
+    }
+
 }
\ No newline at end of file
diff --git a/Picon/app/src/main/res/layout/simple_join_activity.xml b/Picon/app/src/main/res/layout/simple_join_activity.xml
index 7b189d7..2304707 100644
--- a/Picon/app/src/main/res/layout/simple_join_activity.xml
+++ b/Picon/app/src/main/res/layout/simple_join_activity.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <data>
 
@@ -12,109 +11,231 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@color/dark_grey"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
+        android:layout_height="match_parent"
+        android:background="@color/dark_grey"
+        android:focusable="true"
+        android:focusableInTouchMode="true">
+
+        <TextView
+            android:id="@+id/simple_join_tv_title"
+            style="@style/RegularTextViewStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:lineSpacingExtra="4sp"
+            android:text="@string/simple_join_title"
+            android:textColor="@color/very_light_pink"
+            android:textSize="16sp"
+            android:textStyle="normal"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.0421" />
+
+        <EditText
+            android:id="@+id/simple_join_et_id"
+            android:layout_width="300dp"
+            android:layout_height="46dp"
+            android:background="@drawable/bg_login_form"
+            android:hint="@string/simple_join_input_id"
+            android:inputType="textEmailAddress"
+            android:letterSpacing="-0.02"
+            android:paddingStart="14dp"
+            android:paddingEnd="14dp"
+            android:text="@={simpleJoinVM.id}"
+            android:textColor="@color/pale_grey"
+            android:textColorHint="@color/brown_grey_two"
+            android:textSize="14sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/simple_join_tv_title"
+            app:layout_constraintVertical_bias="0.0625" />
+
+        <TextView
+            visibleOrGone="@{simpleJoinVM.idIsBlank}"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="4dp"
+            android:text="@string/simple_join_bottom_text_essential"
+            android:textColor="@color/coral"
+            android:textSize="12sp"
+            android:textStyle="normal"
+            app:layout_constraintStart_toStartOf="@id/simple_join_et_id"
+            app:layout_constraintTop_toBottomOf="@id/simple_join_et_id" />
+
+        <TextView
+            style="@style/RegularTextViewStyle"
+            visibleOrGone="@{simpleJoinVM.idIsError}"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="4dp"
+            android:text="@string/simple_join_bottom_id_error"
+            android:textColor="@color/coral"
+            android:textSize="12sp"
+            android:textStyle="normal"
+            app:layout_constraintStart_toStartOf="@id/simple_join_et_id"
+            app:layout_constraintTop_toBottomOf="@id/simple_join_et_id" />
+
+        <EditText
+            android:id="@+id/simple_join_et_pw"
+            android:layout_width="300dp"
+            android:layout_height="46dp"
+            android:background="@drawable/bg_login_form"
+            android:hint="@string/simple_join_input_pw"
+            android:inputType="textPassword"
+            android:letterSpacing="-0.02"
+            android:paddingStart="14dp"
+            android:paddingEnd="14dp"
+            android:text="@={simpleJoinVM.pw}"
+            android:textColor="@color/pale_grey"
+            android:textColorHint="@color/brown_grey_two"
+            android:textSize="14sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/simple_join_et_id"
+            app:layout_constraintVertical_bias="0.0781" />
+
+        <TextView
+            visibleOrGone="@{simpleJoinVM.pwIsBlank}"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="4dp"
+            android:text="@string/simple_join_bottom_text_essential"
+            android:textColor="@color/coral"
+            android:textSize="12sp"
+            android:textStyle="normal"
+            app:layout_constraintStart_toStartOf="@id/simple_join_et_pw"
+            app:layout_constraintTop_toBottomOf="@id/simple_join_et_pw" />
+
+        <TextView
+            style="@style/RegularTextViewStyle"
+            visibleOrGone="@{simpleJoinVM.pwIsError}"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="4dp"
+            android:text="@string/simple_join_bottom_pw_error"
+            android:textColor="@color/coral"
+            android:textSize="12sp"
+            android:textStyle="normal"
+            app:layout_constraintStart_toStartOf="@id/simple_join_et_pw"
+            app:layout_constraintTop_toBottomOf="@id/simple_join_et_pw" />
+
+        <EditText
+            android:id="@+id/simple_join_et_pw_re"
+            android:layout_width="300dp"
+            android:layout_height="46dp"
+            android:background="@drawable/bg_login_form"
+            android:hint="@string/simple_join_input_pw_re"
+            android:inputType="textPassword"
+            android:letterSpacing="-0.02"
+            android:paddingStart="14dp"
+            android:paddingEnd="14dp"
+            android:text="@={simpleJoinVM.pwRe}"
+            android:textColor="@color/pale_grey"
+            android:textColorHint="@color/brown_grey_two"
+            android:textSize="14sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/simple_join_et_pw"
+            app:layout_constraintVertical_bias="0.0923" />
+
+        <TextView
+            visibleOrGone="@{simpleJoinVM.pwReIsBlank}"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="4dp"
+            android:text="@string/simple_join_bottom_text_essential"
+            android:textColor="@color/coral"
+            android:textSize="12sp"
+            android:textStyle="normal"
+            app:layout_constraintStart_toStartOf="@id/simple_join_et_pw_re"
+            app:layout_constraintTop_toBottomOf="@id/simple_join_et_pw_re" />
+
+        <TextView
+            style="@style/RegularTextViewStyle"
+            visibleOrGone="@{simpleJoinVM.pwReIsError}"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="4dp"
+            android:text="@string/simple_join_bottom_pw_re_error"
+            android:textColor="@color/coral"
+            android:textSize="12sp"
+            android:textStyle="normal"
+            app:layout_constraintStart_toStartOf="@id/simple_join_et_pw_re"
+            app:layout_constraintTop_toBottomOf="@id/simple_join_et_pw_re" />
+
+        <EditText
+            android:id="@+id/simple_join_et_nic"
+            android:layout_width="300dp"
+            android:layout_height="46dp"
+            android:background="@drawable/bg_login_form"
+            android:hint="@string/simple_join_input_nic"
+            android:inputType="text"
+            android:letterSpacing="-0.02"
+            android:paddingStart="14dp"
+            android:paddingEnd="14dp"
+            android:text="@={simpleJoinVM.nic}"
+            android:textColor="@color/pale_grey"
+            android:textColorHint="@color/brown_grey_two"
+            android:textSize="14sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/simple_join_et_pw_re"
+            app:layout_constraintVertical_bias="0.1126" />
+
+        <TextView
+            visibleOrGone="@{simpleJoinVM.nicIsBlank}"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="4dp"
+            android:text="@string/simple_join_bottom_text_essential"
+            android:textColor="@color/coral"
+            android:textSize="12sp"
+            android:textStyle="normal"
+            app:layout_constraintStart_toStartOf="@id/simple_join_et_nic"
+            app:layout_constraintTop_toBottomOf="@id/simple_join_et_nic" />
+
+        <TextView
+            style="@style/RegularTextViewStyle"
+            visibleOrGone="@{simpleJoinVM.nicIsError}"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="4dp"
+            android:text="@string/simple_join_bottom_nic_error"
+            android:textColor="@color/coral"
+            android:textSize="12sp"
+            android:textStyle="normal"
+            app:layout_constraintStart_toStartOf="@id/simple_join_et_nic"
+            app:layout_constraintTop_toBottomOf="@id/simple_join_et_nic" />
+
+        <Button
+            android:id="@+id/simple_join_btn_join"
+            android:layout_width="300dp"
+            android:layout_height="46dp"
+            android:background="@drawable/bg_cornflower_radius_5dp"
             android:gravity="center"
-            android:orientation="vertical"
+            android:letterSpacing="-0.02"
+            android:text="@string/join_membership"
+            android:textColor="@color/pale_grey"
+            android:textSize="15sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:gravity="center_horizontal"
-                android:lineSpacingExtra="4sp"
-                android:textColor="@color/very_light_pink"
-                android:textSize="16sp"
-                android:textStyle="normal"
-                tools:text="간편 로그인" />
-
-            <EditText
-                android:id="@+id/simple_join_et_id"
-                android:layout_width="300dp"
-                android:layout_height="46dp"
-                android:layout_marginTop="44dp"
-                android:background="@drawable/bg_login_form"
-                android:hint="@string/simple_join_input_id"
-                android:inputType="textEmailAddress"
-                android:letterSpacing="-0.02"
-                android:paddingStart="14dp"
-                android:paddingEnd="14dp"
-                android:text="@={simpleJoinVM.id}"
-                android:textColor="@color/pale_grey"
-                android:textColorHint="@color/brown_grey_two"
-                android:textSize="14sp" />
-
-            <EditText
-                android:id="@+id/simple_join_et_pw"
-                android:layout_width="300dp"
-                android:layout_height="46dp"
-                android:layout_marginTop="48dp"
-                android:background="@drawable/bg_login_form"
-                android:hint="@string/simple_join_input_pw"
-                android:inputType="textPassword"
-                android:letterSpacing="-0.02"
-                android:paddingStart="14dp"
-                android:paddingEnd="14dp"
-                android:text="@={simpleJoinVM.pw}"
-                android:textColor="@color/pale_grey"
-                android:textColorHint="@color/brown_grey_two"
-                android:textSize="14sp" />
-
-            <EditText
-                android:id="@+id/simple_join_et_pw_re"
-                android:layout_width="300dp"
-                android:layout_height="46dp"
-                android:layout_marginTop="48dp"
-                android:background="@drawable/bg_login_form"
-                android:hint="@string/simple_join_input_pw_re"
-                android:inputType="textPassword"
-                android:letterSpacing="-0.02"
-                android:paddingStart="14dp"
-                android:paddingEnd="14dp"
-                android:text="@={simpleJoinVM.pwRe}"
-                android:textColor="@color/pale_grey"
-                android:textColorHint="@color/brown_grey_two"
-                android:textSize="14sp" />
-
-            <EditText
-                android:id="@+id/simple_join_et_nic"
-                android:layout_width="300dp"
-                android:layout_height="46dp"
-                android:layout_marginTop="48dp"
-                android:background="@drawable/bg_login_form"
-                android:hint="@string/simple_join_input_nic"
-                android:inputType="text"
-                android:letterSpacing="-0.02"
-                android:paddingStart="14dp"
-                android:paddingEnd="14dp"
-                android:text="@={simpleJoinVM.nic}"
-                android:textColor="@color/pale_grey"
-                android:textColorHint="@color/brown_grey_two"
-                android:textSize="14sp" />
-
-            <Button
-                android:id="@+id/simple_join_btn_join"
-                android:layout_width="300dp"
-                android:layout_height="46dp"
-                android:layout_marginTop="170dp"
-                android:background="@drawable/bg_cornflower_radius_5dp"
-                android:gravity="center"
-                android:letterSpacing="-0.02"
-                android:text="@string/join_membership"
-                android:textColor="@color/pale_grey"
-                android:textSize="15sp" />
-
-        </LinearLayout>
+            app:layout_constraintTop_toBottomOf="@id/simple_join_et_nic"
+            app:layout_constraintVertical_bias="0.5120" />
 
         <ProgressBar
             android:id="@+id/simple_join_progress_bar"
diff --git a/Picon/app/src/main/res/values/strings.xml b/Picon/app/src/main/res/values/strings.xml
index c60a86e..46b8032 100644
--- a/Picon/app/src/main/res/values/strings.xml
+++ b/Picon/app/src/main/res/values/strings.xml
@@ -59,17 +59,23 @@
     <string name="login_is_first">처음이신가요?&#160;</string>
     <string name="login_simple_join">간편가입하기</string>
 
+    <string name="simple_join_title">간편 로그인</string>
     <string name="simple_join_input_id">아이디 입력</string>
     <string name="simple_join_input_pw">비밀번호 입력 (6 – 14자리)</string>
     <string name="simple_join_input_pw_re">비밀번호 재입력</string>
     <string name="simple_join_input_nic">닉네임 입력</string>
+    <string name="simple_join_bottom_text_essential">*필수</string>
+    <string name="simple_join_bottom_id_error">이미 존재하는 아이디입니다</string>
+    <string name="simple_join_bottom_pw_error">6자리 이상으로 설정해주세요</string>
+    <string name="simple_join_bottom_pw_re_error">일치하지 않습니다</string>
+    <string name="simple_join_bottom_nic_error">이미 존재하는 닉네임입니다</string>
 
     <string name="intro_fragment_1_title">추억을 지도 위에</string>
     <string name="intro_fragment_1_sub">여행한 장소에 핀을 추가해서\n나만의 여행지도를 만들어보세요.</string>
     <string name="intro_fragment_2_title">다섯가지 색상 핀</string>
     <string name="intro_fragment_2_sub">색상의 이름을 원하는 감정으로 설정하고\n나만의 지도를 커스텀해보세요!</string>
     <string name="intro_fragment_3_title">PiCON의 100% 활용법</string>
-    <string name="intro_fragment_3_sub">사진을 필터링해서 모아보고\n나만의 여행지도를 공유해보세요.</string>도
+    <string name="intro_fragment_3_sub">사진을 필터링해서 모아보고\n나만의 여행지도를 공유해보세요.</string>
 
     <string name="X">X</string>
     <string name="follow">팔로우</string>

From 48946897fd00e65de914b42716907c29deef5b4d Mon Sep 17 00:00:00 2001
From: NackUn <king4521@naver.com>
Date: Sat, 16 Jan 2021 15:33:01 +0900
Subject: [PATCH 10/14] =?UTF-8?q?[Issue-92]=20=ED=98=84=EC=9E=AC=EC=9C=84?=
 =?UTF-8?q?=EC=B9=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../picon/presentation/map/MapActivity.kt     | 59 +++++++++++++------
 .../picon/presentation/util/LocationHelper.kt | 36 +++++++----
 2 files changed, 65 insertions(+), 30 deletions(-)

diff --git a/Picon/app/src/main/java/com/yapp/picon/presentation/map/MapActivity.kt b/Picon/app/src/main/java/com/yapp/picon/presentation/map/MapActivity.kt
index d37b6ba..5c421ff 100644
--- a/Picon/app/src/main/java/com/yapp/picon/presentation/map/MapActivity.kt
+++ b/Picon/app/src/main/java/com/yapp/picon/presentation/map/MapActivity.kt
@@ -4,12 +4,14 @@ import android.Manifest
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
-import android.net.Uri
+import android.content.pm.PackageManager
+import android.location.Location
 import android.os.Bundle
 import android.util.Log
 import android.util.TypedValue
 import android.view.MenuItem
 import android.view.View
+import android.widget.Toast
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.view.GravityCompat
 import androidx.recyclerview.widget.GridLayoutManager
@@ -114,7 +116,7 @@ class MapActivity : BaseMapActivity<MapActivityBinding, MapViewModel>(
                     dpToPx(this, 60f).toInt(),
                     dpToPx(this, 60f).toInt()
                 )
-                locationLayoutParams.setMargins(0,0,18,0)
+                locationLayoutParams.setMargins(0, 0, 18, 0)
                 locationLayoutParams.endToEnd = R.id.map_constraint_layout
                 locationLayoutParams.topToTop = R.id.map_shared_button
                 locationLayoutParams.bottomToBottom = R.id.map_shared_button
@@ -294,24 +296,26 @@ class MapActivity : BaseMapActivity<MapActivityBinding, MapViewModel>(
         }
     }
 
-    private fun setCurrentLocation() {
-        LocationHelper(this).requestLocationPermissions()?.let {
-            val cameraUpdate = CameraUpdate.scrollAndZoomTo(
-                LatLng(it.latitude, it.longitude),
-                NaverCamera.DEFAULT_ZOOM
-            )
-                .animate(CameraAnimation.Fly, NaverCamera.DEFAULT_ANIMATION_TIME)
-            naverMap.moveCamera(cameraUpdate)
-
-            currentLocationMarker.map = null
-            currentLocationMarker.run {
-                icon = OverlayImage.fromResource(R.drawable.ic_map_now)
-                position = LatLng(it.latitude, it.longitude)
-                this.map = naverMap
-            }
+    private fun setCurrentLocationMarker(location: Location) {
+        val cameraUpdate = CameraUpdate.scrollAndZoomTo(
+            LatLng(location.latitude, location.longitude),
+            NaverCamera.DEFAULT_ZOOM
+        )
+            .animate(CameraAnimation.Fly, NaverCamera.DEFAULT_ANIMATION_TIME)
+        naverMap.moveCamera(cameraUpdate)
+
+        currentLocationMarker.map = null
+        currentLocationMarker.run {
+            icon = OverlayImage.fromResource(R.drawable.ic_map_now)
+            position = LatLng(location.latitude, location.longitude)
+            this.map = naverMap
         }
     }
 
+    private fun setCurrentLocation() {
+        LocationHelper(this).requestLocationPermissions()?.let { setCurrentLocationMarker(it) }
+    }
+
     private fun checkStoragePermission() {
         val storagePermissionListener: PermissionListener = object : PermissionListener {
             override fun onPermissionGranted() {
@@ -556,4 +560,25 @@ class MapActivity : BaseMapActivity<MapActivityBinding, MapViewModel>(
         return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, displayMetrics)
     }
 
+    private fun showRejectLocation() {
+        Toast.makeText(this, "권한이 거절되어 현재 위치 찾기가 불가합니다.", Toast.LENGTH_SHORT).show()
+    }
+
+    override fun onRequestPermissionsResult(
+        requestCode: Int,
+        permissions: Array<out String>,
+        grantResults: IntArray
+    ) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
+        when (requestCode) {
+            RequestCodeSet.LOCATION_REQUEST_CODE.code -> {
+                if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                    setCurrentLocation()
+                } else {
+                    showRejectLocation()
+                }
+            }
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/Picon/app/src/main/java/com/yapp/picon/presentation/util/LocationHelper.kt b/Picon/app/src/main/java/com/yapp/picon/presentation/util/LocationHelper.kt
index c78fffc..09992a1 100644
--- a/Picon/app/src/main/java/com/yapp/picon/presentation/util/LocationHelper.kt
+++ b/Picon/app/src/main/java/com/yapp/picon/presentation/util/LocationHelper.kt
@@ -6,12 +6,11 @@ import android.content.Context
 import android.content.pm.PackageManager
 import android.location.Location
 import android.location.LocationManager
-import android.widget.Toast
 import androidx.core.app.ActivityCompat
 
 class LocationHelper(private val context: Context) {
-    private val locationManager = context.getSystemService(Context.LOCATION_SERVICE) as LocationManager
-    private var location: Location? = null
+    private val locationManager =
+        context.getSystemService(Context.LOCATION_SERVICE) as LocationManager
 
     private fun checkPermission(): Boolean {
         return ActivityCompat.checkSelfPermission(
@@ -23,19 +22,29 @@ class LocationHelper(private val context: Context) {
         ) == PackageManager.PERMISSION_GRANTED
     }
 
-    fun locationPermissionResult(): Location? {
-        if (checkPermission()) {
-            location = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER)
-            return location
+    private fun getLocation(): Location? {
+        val isGPSEnabled: Boolean = locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)
+        val isNetworkEnabled: Boolean =
+            locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER)
+
+        return if (checkPermission()) {
+            when {
+                isNetworkEnabled -> {
+                    locationManager.getLastKnownLocation(LocationManager.NETWORK_PROVIDER)
+                }
+                isGPSEnabled -> {
+                    locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER)
+                }
+                else -> null
+            }
+        } else {
+            null
         }
-        Toast.makeText(context, "권한이 거절되어 현재 위치 찾기가 불가합니다.", Toast.LENGTH_SHORT).show()
-        return null
     }
 
     fun requestLocationPermissions(): Location? {
-        if (checkPermission()) {
-            location = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER)
-            return location
+        getLocation()?.let {
+            return it
         }
         ActivityCompat.requestPermissions(
             context as Activity,
@@ -44,6 +53,7 @@ class LocationHelper(private val context: Context) {
                 Manifest.permission.ACCESS_COARSE_LOCATION
             ), RequestCodeSet.LOCATION_REQUEST_CODE.code
         )
-        return location
+        return null
     }
+
 }
\ No newline at end of file

From f0d3e414fffa0e71150b09eb95961f1c74678d75 Mon Sep 17 00:00:00 2001
From: NackUn <king4521@naver.com>
Date: Sat, 16 Jan 2021 15:45:36 +0900
Subject: [PATCH 11/14] =?UTF-8?q?[Issue-92]=20=ED=95=80=20=EA=B0=A4?=
 =?UTF-8?q?=EB=9F=AC=EB=A6=AC=20=EB=B2=84=ED=8A=BC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/layout/pin_gallery_activity.xml  | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/Picon/app/src/main/res/layout/pin_gallery_activity.xml b/Picon/app/src/main/res/layout/pin_gallery_activity.xml
index 36c28a7..2e2dc19 100644
--- a/Picon/app/src/main/res/layout/pin_gallery_activity.xml
+++ b/Picon/app/src/main/res/layout/pin_gallery_activity.xml
@@ -18,15 +18,15 @@
         <ImageButton
             android:id="@+id/pin_gallery_ib_back"
             visibleOrGone="@{pinGalleryVM.showYN}"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:layout_marginTop="18dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
             android:background="@android:color/transparent"
             android:contentDescription="@string/image_description"
             android:paddingStart="18dp"
-            android:paddingTop="24dp"
+            android:paddingTop="12dp"
             android:paddingEnd="6dp"
-            android:paddingBottom="24dp"
+            android:paddingBottom="12dp"
             android:src="@drawable/ic_back_shadow"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -34,10 +34,10 @@
         <TextView
             android:id="@+id/pin_gallery_tv_cancel"
             visibleOrGone="@{pinGalleryVM.editYN}"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:layout_marginStart="18dp"
-            android:layout_marginTop="18dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="7dp"
+            android:layout_marginTop="20dp"
             android:gravity="end"
             android:paddingStart="11dp"
             android:paddingTop="14dp"
@@ -67,10 +67,10 @@
         <TextView
             android:id="@+id/pin_gallery_tv_edit"
             visibleOrGone="@{pinGalleryVM.showYN}"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:layout_marginTop="18dp"
-            android:layout_marginEnd="18dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:layout_marginEnd="7dp"
             android:gravity="end"
             android:paddingStart="11dp"
             android:paddingTop="14dp"
@@ -87,13 +87,13 @@
             android:id="@+id/pin_gallery_tv_delete"
             visibleOrGone="@{pinGalleryVM.editYN}"
             android:layout_width="wrap_content"
-            android:layout_height="48dp"
-            android:layout_marginTop="18dp"
-            android:layout_marginEnd="18dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:layout_marginEnd="16dp"
             android:gravity="end"
-            android:paddingStart="11dp"
+            android:paddingStart="2dp"
             android:paddingTop="14dp"
-            android:paddingEnd="11dp"
+            android:paddingEnd="2dp"
             android:paddingBottom="14dp"
             android:text="@{pinGalleryVM.deleteCount}"
             android:textColor="@color/coral"

From b7dcccaa78fad71aa00259b38e37d1a4c79dd129 Mon Sep 17 00:00:00 2001
From: NackUn <king4521@naver.com>
Date: Sat, 16 Jan 2021 15:52:12 +0900
Subject: [PATCH 12/14] =?UTF-8?q?[Issue-92]=20=EC=B9=9C=EA=B5=AC=20?=
 =?UTF-8?q?=EA=B4=80=EB=A6=AC=ED=95=98=EA=B8=B0=20=EA=B2=80=EC=83=89=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../presentation/nav/manageFriend/ManageFriendActivity.kt      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Picon/app/src/main/java/com/yapp/picon/presentation/nav/manageFriend/ManageFriendActivity.kt b/Picon/app/src/main/java/com/yapp/picon/presentation/nav/manageFriend/ManageFriendActivity.kt
index 26404a1..15e1664 100644
--- a/Picon/app/src/main/java/com/yapp/picon/presentation/nav/manageFriend/ManageFriendActivity.kt
+++ b/Picon/app/src/main/java/com/yapp/picon/presentation/nav/manageFriend/ManageFriendActivity.kt
@@ -41,7 +41,8 @@ class ManageFriendActivity : BaseActivity<ManageFriendActivityBinding, ManageFri
         })
         vm.searchText.observe(this, { str ->
             if (str.isEmpty()) {
-                changeToMainFragment()
+//                QA 후 PM 요청으로 기능 제거
+//                changeToMainFragment()
             } else {
                 if (binding.manageFriendSearchDeleteButton.visibility == View.GONE) {
                     changeToSearchFragment()

From e54d8c296317b1625bcda432e0fc291f472a3885 Mon Sep 17 00:00:00 2001
From: NackUn <king4521@naver.com>
Date: Wed, 20 Jan 2021 07:24:52 +0900
Subject: [PATCH 13/14] =?UTF-8?q?[Issue-92]=20=EA=B3=B5=EC=9C=A0=ED=95=98?=
 =?UTF-8?q?=EA=B8=B0=20=EC=9E=84=EC=8B=9C=20=EC=A3=BC=EC=84=9D=EC=B2=98?=
 =?UTF-8?q?=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/yapp/picon/presentation/map/MapActivity.kt  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Picon/app/src/main/java/com/yapp/picon/presentation/map/MapActivity.kt b/Picon/app/src/main/java/com/yapp/picon/presentation/map/MapActivity.kt
index 5c421ff..444a96e 100644
--- a/Picon/app/src/main/java/com/yapp/picon/presentation/map/MapActivity.kt
+++ b/Picon/app/src/main/java/com/yapp/picon/presentation/map/MapActivity.kt
@@ -175,6 +175,9 @@ class MapActivity : BaseMapActivity<MapActivityBinding, MapViewModel>(
 
     private fun setSharedButton() {
         binding.mapSharedButton.setOnClickListener {
+            showToast(getString(R.string.update_plan_guide_text))
+            /*
+            //todo share map Image
             vm.setToggleShowBtnYN(false)
             vm.setSharedMenuButton(false)
 
@@ -182,6 +185,7 @@ class MapActivity : BaseMapActivity<MapActivityBinding, MapViewModel>(
             getBitmapFromFile()?.let { imageFile ->
                 shareTheScreenShot(imageFile)
             }
+            */
         }
     }
 

From 3dc33d52d3c34981ceaa9ec0811f214286c09b16 Mon Sep 17 00:00:00 2001
From: NackUn <king4521@naver.com>
Date: Wed, 20 Jan 2021 07:35:12 +0900
Subject: [PATCH 14/14] [PR-91] PiCON 1.2.1

---
 Picon/app/build.gradle                 | 4 ++--
 Picon/app/src/main/AndroidManifest.xml | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Picon/app/build.gradle b/Picon/app/build.gradle
index a7c7e1e..bec0944 100644
--- a/Picon/app/build.gradle
+++ b/Picon/app/build.gradle
@@ -12,8 +12,8 @@ android {
         applicationId "com.yapp.picon"
         minSdkVersion 22
         targetSdkVersion 29
-        versionCode 1
-        versionName "1.0"
+        versionCode 3
+        versionName "1.2.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/Picon/app/src/main/AndroidManifest.xml b/Picon/app/src/main/AndroidManifest.xml
index 182c441..033ae3f 100644
--- a/Picon/app/src/main/AndroidManifest.xml
+++ b/Picon/app/src/main/AndroidManifest.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.yapp.picon"
-    android:versionCode="002"
-    android:versionName="1.010">
+    package="com.yapp.picon">
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />