Bump to 0.9.0

yuetyam · Jul 16, 2024 · bdab730 · bdab730
1 parent 799081c
commit bdab730
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 14 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -12,8 +12,8 @@ android {
                 applicationId = "org.jyutping.jyutping"
                 minSdk = 30
                 targetSdk = 34
-                versionCode = 8
-                versionName = "0.8.0"
+                versionCode = 9
+                versionName = "0.9.0"
                 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
                 vectorDrawables.useSupportLibrary = true
         }

diff --git a/app/src/main/java/org/jyutping/jyutping/ui/home/HomeScreen.kt b/app/src/main/java/org/jyutping/jyutping/ui/home/HomeScreen.kt
@@ -44,33 +44,29 @@ fun HomeScreen(navController: NavHostController) {
         val gwongWanEntries = remember { mutableStateOf<List<GwongWanCharacter>>(listOf()) }
         val helper: DatabaseHelper by lazy { DatabaseHelper(navController.context, DatabasePreparer.databaseName) }
         fun searchYingWan(text: String): List<YingWaaFanWan> {
-                if (text.isBlank()) return listOf()
-                val char = text.first()
+                val char = text.firstOrNull() ?: return emptyList()
                 val matched = helper.yingWaaFanWanMatch(char)
                 if (matched.isNotEmpty()) return YingWaaFanWan.process(matched)
                 val traditionalChar = text.convertedS2T().firstOrNull() ?: char
                 val traditionalMatched = helper.yingWaaFanWanMatch(traditionalChar)
                 return YingWaaFanWan.process(traditionalMatched)
         }
         fun searchChoHok(text: String): List<ChoHokYuetYamCitYiu> {
-                if (text.isBlank()) return listOf()
-                val char = text.first()
+                val char = text.firstOrNull() ?: return emptyList()
                 val matched = helper.choHokYuetYamCitYiuMatch(char)
                 if (matched.isNotEmpty()) return matched
                 val traditionalChar = text.convertedS2T().firstOrNull() ?: char
                 return helper.choHokYuetYamCitYiuMatch(traditionalChar)
         }
         fun searchFanWan(text: String): List<FanWanCuetYiu> {
-                if (text.isBlank()) return listOf()
-                val char = text.first()
+                val char = text.firstOrNull() ?: return emptyList()
                 val matched = helper.fanWanCuetYiuMatch(char)
                 if (matched.isNotEmpty()) return matched
                 val traditionalChar = text.convertedS2T().firstOrNull() ?: char
                 return helper.fanWanCuetYiuMatch(traditionalChar)
         }
         fun searchGwongWan(text: String): List<GwongWanCharacter> {
-                if (text.isBlank()) return listOf()
-                val char = text.first()
+                val char = text.firstOrNull() ?: return emptyList()
                 val matched = helper.gwongWanMatch(char)
                 if (matched.isNotEmpty()) return matched
                 val traditionalChar = text.convertedS2T().firstOrNull() ?: char

diff --git a/app/src/main/java/org/jyutping/jyutping/utilities/DatabaseHelper.kt b/app/src/main/java/org/jyutping/jyutping/utilities/DatabaseHelper.kt
@@ -118,8 +118,9 @@ class DatabaseHelper(context: Context, databaseName: String) : SQLiteOpenHelper(
                 }
                 if (romanization != null) {
                         return Pair(romanization, matchedCount)
+                } else {
+                        return Pair(null, 0)
                 }
-                return Pair(null, 0)
         }
         private fun fetchRomanizations(word: String): List<String> {
                 val romanizations: MutableList<String> = mutableListOf()

diff --git a/app/src/main/java/org/jyutping/jyutping/utilities/DatabasePreparer.kt b/app/src/main/java/org/jyutping/jyutping/utilities/DatabasePreparer.kt
@@ -1,7 +1,6 @@
 package org.jyutping.jyutping.utilities
 
 import android.content.Context
-import android.util.Log
 import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
@@ -14,8 +13,6 @@ object DatabasePreparer {
         private val oldDatabaseNames: List<String> = listOf(
                 "tmpdb.sqlite3",
                 "tmpdb.sqlite3-journal",
-                "appdb-v0.1.0-tmp.sqlite3",
-                "appdb-v0.1.0-tmp.sqlite3-journal",
                 "appdb-v0.2.0-tmp.sqlite3",
                 "appdb-v0.2.0-tmp.sqlite3-journal",
                 "appdb-v0.3.0-tmp.sqlite3",
@@ -28,6 +25,8 @@ object DatabasePreparer {
                 "appdb-v0.6.0-tmp.sqlite3-journal",
                 "appdb-v0.7.0-tmp.sqlite3",
                 "appdb-v0.7.0-tmp.sqlite3-journal",
+                "appdb-v0.8.0-tmp.sqlite3",
+                "appdb-v0.8.0-tmp.sqlite3-journal",
         )
         val databaseName: String = run {
                 val version = BuildConfig.VERSION_NAME