From a346728f87a3b84df71e77d9d91414d64b60e995 Mon Sep 17 00:00:00 2001
From: jooyae <jooyae3970@naver.com>
Date: Sat, 4 Dec 2021 13:34:19 +0900
Subject: [PATCH 1/9] Edit email signup access

---
 .idea/misc.xml                                  |  2 +-
 .../android/signup/ui/SetNickNameFragment.kt    | 17 ++++++++++++++---
 .../main/res/layout/fragment_set_nick_name.xml  |  3 ++-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 6d7bbbf..53dc11e 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -103,7 +103,7 @@
         <entry key="app/src/main/res/layout/fragment_private_detail.xml" value="0.34479166666666666" />
         <entry key="app/src/main/res/layout/fragment_reward.xml" value="0.17239583333333333" />
         <entry key="app/src/main/res/layout/fragment_service_agree.xml" value="0.3302083333333333" />
-        <entry key="app/src/main/res/layout/fragment_set_nick_name.xml" value="0.2609375" />
+        <entry key="app/src/main/res/layout/fragment_set_nick_name.xml" value="0.3039134054954205" />
         <entry key="app/src/main/res/layout/fragment_setting.xml" value="0.3380208333333333" />
         <entry key="app/src/main/res/layout/fragment_signup_first.xml" value="0.3515625" />
         <entry key="app/src/main/res/layout/fragment_signup_third.xml" value="0.32395833333333335" />
diff --git a/app/src/main/java/org/journey/android/signup/ui/SetNickNameFragment.kt b/app/src/main/java/org/journey/android/signup/ui/SetNickNameFragment.kt
index 53622f5..9949449 100644
--- a/app/src/main/java/org/journey/android/signup/ui/SetNickNameFragment.kt
+++ b/app/src/main/java/org/journey/android/signup/ui/SetNickNameFragment.kt
@@ -41,15 +41,19 @@ class SetNickNameFragment : Fragment() {
         initMain()
         checkNickName()
         setButtonVisible()
+        completeSignup()
     }
     private fun popBackStack(){
         binding.buttonNicknameReturn.setOnClickListener { findNavController().popBackStack() }
     }
     private fun initMain() {
         binding.buttonSetNickname.setOnClickListener {
-            viewModel.setNickName()
             if(userPreferenceManager.fetchUserSnsType().isNullOrEmpty()){
                 viewModel.signUpEmail()
+                viewModel.saveEmailSignUpInformation()
+                userPreferenceManager.saveUserEmail(viewModel.getEmail())
+                userPreferenceManager.saveUserPassword(viewModel.getCheckPassword())
+                userPreferenceManager.saveUserSnsType("")
                 viewModel.signUpSuccess.observe(viewLifecycleOwner) { successed ->
                     if(successed) {
                         val intent = Intent(context, MainActivity::class.java)
@@ -60,14 +64,21 @@ class SetNickNameFragment : Fragment() {
                 viewModel.setNickName()
             }
         }
-//        userPreferenceManager.saveUserSnsType("")
+        userPreferenceManager.saveUserEmail(viewModel.getEmail())
+        userPreferenceManager.saveUserPassword(viewModel.getCheckPassword())
+        userPreferenceManager.saveUserSnsType("")
     }
     private fun checkNickName(){
         viewModel.nickname.observe(viewLifecycleOwner){
             viewModel.checkNickNameAvailable()
         }
     }
-
+    private fun completeSignup(){
+        binding.buttonSetNickname.setOnClickListener {
+                val intent = Intent(context, MainActivity::class.java)
+                startActivity(intent)
+        }
+    }
     private fun setButtonVisible(){
         binding.edittextSetNickname.addTextChangedListener(object : TextWatcher {
             override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
diff --git a/app/src/main/res/layout/fragment_set_nick_name.xml b/app/src/main/res/layout/fragment_set_nick_name.xml
index 0bc48d8..f1c8910 100644
--- a/app/src/main/res/layout/fragment_set_nick_name.xml
+++ b/app/src/main/res/layout/fragment_set_nick_name.xml
@@ -17,7 +17,7 @@
         android:layout_width="44dp"
         android:layout_height="44dp"
         android:layout_marginTop="6dp"
-        android:layout_marginLeft="6dp"
+        android:layout_marginStart="6dp"
         android:background="@drawable/ic_gnback"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"/>
@@ -68,6 +68,7 @@
         android:layout_marginTop="12dp"
         android:textSize="10sp"
         android:textScaleX="0.98"
+        android:visibility="invisible"
         android:text="@{viewModel.nickNameStatus != null ? context.getString(viewModel.nickNameStatus.alertMessage) : ``}"
         android:fontFamily="@font/spoqahansansneoregular"
         android:textColor="@color/mohaeng_red_ea"

From 39c74fc13fbb011ef813070b770661e0aac689ee Mon Sep 17 00:00:00 2001
From: jooyae <jooyae3970@naver.com>
Date: Sun, 5 Dec 2021 21:24:13 +0900
Subject: [PATCH 2/9] =?UTF-8?q?[fix]=20=EC=9D=B4=EB=A9=94=EC=9D=BC=20?=
 =?UTF-8?q?=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85=20=EB=A1=9C=EC=A7=81=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

---
 .../android/signup/ui/SetNickNameFragment.kt       | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/org/journey/android/signup/ui/SetNickNameFragment.kt b/app/src/main/java/org/journey/android/signup/ui/SetNickNameFragment.kt
index 9949449..42ec50f 100644
--- a/app/src/main/java/org/journey/android/signup/ui/SetNickNameFragment.kt
+++ b/app/src/main/java/org/journey/android/signup/ui/SetNickNameFragment.kt
@@ -13,6 +13,7 @@ import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
 import dagger.hilt.android.AndroidEntryPoint
 import org.journey.android.databinding.FragmentSetNickNameBinding
+import org.journey.android.entry.frame.EntryActivity
 import org.journey.android.frame.MainActivity
 import org.journey.android.preference.UserPreferenceManager
 import org.journey.android.signup.viewmodel.NickNameViewModel
@@ -41,7 +42,6 @@ class SetNickNameFragment : Fragment() {
         initMain()
         checkNickName()
         setButtonVisible()
-        completeSignup()
     }
     private fun popBackStack(){
         binding.buttonNicknameReturn.setOnClickListener { findNavController().popBackStack() }
@@ -51,12 +51,10 @@ class SetNickNameFragment : Fragment() {
             if(userPreferenceManager.fetchUserSnsType().isNullOrEmpty()){
                 viewModel.signUpEmail()
                 viewModel.saveEmailSignUpInformation()
-                userPreferenceManager.saveUserEmail(viewModel.getEmail())
-                userPreferenceManager.saveUserPassword(viewModel.getCheckPassword())
                 userPreferenceManager.saveUserSnsType("")
-                viewModel.signUpSuccess.observe(viewLifecycleOwner) { successed ->
+                viewModel.emailSignUpSuccess.observe(viewLifecycleOwner) { successed ->
                     if(successed) {
-                        val intent = Intent(context, MainActivity::class.java)
+                        val intent = Intent(context, EntryActivity::class.java)
                         startActivity(intent)
                     }
                 }
@@ -73,12 +71,6 @@ class SetNickNameFragment : Fragment() {
             viewModel.checkNickNameAvailable()
         }
     }
-    private fun completeSignup(){
-        binding.buttonSetNickname.setOnClickListener {
-                val intent = Intent(context, MainActivity::class.java)
-                startActivity(intent)
-        }
-    }
     private fun setButtonVisible(){
         binding.edittextSetNickname.addTextChangedListener(object : TextWatcher {
             override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {

From 8d11ce8408a7ea751a8052d55912397a28c0de12 Mon Sep 17 00:00:00 2001
From: jooyae <jooyae3970@naver.com>
Date: Sun, 5 Dec 2021 21:44:37 +0900
Subject: [PATCH 3/9] =?UTF-8?q?[fix]=20=EC=9D=B8=EC=95=B1=EC=BD=98?=
 =?UTF-8?q?=ED=85=90=EC=B8=A0=EA=B4=80=EB=A0=A8=20=EC=98=A4=EB=A5=98=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

---
 app/src/main/AndroidManifest.xml              |  4 +--
 .../{entry/frame => }/EntryActivity.kt        | 14 ++-------
 .../android/onboarding/OnboardingActivity.kt  | 29 +++++++++++++++++++
 .../ui/fragment/OnboardingFirstFragment.kt    |  2 +-
 .../ui/fragment/OnboardingSixthFragment.kt    |  3 +-
 .../preference/UserPreferenceManager.kt       |  2 --
 .../android/signup/ui/SetNickNameFragment.kt  |  5 +---
 app/src/main/res/layout/activity_entry.xml    |  2 +-
 .../main/res/layout/dialog_course_start.xml   |  1 -
 .../main/res/layout/dialog_detail_delete.xml  |  1 -
 .../main/res/layout/dialog_detail_report.xml  | 10 ++-----
 .../layout/dialog_explanation_challenge.xml   | 11 ++-----
 .../res/layout/dialog_giveup_challenge.xml    |  6 +---
 .../main/res/layout/dialog_myfeed_emoji.xml   |  9 ------
 .../main/res/layout/dialog_user_delete.xml    | 12 ++------
 .../res/layout/diary_hashtag_count_dialog.xml | 16 +++-------
 app/src/main/res/layout/fragment_badge.xml    |  2 --
 .../main/res/layout/fragment_challenge.xml    |  5 ----
 .../main/res/layout/fragment_character.xml    |  7 -----
 app/src/main/res/layout/fragment_chat.xml     | 17 ++---------
 20 files changed, 50 insertions(+), 108 deletions(-)
 rename app/src/main/java/org/journey/android/{entry/frame => }/EntryActivity.kt (81%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6cdcb8a..f244232 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -23,7 +23,6 @@
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_color"
             android:resource="@android:color/holo_orange_light" />
-
         <!-- Set color used with incoming notification messages (알림 채널 메타 데이터 추가) -->
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_channel_id"
@@ -35,9 +34,8 @@
                 <action android:name="com.google.firebase.MESSAGING_EVENT"/>
             </intent-filter>
         </service>
-
         <activity
-            android:name="org.journey.android.entry.frame.EntryActivity"
+            android:name="org.journey.android.EntryActivity"
             android:exported="true">
         </activity>
         <activity
diff --git a/app/src/main/java/org/journey/android/entry/frame/EntryActivity.kt b/app/src/main/java/org/journey/android/EntryActivity.kt
similarity index 81%
rename from app/src/main/java/org/journey/android/entry/frame/EntryActivity.kt
rename to app/src/main/java/org/journey/android/EntryActivity.kt
index b19d871..8ff540c 100644
--- a/app/src/main/java/org/journey/android/entry/frame/EntryActivity.kt
+++ b/app/src/main/java/org/journey/android/EntryActivity.kt
@@ -1,26 +1,17 @@
-package org.journey.android.entry.frame
+package org.journey.android
 
 import android.content.pm.PackageManager
-import android.os.Build
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.util.Base64
 import android.util.Log
-import android.view.WindowInsets
-import androidx.annotation.RequiresApi
+import androidx.appcompat.app.AppCompatActivity
 import androidx.navigation.NavController
 import androidx.navigation.fragment.NavHostFragment
-import com.google.android.gms.auth.api.signin.GoogleSignIn
-import com.google.android.gms.auth.api.signin.GoogleSignInClient
-import com.google.android.gms.auth.api.signin.GoogleSignInOptions
 import com.kakao.sdk.common.util.Utility
 import dagger.hilt.android.AndroidEntryPoint
-import org.journey.android.R
 import org.journey.android.databinding.ActivityEntryBinding
-import org.journey.android.preference.SharedPreferencesManager
 import org.journey.android.util.TedRxKeyboardObserver
 import java.security.MessageDigest
-import javax.inject.Inject
 
 @AndroidEntryPoint
 class EntryActivity : AppCompatActivity() {
@@ -60,4 +51,5 @@ class EntryActivity : AppCompatActivity() {
             Log.e("name not found", e.toString())
         }
     }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/journey/android/onboarding/OnboardingActivity.kt b/app/src/main/java/org/journey/android/onboarding/OnboardingActivity.kt
index dd81787..595e566 100644
--- a/app/src/main/java/org/journey/android/onboarding/OnboardingActivity.kt
+++ b/app/src/main/java/org/journey/android/onboarding/OnboardingActivity.kt
@@ -1,5 +1,6 @@
 package org.journey.android.onboarding
 
+import android.content.Intent
 import android.os.Bundle
 import android.util.Log
 import androidx.appcompat.app.AppCompatActivity
@@ -7,13 +8,20 @@ import androidx.navigation.NavController
 import androidx.navigation.fragment.NavHostFragment
 import com.kakao.sdk.common.util.Utility
 import dagger.hilt.android.AndroidEntryPoint
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+import org.journey.android.EntryActivity
 import org.journey.android.R
 import org.journey.android.databinding.ActivityOnboardingBinding
+import org.journey.android.frame.MainActivity
+import org.journey.android.preference.UserPreferenceManager
+import javax.inject.Inject
 
 @AndroidEntryPoint
 class OnboardingActivity : AppCompatActivity() {
     private lateinit var binding : ActivityOnboardingBinding
     private lateinit var navController: NavController
+    @Inject lateinit var userPreferenceManager: UserPreferenceManager
+    private val disposable = CompositeDisposable()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -28,6 +36,27 @@ class OnboardingActivity : AppCompatActivity() {
         val navHostFragment =
             supportFragmentManager.findFragmentById(R.id.navigation_host_fragment) as NavHostFragment
         navController = navHostFragment.navController
+
+    }
+
+    private fun handleFlow() {
+        val isAlreadyLogin = userPreferenceManager.fetchIsAlreadyLogIn()
+        Log.e("isAlready", "$isAlreadyLogin")
+        when {
+            isAlreadyLogin -> {
+                startActivity(Intent(this, MainActivity::class.java))
+                finish()
+            }
+            else -> {
+                startActivity(Intent(this, OnboardingActivity::class.java))
+                finish()
+            }
+        }
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        disposable.clear()
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/journey/android/onboarding/ui/fragment/OnboardingFirstFragment.kt b/app/src/main/java/org/journey/android/onboarding/ui/fragment/OnboardingFirstFragment.kt
index e82811c..beb5259 100644
--- a/app/src/main/java/org/journey/android/onboarding/ui/fragment/OnboardingFirstFragment.kt
+++ b/app/src/main/java/org/journey/android/onboarding/ui/fragment/OnboardingFirstFragment.kt
@@ -16,7 +16,7 @@ import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.schedulers.Schedulers
 import org.journey.android.R
 import org.journey.android.databinding.FragmentOnboardingFirstBinding
-import org.journey.android.entry.frame.EntryActivity
+import org.journey.android.EntryActivity
 import org.journey.android.frame.MainActivity
 import org.journey.android.onboarding.viewmodel.OnboardingViewModel
 import org.journey.android.preference.UserPreferenceManager
diff --git a/app/src/main/java/org/journey/android/onboarding/ui/fragment/OnboardingSixthFragment.kt b/app/src/main/java/org/journey/android/onboarding/ui/fragment/OnboardingSixthFragment.kt
index 5e89c08..e3cd613 100644
--- a/app/src/main/java/org/journey/android/onboarding/ui/fragment/OnboardingSixthFragment.kt
+++ b/app/src/main/java/org/journey/android/onboarding/ui/fragment/OnboardingSixthFragment.kt
@@ -10,8 +10,7 @@ import androidx.fragment.app.Fragment
 import dagger.hilt.android.AndroidEntryPoint
 import org.journey.android.R
 import org.journey.android.databinding.FragmentOnboardingSixthBinding
-import org.journey.android.entry.frame.EntryActivity
-import org.journey.android.frame.MainActivity
+import org.journey.android.EntryActivity
 import org.journey.android.util.AutoClearedValue
 
 @AndroidEntryPoint
diff --git a/app/src/main/java/org/journey/android/preference/UserPreferenceManager.kt b/app/src/main/java/org/journey/android/preference/UserPreferenceManager.kt
index c26be5b..3388fb1 100644
--- a/app/src/main/java/org/journey/android/preference/UserPreferenceManager.kt
+++ b/app/src/main/java/org/journey/android/preference/UserPreferenceManager.kt
@@ -1,6 +1,5 @@
 package org.journey.android.preference
 
-
 class UserPreferenceManager(private val sharedPreferencesManager: SharedPreferencesManager) {
     fun saveUserFcmDeviceToken(token: String?) = sharedPreferencesManager.putSharedPref(FCM_DEVICE_TOKEN, token)
     fun fetchUserFcmDeviceToken(): String = sharedPreferencesManager.getSharedPrefs(FCM_DEVICE_TOKEN, "")
@@ -26,7 +25,6 @@ class UserPreferenceManager(private val sharedPreferencesManager: SharedPreferen
     fun saveIsAlreadyLogIn(isAlreadyLogIn: Boolean) = sharedPreferencesManager.putSharedPref(IS_ALREADY_LOGIN, isAlreadyLogIn)
     fun fetchIsAlreadyLogIn(): Boolean = sharedPreferencesManager.getSharedPrefs(IS_ALREADY_LOGIN, false)
 
-
     fun saveCheckEmail(checkEmail: String) { sharedPreferencesManager.putSharedPref(CHECK_EMAIL, checkEmail) }
     fun fetchCheckEmail(): String { return sharedPreferencesManager.getSharedPrefs(CHECK_EMAIL, "") }
 
diff --git a/app/src/main/java/org/journey/android/signup/ui/SetNickNameFragment.kt b/app/src/main/java/org/journey/android/signup/ui/SetNickNameFragment.kt
index 42ec50f..db0cb80 100644
--- a/app/src/main/java/org/journey/android/signup/ui/SetNickNameFragment.kt
+++ b/app/src/main/java/org/journey/android/signup/ui/SetNickNameFragment.kt
@@ -13,8 +13,7 @@ import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
 import dagger.hilt.android.AndroidEntryPoint
 import org.journey.android.databinding.FragmentSetNickNameBinding
-import org.journey.android.entry.frame.EntryActivity
-import org.journey.android.frame.MainActivity
+import org.journey.android.EntryActivity
 import org.journey.android.preference.UserPreferenceManager
 import org.journey.android.signup.viewmodel.NickNameViewModel
 import org.journey.android.util.AutoClearedValue
@@ -83,6 +82,4 @@ class SetNickNameFragment : Fragment() {
             override fun afterTextChanged(p0: Editable?) {}
         })
     }
-
-
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_entry.xml b/app/src/main/res/layout/activity_entry.xml
index 59d7b30..fcacfd1 100644
--- a/app/src/main/res/layout/activity_entry.xml
+++ b/app/src/main/res/layout/activity_entry.xml
@@ -6,7 +6,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".entry.frame.EntryActivity">
+    tools:context=".EntryActivity">
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/fragment_container"
         android:name="androidx.navigation.fragment.NavHostFragment"
diff --git a/app/src/main/res/layout/dialog_course_start.xml b/app/src/main/res/layout/dialog_course_start.xml
index 99b6df5..9077e15 100644
--- a/app/src/main/res/layout/dialog_course_start.xml
+++ b/app/src/main/res/layout/dialog_course_start.xml
@@ -79,7 +79,6 @@
                 app:layout_constraintHorizontal_bias="0.5"
                 app:layout_constraintStart_toEndOf="@+id/button_cancel"
                 app:layout_constraintTop_toTopOf="@id/button_cancel" />
-
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_detail_delete.xml b/app/src/main/res/layout/dialog_detail_delete.xml
index 30a5f9d..edabe80 100644
--- a/app/src/main/res/layout/dialog_detail_delete.xml
+++ b/app/src/main/res/layout/dialog_detail_delete.xml
@@ -79,5 +79,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/textview_dialog_delete" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/dialog_detail_report.xml b/app/src/main/res/layout/dialog_detail_report.xml
index d3b5057..8335b26 100644
--- a/app/src/main/res/layout/dialog_detail_report.xml
+++ b/app/src/main/res/layout/dialog_detail_report.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    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"
     android:layout_width="match_parent"
     android:layout_height="71dp"
     android:background="@color/journey_transparency">
-
-
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -15,7 +13,6 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
-
         <Button
             android:id="@+id/button_dialog_report"
             android:layout_width="match_parent"
@@ -34,8 +31,5 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
-
-
     </androidx.constraintlayout.widget.ConstraintLayout>
-
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/dialog_explanation_challenge.xml b/app/src/main/res/layout/dialog_explanation_challenge.xml
index 975bb90..647d974 100644
--- a/app/src/main/res/layout/dialog_explanation_challenge.xml
+++ b/app/src/main/res/layout/dialog_explanation_challenge.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    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"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:background="@color/journey_transparency">
-
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -14,7 +13,6 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
-
         <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/button_dialog_close"
             android:layout_width="34dp"
@@ -24,7 +22,6 @@
             android:background="@drawable/ic_xbtn"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
-
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/textview_dialog_content"
             android:layout_width="wrap_content"
@@ -40,7 +37,6 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
-
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/imageview_dialog_image"
             android:layout_width="290dp"
@@ -50,7 +46,6 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/textview_dialog_content" />
-
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/textview_dialog_how"
             android:layout_width="wrap_content"
@@ -64,7 +59,6 @@
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/imageview_dialog_image" />
-
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/textview_how_content"
             android:layout_width="wrap_content"
@@ -111,5 +105,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/textview_dialog_update" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_giveup_challenge.xml b/app/src/main/res/layout/dialog_giveup_challenge.xml
index 4b5c3bb..c6c2c17 100644
--- a/app/src/main/res/layout/dialog_giveup_challenge.xml
+++ b/app/src/main/res/layout/dialog_giveup_challenge.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:tools="http://schemas.android.com/tools"
+<layout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 <androidx.constraintlayout.widget.ConstraintLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -14,7 +13,6 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
-
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/textview_dialog_title"
             android:layout_width="wrap_content"
@@ -67,7 +65,6 @@
             app:layout_constraintHorizontal_chainStyle="packed"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/imageview_giveup_character" />
-
         <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/button_change"
             android:layout_width="wrap_content"
@@ -79,7 +76,6 @@
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toEndOf="@+id/button_cancel"
             app:layout_constraintTop_toTopOf="@id/button_cancel" />
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_myfeed_emoji.xml b/app/src/main/res/layout/dialog_myfeed_emoji.xml
index fb5f4af..b9cf919 100644
--- a/app/src/main/res/layout/dialog_myfeed_emoji.xml
+++ b/app/src/main/res/layout/dialog_myfeed_emoji.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout 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"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/journey_transparency">
-
     <ImageButton
         android:id="@+id/imagebutton_emoji_close"
         android:layout_width="39dp"
@@ -15,7 +13,6 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
-
     <ImageButton
         android:id="@+id/imagebutton_emoji_first"
         android:layout_width="84dp"
@@ -24,7 +21,6 @@
         android:background="@drawable/ic_emoji_tears"
         app:layout_constraintBottom_toTopOf="@+id/imagebutton_emoji_close"
         app:layout_constraintEnd_toStartOf="@+id/imagebutton_emoji_second" />
-
     <ImageButton
         android:id="@+id/imagebutton_emoji_second"
         android:layout_width="84dp"
@@ -34,7 +30,6 @@
         app:layout_constraintBottom_toTopOf="@+id/imagebutton_emoji_close"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
-
     <ImageButton
         android:id="@+id/imagebutton_emoji_third"
         android:layout_width="84dp"
@@ -43,7 +38,6 @@
         android:background="@drawable/ic_emoji_medal"
         app:layout_constraintBottom_toTopOf="@+id/imagebutton_emoji_close"
         app:layout_constraintStart_toEndOf="@+id/imagebutton_emoji_second" />
-
     <ImageButton
         android:id="@+id/imagebutton_emoji_fourth"
         android:layout_width="84dp"
@@ -52,7 +46,6 @@
         android:background="@drawable/ic_emoji_good"
         app:layout_constraintEnd_toStartOf="@+id/imagebutton_emoji_fifth"
         app:layout_constraintTop_toBottomOf="@+id/imagebutton_emoji_close" />
-
     <ImageButton
         android:id="@+id/imagebutton_emoji_fifth"
         android:layout_width="84dp"
@@ -62,7 +55,6 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/imagebutton_emoji_close" />
-
     <ImageButton
         android:id="@+id/imagebutton_emoji_sixth"
         android:layout_width="84dp"
@@ -71,5 +63,4 @@
         android:background="@drawable/ic_emoji_lucky"
         app:layout_constraintStart_toEndOf="@+id/imagebutton_emoji_fifth"
         app:layout_constraintTop_toBottomOf="@+id/imagebutton_emoji_close" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/dialog_user_delete.xml b/app/src/main/res/layout/dialog_user_delete.xml
index c8b5dd7..8f3264a 100644
--- a/app/src/main/res/layout/dialog_user_delete.xml
+++ b/app/src/main/res/layout/dialog_user_delete.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    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"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:background="@color/mohaeng_transparency">
-
-
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -17,7 +15,6 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
-
         <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/button_dialog_close"
             android:layout_width="118dp"
@@ -30,7 +27,6 @@
             android:textSize="14sp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@+id/button_dialog_delete" />
-
         <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/button_dialog_delete"
             android:layout_width="118dp"
@@ -46,7 +42,6 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/button_dialog_close"
             app:layout_constraintTop_toBottomOf="@+id/textview_delete_content" />
-
         <TextView
             android:id="@+id/textview_dialog_delete"
             android:layout_width="wrap_content"
@@ -62,8 +57,6 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
-
-
         <TextView
             android:id="@+id/textview_delete_content"
             android:layout_width="wrap_content"
@@ -79,5 +72,4 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/textview_dialog_delete" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/diary_hashtag_count_dialog.xml b/app/src/main/res/layout/diary_hashtag_count_dialog.xml
index 7b09e11..e79054b 100644
--- a/app/src/main/res/layout/diary_hashtag_count_dialog.xml
+++ b/app/src/main/res/layout/diary_hashtag_count_dialog.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    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"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    >
-
+    android:layout_height="wrap_content">
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -14,9 +12,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        android:background="@drawable/delete_dialog"
-        >
-
+        android:background="@drawable/delete_dialog">
         <TextView
             android:id="@+id/textview_hashtag_count_content"
             android:layout_width="wrap_content"
@@ -30,8 +26,6 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
-
-
             <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/button_confirm"
                 style="@style/Widget.AppCompat.Button.Borderless"
@@ -48,6 +42,4 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/textview_hashtag_count_content"/>
     </androidx.constraintlayout.widget.ConstraintLayout>
-
-
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_badge.xml b/app/src/main/res/layout/fragment_badge.xml
index 17e41f1..b35bfb3 100644
--- a/app/src/main/res/layout/fragment_badge.xml
+++ b/app/src/main/res/layout/fragment_badge.xml
@@ -2,9 +2,7 @@
 <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="viewModel"
             type="org.journey.android.badge.viewmodel.BadgeViewModel" />
diff --git a/app/src/main/res/layout/fragment_challenge.xml b/app/src/main/res/layout/fragment_challenge.xml
index b904af4..14b46c2 100644
--- a/app/src/main/res/layout/fragment_challenge.xml
+++ b/app/src/main/res/layout/fragment_challenge.xml
@@ -25,7 +25,6 @@
             android:background="@drawable/ic_row"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
-
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/textview_challenge_today"
             android:layout_width="wrap_content"
@@ -101,7 +100,6 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
-
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/imageview_mohaeng_rabbit"
             android:layout_width="wrap_content"
@@ -111,7 +109,6 @@
             app:layout_constraintBottom_toBottomOf="@+id/imageview_mohaeng_talk"
             app:layout_constraintStart_toStartOf="@+id/imageview_mohaeng_talk"
             app:layout_constraintTop_toTopOf="@+id/imageview_mohaeng_talk" />
-
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/textview_mohaeng_talk"
                 android:layout_width="wrap_content"
@@ -125,7 +122,6 @@
                 app:layout_constraintBottom_toBottomOf="@+id/imageview_mohaeng_talk"
                 app:layout_constraintStart_toEndOf="@+id/imageview_mohaeng_rabbit"
                 app:layout_constraintTop_toTopOf="@+id/imageview_mohaeng_talk" />
-
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/constraintlayout_challenge_sub"
             android:layout_width="match_parent"
@@ -134,7 +130,6 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/imageview_mohaeng_talk">
-
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/constraintlayout_sub_first"
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_character.xml b/app/src/main/res/layout/fragment_character.xml
index 1f6ffa0..8249ddb 100644
--- a/app/src/main/res/layout/fragment_character.xml
+++ b/app/src/main/res/layout/fragment_character.xml
@@ -29,7 +29,6 @@
                 android:background="@drawable/ic_gnbicnback"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
-
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/textview_character_style"
                 android:layout_width="wrap_content"
@@ -42,7 +41,6 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
-
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/imageview_character"
                 setImageURL="@{viewModel.characterInfo.currentCharacterImage.image}"
@@ -52,7 +50,6 @@
                 app:layout_constraintBottom_toTopOf="@+id/button_complete_style"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="@id/textview_character_style" />
-
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recyclerview_skin"
                 android:layout_width="32dp"
@@ -68,7 +65,6 @@
                 app:layout_constraintVertical_bias="0.45"
                 app:layout_constraintStart_toStartOf="@+id/button_character_skin"
                 tools:listitem="@layout/item_character_skin" />
-
             <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/button_character_skin"
                 android:layout_width="52dp"
@@ -94,7 +90,6 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/button_character_skin" />
-
             <View
                 android:id="@+id/view_select_character"
                 android:layout_width="match_parent"
@@ -103,7 +98,6 @@
                 android:background="@drawable/bottom_sheet_radius"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/button_complete_style" />
-
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recyclerview_select_character"
                 android:layout_width="match_parent"
@@ -114,7 +108,6 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="@+id/view_select_character"
                 tools:listitem="@layout/item_select_character" />
-
             <androidx.core.widget.NestedScrollView
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
diff --git a/app/src/main/res/layout/fragment_chat.xml b/app/src/main/res/layout/fragment_chat.xml
index dfc3255..83373a7 100644
--- a/app/src/main/res/layout/fragment_chat.xml
+++ b/app/src/main/res/layout/fragment_chat.xml
@@ -1,23 +1,18 @@
 <?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">
-
     <data>
-
         <variable
             name="viewModel"
             type="org.journey.android.chat.viewmodel.ChatViewModel" />
-
         <variable
             name="data"
             type="org.journey.android.pushalarm.data.response.ResponsePushAlarmDTO" />
     </data>
-
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/mohaeng_yellow5">
-
         <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/button_pop_back"
             android:layout_width="44dp"
@@ -27,7 +22,6 @@
             android:background="@drawable/ic_gnbicnback"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
-
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/textview_chat_title"
             android:layout_width="wrap_content"
@@ -40,7 +34,6 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@+id/button_pop_back" />
-
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/textview_chat_empty"
             android:layout_width="wrap_content"
@@ -54,7 +47,6 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
-
         <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/button_chat_new_content"
             android:layout_width="match_parent"
@@ -69,29 +61,26 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/textview_chat_title" />
-
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/imageview_chat_character"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="18dp"
+            android:layout_marginStart="18dp"
             android:layout_marginTop="16dp"
             android:background="@drawable/ic_mohaeng_rabbit"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/button_chat_new_content" />
-
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/textview_name_mohaeng"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="8dp"
+            android:layout_marginStart="8dp"
             android:fontFamily="@font/gmarketsansttfmedium"
             android:text="모행"
             android:textColor="@color/journey_black2"
             android:textSize="12sp"
             app:layout_constraintStart_toEndOf="@id/imageview_chat_character"
             app:layout_constraintTop_toTopOf="@id/imageview_chat_character" />
-
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/imageview_text_balloon"
             android:layout_width="wrap_content"
@@ -100,7 +89,6 @@
             android:background="@drawable/ic_union"
             app:layout_constraintStart_toStartOf="@id/textview_name_mohaeng"
             app:layout_constraintTop_toBottomOf="@id/textview_name_mohaeng" />
-
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/textview_balloon_content"
             android:layout_width="wrap_content"
@@ -112,7 +100,6 @@
             app:layout_constraintEnd_toEndOf="@id/imageview_text_balloon"
             app:layout_constraintStart_toStartOf="@id/imageview_text_balloon"
             app:layout_constraintTop_toTopOf="@id/imageview_text_balloon" />
-
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/textview_arrival_time"
             android:layout_width="wrap_content"

From 73d0e4b37a9b8790c9d22c9c1b9bb2ba55639eaa Mon Sep 17 00:00:00 2001
From: jooyae <jooyae3970@naver.com>
Date: Sun, 5 Dec 2021 21:56:07 +0900
Subject: [PATCH 4/9] [fix] Resolve Conflict

---
 app/build.gradle                                     |  2 +-
 .../main/res/layout/diary_hashtag_count_dialog.xml   | 12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1730774..cafc4a3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -19,7 +19,7 @@ android {
         applicationId "org.journey.android"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 4
+        versionCode 5
         versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/res/layout/diary_hashtag_count_dialog.xml b/app/src/main/res/layout/diary_hashtag_count_dialog.xml
index 311b555..e79054b 100644
--- a/app/src/main/res/layout/diary_hashtag_count_dialog.xml
+++ b/app/src/main/res/layout/diary_hashtag_count_dialog.xml
@@ -4,10 +4,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
-<<<<<<< HEAD
-=======
-
->>>>>>> 7e103b846750b8ee2ba7d0b23604c90a767e6421
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -17,10 +13,6 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         android:background="@drawable/delete_dialog">
-<<<<<<< HEAD
-=======
-
->>>>>>> 7e103b846750b8ee2ba7d0b23604c90a767e6421
         <TextView
             android:id="@+id/textview_hashtag_count_content"
             android:layout_width="wrap_content"
@@ -34,10 +26,6 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
-<<<<<<< HEAD
-=======
-
->>>>>>> 7e103b846750b8ee2ba7d0b23604c90a767e6421
             <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/button_confirm"
                 style="@style/Widget.AppCompat.Button.Borderless"

From f32c7830c56c797506c89bdf46d97a941358d993 Mon Sep 17 00:00:00 2001
From: jooyae <jooyae3970@naver.com>
Date: Sun, 5 Dec 2021 22:06:29 +0900
Subject: [PATCH 5/9] =?UTF-8?q?[fix]=20entry=20=EC=A4=91=EB=B3=B5=20?=
 =?UTF-8?q?=EC=97=90=EB=9F=AC=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  2 +-
 .../java/org/journey/android/EntryActivity.kt |  1 -
 .../android/splash/frame/EntryActivity.kt     | 65 -------------------
 3 files changed, 1 insertion(+), 67 deletions(-)
 delete mode 100644 app/src/main/java/org/journey/android/splash/frame/EntryActivity.kt

diff --git a/app/build.gradle b/app/build.gradle
index cafc4a3..e550f4a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -19,7 +19,7 @@ android {
         applicationId "org.journey.android"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 5
+        versionCode 6
         versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/java/org/journey/android/EntryActivity.kt b/app/src/main/java/org/journey/android/EntryActivity.kt
index 11c20bb..8ff540c 100644
--- a/app/src/main/java/org/journey/android/EntryActivity.kt
+++ b/app/src/main/java/org/journey/android/EntryActivity.kt
@@ -1,4 +1,3 @@
-
 package org.journey.android
 
 import android.content.pm.PackageManager
diff --git a/app/src/main/java/org/journey/android/splash/frame/EntryActivity.kt b/app/src/main/java/org/journey/android/splash/frame/EntryActivity.kt
deleted file mode 100644
index ea11635..0000000
--- a/app/src/main/java/org/journey/android/splash/frame/EntryActivity.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-<<<<<<< HEAD:app/src/main/java/org/journey/android/EntryActivity.kt
-package org.journey.android
-
-import android.content.pm.PackageManager
-import android.os.Bundle
-import android.util.Base64
-import android.util.Log
-import androidx.appcompat.app.AppCompatActivity
-=======
-package org.journey.android.splash.frame
-
-import android.content.pm.PackageManager
-import androidx.appcompat.app.AppCompatActivity
-import android.os.Bundle
-import android.util.Base64
-import android.util.Log
->>>>>>> 7e103b846750b8ee2ba7d0b23604c90a767e6421:app/src/main/java/org/journey/android/splash/frame/EntryActivity.kt
-import androidx.navigation.NavController
-import androidx.navigation.fragment.NavHostFragment
-import com.kakao.sdk.common.util.Utility
-import dagger.hilt.android.AndroidEntryPoint
-import org.journey.android.databinding.ActivityEntryBinding
-import org.journey.android.util.TedRxKeyboardObserver
-import java.security.MessageDigest
-
-@AndroidEntryPoint
-class EntryActivity : AppCompatActivity() {
-    private lateinit var binding: ActivityEntryBinding
-    private lateinit var navController: NavController
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        binding = ActivityEntryBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-        initNavController()
-        setKeyboardObserver()
-        getAppKeyHash()
-    }
-
-    private fun initNavController() {
-        val navHostFragment =
-            supportFragmentManager.findFragmentById(R.id.fragment_container) as NavHostFragment
-        navController = navHostFragment.navController
-    }
-    private fun setKeyboardObserver(){
-        TedRxKeyboardObserver(this)
-            .listen()
-            .subscribe()
-    }
-    private fun getAppKeyHash() {
-        var keyHash = Utility.getKeyHash(this)
-        try {
-            val info = packageManager.getPackageInfo(packageName, PackageManager.GET_SIGNATURES)
-            for (signature in info.signatures) {
-                val md: MessageDigest = MessageDigest.getInstance("SHA")
-                md.update(signature.toByteArray())
-                val something = String(Base64.encode(md.digest(), 0))
-                Log.e("Hash key", something)
-            }
-        } catch (e: Exception) {
-            Log.e("name not found", e.toString())
-        }
-    }
-
-}
\ No newline at end of file

From c09c8cdb79c6c228bba6bc5c55cd794647718933 Mon Sep 17 00:00:00 2001
From: jooyae <jooyae3970@naver.com>
Date: Tue, 7 Dec 2021 15:44:12 +0900
Subject: [PATCH 6/9] =?UTF-8?q?[chore]=EC=82=AC=EC=9A=A9=EC=9E=90=20?=
 =?UTF-8?q?=EC=B0=A8=EB=8B=A8=20API?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                            | 2 +-
 app/src/main/java/org/journey/android/di/NetworkModule.kt   | 6 +++---
 .../java/org/journey/android/network/RetrofitInterface.kt   | 5 +++++
 .../android/signup/data/request/RequestBlockUserDTO.kt      | 5 +++++
 .../android/signup/data/response/ResponseBlockUserDTO.kt    | 6 ++++++
 5 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/java/org/journey/android/signup/data/request/RequestBlockUserDTO.kt
 create mode 100644 app/src/main/java/org/journey/android/signup/data/response/ResponseBlockUserDTO.kt

diff --git a/app/build.gradle b/app/build.gradle
index e550f4a..bbf2400 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -19,7 +19,7 @@ android {
         applicationId "org.journey.android"
         minSdkVersion 23
         targetSdkVersion 31
-        versionCode 6
+        versionCode 7
         versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/java/org/journey/android/di/NetworkModule.kt b/app/src/main/java/org/journey/android/di/NetworkModule.kt
index 2587a02..31d6ba8 100644
--- a/app/src/main/java/org/journey/android/di/NetworkModule.kt
+++ b/app/src/main/java/org/journey/android/di/NetworkModule.kt
@@ -38,9 +38,9 @@ object NetworkModule {
     @UnAuthOkHttp
     fun provideAuthOkHttpClientBuilder(): OkHttpClient {
         return OkHttpClient.Builder()
-            .connectTimeout(30, TimeUnit.SECONDS)
-            .writeTimeout(30, TimeUnit.SECONDS)
-            .readTimeout(30, TimeUnit.SECONDS)
+            .connectTimeout(60, TimeUnit.SECONDS)
+            .writeTimeout(60, TimeUnit.SECONDS)
+            .readTimeout(60, TimeUnit.SECONDS)
             .addInterceptor(loggingInterceptor)
             .build()
     }
diff --git a/app/src/main/java/org/journey/android/network/RetrofitInterface.kt b/app/src/main/java/org/journey/android/network/RetrofitInterface.kt
index 9b8908d..014e6c0 100644
--- a/app/src/main/java/org/journey/android/network/RetrofitInterface.kt
+++ b/app/src/main/java/org/journey/android/network/RetrofitInterface.kt
@@ -23,9 +23,11 @@ import org.journey.android.main.dto.ResponseHomeDTO
 import org.journey.android.mypage.data.dto.response.ResponseCheckMyPageDTO
 import org.journey.android.mypage.data.dto.response.ResponseCompleteCourseDTO
 import org.journey.android.pushalarm.data.response.ResponsePushAlarmDTO
+import org.journey.android.signup.data.request.RequestBlockUserDTO
 import org.journey.android.signup.data.request.RequestChangeNickNameDTO
 import org.journey.android.signup.data.request.RequestSignupDTO
 import org.journey.android.signup.data.request.RequestSocialSignUpDTO
+import org.journey.android.signup.data.response.ResponseBlockUserDTO
 import org.journey.android.signup.data.response.ResponseChangeNickNameDTO
 import org.journey.android.signup.data.response.ResponseSignupDTO
 import org.journey.android.signup.data.response.ResponseSocialSignUpDTO
@@ -124,4 +126,7 @@ interface RetrofitInterface {
         @Part image: MultipartBody.Part?
     ): Single<ResponsePostCommunityDTO>
 
+    @POST("/api/block")
+    fun blockUser(@Body requestBlockUserDTO: RequestBlockUserDTO) : Single<ResponseBlockUserDTO>
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/journey/android/signup/data/request/RequestBlockUserDTO.kt b/app/src/main/java/org/journey/android/signup/data/request/RequestBlockUserDTO.kt
new file mode 100644
index 0000000..f0335b8
--- /dev/null
+++ b/app/src/main/java/org/journey/android/signup/data/request/RequestBlockUserDTO.kt
@@ -0,0 +1,5 @@
+package org.journey.android.signup.data.request
+
+data class RequestBlockUserDTO(
+    val nickname : String
+)
diff --git a/app/src/main/java/org/journey/android/signup/data/response/ResponseBlockUserDTO.kt b/app/src/main/java/org/journey/android/signup/data/response/ResponseBlockUserDTO.kt
new file mode 100644
index 0000000..9fdf872
--- /dev/null
+++ b/app/src/main/java/org/journey/android/signup/data/response/ResponseBlockUserDTO.kt
@@ -0,0 +1,6 @@
+package org.journey.android.signup.data.response
+
+data class ResponseBlockUserDTO(
+    val status : Int,
+    val message : String
+)

From 26917431a5187fc426f5ca8b43b0ce33c42e0fce Mon Sep 17 00:00:00 2001
From: teagh82 <teagh8237@gmail.com>
Date: Tue, 7 Dec 2021 16:46:10 +0900
Subject: [PATCH 7/9] [fix] #444 Add Report Message

---
 .idea/runConfigurations.xml                   | 10 +++
 .../ui/fragment/CommunityDetailFragment.kt    | 78 ++++++++++++++-----
 .../main/res/layout/dialog_detail_delete.xml  |  1 +
 3 files changed, 68 insertions(+), 21 deletions(-)
 create mode 100644 .idea/runConfigurations.xml

diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 0000000..797acea
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/src/main/java/org/journey/android/community/ui/fragment/CommunityDetailFragment.kt b/app/src/main/java/org/journey/android/community/ui/fragment/CommunityDetailFragment.kt
index b76c3c7..565b2dc 100644
--- a/app/src/main/java/org/journey/android/community/ui/fragment/CommunityDetailFragment.kt
+++ b/app/src/main/java/org/journey/android/community/ui/fragment/CommunityDetailFragment.kt
@@ -13,6 +13,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
 import android.widget.ImageButton
+import android.widget.TextView
 import android.widget.Toast
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
@@ -129,30 +130,65 @@ class CommunityDetailFragment : Fragment() {
                 val reportBtn = view.findViewById<Button>(R.id.button_dialog_report)
 
                 reportBtn.setOnClickListener {
-                    val call: Call<Unit> = FeedRequestToServer.writeService
-                        .reportDiary(
-                            feedDetail.get("id") as Int,
-                            "application/json",
-                            viewModel.getJWT()
-                        )
-                    call.enqueue(object : Callback<Unit> {
-                        override fun onResponse(call: Call<Unit>, response: Response<Unit>) {
-                            if (response.isSuccessful) {
-                                Toast.makeText(requireContext(), "신고했습니다.", Toast.LENGTH_SHORT).show()
-                                reportDialog?.dismiss()
-                            } else {
-                                if(response.code() == 404 || response.code() == 401){
-                                    Toast.makeText(requireContext(), response.message(), Toast.LENGTH_SHORT).show()
+                    reportDialog?.dismiss()
+
+                    val reportCheckDialog = activity?.let { it1 -> Dialog(it1) }
+                    val reportCheckDialogInflater: LayoutInflater = LayoutInflater.from(activity)
+                    val mView: View =
+                        reportCheckDialogInflater.inflate(R.layout.dialog_detail_delete, null)
+                    val reportBtn: Button = mView.findViewById(R.id.button_dialog_delete)
+                    val closeBtn: Button = mView.findViewById(R.id.button_dialog_close)
+                    val window = reportCheckDialog?.window
+                    window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+
+                    val reportTitle: TextView = mView.findViewById(R.id.textview_dialog_delete)
+                    val reportContent: TextView = mView.findViewById(R.id. textview_delete_content)
+                    reportTitle.text = "신고하기"
+                    reportContent.text = "10회 이상 신고될 경우 \n게시물이 삭제되고 계정이 차단 조치돼"
+                    reportBtn.text = "신고"
+
+
+                    if (reportCheckDialog != null) {
+                        reportCheckDialog.setContentView(mView)
+                        reportCheckDialog.create()
+                        reportCheckDialog.show()
+                    }
+                    closeBtn.setOnClickListener {
+                        if (reportCheckDialog != null) {
+                            reportCheckDialog.dismiss()
+                            reportCheckDialog.cancel()
+                        }
+                    }
+                    reportBtn.setOnClickListener {
+                        val call: Call<Unit> = FeedRequestToServer.writeService
+                            .reportDiary(
+                                feedDetail.get("id") as Int,
+                                "application/json",
+                                viewModel.getJWT()
+                            )
+                        call.enqueue(object : Callback<Unit> {
+                            override fun onResponse(call: Call<Unit>, response: Response<Unit>) {
+                                if (response.isSuccessful) {
+                                    Toast.makeText(requireContext(), "신고했습니다.", Toast.LENGTH_SHORT)
+                                        .show()
+                                    reportDialog?.dismiss()
+                                } else {
+                                    if (response.code() == 404 || response.code() == 401) {
+                                        Toast.makeText(
+                                            requireContext(),
+                                            "이미 신고한 게시물입니다.",
+                                            Toast.LENGTH_SHORT
+                                        ).show()
+                                    }
                                 }
-//                                Toast.makeText(requireContext(), response.toString(), Toast.LENGTH_SHORT).show()
+                                reportCheckDialog?.dismiss()
                             }
-                        }
 
-                        override fun onFailure(call: Call<Unit>, t: Throwable) {
-                            Log.d("Report Diary NT Error", "Report Error!")
-                        }
-                    })
-                    reportDialog?.dismiss()
+                            override fun onFailure(call: Call<Unit>, t: Throwable) {
+                                Log.d("Report Diary NT Error", "Report Error!")
+                            }
+                        })
+                    }
                 }
 
                 reportDialog?.setContentView(view)
diff --git a/app/src/main/res/layout/dialog_detail_delete.xml b/app/src/main/res/layout/dialog_detail_delete.xml
index edabe80..729949a 100644
--- a/app/src/main/res/layout/dialog_detail_delete.xml
+++ b/app/src/main/res/layout/dialog_detail_delete.xml
@@ -73,6 +73,7 @@
             android:layout_marginTop="14dp"
             android:fontFamily="@font/spoqahansansneoregular"
             android:text="안부를 정말 삭제할 거야?"
+            android:gravity="center"
             android:textColor="@color/mohaeng_black"
             android:textSize="14sp"
             app:layout_constraintEnd_toEndOf="parent"

From 0563727ed18348f49e5a3c86ae47dd1b5dd277bb Mon Sep 17 00:00:00 2001
From: jooyae <jooyae3970@naver.com>
Date: Tue, 7 Dec 2021 17:08:46 +0900
Subject: [PATCH 8/9] merge develop

---
 .idea/runConfigurations.xml | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100644 .idea/runConfigurations.xml

diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 797acea..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file

From 1af9cb6e54b235d555c93f4cc5b398ec4d250d3d Mon Sep 17 00:00:00 2001
From: teagh82 <teagh8237@gmail.com>
Date: Tue, 7 Dec 2021 17:55:12 +0900
Subject: [PATCH 9/9] [fix] #446 Fix EditNickName Hint

---
 .../android/mypage/ui/fragment/EditNickNameFragment.kt        | 1 +
 .../org/journey/android/signup/viewmodel/NickNameViewModel.kt | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/app/src/main/java/org/journey/android/mypage/ui/fragment/EditNickNameFragment.kt b/app/src/main/java/org/journey/android/mypage/ui/fragment/EditNickNameFragment.kt
index 149f3cc..2ceb438 100644
--- a/app/src/main/java/org/journey/android/mypage/ui/fragment/EditNickNameFragment.kt
+++ b/app/src/main/java/org/journey/android/mypage/ui/fragment/EditNickNameFragment.kt
@@ -38,6 +38,7 @@ class EditNickNameFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
         binding.viewModel = viewModel
         binding.lifecycleOwner = viewLifecycleOwner
+        binding.edittextEditNickname.hint = viewModel.getNickName()
         setButtonVisible()
         popBackStack()
         changeNickName()
diff --git a/app/src/main/java/org/journey/android/signup/viewmodel/NickNameViewModel.kt b/app/src/main/java/org/journey/android/signup/viewmodel/NickNameViewModel.kt
index 4d6a92c..61b6f79 100644
--- a/app/src/main/java/org/journey/android/signup/viewmodel/NickNameViewModel.kt
+++ b/app/src/main/java/org/journey/android/signup/viewmodel/NickNameViewModel.kt
@@ -54,6 +54,7 @@ class NickNameViewModel @Inject constructor(
                 _nickNameStatus.value = NickNameStatus.IS_NOT_AVAILABLE_NICKNAME
             } else {
                 _nickNameStatus.value = NickNameStatus.CHECK_NICKNAME_REPETITION
+                userPreferenceManager.saveUserNickName(nickname.value.toString())
             }
         }
     }
@@ -151,4 +152,7 @@ class NickNameViewModel @Inject constructor(
     fun getCheckPassword(): String{
         return userPreferenceManager.fetchCheckDoublePassword()
     }
+    fun getNickName(): String{
+        return userPreferenceManager.fetchUserNickName()
+    }
 }
\ No newline at end of file