refactoring : presentation 레이어 코드 스타일 리팩토링

Author: koreatlwls

presentation/src/main/AndroidManifest.xml

@@ -29,14 +29,14 @@
         tools:targetApi="31">
 
         <receiver
-            android:name=".alarm.AlarmReceiver"
+            android:name=".ui.alarmstart.AlarmReceiver"
             android:enabled="true" />
 
-        <service android:name=".alarm.SoundService" />
+        <service android:name=".ui.alarmstart.SoundService" />
 
         <service android:name=".ui.mission.MissionService"/>
 
-        <service android:name=".alarm.SoundRestartService" />
+        <service android:name=".ui.alarmstart.SoundRestartService" />
 
         <provider
             android:name="androidx.startup.InitializationProvider"

presentation/src/main/java/com/stop/AlarmActivity.kt

@@ -7,6 +7,8 @@ import android.view.WindowManager
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.WindowCompat
 import com.stop.databinding.ActivityAlarmBinding
+import com.stop.util.isMoreThanOreoMr1
+import com.stop.util.navigationHeight
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint

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

@@ -11,10 +11,12 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.WindowCompat
 import com.stop.databinding.ActivityMainBinding
+import com.stop.util.navigationHeight
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
+
     private lateinit var binding: ActivityMainBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {

presentation/src/main/java/com/stop/di/AlarmModule.kt

@@ -2,7 +2,7 @@ package com.stop.di
 
 import android.content.Context
 import androidx.work.WorkManager
-import com.stop.alarm.AlarmFunctions
+import com.stop.util.AlarmFunctions
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn

presentation/src/main/java/com/stop/model/AlarmStatus.kt

@@ -0,0 +1,7 @@
+package com.stop.model.alarm
+
+enum class AlarmStatus(val text: String) {
+    NON_EXIST("현재 등록된 막차 알림이 없습니다"),
+    EXIST("드래그하여 등록된 막차 알림을 확인할 수 있습니다"),
+    MISSION("진행중인 미션이 있습니다")
+}

presentation/src/main/java/com/stop/model/alarm/AlarmStatus.kt

@@ -1,4 +1,4 @@
-package com.stop.model
+package com.stop.model.map
 
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize

presentation/src/main/java/com/stop/model/Location.kt renamed to presentation/src/main/java/com/stop/model/map/Location.kt

@@ -1,4 +1,4 @@
-package com.stop.model
+package com.stop.model.mission
 
 enum class MissionStatus(val text: String) {
     BEFORE("미션 시작"), ONGOING("미션 진행중"), OVER("미션 시작")

presentation/src/main/java/com/stop/model/MissionStatus.kt renamed to presentation/src/main/java/com/stop/model/mission/MissionStatus.kt

@@ -19,7 +19,8 @@ import kotlin.math.roundToInt
 class AlarmSettingFragment : Fragment() {
 
     private var _binding: FragmentAlarmSettingBinding? = null
-    private val binding get() = _binding!!
+    private val binding: FragmentAlarmSettingBinding
+        get() = _binding!!
 
     private val alarmSettingViewModel by activityViewModels<AlarmSettingViewModel>()
     private val routeResultViewModel: RouteResultViewModel by navGraphViewModels(R.id.route_nav_graph)
@@ -35,13 +36,6 @@ class AlarmSettingFragment : Fragment() {
         return binding.root
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        initView()
-        setToggleListener()
-    }
-
     private fun initBinding() {
         val itinerary = routeResultViewModel.itinerary.value ?: throw IllegalArgumentException()
 
@@ -63,8 +57,15 @@ class AlarmSettingFragment : Fragment() {
         }
     }
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        initView()
+        setToggleListener()
+    }
+
     private fun initView() {
-        with (binding) {
+        with(binding) {
             numberPickerAlarmTime.minValue = 0
             numberPickerAlarmTime.maxValue = 60
 

presentation/src/main/java/com/stop/ui/alarmsetting/AlarmSettingFragment.kt

@@ -7,16 +7,15 @@ import androidx.lifecycle.viewModelScope
 import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.WorkManager
 import androidx.work.workDataOf
-import com.stop.alarm.AlarmFunctions
-import com.stop.alarm.LastTimeCheckWorker
-import com.stop.convertTimeMillisToString
+import com.stop.util.AlarmFunctions
+import com.stop.util.convertTimeMillisToString
 import com.stop.domain.model.alarm.AlarmUseCaseItem
 import com.stop.domain.usecase.alarm.DeleteAlarmUseCase
 import com.stop.domain.usecase.alarm.GetAlarmUseCase
 import com.stop.domain.usecase.alarm.SaveAlarmUseCase
-import com.stop.makeFullTime
-import com.stop.model.AlarmStatus
-import com.stop.model.MissionStatus
+import com.stop.util.makeFullTime
+import com.stop.model.alarm.AlarmStatus
+import com.stop.model.mission.MissionStatus
 import com.stop.ui.alarmsetting.AlarmSettingFragment.Companion.ALARM_TIME
 import com.stop.ui.alarmsetting.AlarmSettingFragment.Companion.LAST_TIME
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -37,18 +36,20 @@ class AlarmSettingViewModel @Inject constructor(
     private val workManager: WorkManager
 ) : ViewModel() {
 
-    val alarmTime = MutableLiveData(0)
-    var alarmMethod = true
-
     private val _alarmItem = MutableStateFlow<AlarmUseCaseItem?>(null)
-    val alarmItem: StateFlow<AlarmUseCaseItem?> = _alarmItem
+    val alarmItem: StateFlow<AlarmUseCaseItem?>
+        get() = _alarmItem
+
+    private val _lastTimeCountDown = MutableLiveData("")
+    val lastTimeCountDown: LiveData<String>
+        get() = _lastTimeCountDown
 
     var alarmStatus = MutableStateFlow(AlarmStatus.NON_EXIST)
 
     private lateinit var workerId: UUID
 
-    private val _lastTimeCountDown = MutableLiveData("")
-    val lastTimeCountDown: LiveData<String> = _lastTimeCountDown
+    val alarmTime = MutableLiveData(0)
+    var alarmMethod = true
 
     fun saveAlarm(alarmUseCaseItem: AlarmUseCaseItem) {
         viewModelScope.launch(Dispatchers.IO) {