Merge pull request #62 from boostcampwm-2022/feature/moment-list

모먼트 리스트 스크롤 이슈 해결 및 상세 페이지 이동

Author: jaemin-Yoo

.github/workflows/android-cd.yml

@@ -42,7 +42,7 @@ jobs:
           appId: ${{secrets.FIREBASE_APP_ID}}
           serviceCredentialsFileContent: ${{ secrets.CREDENTIAL_FILE_CONTENT }}
           groups: mogle-testers
-          file: app/build/outputs/apk/release/app-release-unsigned.apk
+          file: app/build/outputs/apk/debug/app-debug.apk
 
       - name: action-slack
         uses: 8398a7/action-slack@v3.14.0

presentation/src/main/java/com/wakeup/presentation/adapter/BindingAdapters.kt

@@ -33,9 +33,9 @@ fun bindImageBitmap(view: ImageView, bitmap: Bitmap?) {
     view.setImageBitmap(bitmap)
 }
 
-@BindingAdapter("gone")
-fun bindGone(view: View, shouldBeGone: Boolean) {
-    view.visibility = if (shouldBeGone) {
+@BindingAdapter("isGone")
+fun bindGone(view: View, isGone: Boolean) {
+    view.visibility = if (isGone) {
         View.GONE
     } else {
         View.VISIBLE

presentation/src/main/java/com/wakeup/presentation/adapter/MomentPagingAdapter.kt

@@ -1,15 +1,19 @@
 package com.wakeup.presentation.adapter
 
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import androidx.databinding.DataBindingUtil
+import androidx.navigation.findNavController
+import androidx.navigation.fragment.findNavController
 import androidx.paging.PagingDataAdapter
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import com.wakeup.presentation.R
 import com.wakeup.presentation.databinding.ItemMomentBinding
 import com.wakeup.presentation.model.MomentModel
+import com.wakeup.presentation.ui.map.MapFragmentDirections
 import timber.log.Timber
 
 class MomentPagingAdapter :
@@ -37,12 +41,19 @@ class MomentPagingAdapter :
         private val binding: ItemMomentBinding
     ) : RecyclerView.ViewHolder(binding.root) {
         init {
-            itemView.setOnClickListener {
-                // TODO: 모먼트 페이지 이동
-                Timber.d("모먼트 클릭")
+            itemView.setOnClickListener { view ->
+                binding.moment?.let { moment ->
+                    navigateToMoment(moment, view)
+                }
             }
         }
 
+        private fun navigateToMoment(moment: MomentModel, view: View) {
+            val direction =
+                MapFragmentDirections.actionMapFragmentToMomentDetailFragment(moment)
+            view.findNavController().navigate(direction)
+        }
+
         fun bind(moment: MomentModel) {
             with(binding) {
                 this.moment = moment

presentation/src/main/java/com/wakeup/presentation/ui/detail/MomentDetailFragment.kt

@@ -7,13 +7,15 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
+import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import androidx.viewpager2.widget.ViewPager2.OnPageChangeCallback
 import androidx.viewpager2.widget.ViewPager2.SCROLL_STATE_DRAGGING
 import androidx.viewpager2.widget.ViewPager2.SCROLL_STATE_IDLE
 import com.wakeup.presentation.R
 import com.wakeup.presentation.adapter.DetailPictureAdapter
 import com.wakeup.presentation.databinding.FragmentMomentDetailBinding
+import com.wakeup.presentation.util.setToolbar
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -43,12 +45,21 @@ class MomentDetailFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        initToolbar()
         initAnimator()
         initViewPagerAdapter()
         initMoment()
         collectPageChangedFlow()
     }
 
+    private fun initToolbar() {
+        setToolbar(
+            toolbar = binding.tbDetailMoment,
+            titleId = R.string.moment,
+            onBackClick = { findNavController().navigateUp() }
+        )
+    }
+
     private fun initAnimator() {
         indicatorAnimator =
             ObjectAnimator.ofFloat(binding.tvIndicator, ALPHA_PROPERTY, START_ALPHA, END_ALPHA)

presentation/src/main/java/com/wakeup/presentation/ui/map/MapFragment.kt

@@ -13,6 +13,8 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import androidx.navigation.fragment.findNavController
+import androidx.paging.map
+import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.textfield.MaterialAutoCompleteTextView
@@ -43,6 +45,13 @@ class MapFragment : Fragment(), OnMapReadyCallback {
     private lateinit var locationSource: FusedLocationSource
     private lateinit var mapHelper: MapHelper
 
+    private val adapterDataObserver = object : RecyclerView.AdapterDataObserver() {
+        override fun onItemRangeMoved(fromPosition: Int, toPosition: Int, itemCount: Int) {
+            super.onItemRangeMoved(fromPosition, toPosition, itemCount)
+            binding.bottomSheet.rvMoments.scrollToPosition(0)
+        }
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?,
@@ -58,10 +67,19 @@ class MapFragment : Fragment(), OnMapReadyCallback {
         initMap()
         initLocation()
         initBottomSheet()
-        initTestButton()
+        setAdapterListener()
 
         collectMoments()
         updateMoments()
+
+    }
+
+    private fun setAdapterListener() {
+        momentAdapter.registerAdapterDataObserver(adapterDataObserver)
+
+        momentAdapter.addLoadStateListener {
+            binding.bottomSheet.hasMoments = momentAdapter.itemCount > 0
+        }
     }
 
     private fun updateMoments() {
@@ -90,20 +108,6 @@ class MapFragment : Fragment(), OnMapReadyCallback {
         }
     }
 
-    // TODO 추후 삭제
-    private fun initTestButton() {
-        val bitmap =
-            BitmapFactory.decodeResource(requireContext().resources, R.drawable.sample_image2)
-        val picture = PictureModel(bitmap)
-
-        binding.btnTest.setOnClickListener {
-            val fakeMoment = FakeMomentFactory.createMomentsWithSampleImage(picture, 1)
-            val action =
-                MapFragmentDirections.actionMapFragmentToMomentDetailFragment(fakeMoment.first())
-            findNavController().navigate(action)
-        }
-    }
-
     private fun setMenus(binding: BottomSheetBinding) {
         val items = listOf(
             getString(R.string.most_recent),
@@ -203,6 +207,7 @@ class MapFragment : Fragment(), OnMapReadyCallback {
     }
 
     override fun onDestroyView() {
+        momentAdapter.unregisterAdapterDataObserver(adapterDataObserver)
         binding.unbind()
         super.onDestroyView()
     }

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

@@ -3,6 +3,13 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <data>
+
+        <variable
+            name="hasMoments"
+            type="boolean" />
+    </data>
+
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -49,17 +56,33 @@
 
             </com.google.android.material.textfield.TextInputLayout>
 
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/rv_moments"
-                android:layout_width="match_parent"
+            <FrameLayout
+                android:layout_width="0dp"
                 android:layout_height="0dp"
-                android:layout_marginTop="@dimen/normal_100"
-                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/text_field"
-                app:layout_constraintBottom_toBottomOf="parent"
-                tools:listitem="@layout/item_moment" />
+                app:layout_constraintTop_toBottomOf="@id/text_field">
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/rv_moments"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginTop="@dimen/normal_100"
+                    app:isGone="@{!hasMoments}"
+                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                    tools:listitem="@layout/item_moment" />
+
+                <TextView
+                    style="@style/TextAppearance.Mogle.Title"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:text="지금 이 순간을 기록해보세요."
+                    app:isGone="@{hasMoments}" />
+
+            </FrameLayout>
+
 
         </androidx.constraintlayout.widget.ConstraintLayout>