From 43636a8198b2a523df91db8cce356e9d238bb686 Mon Sep 17 00:00:00 2001
From: Sven Jacobs <github@svenjacobs.com>
Date: Thu, 30 May 2024 15:30:28 +0200
Subject: [PATCH] feat: add option to open URLs with custom tabs (#407)

---
 app/build.gradle.kts                          |  1 +
 app/src/main/AndroidManifest.xml              |  8 ++-
 .../com/svenjacobs/app/leon/MainActivity.kt   | 37 +++++++++++
 .../app/leon/datastore/AppDataStoreManager.kt | 12 ++++
 .../app/leon/ui/screens/main/MainScreen.kt    | 23 ++++++-
 .../screens/main/model/MainScreenViewModel.kt |  5 +-
 .../ui/screens/settings/SettingsScreen.kt     | 62 +++++++++++++------
 .../settings/model/SettingsScreenViewModel.kt | 13 +++-
 app/src/main/res/values-de/strings.xml        |  3 +-
 app/src/main/res/values-pl/strings.xml        |  3 +-
 app/src/main/res/values-ru/strings.xml        |  3 +-
 app/src/main/res/values-vi/strings.xml        |  1 +
 app/src/main/res/values/strings.xml           |  3 +-
 gradle/libs.versions.toml                     |  1 +
 14 files changed, 147 insertions(+), 28 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index cc373da3..ffd15303 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -145,6 +145,7 @@ dependencies {
 	implementation(libs.androidx.lifecycle.viewmodel.ktx)
 	implementation(libs.androidx.datastore.preferences)
 	implementation(libs.kotlinx.coroutines.android)
+	implementation(libs.androidx.browser)
 	implementation(libs.jakewharton.timber)
 
 	debugImplementation(libs.facebook.stetho)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2b8f0d5d..2ca759f4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?><!--
   ~ Léon - The URL Cleaner
-  ~ Copyright (C) 2023 Sven Jacobs
+  ~ Copyright (C) 2024 Sven Jacobs
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
@@ -73,4 +73,10 @@
         </provider>
     </application>
 
+    <queries>
+        <intent>
+            <action android:name="android.support.customtabs.action.CustomTabsService" />
+        </intent>
+    </queries>
+
 </manifest>
diff --git a/app/src/main/kotlin/com/svenjacobs/app/leon/MainActivity.kt b/app/src/main/kotlin/com/svenjacobs/app/leon/MainActivity.kt
index b0b6b154..e794748e 100644
--- a/app/src/main/kotlin/com/svenjacobs/app/leon/MainActivity.kt
+++ b/app/src/main/kotlin/com/svenjacobs/app/leon/MainActivity.kt
@@ -18,18 +18,27 @@
 
 package com.svenjacobs.app.leon
 
+import android.content.ComponentName
 import android.content.Intent
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.browser.customtabs.CustomTabsClient
+import androidx.browser.customtabs.CustomTabsServiceConnection
 import androidx.compose.runtime.mutableStateOf
 import androidx.core.view.WindowCompat
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import com.svenjacobs.app.leon.inject.AppContainer.AppDataStoreManager
 import com.svenjacobs.app.leon.ui.MainRouter
 import com.svenjacobs.app.leon.ui.theme.AppTheme
+import kotlinx.coroutines.launch
 
 class MainActivity : ComponentActivity() {
 
 	private val sourceText = mutableStateOf<String?>(null)
+	private var customTabsInitialized = false
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
@@ -45,6 +54,16 @@ class MainActivity : ComponentActivity() {
 				)
 			}
 		}
+
+		lifecycleScope.launch {
+			repeatOnLifecycle(Lifecycle.State.STARTED) {
+				AppDataStoreManager.customTabsEnabled.collect { customTabsEnabled ->
+					if (customTabsEnabled) {
+						setupCustomTabsService()
+					}
+				}
+			}
+		}
 	}
 
 	override fun onNewIntent(intent: Intent) {
@@ -72,6 +91,24 @@ class MainActivity : ComponentActivity() {
 		}
 	}
 
+	private fun setupCustomTabsService() {
+		if (customTabsInitialized) return
+
+		val connection = object : CustomTabsServiceConnection() {
+			override fun onCustomTabsServiceConnected(name: ComponentName, client: CustomTabsClient) {
+				client.warmup(0)
+			}
+
+			override fun onServiceDisconnected(name: ComponentName?) {
+			}
+		}
+
+		val packageName = CustomTabsClient.getPackageName(this, null)
+		CustomTabsClient.bindCustomTabsService(this, packageName, connection)
+
+		customTabsInitialized = true
+	}
+
 	private companion object {
 		private const val MIME_TYPE_TEXT_PLAIN = "text/plain"
 	}
diff --git a/app/src/main/kotlin/com/svenjacobs/app/leon/datastore/AppDataStoreManager.kt b/app/src/main/kotlin/com/svenjacobs/app/leon/datastore/AppDataStoreManager.kt
index 75d5df44..87d6ddb0 100644
--- a/app/src/main/kotlin/com/svenjacobs/app/leon/datastore/AppDataStoreManager.kt
+++ b/app/src/main/kotlin/com/svenjacobs/app/leon/datastore/AppDataStoreManager.kt
@@ -77,10 +77,22 @@ class AppDataStoreManager(private val context: Context = AppContext) {
 			preferences[KEY_EXTRACT_URL] ?: false
 		}
 
+	suspend fun setCustomTabsEnabled(enabled: Boolean) {
+		context.dataStore.edit {
+			it[KEY_CUSTOM_TABS] = enabled
+		}
+	}
+
+	val customTabsEnabled: Flow<Boolean> =
+		context.dataStore.data.map { preferences ->
+			preferences[KEY_CUSTOM_TABS] ?: false
+		}
+
 	private companion object {
 		private val KEY_VERSION_CODE = intPreferencesKey("version_code")
 		private val KEY_ACTION_AFTER_CLEAN = stringPreferencesKey("action_after_clean")
 		private val KEY_URL_DECODE = booleanPreferencesKey("url_decode")
 		private val KEY_EXTRACT_URL = booleanPreferencesKey("extract_url")
+		private val KEY_CUSTOM_TABS = booleanPreferencesKey("custom_tabs")
 	}
 }
diff --git a/app/src/main/kotlin/com/svenjacobs/app/leon/ui/screens/main/MainScreen.kt b/app/src/main/kotlin/com/svenjacobs/app/leon/ui/screens/main/MainScreen.kt
index 2659bde3..0fb18aae 100644
--- a/app/src/main/kotlin/com/svenjacobs/app/leon/ui/screens/main/MainScreen.kt
+++ b/app/src/main/kotlin/com/svenjacobs/app/leon/ui/screens/main/MainScreen.kt
@@ -24,6 +24,7 @@ import android.content.ContextWrapper
 import android.content.Intent
 import android.net.Uri
 import android.view.Window
+import androidx.browser.customtabs.CustomTabsIntent
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Arrangement
@@ -143,6 +144,24 @@ fun MainScreen(
 		)
 	}
 
+	fun openInCustomTabs(result: Result.Success) {
+		result.urls.firstOrNull()?.let { url ->
+			val intent = CustomTabsIntent.Builder()
+				.setColorScheme(CustomTabsIntent.COLOR_SCHEME_SYSTEM)
+				.build()
+
+			intent.launchUrl(context, Uri.parse(url))
+		}
+	}
+
+	fun openUrl(result: Result.Success) {
+		if (uiState.isCustomTabsEnabled) {
+			openInCustomTabs(result)
+		} else {
+			openInDefaultApp(result)
+		}
+	}
+
 	fun copyToClipboard(result: Result.Success) {
 		clipboard.setText(AnnotatedString(result.cleanedText))
 		coroutineScope.launch {
@@ -172,7 +191,7 @@ fun MainScreen(
 							(uiState.result as? Result.Success)?.let { result ->
 								when (uiState.actionAfterClean) {
 									ActionAfterClean.OpenShareMenu -> openShareMenu(result)
-									ActionAfterClean.OpenUrl -> openInDefaultApp(result)
+									ActionAfterClean.OpenUrl -> openUrl(result)
 									ActionAfterClean.CopyToClipboard -> copyToClipboard(result)
 									ActionAfterClean.DoNothing -> {}
 								}
@@ -192,7 +211,7 @@ fun MainScreen(
 							},
 							onShareClick = ::openShareMenu,
 							onCopyToClipboardClick = ::copyToClipboard,
-							onOpenClick = ::openInDefaultApp,
+							onOpenClick = ::openUrl,
 							onResetClick = viewModel::onResetClick,
 							onUrlDecodeCheckedChange = viewModel::onUrlDecodeCheckedChange,
 							onExtractUrlCheckedChange = viewModel::onExtractUrlCheckedChange,
diff --git a/app/src/main/kotlin/com/svenjacobs/app/leon/ui/screens/main/model/MainScreenViewModel.kt b/app/src/main/kotlin/com/svenjacobs/app/leon/ui/screens/main/model/MainScreenViewModel.kt
index 92e3771b..bbf4c39c 100644
--- a/app/src/main/kotlin/com/svenjacobs/app/leon/ui/screens/main/model/MainScreenViewModel.kt
+++ b/app/src/main/kotlin/com/svenjacobs/app/leon/ui/screens/main/model/MainScreenViewModel.kt
@@ -41,6 +41,7 @@ class MainScreenViewModel(
 		val isLoading: Boolean = true,
 		val isUrlDecodeEnabled: Boolean = false,
 		val isExtractUrlEnabled: Boolean = false,
+		val isCustomTabsEnabled: Boolean = false,
 		val result: Result = Result.Empty,
 		val actionAfterClean: ActionAfterClean = ActionAfterClean.DoNothing,
 	) {
@@ -65,8 +66,9 @@ class MainScreenViewModel(
 			text,
 			appDataStoreManager.urlDecodeEnabled,
 			appDataStoreManager.extractUrlEnabled,
+			appDataStoreManager.customTabsEnabled,
 			appDataStoreManager.actionAfterClean,
-		) { text, urlDecodeEnabled, extractUrlEnabled, actionAfterClean ->
+		) { text, urlDecodeEnabled, extractUrlEnabled, isCustomTabsEnabled, actionAfterClean ->
 			val result = text?.let {
 				clean(
 					text = text,
@@ -79,6 +81,7 @@ class MainScreenViewModel(
 				isLoading = text == null,
 				isUrlDecodeEnabled = urlDecodeEnabled,
 				isExtractUrlEnabled = extractUrlEnabled,
+				isCustomTabsEnabled = isCustomTabsEnabled,
 				result = result,
 				actionAfterClean = actionAfterClean ?: ActionAfterClean.DoNothing,
 			)
diff --git a/app/src/main/kotlin/com/svenjacobs/app/leon/ui/screens/settings/SettingsScreen.kt b/app/src/main/kotlin/com/svenjacobs/app/leon/ui/screens/settings/SettingsScreen.kt
index 7899173b..f0975207 100644
--- a/app/src/main/kotlin/com/svenjacobs/app/leon/ui/screens/settings/SettingsScreen.kt
+++ b/app/src/main/kotlin/com/svenjacobs/app/leon/ui/screens/settings/SettingsScreen.kt
@@ -65,10 +65,12 @@ fun SettingsScreen(
 		modifier = modifier,
 		isLoading = uiState.isLoading,
 		browserEnabled = uiState.browserEnabled,
+		customTabsEnabled = uiState.customTabsEnabled,
 		actionAfterClean = uiState.actionAfterClean,
 		onSanitizersClick = onNavigateToSettingsSanitizers,
 		onLicensesClick = onNavigateToSettingsLicenses,
 		onBrowserSwitchCheckedChange = viewModel::onBrowserSwitchCheckedChange,
+		onCustomTabsSwitchCheckedChange = viewModel::onCustomTabsSwitchCheckedChange,
 		onActionAfterCleanClick = viewModel::onActionAfterCleanClick,
 	)
 }
@@ -77,10 +79,12 @@ fun SettingsScreen(
 private fun Content(
 	isLoading: Boolean,
 	browserEnabled: Boolean,
+	customTabsEnabled: Boolean,
 	actionAfterClean: ActionAfterClean,
 	onSanitizersClick: () -> Unit,
 	onLicensesClick: () -> Unit,
 	onBrowserSwitchCheckedChange: (Boolean) -> Unit,
+	onCustomTabsSwitchCheckedChange: (Boolean) -> Unit,
 	onActionAfterCleanClick: (ActionAfterClean) -> Unit,
 	modifier: Modifier = Modifier,
 ) {
@@ -111,24 +115,19 @@ private fun Content(
 					Text(stringResource(R.string.licenses))
 				}
 
-				Row(
-					modifier = Modifier
-						.fillMaxWidth()
-						.padding(top = 16.dp),
-					verticalAlignment = Alignment.CenterVertically,
-				) {
-					Text(
-						modifier = Modifier
-							.padding(end = 8.dp)
-							.weight(1f),
-						text = stringResource(R.string.register_as_browser),
-					)
-
-					Switch(
-						checked = browserEnabled,
-						onCheckedChange = onBrowserSwitchCheckedChange,
-					)
-				}
+				SwitchRow(
+					modifier = Modifier.padding(top = 16.dp),
+					text = stringResource(R.string.register_as_browser),
+					checked = browserEnabled,
+					onCheckedChange = onBrowserSwitchCheckedChange,
+				)
+
+				SwitchRow(
+					modifier = Modifier.padding(top = 16.dp),
+					text = stringResource(R.string.open_in_custom_tabs),
+					checked = customTabsEnabled,
+					onCheckedChange = onCustomTabsSwitchCheckedChange,
+				)
 
 				Column(
 					modifier = Modifier.padding(top = 8.dp),
@@ -210,6 +209,31 @@ private fun Content(
 	}
 }
 
+@Composable
+private fun SwitchRow(
+	text: String,
+	checked: Boolean,
+	onCheckedChange: (Boolean) -> Unit,
+	modifier: Modifier = Modifier,
+) {
+	Row(
+		modifier = modifier.fillMaxWidth(),
+		verticalAlignment = Alignment.CenterVertically,
+	) {
+		Text(
+			modifier = Modifier
+				.padding(end = 8.dp)
+				.weight(1f),
+			text = text,
+		)
+
+		Switch(
+			checked = checked,
+			onCheckedChange = onCheckedChange,
+		)
+	}
+}
+
 @Composable
 private fun ActionAfterClean.text(): String = when (this) {
 	ActionAfterClean.DoNothing -> stringResource(R.string.do_nothing)
@@ -225,10 +249,12 @@ private fun ContentPreview() {
 		Content(
 			isLoading = false,
 			browserEnabled = false,
+			customTabsEnabled = false,
 			actionAfterClean = ActionAfterClean.OpenShareMenu,
 			onSanitizersClick = {},
 			onLicensesClick = {},
 			onBrowserSwitchCheckedChange = {},
+			onCustomTabsSwitchCheckedChange = {},
 			onActionAfterCleanClick = {},
 		)
 	}
diff --git a/app/src/main/kotlin/com/svenjacobs/app/leon/ui/screens/settings/model/SettingsScreenViewModel.kt b/app/src/main/kotlin/com/svenjacobs/app/leon/ui/screens/settings/model/SettingsScreenViewModel.kt
index 2324e27d..e2aca674 100644
--- a/app/src/main/kotlin/com/svenjacobs/app/leon/ui/screens/settings/model/SettingsScreenViewModel.kt
+++ b/app/src/main/kotlin/com/svenjacobs/app/leon/ui/screens/settings/model/SettingsScreenViewModel.kt
@@ -1,6 +1,6 @@
 /*
  * Léon - The URL Cleaner
- * Copyright (C) 2023 Sven Jacobs
+ * Copyright (C) 2024 Sven Jacobs
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -44,6 +44,7 @@ class SettingsScreenViewModel(
 	data class UiState(
 		val isLoading: Boolean = true,
 		val browserEnabled: Boolean = false,
+		val customTabsEnabled: Boolean = false,
 		val actionAfterClean: ActionAfterClean = ActionAfterClean.DoNothing,
 	)
 
@@ -52,11 +53,13 @@ class SettingsScreenViewModel(
 	val uiState: StateFlow<UiState> =
 		combine(
 			browserEnabled,
+			appDataStoreManager.customTabsEnabled,
 			appDataStoreManager.actionAfterClean,
-		) { browserEnabled, actionAfterClean ->
+		) { browserEnabled, customTabsEnabled, actionAfterClean ->
 			UiState(
 				isLoading = false,
 				browserEnabled = browserEnabled,
+				customTabsEnabled = customTabsEnabled,
 				actionAfterClean = actionAfterClean ?: ActionAfterClean.DoNothing,
 			)
 		}.stateIn(
@@ -83,6 +86,12 @@ class SettingsScreenViewModel(
 		)
 	}
 
+	fun onCustomTabsSwitchCheckedChange(checked: Boolean) {
+		viewModelScope.launch {
+			appDataStoreManager.setCustomTabsEnabled(checked)
+		}
+	}
+
 	fun onActionAfterCleanClick(actionAfterClean: ActionAfterClean) {
 		viewModelScope.launch {
 			appDataStoreManager.setActionAfterClean(actionAfterClean)
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 35a67e24..1cf6f423 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,6 +1,6 @@
 <!--
   ~ Léon - The URL Cleaner
-  ~ Copyright (C) 2023 Sven Jacobs
+  ~ Copyright (C) 2024 Sven Jacobs
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
@@ -36,6 +36,7 @@
     <string name="reset">Zurücksetzen</string>
     <string name="extract_url">Nur URL extrahieren</string>
     <string name="register_as_browser">Registriere Léon als Browser</string>
+    <string name="open_in_custom_tabs">URLs in Browser Custom Tabs öffnen</string>
     <string name="action_after_clean">Aktion nach Reinigung</string>
     <string name="do_nothing">Nichts unternehmen</string>
     <string name="open_share_menu">Teilenmenü öffnen</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 9ce030af..f84d275e 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -1,6 +1,6 @@
 <!--
   ~ Léon - The URL Cleaner
-  ~ Copyright (C) 2023 Sven Jacobs
+  ~ Copyright (C) 2024 Sven Jacobs
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
@@ -36,6 +36,7 @@
     <string name="reset">Wyzeruj</string>
     <string name="extract_url">Wyodrębnij tylko URL</string>
     <string name="register_as_browser">Zarejestruj Léona jako przeglądarkę</string>
+    <string name="open_in_custom_tabs">Open URLs in browser custom tabs</string> <!-- TODO: translate -->
     <string name="action_after_clean">Action after clean</string> <!-- TODO: translate -->
     <string name="do_nothing">Do nothing</string> <!-- TODO: translate -->
     <string name="open_share_menu">Open share menu</string> <!-- TODO: translate -->
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 5274efd3..0ac8dcbb 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -1,6 +1,6 @@
 <!--
   ~ Léon - The URL Cleaner
-  ~ Copyright (C) 2023 Sven Jacobs
+  ~ Copyright (C) 2024 Sven Jacobs
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
@@ -36,6 +36,7 @@
     <string name="reset">Сброс</string>
     <string name="extract_url">Извлечение только URL-адреса</string>
     <string name="register_as_browser">Register Léon as browser</string>  <!-- TODO: translate -->
+    <string name="open_in_custom_tabs">Open URLs in browser custom tabs</string> <!-- TODO: translate -->
     <string name="action_after_clean">Action after clean</string> <!-- TODO: translate -->
     <string name="do_nothing">Do nothing</string> <!-- TODO: translate -->
     <string name="open_share_menu">Open share menu</string> <!-- TODO: translate -->
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 4e999ae8..f7c607fb 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -37,6 +37,7 @@
     <string name="reset">Đặt lại</string>
     <string name="extract_url">Chỉ trích xuất URL</string>
     <string name="register_as_browser">Đăng ký Léon làm trình duyệt</string>
+    <string name="open_in_custom_tabs">Open URLs in browser custom tabs</string> <!-- TODO: translate -->
     <string name="action_after_clean">Hành động sau khi làm sạch</string>
     <string name="do_nothing">Không làm gì cả</string>
     <string name="open_share_menu">Mở menu chia sẻ</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 19dae85c..5f580eda 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
 <!--
   ~ Léon - The URL Cleaner
-  ~ Copyright (C) 2023 Sven Jacobs
+  ~ Copyright (C) 2024 Sven Jacobs
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
@@ -37,6 +37,7 @@
     <string name="reset">Reset</string>
     <string name="extract_url">Extract only URL</string>
     <string name="register_as_browser">Register Léon as browser</string>
+    <string name="open_in_custom_tabs">Open URLs in browser custom tabs</string>
     <string name="action_after_clean">Action after clean</string>
     <string name="do_nothing">Do nothing</string>
     <string name="open_share_menu">Open share menu</string>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index dae93a8d..22af0a48 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -12,6 +12,7 @@ mikepenz-aboutlibraries = "11.2.1"
 android-gradle-plugin = { module = "com.android.tools.build:gradle", version.ref = "android-gradle-plugin" }
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" }
 androidx-appcompat = "androidx.appcompat:appcompat:1.7.0"
+androidx-browser = "androidx.browser:browser:1.8.0"
 androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "androidx-compose-bom" }
 androidx-compose-material3 = { module = "androidx.compose.material3:material3" }
 androidx-compose-material3-window-size = { module = "androidx.compose.material3:material3-window-size-class" }