diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c106e7fb..c3382f99 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,7 +19,7 @@
-
+
diff --git a/app/src/main/java/com/sadellie/unitto/PushDynamicShortcut.kt b/app/src/main/java/com/sadellie/unitto/PushDynamicShortcut.kt
index ed344190..6a6a7bf5 100644
--- a/app/src/main/java/com/sadellie/unitto/PushDynamicShortcut.kt
+++ b/app/src/main/java/com/sadellie/unitto/PushDynamicShortcut.kt
@@ -50,7 +50,7 @@ suspend fun Context.pushDynamicShortcut(
Intent.ACTION_VIEW,
Uri.parse("app://com.sadellie.unitto/$route"),
context,
- this.javaClass
+ context.javaClass
)
)
.build()
diff --git a/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/navigation/CalculatorNavigation.kt b/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/navigation/CalculatorNavigation.kt
index 56cfd40f..716d6aac 100644
--- a/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/navigation/CalculatorNavigation.kt
+++ b/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/navigation/CalculatorNavigation.kt
@@ -20,8 +20,8 @@ package com.sadellie.unitto.feature.calculator.navigation
import androidx.navigation.NavGraphBuilder
import androidx.navigation.compose.composable
+import androidx.navigation.compose.navigation
import androidx.navigation.navDeepLink
-import androidx.navigation.navigation
import com.sadellie.unitto.core.base.TopLevelDestinations
import com.sadellie.unitto.feature.calculator.CalculatorRoute
@@ -32,13 +32,14 @@ fun NavGraphBuilder.calculatorGraph(
navigateToMenu: () -> Unit,
navigateToSettings: () -> Unit
) {
- navigation(start, graph) {
- composable(
- route = start,
- deepLinks = listOf(
- navDeepLink { uriPattern = "app://com.sadellie.unitto/$start" }
- )
- ) {
+ navigation(
+ startDestination = start,
+ route = graph,
+ deepLinks = listOf(
+ navDeepLink { uriPattern = "app://com.sadellie.unitto/$graph" }
+ )
+ ) {
+ composable(start) {
CalculatorRoute(
navigateToMenu = navigateToMenu,
navigateToSettings = navigateToSettings
diff --git a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/navigation/ConverterNavigation.kt b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/navigation/ConverterNavigation.kt
index c374a153..0dbdb170 100644
--- a/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/navigation/ConverterNavigation.kt
+++ b/feature/converter/src/main/java/com/sadellie/unitto/feature/converter/navigation/ConverterNavigation.kt
@@ -20,8 +20,8 @@ package com.sadellie.unitto.feature.converter.navigation
import androidx.navigation.NavGraphBuilder
import androidx.navigation.compose.composable
+import androidx.navigation.compose.navigation
import androidx.navigation.navDeepLink
-import androidx.navigation.navigation
import com.sadellie.unitto.core.base.TopLevelDestinations
import com.sadellie.unitto.feature.converter.ConverterRoute
import com.sadellie.unitto.feature.converter.ConverterViewModel
@@ -36,13 +36,14 @@ fun NavGraphBuilder.converterGraph(
navigateToMenu: () -> Unit,
viewModel: ConverterViewModel
) {
- navigation(start, graph) {
- composable(
- route = start,
- deepLinks = listOf(
- navDeepLink { uriPattern = "app://com.sadellie.unitto/$start" }
- )
- ) {
+ navigation(
+ startDestination = start,
+ route = graph,
+ deepLinks = listOf(
+ navDeepLink { uriPattern = "app://com.sadellie.unitto/$graph" }
+ )
+ ) {
+ composable(start) {
ConverterRoute(
viewModel = viewModel,
navigateToLeftScreen = navigateToLeftScreen,
diff --git a/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/navigation/DateCalculatorNavigation.kt b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/navigation/DateCalculatorNavigation.kt
index 138f7659..735bda80 100644
--- a/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/navigation/DateCalculatorNavigation.kt
+++ b/feature/datecalculator/src/main/java/com/sadellie/unitto/feature/datecalculator/navigation/DateCalculatorNavigation.kt
@@ -20,8 +20,8 @@ package com.sadellie.unitto.feature.datecalculator.navigation
import androidx.navigation.NavGraphBuilder
import androidx.navigation.compose.composable
+import androidx.navigation.compose.navigation
import androidx.navigation.navDeepLink
-import androidx.navigation.navigation
import com.sadellie.unitto.core.base.TopLevelDestinations
import com.sadellie.unitto.feature.datecalculator.DateCalculatorRoute
@@ -32,13 +32,14 @@ fun NavGraphBuilder.dateCalculatorGraph(
navigateToMenu: () -> Unit,
navigateToSettings: () -> Unit
) {
- navigation(start, graph) {
- composable(
- route = start,
- deepLinks = listOf(
- navDeepLink { uriPattern = "app://com.sadellie.unitto/$start" }
- )
- ) {
+ navigation(
+ startDestination = start,
+ route = graph,
+ deepLinks = listOf(
+ navDeepLink { uriPattern = "app://com.sadellie.unitto/$graph" }
+ )
+ ) {
+ composable(start) {
DateCalculatorRoute(
navigateToMenu = navigateToMenu,
navigateToSettings = navigateToSettings
diff --git a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/navigation/SettingsNavigation.kt b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/navigation/SettingsNavigation.kt
index 16b5d6f2..89e92de4 100644
--- a/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/navigation/SettingsNavigation.kt
+++ b/feature/settings/src/main/java/com/sadellie/unitto/feature/settings/navigation/SettingsNavigation.kt
@@ -23,6 +23,7 @@ import androidx.navigation.NavGraphBuilder
import androidx.navigation.NavHostController
import androidx.navigation.compose.composable
import androidx.navigation.compose.navigation
+import androidx.navigation.navDeepLink
import com.sadellie.unitto.core.base.TopLevelDestinations
import com.sadellie.unitto.feature.settings.AboutScreen
import com.sadellie.unitto.feature.settings.SettingsScreen
@@ -52,7 +53,13 @@ fun NavGraphBuilder.settingGraph(
themmoController: ThemmoController,
navController: NavHostController
) {
- navigation(start, graph) {
+ navigation(
+ startDestination = start,
+ route = graph,
+ deepLinks = listOf(
+ navDeepLink { uriPattern = "app://com.sadellie.unitto/$graph" }
+ )
+ ) {
composable(start) {
SettingsScreen(
menuButtonClick = navController::navigateUp,
diff --git a/feature/timezone/src/main/java/com/sadellie/unitto/timezone/navigation/TimeZoneNavigation.kt b/feature/timezone/src/main/java/com/sadellie/unitto/timezone/navigation/TimeZoneNavigation.kt
index 14105a31..e4811c2d 100644
--- a/feature/timezone/src/main/java/com/sadellie/unitto/timezone/navigation/TimeZoneNavigation.kt
+++ b/feature/timezone/src/main/java/com/sadellie/unitto/timezone/navigation/TimeZoneNavigation.kt
@@ -55,13 +55,11 @@ fun NavGraphBuilder.timeZoneGraph(
navigation(
startDestination = start,
route = graph,
+ deepLinks = listOf(
+ navDeepLink { uriPattern = "app://com.sadellie.unitto/$graph" }
+ )
) {
- composable(
- route = start,
- deepLinks = listOf(
- navDeepLink { uriPattern = "app://com.sadellie.unitto/$start" }
- )
- ) {
+ composable(start) {
TimeZoneRoute(
navigateToMenu = navigateToMenu,
navigateToSettings = navigateToSettings,