Merge pull request #204 from depromeet/feat/alarm-fix#177

 [#203] 현위치 버튼 위치 수정 & 일부 알람 로직 개선

Author: hyuns66

app/build.gradle.kts

@@ -39,8 +39,8 @@ android {
         applicationId = "com.depromeet.team6"
         minSdk = 26
         targetSdk = 35
-        versionCode = 14
-        versionName = "1.3.0"
+        versionCode = 16
+        versionName = "1.3.11"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         buildConfigField("String", "KAKAO_NATIVE_APP_KEY", properties["kakao.native.app.key"].toString())

app/src/main/java/com/depromeet/team6/data/background/LockService.kt

@@ -34,6 +34,7 @@ import com.google.android.gms.location.LocationServices
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.cancel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -62,6 +63,7 @@ class LockService : Service() {
     private val notificationManager by lazy {
         getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
     }
+    private val timerScope = CoroutineScope(Dispatchers.Default)
 
     private fun playAlarm() {
         val isSound = userInfoRepositoryImpl.getAlarmSound()
@@ -191,11 +193,6 @@ class LockService : Service() {
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         Log.d("LockService", "onStartCommand 호출됨")
 
-        if (intent?.action == ACTION_STOP_ALARM_SOUND) {
-            stopAlarm()
-            return START_STICKY
-        }
-
         startLockReceiver()
         wakeLockAcquire()
 
@@ -207,7 +204,10 @@ class LockService : Service() {
 
                 lockScreenNavigator.navigateToLockScreen(applicationContext, taxiCost)
             }
+        }
 
+        // 2분 후 알람 종료
+        timerScope.launch {
             delay(ALARM_DURATION_MS)
             withContext(Dispatchers.Main) {
                 AmplitudeUtils.trackEventWithProperties(
@@ -227,10 +227,16 @@ class LockService : Service() {
                 )
 
                 val notification = NotificationCompat.Builder(this@LockService, ATCHA_SERVICE_CHANNEL_ID)
+                    .setContentTitle(
+                        ContextCompat.getString(
+                            this@LockService,
+                            R.string.notification_alarm_timeout_title
+                        )
+                    )
                     .setContentText(
                         ContextCompat.getString(
                             this@LockService,
-                            R.string.notification_alarm_timeout
+                            R.string.notification_alarm_timeout_body
                         )
                     )
                     .setSmallIcon(R.drawable.ic_app_logo_foreground)
@@ -254,6 +260,7 @@ class LockService : Service() {
         stopAlarm()
         vibrationTimer?.cancel()
         vibrationTimer = null
+        timerScope.cancel()
         super.onDestroy()
     }
 
@@ -283,8 +290,6 @@ class LockService : Service() {
         }
     }
     companion object {
-        const val ACTION_STOP_ALARM_SOUND = "com.depromeet.team6.STOP_ALARM_SOUND"
-
         const val ALARM_NOTIFICATION_ID = 1
         const val ALARM_NOTIFICATION_TIMEOUT_ID = 2
 

app/src/main/java/com/depromeet/team6/domain/usecase/GetCourseSearchResultsUseCase.kt

@@ -38,12 +38,12 @@ class GetCourseSearchResultsUseCase @Inject constructor(
             "REQ_001" -> TODO()
             "REQ_002" -> TODO()
             "TOK_002" -> ErrorControlFailureException.NavigateAndShowToastException(toastMessage = API_ERROR_LOGIN_TOKEN_EXPIRED, route = Route.Login)
-            "USR_002" -> ErrorControlFailureException.NavigateAndShowToastException(toastMessage = API_ERROR_INVALID_LOCATION, route = Route.Home)
-            "LOC_003" -> ErrorControlFailureException.NavigateAndShowToastException(toastMessage = API_ERROR_INVALID_LOCATION, route = Route.Home)
-            "LOC_004" -> ErrorControlFailureException.NavigateAndShowToastException(toastMessage = API_ERROR_INVALID_LOCATION, route = Route.Home)
+            "USR_002" -> ErrorControlFailureException.NavigateAndShowToastException(toastMessage = API_ERROR_INVALID_LOCATION, route = Route.Back)
+            "LOC_003" -> ErrorControlFailureException.NavigateAndShowToastException(toastMessage = API_ERROR_INVALID_LOCATION, route = Route.Back)
+            "LOC_004" -> ErrorControlFailureException.NavigateAndShowToastException(toastMessage = API_ERROR_INVALID_LOCATION, route = Route.Back)
             "TRS_001" -> TODO()
-            "TRS_011" -> ErrorControlFailureException.NavigateAndShowToastException(toastMessage = API_ERROR_SHORT_DISTANCE, route = Route.Home)
-            "TRS_012" -> ErrorControlFailureException.NavigateAndShowToastException(toastMessage = API_ERROR_OUT_OF_SERVICE_REGION, route = Route.Home)
+            "TRS_011" -> ErrorControlFailureException.NavigateAndShowToastException(toastMessage = API_ERROR_SHORT_DISTANCE, route = Route.Back)
+            "TRS_012" -> ErrorControlFailureException.NavigateAndShowToastException(toastMessage = API_ERROR_OUT_OF_SERVICE_REGION, route = Route.Back)
             "INTERNAL_SERVER_ERROR" -> ErrorControlFailureException.ShowToastException(toastMessage = API_ERROR_NETWORK_FAILURE)
             else -> ErrorControlFailureException.ShowToastException(API_ERROR_NETWORK_FAILURE)
         }

app/src/main/java/com/depromeet/team6/presentation/ui/coursesearch/CourseSearchScreen.kt

@@ -8,7 +8,6 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.CircularProgressIndicator
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
@@ -26,6 +25,7 @@ import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.depromeet.team6.R
 import com.depromeet.team6.domain.model.course.LegInfo
+import com.depromeet.team6.presentation.ui.common.view.AtChaLoadingView
 import com.depromeet.team6.presentation.ui.coursesearch.component.CourseAppBar
 import com.depromeet.team6.presentation.ui.coursesearch.component.DestinationSearchBar
 import com.depromeet.team6.presentation.ui.coursesearch.component.TransportTabMenu
@@ -54,6 +54,7 @@ fun CourseSearchRoute(
     navigateToHome: () -> Unit,
     navigateToHomeAfterAlarmRegister: () -> Unit,
     navigateToLogin: () -> Unit,
+    popBackStack: () -> Unit,
     fromLockScreen: Boolean = false,
     viewModel: CourseSearchViewModel = hiltViewModel()
 ) {
@@ -104,6 +105,10 @@ fun CourseSearchRoute(
                     navigateToHome()
                 }
 
+                is ApiErrorSideEffect.NavigateToBackSideEffect -> {
+                    popBackStack()
+                }
+
                 is ApiErrorSideEffect.NavigateToLoginSideEffect -> {
                     navigateToLogin()
                 }
@@ -134,7 +139,7 @@ fun CourseSearchRoute(
                     .padding(padding)
             )
             Box(modifier = Modifier.fillMaxSize()) {
-                CircularProgressIndicator(modifier = Modifier.align(Alignment.Center))
+                AtChaLoadingView()
             }
         }
 

app/src/main/java/com/depromeet/team6/presentation/ui/coursesearch/component/SearchResultEmpty.kt

@@ -23,7 +23,8 @@ import com.depromeet.team6.ui.theme.defaultTeam6Typography
 
 @Composable
 fun SearchResultEmpty(
-    modifier: Modifier = Modifier
+    modifier: Modifier = Modifier,
+    isApiError: Boolean = false
 ) {
     Box(
         modifier = modifier

app/src/main/java/com/depromeet/team6/presentation/ui/coursesearch/component/TransportTabMenu.kt

@@ -21,6 +21,8 @@ import com.depromeet.team6.domain.model.course.LegInfo
 import com.depromeet.team6.presentation.ui.itinerary.LegInfoDummyProvider
 import com.depromeet.team6.ui.theme.defaultTeam6Colors
 import kotlinx.coroutines.launch
+import java.time.LocalTime
+import java.time.ZoneId
 
 @Composable
 fun TransportTabMenu(
@@ -70,25 +72,34 @@ fun TransportTabMenu(
                 } else {
                     availableCourses.filter { it.filterCategory == page }
                 }
-
-            if (resultItems.isEmpty() && isLoaded) {
-                SearchResultEmpty(
-                    modifier = Modifier.padding(top = 10.dp)
-                )
-            } else {
-                LastTransportInfoList(
-                    listData = resultItems,
-                    onItemClick = onItemClick,
-                    courseInfoToggleClick = courseInfoToggleClick,
-                    onRegisterAlarmBtnClick = { routeId ->
-                        onRegisterAlarmBtnClick(routeId)
-                    }
-                )
+            if (isLoaded) {
+                if (resultItems.isEmpty() || isMidNight()) {
+                    SearchResultEmpty(
+                        modifier = Modifier.padding(top = 10.dp)
+                    )
+                } else {
+                    LastTransportInfoList(
+                        listData = resultItems,
+                        onItemClick = onItemClick,
+                        courseInfoToggleClick = courseInfoToggleClick,
+                        onRegisterAlarmBtnClick = { routeId ->
+                            onRegisterAlarmBtnClick(routeId)
+                        }
+                    )
+                }
             }
         }
     }
 }
 
+private fun isMidNight(): Boolean {
+    val currentTime = LocalTime.now(ZoneId.systemDefault())
+    val midnight = LocalTime.MIDNIGHT // 00:00:00
+    val fiveAM = LocalTime.of(5, 0, 0) // 05:00:00
+
+    return !currentTime.isBefore(midnight) && currentTime.isBefore(fiveAM)
+}
+
 @Preview
 @Composable
 fun PreviewTabMenu(

app/src/main/java/com/depromeet/team6/presentation/ui/coursesearch/navigation/CourseSearchNavigation.kt

@@ -22,7 +22,8 @@ fun NavGraphBuilder.courseSearchNavGraph(
     navigateToHome: () -> Unit,
     navigateToHomeAfterAlarmRegister: () -> Unit,
     navigateToLogin: () -> Unit,
-    navigateToItinerary: (String, String, String) -> Unit
+    navigateToItinerary: (String, String, String) -> Unit,
+    popBackStack: () -> Unit
 ) {
     composable(
         route = "${CourseSearchRoute.ROUTE}/{${CourseSearchRoute.DEPARTURE_POINT}}/{${CourseSearchRoute.DESTINATION_POINT}}",
@@ -45,6 +46,7 @@ fun NavGraphBuilder.courseSearchNavGraph(
             navigateToHome = navigateToHome,
             navigateToHomeAfterAlarmRegister = navigateToHomeAfterAlarmRegister,
             navigateToLogin = navigateToLogin,
+            popBackStack = popBackStack,
             departurePoint = departurePoint,
             destinationPoint = destinationPoint,
             fromLockScreen = fromLockScreen

app/src/main/java/com/depromeet/team6/presentation/ui/home/HomeContract.kt

@@ -26,6 +26,7 @@ class HomeContract {
         val showSpeechBubble: Boolean = true,
         val locationAddress: String = "",
         val currentLocation: LatLng = LatLng(DEFAULT_LAT, DEFAULT_LNG),
+        val isMapFocused: Boolean = true,
         // 알림 등록 후 경로 표시
         val itineraryInfo: CourseInfo? = null,
         val courseDataLoadState: LoadState = LoadState.Idle,