Merge branch 'develop' of https://github.com/team-winey/Winey-AOS int…

…o feature/fix-comment-empty-switch
team-winey · Aug 23, 2023 · cccf775 · cccf775
2 parents 96ed66c + 80da0c9
commit cccf775
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 9 deletions.
diff --git a/app/src/main/java/com/android/go/sopt/winey/presentation/main/MainActivity.kt b/app/src/main/java/com/android/go/sopt/winey/presentation/main/MainActivity.kt
@@ -46,7 +46,13 @@ class MainActivity : BindingActivity<ActivityMainBinding>(R.layout.activity_main
 
     private fun initFragment() {
         if (intent.getBooleanExtra("navigateMypage", false)) {
-            navigateTo<MyPageFragment>()
+            val bundle = Bundle()
+            bundle.putString("fromNoti", "true")
+            val myPageFragment = MyPageFragment()
+            myPageFragment.arguments = bundle
+            val transaction = supportFragmentManager.beginTransaction()
+            transaction.replace(R.id.fcv_main, myPageFragment)
+            transaction.commit()
             binding.bnvMain.selectedItemId = R.id.menu_mypage
         } else {
             navigateTo<WineyFeedFragment>()

diff --git a/app/src/main/java/com/android/go/sopt/winey/presentation/main/mypage/MyPageFragment.kt b/app/src/main/java/com/android/go/sopt/winey/presentation/main/mypage/MyPageFragment.kt
@@ -4,6 +4,7 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import android.view.View
+import androidx.activity.OnBackPressedCallback
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.commit
@@ -17,6 +18,7 @@ import com.android.go.sopt.winey.domain.entity.User
 import com.android.go.sopt.winey.domain.repository.DataStoreRepository
 import com.android.go.sopt.winey.presentation.main.MainViewModel
 import com.android.go.sopt.winey.presentation.main.mypage.myfeed.MyFeedFragment
+import com.android.go.sopt.winey.presentation.main.notification.NotificationActivity
 import com.android.go.sopt.winey.presentation.nickname.NicknameActivity
 import com.android.go.sopt.winey.presentation.onboarding.guide.GuideActivity
 import com.android.go.sopt.winey.util.binding.BindingFragment
@@ -51,10 +53,24 @@ class MyPageFragment : BindingFragment<FragmentMyPageBinding>(R.layout.fragment_
         initLogoutButtonClickListener()
         initWithdrawButtonClickListener()
         initNicknameButtonClickListener()
-
+        requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner, callback)
         setupGetUserState()
         setupDeleteUserState()
     }
+    private val callback = object : OnBackPressedCallback(true) {
+        override fun handleOnBackPressed() {
+            val receivedBundle = arguments
+            if (receivedBundle != null) {
+                val value = receivedBundle.getString("fromNoti")
+                if (value == "true") {
+                    val intent = Intent(requireContext(), NotificationActivity::class.java)
+                    startActivity(intent)
+                    requireActivity().finish()
+                }
+            }
+            requireActivity().finish()
+        }
+    }
 
     // 닉네임 액티비티 갔다가 다시 돌아왔을 때 유저 데이터 갱신하도록
     override fun onStart() {
@@ -182,10 +198,7 @@ class MyPageFragment : BindingFragment<FragmentMyPageBinding>(R.layout.fragment_
 
     private fun initBottomSheetClickListener(data: User?) {
         binding.btnMypageTargetModify.setOnSingleClickListener {
-            val bottomSheet = TargetAmountBottomSheetFragment()
-            bottomSheet.show(this.childFragmentManager, bottomSheet.tag)
-
-            /*when (data.isOver) {
+            when (data?.isOver) {
                 true -> {
                     val bottomSheet = TargetAmountBottomSheetFragment()
                     bottomSheet.show(this.childFragmentManager, bottomSheet.tag)
@@ -195,7 +208,10 @@ class MyPageFragment : BindingFragment<FragmentMyPageBinding>(R.layout.fragment_
                     val dialog = MyPageDialogFragment()
                     dialog.show(this.childFragmentManager, dialog.tag)
                 }
-           }*/
+
+                null -> {
+                }
+            }
         }
     }
 

diff --git a/...ain/java/com/android/go/sopt/winey/presentation/main/notification/NotificationActivity.kt b/...ain/java/com/android/go/sopt/winey/presentation/main/notification/NotificationActivity.kt
@@ -46,7 +46,7 @@ class NotificationActivity :
                 }
 
                 is UiState.Success -> {
-                    notificationAdapter.submitList(state.data)
+                    notificationAdapter.setData(state.data)
                 }
 
                 is UiState.Failure -> {
@@ -73,7 +73,6 @@ class NotificationActivity :
 
     private fun navigateToMypage() {
         val intent = Intent(this, MainActivity::class.java)
-        intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
         intent.putExtra("navigateMypage", true)
         startActivity(intent)
         this.finish()

diff --git a/...main/java/com/android/go/sopt/winey/presentation/main/notification/NotificationAdapter.kt b/...main/java/com/android/go/sopt/winey/presentation/main/notification/NotificationAdapter.kt
@@ -15,6 +15,17 @@ class NotificationAdapter(
 ) :
     ListAdapter<Notification, NotificationAdapter.NotificationViewHolder>(DiffUtil) {
 
+    fun setData(dataList: List<Notification>?) {
+        val filteredDataList = filterData(dataList)
+        submitList(filteredDataList)
+    }
+
+    private fun filterData(dataList: List<Notification>?): List<Notification>? {
+        return dataList?.filterNot { data ->
+            data.notiReceiver.length <= data.notiMessage.length &&
+                data.notiReceiver == data.notiMessage.substring(0, data.notiReceiver.length)
+        }
+    }
     class NotificationViewHolder(
         private val binding: ItemNotificationPostBinding,
         private val navigateFeedDetail: (feedId: Int?) -> Unit,