Merge pull request #64 from boostcampwm-2022/prepare-demo

koreatlwls · web-flow · commit 935db926afca · 2022-12-03T01:00:23.000+09:00
[PR] 모든 화면 연결 작업 완료
diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml
@@ -20,32 +20,17 @@
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_bus"
-        android:roundIcon="@mipmap/ic_bus_round"
         android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_bus_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Splash"
         android:usesCleartextTraffic="true"
         tools:targetApi="31">
 
-
-        <activity
-            android:name=".TestActivity"
-            android:excludeFromRecents="true"
-            android:exported="true"
-            android:launchMode="singleTop"
-            android:showOnLockScreen="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
         <receiver
             android:name=".AlarmReceiver"
-            android:enabled="true"/>
+            android:enabled="true" />
 
-        <service
-            android:name=".SoundService"/>
+        <service android:name=".SoundService" />
 
         <provider
             android:name="androidx.startup.InitializationProvider"
@@ -54,7 +39,11 @@
 
         <activity
             android:name=".MainActivity"
-            android:exported="true">
+            android:excludeFromRecents="true"
+            android:exported="true"
+            android:launchMode="singleTask"
+            android:showOnLockScreen="true"
+            android:theme="@style/Theme.Splash">
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/presentation/src/main/java/com/stop/AlarmFunctions.kt b/presentation/src/main/java/com/stop/AlarmFunctions.kt
@@ -4,7 +4,6 @@ import android.app.AlarmManager
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
-import android.os.Build
 import java.text.ParseException
 import java.text.SimpleDateFormat
 import java.util.*
@@ -20,11 +19,11 @@ class AlarmFunctions(
 
         val receiverIntent = Intent(context, AlarmReceiver::class.java)
         receiverIntent.apply {
-            putExtra("ALARM_REQUEST_CODE", alarmCode)
+            putExtra("ALARM_CODE", alarmCode)
             putExtra("ALARM_CONTENT", alarmContent)
         }
 
-        val pendingIntent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+        val pendingIntent = if (isMoreThanSnow()) {
             PendingIntent.getBroadcast(context, alarmCode, receiverIntent, PendingIntent.FLAG_IMMUTABLE)
         } else {
             PendingIntent.getBroadcast(context, alarmCode, receiverIntent, PendingIntent.FLAG_UPDATE_CURRENT)
@@ -62,7 +61,7 @@ class AlarmFunctions(
         val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
         val intent = Intent(context, AlarmReceiver::class.java)
 
-        pendingIntent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+        pendingIntent = if (isMoreThanSnow()) {
             PendingIntent.getBroadcast(context, alarmCode, intent, PendingIntent.FLAG_IMMUTABLE)
         } else {
             PendingIntent.getBroadcast(context, alarmCode, intent, PendingIntent.FLAG_UPDATE_CURRENT)
diff --git a/presentation/src/main/java/com/stop/AlarmReceiver.kt b/presentation/src/main/java/com/stop/AlarmReceiver.kt
@@ -11,7 +11,7 @@ import androidx.core.app.NotificationCompat
 class AlarmReceiver : BroadcastReceiver() {
 
     override fun onReceive(context: Context, intent: Intent) {
-        val requestCode = intent.extras?.getInt("ALARM_REQUEST_CODE") ?: -1
+        val alarmCode = intent.extras?.getInt("ALARM_CODE") ?: -1
         val alarmContent = intent.extras?.getString("ALARM_CONTENT") ?: ""
 
         val soundServiceIntent = Intent(context, SoundService::class.java)
@@ -26,8 +26,8 @@ class AlarmReceiver : BroadcastReceiver() {
                 }
             }
 
-            val pendingIntent = PendingIntent.getActivity(context, requestCode, Intent(context, TestActivity::class.java).apply {
-                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            val pendingIntent = PendingIntent.getActivity(context, alarmCode, Intent(context, MainActivity::class.java).apply {
+                putExtra("ALARM_CODE", alarmCode)
             }, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
 
             val builder = NotificationCompat.Builder(context, ALARM_RECEIVER_CHANNEL_ID)
@@ -47,8 +47,8 @@ class AlarmReceiver : BroadcastReceiver() {
         } else {
             context.startService(soundServiceIntent)
 
-            Intent(context, TestActivity::class.java).apply {
-                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            Intent(context, MainActivity::class.java).apply {
+                putExtra("ALARM_CODE", alarmCode)
                 context.startActivity(this)
             }
         }
diff --git a/presentation/src/main/java/com/stop/MainActivity.kt b/presentation/src/main/java/com/stop/MainActivity.kt
@@ -1,31 +1,49 @@
 package com.stop
 
+import android.app.KeyguardManager
 import android.content.Context
+import android.content.Intent
 import android.graphics.Rect
 import android.os.Bundle
-import com.stop.databinding.ActivityMainBinding
 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.navigation.fragment.NavHostFragment
+import com.stop.databinding.ActivityMainBinding
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
     private lateinit var binding: ActivityMainBinding
 
+    override fun onNewIntent(intent: Intent?) {
+        super.onNewIntent(intent)
+
+        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
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         installSplashScreen()
+
         super.onCreate(savedInstanceState)
 
         binding = ActivityMainBinding.inflate(layoutInflater)
-        hideStatusBar()
         setContentView(binding.root)
+
+        hideStatusBar()
+        showOverLockScreen()
     }
 
+
     private fun hideStatusBar() {
         window.setFlags(
             WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS,
@@ -55,4 +73,20 @@ class MainActivity : AppCompatActivity() {
             this.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
         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)
+        }
+    }
+
 }
diff --git a/presentation/src/main/java/com/stop/SoundService.kt b/presentation/src/main/java/com/stop/SoundService.kt
@@ -73,7 +73,7 @@ class SoundService : LifecycleService() {
 
     private fun createNotification() {
         val notificationManager = this.getSystemService(NotificationManager::class.java)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        if (isMoreThanOreo()) {
             if (notificationManager.getNotificationChannel(DEFAULT_NOTIFICATION_CHANNEL_ID) == null) {
                 NotificationChannel(DEFAULT_NOTIFICATION_CHANNEL_ID, DEFAULT_NOTIFICATION_CHANNEL_NAME, NotificationManager.IMPORTANCE_DEFAULT).apply {
                     notificationManager.createNotificationChannel(this)
@@ -109,4 +109,4 @@ class SoundService : LifecycleService() {
         private const val DEFAULT_NOTIFICATION_ID = 124
     }
 
-}
+}
diff --git a/presentation/src/main/java/com/stop/TestActivity.kt b/presentation/src/main/java/com/stop/TestActivity.kt
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,6 +9,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
+import androidx.navigation.findNavController
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
 import com.stop.AlarmFunctions
@@ -125,18 +126,12 @@ class AlarmSettingFragment : Fragment() {
         alarmSettingViewModel.saveAlarm()
         makeAlarm()
         //makeAlarmWorker()
-        //binding.root.findNavController().navigate(R.id.action_alarmSetting_to_mapFragment)
+        binding.root.findNavController().navigate(R.id.action_alarmSetting_to_mapFragment)
     }
 
-    private var test = true
     private fun makeAlarm() {
-        if (test) {
-            alarmFunctions.callAlarm("10:00:00", 4, 123, "막차알림")
-            test = !test
-        } else {
-            alarmFunctions.cancelAlarm(123)
-            test = !test
-        }
+        //TODO 알람 바꿔야함
+        alarmFunctions.callAlarm("00:00:05", 4, 123, "막차알림")
     }
 
     private fun makeAlarmWorker() {
diff --git a/presentation/src/main/java/com/stop/ui/alarmstart/AlarmStartFragment.kt b/presentation/src/main/java/com/stop/ui/alarmstart/AlarmStartFragment.kt
@@ -1,10 +1,14 @@
 package com.stop.ui.alarmstart
 
+import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
+import androidx.navigation.findNavController
+import com.stop.R
+import com.stop.SoundService
 import com.stop.databinding.FragmentAlarmStartBinding
 
 class AlarmStartFragment : Fragment() {
@@ -25,6 +29,25 @@ class AlarmStartFragment : Fragment() {
         return binding.root
     }
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        listenButton()
+    }
+
+    private fun listenButton() {
+        with(binding) {
+            textViewAlarmQuit.setOnClickListener {
+                val intent = Intent(context, SoundService::class.java)
+                context?.stopService(intent)
+            }
+
+            textViewMissionStart.setOnClickListener {
+                root.findNavController().navigate(R.id.action_alarmStartFragment_to_missionFragment)
+            }
+        }
+    }
+
     override fun onDestroyView() {
         _binding = null
 
diff --git a/presentation/src/main/java/com/stop/ui/map/MapTMap.kt b/presentation/src/main/java/com/stop/ui/map/MapTMap.kt
@@ -10,7 +10,6 @@ import com.skt.tmap.poi.TMapPOIItem
 import com.stop.model.Location
 import com.stop.ui.util.Marker
 import com.stop.ui.util.TMap
-import java.util.ArrayList
 
 class MapTMap(
     context: Context,
diff --git a/presentation/src/main/java/com/stop/ui/routedetail/RouteDetailFragment.kt b/presentation/src/main/java/com/stop/ui/routedetail/RouteDetailFragment.kt
@@ -6,6 +6,8 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.activityViewModels
+import androidx.navigation.findNavController
+import com.stop.R
 import com.stop.databinding.FragmentRouteDetailBinding
 import com.stop.ui.route.RouteViewModel
 import dagger.hilt.android.AndroidEntryPoint
@@ -40,7 +42,10 @@ class RouteDetailFragment : Fragment() {
     }
 
     private fun initView() {
-
+        //TODO 임시 화면이동 로직
+        binding.root.setOnClickListener {
+            binding.root.findNavController().navigate(R.id.action_routeDetailFragment_to_alarmSetting)
+        }
     }
 
     override fun onDestroyView() {
diff --git a/presentation/src/main/res/layout/activity_test.xml b/presentation/src/main/res/layout/activity_test.xml
diff --git a/presentation/src/main/res/layout/fragment_alarm_setting.xml b/presentation/src/main/res/layout/fragment_alarm_setting.xml
@@ -34,6 +34,13 @@
             android:orientation="vertical"
             app:layout_constraintGuide_end="16dp" />
 
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/guideline_top"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            app:layout_constraintGuide_begin="55dp" />
+
         <TextView
             android:id="@+id/text_view_last_time"
             android:layout_width="0dp"
@@ -43,7 +50,7 @@
             android:textSize="18sp"
             app:layout_constraintEnd_toEndOf="@id/guide_line_end"
             app:layout_constraintStart_toStartOf="@id/guide_line_start"
-            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintTop_toTopOf="@id/guideline_top"
             tools:text="막차가 23시30분에 도착할 예정이에요!!" />
 
         <androidx.cardview.widget.CardView
diff --git a/presentation/src/main/res/layout/fragment_place_search.xml b/presentation/src/main/res/layout/fragment_place_search.xml

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import androidx.core.app.NotificationCompat`
`11`	`11`	`class AlarmReceiver : BroadcastReceiver() {`
`12`	`12`
`13`	`13`	`override fun onReceive(context: Context, intent: Intent) {`
`14`		`- val requestCode = intent.extras?.getInt("ALARM_REQUEST_CODE") ?: -1`
	`14`	`+ val alarmCode = intent.extras?.getInt("ALARM_CODE") ?: -1`
`15`	`15`	`val alarmContent = intent.extras?.getString("ALARM_CONTENT") ?: ""`
`16`	`16`
`17`	`17`	`val soundServiceIntent = Intent(context, SoundService::class.java)`
`@@ -26,8 +26,8 @@ class AlarmReceiver : BroadcastReceiver() {`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`
`29`		`- val pendingIntent = PendingIntent.getActivity(context, requestCode, Intent(context, TestActivity::class.java).apply {`
`30`		`- addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)`
	`29`	`+ val pendingIntent = PendingIntent.getActivity(context, alarmCode, Intent(context, MainActivity::class.java).apply {`
	`30`	`+ putExtra("ALARM_CODE", alarmCode)`
`31`	`31`	`}, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)`
`32`	`32`
`33`	`33`	`val builder = NotificationCompat.Builder(context, ALARM_RECEIVER_CHANNEL_ID)`
`@@ -47,8 +47,8 @@ class AlarmReceiver : BroadcastReceiver() {`
`47`	`47`	`} else {`
`48`	`48`	`context.startService(soundServiceIntent)`
`49`	`49`
`50`		`- Intent(context, TestActivity::class.java).apply {`
`51`		`- addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)`
	`50`	`+ Intent(context, MainActivity::class.java).apply {`
	`51`	`+ putExtra("ALARM_CODE", alarmCode)`
`52`	`52`	`context.startActivity(this)`
`53`	`53`	`}`
`54`	`54`	`}`