lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Add websearch quick action

Browse Source 
Close #373, #443
This commit is contained in:
MM20
2023-07-21 14:04:08 +02:00
parent afd407dfc2
commit f4b217b30c
10 changed files with 146 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/ui/src/main/java/de/mm20/launcher2/ui/settings/searchactions/EditSearchActionSheet.kt
+7 -7
View File
@@ -85,7 +85,7 @@ import de.mm20.launcher2.searchactions.actions.SearchActionIcon
import de.mm20.launcher2.searchactions.builders.AppSearchActionBuilder
import de.mm20.launcher2.searchactions.builders.CustomIntentActionBuilder
import de.mm20.launcher2.searchactions.builders.CustomizableSearchActionBuilder
import de.mm20.launcher2.searchactions.builders.WebsearchActionBuilder
import de.mm20.launcher2.searchactions.builders.CustomWebsearchActionBuilder
import de.mm20.launcher2.ui.R
import de.mm20.launcher2.ui.component.BottomSheetDialog
import de.mm20.launcher2.ui.component.ExperimentalBadge
@@ -406,7 +406,7 @@ fun CustomizeWebSearch(viewModel: EditSearchActionSheetVM, paddingValues: Paddin
.padding(paddingValues)
) {
if (searchAction != null && searchAction is WebsearchActionBuilder) {
if (searchAction != null && searchAction is CustomWebsearchActionBuilder) {
Row(
modifier = Modifier.padding(bottom = 16.dp),
verticalAlignment = Alignment.Bottom
@@ -436,7 +436,7 @@ fun CustomizeWebSearch(viewModel: EditSearchActionSheetVM, paddingValues: Paddin
modifier = Modifier
.fillMaxWidth(),
singleLine = true,
value = (searchAction as WebsearchActionBuilder).urlTemplate,
value = (searchAction as CustomWebsearchActionBuilder).urlTemplate,
onValueChange = { viewModel.setUrlTemplate(it) },
label = { Text(stringResource(R.string.search_action_websearch_url)) },
supportingText = {
@@ -507,11 +507,11 @@ fun CustomizeWebSearch(viewModel: EditSearchActionSheetVM, paddingValues: Paddin
ListPreference(
title = stringResource(R.string.websearch_dialog_query_encoding),
items = listOf(
stringResource(id = R.string.websearch_dialog_query_encoding_url) to WebsearchActionBuilder.QueryEncoding.UrlEncode,
stringResource(id = R.string.websearch_dialog_query_encoding_form) to WebsearchActionBuilder.QueryEncoding.FormData,
stringResource(id = R.string.websearch_dialog_query_encoding_none) to WebsearchActionBuilder.QueryEncoding.None,
stringResource(id = R.string.websearch_dialog_query_encoding_url) to CustomWebsearchActionBuilder.QueryEncoding.UrlEncode,
stringResource(id = R.string.websearch_dialog_query_encoding_form) to CustomWebsearchActionBuilder.QueryEncoding.FormData,
stringResource(id = R.string.websearch_dialog_query_encoding_none) to CustomWebsearchActionBuilder.QueryEncoding.None,
),
value = (searchAction as WebsearchActionBuilder).encoding,
value = (searchAction as CustomWebsearchActionBuilder).encoding,
onValueChanged = {
viewModel.setQueryEncoding(it)
},
app/ui/src/main/java/de/mm20/launcher2/ui/settings/searchactions/EditSearchActionSheetVM.kt
+14 -14
View File
@@ -17,7 +17,7 @@ import de.mm20.launcher2.searchactions.actions.SearchActionIcon
import de.mm20.launcher2.searchactions.builders.AppSearchActionBuilder
import de.mm20.launcher2.searchactions.builders.CustomIntentActionBuilder
import de.mm20.launcher2.searchactions.builders.CustomizableSearchActionBuilder
import de.mm20.launcher2.searchactions.builders.WebsearchActionBuilder
import de.mm20.launcher2.searchactions.builders.CustomWebsearchActionBuilder
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.launch
@@ -41,7 +41,7 @@ class EditSearchActionSheetVM : ViewModel(), KoinComponent {
initialCustomIcon = searchAction?.customIcon
currentPage.value = when (searchAction) {
is AppSearchActionBuilder -> EditSearchActionPage.CustomizeAppSearch
is WebsearchActionBuilder -> EditSearchActionPage.CustomizeWebSearch
is CustomWebsearchActionBuilder -> EditSearchActionPage.CustomizeWebSearch
is CustomIntentActionBuilder -> EditSearchActionPage.CustomizeCustomIntent
else -> EditSearchActionPage.SelectType
}
@@ -100,7 +100,7 @@ class EditSearchActionSheetVM : ViewModel(), KoinComponent {
val newAction = when (action) {
is CustomIntentActionBuilder -> action.copy(label = label)
is AppSearchActionBuilder -> action.copy(label = label)
is WebsearchActionBuilder -> action.copy(label = label)
is CustomWebsearchActionBuilder -> action.copy(label = label)
}
searchAction.value = newAction
@@ -120,7 +120,7 @@ class EditSearchActionSheetVM : ViewModel(), KoinComponent {
it.baseIntent.setComponent(componentName)
}
is WebsearchActionBuilder -> action
is CustomWebsearchActionBuilder -> action
}
searchAction.value = newAction
@@ -160,7 +160,7 @@ class EditSearchActionSheetVM : ViewModel(), KoinComponent {
}
fun skipWebsearchImport() {
searchAction.value = WebsearchActionBuilder(
searchAction.value = CustomWebsearchActionBuilder(
urlTemplate = "",
iconColor = 0,
icon = SearchActionIcon.Search,
@@ -171,7 +171,7 @@ class EditSearchActionSheetVM : ViewModel(), KoinComponent {
fun setUrlTemplate(template: String) {
val action = searchAction.value ?: return
if (action is WebsearchActionBuilder) {
if (action is CustomWebsearchActionBuilder) {
searchAction.value = action.copy(
urlTemplate = template
)
@@ -181,12 +181,12 @@ class EditSearchActionSheetVM : ViewModel(), KoinComponent {
private val invalidWebsearchUrl = mutableStateOf<String?>(null)
val websearchInvalidUrlError =
derivedStateOf { invalidWebsearchUrl.value == (searchAction.value as? WebsearchActionBuilder)?.urlTemplate }
derivedStateOf { invalidWebsearchUrl.value == (searchAction.value as? CustomWebsearchActionBuilder)?.urlTemplate }
val customIntentKeyError = mutableStateOf(false)
fun validate(): Boolean {
val action = searchAction.value ?: return false
if (action is WebsearchActionBuilder) {
if (action is CustomWebsearchActionBuilder) {
val valid = action.urlTemplate.contains("\${1}")
invalidWebsearchUrl.value = if (valid) null else action.urlTemplate
return valid
@@ -218,7 +218,7 @@ class EditSearchActionSheetVM : ViewModel(), KoinComponent {
deleteCustomIcon(action.customIcon)
}
searchAction.value = when (action) {
is WebsearchActionBuilder -> action.copy(icon = icon, customIcon = null, iconColor = 0)
is CustomWebsearchActionBuilder -> action.copy(icon = icon, customIcon = null, iconColor = 0)
is CustomIntentActionBuilder -> action.copy(
icon = icon,
customIcon = null,
@@ -235,7 +235,7 @@ class EditSearchActionSheetVM : ViewModel(), KoinComponent {
deleteCustomIcon(action.customIcon)
}
searchAction.value = when (action) {
is WebsearchActionBuilder -> action.copy(
is CustomWebsearchActionBuilder -> action.copy(
customIcon = iconPath,
iconColor = 1,
icon = SearchActionIcon.Custom
@@ -269,7 +269,7 @@ class EditSearchActionSheetVM : ViewModel(), KoinComponent {
fun applyIcon() {
currentPage.value = when (searchAction.value) {
is AppSearchActionBuilder -> EditSearchActionPage.CustomizeAppSearch
is WebsearchActionBuilder -> EditSearchActionPage.CustomizeWebSearch
is CustomWebsearchActionBuilder -> EditSearchActionPage.CustomizeWebSearch
is CustomIntentActionBuilder -> EditSearchActionPage.CustomizeCustomIntent
null -> EditSearchActionPage.SelectType
}
@@ -278,7 +278,7 @@ class EditSearchActionSheetVM : ViewModel(), KoinComponent {
fun setIconColor(color: Int) {
val action = searchAction.value ?: return
searchAction.value = when (action) {
is WebsearchActionBuilder -> action.copy(iconColor = color)
is CustomWebsearchActionBuilder -> action.copy(iconColor = color)
is CustomIntentActionBuilder -> action.copy(iconColor = color)
is AppSearchActionBuilder -> action.copy(iconColor = color)
}
@@ -495,10 +495,10 @@ class EditSearchActionSheetVM : ViewModel(), KoinComponent {
}
}
fun setQueryEncoding(encoding: WebsearchActionBuilder.QueryEncoding) {
fun setQueryEncoding(encoding: CustomWebsearchActionBuilder.QueryEncoding) {
val action = searchAction.value ?: return
searchAction.value = when (action) {
is WebsearchActionBuilder -> action.copy(
is CustomWebsearchActionBuilder -> action.copy(
encoding = encoding
)