From e70681c27912ef0d91d07ac4ee00ec3798bac786 Mon Sep 17 00:00:00 2001 From: Der_Googler <54764558+DerGoogler@users.noreply.github.com> Date: Wed, 1 Jan 2025 21:13:56 +0100 Subject: [PATCH] fix deep links --- app/src/main/AndroidManifest.xml | 6 ------ .../mmrl/ui/navigation/graphs/Repositories.kt | 13 +++++++++++-- .../repositories/screens/view/NewViewScreen.kt | 3 ++- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d564c882..e9e3d091 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -62,9 +62,6 @@ - - - @@ -81,9 +78,6 @@ - - - diff --git a/app/src/main/kotlin/com/dergoogler/mmrl/ui/navigation/graphs/Repositories.kt b/app/src/main/kotlin/com/dergoogler/mmrl/ui/navigation/graphs/Repositories.kt index 91879c49..69917a71 100644 --- a/app/src/main/kotlin/com/dergoogler/mmrl/ui/navigation/graphs/Repositories.kt +++ b/app/src/main/kotlin/com/dergoogler/mmrl/ui/navigation/graphs/Repositories.kt @@ -82,6 +82,14 @@ fun NavGraphBuilder.repositoryScreen( navArgument("moduleId") { type = NavType.StringType }, navArgument("repoUrl") { type = NavType.StringType }, ), + deepLinks = listOf( + navDeepLink { + uriPattern = "https://mmrl.dergoogler.com/module/{repoUrl}/{moduleId}" + }, + navDeepLink { + uriPattern = "http://mmrl.dergoogler.com/module/{repoUrl}/{moduleId}" + } + ), enterTransition = { scaleIn() + fadeIn() }, exitTransition = { fadeOut() } ) { @@ -137,13 +145,14 @@ fun NavGraphBuilder.repositoryScreen( navArgument("repoUrl") { type = NavType.StringType }, navArgument("value") { type = NavType.StringType } ), - deepLinks = listOf(navDeepLink { uriPattern = "mmrl://search/{repoUrl}/{type}/{value}" }, + deepLinks = listOf( navDeepLink { uriPattern = "https://mmrl.dergoogler.com/search/{repoUrl}/{type}/{value}" }, navDeepLink { uriPattern = "http://mmrl.dergoogler.com/search/{repoUrl}/{type}/{value}" - }), + } + ), enterTransition = { scaleIn() + fadeIn() }, exitTransition = { fadeOut() } ) { diff --git a/app/src/main/kotlin/com/dergoogler/mmrl/ui/screens/repositories/screens/view/NewViewScreen.kt b/app/src/main/kotlin/com/dergoogler/mmrl/ui/screens/repositories/screens/view/NewViewScreen.kt index 772d09d4..fa5e7776 100644 --- a/app/src/main/kotlin/com/dergoogler/mmrl/ui/screens/repositories/screens/view/NewViewScreen.kt +++ b/app/src/main/kotlin/com/dergoogler/mmrl/ui/screens/repositories/screens/view/NewViewScreen.kt @@ -117,6 +117,7 @@ import dev.dergoogler.mmrl.compat.ext.isNotNullOrBlank import dev.dergoogler.mmrl.compat.ext.nullable import dev.dergoogler.mmrl.compat.ext.shareText import dev.dergoogler.mmrl.compat.ext.takeTrue +import dev.dergoogler.mmrl.compat.ext.toEncodedUrl import dev.dergoogler.mmrl.compat.ext.toFormattedDateSafely import dev.dergoogler.mmrl.compat.ext.toFormattedFileSize import kotlinx.coroutines.launch @@ -290,7 +291,7 @@ fun NewViewScreen( }, onClick = { menuExpanded = false - context.shareText("https://mmrl.dergoogler.com/module/${module.id}") + context.shareText("https://mmrl.dergoogler.com/module/${repoUrl.toEncodedUrl()}/${module.id}?utm_medium=share&utm_source=${context.packageName}") } )