Merge pull request #225 from boostcampwm2023/android/feature/61

내가 업로드한 노래 전체 보기

android/feature/mypage/src/main/java/com/ohdodok/catchytape/feature/mypage/MyMusicsFragment.kt

@@ -0,0 +1,41 @@
+package com.ohdodok.catchytape.feature.mypage
+
+import android.os.Bundle
+import android.view.View
+import androidx.fragment.app.viewModels
+import com.ohdodok.catchytape.core.ui.BaseFragment
+import com.ohdodok.catchytape.core.ui.MusicAdapter
+import com.ohdodok.catchytape.core.ui.Orientation
+import com.ohdodok.catchytape.core.ui.toMessageId
+import com.ohdodok.catchytape.feature.mypage.databinding.FragmentMyMusicsBinding
+import dagger.hilt.android.AndroidEntryPoint
+
+@AndroidEntryPoint
+class MyMusicsFragment : BaseFragment<FragmentMyMusicsBinding>(R.layout.fragment_my_musics) {
+    private val viewModel: MyMusicsViewModel by viewModels()
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding.viewModel = viewModel
+
+        setupRecyclerView()
+        observeEvents()
+        setupBackStack(binding.tbMyMusics)
+    }
+
+    private fun setupRecyclerView() {
+        binding.rvMyMusics.adapter = MusicAdapter(Orientation.VERTICAL)
+    }
+
+    private fun observeEvents() {
+        repeatOnStarted {
+            viewModel.events.collect { event ->
+                when (event) {
+                    is MyMusicsEvent.ShowMessage -> {
+                        showMessage(event.error.toMessageId())
+                    }
+                }
+            }
+        }
+    }
+}

android/feature/mypage/src/main/java/com/ohdodok/catchytape/feature/mypage/MyMusicsViewModel.kt

@@ -0,0 +1,70 @@
+package com.ohdodok.catchytape.feature.mypage
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.ohdodok.catchytape.core.domain.model.CtErrorType
+import com.ohdodok.catchytape.core.domain.model.CtException
+import com.ohdodok.catchytape.core.domain.model.Music
+import com.ohdodok.catchytape.core.domain.repository.MusicRepository
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.plus
+import javax.inject.Inject
+
+data class MyMusicsUiState(
+    val myMusics: List<Music> = emptyList()
+)
+
+sealed interface MyMusicsEvent {
+    data class ShowMessage(
+        val error: CtErrorType
+    ) : MyMusicsEvent
+}
+
+@HiltViewModel
+class MyMusicsViewModel @Inject constructor(
+    private val musicRepository: MusicRepository,
+) : ViewModel() {
+
+    private val _uiState = MutableStateFlow(MyMusicsUiState())
+    val uiState: StateFlow<MyMusicsUiState> = _uiState.asStateFlow()
+
+    private val _events = MutableSharedFlow<MyMusicsEvent>()
+    val events: SharedFlow<MyMusicsEvent> = _events.asSharedFlow()
+
+    private val exceptionHandler = CoroutineExceptionHandler { _, throwable ->
+        viewModelScope.launch {
+            val errorType =
+                if (throwable is CtException) throwable.ctError
+                else CtErrorType.UN_KNOWN
+
+            _events.emit(MyMusicsEvent.ShowMessage(errorType))
+        }
+    }
+
+    private val viewModelScopeWithExceptionHandler = viewModelScope + exceptionHandler
+
+    init {
+        fetchMyMusics()
+    }
+
+    private fun fetchMyMusics() {
+        musicRepository.getMyMusics()
+            .onEach { musics ->
+                _uiState.update {
+                    it.copy(myMusics = musics)
+                }
+            }
+            .launchIn(viewModelScopeWithExceptionHandler)
+    }
+}

android/feature/mypage/src/main/java/com/ohdodok/catchytape/feature/mypage/MyPageFragment.kt

@@ -3,7 +3,10 @@ package com.ohdodok.catchytape.feature.mypage
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.viewModels
+import androidx.navigation.fragment.findNavController
 import com.ohdodok.catchytape.core.ui.BaseFragment
+import com.ohdodok.catchytape.core.ui.MusicAdapter
+import com.ohdodok.catchytape.core.ui.Orientation
 import com.ohdodok.catchytape.core.ui.toMessageId
 import com.ohdodok.catchytape.feature.mypage.databinding.FragmentMyPageBinding
 import dagger.hilt.android.AndroidEntryPoint
@@ -18,7 +21,8 @@ class MyPageFragment : BaseFragment<FragmentMyPageBinding>(R.layout.fragment_my_
         binding.viewModel = viewModel
 
         observeEvents()
-        viewModel.fetchMyMusics()
+        setupButtons()
+        setupRecyclerView()
     }
 
     private fun observeEvents() {
@@ -32,4 +36,20 @@ class MyPageFragment : BaseFragment<FragmentMyPageBinding>(R.layout.fragment_my_
             }
         }
     }
+
+    private fun setupButtons() {
+        binding.btnMore.setOnClickListener {
+            val action = MyPageFragmentDirections.actionMyPageFragmentToMyMusicsFragment()
+            findNavController().navigate(action)
+        }
+    }
+
+    private fun setupRecyclerView() {
+        binding.rvMusics.adapter = MusicAdapter(Orientation.VERTICAL)
+    }
+
+    override fun onStart() {
+        super.onStart()
+        viewModel.fetchMyMusics(count = 3)
+    }
 }

android/feature/mypage/src/main/java/com/ohdodok/catchytape/feature/mypage/MyPageViewModel.kt

@@ -37,23 +37,20 @@ class MyPageViewModel @Inject constructor(
     val events: SharedFlow<MyPageEvent> = _events.asSharedFlow()
 
     private val exceptionHandler = CoroutineExceptionHandler { _, throwable ->
-        viewModelScope.launch {
-            if (throwable is CtException) {
-                _events.emit(MyPageEvent.ShowMessage(throwable.ctError))
-            } else {
-                _events.emit(MyPageEvent.ShowMessage(CtErrorType.UN_KNOWN))
-            }
-        }
+        val errorType =
+            if (throwable is CtException) throwable.ctError
+            else CtErrorType.UN_KNOWN
+
+        viewModelScope.launch { _events.emit(MyPageEvent.ShowMessage(errorType)) }
     }
 
     private val viewModelScopeWithExceptionHandler = viewModelScope + exceptionHandler
 
-
-    fun fetchMyMusics() {
+    fun fetchMyMusics(count: Int) {
         musicRepository.getMyMusics()
             .onEach { musics ->
                 _uiState.update {
-                    it.copy(myMusics = musics.take(3))
+                    it.copy(myMusics = musics.take(count))
                 }
             }
             .launchIn(viewModelScopeWithExceptionHandler)

android/feature/mypage/src/main/res/layout/fragment_my_musics.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <variable
+            name="viewModel"
+            type="com.ohdodok.catchytape.feature.mypage.MyMusicsViewModel" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/tb_my_musics"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/appbar_height"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:navigationIcon="@drawable/ic_arrow_back"
+            app:title="@string/my_musics" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rv_my_musics"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:clipToPadding="false"
+            android:paddingHorizontal="@dimen/margin_horizontal"
+            android:paddingTop="@dimen/large"
+            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/tb_my_musics"
+            app:list="@{viewModel.uiState.myMusics}"
+            tools:listitem="@layout/item_music_vertical" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>

android/feature/mypage/src/main/res/layout/fragment_my_page.xml

@@ -15,7 +15,7 @@
         android:layout_height="match_parent">
 
         <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/mt_my_page"
+            android:id="@+id/tb_my_page"
             android:layout_width="0dp"
             android:layout_height="@dimen/appbar_height"
             app:layout_constraintEnd_toEndOf="parent"
@@ -34,7 +34,7 @@
             android:text="@string/share_music"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/mt_my_page" />
+            app:layout_constraintTop_toBottomOf="@id/tb_my_page" />
 
         <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/btn_upload"

android/feature/mypage/src/main/res/navigation/my_page_navigation.xml

@@ -8,10 +8,18 @@
     <fragment
         android:id="@+id/my_page_fragment"
         android:name="com.ohdodok.catchytape.feature.mypage.MyPageFragment"
-        android:label="mypage"
+        android:label="my page"
         tools:layout="@layout/fragment_my_page">
 
+        <action
+            android:id="@+id/action_my_page_fragment_to_my_musics_fragment"
+            app:destination="@id/my_musics_fragment" />
     </fragment>
 
+    <fragment
+        android:id="@+id/my_musics_fragment"
+        android:name="com.ohdodok.catchytape.feature.mypage.MyMusicsFragment"
+        android:label="my musics"
+        tools:layout="@layout/fragment_my_musics" />
 
 </navigation>