Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a30ef6fd authored by Binyi Wu's avatar Binyi Wu
Browse files

Refactor entry displayName to label and use it for SPA search

Bug: 253981143
Test: manual, unit test
Change-Id: I4bf129092c7eb52b8feb277ab232456236ca338e
parent a9233ab0
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ object ItemListPageProvider : SettingsPageProvider {

        return SettingsEntryBuilder.createInject(
            owner = createSettingsPage(arguments),
            displayName = "ItemList_$opParam",
            label = "ItemList_$opParam",
        ).setUiLayoutFn {
            Preference(
                object : PreferenceModel {
+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ object ItemOperatePageProvider : SettingsPageProvider {

        return SettingsEntryBuilder.createInject(
            owner = createSettingsPage(arguments),
            displayName = "ItemOp_$opParam",
            label = "ItemOp_$opParam",
        ).setUiLayoutFn {
            // Item name is a runtime parameter, which needs to be read inside UiLayoutFn
            val itemName = parameter.getStringArg(ITEM_NAME_PARAM_NAME, it) ?: "NULL"
+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ object ArgumentPageProvider : SettingsPageProvider {

        return SettingsEntryBuilder.createInject(
            owner = createSettingsPage(arguments),
            displayName = "${name}_$stringParam",
            label = "${name}_$stringParam",
        )
            .setSearchDataFn { ArgumentPageModel.genInjectSearchData() }
            .setUiLayoutFn {
+4 −4
Original line number Diff line number Diff line
@@ -50,22 +50,22 @@ fun SettingsPage.debugBrief(): String {
}

fun SettingsEntry.debugBrief(): String {
    return "${owner.displayName}:$displayName"
    return "${owner.displayName}:$label"
}

fun SettingsEntry.debugContent(entryRepository: SettingsEntryRepository): String {
    val searchData = getSearchData()
    val statusData = getStatusData()
    val entryPathWithName = entryRepository.getEntryPathWithDisplayName(id)
    val entryPathWithLabel = entryRepository.getEntryPathWithLabel(id)
    val entryPathWithTitle = entryRepository.getEntryPathWithTitle(id,
        searchData?.title ?: displayName)
        searchData?.title ?: label)
    val content = listOf(
        "------ STATIC ------",
        "id = $id",
        "owner = ${owner.debugBrief()} ${owner.debugArguments()}",
        "linkFrom = ${fromPage?.debugBrief()} ${fromPage?.debugArguments()}",
        "linkTo = ${toPage?.debugBrief()} ${toPage?.debugArguments()}",
        "hierarchy_path = $entryPathWithName",
        "hierarchy_path = $entryPathWithLabel",
        "------ ATTRIBUTION ------",
        "allowSearch = $isAllowSearch",
        "isSearchDynamic = $isSearchDataDynamic",
+2 −2
Original line number Diff line number Diff line
@@ -173,12 +173,12 @@ class DebugProvider : ContentProvider() {
            val intent = entry.createIntent(SESSION_SEARCH) ?: Intent()
            cursor.newRow()
                .add(ColumnEnum.ENTRY_ID.id, entry.id)
                .add(ColumnEnum.ENTRY_NAME.id, entry.displayName)
                .add(ColumnEnum.ENTRY_LABEL.id, entry.label)
                .add(ColumnEnum.ENTRY_ROUTE.id, entry.containerPage().buildRoute())
                .add(ColumnEnum.ENTRY_INTENT_URI.id, intent.toUri(URI_INTENT_SCHEME))
                .add(
                    ColumnEnum.ENTRY_HIERARCHY_PATH.id,
                    entryRepository.getEntryPathWithDisplayName(entry.id)
                    entryRepository.getEntryPathWithLabel(entry.id)
                )
        }
        return cursor
Loading