Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FEAT] 알람 해제 후 미션 화면 연결 #119

Merged
merged 2 commits into from
Feb 13, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,15 @@

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>

<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data
android:scheme="orbitapp"
android:host="mission"/>
</intent-filter>
</activity>

<activity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package com.yapp.alarm.receivers
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import android.net.Uri
import android.util.Log
import androidx.activity.ComponentActivity
import com.yapp.alarm.AlarmConstants
Expand All @@ -12,6 +13,10 @@ class AlarmInteractionActivityReceiver(private val activity: ComponentActivity)
Log.d("AlarmInteractionActivityReceiver", "알람 수신, AlarmAlertActivity 종료")
if (intent?.action == AlarmConstants.ACTION_ALARM_INTERACTION_ACTIVITY_CLOSE) {
activity.finish()
context?.let {
val missionIntent = Intent(Intent.ACTION_VIEW, Uri.parse("orbitapp://mission"))
it.startActivity(missionIntent)
}
}
}
}
38 changes: 26 additions & 12 deletions feature/mission/src/main/java/com/yapp/mission/MissionNavGraph.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package com.yapp.mission
import androidx.compose.runtime.LaunchedEffect
import androidx.navigation.NavGraphBuilder
import androidx.navigation.compose.composable
import androidx.navigation.navDeepLink
import androidx.navigation.navigation
import com.yapp.common.navigation.OrbitNavigator
import com.yapp.common.navigation.destination.MissionDestination
Expand All @@ -15,22 +16,35 @@ fun NavGraphBuilder.missionNavGraph(
route = MissionDestination.Route.route,
startDestination = MissionDestination.Mission.route,
) {
MissionDestination.routes.forEach { destination ->
composable(destination.route) { backStackEntry ->
val viewModel = backStackEntry.sharedHiltViewModel<MissionViewModel>(navigator.navController)

LaunchedEffect(viewModel) {
viewModel.container.sideEffectFlow.collect { sideEffect ->
handleMissionSideEffect(sideEffect, navigator, viewModel)
}
composable(
route = MissionDestination.Mission.route,
deepLinks = listOf(
navDeepLink {
uriPattern = "orbitapp://mission"
},
),
) { backStackEntry ->
val viewModel = backStackEntry.sharedHiltViewModel<MissionViewModel>(navigator.navController)

LaunchedEffect(viewModel) {
viewModel.container.sideEffectFlow.collect { sideEffect ->
handleMissionSideEffect(sideEffect, navigator, viewModel)
}
}

MissionRoute(viewModel)
}

composable(MissionDestination.Progress.route) { backStackEntry ->
val viewModel = backStackEntry.sharedHiltViewModel<MissionViewModel>(navigator.navController)

when (destination) {
MissionDestination.Mission -> MissionRoute(viewModel)
MissionDestination.Progress -> MissionProgressRoute(viewModel)
else -> {}
LaunchedEffect(viewModel) {
viewModel.container.sideEffectFlow.collect { sideEffect ->
handleMissionSideEffect(sideEffect, navigator, viewModel)
}
}

MissionProgressRoute(viewModel)
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import androidx.activity.ComponentActivity
import androidx.activity.SystemBarStyle
import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import com.yapp.common.navigation.rememberOrbitNavigator
import com.yapp.designsystem.theme.OrbitTheme
import dagger.hilt.android.AndroidEntryPoint

Expand All @@ -27,8 +28,12 @@ class MainActivity : ComponentActivity() {
),
)
setContent {
val navigator = rememberOrbitNavigator()

OrbitTheme {
OrbitNavHost()
OrbitNavHost(
navigator = navigator,
)
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ internal fun OrbitNavHost(
) {
NavHost(
navController = navigator.navController,
startDestination = SplashDestination.Route.route, // ✅ Splash를 가장 먼저 띄움
startDestination = SplashDestination.Route.route,
modifier = Modifier.navigationBarsPadding(),
) {
composable(SplashDestination.Route.route) {
Expand Down
Loading