feat: 마이페이지 개편(parent issue)

app/src/main/java/com/into/websoso/data/mapper/UserMapper.kt

@@ -23,7 +23,7 @@ import com.into.websoso.data.remote.response.UserFeedsResponseDto.UserFeedRespon
 import com.into.websoso.data.remote.response.UserInfoDetailResponseDto
 import com.into.websoso.data.remote.response.UserInfoResponseDto
 import com.into.websoso.data.remote.response.UserNovelStatsResponseDto
-import com.into.websoso.ui.main.myPage.myActivity.model.Genres
+import com.into.websoso.ui.main.myPage.model.Genres
 
 fun UserInfoResponseDto.toData(): UserInfoEntity =
     UserInfoEntity(

app/src/main/java/com/into/websoso/ui/activityDetail/ActivityDetailActivity.kt

@@ -24,7 +24,6 @@ import com.into.websoso.core.common.util.showWebsosoSnackBar
 import com.into.websoso.core.resource.R.drawable.ic_blocked_user_snack_bar
 import com.into.websoso.core.resource.R.string.block_user_success_message
 import com.into.websoso.core.resource.R.string.feed_removed_feed_snackbar
-import com.into.websoso.core.resource.R.string.my_activity_detail_title
 import com.into.websoso.core.resource.R.string.other_user_page_activity
 import com.into.websoso.databinding.ActivityActivityDetailBinding
 import com.into.websoso.databinding.MenuMyActivityPopupBinding
@@ -39,12 +38,11 @@ import com.into.websoso.ui.main.feed.dialog.FeedReportDoneDialogFragment
 import com.into.websoso.ui.main.feed.dialog.RemoveMenuType
 import com.into.websoso.ui.main.feed.dialog.ReportMenuType.IMPERTINENCE_FEED
 import com.into.websoso.ui.main.feed.dialog.ReportMenuType.SPOILER_FEED
+import com.into.websoso.ui.main.myPage.ActivityItemClickListener
 import com.into.websoso.ui.main.myPage.MyPageViewModel
-import com.into.websoso.ui.main.myPage.myActivity.ActivityItemClickListener
-import com.into.websoso.ui.main.myPage.myActivity.MyActivityFragment
-import com.into.websoso.ui.main.myPage.myActivity.model.ActivitiesModel
-import com.into.websoso.ui.main.myPage.myActivity.model.UserActivityModel
-import com.into.websoso.ui.main.myPage.myActivity.model.UserProfileModel
+import com.into.websoso.ui.main.myPage.model.ActivitiesModel
+import com.into.websoso.ui.main.myPage.model.UserActivityModel
+import com.into.websoso.ui.main.myPage.model.UserProfileModel
 import com.into.websoso.ui.mapper.toUserProfileModel
 import com.into.websoso.ui.novelDetail.NovelDetailActivity
 import com.into.websoso.ui.otherUserPage.BlockUserDialogFragment.Companion.USER_NICKNAME
@@ -61,9 +59,6 @@ class ActivityDetailActivity : BaseActivity<ActivityActivityDetailBinding>(activ
     }
     private val myPageViewModel: MyPageViewModel by viewModels()
     private val otherUserPageViewModel: OtherUserPageViewModel by viewModels()
-    private val source: String by lazy {
-        intent.getStringExtra(MyActivityFragment.EXTRA_SOURCE) ?: ""
-    }
     private val userId: Long by lazy { intent.getLongExtra(USER_ID_KEY, DEFAULT_USER_ID) }
     private var _popupWindow: PopupWindow? = null
     private lateinit var activityResultCallback: ActivityResultLauncher<Intent>
@@ -109,22 +104,12 @@ class ActivityDetailActivity : BaseActivity<ActivityActivityDetailBinding>(activ
     }
 
     private fun setupUserIDAndSource() {
-        activityDetailViewModel.source = source
         activityDetailViewModel.userId = userId
-
-        if (source == SOURCE_OTHER_USER_ACTIVITY) {
-            otherUserPageViewModel.updateUserId(userId)
-        }
-
         activityDetailViewModel.updateUserActivities(userId)
     }
 
     private fun setActivityTitle() {
-        binding.tvActivityDetailTitle.text = when (source) {
-            SOURCE_MY_ACTIVITY -> getString(my_activity_detail_title)
-            SOURCE_OTHER_USER_ACTIVITY -> getString(other_user_page_activity)
-            else -> ""
-        }
+        binding.tvActivityDetailTitle.text = getString(other_user_page_activity)
     }
 
     private fun setupMyActivitiesDetailAdapter() {
@@ -191,7 +176,9 @@ class ActivityDetailActivity : BaseActivity<ActivityActivityDetailBinding>(activ
                     ?.toUserProfileModel()
             }
 
-            else -> null
+            else -> {
+                null
+            }
         }
 
     private fun onBackButtonClick() {
@@ -249,11 +236,7 @@ class ActivityDetailActivity : BaseActivity<ActivityActivityDetailBinding>(activ
         feedId: Long,
     ) {
         val inflater = LayoutInflater.from(this)
-        val binding = when (source) {
-            SOURCE_MY_ACTIVITY -> MenuMyActivityPopupBinding.inflate(inflater)
-            SOURCE_OTHER_USER_ACTIVITY -> MenuOtherUserActivityPopupBinding.inflate(inflater)
-            else -> return
-        }
+        val binding = MenuOtherUserActivityPopupBinding.inflate(inflater)
 
         _popupWindow?.dismiss()
         _popupWindow = PopupWindow(binding.root, WRAP_CONTENT, WRAP_CONTENT, true).apply {
@@ -329,11 +312,13 @@ class ActivityDetailActivity : BaseActivity<ActivityActivityDetailBinding>(activ
             menuType = menuType,
             event = {
                 when (menuType) {
-                    SPOILER_FEED.name ->
+                    SPOILER_FEED.name -> {
                         activityDetailViewModel.updateReportedSpoilerFeed(feedId)
+                    }
 
-                    IMPERTINENCE_FEED.name ->
+                    IMPERTINENCE_FEED.name -> {
                         activityDetailViewModel.updateReportedImpertinenceFeed(feedId)
+                    }
                 }
                 showReportDoneDialog(menuType)
             },

app/src/main/java/com/into/websoso/ui/activityDetail/ActivityDetailViewModel.kt

@@ -9,7 +9,7 @@ import com.into.websoso.data.repository.FeedRepository
 import com.into.websoso.data.repository.UserRepository
 import com.into.websoso.ui.activityDetail.ActivityDetailActivity.Companion.SOURCE_MY_ACTIVITY
 import com.into.websoso.ui.activityDetail.model.ActivityDetailUiState
-import com.into.websoso.ui.main.myPage.myActivity.model.ActivityLikeState
+import com.into.websoso.ui.main.myPage.model.ActivityLikeState
 import com.into.websoso.ui.mapper.toUi
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch

app/src/main/java/com/into/websoso/ui/activityDetail/adapter/ActivityDetailAdapter.kt

@@ -5,8 +5,8 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import com.into.websoso.databinding.ItemMyActivityBinding
-import com.into.websoso.ui.main.myPage.myActivity.ActivityItemClickListener
-import com.into.websoso.ui.main.myPage.myActivity.model.UserActivityModel
+import com.into.websoso.ui.main.myPage.ActivityItemClickListener
+import com.into.websoso.ui.main.myPage.model.UserActivityModel
 
 class ActivityDetailAdapter(
     private val activityItemClickListener: ActivityItemClickListener,

app/src/main/java/com/into/websoso/ui/activityDetail/adapter/ActivityDetailViewHolder.kt

@@ -5,8 +5,8 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.into.websoso.core.common.util.getS3ImageUrl
 import com.into.websoso.databinding.ItemMyActivityBinding
-import com.into.websoso.ui.main.myPage.myActivity.ActivityItemClickListener
-import com.into.websoso.ui.main.myPage.myActivity.model.UserActivityModel
+import com.into.websoso.ui.main.myPage.ActivityItemClickListener
+import com.into.websoso.ui.main.myPage.model.UserActivityModel
 
 class ActivityDetailViewHolder(
     private val binding: ItemMyActivityBinding,

app/src/main/java/com/into/websoso/ui/activityDetail/model/ActivityDetailUiState.kt

@@ -1,6 +1,6 @@
 package com.into.websoso.ui.activityDetail.model
 
-import com.into.websoso.ui.main.myPage.myActivity.model.ActivitiesModel
+import com.into.websoso.ui.main.myPage.model.ActivitiesModel
 
 data class ActivityDetailUiState(
     val isLoading: Boolean = false,

app/src/main/java/com/into/websoso/ui/main/home/adpater/PopularFeedsAdapter.kt

@@ -1,5 +1,6 @@
 package com.into.websoso.ui.main.home.adpater
 
+import android.annotation.SuppressLint
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.DiffUtil
@@ -33,6 +34,7 @@ class PopularFeedsAdapter(
                 newItem: List<PopularFeedEntity>,
             ): Boolean = oldItem.firstOrNull()?.feedId == newItem.firstOrNull()?.feedId
 
+            @SuppressLint("DiffUtilEquals")
             override fun areContentsTheSame(
                 oldItem: List<PopularFeedEntity>,
                 newItem: List<PopularFeedEntity>,

app/src/main/java/com/into/websoso/ui/main/myPage/myActivity/ActivityItemClickListener.kt → app/src/main/java/com/into/websoso/ui/main/myPage/ActivityItemClickListener.kt

@@ -1,4 +1,4 @@
-package com.into.websoso.ui.main.myPage.myActivity
+package com.into.websoso.ui.main.myPage
 
 import android.view.View
 

app/src/main/java/com/into/websoso/ui/main/myPage/myLibrary/MyLibraryViewModel.kt → app/src/main/java/com/into/websoso/ui/main/myPage/MyLibraryViewModel.kt

@@ -1,12 +1,12 @@
-package com.into.websoso.ui.main.myPage.myLibrary
+package com.into.websoso.ui.main.myPage
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.into.websoso.data.repository.UserRepository
-import com.into.websoso.ui.main.myPage.myLibrary.model.AttractivePoints
-import com.into.websoso.ui.main.myPage.myLibrary.model.MyLibraryUiState
+import com.into.websoso.ui.main.myPage.model.AttractivePoints
+import com.into.websoso.ui.main.myPage.model.MyLibraryUiState
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
 import javax.inject.Inject
@@ -115,7 +115,7 @@ class MyLibraryViewModel
 
         private fun translateAttractivePoints(attractivePoints: List<String>): List<String> =
             attractivePoints.mapNotNull { point ->
-                AttractivePoints.fromString(point)?.korean
+                AttractivePoints.Companion.fromString(point)?.korean
             }
 
         companion object {