[optimize|build]优化使用体验；更新文字识别 ML 库版本

SkyD666 · May 12, 2023 · 3c437cd · 3c437cd
1 parent e06cab6
commit 3c437cd
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 11 deletions.
diff --git a/app/src/main/java/com/skyd/rays/model/respository/AddRepository.kt b/app/src/main/java/com/skyd/rays/model/respository/AddRepository.kt
@@ -16,12 +16,12 @@ import com.skyd.rays.base.BaseData
 import com.skyd.rays.base.BaseRepository
 import com.skyd.rays.config.CLASSIFICATION_MODEL_DIR_FILE
 import com.skyd.rays.config.STICKER_DIR
-import com.skyd.rays.model.db.dao.StickerDao
 import com.skyd.rays.ext.copyTo
 import com.skyd.rays.ext.dataStore
 import com.skyd.rays.ext.get
 import com.skyd.rays.ext.md5
 import com.skyd.rays.model.bean.StickerWithTags
+import com.skyd.rays.model.db.dao.StickerDao
 import com.skyd.rays.model.preference.StickerClassificationModelPreference
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
@@ -172,7 +172,9 @@ class AddRepository @Inject constructor(private val stickerDao: StickerDao) : Ba
         for (block in result.textBlocks) {
             for (line in block.lines) {
                 for (element in line.elements) {
-                    list += element.text
+                    if (element.confidence > 0.4f) {
+                        list += element.text
+                    }
                 }
             }
         }

diff --git a/app/src/main/java/com/skyd/rays/ui/screen/MainScreen.kt b/app/src/main/java/com/skyd/rays/ui/screen/MainScreen.kt
@@ -10,8 +10,16 @@ import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Egg
 import androidx.compose.material.icons.filled.Home
-import androidx.compose.material3.*
+import androidx.compose.material.icons.outlined.Egg
+import androidx.compose.material.icons.outlined.Home
+import androidx.compose.material3.Icon
+import androidx.compose.material3.NavigationBar
+import androidx.compose.material3.NavigationBarItem
+import androidx.compose.material3.NavigationRail
+import androidx.compose.material3.NavigationRailItem
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
@@ -68,28 +76,33 @@ private fun NavigationBarOrRail(
     val items = listOf(
         stringResource(R.string.home_screen_name), stringResource(R.string.more_screen_name)
     )
-    val icons = listOf(
-        Icons.Default.Home, Icons.Default.Egg
-    )
+    val icons = remember {
+        mapOf(
+            true to listOf(Icons.Filled.Home, Icons.Filled.Egg),
+            false to listOf(Icons.Outlined.Home, Icons.Outlined.Egg),
+        )
+    }
 
     if (LocalContext.current.screenIsLand) {
         NavigationRail {
             items.forEachIndexed { index, item ->
+                val selected = currentPage == index
                 NavigationRailItem(
-                    icon = { Icon(icons[index], contentDescription = item) },
+                    icon = { Icon(icons[selected]!![index], contentDescription = item) },
                     label = { Text(item) },
-                    selected = currentPage == index,
+                    selected = selected,
                     onClick = { scrollToPage(index) }
                 )
             }
         }
     } else {
         NavigationBar {
             items.forEachIndexed { index, item ->
+                val selected = currentPage == index
                 NavigationBarItem(
-                    icon = { Icon(icons[index], contentDescription = item) },
+                    icon = { Icon(icons[selected]!![index], contentDescription = item) },
                     label = { Text(item) },
-                    selected = currentPage == index,
+                    selected = selected,
                     onClick = { scrollToPage(index) }
                 )
             }
@@ -110,6 +123,7 @@ private fun ContentPager(pagerState: PagerState) {
                 0 -> {
                     HomeScreen()
                 }
+
                 1 -> {
                     MoreScreen()
                 }

diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         compose_version = '1.4.3'
         md3_version = '1.1.0-rc01'
         accompanist_version = '0.30.0'
-        mlkit_recognition_version = '16.0.0-beta6'
+        mlkit_recognition_version = '16.0.0'
     }
     repositories {
         google()