From 811753f37a734b3be27a1327e608045bff39fa11 Mon Sep 17 00:00:00 2001
From: krrong <khk9664@naver.com>
Date: Mon, 2 Oct 2023 18:39:37 +0900
Subject: [PATCH 01/11] =?UTF-8?q?refactor:=20=EC=97=85=EB=A1=9C=EB=93=9C?=
 =?UTF-8?q?=20=EB=B7=B0=20=EB=94=94=EC=9E=90=EC=9D=B8=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../presentation/upload/UploadActivity.kt     |  15 +-
 .../src/main/res/layout/activity_upload.xml   | 152 +++++++-----------
 android/app/src/main/res/values/strings.xml   |   7 +-
 android/app/src/main/res/values/themes.xml    |   1 +
 .../UploadViewModelTestWithRobolectric.kt     |   2 +-
 5 files changed, 61 insertions(+), 116 deletions(-)

diff --git a/android/app/src/main/java/com/now/naaga/presentation/upload/UploadActivity.kt b/android/app/src/main/java/com/now/naaga/presentation/upload/UploadActivity.kt
index 57320dc7d..0f22fb812 100644
--- a/android/app/src/main/java/com/now/naaga/presentation/upload/UploadActivity.kt
+++ b/android/app/src/main/java/com/now/naaga/presentation/upload/UploadActivity.kt
@@ -25,7 +25,6 @@ import com.now.naaga.R
 import com.now.naaga.data.firebase.analytics.AnalyticsDelegate
 import com.now.naaga.data.firebase.analytics.DefaultAnalyticsDelegate
 import com.now.naaga.data.firebase.analytics.UPLOAD_OPEN_CAMERA
-import com.now.naaga.data.firebase.analytics.UPLOAD_SET_COORDINATE
 import com.now.naaga.data.throwable.DataThrowable
 import com.now.naaga.databinding.ActivityUploadBinding
 import com.now.naaga.presentation.beginadventure.LocationPermissionDialog
@@ -140,11 +139,7 @@ class UploadActivity : AppCompatActivity(), AnalyticsDelegate by DefaultAnalytic
             val fusedLocationClient = LocationServices.getFusedLocationProviderClient(this)
             fusedLocationClient.getCurrentLocation(PRIORITY_HIGH_ACCURACY, createCancellationToken())
                 .addOnSuccessListener { location ->
-                    if (location != null) {
-                        val coordinate = getCoordinate(location)
-                        binding.tvUploadPhotoCoordinate.text = coordinate.toText()
-                        viewModel.setCoordinate(coordinate)
-                    }
+                    location.let { viewModel.setCoordinate(getCoordinate(location)) }
                 }
                 .addOnFailureListener { }
         }
@@ -178,18 +173,10 @@ class UploadActivity : AppCompatActivity(), AnalyticsDelegate by DefaultAnalytic
             logClickEvent(getViewEntryName(it), UPLOAD_OPEN_CAMERA)
             checkCameraPermission()
         }
-
         binding.ivUploadPhoto.setOnClickListener {
             logClickEvent(getViewEntryName(it), UPLOAD_OPEN_CAMERA)
             checkCameraPermission()
         }
-        binding.ivUploadPhotoCoordinate.setOnClickListener {
-            logClickEvent(getViewEntryName(it), UPLOAD_SET_COORDINATE)
-            checkLocationPermission()
-        }
-        binding.ivUploadClose.setOnClickListener {
-            finish()
-        }
         binding.btnUploadSubmit.setOnClickListener {
             if (isFormValid().not()) {
                 shortToast(getString(R.string.upload_error_insufficient_info_message))
diff --git a/android/app/src/main/res/layout/activity_upload.xml b/android/app/src/main/res/layout/activity_upload.xml
index e391422c7..129f2ad09 100644
--- a/android/app/src/main/res/layout/activity_upload.xml
+++ b/android/app/src/main/res/layout/activity_upload.xml
@@ -33,17 +33,40 @@
             app:lottie_loop="true"
             app:lottie_rawRes="@raw/simple_loading" />
 
+        <ImageView
+            android:id="@+id/iv_upload_back"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="16dp"
+            android:paddingHorizontal="20dp"
+            android:paddingVertical="@dimen/space_default_medium"
+            android:src="@drawable/ic_arrow"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/tv_upload_activity_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/upload_title"
+            android:textSize="28sp"
+            app:layout_constraintBottom_toBottomOf="@id/iv_upload_back"
+            app:layout_constraintStart_toEndOf="@id/iv_upload_back"
+            app:layout_constraintTop_toTopOf="@id/iv_upload_back" />
+
         <ImageView
             android:id="@+id/iv_upload_photo"
-            android:layout_width="180dp"
-            android:layout_height="180dp"
-            android:layout_marginTop="@dimen/space_default_large"
+            android:layout_width="300dp"
+            android:layout_height="300dp"
+            android:layout_marginTop="@dimen/space_default_medium"
             android:background="@drawable/rect_radius_small"
             android:backgroundTint="@color/white"
             android:scaleType="centerCrop"
+            app:layout_constraintBottom_toTopOf="@id/tv_upload_title"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toBottomOf="@id/tv_upload_activity_title" />
 
         <ImageView
             android:id="@+id/iv_upload_camera_icon"
@@ -55,102 +78,47 @@
             app:layout_constraintStart_toStartOf="@id/iv_upload_photo"
             app:layout_constraintTop_toTopOf="@id/iv_upload_photo" />
 
-        <EditText
-            android:id="@+id/et_upload_photo_title"
-            android:layout_width="0dp"
+        <TextView
+            android:id="@+id/tv_upload_title"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="@dimen/space_default_large"
-            android:layout_marginTop="@dimen/space_default_medium"
-            android:autofillHints="no"
-            android:ellipsize="end"
-            android:hint="@string/upload_photo_title"
-            android:inputType="text"
-            android:maxLines="1"
-            android:text="@={viewModel.name}"
-            android:textAlignment="textStart"
+            android:layout_marginTop="@dimen/space_default_large"
+            android:text="@string/upload_photo_title"
             android:textSize="28sp"
-            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/iv_upload_photo"
-            tools:text="선정릉 돌담길" />
-
-        <ImageView
-            android:id="@+id/iv_upload_photo_coordinate"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/space_default_medium"
-            android:src="@drawable/ic_coordinate"
-            app:layout_constraintEnd_toStartOf="@id/tv_upload_photo_coordinate"
-            app:layout_constraintStart_toStartOf="@id/et_upload_photo_title"
-            app:layout_constraintTop_toBottomOf="@id/et_upload_photo_title" />
-
-        <TextView
-            android:id="@+id/tv_upload_photo_coordinate"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:background="@drawable/rect_radius_small"
-            android:backgroundTint="@color/white"
-            android:fontFamily="@font/pretendard_medium"
-            android:gravity="center"
-            android:textSize="28sp"
-            app:layout_constraintBottom_toBottomOf="@id/iv_upload_photo_coordinate"
-            app:layout_constraintEnd_toEndOf="@id/et_upload_photo_title"
-            app:layout_constraintStart_toEndOf="@id/iv_upload_photo_coordinate"
-            app:layout_constraintTop_toTopOf="@id/iv_upload_photo_coordinate"
-            tools:text="35.123, 127.345" />
+            app:layout_constraintTop_toBottomOf="@id/iv_upload_photo" />
 
         <View
             android:id="@+id/v_upload_divide_line_1"
             android:layout_width="0dp"
             android:layout_height="3dp"
-            android:layout_marginTop="@dimen/space_default_large"
-            android:background="@color/black"
-            app:layout_constraintEnd_toEndOf="@id/et_upload_photo_title"
-            app:layout_constraintStart_toStartOf="@id/et_upload_photo_title"
-            app:layout_constraintTop_toBottomOf="@id/tv_upload_photo_coordinate" />
-
-        <TextView
-            android:id="@+id/tv_upload_description"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/space_default_large"
-            android:fontFamily="@font/pretendard_bold"
-            android:text="@string/upload_description"
-            android:textSize="28sp"
-            app:layout_constraintEnd_toEndOf="@id/et_upload_photo_title"
-            app:layout_constraintStart_toStartOf="@id/et_upload_photo_title"
-            app:layout_constraintTop_toBottomOf="@id/v_upload_divide_line_1" />
+            android:layout_marginHorizontal="@dimen/space_default_large"
+            android:layout_marginTop="@dimen/space_default_medium"
+            android:background="@color/white"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_upload_title" />
 
         <EditText
-            android:id="@+id/et_upload_photo_description"
+            android:id="@+id/et_upload_place_name"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/space_default_medium"
             android:autofillHints="no"
-            android:background="@drawable/rect_radius_small"
             android:backgroundTint="@color/white"
-            android:fontFamily="@font/pretendard_medium"
-            android:gravity="top"
-            android:hint="@string/upload_photo_description"
+            android:ellipsize="end"
+            android:hint="@string/upload_photo_title"
             android:inputType="text"
-            android:padding="@dimen/space_default_medium"
-            android:text="@={viewModel.description}"
-            app:layout_constraintBottom_toTopOf="@id/v_upload_divide_line_2"
-            app:layout_constraintEnd_toEndOf="@id/et_upload_photo_title"
-            app:layout_constraintStart_toStartOf="@id/et_upload_photo_title"
-            app:layout_constraintTop_toBottomOf="@id/tv_upload_description"
-            app:layout_constraintVertical_chainStyle="spread" />
-
-        <View
-            android:id="@+id/v_upload_divide_line_2"
-            android:layout_width="0dp"
-            android:layout_height="3dp"
-            android:layout_marginTop="@dimen/space_default_large"
-            android:background="@color/black"
-            app:layout_constraintBottom_toTopOf="@id/btn_upload_submit"
-            app:layout_constraintEnd_toEndOf="@id/et_upload_photo_title"
-            app:layout_constraintStart_toStartOf="@id/et_upload_photo_title"
-            app:layout_constraintTop_toBottomOf="@id/et_upload_photo_description" />
+            android:maxLines="1"
+            android:text="@={viewModel.name}"
+            android:textAlignment="textEnd"
+            android:textColor="@color/white"
+            android:textSize="28sp"
+            app:layout_constraintEnd_toEndOf="@id/v_upload_divide_line_1"
+            app:layout_constraintStart_toStartOf="@id/v_upload_divide_line_1"
+            app:layout_constraintTop_toBottomOf="@id/tv_upload_title"
+            tools:text="선정릉 돌담길" />
 
         <Button
             android:id="@+id/btn_upload_submit"
@@ -159,23 +127,13 @@
             android:layout_marginHorizontal="@dimen/space_default_large"
             android:layout_marginTop="@dimen/space_default_large"
             android:layout_marginBottom="@dimen/space_default_large"
-            android:fontFamily="@font/pretendard_bold"
+            android:background="@drawable/rect_radius_small"
+            android:backgroundTint="@color/main_yellow"
             android:text="@string/upload_submit"
             android:textSize="28sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/v_upload_divide_line_2" />
-
-        <ImageView
-            android:id="@+id/iv_upload_close"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:layout_marginEnd="20dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/ic_close" />
+            app:layout_constraintStart_toStartOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index c0e67d4f3..b853f861f 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -53,10 +53,9 @@
     <string name="adventureResult_rank">%d등</string>
 
     <!-- UploadActivity -->
-    <string name="upload_description">Description</string>
-    <string name="upload_photo_description">장소에 대한 설명을 입력해주세요! \n\n자세할수록 좋습니다!</string>
-    <string name="upload_submit">등록할게요!</string>
-    <string name="upload_photo_title">장소명을 입력해주세요!</string>
+    <string name="upload_title">장소 등록</string>
+    <string name="upload_photo_title">장소이름</string>
+    <string name="upload_submit">장소 등록</string>
 
     <!-- CameraDialog-->
     <string name="cameraDialog_description">장소를 올리기 위해서는\n카메라 접근 권한이 필요해요!</string>
diff --git a/android/app/src/main/res/values/themes.xml b/android/app/src/main/res/values/themes.xml
index 3818bccfb..33c7807b3 100644
--- a/android/app/src/main/res/values/themes.xml
+++ b/android/app/src/main/res/values/themes.xml
@@ -9,6 +9,7 @@
         <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
         <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
+        <item name="android:textColor">@color/white</item>
         <item name="android:fontFamily">@font/main_font</item>
         <!-- Customize your theme here. -->
         <item name="android:windowBackground">@color/main_dark_blue</item>
diff --git a/android/app/src/test/java/com/now/naaga/UploadViewModelTestWithRobolectric.kt b/android/app/src/test/java/com/now/naaga/UploadViewModelTestWithRobolectric.kt
index 53e38e8c4..29d8cadee 100644
--- a/android/app/src/test/java/com/now/naaga/UploadViewModelTestWithRobolectric.kt
+++ b/android/app/src/test/java/com/now/naaga/UploadViewModelTestWithRobolectric.kt
@@ -45,7 +45,7 @@ class UploadViewModelTestWithRobolectric {
             .get()
 
         // EditText 찾기
-        val editTextTitle = activity.findViewById<EditText>(R.id.et_upload_photo_title)
+        val editTextTitle = activity.findViewById<EditText>(R.id.et_upload_place_name)
 
         // when : EditText 값 변경
         val testInput = "Test Input"

From e990ef94c3e83ecf093f99b664f12410ce845d84 Mon Sep 17 00:00:00 2001
From: krrong <khk9664@naver.com>
Date: Mon, 2 Oct 2023 18:47:41 +0900
Subject: [PATCH 02/11] =?UTF-8?q?refactor:=20=EC=82=AC=EC=9A=A9=ED=95=98?=
 =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EB=B3=80=EC=88=98=20=EC=82=AD?=
 =?UTF-8?q?=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../presentation/upload/UploadActivity.kt     | 22 +++----------------
 .../presentation/upload/UploadViewModel.kt    |  7 ++----
 android/app/src/main/res/values/strings.xml   | 11 +++++-----
 3 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/android/app/src/main/java/com/now/naaga/presentation/upload/UploadActivity.kt b/android/app/src/main/java/com/now/naaga/presentation/upload/UploadActivity.kt
index 0f22fb812..0cd6cbc9c 100644
--- a/android/app/src/main/java/com/now/naaga/presentation/upload/UploadActivity.kt
+++ b/android/app/src/main/java/com/now/naaga/presentation/upload/UploadActivity.kt
@@ -96,23 +96,17 @@ class UploadActivity : AppCompatActivity(), AnalyticsDelegate by DefaultAnalytic
                 UploadStatus.PENDING -> { changeVisibility(binding.lottieUploadLoading, View.VISIBLE) }
                 UploadStatus.FAIL -> {
                     changeVisibility(binding.lottieUploadLoading, View.GONE)
-                    shortToast(MESSAGE_FAIL_UPLOAD)
+                    shortToast(getString(R.string.upload_fail_submit))
                 }
             }
         }
         viewModel.throwable.observe(this) { error: DataThrowable ->
             when (error.code) {
-                UploadViewModel.ERROR_STORE_PHOTO -> {
-                    shortToast(getString(R.string.upload_error_store_photo_message))
-                }
-
+                UploadViewModel.ERROR_STORE_PHOTO -> { shortToast(getString(R.string.upload_error_store_photo_message)) }
                 UploadViewModel.ALREADY_EXISTS_NEARBY -> {
                     shortToast(getString(R.string.upload_error_already_exists_nearby_message))
                 }
-
-                UploadViewModel.ERROR_POST_BODY -> {
-                    shortToast(getString(R.string.upload_error_post_message))
-                }
+                UploadViewModel.ERROR_POST_BODY -> { shortToast(getString(R.string.upload_error_post_message)) }
             }
         }
     }
@@ -198,14 +192,6 @@ class UploadActivity : AppCompatActivity(), AnalyticsDelegate by DefaultAnalytic
         cameraLauncher.launch(null)
     }
 
-    private fun checkLocationPermission() {
-        if (checkSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_DENIED) {
-            LocationPermissionDialog().show(supportFragmentManager, TAG_LOCATION_DIALOG)
-        } else {
-            setCoordinate()
-        }
-    }
-
     private fun setImage(bitmap: Bitmap) {
         binding.ivUploadCameraIcon.visibility = View.GONE
         binding.ivUploadPhoto.setImageBitmap(bitmap)
@@ -257,8 +243,6 @@ class UploadActivity : AppCompatActivity(), AnalyticsDelegate by DefaultAnalytic
             Manifest.permission.CAMERA,
         )
 
-        private const val MESSAGE_FAIL_UPLOAD = "장소등록에 실패했어요!"
-
         val contentValues = ContentValues().apply {
             put(MediaStore.Images.Media.DISPLAY_NAME, "ImageTitle")
             put(MediaStore.Images.Media.MIME_TYPE, "image/jpeg")
diff --git a/android/app/src/main/java/com/now/naaga/presentation/upload/UploadViewModel.kt b/android/app/src/main/java/com/now/naaga/presentation/upload/UploadViewModel.kt
index 9480b47a7..5f7a460ac 100644
--- a/android/app/src/main/java/com/now/naaga/presentation/upload/UploadViewModel.kt
+++ b/android/app/src/main/java/com/now/naaga/presentation/upload/UploadViewModel.kt
@@ -23,8 +23,6 @@ class UploadViewModel @Inject constructor(
 
     val name = MutableLiveData<String>()
 
-    val description = MutableLiveData<String>()
-
     private val _successUpload = MutableSingleLiveData<UploadStatus>()
     val successUpload: SingleLiveData<UploadStatus> = _successUpload
 
@@ -43,8 +41,7 @@ class UploadViewModel @Inject constructor(
     }
 
     fun isFormValid(): Boolean {
-        return (imageUri != URI_EMPTY) && (_coordinate.value != null) &&
-            (name.value != null) && (description.value != null)
+        return (imageUri != URI_EMPTY) && (_coordinate.value != null) && (name.value != null)
     }
 
     fun postPlace() {
@@ -54,7 +51,7 @@ class UploadViewModel @Inject constructor(
                 runCatching {
                     placeRepository.postPlace(
                         name = name.value.toString(),
-                        description = description.value.toString(),
+                        description = "",
                         coordinate = coordinate,
                         image = imageUri,
                     )
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index b853f861f..88fc84525 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -56,6 +56,11 @@
     <string name="upload_title">장소 등록</string>
     <string name="upload_photo_title">장소이름</string>
     <string name="upload_submit">장소 등록</string>
+    <string name="upload_fail_submit">장소등록에 실패했어요!</string>
+    <string name="upload_error_store_photo_message">사진을 저장하는데 문제가 생겼어요! 다시 시도해주세요!</string>
+    <string name="upload_error_already_exists_nearby_message">근방에 다른 미션장소가 존재해서 추가할 수 없어요!</string>
+    <string name="upload_error_post_message">전송에 실패했어요! 다시 시도해주세요!</string>
+    <string name="upload_error_insufficient_info_message">모든 정보를 입력해주세요.</string>
 
     <!-- CameraDialog-->
     <string name="cameraDialog_description">장소를 올리기 위해서는\n카메라 접근 권한이 필요해요!</string>
@@ -99,12 +104,6 @@
     <!-- LoginActivity -->
     <string name="login_app_title">NAAGA</string>
 
-    <!-- UploadActivity -->
-    <string name="upload_error_store_photo_message">사진을 저장하는데 문제가 생겼어요! 다시 시도해주세요!</string>
-    <string name="upload_error_already_exists_nearby_message">근방에 다른 미션장소가 존재해서 추가할 수 없어요!</string>
-    <string name="upload_error_post_message">전송에 실패했어요! 다시 시도해주세요!</string>
-    <string name="upload_error_insufficient_info_message">모든 정보를 입력해주세요.</string>
-
     <!-- SettingActivity -->
     <string name="setting_withdrawal_success_message">"성공적으로 회원 탈퇴 되었습니다."</string>
     <string name="setting_wrong_error_message">"인증 정보가 잘 못 되었어요!"</string>

From bb2d7e496fc8fca3ad16b8c78e7bca7eb35561ea Mon Sep 17 00:00:00 2001
From: krrong <khk9664@naver.com>
Date: Mon, 2 Oct 2023 18:57:33 +0900
Subject: [PATCH 03/11] =?UTF-8?q?refactor:=20AppCompatButton=20=EC=82=AC?=
 =?UTF-8?q?=EC=9A=A9=ED=95=B4=EC=84=9C=20=EB=B0=B0=EA=B2=BD=EC=83=89=20?=
 =?UTF-8?q?=EC=A7=80=EC=A0=95=ED=95=98=EB=8F=84=EB=A1=9D=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 android/app/src/main/res/layout/activity_upload.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/app/src/main/res/layout/activity_upload.xml b/android/app/src/main/res/layout/activity_upload.xml
index 129f2ad09..f298103e2 100644
--- a/android/app/src/main/res/layout/activity_upload.xml
+++ b/android/app/src/main/res/layout/activity_upload.xml
@@ -120,7 +120,7 @@
             app:layout_constraintTop_toBottomOf="@id/tv_upload_title"
             tools:text="선정릉 돌담길" />
 
-        <Button
+        <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/btn_upload_submit"
             android:layout_width="0dp"
             android:layout_height="wrap_content"

From d72796addb1ab9d255154b123a692633b023f765 Mon Sep 17 00:00:00 2001
From: krrong <khk9664@naver.com>
Date: Tue, 3 Oct 2023 01:12:49 +0900
Subject: [PATCH 04/11] =?UTF-8?q?refactor:=20editText=EC=97=90=20hint=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 android/app/src/main/res/layout/activity_upload.xml | 6 +++---
 android/app/src/main/res/values/strings.xml         | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/android/app/src/main/res/layout/activity_upload.xml b/android/app/src/main/res/layout/activity_upload.xml
index f298103e2..d70d18f4b 100644
--- a/android/app/src/main/res/layout/activity_upload.xml
+++ b/android/app/src/main/res/layout/activity_upload.xml
@@ -108,7 +108,8 @@
             android:autofillHints="no"
             android:backgroundTint="@color/white"
             android:ellipsize="end"
-            android:hint="@string/upload_photo_title"
+            android:hint="@string/upload_photo_title_hint"
+            android:textColorHint="@color/white"
             android:inputType="text"
             android:maxLines="1"
             android:text="@={viewModel.name}"
@@ -117,8 +118,7 @@
             android:textSize="28sp"
             app:layout_constraintEnd_toEndOf="@id/v_upload_divide_line_1"
             app:layout_constraintStart_toStartOf="@id/v_upload_divide_line_1"
-            app:layout_constraintTop_toBottomOf="@id/tv_upload_title"
-            tools:text="선정릉 돌담길" />
+            app:layout_constraintTop_toBottomOf="@id/tv_upload_title"/>
 
         <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/btn_upload_submit"
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index 88fc84525..81681a55c 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -55,6 +55,7 @@
     <!-- UploadActivity -->
     <string name="upload_title">장소 등록</string>
     <string name="upload_photo_title">장소이름</string>
+    <string name="upload_photo_title_hint">장소이름을 적어주세요!</string>
     <string name="upload_submit">장소 등록</string>
     <string name="upload_fail_submit">장소등록에 실패했어요!</string>
     <string name="upload_error_store_photo_message">사진을 저장하는데 문제가 생겼어요! 다시 시도해주세요!</string>

From 2fd0d1a89c999ddbfe0650ad502e99536a5e7a9d Mon Sep 17 00:00:00 2001
From: krrong <khk9664@naver.com>
Date: Tue, 3 Oct 2023 02:02:06 +0900
Subject: [PATCH 05/11] refactor: ktlint

---
 .../java/com/now/naaga/presentation/upload/UploadActivity.kt  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/android/app/src/main/java/com/now/naaga/presentation/upload/UploadActivity.kt b/android/app/src/main/java/com/now/naaga/presentation/upload/UploadActivity.kt
index 0cd6cbc9c..0bf2195ab 100644
--- a/android/app/src/main/java/com/now/naaga/presentation/upload/UploadActivity.kt
+++ b/android/app/src/main/java/com/now/naaga/presentation/upload/UploadActivity.kt
@@ -102,7 +102,9 @@ class UploadActivity : AppCompatActivity(), AnalyticsDelegate by DefaultAnalytic
         }
         viewModel.throwable.observe(this) { error: DataThrowable ->
             when (error.code) {
-                UploadViewModel.ERROR_STORE_PHOTO -> { shortToast(getString(R.string.upload_error_store_photo_message)) }
+                UploadViewModel.ERROR_STORE_PHOTO -> {
+                    shortToast(getString(R.string.upload_error_store_photo_message))
+                }
                 UploadViewModel.ALREADY_EXISTS_NEARBY -> {
                     shortToast(getString(R.string.upload_error_already_exists_nearby_message))
                 }

From e28f68bb4ca5ef692f2eae94bac92a8cbcf04340 Mon Sep 17 00:00:00 2001
From: krrong <khk9664@naver.com>
Date: Wed, 4 Oct 2023 13:59:30 +0900
Subject: [PATCH 06/11] =?UTF-8?q?refactor:=20=EB=B2=84=ED=8A=BC=20?=
 =?UTF-8?q?=EB=B0=B0=EA=B2=BD=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../naaga/presentation/login/LoginActivity.kt |  2 +-
 .../app/src/main/res/drawable/bg_button.xml   | 55 +++++++++++++++++++
 .../src/main/res/layout/activity_upload.xml   |  3 +-
 3 files changed, 57 insertions(+), 3 deletions(-)
 create mode 100644 android/app/src/main/res/drawable/bg_button.xml

diff --git a/android/app/src/main/java/com/now/naaga/presentation/login/LoginActivity.kt b/android/app/src/main/java/com/now/naaga/presentation/login/LoginActivity.kt
index f2c2e7942..cee1a4b79 100644
--- a/android/app/src/main/java/com/now/naaga/presentation/login/LoginActivity.kt
+++ b/android/app/src/main/java/com/now/naaga/presentation/login/LoginActivity.kt
@@ -32,7 +32,7 @@ class LoginActivity : AppCompatActivity(), AnalyticsDelegate by DefaultAnalytics
         registerAnalytics(this.lifecycle)
         subscribe()
         setClickListeners()
-        setStatusBar()
+//        setStatusBar()
     }
 
     private fun subscribe() {
diff --git a/android/app/src/main/res/drawable/bg_button.xml b/android/app/src/main/res/drawable/bg_button.xml
new file mode 100644
index 000000000..f14c092da
--- /dev/null
+++ b/android/app/src/main/res/drawable/bg_button.xml
@@ -0,0 +1,55 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="320dp"
+    android:height="60dp"
+    android:viewportWidth="320"
+    android:viewportHeight="60">
+  <path
+      android:pathData="M12,0L308,0A12,12 0,0 1,320 12L320,48A12,12 0,0 1,308 60L12,60A12,12 0,0 1,0 48L0,12A12,12 0,0 1,12 0z"
+      android:fillColor="#FFFDBA"/>
+  <path
+      android:pathData="M26.02,0L308,0A12,12 0,0 1,320 12L320,48A12,12 0,0 1,308 60L26.02,60A12,12 0,0 1,14.02 48L14.02,12A12,12 0,0 1,26.02 0z"
+      android:fillColor="#FEFA1D"/>
+  <path
+      android:pathData="M0,14.98C0,9.9 3.2,5.37 7.98,3.67L13.43,1.74C14.71,1.28 16.07,1.04 17.44,1.04H308C314.63,1.04 320,6.42 320,13.04V48C320,54.63 314.63,60 308,60H12C5.37,60 0,54.63 0,48V14.98Z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="160"
+          android:startY="1.04"
+          android:endX="160"
+          android:endY="60"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFEFA1D"/>
+        <item android:offset="0.05" android:color="#FFFFD50C"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M0,31.06h320v28.92h-320z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="160"
+          android:startY="31.06"
+          android:endX="160"
+          android:endY="59.98"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFFD50C"/>
+        <item android:offset="0.07" android:color="#FFFFB70A"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M2.09,55.83L317.91,55.83A2.09,2.09 0,0 1,320 57.91L320,57.91A2.09,2.09 0,0 1,317.91 60L2.09,60A2.09,2.09 0,0 1,0 57.91L0,57.91A2.09,2.09 0,0 1,2.09 55.83z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="160"
+          android:startY="55.83"
+          android:endX="160"
+          android:endY="60"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFFB80B"/>
+        <item android:offset="0.52" android:color="#C6DA8002"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+</vector>
diff --git a/android/app/src/main/res/layout/activity_upload.xml b/android/app/src/main/res/layout/activity_upload.xml
index d70d18f4b..f01a2cb14 100644
--- a/android/app/src/main/res/layout/activity_upload.xml
+++ b/android/app/src/main/res/layout/activity_upload.xml
@@ -127,8 +127,7 @@
             android:layout_marginHorizontal="@dimen/space_default_large"
             android:layout_marginTop="@dimen/space_default_large"
             android:layout_marginBottom="@dimen/space_default_large"
-            android:background="@drawable/rect_radius_small"
-            android:backgroundTint="@color/main_yellow"
+            android:background="@drawable/bg_button"
             android:text="@string/upload_submit"
             android:textSize="28sp"
             app:layout_constraintBottom_toBottomOf="parent"

From 25790aee40b2beaa8f3bfd9fdcc054a2682ce6f2 Mon Sep 17 00:00:00 2001
From: krrong <khk9664@naver.com>
Date: Wed, 4 Oct 2023 14:01:34 +0900
Subject: [PATCH 07/11] =?UTF-8?q?refactor:=20editText=20=EB=B0=91=EC=A4=84?=
 =?UTF-8?q?=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 android/app/src/main/res/layout/activity_upload.xml | 5 ++---
 android/app/src/main/res/values/strings.xml         | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/android/app/src/main/res/layout/activity_upload.xml b/android/app/src/main/res/layout/activity_upload.xml
index f01a2cb14..7b5b5a2e5 100644
--- a/android/app/src/main/res/layout/activity_upload.xml
+++ b/android/app/src/main/res/layout/activity_upload.xml
@@ -106,7 +106,6 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/space_default_medium"
             android:autofillHints="no"
-            android:backgroundTint="@color/white"
             android:ellipsize="end"
             android:hint="@string/upload_photo_title_hint"
             android:textColorHint="@color/white"
@@ -115,13 +114,13 @@
             android:text="@={viewModel.name}"
             android:textAlignment="textEnd"
             android:textColor="@color/white"
-            android:textSize="28sp"
+            android:textSize="24sp"
             app:layout_constraintEnd_toEndOf="@id/v_upload_divide_line_1"
             app:layout_constraintStart_toStartOf="@id/v_upload_divide_line_1"
             app:layout_constraintTop_toBottomOf="@id/tv_upload_title"/>
 
         <androidx.appcompat.widget.AppCompatButton
-            android:id="@+id/btn_upload_submit"
+            android:id="@+id/btn_upload_su경bmit"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="@dimen/space_default_large"
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index 81681a55c..a8d047673 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -55,7 +55,7 @@
     <!-- UploadActivity -->
     <string name="upload_title">장소 등록</string>
     <string name="upload_photo_title">장소이름</string>
-    <string name="upload_photo_title_hint">장소이름을 적어주세요!</string>
+    <string name="upload_photo_title_hint">이곳에 장소이름을 적어주세요!</string>
     <string name="upload_submit">장소 등록</string>
     <string name="upload_fail_submit">장소등록에 실패했어요!</string>
     <string name="upload_error_store_photo_message">사진을 저장하는데 문제가 생겼어요! 다시 시도해주세요!</string>

From ef42cc13250e6a17ea97fcb568357745898b4919 Mon Sep 17 00:00:00 2001
From: krrong <khk9664@naver.com>
Date: Wed, 4 Oct 2023 14:03:52 +0900
Subject: [PATCH 08/11] =?UTF-8?q?refactor:=20editText=20marginTop=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/app/src/main/res/layout/activity_upload.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/app/src/main/res/layout/activity_upload.xml b/android/app/src/main/res/layout/activity_upload.xml
index 7b5b5a2e5..d024aab3c 100644
--- a/android/app/src/main/res/layout/activity_upload.xml
+++ b/android/app/src/main/res/layout/activity_upload.xml
@@ -104,7 +104,7 @@
             android:id="@+id/et_upload_place_name"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/space_default_medium"
+            android:layout_marginTop="@dimen/space_default_large"
             android:autofillHints="no"
             android:ellipsize="end"
             android:hint="@string/upload_photo_title_hint"

From 6bc1833986ebe3fe3c4cdbf384237348bb5d0483 Mon Sep 17 00:00:00 2001
From: krrong <khk9664@naver.com>
Date: Wed, 4 Oct 2023 14:05:04 +0900
Subject: [PATCH 09/11] =?UTF-8?q?refactor:=20=EC=9D=B4=EB=AF=B8=EC=A7=80?=
 =?UTF-8?q?=EB=B7=B0=20marginTop=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 android/app/src/main/res/layout/activity_upload.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/app/src/main/res/layout/activity_upload.xml b/android/app/src/main/res/layout/activity_upload.xml
index d024aab3c..c670618f1 100644
--- a/android/app/src/main/res/layout/activity_upload.xml
+++ b/android/app/src/main/res/layout/activity_upload.xml
@@ -59,7 +59,7 @@
             android:id="@+id/iv_upload_photo"
             android:layout_width="300dp"
             android:layout_height="300dp"
-            android:layout_marginTop="@dimen/space_default_medium"
+            android:layout_marginTop="@dimen/space_default_large"
             android:background="@drawable/rect_radius_small"
             android:backgroundTint="@color/white"
             android:scaleType="centerCrop"

From 6485bc11753e48a05af137a5d5e93a65962b8217 Mon Sep 17 00:00:00 2001
From: krrong <khk9664@naver.com>
Date: Wed, 4 Oct 2023 14:13:13 +0900
Subject: [PATCH 10/11] =?UTF-8?q?fix:=20=EB=B2=84=ED=8A=BC=20id=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/app/src/main/res/layout/activity_upload.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/app/src/main/res/layout/activity_upload.xml b/android/app/src/main/res/layout/activity_upload.xml
index c670618f1..bcdce9196 100644
--- a/android/app/src/main/res/layout/activity_upload.xml
+++ b/android/app/src/main/res/layout/activity_upload.xml
@@ -120,7 +120,7 @@
             app:layout_constraintTop_toBottomOf="@id/tv_upload_title"/>
 
         <androidx.appcompat.widget.AppCompatButton
-            android:id="@+id/btn_upload_su경bmit"
+            android:id="@+id/btn_upload_submit"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="@dimen/space_default_large"

From 753094c3f8aa7feb89dd31d8771a0ff8a9a3219a Mon Sep 17 00:00:00 2001
From: krrong <khk9664@naver.com>
Date: Wed, 4 Oct 2023 14:17:37 +0900
Subject: [PATCH 11/11] =?UTF-8?q?refactor:=20=EC=82=AC=EC=9A=A9=ED=95=98?=
 =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8A=94=20=ED=95=A8=EC=88=98=20=EC=82=AD?=
 =?UTF-8?q?=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/now/naaga/presentation/upload/UploadActivity.kt  | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/android/app/src/main/java/com/now/naaga/presentation/upload/UploadActivity.kt b/android/app/src/main/java/com/now/naaga/presentation/upload/UploadActivity.kt
index 0bf2195ab..edeb49175 100644
--- a/android/app/src/main/java/com/now/naaga/presentation/upload/UploadActivity.kt
+++ b/android/app/src/main/java/com/now/naaga/presentation/upload/UploadActivity.kt
@@ -234,10 +234,6 @@ class UploadActivity : AppCompatActivity(), AnalyticsDelegate by DefaultAnalytic
         return viewModel.isFormValid()
     }
 
-    private fun Coordinate.toText(): String {
-        return "$latitude, $longitude"
-    }
-
     companion object {
         private val requestPermissions = listOf(
             Manifest.permission.ACCESS_FINE_LOCATION,