n/futokb
1
0
Fork 0
mirror of https://gitlab.futo.org/keyboard/latinime.git synced 2024-09-28 14:54:30 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update wording for languages & models

Browse Source
This commit is contained in:
Aleksandras Kostarevas 2024-06-06 22:25:17 +03:00
parent b39159e582
commit 54114c7cf0
4 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
java/src/org/futo/inputmethod/latin/uix/ImportResourceActivity.kt
View File

@ -318,6 +318,10 @@ fun determineFileKind(context: Context, file: Uri): FileKindAndInfo {
}
object ResourceHelper {
val BuiltInVoiceInputFallbacks = mapOf(
"en" to BUILTIN_ENGLISH_MODEL
)
suspend fun findKeyForLocaleAndKind(context: Context, locale: Locale, kind: FileKind): String? {
val keysToTry = listOf(
locale.language,
@ -348,11 +352,7 @@ object ResourceHelper {
fun tryFindingVoiceInputModelForLocale(context: Context, locale: Locale): ModelLoader? {
val file = runBlocking { findFileForKind(context, locale, FileKind.VoiceInput) }
?: return if(locale.language == "en") {
BUILTIN_ENGLISH_MODEL
} else {
null
}
?: return BuiltInVoiceInputFallbacks[locale.language]
return ModelFileFile(R.string.externally_imported_model, file)
}

2
java/src/org/futo/inputmethod/latin/uix/settings/pages/Home.kt
View File

@ -57,7 +57,7 @@ fun HomeScreen(navController: NavHostController = rememberNavController()) {
ConditionalUnpaidNoticeWithNav(navController)
NavigationItem(
title = "Languages",
title = "Languages & Models",
style = NavigationItemStyle.HomePrimary,
navigate = { navController.navigate("languages") },
icon = painterResource(id = R.drawable.globe)

24
java/src/org/futo/inputmethod/latin/uix/settings/pages/Languages.kt
View File

@ -51,6 +51,7 @@ import org.futo.inputmethod.latin.uix.settings.pages.modelmanager.openModelImpor
import org.futo.inputmethod.latin.uix.settings.useDataStoreValueBlocking
import org.futo.inputmethod.latin.uix.theme.Typography
import org.futo.inputmethod.latin.uix.youAreImporting
import org.futo.inputmethod.latin.utils.Dictionaries
import org.futo.inputmethod.latin.xlm.ModelPaths
import org.futo.inputmethod.updates.openURI
import java.util.Locale
@ -73,6 +74,14 @@ fun ConfirmResourceActionDialog(
isCurrentlySet: Boolean,
locale: Locale
) {
val hasBuiltInFallback = if(resourceKind == FileKind.VoiceInput) {
ResourceHelper.BuiltInVoiceInputFallbacks[locale.language] != null
} else if(resourceKind == FileKind.Dictionary) {
Dictionaries.getDictionaryId(locale) != 0
} else {
true
}
AlertDialog(
icon = {
Icon(painterResource(id = resourceKind.icon()), contentDescription = "Action")
@ -81,8 +90,10 @@ fun ConfirmResourceActionDialog(
Text(text = "${locale.displayLanguage} - ${resourceKind.kindTitle()}")
},
text = {
if(isCurrentlySet) {
Text(text = "Would you like to delete ${resourceKind.youAreImporting()} for ${locale.displayLanguage}, or replace it with another file?")
if(isCurrentlySet && hasBuiltInFallback) {
Text(text = "Would you like to revert ${resourceKind.youAreImporting()} to default for ${locale.displayLanguage}, or replace it with another file?")
} else if(isCurrentlySet) {
Text(text = "Would you like to remove the ${resourceKind.youAreImporting()} for ${locale.displayLanguage}, or replace it with another file?\n\nNo built-in ${resourceKind.youAreImporting()} exists for this language, so if you remove it, it will stop working until you import a different one!")
} else {
Text(text = "No ${resourceKind.youAreImporting()} override is set for ${locale.displayLanguage}. You can explore downloads online, or import an existing file.")
}
@ -106,7 +117,12 @@ fun ConfirmResourceActionDialog(
dismissButton = {
if(isCurrentlySet) {
TextButton(onClick = { onDelete() }) {
Text("Delete")
if(hasBuiltInFallback) {
Text("Revert to Default")
} else {
Text("Remove")
}
}
} else {
TextButton(onClick = { onExplore() }) {
@ -159,7 +175,7 @@ fun LanguagesScreen(navController: NavHostController = rememberNavController())
}
LazyColumn {
item {
ScreenTitle("Languages", showBack = true, navController)
ScreenTitle("Languages & Models", showBack = true, navController)
}
item {

4
java/src/org/futo/inputmethod/latin/uix/settings/pages/VoiceInput.kt
View File

@ -79,8 +79,8 @@ fun VoiceInputScreen(navController: NavHostController = rememberNavController())
)
NavigationItem(
title = "Languages",
subtitle = "To change the model, visit Languages menu",
title = "Models",
subtitle = "To change the models, visit Languages & Models menu",
style = NavigationItemStyle.Misc,
navigate = { navController.navigate("languages") }
)