Skip to content

Commit 5b2fcff

Browse files
committed
feat : 알람 세팅 -> 메인 알람 시작 -> 미션 화면 이동 추가
1 parent e0a5907 commit 5b2fcff

File tree

4 files changed

+28
-14
lines changed

4 files changed

+28
-14
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@ class MainActivity : AppCompatActivity() {
2828
binding = ActivityMainBinding.inflate(layoutInflater)
2929
setContentView(binding.root)
3030

31-
// TODO 버튼을 통해서 소리나 진동 끄기로 바꿔야함 !!
32-
val intent = Intent(this, SoundService::class.java)
33-
this.stopService(intent)
34-
3531
setStartDestination()
3632
hideStatusBar()
3733
showOverLockScreen()

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

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import android.view.View
99
import android.view.ViewGroup
1010
import androidx.fragment.app.Fragment
1111
import androidx.fragment.app.viewModels
12+
import androidx.navigation.findNavController
1213
import androidx.work.PeriodicWorkRequestBuilder
1314
import androidx.work.WorkManager
1415
import com.stop.AlarmFunctions
@@ -125,18 +126,12 @@ class AlarmSettingFragment : Fragment() {
125126
alarmSettingViewModel.saveAlarm()
126127
makeAlarm()
127128
//makeAlarmWorker()
128-
//binding.root.findNavController().navigate(R.id.action_alarmSetting_to_mapFragment)
129+
binding.root.findNavController().navigate(R.id.action_alarmSetting_to_mapFragment)
129130
}
130131

131-
private var test = true
132132
private fun makeAlarm() {
133-
if (test) {
134-
alarmFunctions.callAlarm("10:00:00", 4, 123, "막차알림")
135-
test = !test
136-
} else {
137-
alarmFunctions.cancelAlarm(123)
138-
test = !test
139-
}
133+
//TODO 알람 바꿔야함
134+
alarmFunctions.callAlarm("10:00:00", 4, 123, "막차알림")
140135
}
141136

142137
private fun makeAlarmWorker() {

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
package com.stop.ui.alarmstart
22

3+
import android.content.Intent
34
import android.os.Bundle
45
import android.view.LayoutInflater
56
import android.view.View
67
import android.view.ViewGroup
78
import androidx.fragment.app.Fragment
9+
import androidx.navigation.findNavController
10+
import com.stop.R
11+
import com.stop.SoundService
812
import com.stop.databinding.FragmentAlarmStartBinding
913

1014
class AlarmStartFragment : Fragment() {
@@ -25,6 +29,25 @@ class AlarmStartFragment : Fragment() {
2529
return binding.root
2630
}
2731

32+
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
33+
super.onViewCreated(view, savedInstanceState)
34+
35+
listenButton()
36+
}
37+
38+
private fun listenButton() {
39+
with(binding) {
40+
textViewAlarmQuit.setOnClickListener {
41+
val intent = Intent(context, SoundService::class.java)
42+
context?.stopService(intent)
43+
}
44+
45+
textViewMissionStart.setOnClickListener {
46+
root.findNavController().navigate(R.id.action_alarmStartFragment_to_missionFragment)
47+
}
48+
}
49+
}
50+
2851
override fun onDestroyView() {
2952
_binding = null
3053

presentation/src/main/res/navigation/nav_graph.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
xmlns:tools="http://schemas.android.com/tools"
55
android:id="@+id/nav_graph"
6-
app:startDestination="@id/alarmSetting">
6+
app:startDestination="@id/mapFragment">
77

88
<fragment
99
android:id="@+id/mapFragment"

0 commit comments

Comments
 (0)