feat : 페이크 데이터로 알람 정보 저장 로직 구현

koreatlwls · koreatlwls · commit 06db43aae2ba · 2022-11-24T15:01:03.000+09:00
diff --git a/data/src/main/java/com/stop/data/local/source/alarm/AlarmLocalDataSourceImpl.kt b/data/src/main/java/com/stop/data/local/source/alarm/AlarmLocalDataSourceImpl.kt
@@ -35,8 +35,11 @@ internal class AlarmLocalDataSourceImpl @Inject constructor(
     override suspend fun getAlarm(): Flow<AlarmRepositoryItem?> {
         return context.datastore.data.map { preferences ->
             val jsonString = preferences[ALARM] ?: ""
-            val elements = adapter.fromJson(jsonString)?.toRepositoryModel()
-            elements
+            if (jsonString.isNotBlank()) {
+                adapter.fromJson(jsonString)?.toRepositoryModel()
+            } else {
+                null
+            }
         }
     }
 
diff --git a/presentation/src/main/java/com/stop/ui/alarmsetting/AlarmSettingFragment.kt b/presentation/src/main/java/com/stop/ui/alarmsetting/AlarmSettingFragment.kt
@@ -9,13 +9,9 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
-import androidx.lifecycle.lifecycleScope
 import com.stop.R
 import com.stop.databinding.FragmentAlarmSettingBinding
-import com.stop.domain.model.alarm.AlarmUseCaseItem
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.flow.collectLatest
-import kotlinx.coroutines.launch
 
 @AndroidEntryPoint
 class AlarmSettingFragment : Fragment() {
@@ -38,48 +34,33 @@ class AlarmSettingFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        val test = AlarmUseCaseItem(
-            "abc",
-            "abc",
-            listOf("ABC"),
-            "abc","abc",true,true
-        )
-
-        lifecycleScope.launch{
-            alarmSettingViewModel.save(test)
-        }
-
-      /*  lifecycleScope.launch{
-            alarmSettingViewModel.get().asLiveData().observe(viewLifecycleOwner){
-                Log.e("ABC", it.toString())
-            }
-        }*/
-
-        lifecycleScope.launch{
-            alarmSettingViewModel.get().collectLatest {
-                Log.e("ABC", it.toString())
-            }
-        }
-
 
         initView()
         setButtonListener()
+        setToggleListener()
+        alarmSettingViewModel.getAlarm()
+        alarmSettingViewModel.alarmUseCaseItem.observe(viewLifecycleOwner) {
+            Log.e("ABC", it.toString())
+        }
     }
 
-    private fun initBinding(){
+    private fun initBinding() {
         binding.apply {
             lifecycleOwner = viewLifecycleOwner
             viewModel = alarmSettingViewModel
         }
     }
 
     private fun initView() {
-        with(binding){
+        with(binding) {
             textViewLastTime.text = getString(R.string.last_transport_arrival_time, 23, 30)
             textViewWalk.text = getString(R.string.last_transport_walking_time, 10)
 
             numberPickerAlarmTime.minValue = 0
             numberPickerAlarmTime.maxValue = 60
+
+            buttonSound.isCheckable = true
+            buttonMissionOn.isCheckable = true
         }
     }
 
@@ -113,6 +94,28 @@ class AlarmSettingFragment : Fragment() {
         }
     }
 
+    private fun setToggleListener() {
+        with(binding) {
+            toggleGroupAlarm.addOnButtonCheckedListener { group, checkedId, isChecked ->
+                if (isChecked) {
+                    when (checkedId) {
+                        R.id.button_sound -> alarmSettingViewModel.alarmMethod = true
+                        else -> alarmSettingViewModel.alarmMethod = false
+                    }
+                }
+            }
+
+            toggleGroupMission.addOnButtonCheckedListener { group, checkedId, isChecked ->
+                if (isChecked) {
+                    when (checkedId) {
+                        R.id.button_mission_on -> alarmSettingViewModel.isMission = true
+                        else -> alarmSettingViewModel.isMission = false
+                    }
+                }
+            }
+        }
+    }
+
     override fun onDestroyView() {
         _binding = null
         super.onDestroyView()
diff --git a/presentation/src/main/java/com/stop/ui/alarmsetting/AlarmSettingViewModel.kt b/presentation/src/main/java/com/stop/ui/alarmsetting/AlarmSettingViewModel.kt
@@ -1,11 +1,16 @@
 package com.stop.ui.alarmsetting
 
+import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
 import com.stop.domain.model.alarm.AlarmUseCaseItem
 import com.stop.domain.usecase.alarm.GetAlarmUseCase
 import com.stop.domain.usecase.alarm.SaveAlarmUseCase
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
@@ -16,11 +21,36 @@ class AlarmSettingViewModel @Inject constructor(
 
     val alarmTime = MutableLiveData(0)
 
-    suspend fun save(alarmUseCaseItem: AlarmUseCaseItem){
-        saveAlarmUseCase.saveAlarm(alarmUseCaseItem)
+    //TODO TEST 코드
+    private val _alarmUseCaseItem = MutableLiveData<AlarmUseCaseItem?>()
+    val alarmUseCaseItem: LiveData<AlarmUseCaseItem?> = _alarmUseCaseItem
+
+    var alarmMethod = true
+    var isMission = true
+
+    fun saveAlarm() {
+        val alarmUseCaseItem = AlarmUseCaseItem(
+            "쑥고개로 2다길 1",
+            "현대 아남타워",
+            listOf("도보", "버스5517", "신림역", "선릉역", "도보"),
+            "23:30",
+            alarmTime.value.toString(),
+            alarmMethod,
+            isMission
+        )
+
+        viewModelScope.launch(Dispatchers.IO) {
+            saveAlarmUseCase.saveAlarm(alarmUseCaseItem)
+        }
     }
 
-    suspend fun get()  =
-        getAlarmUseCase.getAlarm()
+    // TODO TEST 코드
+    fun getAlarm() {
+        viewModelScope.launch(Dispatchers.IO) {
+            getAlarmUseCase.getAlarm().collectLatest {
+                _alarmUseCaseItem.postValue(it)
+            }
+        }
+    }
 
 }
diff --git a/presentation/src/main/res/layout/fragment_alarm_setting.xml b/presentation/src/main/res/layout/fragment_alarm_setting.xml
@@ -174,6 +174,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="12dp"
             android:layout_marginBottom="9dp"
+            app:checkedButton="@id/button_sound"
             app:layout_constraintBottom_toTopOf="@id/toggle_group_mission"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/text_view_alarm_method"
@@ -217,6 +218,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="12dp"
             android:layout_marginTop="9dp"
+            app:checkedButton="@id/button_mission_on"
             app:layout_constraintBottom_toTopOf="@id/text_view_register_alarm"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/text_view_mission_toggle"
@@ -246,10 +248,11 @@
             android:layout_marginBottom="24dp"
             android:background="@drawable/background_gray_d9_8"
             android:gravity="center"
-            android:textSize="16sp"
+            android:onClick="@{() -> viewModel.saveAlarm()}"
             android:paddingVertical="8dp"
             android:text="@string/register_alarm_text"
             android:textColor="@color/black"
+            android:textSize="16sp"
             android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="@id/guide_line_end"
diff --git a/presentation/src/main/res/values/themes.xml b/presentation/src/main/res/values/themes.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.PlzStop" parent="Theme.Material3.DayNight.NoActionBar">
+    <style name="Theme.PlzStop" parent="Theme.Material3.Light.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_500</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>

Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,11 @@ internal class AlarmLocalDataSourceImpl @Inject constructor(`
`35`	`35`	`override suspend fun getAlarm(): Flow<AlarmRepositoryItem?> {`
`36`	`36`	`return context.datastore.data.map { preferences ->`
`37`	`37`	`val jsonString = preferences[ALARM] ?: ""`
`38`		`- val elements = adapter.fromJson(jsonString)?.toRepositoryModel()`
`39`		`- elements`
	`38`	`+ if (jsonString.isNotBlank()) {`
	`39`	`+ adapter.fromJson(jsonString)?.toRepositoryModel()`
	`40`	`+ } else {`
	`41`	`+ null`
	`42`	`+ }`
`40`	`43`	`}`
`41`	`44`	`}`
`42`	`45`