Skip to content

Commit feb2e98

Browse files
committed
style : 패키지 정리
1 parent 4ae1deb commit feb2e98

File tree

12 files changed

+23
-14
lines changed

12 files changed

+23
-14
lines changed

presentation/src/main/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
tools:targetApi="31">
2929

3030
<receiver
31-
android:name=".AlarmReceiver"
31+
android:name=".alarm.AlarmReceiver"
3232
android:enabled="true" />
3333

34-
<service android:name=".SoundService" />
34+
<service android:name=".alarm.SoundService" />
3535

3636
<provider
3737
android:name="androidx.startup.InitializationProvider"

presentation/src/main/java/com/stop/AlarmFunctions.kt renamed to presentation/src/main/java/com/stop/alarm/AlarmFunctions.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
package com.stop
1+
package com.stop.alarm
22

33
import android.app.AlarmManager
44
import android.app.PendingIntent
55
import android.content.Context
66
import android.content.Intent
7+
import com.stop.isMoreThanSnow
8+
import com.stop.makeFullTime
79

810
class AlarmFunctions(
911
private val context: Context

presentation/src/main/java/com/stop/AlarmReceiver.kt renamed to presentation/src/main/java/com/stop/alarm/AlarmReceiver.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.stop
1+
package com.stop.alarm
22

33
import android.app.NotificationChannel
44
import android.app.NotificationManager
@@ -7,7 +7,10 @@ import android.content.BroadcastReceiver
77
import android.content.Context
88
import android.content.Intent
99
import androidx.core.app.NotificationCompat
10-
import com.stop.LastTimeCheckWorker.Companion.NOTIFICATION_ID
10+
import com.stop.alarm.LastTimeCheckWorker.Companion.NOTIFICATION_ID
11+
import com.stop.MainActivity
12+
import com.stop.R
13+
import com.stop.isMoreThanOreo
1114

1215
class AlarmReceiver : BroadcastReceiver() {
1316

presentation/src/main/java/com/stop/LastTimeCheckWorker.kt renamed to presentation/src/main/java/com/stop/alarm/LastTimeCheckWorker.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.stop
1+
package com.stop.alarm
22

33
import android.app.NotificationChannel
44
import android.app.NotificationManager
@@ -9,7 +9,10 @@ import androidx.work.CoroutineWorker
99
import androidx.work.ForegroundInfo
1010
import androidx.work.WorkManager
1111
import androidx.work.WorkerParameters
12+
import com.stop.R
1213
import com.stop.domain.usecase.nearplace.GetNearPlacesUseCase
14+
import com.stop.isMoreThanOreo
15+
import com.stop.makeFullTime
1316
import com.stop.ui.alarmsetting.AlarmSettingFragment.Companion.ALARM_CODE
1417
import com.stop.ui.alarmsetting.AlarmSettingFragment.Companion.ALARM_TIME
1518
import com.stop.ui.alarmsetting.AlarmSettingFragment.Companion.LAST_TIME

presentation/src/main/java/com/stop/SoundService.kt renamed to presentation/src/main/java/com/stop/alarm/SoundService.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.stop
1+
package com.stop.alarm
22

33
import android.app.NotificationChannel
44
import android.app.NotificationManager
@@ -10,6 +10,7 @@ import android.os.*
1010
import androidx.core.app.NotificationCompat
1111
import androidx.lifecycle.LifecycleService
1212
import androidx.lifecycle.lifecycleScope
13+
import com.stop.*
1314
import com.stop.domain.usecase.alarm.DeleteAlarmUseCase
1415
import com.stop.domain.usecase.alarm.GetAlarmUseCase
1516
import dagger.hilt.android.AndroidEntryPoint

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.stop.di
22

33
import android.content.Context
44
import androidx.work.WorkManager
5-
import com.stop.AlarmFunctions
5+
import com.stop.alarm.AlarmFunctions
66
import dagger.Module
77
import dagger.Provides
88
import dagger.hilt.InstallIn

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import androidx.lifecycle.viewModelScope
77
import androidx.work.OneTimeWorkRequestBuilder
88
import androidx.work.WorkManager
99
import androidx.work.workDataOf
10-
import com.stop.AlarmFunctions
11-
import com.stop.LastTimeCheckWorker
10+
import com.stop.alarm.AlarmFunctions
11+
import com.stop.alarm.LastTimeCheckWorker
1212
import com.stop.convertTimeMillisToString
1313
import com.stop.domain.model.alarm.AlarmUseCaseItem
1414
import com.stop.domain.usecase.alarm.DeleteAlarmUseCase
@@ -45,7 +45,7 @@ class AlarmSettingViewModel @Inject constructor(
4545
private val _isAlarmItemNotNull = MutableStateFlow(false)
4646
val isAlarmItemNotNull: StateFlow<Boolean> = _isAlarmItemNotNull
4747

48-
private lateinit var workerId : UUID
48+
private lateinit var workerId: UUID
4949

5050
private val _lastTimeCountDown = MutableLiveData("")
5151
val lastTimeCountDown: LiveData<String> = _lastTimeCountDown
@@ -81,7 +81,7 @@ class AlarmSettingViewModel @Inject constructor(
8181
alarmFunctions.cancelAlarm(ALARM_CODE)
8282
}
8383

84-
fun makeAlarmWorker(time : String) {
84+
fun makeAlarmWorker(time: String) {
8585
val workData = workDataOf(
8686
LAST_TIME to time,
8787
ALARM_TIME to alarmTime.value

presentation/src/main/java/com/stop/ui/alarmstart/AlarmStartFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import androidx.fragment.app.Fragment
99
import androidx.fragment.app.activityViewModels
1010
import androidx.navigation.findNavController
1111
import com.stop.R
12-
import com.stop.SoundService
12+
import com.stop.alarm.SoundService
1313
import com.stop.databinding.FragmentAlarmStartBinding
1414
import com.stop.ui.alarmsetting.AlarmSettingViewModel
1515

presentation/src/main/java/com/stop/ui/map/MapFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior
1818
import com.skt.tmap.TMapPoint
1919
import com.stop.R
2020
import com.stop.RouteNavGraphDirections
21-
import com.stop.SoundService
21+
import com.stop.alarm.SoundService
2222
import com.stop.databinding.FragmentMapBinding
2323
import com.stop.model.Location
2424
import com.stop.ui.alarmsetting.AlarmSettingViewModel

0 commit comments

Comments
 (0)