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

…o feature/mod-levelup-guide-noti

# Conflicts:
#	app/src/main/java/org/go/sopt/winey/presentation/main/MainActivity.kt
#	app/src/main/java/org/go/sopt/winey/presentation/splash/SplashActivity.kt

app/src/main/AndroidManifest.xml

@@ -83,6 +83,10 @@
             android:name=".presentation.main.notification.NotificationActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
+        <activity
+            android:name=".presentation.main.mypage.setting.SettingActivity"
+            android:exported="false"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".presentation.main.mypage.goal.GoalPathActivity"
             android:exported="false"

app/src/main/java/org/go/sopt/winey/presentation/main/MainActivity.kt

@@ -9,9 +9,7 @@ import android.provider.Settings
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.core.content.ContextCompat
-import androidx.fragment.app.Fragment
 import androidx.fragment.app.commit
-import androidx.fragment.app.replace
 import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import dagger.hilt.android.AndroidEntryPoint
@@ -41,7 +39,6 @@ class MainActivity : BindingActivity<ActivityMainBinding>(R.layout.activity_main
     private val isUploadSuccess by lazy { intent.getBooleanExtra(KEY_FEED_UPLOAD, false) }
     private val isDeleteSuccess by lazy { intent.getBooleanExtra(KEY_FEED_DELETE, false) }
 
-    private val prevScreenName by lazy { intent.getStringExtra(KEY_PREV_SCREEN) }
     private val notiType by lazy { intent.getStringExtra(KEY_NOTI_TYPE) }
     private val feedId by lazy { intent.getStringExtra(KEY_FEED_ID) }
 
@@ -125,11 +122,7 @@ class MainActivity : BindingActivity<ActivityMainBinding>(R.layout.activity_main
             return
         }
 
-        if (prevScreenName == MY_FEED_SCREEN) {
-            navigateToMyPageFragment(KEY_TO_MYFEED, true)
-        } else {
-            navigateTo<WineyFeedFragment>()
-        }
+        navigateTo<WineyFeedFragment>()
     }
 
     private fun showWineyFeedResultSnackBar() {
@@ -204,12 +197,6 @@ class MainActivity : BindingActivity<ActivityMainBinding>(R.layout.activity_main
         }
     }
 
-    private inline fun <reified T : Fragment> navigateTo() {
-        supportFragmentManager.commit {
-            replace<T>(R.id.fcv_main, T::class.simpleName)
-        }
-    }
-
     private fun navigateToMyPageFragment(key: String, value: Boolean) {
         supportFragmentManager.commit {
             val bundle = Bundle()
@@ -232,18 +219,20 @@ class MainActivity : BindingActivity<ActivityMainBinding>(R.layout.activity_main
         startActivity(intent)
     }
 
-    companion object {
-        const val KEY_FEED_ID = "feedId"
-        const val KEY_TO_MY_PAGE = "navigateMyPage"
-        const val KEY_FROM_GOAL_PATH = "fromGoalPath"
+    private inline fun <reified T : Fragment> navigateTo() {
+        supportFragmentManager.commit {
+            replace<T>(R.id.fcv_main, T::class.simpleName)
+        }
+    }
 
+    companion object {
         private const val KEY_FEED_UPLOAD = "upload"
         private const val KEY_FEED_DELETE = "delete"
         private const val KEY_NOTI_TYPE = "notiType"
         private const val KEY_FROM_NOTI = "fromNoti"
-        private const val KEY_TO_MYFEED = "toMyFeed"
 
-        private const val KEY_PREV_SCREEN = "PREV_SCREEN_NAME"
-        private const val MY_FEED_SCREEN = "MyFeedFragment"
+        const val KEY_FEED_ID = "feedId"
+        const val KEY_TO_MY_PAGE = "navigateMyPage"
+        const val KEY_FROM_GOAL_PATH = "fromGoalPath"
     }
 }

app/src/main/java/org/go/sopt/winey/presentation/main/MainViewModel.kt

@@ -26,7 +26,7 @@ class MainViewModel @Inject constructor(
     private val dataStoreRepository: DataStoreRepository,
     private val notificationRepository: NotificationRepository
 ) : ViewModel() {
-    private val _getUserState = MutableStateFlow<UiState<UserV2?>>(UiState.Loading)
+    private val _getUserState = MutableStateFlow<UiState<UserV2?>>(UiState.Empty)
     val getUserState: StateFlow<UiState<UserV2?>> = _getUserState.asStateFlow()
 
     private val _logoutState = MutableStateFlow<UiState<ResponseLogoutDto?>>(UiState.Empty)
@@ -44,7 +44,7 @@ class MainViewModel @Inject constructor(
 
             authRepository.getUser()
                 .onSuccess { response ->
-                    Timber.e("SUCCESS GET USER IN MAIN")
+                    Timber.d("SUCCESS GET USER IN MAIN")
                     dataStoreRepository.saveUserInfo(response)
                     _getUserState.value = UiState.Success(response)
                 }
@@ -61,7 +61,7 @@ class MainViewModel @Inject constructor(
         }
     }
 
-    private fun postLogout() {
+    fun postLogout() {
         viewModelScope.launch {
             _logoutState.value = UiState.Loading
 

app/src/main/java/org/go/sopt/winey/presentation/main/feed/WineyFeedFragment.kt

@@ -6,29 +6,26 @@ import android.os.Bundle
 import android.view.View
 import androidx.core.view.isVisible
 import androidx.fragment.app.activityViewModels
-import androidx.fragment.app.commit
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.paging.LoadState
 import androidx.paging.PagingData
 import androidx.recyclerview.widget.ConcatAdapter
 import androidx.recyclerview.widget.SimpleItemAnimator
-import com.google.android.material.bottomnavigation.BottomNavigationView
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import org.go.sopt.winey.R
 import org.go.sopt.winey.databinding.FragmentWineyFeedBinding
+import org.go.sopt.winey.domain.entity.UserV2
 import org.go.sopt.winey.domain.entity.WineyFeed
 import org.go.sopt.winey.domain.repository.DataStoreRepository
 import org.go.sopt.winey.presentation.main.MainViewModel
 import org.go.sopt.winey.presentation.main.feed.detail.DetailActivity
 import org.go.sopt.winey.presentation.main.feed.upload.UploadActivity
-import org.go.sopt.winey.presentation.main.mypage.MyPageFragment
 import org.go.sopt.winey.presentation.main.mypage.goal.GoalPathActivity
 import org.go.sopt.winey.presentation.main.notification.NotificationActivity
 import org.go.sopt.winey.presentation.model.WineyDialogLabel
@@ -60,9 +57,9 @@ class WineyFeedFragment :
     private val viewModel by viewModels<WineyFeedViewModel>()
     private val mainViewModel by activityViewModels<MainViewModel>()
     private lateinit var wineyFeedAdapter: WineyFeedAdapter
-    private lateinit var wineyFeedHeaderAdapter: WineyFeedHeaderAdapter
-    private lateinit var wineyFeedGoalAdapter: WineyFeedGoalAdapter
     private lateinit var wineyFeedLoadAdapter: WineyFeedLoadAdapter
+    private lateinit var wineyFeedHeaderAdapter: WineyFeedHeaderAdapter
+    private var wineyFeedGoalAdapter: WineyFeedGoalAdapter? = null
     private var clickedFeedId = -1
 
     @Inject
@@ -109,7 +106,6 @@ class WineyFeedFragment :
 
     /** Adapter */
     private fun initAdapter() {
-        initGoalAdapter()
         wineyFeedHeaderAdapter = WineyFeedHeaderAdapter(
             onBannerClicked = {
                 navigateToWineyInstagram()
@@ -129,21 +125,16 @@ class WineyFeedFragment :
             }
         )
         wineyFeedLoadAdapter = WineyFeedLoadAdapter()
+        initConcatAdapter()
+    }
 
+    private fun initConcatAdapter() {
         binding.rvWineyfeedPost.adapter = ConcatAdapter(
             wineyFeedHeaderAdapter,
-            wineyFeedGoalAdapter,
             wineyFeedAdapter.withLoadStateFooter(wineyFeedLoadAdapter)
         )
     }
 
-    private fun initGoalAdapter() {
-        viewLifeCycleScope.launch {
-            val user = dataStoreRepository.getUserInfo().firstOrNull() ?: return@launch
-            wineyFeedGoalAdapter = WineyFeedGoalAdapter(requireContext(), user)
-        }
-    }
-
     private fun navigateToWineyInstagram() {
         val url = INSTAGRAM_URL
         val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
@@ -278,13 +269,25 @@ class WineyFeedFragment :
         mainViewModel.getUserState.flowWithLifecycle(viewLifeCycle)
             .onEach { state ->
                 when (state) {
+                    is UiState.Loading -> {
+                        showLoadingProgressBar()
+                    }
+
                     is UiState.Success -> {
-                        // 피드 생성, 삭제에 따라 유저 데이터와 프로그레스바 갱신
                         val userInfo = state.data ?: return@onEach
-                        wineyFeedGoalAdapter.updateProgressBar(userInfo)
+
+                        if (wineyFeedGoalAdapter == null) {
+                            updateConcatAdapter(userInfo)
+                        } else {
+                            // 피드 생성, 삭제에 따라 유저 데이터와 프로그레스바 갱신
+                            wineyFeedGoalAdapter?.updateGoalProgressBar(userInfo)
+                        }
+
+                        dismissLoadingProgressBar()
                     }
 
                     is UiState.Failure -> {
+                        dismissLoadingProgressBar()
                         snackBar(binding.root) { state.msg }
                     }
 
@@ -293,6 +296,25 @@ class WineyFeedFragment :
             }.launchIn(viewLifeCycleScope)
     }
 
+    private fun updateConcatAdapter(user: UserV2) {
+        wineyFeedGoalAdapter = WineyFeedGoalAdapter(requireContext(), user)
+        binding.rvWineyfeedPost.adapter = ConcatAdapter(
+            wineyFeedHeaderAdapter,
+            wineyFeedGoalAdapter,
+            wineyFeedAdapter.withLoadStateFooter(wineyFeedLoadAdapter)
+        )
+    }
+
+    private fun showLoadingProgressBar() {
+        binding.pbWineyfeedLoading.isVisible = true
+        binding.rvWineyfeedPost.isVisible = false
+    }
+
+    private fun dismissLoadingProgressBar() {
+        binding.pbWineyfeedLoading.isVisible = false
+        binding.rvWineyfeedPost.isVisible = true
+    }
+
     private fun initGetWineyFeedListStateObserver() {
         viewModel.getWineyFeedListState.flowWithLifecycle(viewLifeCycle)
             .onEach { state ->
@@ -450,23 +472,6 @@ class WineyFeedFragment :
     }
 
     /** Amplitude Event Tagging */
-    private fun sendDialogClickEvent(isNavigate: Boolean) {
-        val eventProperties = JSONObject()
-
-        try {
-            if (isNavigate) {
-                eventProperties.put("method", "yes")
-            } else {
-                eventProperties.put("method", "no")
-            }
-        } catch (e: JSONException) {
-            System.err.println("Invalid JSON")
-            e.printStackTrace()
-        }
-
-        amplitudeUtils.logEvent("click_goalsetting", eventProperties)
-    }
-
     private fun sendWineyFeedEvent(type: EventType, feed: WineyFeed) {
         val eventProperties = JSONObject()
 
@@ -496,59 +501,18 @@ class WineyFeedFragment :
         }
     }
 
-    private fun showDefaultGoalSettingDialog() {
-        amplitudeUtils.logEvent("view_goalsetting_popup")
-
-        val dialog = WineyDialogFragment.newInstance(
-            WineyDialogLabel(
-                stringOf(R.string.wineyfeed_goal_dialog_title),
-                stringOf(R.string.wineyfeed_goal_dialog_subtitle),
-                stringOf(R.string.wineyfeed_goal_dialog_negative_button),
-                stringOf(R.string.wineyfeed_goal_dialog_positive_button)
-            ),
-            handleNegativeButton = {
-                sendDialogClickEvent(false)
-            },
-            handlePositiveButton = {
-                sendDialogClickEvent(true)
-                navigateToMyPageWithBundle()
-            }
-        )
-
-        activity?.supportFragmentManager?.let { dialog.show(it, TAG_DEFAULT_GOAL_SETTING_DIALOG) }
-    }
-
-    private fun navigateToMyPageWithBundle() {
-        val myPageFragment = MyPageFragment().apply {
-            arguments = Bundle().apply {
-                putBoolean(KEY_FROM_WINEY_FEED, true)
-            }
-        }
-        activity?.supportFragmentManager?.commit {
-            replace(R.id.fcv_main, myPageFragment)
-        }
-        syncBnvSelectedItem()
-    }
-
-    private fun syncBnvSelectedItem() {
-        val bottomNav: BottomNavigationView = requireActivity().findViewById(R.id.bnv_main)
-        bottomNav.selectedItemId = R.id.menu_mypage
-    }
-
     companion object {
         private const val INSTAGRAM_URL =
             "https://instagram.com/winey__official?igshid=MzRlODBiNWFlZA=="
-
         private const val MSG_WINEYFEED_ERROR = "ERROR"
-        private const val TAG_DEFAULT_GOAL_SETTING_DIALOG = "DEFAULT_GOAL_SETTING_DIALOG"
+
         private const val TAG_FEED_DELETE_DIALOG = "FEED_DELETE_DIALOG"
         private const val TAG_FEED_REPORT_DIALOG = "FEED_REPORT_DIALOG"
         private const val TAG_UPLOAD_DIALOG = "UPLOAD_DIALOG"
         private const val TAG_CONGRATULATION_DIALOG = "CONGRATULATION_DIALOG"
 
         private const val KEY_PREV_SCREEN_NAME = "PREV_SCREEN_NAME"
         private const val WINEY_FEED_SCREEN = "WineyFeedFragment"
-        private const val KEY_FROM_WINEY_FEED = "fromWineyFeed"
         private const val KEY_FEED_ID = "feedId"
         private const val KEY_FEED_WRITER_ID = "feedWriterId"
 

app/src/main/java/org/go/sopt/winey/presentation/main/feed/WineyFeedGoalAdapter.kt

@@ -15,7 +15,6 @@ class WineyFeedGoalAdapter(
     private val initialUser: UserV2
 ) : RecyclerView.Adapter<WineyFeedGoalAdapter.WineyFeedGoalViewHolder>() {
     private lateinit var binding: ItemWineyfeedGoalBinding
-    private var isInitialized = false
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): WineyFeedGoalViewHolder {
         binding = ItemWineyfeedGoalBinding.inflate(
@@ -33,18 +32,21 @@ class WineyFeedGoalAdapter(
     override fun getItemCount(): Int = ITEM_COUNT
 
     inner class WineyFeedGoalViewHolder : RecyclerView.ViewHolder(binding.root) {
+        private var isInitialized = false
+
         fun bind() {
             if (!isInitialized) {
                 isInitialized = true
 
-                // 최초 1회만 실행 (아이템 뷰의 재활용에 따라 예전 초기 데이터가 반영되는 문제 해결)
-                updateProgressBar(initialUser)
+                // 초기 유저 데이터로 최초 1회만 바인딩
+                updateGoalProgressBar(initialUser)
             }
         }
     }
 
-    fun updateProgressBar(user: UserV2) {
+    fun updateGoalProgressBar(user: UserV2) {
         if (::binding.isInitialized) {
+            // 피드 생성, 삭제에 따라 바뀌는 유저 데이터 반영
             binding.user = user
             updateProgressBarRate(user)
         }