refactor: 카테고리, 일시 선택 순서 변경 및 리팩터링 (스타카토 생성/수정) #564

android/Staccato_AN/app/build.gradle.kts

@@ -98,6 +98,7 @@ dependencies {
     implementation(libs.androidx.activity)
     implementation(libs.androidx.constraintlayout)
     testImplementation(libs.junit)
+    testImplementation(libs.androidx.arch.core)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
 
@@ -139,9 +140,15 @@ dependencies {
     // Fragment
     implementation(libs.androidx.fragment.ktx)
 
+    // Coroutines Test
+    testImplementation(libs.kotlinx.coroutines.test)
+
     // Mockk
-    testImplementation(libs.mockk.android)
+    testImplementation(libs.junitparams)
+    testImplementation(libs.mockk)
     testImplementation(libs.mockk.agent)
+    androidTestImplementation(libs.mockk.agent)
+    androidTestImplementation(libs.mockk.android)
 
     // Navigation
     implementation(libs.androidx.navigation.fragment.ktx)

android/Staccato_AN/app/src/main/java/com/on/staccato/domain/model/MemoryCandidate.kt

@@ -1,16 +1,39 @@
 package com.on.staccato.domain.model
 
 import java.time.LocalDate
+import java.time.LocalDateTime
 import java.time.YearMonth
 
-data class MemoryCandidates(val memoryCandidate: List<MemoryCandidate>)
-
 data class MemoryCandidate(
     val memoryId: Long,
     val memoryTitle: String,
     val startAt: LocalDate?,
     val endAt: LocalDate?,
 ) {
+    fun getClosestDateTime(date: LocalDateTime): LocalDateTime {
+        if (startAt == null || endAt == null) return date
+
+        val startDateTime = startAt.atStartOfDay()
+        val endDateTime = endAt.atTime(23, 59)
+
+        return when {
+            date.isBefore(startDateTime) ->
+                startDateTime.changeTimeToNoon()
+
+            date.isAfter(endDateTime) ->
+                endDateTime.changeTimeToNoon()
+
+            else -> date
+        }
+    }
+
+    fun isDateWithinPeriod(date: LocalDate): Boolean {
+        if (startAt == null || endAt == null) return true
+        return date in startAt..endAt
+    }
+
+    private fun LocalDateTime.changeTimeToNoon(): LocalDateTime = withHour(12).withMinute(0)
+
     companion object {
         fun buildNumberPickerDates(
             startAt: LocalDate?,

android/Staccato_AN/app/src/main/java/com/on/staccato/domain/model/MemoryCandidates.kt

@@ -0,0 +1,19 @@
+package com.on.staccato.domain.model
+
+import java.time.LocalDate
+
+data class MemoryCandidates(val memoryCandidate: List<MemoryCandidate>) {
+    fun filterBy(date: LocalDate): MemoryCandidates = copy(memoryCandidate = memoryCandidate.filter { it.isDateWithinPeriod(date) })
+
+    fun findBy(memoryId: Long): MemoryCandidate? = memoryCandidate.find { it.memoryId == memoryId }
+
+    fun findByIdOrFirst(targetId: Long?): MemoryCandidate? =
+        memoryCandidate.find { it.memoryId == targetId }
+            ?: memoryCandidate.firstOrNull()
+
+    companion object {
+        val emptyMemoryCandidates = MemoryCandidates(emptyList())
+
+        fun from(vararg memoryCandidate: MemoryCandidate) = MemoryCandidates(listOf(*memoryCandidate))
+    }
+}

android/Staccato_AN/app/src/main/java/com/on/staccato/presentation/bindingadapter/TextBindingAdapter.kt

@@ -16,38 +16,34 @@ fun TextView.setSelectedMemory(
     selectedMemory: MemoryCandidate?,
     memoryCandidates: MemoryCandidates?,
 ) {
-    if (memoryCandidates?.memoryCandidate?.isEmpty() == true) {
-        text = resources.getString(R.string.staccato_creation_no_memory_hint)
-        setTextColor(resources.getColor(R.color.gray3, null))
-        isClickable = false
-        isFocusable = false
-    } else if (selectedMemory == null) {
-        text = resources.getString(R.string.staccato_creation_memory_selection_hint)
-        setTextColor(resources.getColor(R.color.gray3, null))
-        isClickable = true
-        isFocusable = true
-    } else {
-        text = selectedMemory.memoryTitle
-        setTextColor(resources.getColor(R.color.staccato_black, null))
+    when {
+        (memoryCandidates?.memoryCandidate?.isEmpty() == true) -> {
+            text = resources.getString(R.string.staccato_creation_no_memory)
+            setTextColor(resources.getColor(R.color.gray3, null))
+            isClickable = false
+            isFocusable = false
+        }
+        (selectedMemory == null) -> {
+            text = resources.getString(R.string.staccato_creation_no_memory_in_this_date)
+            setTextColor(resources.getColor(R.color.gray3, null))
+            isClickable = false
+            isFocusable = false
+        }
+        else -> {
+            text = selectedMemory.memoryTitle
+            isClickable = true
+            isFocusable = true
+            setTextColor(resources.getColor(R.color.staccato_black, null))
+        }
     }
 }
 
-@BindingAdapter(value = ["dateTimeWithAmPm", "memoryCandidates"])
-fun TextView.setDateTimeWithAmPm(
-    dateTime: LocalDateTime?,
-    memoryCandidates: MemoryCandidates?,
-) {
-    if (memoryCandidates?.memoryCandidate?.isEmpty() == true) {
-        text = resources.getString(R.string.staccato_creation_memory_selection_hint)
-        setTextColor(resources.getColor(R.color.gray3, null))
-        isClickable = false
-        isFocusable = false
-    } else {
-        text = dateTime?.let(::getFormattedLocalDateTime) ?: EMPTY_TEXT
-        setTextColor(resources.getColor(R.color.staccato_black, null))
-        isClickable = true
-        isFocusable = true
-    }
+@BindingAdapter("dateTimeWithAmPm")
+fun TextView.setDateTimeWithAmPm(dateTime: LocalDateTime?) {
+    text = dateTime?.let(::getFormattedLocalDateTime) ?: EMPTY_TEXT
+    setTextColor(resources.getColor(R.color.staccato_black, null))
+    isClickable = true
+    isFocusable = true
 }
 
 @BindingAdapter(
@@ -73,11 +69,6 @@ fun TextView.setIsMemoryCandidatesEmptyVisibility(memoryCandidates: MemoryCandid
     isGone = !memoryCandidates?.memoryCandidate.isNullOrEmpty()
 }
 
-@BindingAdapter("isMemoryEmpty")
-fun TextView.setIsMemoryEmptyVisibility(items: List<Int>?) {
-    isGone = !items.isNullOrEmpty()
-}
-
 @BindingAdapter("visitedAtHistory")
 fun TextView.formatVisitedAtHistory(visitedAt: LocalDateTime?) {
     text = visitedAt?.let {

android/Staccato_AN/app/src/main/java/com/on/staccato/presentation/main/MainActivity.kt

@@ -108,10 +108,8 @@ class MainActivity :
 
     override fun onStaccatoCreationClicked() {
         StaccatoCreationActivity.startWithResultLauncher(
-            0L,
-            "임시 추억",
-            this,
-            staccatoCreationLauncher,
+            context = this,
+            activityLauncher = staccatoCreationLauncher,
         )
     }
 

android/Staccato_AN/app/src/main/java/com/on/staccato/presentation/memory/MemoryFragment.kt

@@ -87,10 +87,10 @@ class MemoryFragment :
         viewModel.memory.value?.let {
             val staccatoCreationLauncher = (activity as MainActivity).staccatoCreationLauncher
             StaccatoCreationActivity.startWithResultLauncher(
-                memoryId,
-                it.title,
                 requireContext(),
                 staccatoCreationLauncher,
+                memoryId,
+                it.title,
             )
         }
     }

android/Staccato_AN/app/src/main/java/com/on/staccato/presentation/staccato/StaccatoFragment.kt

@@ -39,7 +39,9 @@ class StaccatoFragment :
         DeleteDialogFragment {
             staccatoViewModel.deleteStaccato(staccatoId)
         }
-    private val staccatoId by lazy { arguments?.getLong(STACCATO_ID_KEY) ?: DEFAULT_STACCATO_ID }
+    private val staccatoId by lazy {
+        arguments?.getLong(STACCATO_ID_KEY) ?: DEFAULT_STACCATO_ID
+    }
 
     override fun onViewCreated(
         view: View,
@@ -231,6 +233,6 @@ class StaccatoFragment :
 
     companion object {
         const val STACCATO_ID_KEY = "staccatoId"
-        const val DEFAULT_STACCATO_ID = -1L
+        const val DEFAULT_STACCATO_ID = 0L
     }
 }

android/Staccato_AN/app/src/main/java/com/on/staccato/presentation/staccato/feeling/StaccatoFeelingSelectionFragment.kt

@@ -17,7 +17,9 @@ class StaccatoFeelingSelectionFragment :
     private lateinit var feelingSelectionAdapter: FeelingSelectionAdapter
     private val staccatoViewModel: StaccatoViewModel by viewModels({ requireParentFragment() })
     private val staccatoFeelingSelectionViewModel: StaccatoFeelingSelectionViewModel by viewModels()
-    private val staccatoId by lazy { arguments?.getLong(STACCATO_ID_KEY) ?: DEFAULT_STACCATO_ID }
+    private val staccatoId by lazy {
+        arguments?.getLong(STACCATO_ID_KEY) ?: DEFAULT_STACCATO_ID
+    }
 
     override fun onViewCreated(
         view: View,

android/Staccato_AN/app/src/main/java/com/on/staccato/presentation/staccatocreation/StaccatoCreationActivity.kt

@@ -45,7 +45,6 @@ import com.on.staccato.presentation.util.showToast
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import java.time.LocalDate
 import java.time.LocalDateTime
 
 @AndroidEntryPoint
@@ -76,7 +75,7 @@ class StaccatoCreationActivity :
     private lateinit var photoAttachAdapter: PhotoAttachAdapter
     private lateinit var itemTouchHelper: ItemTouchHelper
 
-    private val memoryId by lazy { intent.getLongExtra(MEMORY_ID_KEY, 0L) }
+    private val memoryId by lazy { intent.getLongExtra(MEMORY_ID_KEY, DEFAULT_CATEGORY_ID) }
     private val memoryTitle by lazy { intent.getStringExtra(MEMORY_TITLE_KEY) ?: "" }
 
     private val locationPermissionManager =
@@ -87,7 +86,7 @@ class StaccatoCreationActivity :
     private var currentSnackBar: Snackbar? = null
 
     override fun initStartView(savedInstanceState: Bundle?) {
-        viewModel.fetchMemoryCandidates(memoryId)
+        viewModel.fetchMemoryCandidates()
         setupPermissionRequestLauncher()
         setupFusedLocationProviderClient()
         initBinding()
@@ -269,10 +268,6 @@ class StaccatoCreationActivity :
 
     private fun initMemorySelectionFragment() {
         memorySelectionFragment.setOnMemorySelected { selectedMemory ->
-            val startAt = selectedMemory.startAt ?: LocalDate.now()
-            val initializedDateTime =
-                LocalDateTime.of(startAt.year, startAt.month, startAt.dayOfMonth, 0, 0, 0)
-            viewModel.selectedVisitedAt(initializedDateTime)
             viewModel.selectMemory(selectedMemory)
         }
     }
@@ -284,9 +279,14 @@ class StaccatoCreationActivity :
     }
 
     private fun observeViewModelData() {
-        viewModel.placeName.observe(this) {
-            autocompleteFragment.setText(it)
-        }
+        observePhotoData()
+        observePlaceData()
+        observeVisitedAtData()
+        observeMemoryData()
+        observeCreatedStaccatoId()
+    }
+
+    private fun observePhotoData() {
         viewModel.isAddPhotoClicked.observe(this) {
             if (!photoAttachFragment.isAdded && it) {
                 photoAttachFragment.show(fragmentManager, PhotoAttachFragment.TAG)
@@ -301,21 +301,50 @@ class StaccatoCreationActivity :
                 listOf(AttachedPhotoUiModel.addPhotoButton, *photos.attachedPhotos.toTypedArray()),
             )
         }
+    }
+
+    private fun observePlaceData() {
+        viewModel.placeName.observe(this) {
+            autocompleteFragment.setText(it)
+        }
+    }
+
+    private fun observeVisitedAtData() {
+        viewModel.selectedVisitedAt.observe(this) {
+            it?.let {
+                visitedAtSelectionFragment.updateSelectedVisitedAt(it)
+                if (memoryId == DEFAULT_CATEGORY_ID) {
+                    updateMemoryCandidateAndVisitedAt(it)
+                }
+            }
+        }
+    }
+
+    private fun observeMemoryData() {
         viewModel.memoryCandidates.observe(this) {
-            memorySelectionFragment.setItems(it.memoryCandidate)
+            it?.let {
+                viewModel.initMemoryAndVisitedAt(memoryId, LocalDateTime.now())
+            }
         }
-        viewModel.selectedMemory.observe(this) { selectedMemory ->
-            val startAt = selectedMemory.startAt ?: LocalDate.now()
-            val initializedDateTime =
-                LocalDateTime.of(startAt.year, startAt.month, startAt.dayOfMonth, 0, 0, 0)
-            memorySelectionFragment.updateKeyMemory(selectedMemory)
-            visitedAtSelectionFragment.initDateCandidates(selectedMemory, initializedDateTime)
+        viewModel.selectableMemories.observe(this) {
+            it?.let {
+                memorySelectionFragment.setItems(it.memoryCandidate)
+            }
         }
-        viewModel.selectedVisitedAt.observe(this) { selectedVisitedAt ->
-            if (selectedVisitedAt != null) {
-                visitedAtSelectionFragment.initKeyWithSelectedValues(selectedVisitedAt)
+        viewModel.selectedMemory.observe(this) {
+            it?.let {
+                memorySelectionFragment.updateKeyMemory(it)
+                if (memoryId != DEFAULT_CATEGORY_ID) {
+                    visitedAtSelectionFragment.setVisitedAtPeriod(
+                        it.startAt,
+                        it.endAt,
+                    )
+                }
             }
         }
+    }
+
+    private fun observeCreatedStaccatoId() {
         viewModel.createdStaccatoId.observe(this) { createdStaccatoId ->
             val resultIntent =
                 Intent()
@@ -328,6 +357,15 @@ class StaccatoCreationActivity :
         }
     }
 
+    private fun updateMemoryCandidateAndVisitedAt(visitedAt: LocalDateTime) {
+        viewModel.updateMemorySelectionBy(visitedAt)
+        val visitedDate = visitedAt.toLocalDate()
+        visitedAtSelectionFragment.setVisitedAtPeriod(
+            visitedDate.minusYears(10),
+            visitedDate.plusYears(10),
+        )
+    }
+
     private fun fetchAddress(location: Location) {
         lifecycleScope.launch {
             val defaultDelayJob =
@@ -429,12 +467,14 @@ class StaccatoCreationActivity :
 
     companion object {
         const val MEMORY_TITLE_KEY = "memoryTitle"
+        const val DEFAULT_CATEGORY_ID = 0L
+        private const val DEFAULT_CATEGORY_TITLE = ""
 
         fun startWithResultLauncher(
-            memoryId: Long,
-            memoryTitle: String,
             context: Context,
             activityLauncher: ActivityResultLauncher<Intent>,
+            memoryId: Long = DEFAULT_CATEGORY_ID,
+            memoryTitle: String = DEFAULT_CATEGORY_TITLE,
         ) {
             Intent(context, StaccatoCreationActivity::class.java).apply {
                 putExtra(MEMORY_ID_KEY, memoryId)