[MERGE] #131 -> develop

[FIX/#131] 2차 QA 이슈 수정 및 반영

app/src/main/AndroidManifest.xml

@@ -44,6 +44,10 @@
             android:exported="false"
             android:screenOrientation="portrait" />
 
+        <activity android:name="co.orange.main.alarm.AlarmActivity"
+            android:exported="false"
+            android:screenOrientation="portrait" />
+
         <activity
             android:name="co.orange.main.alarm.AlarmRequestActivity"
             android:exported="false"

buildSrc/src/main/kotlin/Constants.kt

@@ -3,6 +3,6 @@ object Constants {
     const val compileSdk = 34
     const val minSdk = 28
     const val targetSdk = 34
-    const val versionCode = 5
-    const val versionName = "1.0.2"
+    const val versionCode = 6
+    const val versionName = "1.1.0"
 }

core/src/main/res/values/appearances.xml

@@ -41,7 +41,7 @@
 
     <style name="TextAppearance.DDanzi.Body2">
         <item name="fontFamily">@font/font_pretendard_semibold</item>
-        <item name="android:textSize">18sp</item>
+        <item name="android:textSize">20sp</item>
         <item name="android:paddingVertical">2sp</item>
     </style>
 

core/src/main/res/values/strings.xml

@@ -34,8 +34,8 @@
     <string name="home_btn_sell">판매하기</string>
 
     <string name="ex_item_title">퓨어 오일 퍼퓸 10 ml 긴제목테스트트트트트</string>
-    <string name="ex_item_real_price"><strike>54,000</strike></string>
-    <string name="ex_item_now_price">48,900</string>
+    <string name="ex_item_real_price"><strike>54,000원</strike></string>
+    <string name="ex_item_now_price">48,900원</string>
     <string name="ex_item_like">999+</string>
 
     <string name="alarm_tv_title">알림</string>
@@ -48,7 +48,7 @@
     <string name="detail_tv_percent">%</string>
     <string name="detail_tv_stock">남은 재고</string>
     <string name="detail_tv_stock_unit">개</string>
-    <string name="detail_btn_detail_view"><u>이 상품에 대한 자세한 정보를 보고 싶다면?</u></string>
+    <string name="detail_btn_detail_view">이 상품에 대한 자세한 정보를 보고 싶다면?</string>
     <string name="detail_btn_purchase">구매하기</string>
 
     <string name="option_tv_title">원하는 옵션을 선택해주세요</string>
@@ -240,15 +240,15 @@
     <string name="sign_up_term_tv_first">개인정보 처리방침 (필수)</string>
     <string name="sign_up_term_tv_second">서비스 이용 약관 (필수)</string>
     <string name="sign_up_term_tv_third">마케팅 수신 동의 (선택)</string>
-    <string name="sign_up_term_btn_submit">동의하고 본인 인증하러 가기</string>
+    <string name="sign_up_term_btn_submit">동의하고 본인인증하러 가기</string>
 
     <string name="sign_up_nickname">%1$s님</string>
     <string name="sign_up_confirm_btn_confirm">완료</string>
     <string name="sign_up_confirm_tv_title">환영해요!</string>
 
-    <string name="phone_tv_title">본인 인증을 진행해주세요</string>
-    <string name="phone_tv_subtitle">안전한 딴지 사용을 위해\n본인 인증이 필요해요</string>
-    <string name="phone_btn_auth">본인 인증하러 가기</string>
+    <string name="phone_tv_title">본인인증을 진행해주세요</string>
+    <string name="phone_tv_subtitle">안전한 딴지 사용을 위해\n본인인증이 필요해요</string>
+    <string name="phone_btn_auth">본인인증하러 가기</string>
 
     <string name="profile_history_buy_title">구매 목록</string>
     <string name="profile_history_sell_title">판매 목록</string>

data/src/main/java/co/orange/data/dto/request/SellRegisterRequestDto.kt

@@ -10,12 +10,12 @@ data class SellRegisterRequestDto(
     val productId: String,
     @SerialName("productName")
     val productName: String,
-    @SerialName("dueDate")
-    val dueDate: String,
+    @SerialName("receivedDate")
+    val receivedDate: String,
     @SerialName("registeredImage")
     val registeredImage: String,
 ) {
     companion object {
-        fun SellRegisterRequestModel.toDto() = SellRegisterRequestDto(productId, productName, dueDate, registeredImage)
+        fun SellRegisterRequestModel.toDto() = SellRegisterRequestDto(productId, productName, receivedDate, registeredImage)
     }
 }

data/src/main/java/co/orange/data/service/SellService.kt

@@ -48,7 +48,7 @@ interface SellService {
         @Path("id") orderId: String,
     ): BaseResponse<SellBuyerInfoDto>
 
-    @PATCH("/api/v1/order/{id}/sell")
+    @PATCH("/api/v1/order/{id}/sale")
     suspend fun patchOrderConfirm(
         @Path("id") orderId: String,
     ): BaseResponse<OrderConfirmDto>

domain/src/main/kotlin/co/orange/domain/entity/request/SellRegisterRequestModel.kt

@@ -3,6 +3,6 @@ package co.orange.domain.entity.request
 data class SellRegisterRequestModel(
     val productId: String,
     val productName: String,
-    val dueDate: String,
+    val receivedDate: String,
     val registeredImage: String,
 )

domain/src/main/kotlin/co/orange/domain/enums/ItemStatus.kt

@@ -4,6 +4,8 @@ enum class ItemStatus {
     ON_SALE,
     ORDERED,
     SHIPPING,
+    DELAYED_SHIPPING,
+    WARNING,
     COMPLETED,
     CANCELLED,
 }

feature/auth/build.gradle.kts

@@ -22,12 +22,23 @@ android {
             "IAMPORT_CODE",
             gradleLocalProperties(rootDir).getProperty("iamport.code"),
         )
+    }
 
-        buildConfigField(
-            "String",
-            "MERCHANT_UID",
-            gradleLocalProperties(rootDir).getProperty("merchant.uid"),
-        )
+    buildTypes {
+        debug {
+            buildConfigField(
+                "String",
+                "MERCHANT_UID",
+                gradleLocalProperties(rootDir).getProperty("merchant.test.uid"),
+            )
+        }
+        release {
+            buildConfigField(
+                "String",
+                "MERCHANT_UID",
+                gradleLocalProperties(rootDir).getProperty("merchant.uid"),
+            )
+        }
     }
 
     compileOptions {

feature/buy/build.gradle.kts

@@ -22,12 +22,22 @@ android {
             "IAMPORT_CODE",
             gradleLocalProperties(rootDir).getProperty("iamport.code"),
         )
-
-        buildConfigField(
-            "String",
-            "PAYMENT_UID",
-            gradleLocalProperties(rootDir).getProperty("payment.uid"),
-        )
+    }
+    buildTypes {
+        debug {
+            buildConfigField(
+                "String",
+                "PAYMENT_UID",
+                gradleLocalProperties(rootDir).getProperty("payment.test.uid"),
+            )
+        }
+        release {
+            buildConfigField(
+                "String",
+                "PAYMENT_UID",
+                gradleLocalProperties(rootDir).getProperty("payment.uid"),
+            )
+        }
     }
 
     compileOptions {

feature/buy/src/main/java/co/orange/buy/finished/BuyFinishedActivity.kt

@@ -54,17 +54,13 @@ class BuyFinishedActivity :
     }
 
     private fun initReturnBtnListener() {
-        binding.btnHome.setOnSingleClickListener { navigateToHome() }
+        binding.btnHome.setOnSingleClickListener { navigationManager.toMainViewWIthClearing(this) }
         binding.btnKeepShopping.setOnSingleClickListener {
             AmplitudeManager.trackEvent("click_purchase_adjustment_add")
-            navigateToHome()
+            navigationManager.toMainViewWIthClearing(this)
         }
     }
 
-    private fun navigateToHome() {
-        navigationManager.toMainViewWIthClearing(this)
-    }
-
     private fun initDetailBtnListener() {
         binding.btnShowDetail.setOnSingleClickListener {
             AmplitudeManager.trackEvent("click_purchase_adjustment_check")

feature/buy/src/main/res/layout/activity_buy_finished.xml

@@ -24,8 +24,7 @@
                 style="@style/TextAppearance.DDanzi.Body2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="12dp"
-                android:layout_marginBottom="19dp"
+                android:padding="20dp"
                 android:text="@string/buy_finished_tv_title"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"

feature/buy/src/main/res/layout/activity_buy_info.xml

@@ -24,8 +24,7 @@
                 style="@style/TextAppearance.DDanzi.Body2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="12dp"
-                android:layout_marginBottom="19dp"
+                android:padding="20dp"
                 android:text="@string/buy_info_tv_title"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -112,10 +111,10 @@
                     android:layout_height="0dp"
                     android:layout_marginTop="18dp"
                     android:scaleType="centerCrop"
-                    android:src="@drawable/mock_img_product"
                     app:layout_constraintDimensionRatio="1"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/tv_info_product_title" />
+                    app:layout_constraintTop_toBottomOf="@id/tv_info_product_title"
+                    tools:src="@drawable/mock_img_product" />
 
                 <TextView
                     android:id="@+id/tv_info_product_price"

feature/buy/src/main/res/layout/activity_buy_progress.xml

@@ -29,8 +29,7 @@
                 style="@style/TextAppearance.DDanzi.Body2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="12dp"
-                android:layout_marginBottom="24dp"
+                android:padding="20dp"
                 android:text="@string/buy_confirm_tv_title"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -69,7 +68,6 @@
                     style="@style/TextAppearance.DDanzi.Title4"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="12dp"
                     android:text="@string/confirm_tv_product_title"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"

feature/main/src/main/java/co/orange/main/alarm/AlarmActivity.kt

@@ -68,7 +68,11 @@ class AlarmActivity : BaseActivity<ActivityAlarmBinding>(R.layout.activity_alarm
                         binding.layoutEmpty.isVisible = state.data.alarmList.isEmpty()
                     }
 
-                    is UiState.Failure -> toast(stringOf(co.orange.core.R.string.error_msg))
+                    is UiState.Failure -> {
+                        toast(stringOf(co.orange.core.R.string.error_msg))
+                        binding.layoutEmpty.isVisible = true
+                    }
+
                     else -> return@onEach
                 }
             }.launchIn(lifecycleScope)
@@ -96,10 +100,10 @@ class AlarmActivity : BaseActivity<ActivityAlarmBinding>(R.layout.activity_alarm
             }
 
             in listOf(AlarmType.B2.name, AlarmType.B3.name, AlarmType.B4.name) -> {
-                item.orderId?.let { navigationManager.toSellInfoView(this, it) }
+                item.orderId?.let { navigationManager.toBuyInfoView(this, it) }
             }
 
-            else -> return
+            else -> finish()
         }
     }
 

feature/main/src/main/java/co/orange/main/detail/DetailActivity.kt

@@ -122,6 +122,7 @@ class DetailActivity : BaseActivity<ActivityDetailBinding>(featureR.layout.activ
 
     private fun setProduct(item: ProductDetailModel) {
         with(binding) {
+            layoutDetailBefore.isVisible = false
             tvDetailTitle.text = item.name.breakLines()
             chipsDetailCategory.text = item.category
             chipsDetailOption.isVisible = item.isOptionExist

feature/main/src/main/java/co/orange/main/detail/OptionBottomSheet.kt

@@ -70,6 +70,7 @@ class OptionBottomSheet :
                 viewModel.productId,
                 viewModel.selectedOptionList,
             )
+            dismiss()
         }
     }
 

feature/main/src/main/java/co/orange/main/main/home/HomeFragment.kt

@@ -18,6 +18,7 @@ import co.orange.core.extension.stringOf
 import co.orange.core.extension.toast
 import co.orange.core.navigation.NavigationManager
 import co.orange.core.state.UiState
+import co.orange.main.alarm.AlarmActivity
 import co.orange.main.databinding.FragmentHomeBinding
 import co.orange.main.detail.DetailActivity
 import co.orange.main.main.home.HomeAdapter.Companion.VIEW_TYPE_BANNER
@@ -48,6 +49,7 @@ class HomeFragment() : BaseFragment<FragmentHomeBinding>(featureR.layout.fragmen
 
         initAdapter()
         initSearchBtnListener()
+        initAlarmBtnListener()
         initSellBtnListener()
         setDeviceToken()
         setGridRecyclerView()
@@ -102,6 +104,12 @@ class HomeFragment() : BaseFragment<FragmentHomeBinding>(featureR.layout.fragmen
         }
     }
 
+    private fun initAlarmBtnListener() {
+        binding.btnAlarm.setOnSingleClickListener {
+            startActivity(Intent(requireContext(), AlarmActivity::class.java))
+        }
+    }
+
     private fun initSellBtnListener() {
         binding.btnSell.setOnSingleClickListener {
             AmplitudeManager.trackEvent("click_home_sell")

feature/main/src/main/res/layout/activity_alarm.xml

@@ -26,8 +26,8 @@
             android:id="@+id/tv_alarm_title"
             style="@style/TextAppearance.DDanzi.Body2"
             android:layout_width="wrap_content"
+            android:padding="20dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
             android:text="@string/alarm_tv_title"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -37,11 +37,10 @@
             android:id="@+id/border_alarm"
             android:layout_width="0dp"
             android:layout_height="7dp"
-            android:layout_marginTop="2dp"
             android:background="@color/background_gray"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btn_back" />
+            app:layout_constraintTop_toBottomOf="@id/tv_alarm_title" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rv_alarm"