feat:优化搜索部分UI细节

Yricky · Sep 26, 2024 · 37b28b4 · 37b28b4
1 parent a120923
commit 37b28b4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/abcdecoder/src/jvmMain/kotlin/me/yricky/abcde/content/AbcUniSearch.kt b/abcdecoder/src/jvmMain/kotlin/me/yricky/abcde/content/AbcUniSearch.kt
@@ -127,10 +127,10 @@ fun AbcUniSearchStateView(
                 cursorBrush = SolidColor(MaterialTheme.colorScheme.onSecondaryContainer),
                 modifier = Modifier.weight(1f)
             )
-            Button({
+            Button(onClick = {
                 state.session?.job?.cancel()
                 state.session = state.startSearch(setOf(AbcUniSearchState.MethodName,AbcUniSearchState.ASM))
-            }){
+            }, enabled = state.filterText.isNotBlank()){
                 Text("查询")
             }
         }
@@ -141,15 +141,15 @@ fun AbcUniSearchStateView(
             }
             var tabIndex by remember { mutableStateOf(0) }
             TabRow(
-                selectedTabIndex = 0
+                selectedTabIndex = tabIndex,
             ){
                 Tab(
                     selected = tabIndex == 0,
                     onClick = { tabIndex = 0 },
                     text = { Text("在方法名中查找") }
                 )
                 Tab(
-                    selected = tabIndex == 0,
+                    selected = tabIndex == 1,
                     onClick = { tabIndex = 1 },
                     text = { Text("在方法引用的字符串中查找") }
                 )
@@ -160,7 +160,7 @@ fun AbcUniSearchStateView(
                     1 -> AbcUniSearchState.ASM
                     else -> null
                 }]?.let {  u ->
-                    itemsIndexed(u){ index,it ->
+                    itemsIndexed(u){ _,it ->
                         when(it){
                             is AbcUniSearchState.ClassResult -> {
                                 Row(

diff --git a/abcdecoder/src/jvmMain/kotlin/me/yricky/abcde/page/AbcView.kt b/abcdecoder/src/jvmMain/kotlin/me/yricky/abcde/page/AbcView.kt
@@ -114,13 +114,11 @@ class AbcView(val abc: AbcBuf,override val hap:HapView? = null):AttachHapPage()
                     scope.launch(Dispatchers.Default) { realCkSum = realCheckSum.value }
                 })
             }
-        }, if(appCfg.futureFeature) {
-            composeSelectContent {
+        }, composeSelectContent {
                 Image(Icons.search(), null, Modifier.fillMaxSize(), colorFilter = grayColorFilter)
             } to composeContent {
                 AbcUniSearchStateView(hapSession, this, searchState)
             }
-        } else null
         ))
     }