Merge pull request #93 from boostcampwm-2022/89-feature-alarm-background-bug

[PR] 알람 버그 수정

Author: koreatlwls

data/src/main/java/com/stop/data/local/model/Alarm.kt

@@ -8,7 +8,7 @@ import com.stop.domain.model.route.tmap.custom.Route
 data class Alarm(
     val startPosition: String,
     val endPosition: String,
-    val routes: List<Route>,
+    val routes: Route,
     val lastTime: String, // 막차 시간 -> 23:30:15 시분초
     val walkTime : Int, // 도보시간 -> 분단위
     val alarmTime: Int, // 10분 전 알람 설정 -> 10

data/src/main/java/com/stop/data/model/alarm/AlarmRepositoryItem.kt

@@ -7,7 +7,7 @@ import com.stop.domain.model.route.tmap.custom.Route
 data class AlarmRepositoryItem(
     val startPosition: String,
     val endPosition: String,
-    val routes: List<Route>,
+    val routes: Route,
     val lastTime: String, // 막차 시간 -> 23:30:15 시분초
     val walkTime : Int, // 도보시간 -> 분단위
     val alarmTime: Int, // 10분 전 알람 설정 -> 10

domain/src/main/java/com/stop/domain/model/alarm/AlarmUseCaseItem.kt

@@ -5,7 +5,7 @@ import com.stop.domain.model.route.tmap.custom.Route
 data class AlarmUseCaseItem(
     val startPosition: String,
     val endPosition: String,
-    val routes: List<Route>,
+    val routes: Route,
     val lastTime: String, // 막차 시간 -> 23:30:15 시분초
     val walkTime : Int, // 도보시간 -> 분단위
     val alarmTime: Int, // 10분 전 알람 설정 -> 10

presentation/src/main/AndroidManifest.xml

@@ -6,7 +6,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
@@ -33,6 +33,8 @@
 
         <service android:name=".alarm.SoundService" />
 
+        <service android:name=".alarm.SoundRestartService" />
+
         <provider
             android:name="androidx.startup.InitializationProvider"
             android:authorities="${applicationId}.androidx-startup"
@@ -44,13 +46,17 @@
             tools:node="merge" />
 
         <activity
-            android:name=".MainActivity"
-            android:excludeFromRecents="true"
+            android:name=".AlarmActivity"
             android:exported="true"
-            android:launchMode="singleTask"
             android:screenOrientation="portrait"
             android:showOnLockScreen="true"
+            android:theme="@style/Theme.PlzStop" />
+
+        <activity
+            android:name=".MainActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
+            android:exported="true"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.Splash">
 
             <intent-filter>

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

@@ -0,0 +1,46 @@
+package com.stop
+
+import android.app.KeyguardManager
+import android.content.Context
+import android.os.Bundle
+import android.view.WindowManager
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.WindowCompat
+import com.stop.databinding.ActivityAlarmBinding
+import dagger.hilt.android.AndroidEntryPoint
+
+@AndroidEntryPoint
+class AlarmActivity : AppCompatActivity() {
+
+    private lateinit var binding: ActivityAlarmBinding
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        WindowCompat.setDecorFitsSystemWindows(window, false)
+        super.onCreate(savedInstanceState)
+
+        binding = ActivityAlarmBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        binding.navHostFragment.setPadding(0, 0, 0, this.navigationHeight())
+        showOverLockScreen()
+    }
+
+    private fun showOverLockScreen() {
+        window.addFlags(
+            WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON or
+                    WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD or
+                    WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or
+                    WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
+        )
+
+        if (isMoreThanOreoMr1()) {
+            setShowWhenLocked(true)
+            setTurnScreenOn(true)
+            (getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager).requestDismissKeyguard(
+                this,
+                null
+            )
+        }
+    }
+
+}

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

@@ -1,57 +1,22 @@
 package com.stop
 
-import android.app.KeyguardManager
 import android.content.Context
-import android.content.Intent
 import android.graphics.Rect
 import android.os.Bundle
 import android.view.MotionEvent
 import android.view.View
-import android.view.WindowManager
 import android.view.inputmethod.InputMethodManager
 import android.widget.EditText
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.WindowCompat
-import androidx.navigation.fragment.NavHostFragment
 import com.stop.databinding.ActivityMainBinding
-import com.stop.ui.alarmsetting.AlarmSettingFragment.Companion.ALARM_CODE
-import com.stop.ui.mission.MissionWorker.Companion.MISSION_CODE
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
     private lateinit var binding: ActivityMainBinding
 
-    override fun onNewIntent(intent: Intent?) {
-        super.onNewIntent(intent)
-        setIntent(intent)
-
-        intent?.extras?.getInt("ALARM_CODE")?.let {
-            if (it == ALARM_CODE) {
-                val navHostFragment =
-                    supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as NavHostFragment
-                val inflater = navHostFragment.navController.navInflater
-                val graph = inflater.inflate(R.navigation.nav_graph)
-                graph.setStartDestination(R.id.alarmStartFragment)
-
-                navHostFragment.navController.graph = graph
-            }
-        }
-
-        intent?.extras?.getInt("MISSION_CODE")?.let {
-            if (it == MISSION_CODE) {
-                val navHostFragment =
-                    supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as NavHostFragment
-                val inflater = navHostFragment.navController.navInflater
-                val graph = inflater.inflate(R.navigation.nav_graph)
-                graph.setStartDestination(R.id.missionFragment)
-
-                navHostFragment.navController.graph = graph
-            }
-        }
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         installSplashScreen()
         WindowCompat.setDecorFitsSystemWindows(window, false)
@@ -61,7 +26,6 @@ class MainActivity : AppCompatActivity() {
         setContentView(binding.root)
 
         binding.navHostFragment.setPadding(0, 0, 0, this.navigationHeight())
-        showOverLockScreen()
     }
 
     override fun dispatchTouchEvent(event: MotionEvent): Boolean {
@@ -87,22 +51,4 @@ class MainActivity : AppCompatActivity() {
         inputMethodManager.hideSoftInputFromWindow(view.windowToken, 0)
     }
 
-    private fun showOverLockScreen() {
-        window.addFlags(
-            WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON or
-                    WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD or
-                    WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or
-                    WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
-        )
-
-        if (isMoreThanOreoMr1()) {
-            setShowWhenLocked(true)
-            setTurnScreenOn(true)
-            (getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager).requestDismissKeyguard(
-                this,
-                null
-            )
-        }
-    }
-
 }

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

@@ -4,62 +4,44 @@ import android.app.NotificationManager
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import com.stop.MainActivity
+import com.stop.AlarmActivity
 import com.stop.R
 import com.stop.isMoreThanOreo
 import com.stop.ui.alarmsetting.AlarmSettingFragment.Companion.ALARM_CODE
 import com.stop.ui.alarmsetting.AlarmSettingFragment.Companion.ALARM_NOTIFICATION_HIGH_ID
 import com.stop.ui.alarmsetting.AlarmSettingFragment.Companion.ALARM_NOTIFICATION_ID
 import com.stop.util.getAlarmReceiverNotification
 import com.stop.util.getAlarmReceiverPendingIntent
-import com.stop.util.getAlarmScreenOnNotification
-import com.stop.util.isScreenOn
 
 class AlarmReceiver : BroadcastReceiver() {
 
     override fun onReceive(context: Context, intent: Intent) {
         val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
         notificationManager.cancel(ALARM_NOTIFICATION_ID)
 
-        val soundServiceIntent = Intent(context, SoundService::class.java)
         val content = context.getString(R.string.alarm_content_text)
 
-        if (context.isScreenOn()) {
-            if (isMoreThanOreo()) {
-                context.startForegroundService(soundServiceIntent)
-            } else {
-                context.startService(soundServiceIntent)
-            }
+        if (isMoreThanOreo()) {
+            val soundRestartServiceIntent = Intent(context, SoundRestartService::class.java)
+            context.startForegroundService(soundRestartServiceIntent)
 
             val alarmStartPendingIntent = context.getAlarmReceiverPendingIntent()
-            val alarmStartNotification = context.getAlarmScreenOnNotification(alarmStartPendingIntent, content)
+            val alarmStartNotification = context.getAlarmReceiverNotification(
+                alarmStartPendingIntent,
+                content
+            )
 
-            notificationManager.notify(ALARM_NOTIFICATION_ID, alarmStartNotification)
+            notificationManager.notify(ALARM_NOTIFICATION_HIGH_ID, alarmStartNotification)
+        } else {
+            val soundServiceIntent = Intent(context, SoundService::class.java)
+            context.startService(soundServiceIntent)
 
-            /*Intent(context, MainActivity::class.java).apply {
+            Intent(context, AlarmActivity::class.java).apply {
                 putExtra("ALARM_CODE", ALARM_CODE)
+                flags = Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK
                 context.startActivity(this)
-            }*/
-        } else {
-            if (isMoreThanOreo()) {
-                context.startForegroundService(soundServiceIntent)
-
-                val alarmStartPendingIntent = context.getAlarmReceiverPendingIntent()
-                val alarmStartNotification = context.getAlarmReceiverNotification(
-                    alarmStartPendingIntent,
-                    content
-                )
-
-                notificationManager.notify(ALARM_NOTIFICATION_HIGH_ID, alarmStartNotification)
-            } else {
-                context.startService(soundServiceIntent)
-                Intent(context, MainActivity::class.java).apply {
-                    putExtra("ALARM_CODE", ALARM_CODE)
-                    context.startActivity(this)
-                }
             }
         }
-
     }
 
 }

presentation/src/main/java/com/stop/alarm/SoundRestartService.kt

@@ -0,0 +1,50 @@
+package com.stop.alarm
+
+import android.app.*
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import android.os.IBinder
+import androidx.core.app.NotificationCompat
+import com.stop.AlarmActivity
+import com.stop.R
+
+class SoundRestartService : Service() {
+
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        val builder = NotificationCompat.Builder(this, "default")
+        builder.setSmallIcon(R.mipmap.ic_bus)
+        builder.setContentTitle(null)
+        builder.setContentText(null)
+
+        val notificationIntent = Intent(this, AlarmActivity::class.java)
+        val pendingIntent: PendingIntent = PendingIntent.getActivity(this, 0, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
+        builder.setContentIntent(pendingIntent)
+
+        val manager: NotificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            manager.createNotificationChannel(
+                NotificationChannel(
+                    "default",
+                    "기본 채널",
+                    NotificationManager.IMPORTANCE_NONE
+                )
+            )
+        }
+
+        val notification: Notification = builder.build()
+        startForeground(9, notification)
+
+        val serviceIntent = Intent(this, SoundService::class.java)
+
+        startService(serviceIntent)
+        stopForeground(true)
+        stopSelf()
+
+        return START_NOT_STICKY
+    }
+
+    override fun onBind(intent: Intent?): IBinder? {
+        return null
+    }
+}