[MERGE] #61 -> develop

[UI/#61] 리듬뷰 / UI 수정사항 대응

data/src/main/java/com/kkkk/data/dataSource/RhythmDataSource.kt

@@ -2,11 +2,12 @@ package com.kkkk.data.dataSource
 
 import com.kkkk.data.dto.BaseResponse
 import com.kkkk.data.dto.request.RecordRequestDto
+import com.kkkk.data.dto.request.RhythmRequestDto
 import okhttp3.ResponseBody
 
 interface RhythmDataSource {
     suspend fun postToGetRhythmUrl(
-        bpm: Int
+        request: RhythmRequestDto
     ): BaseResponse<String>
 
     suspend fun getRhythmWav(

data/src/main/java/com/kkkk/data/dataSourceImpl/RhythmDataSourceImpl.kt

@@ -3,6 +3,7 @@ package com.kkkk.data.dataSourceImpl
 import com.kkkk.data.dataSource.RhythmDataSource
 import com.kkkk.data.dto.BaseResponse
 import com.kkkk.data.dto.request.RecordRequestDto
+import com.kkkk.data.dto.request.RhythmRequestDto
 import com.kkkk.data.service.RhythmService
 import okhttp3.ResponseBody
 import javax.inject.Inject
@@ -13,8 +14,8 @@ constructor(
     private val rhythmService: RhythmService
 ) : RhythmDataSource {
 
-    override suspend fun postToGetRhythmUrl(bpm: Int): BaseResponse<String> =
-        rhythmService.postToGetRhythmUrl(bpm)
+    override suspend fun postToGetRhythmUrl(request: RhythmRequestDto): BaseResponse<String> =
+        rhythmService.postToGetRhythmUrl(request)
 
     override suspend fun getRhythmWav(url: String): ResponseBody =
         rhythmService.getRhythmWav(url)

data/src/main/java/com/kkkk/data/dto/request/RhythmRequestDto.kt

@@ -0,0 +1,17 @@
+package com.kkkk.data.dto.request
+
+import com.kkkk.domain.entity.request.RhythmRequestModel
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class RhythmRequestDto(
+    @SerialName("bpm")
+    val bpm: Int,
+    @SerialName("bit")
+    val bit: Int,
+) {
+    companion object {
+        fun RhythmRequestModel.toDto() = RhythmRequestDto(bpm, bit)
+    }
+}

data/src/main/java/com/kkkk/data/repositoryImpl/RhythmRepositoryImpl.kt

@@ -2,7 +2,9 @@ package com.kkkk.data.repositoryImpl
 
 import com.kkkk.data.dataSource.RhythmDataSource
 import com.kkkk.data.dto.request.RecordRequestDto.Companion.toDto
+import com.kkkk.data.dto.request.RhythmRequestDto.Companion.toDto
 import com.kkkk.domain.entity.request.RecordRequestModel
+import com.kkkk.domain.entity.request.RhythmRequestModel
 import com.kkkk.domain.repository.RhythmRepository
 import javax.inject.Inject
 
@@ -12,9 +14,9 @@ constructor(
     private val rhythmDataSource: RhythmDataSource,
 ) : RhythmRepository {
 
-    override suspend fun postToGetRhythmUrl(bpm: Int): Result<String> =
+    override suspend fun postToGetRhythmUrl(request: RhythmRequestModel): Result<String> =
         runCatching {
-            rhythmDataSource.postToGetRhythmUrl(bpm).data
+            rhythmDataSource.postToGetRhythmUrl(request.toDto()).data
         }
 
     override suspend fun getRhythmWav(url: String): Result<ByteArray> =

data/src/main/java/com/kkkk/data/service/RhythmService.kt

@@ -2,17 +2,17 @@ package com.kkkk.data.service
 
 import com.kkkk.data.dto.BaseResponse
 import com.kkkk.data.dto.request.RecordRequestDto
+import com.kkkk.data.dto.request.RhythmRequestDto
 import okhttp3.ResponseBody
 import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.POST
-import retrofit2.http.Path
 import retrofit2.http.Url
 
 interface RhythmService {
-    @POST("/api/v1/rhythm/{bpm}")
+    @POST("/api/v1/rhythm")
     suspend fun postToGetRhythmUrl(
-        @Path("bpm") bpm: Int,
+        @Body request: RhythmRequestDto,
     ): BaseResponse<String>
 
     @GET

domain/src/main/kotlin/com/kkkk/domain/entity/request/RhythmRequestModel.kt

@@ -0,0 +1,6 @@
+package com.kkkk.domain.entity.request
+
+data class RhythmRequestModel(
+    val bpm: Int,
+    val bit: Int,
+)

domain/src/main/kotlin/com/kkkk/domain/repository/RhythmRepository.kt

@@ -1,10 +1,11 @@
 package com.kkkk.domain.repository
 
 import com.kkkk.domain.entity.request.RecordRequestModel
+import com.kkkk.domain.entity.request.RhythmRequestModel
 
 interface RhythmRepository {
     suspend fun postToGetRhythmUrl(
-        bpm: Int
+        request: RhythmRequestModel
     ): Result<String>
 
     suspend fun getRhythmWav(

presentation/src/main/java/com/kkkk/presentation/main/MainActivity.kt

@@ -4,22 +4,34 @@ import android.os.Bundle
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.commit
 import androidx.fragment.app.replace
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.flowWithLifecycle
+import androidx.lifecycle.lifecycleScope
 import com.kkkk.core.base.BaseActivity
 import com.kkkk.presentation.main.profile.ProfileFragment
 import com.kkkk.presentation.main.record.RecordFragment
 import com.kkkk.presentation.main.rhythm.RhythmFragment
+import com.kkkk.presentation.main.rhythm.RhythmViewModel
+import com.kkkk.presentation.main.rhythm.StretchFragment
 import com.kkkk.presentation.main.study.StudyFragment
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 import kr.genti.presentation.R
 import kr.genti.presentation.databinding.ActivityMainBinding
 
 @AndroidEntryPoint
 class MainActivity : BaseActivity<ActivityMainBinding>(R.layout.activity_main) {
+
+    private lateinit var rhythmViewModel: RhythmViewModel
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         initBnvItemIconTintList()
         initBnvItemSelectedListener()
+        initViewModelProvider()
+        observeStretchViewNavigate()
     }
 
     private fun initBnvItemIconTintList() {
@@ -56,4 +68,18 @@ class MainActivity : BaseActivity<ActivityMainBinding>(R.layout.activity_main) {
             replace<T>(R.id.fcv_main, T::class.java.canonicalName)
         }
     }
+
+    private fun initViewModelProvider() {
+        rhythmViewModel = ViewModelProvider(this)[RhythmViewModel::class.java]
+    }
+
+    private fun observeStretchViewNavigate() {
+        rhythmViewModel.isStretchView.flowWithLifecycle(lifecycle).onEach { isStretch ->
+            if (isStretch) {
+                navigateTo<StretchFragment>()
+            } else {
+                navigateTo<RhythmFragment>()
+            }
+        }.launchIn(lifecycleScope)
+    }
 }

presentation/src/main/java/com/kkkk/presentation/main/record/RecordFragment.kt

@@ -18,7 +18,6 @@ import com.kkkk.core.extension.stringOf
 import com.kkkk.core.extension.toast
 import com.kkkk.core.state.UiState
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kr.genti.presentation.R
@@ -39,6 +38,7 @@ class RecordFragment : BaseFragment<FragmentRecordBinding>(R.layout.fragment_rec
         observeReportMonth()
         observeChartEntry()
         setStatusBarColor(R.color.white)
+        viewModel.setGraphWithDate()
     }
 
     private fun observeReportMonth() {
@@ -53,11 +53,11 @@ class RecordFragment : BaseFragment<FragmentRecordBinding>(R.layout.fragment_rec
     }
 
     private fun observeChartEntry() {
-        viewModel.chartEntry.flowWithLifecycle(lifecycle).distinctUntilChanged().onEach { state ->
+        viewModel.chartEntry.flowWithLifecycle(lifecycle).onEach { state ->
             when (state) {
                 is UiState.Success -> {
-                    binding.ivChartLoading.isVisible = false
-                    binding.layoutChart.isVisible = true
+                    setLoadingView(false)
+                    binding.ivChartEmpty.isVisible = false
                     binding.chartReport.apply {
                         data = LineData(LineDataSet(state.data, CHART_RECORD).setDataSettings())
                         invalidate()
@@ -66,17 +66,33 @@ class RecordFragment : BaseFragment<FragmentRecordBinding>(R.layout.fragment_rec
                 }
 
                 is UiState.Failure -> {
-                    binding.ivChartLoading.isVisible = true
+                    setLoadingView(false)
+                    binding.ivChartEmpty.isVisible = true
                     toast(stringOf(R.string.error_msg))
                 }
 
-                is UiState.Loading -> binding.ivChartLoading.isVisible = false
+                is UiState.Loading -> setLoadingView(true)
 
-                is UiState.Empty -> binding.ivChartLoading.isVisible = true
+                is UiState.Empty -> {
+                    setLoadingView(false)
+                    binding.ivChartEmpty.isVisible = true
+                }
             }
         }.launchIn(lifecycleScope)
     }
 
+    private fun setLoadingView(isLoading: Boolean) {
+        binding.layoutLoading.isVisible = isLoading
+        if (isLoading) {
+            binding.layoutChart.visibility = View.INVISIBLE
+            setStatusBarColor(R.color.transparent_50)
+        } else {
+            binding.layoutChart.visibility = View.VISIBLE
+            setStatusBarColor(R.color.white)
+        }
+    }
+
+
     private fun LineDataSet.setDataSettings(): LineDataSet {
         this.apply {
             color = colorOf(R.color.purple_50)

presentation/src/main/java/com/kkkk/presentation/main/record/RecordViewModel.kt

@@ -34,10 +34,6 @@ constructor(
     var startDate = ""
     var endDate = ""
 
-    init {
-        setGraphWithDate()
-    }
-
     fun setIsChangingMonth() {
         isChangingMonth.value = isChangingMonth.value?.not() ?: false
     }
@@ -48,7 +44,7 @@ constructor(
         setGraphWithDate()
     }
 
-    private fun setGraphWithDate() {
+    fun setGraphWithDate() {
         endDate = DATE_FORMAT.format(Date())
         DATE_FORMAT.parse(endDate)?.let { date ->
             val postCalendar = Calendar.getInstance().apply {