[FEAT/#66] 설정뷰 / 배송지 등록 진입 API 구현

app/src/main/java/co/orange/ddanzi/di/interceptor/AuthInterceptor.kt

@@ -84,6 +84,6 @@ class AuthInterceptor
             private const val CODE_TOKEN_EXPIRED = 401
             private const val TOKEN_EXPIRED_ERROR = "토큰이 만료되었어요\n다시 로그인 해주세요"
             private const val BEARER = "Bearer"
-            private const val AUTHORIZATION = "Authorization"
+            private const val AUTHORIZATION = "accesstoken"
         }
     }

app/src/main/java/co/orange/ddanzi/di/module/ServiceModule.kt

@@ -43,25 +43,22 @@ object ServiceModule {
         @RetrofitQualifier.NOTOKEN retrofit: Retrofit,
     ): SearchService = retrofit.create(SearchService::class.java)
 
-    // TODO
     @Provides
     @Singleton
     fun provideProfileService(
-        @RetrofitQualifier.NOTOKEN retrofit: Retrofit,
+        @RetrofitQualifier.JWT retrofit: Retrofit,
     ): ProfileService = retrofit.create(ProfileService::class.java)
 
-    // TODO
     @Provides
     @Singleton
     fun provideSettingService(
-        @RetrofitQualifier.NOTOKEN retrofit: Retrofit,
+        @RetrofitQualifier.JWT retrofit: Retrofit,
     ): SettingService = retrofit.create(SettingService::class.java)
 
-    // TODO
     @Provides
     @Singleton
     fun provideInterestService(
-        @RetrofitQualifier.NOTOKEN retrofit: Retrofit,
+        @RetrofitQualifier.JWT retrofit: Retrofit,
     ): InterestService = retrofit.create(InterestService::class.java)
 
     @Provides

data/src/main/java/co/orange/data/dto/response/AddressDto.kt

@@ -8,8 +8,8 @@ import kotlinx.serialization.Serializable
 data class AddressDto(
     @SerialName("addressId")
     val addressId: Long?,
-    @SerialName("name")
-    val name: String?,
+    @SerialName("recipient")
+    val recipient: String?,
     @SerialName("zipCode")
     val zipCode: String?,
     @SerialName("type")
@@ -18,8 +18,8 @@ data class AddressDto(
     val address: String,
     @SerialName("detailAddress")
     val detailAddress: String,
-    @SerialName("phone")
-    val phone: String?,
+    @SerialName("recipientPhone")
+    val recipientPhone: String?,
 ) {
-    fun toModel() = AddressModel(addressId, name, zipCode, type, address, detailAddress, phone)
+    fun toModel() = AddressModel(addressId, recipient, zipCode, type, address, detailAddress, recipientPhone)
 }

data/src/main/java/co/orange/data/dto/response/ProductDetailDto.kt

@@ -26,6 +26,8 @@ data class ProductDetailDto(
     val stockCount: Int,
     @SerialName("infoUrl")
     val infoUrl: String,
+    @SerialName("isInterested")
+    val isInterested: Boolean,
     @SerialName("interestCount")
     val interestCount: Int,
     @SerialName("optionList")
@@ -43,6 +45,7 @@ data class ProductDetailDto(
             salePrice,
             stockCount,
             infoUrl,
+            isInterested,
             interestCount,
             optionList.map { it.toModel() },
         )

data/src/main/java/co/orange/data/dto/response/ProductDto.kt

@@ -18,8 +18,20 @@ data class ProductDto(
     val originPrice: Int,
     @SerialName("salePrice")
     val salePrice: Int,
+    @SerialName("isInterested")
+    val isInterested: Boolean,
     @SerialName("interestCount")
     val interestCount: Int,
 ) {
-    fun toModel() = ProductModel(productId, kakaoProductId, name, imgUrl, originPrice, salePrice, interestCount)
+    fun toModel() =
+        ProductModel(
+            productId,
+            kakaoProductId,
+            name,
+            imgUrl,
+            originPrice,
+            salePrice,
+            isInterested,
+            interestCount,
+        )
 }

domain/src/main/kotlin/co/orange/domain/entity/response/AddressModel.kt

@@ -2,10 +2,10 @@ package co.orange.domain.entity.response
 
 data class AddressModel(
     val addressId: Long?,
-    val name: String?,
+    val recipient: String?,
     val zipCode: String?,
     val type: String?,
     val address: String?,
     val detailAddress: String?,
-    val phone: String?,
+    val recipientPhone: String?,
 )

domain/src/main/kotlin/co/orange/domain/entity/response/ProductDetailModel.kt

@@ -11,6 +11,7 @@ data class ProductDetailModel(
     val salePrice: Int,
     val stockCount: Int,
     val infoUrl: String,
+    val isInterested: Boolean,
     val interestCount: Int,
     val optionList: List<ProductOptionModel>,
 )

domain/src/main/kotlin/co/orange/domain/entity/response/ProductModel.kt

@@ -7,5 +7,6 @@ data class ProductModel(
     val imgUrl: String,
     val originPrice: Int,
     val salePrice: Int,
+    val isInterested: Boolean,
     val interestCount: Int,
 )

presentation/src/main/java/co/orange/presentation/address/AddressViewModel.kt

@@ -33,6 +33,7 @@ class AddressViewModel
         init {
             getUserName()
             getUserPhone()
+            getUserInfoFromServer()
         }
 
         private fun getUserName() {
@@ -54,6 +55,17 @@ class AddressViewModel
                 )
         }
 
+        private fun getUserInfoFromServer() {
+            viewModelScope.launch {
+                settingRepository.getSettingInfo()
+                    .onSuccess {
+                        name.value = it.name
+                        phone.value = it.phone
+                        userRepository.setUserInfo(it.name, it.phone)
+                    }
+            }
+        }
+
         fun postToAddAddressToServer() {
             viewModelScope.launch {
                 settingRepository.postToAddAddress(

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

@@ -117,12 +117,10 @@ class DetailActivity : BaseActivity<ActivityDetailBinding>(R.layout.activity_det
 
     private fun observeLikeState() {
         viewModel.likeState.flowWithLifecycle(lifecycle).distinctUntilChanged().onEach { isLiked ->
-            if (isLiked) {
-                binding.btnLike.setImageResource(R.drawable.ic_like_yellow)
-            } else {
-                binding.btnLike.setImageResource(R.drawable.ic_like_black_unselected)
+            with(binding) {
+                btnLike.isEnabled = isLiked
+                tvDetailLike.text = viewModel.interestCount.setOverThousand()
             }
-            binding.tvDetailLike.text = viewModel.interestCount.setOverThousand()
         }.launchIn(lifecycleScope)
     }
 

presentation/src/main/java/co/orange/presentation/detail/DetailViewModel.kt

@@ -41,6 +41,7 @@ class DetailViewModel
                         infoUrl = it.infoUrl
                         interestCount = it.interestCount
                         optionList = it.optionList
+                        _likeState.value = it.isInterested
                         _getProductDetailState.value = UiState.Success(it)
                     }
                     .onFailure {

presentation/src/main/java/co/orange/presentation/main/home/HomeProductViewHolder.kt

@@ -30,6 +30,7 @@ class HomeProductViewHolder(
             }
             tvHomeItemNowPrice.text = item.salePrice.setNumberForm()
             tvHomeItemLike.text = item.interestCount.setOverThousand()
+            ivHomeItemLike.isEnabled = item.isInterested
         }
     }
 }

presentation/src/main/java/co/orange/presentation/search/SearchItemViewHolder.kt

@@ -25,6 +25,7 @@ class SearchItemViewHolder(
             }
             tvSearchItemNowPrice.text = item.salePrice.setNumberForm()
             tvSearchItemLike.text = item.interestCount.setOverThousand()
+            ivSearchItemLike.isEnabled = item.isInterested
 
             root.setOnSingleClickListener {
                 itemClick(item)

presentation/src/main/java/co/orange/presentation/setting/delivery/DeliveryActivity.kt

@@ -72,15 +72,15 @@ class DeliveryActivity : BaseActivity<ActivityDeliveryBinding>(R.layout.activity
                             if (state.data.addressId != null) {
                                 btnDeliveryAdd.isVisible = false
                                 layoutDeliveryItem.isVisible = true
-                                tvDeliveryName.text = state.data.name
+                                tvDeliveryName.text = state.data.recipient
                                 tvDeliveryAddress.text =
                                     getString(
                                         R.string.address_format,
                                         state.data.zipCode,
                                         state.data.address,
                                         state.data.detailAddress,
                                     ).breakLines()
-                                tvDeliveryPhone.text = state.data.phone
+                                tvDeliveryPhone.text = state.data.recipientPhone
                             }
                         }
                     }

presentation/src/main/java/co/orange/presentation/setting/history/HistoryViewHolder.kt

@@ -25,6 +25,7 @@ class HistoryViewHolder(
             }
             tvHomeItemNowPrice.text = item.salePrice.setNumberForm()
             tvHomeItemLike.text = item.interestCount.setOverThousand()
+            btnItemLike.isEnabled = item.isInterested
 
             root.setOnSingleClickListener {
                 itemClick(item)

presentation/src/main/res/drawable/sel_item_like_yellow.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_like_yellow" android:state_enabled="true" />
+    <item android:drawable="@drawable/ic_like_black_unselected" android:state_enabled="false" />
+</selector>

presentation/src/main/res/layout/activity_detail.xml

@@ -249,7 +249,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:padding="5dp"
-            android:src="@drawable/ic_like_black_unselected"
+            android:src="@drawable/sel_item_like_yellow"
             app:layout_constraintBottom_toTopOf="@id/tv_detail_like"
             app:layout_constraintEnd_toEndOf="@id/tv_detail_like"
             app:layout_constraintStart_toStartOf="@id/tv_detail_like"

presentation/src/main/res/layout/item_search_product.xml

@@ -49,10 +49,11 @@
             app:layout_constraintTop_toTopOf="@id/cv_search_item">
 
             <ImageView
+                android:id="@+id/iv_search_item_like"
                 android:layout_width="10dp"
                 android:layout_height="10dp"
                 android:layout_gravity="center"
-                android:src="@drawable/ic_like_white_unselected" />
+                android:src="@drawable/sel_item_like_yellow" />
 
             <TextView
                 android:id="@+id/tv_search_item_like"