[MERGE] : develop -> #374

team-yello · Feb 7, 2024 · 0bdb1e1 · 0bdb1e1
2 parents 4050ca2 + 5d91aab
commit 0bdb1e1
Show file tree

Hide file tree

Showing 11 changed files with 107 additions and 10 deletions.
diff --git a/app/src/main/java/com/el/yello/presentation/main/profile/ProfileViewModel.kt b/app/src/main/java/com/el/yello/presentation/main/profile/ProfileViewModel.kt
@@ -1,7 +1,6 @@
 package com.el.yello.presentation.main.profile
 
 import android.content.Context
-import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
@@ -12,7 +11,9 @@ import com.example.domain.entity.PayInfoModel
 import com.example.domain.entity.ProfileFriendsListModel
 import com.example.domain.entity.ProfileQuitReasonModel
 import com.example.domain.entity.ProfileUserModel
+import com.example.domain.entity.notice.ProfileBanner
 import com.example.domain.repository.AuthRepository
+import com.example.domain.repository.NoticeRepository
 import com.example.domain.repository.PayRepository
 import com.example.domain.repository.ProfileRepository
 import com.example.ui.view.UiState
@@ -32,6 +33,7 @@ class ProfileViewModel @Inject constructor(
     private val profileRepository: ProfileRepository,
     private val authRepository: AuthRepository,
     private val payRepository: PayRepository,
+    private val noticeRepository: NoticeRepository
 ) : ViewModel() {
 
     init {
@@ -41,7 +43,8 @@ class ProfileViewModel @Inject constructor(
     private val _getUserDataResult = MutableSharedFlow<Boolean>()
     val getUserDataResult: SharedFlow<Boolean> = _getUserDataResult
 
-    private val _getFriendListState = MutableStateFlow<UiState<ProfileFriendsListModel>>(UiState.Empty)
+    private val _getFriendListState =
+        MutableStateFlow<UiState<ProfileFriendsListModel>>(UiState.Empty)
     val getFriendListState: StateFlow<UiState<ProfileFriendsListModel>> = _getFriendListState
 
     private val _deleteUserState = MutableStateFlow<UiState<Unit>>(UiState.Empty)
@@ -79,12 +82,20 @@ class ProfileViewModel @Inject constructor(
     val etcText = MutableLiveData("")
     private val _quitReasonData: MutableLiveData<List<String>> = MutableLiveData()
     val quitReasonData: LiveData<List<String>> = _quitReasonData
+
+    private val _getBannerResult = MutableSharedFlow<Boolean>()
+    val getBannerResult: SharedFlow<Boolean> = _getBannerResult
+
+    var profileBanner = ProfileBanner()
+
     fun setEtcText(etc: String) {
         etcText.value = etc
     }
+
     fun setQuitReason(reason: String) {
         quitReasonText.value = reason
     }
+
     fun addQuitReasonList(context: Context) {
         val quitReasonArray = context.resources.getStringArray(R.array.quit_reasons)
         _quitReasonData.value = quitReasonArray.toList()
@@ -112,6 +123,7 @@ class ProfileViewModel @Inject constructor(
         _getFriendListState.value = UiState.Empty
         _getPurchaseInfoState.value = UiState.Empty
         _getUserDataResult.resetReplayCache()
+        _getBannerResult.resetReplayCache()
     }
 
     fun getUserDataFromServer() {
@@ -229,6 +241,19 @@ class ProfileViewModel @Inject constructor(
         }
     }
 
+    fun getProfileBannerFromServer() {
+        viewModelScope.launch {
+            noticeRepository.getProfileBanner()
+                .onSuccess { banner ->
+                    profileBanner = banner ?: return@launch
+                    _getBannerResult.emit(true)
+                }
+                .onFailure {
+                    _getBannerResult.emit(false)
+                }
+        }
+    }
+
     private fun clearLocalInfo() {
         authRepository.clearLocalPref()
     }

diff --git a/app/src/main/java/com/el/yello/presentation/main/profile/info/ProfileFragment.kt b/app/src/main/java/com/el/yello/presentation/main/profile/info/ProfileFragment.kt
@@ -1,5 +1,7 @@
 package com.el.yello.presentation.main.profile.info
 
+import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import android.view.View
 import android.view.animation.AnimationUtils
@@ -60,6 +62,7 @@ class ProfileFragment : BindingFragment<FragmentProfileBinding>(R.layout.fragmen
         observeFriendsDataState()
         observeFriendDeleteState()
         observeCheckIsSubscribed()
+        observeGetBannerState()
         AmplitudeUtils.trackEventWithProperties("view_profile")
     }
 
@@ -113,6 +116,7 @@ class ProfileFragment : BindingFragment<FragmentProfileBinding>(R.layout.fragmen
             },
             shopClick = { initShopClickListener() },
             modClick = { initProfileModClickListener() },
+            bannerClick = { redirectUrl -> initProfileBannerClickListener(redirectUrl) }
         )
         binding.rvProfileFriendsList.adapter = adapter
     }
@@ -143,6 +147,10 @@ class ProfileFragment : BindingFragment<FragmentProfileBinding>(R.layout.fragmen
         viewModel.resetStateVariable()
     }
 
+    private fun initProfileBannerClickListener(redirectUrl: String) {
+        startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(redirectUrl)))
+    }
+
     private fun initPullToScrollListener() {
         binding.layoutProfileSwipe.apply {
             setOnRefreshListener {
@@ -163,7 +171,7 @@ class ProfileFragment : BindingFragment<FragmentProfileBinding>(R.layout.fragmen
             resetStateVariable()
             getPurchaseInfoFromServer()
             getUserDataFromServer()
-            getFriendsListFromServer()
+            getProfileBannerFromServer()
         }
     }
 
@@ -259,6 +267,15 @@ class ProfileFragment : BindingFragment<FragmentProfileBinding>(R.layout.fragmen
         }.launchIn(lifecycleScope)
     }
 
+    private fun observeGetBannerState() {
+        viewModel.getBannerResult.flowWithLifecycle(lifecycle).onEach { result ->
+            if (!result) {
+                yelloSnackbar(binding.root, getString(R.string.my_yello_get_banner_failure))
+            }
+            viewModel.getFriendsListFromServer()
+        }.launchIn(lifecycleScope)
+    }
+
     private fun setDeleteAnimation() {
         binding.rvProfileFriendsList.itemAnimator = object : DefaultItemAnimator() {
             override fun animateRemove(holder: RecyclerView.ViewHolder): Boolean {

diff --git a/app/src/main/java/com/el/yello/presentation/main/profile/info/ProfileFriendAdapter.kt b/app/src/main/java/com/el/yello/presentation/main/profile/info/ProfileFriendAdapter.kt
@@ -16,6 +16,7 @@ class ProfileFriendAdapter(
     private val itemClick: (ProfileUserModel, Int) -> (Unit),
     private val shopClick: (Unit) -> (Unit),
     private val modClick: (Unit) -> (Unit),
+    private val bannerClick: (String) -> (Unit),
 ) : ListAdapter<ProfileUserModel, RecyclerView.ViewHolder>(diffUtil) {
 
     private var itemList = mutableListOf<ProfileUserModel>()
@@ -27,7 +28,8 @@ class ProfileFriendAdapter(
             VIEW_TYPE_USER_INFO -> ProfileUserInfoViewHolder(
                 ItemProfileUserInfoBinding.inflate(inflater, parent, false),
                 shopClick,
-                modClick
+                modClick,
+                bannerClick
             )
 
             VIEW_TYPE_FRIENDS_LIST -> ProfileListInfoViewHolder(

diff --git a/app/src/main/java/com/el/yello/presentation/main/profile/info/ProfileUserInfoViewHolder.kt b/app/src/main/java/com/el/yello/presentation/main/profile/info/ProfileUserInfoViewHolder.kt
@@ -2,15 +2,17 @@ package com.el.yello.presentation.main.profile.info
 
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView
+import coil.load
 import com.el.yello.databinding.ItemProfileUserInfoBinding
 import com.el.yello.presentation.main.profile.ProfileViewModel
 import com.el.yello.util.Utils.setImageOrBasicThumbnail
 import com.example.ui.view.setOnSingleClickListener
 
 class ProfileUserInfoViewHolder(
     val binding: ItemProfileUserInfoBinding,
-    val shopClick: (Unit) -> (Unit),
-    val modClick: (Unit) -> (Unit),
+    private val shopClick: (Unit) -> (Unit),
+    private val modClick: (Unit) -> (Unit),
+    private val bannerClick: (String) -> (Unit)
 ) : RecyclerView.ViewHolder(binding.root) {
 
     fun onBind(viewModel: ProfileViewModel) {
@@ -25,6 +27,13 @@ class ProfileUserInfoViewHolder(
             btnPrifileMod.setOnSingleClickListener { modClick(Unit) }
 
             ivProfileInfoThumbnail.setImageOrBasicThumbnail(viewModel.myUserData.profileImageUrl)
+
+            ivProfileBanner.isVisible = viewModel.profileBanner.isAvailable
+        }
+
+        if (viewModel.profileBanner.isAvailable) {
+            binding.ivProfileBanner.load(viewModel.profileBanner.imageUrl)
+            binding.ivProfileBanner.setOnSingleClickListener { bannerClick(viewModel.profileBanner.redirectUrl) }
         }
     }
 }
diff --git a/app/src/main/res/layout/item_profile_user_info.xml b/app/src/main/res/layout/item_profile_user_info.xml
@@ -301,17 +301,31 @@
 
         </LinearLayout>
 
+        <ImageView
+            android:id="@+id/iv_profile_banner"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="16dp"
+            android:layout_marginTop="10dp"
+            android:adjustViewBounds="true"
+            android:visibility="gone"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/btn_profile_shop"
+            tools:src="@drawable/ic_pay_under_first"
+            tools:visibility="visible" />
+
         <TextView
             android:id="@+id/tv_profile_friend_list_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-            android:layout_marginTop="40dp"
+            android:layout_marginTop="14dp"
             android:text="@string/profile_user_info_friends_list_title"
             android:textAppearance="?textAppearanceSubtitle2"
             android:textColor="@color/white"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/btn_profile_shop" />
+            app:layout_constraintTop_toBottomOf="@id/iv_profile_banner" />
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="wrap_content"
@@ -337,8 +351,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="2dp"
-                android:layout_marginBottom="1dp"
                 android:layout_marginEnd="1dp"
+                android:layout_marginBottom="1dp"
                 android:fontFamily="@font/pretendard_bold"
                 android:text="@{@string/to_string(vm.myFriendCount)}"
                 android:textColor="@color/white"

diff --git a/data/src/main/java/com/example/data/datasource/NoticeDataSource.kt b/data/src/main/java/com/example/data/datasource/NoticeDataSource.kt
@@ -7,4 +7,6 @@ interface NoticeDataSource {
     suspend fun getNotice(): BaseResponse<ResponseGetNoticeDto>
 
     suspend fun getBanner(): BaseResponse<ResponseGetNoticeDto>
+
+    suspend fun getProfileBanner(): BaseResponse<ResponseGetNoticeDto>
 }
diff --git a/data/src/main/java/com/example/data/datasource/remote/NoticeDataSourceImpl.kt b/data/src/main/java/com/example/data/datasource/remote/NoticeDataSourceImpl.kt
@@ -15,8 +15,12 @@ class NoticeDataSourceImpl @Inject constructor(
     override suspend fun getBanner(): BaseResponse<ResponseGetNoticeDto> =
         service.getNotice(TAG_BANNER)
 
+    override suspend fun getProfileBanner(): BaseResponse<ResponseGetNoticeDto> =
+        service.getNotice(TAG_PROFILE_BANNER)
+
     companion object {
         private const val TAG_NOTICE = "NOTICE"
         private const val TAG_BANNER = "BANNER"
+        private const val TAG_PROFILE_BANNER = "PROFILE-BANNER"
     }
 }
diff --git a/data/src/main/java/com/example/data/model/response/notice/ResponseGetNotice.kt b/data/src/main/java/com/example/data/model/response/notice/ResponseGetNotice.kt
@@ -2,6 +2,7 @@ package com.example.data.model.response.notice
 
 import com.example.domain.entity.notice.Banner
 import com.example.domain.entity.notice.Notice
+import com.example.domain.entity.notice.ProfileBanner
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -33,4 +34,10 @@ data class ResponseGetNoticeDto(
         redirectUrl = redirectUrl,
         isAvailable = isAvailable,
     )
+
+    fun toProfileBanner() : ProfileBanner = ProfileBanner(
+        imageUrl = imageUrl,
+        redirectUrl = redirectUrl,
+        isAvailable = isAvailable
+    )
 }
diff --git a/data/src/main/java/com/example/data/repository/NoticeRepositoryImpl.kt b/data/src/main/java/com/example/data/repository/NoticeRepositoryImpl.kt
@@ -4,6 +4,7 @@ import com.example.data.datasource.NoticeDataSource
 import com.example.domain.YelloDataStore
 import com.example.domain.entity.notice.Banner
 import com.example.domain.entity.notice.Notice
+import com.example.domain.entity.notice.ProfileBanner
 import com.example.domain.repository.NoticeRepository
 import javax.inject.Inject
 
@@ -15,10 +16,14 @@ class NoticeRepositoryImpl @Inject constructor(
         dataSource.getNotice().data?.toNotice()
     }
 
-    override suspend fun getBanner(): Result<Banner?> = kotlin.runCatching {
+    override suspend fun getBanner(): Result<Banner?> = runCatching {
         dataSource.getBanner().data?.toBanner()
     }
 
+    override suspend fun getProfileBanner(): Result<ProfileBanner?> = runCatching {
+        dataSource.getProfileBanner().data?.toProfileBanner()
+    }
+
     override fun isDisabledNoticeUrl(url: String): Boolean =
         yelloDataStore.disabledNoticeUrl == url
 

diff --git a/domain/src/main/java/com/example/domain/entity/notice/ProfileBanner.kt b/domain/src/main/java/com/example/domain/entity/notice/ProfileBanner.kt
@@ -0,0 +1,9 @@
+package com.example.domain.entity.notice
+
+data class ProfileBanner(
+    val imageUrl: String,
+    val redirectUrl: String,
+    val isAvailable: Boolean,
+) {
+    constructor() : this("","",false)
+}
diff --git a/domain/src/main/java/com/example/domain/repository/NoticeRepository.kt b/domain/src/main/java/com/example/domain/repository/NoticeRepository.kt
@@ -2,12 +2,15 @@ package com.example.domain.repository
 
 import com.example.domain.entity.notice.Banner
 import com.example.domain.entity.notice.Notice
+import com.example.domain.entity.notice.ProfileBanner
 
 interface NoticeRepository {
     suspend fun getNotice(): Result<Notice?>
 
     suspend fun getBanner(): Result<Banner?>
 
+    suspend fun getProfileBanner(): Result<ProfileBanner?>
+
     fun isDisabledNoticeUrl(url: String): Boolean
 
     fun setDisabledNoticeUrl(url: String)