Fix shortcuts

This commit is contained in:
sadellie 2023-08-03 17:45:11 +03:00
parent 9c1cd8e05b
commit c99ee787ef
7 changed files with 41 additions and 33 deletions

View File

@ -19,7 +19,7 @@
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
<intent-filter android:label="@string/epoch_converter">
<intent-filter android:label="@string/calculator">
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />

View File

@ -50,7 +50,7 @@ suspend fun Context.pushDynamicShortcut(
Intent.ACTION_VIEW,
Uri.parse("app://com.sadellie.unitto/$route"),
context,
this.javaClass
context.javaClass
)
)
.build()

View File

@ -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

View File

@ -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,

View File

@ -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

View File

@ -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,

View File

@ -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,