diff --git a/java/src/org/futo/inputmethod/latin/uix/ImportResourceActivity.kt b/java/src/org/futo/inputmethod/latin/uix/ImportResourceActivity.kt index f06f855f3..4f237336f 100644 --- a/java/src/org/futo/inputmethod/latin/uix/ImportResourceActivity.kt +++ b/java/src/org/futo/inputmethod/latin/uix/ImportResourceActivity.kt @@ -43,6 +43,7 @@ import org.futo.inputmethod.latin.uix.settings.NavigationItem import org.futo.inputmethod.latin.uix.settings.NavigationItemStyle import org.futo.inputmethod.latin.uix.settings.ScreenTitle import org.futo.inputmethod.latin.uix.settings.ScrollableList +import org.futo.inputmethod.latin.uix.settings.Tip import org.futo.inputmethod.latin.uix.settings.useDataStore import org.futo.inputmethod.latin.uix.theme.StatusBarColorSetter import org.futo.inputmethod.latin.uix.theme.ThemeOption @@ -127,7 +128,7 @@ fun ImportScreen(fileKind: FileKindAndInfo, file: String?, onApply: (FileKindAnd if(fileKind.locale != null) { it.filter { it.tag.lowercase() == fileKind.locale.lowercase() || it.tag.split("_")[0].lowercase() == fileKind.locale.split("_")[0].lowercase() }.let { if(it.isEmpty()) { - Text("Warning: This file appears to be intended for a language (${fileKind.locale}) which is not active", modifier = Modifier.padding(8.dp)) + Tip("⚠\uFE0F This file appears to be intended for a language (${fileKind.locale}) which is not enabled in settings") getActiveLanguages(context) } else { it @@ -141,7 +142,7 @@ fun ImportScreen(fileKind: FileKindAndInfo, file: String?, onApply: (FileKindAnd languages.forEach { NavigationItem( title = "${it.name} (${it.tag})", - style = NavigationItemStyle.MiscNoArrow, + style = NavigationItemStyle.Misc, navigate = { importing.value = true importingLanguage.value = it.name diff --git a/java/src/org/futo/inputmethod/latin/uix/settings/pages/Help.kt b/java/src/org/futo/inputmethod/latin/uix/settings/pages/Help.kt index 23b55a0b0..c9aa962c2 100644 --- a/java/src/org/futo/inputmethod/latin/uix/settings/pages/Help.kt +++ b/java/src/org/futo/inputmethod/latin/uix/settings/pages/Help.kt @@ -21,15 +21,18 @@ fun HelpScreen(navController: NavHostController = rememberNavController()) { ScrollableList { ScreenTitle("Help & Feedback", showBack = true, navController) - Tip("We want to hear from you! If you're reporting an issue, your version may be relevant: zv${BuildConfig.VERSION_NAME}") + Tip("We want to hear from you! If you're reporting an issue, your version may be relevant: v${BuildConfig.VERSION_NAME}") + NavigationItem(title = "Wiki", style = NavigationItemStyle.Misc, navigate = { + context.openURI("https://gitlab.futo.org/alex/keyboard-wiki/-/wikis/FUTO-Keyboard") + }) NavigationItem(title = "Discord Server", style = NavigationItemStyle.Misc, navigate = { context.openURI("https://keyboard.futo.org/discord") }) NavigationItem(title = "FUTO Chat", style = NavigationItemStyle.Misc, navigate = { context.openURI("https://chat.futo.org/") }) - NavigationItem(title = "Email us", style = NavigationItemStyle.Misc, navigate = { + NavigationItem(title = "Email keyboard@futo.org", style = NavigationItemStyle.Misc, navigate = { context.openURI("mailto:keyboard@futo.org") }) }