Skip to content

Commit

Permalink
manager: support search module list (#2331)
Browse files Browse the repository at this point in the history
  • Loading branch information
@5ec1cff @rifsxd
5ec1cff authored and rifsxd committed Jan 18, 2025
1 parent b117444 commit cae7693
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 21 deletions.
32 changes: 15 additions & 17 deletions manager/app/src/main/java/com/rifsxd/ksunext/ui/screen/Module.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ import androidx.compose.material3.SnackbarResult
import androidx.compose.material3.Switch
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.material3.TopAppBar
import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.material3.pulltorefresh.PullToRefreshBox
import androidx.compose.material3.rememberTopAppBarState
Expand Down Expand Up @@ -96,6 +95,7 @@ import com.rifsxd.ksunext.R
import com.rifsxd.ksunext.ui.component.ConfirmResult
import com.rifsxd.ksunext.ui.component.rememberConfirmDialog
import com.rifsxd.ksunext.ui.component.rememberLoadingDialog
import com.rifsxd.ksunext.ui.component.SearchAppBar
import com.rifsxd.ksunext.ui.util.*
import com.rifsxd.ksunext.ui.util.DownloadListener
import com.rifsxd.ksunext.ui.util.LocalSnackbarHost
Expand Down Expand Up @@ -145,8 +145,12 @@ fun ModuleScreen(navigator: DestinationsNavigator) {

Scaffold(
topBar = {
TopAppBar(
actions = {
SearchAppBar(
title = { Text(stringResource(R.string.module)) },
searchText = viewModel.search,
onSearchTextChange = { viewModel.search = it },
onClearClick = { viewModel.search = "" },
dropdownContent = {
var showDropdown by remember { mutableStateOf(false) }
IconButton(
onClick = { showDropdown = true },
Expand Down Expand Up @@ -203,9 +207,7 @@ fun ModuleScreen(navigator: DestinationsNavigator) {
}
}
},
scrollBehavior = scrollBehavior,
title = { Text(stringResource(R.string.module)) },
windowInsets = WindowInsets.safeDrawing.only(WindowInsetsSides.Top + WindowInsetsSides.Horizontal)
scrollBehavior = scrollBehavior
)
},
floatingActionButton = {
Expand Down Expand Up @@ -535,7 +537,6 @@ private fun ModuleList(

else -> {
items(viewModel.moduleList) { module ->
var isChecked by rememberSaveable(module) { mutableStateOf(module.enabled) }
val scope = rememberCoroutineScope()
val updatedModule by produceState(initialValue = Triple("", "", "")) {
scope.launch(Dispatchers.IO) {
Expand All @@ -546,7 +547,6 @@ private fun ModuleList(
ModuleItem(
navigator = navigator,
module = module,
isChecked = isChecked,
updateUrl = updatedModule.first,
onUninstall = {
scope.launch { onModuleUninstall(module) }
Expand All @@ -558,11 +558,10 @@ private fun ModuleList(
scope.launch {
val success = loadingDialog.withLoading {
withContext(Dispatchers.IO) {
toggleModule(module.dirId, !isChecked)
toggleModule(module.dirId, !module.enabled)
}
}
if (success) {
isChecked = it
viewModel.fetchModuleList()

val result = snackBarHost.showSnackbar(
Expand All @@ -574,7 +573,7 @@ private fun ModuleList(
reboot()
}
} else {
val message = if (isChecked) failedDisable else failedEnable
val message = if (module.enabled) failedDisable else failedEnable
snackBarHost.showSnackbar(message.format(module.name))
}
}
Expand Down Expand Up @@ -610,7 +609,6 @@ private fun ModuleList(
fun ModuleItem(
navigator: DestinationsNavigator,
module: ModuleViewModel.ModuleInfo,
isChecked: Boolean,
updateUrl: String,
onUninstall: (ModuleViewModel.ModuleInfo) -> Unit,
onRestore: (ModuleViewModel.ModuleInfo) -> Unit,
Expand All @@ -631,7 +629,7 @@ fun ModuleItem(
.run {
if (module.hasWebUi) {
toggleable(
value = isChecked,
value = module.enabled,
interactionSource = interactionSource,
role = Role.Button,
indication = indication,
Expand Down Expand Up @@ -687,7 +685,7 @@ fun ModuleItem(
) {
Switch(
enabled = !module.update,
checked = isChecked,
checked = module.enabled,
onCheckedChange = onCheckChanged,
interactionSource = if (!module.hasWebUi) interactionSource else null
)
Expand Down Expand Up @@ -826,7 +824,7 @@ fun ModuleItem(
imageVector = Icons.Outlined.Delete,
contentDescription = null
)
if (!module.hasActionScript && !module.hasWebUi && updateUrl.isEmpty()) {
if (!module.hasActionScript && !module.hasWebUi && updateUrl.isEmpty()) {
Text(
modifier = Modifier.padding(start = 7.dp),
fontFamily = MaterialTheme.typography.labelMedium.fontFamily,
Expand Down Expand Up @@ -859,5 +857,5 @@ fun ModuleItemPreview() {
hasActionScript = false,
dirId = "dirId"
)
ModuleItem(EmptyDestinationsNavigator, module, true, "", {}, {}, {}, {}, {})
}
ModuleItem(EmptyDestinationsNavigator, module, "", {}, {}, {}, {}, {})
}
18 changes: 14 additions & 4 deletions manager/app/src/main/java/com/rifsxd/ksunext/ui/viewmodel/ModuleViewModel.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import java.text.Collator
import java.util.Locale
import com.rifsxd.ksunext.ui.util.HanziToPinyin
import com.rifsxd.ksunext.ui.util.listModules
import com.rifsxd.ksunext.ui.util.overlayFsAvailable
import org.json.JSONArray
Expand Down Expand Up @@ -51,6 +54,8 @@ class ModuleViewModel : ViewModel() {
var isRefreshing by mutableStateOf(false)
private set

var search by mutableStateOf("")

var sortAToZ by mutableStateOf(false)
var sortZToA by mutableStateOf(false)

Expand All @@ -59,8 +64,13 @@ class ModuleViewModel : ViewModel() {
sortAToZ -> compareBy<ModuleInfo> { it.name.lowercase() }
sortZToA -> compareByDescending<ModuleInfo> { it.name.lowercase() }
else -> compareBy<ModuleInfo> { it.dirId }
}
modules.sortedWith(comparator).also {
}.thenBy(Collator.getInstance(Locale.getDefault()), ModuleInfo::id)

modules.filter {
it.id.contains(search, ignoreCase = true) ||
it.name.contains(search, ignoreCase = true) ||
HanziToPinyin.getInstance().toPinyinString(it.name).contains(search, ignoreCase = true)
}.sortedWith(comparator).also {
isRefreshing = false
}
}
Expand All @@ -83,7 +93,7 @@ class ModuleViewModel : ViewModel() {

kotlin.runCatching {
isOverlayAvailable = overlayFsAvailable()

val result = listModules()

Log.i(TAG, "result: $result")
Expand Down Expand Up @@ -167,4 +177,4 @@ class ModuleViewModel : ViewModel() {

return Triple(zipUrl, version, changelog)
}
}
}

0 comments on commit cae7693

Please sign in to comment.