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 help menu

Browse Source
This commit is contained in:
Aleksandras Kostarevas 2024-04-02 11:52:31 -05:00
parent c4bd35c921
commit 20acfb57c6
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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.NavigationItemStyle
import org.futo.inputmethod.latin.uix.settings.ScreenTitle import org.futo.inputmethod.latin.uix.settings.ScreenTitle
import org.futo.inputmethod.latin.uix.settings.ScrollableList 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.settings.useDataStore
import org.futo.inputmethod.latin.uix.theme.StatusBarColorSetter import org.futo.inputmethod.latin.uix.theme.StatusBarColorSetter
import org.futo.inputmethod.latin.uix.theme.ThemeOption import org.futo.inputmethod.latin.uix.theme.ThemeOption
@ -127,7 +128,7 @@ fun ImportScreen(fileKind: FileKindAndInfo, file: String?, onApply: (FileKindAnd
if(fileKind.locale != null) { if(fileKind.locale != null) {
it.filter { it.tag.lowercase() == fileKind.locale.lowercase() || it.tag.split("_")[0].lowercase() == fileKind.locale.split("_")[0].lowercase() }.let { it.filter { it.tag.lowercase() == fileKind.locale.lowercase() || it.tag.split("_")[0].lowercase() == fileKind.locale.split("_")[0].lowercase() }.let {
if(it.isEmpty()) { 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) getActiveLanguages(context)
} else { } else {
it it
@ -141,7 +142,7 @@ fun ImportScreen(fileKind: FileKindAndInfo, file: String?, onApply: (FileKindAnd
languages.forEach { languages.forEach {
NavigationItem( NavigationItem(
title = "${it.name} (${it.tag})", title = "${it.name} (${it.tag})",
style = NavigationItemStyle.MiscNoArrow, style = NavigationItemStyle.Misc,
navigate = { navigate = {
importing.value = true importing.value = true
importingLanguage.value = it.name importingLanguage.value = it.name

7
java/src/org/futo/inputmethod/latin/uix/settings/pages/Help.kt
View File

@ -21,15 +21,18 @@ fun HelpScreen(navController: NavHostController = rememberNavController()) {
ScrollableList { ScrollableList {
ScreenTitle("Help & Feedback", showBack = true, navController) 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 = { NavigationItem(title = "Discord Server", style = NavigationItemStyle.Misc, navigate = {
context.openURI("https://keyboard.futo.org/discord") context.openURI("https://keyboard.futo.org/discord")
}) })
NavigationItem(title = "FUTO Chat", style = NavigationItemStyle.Misc, navigate = { NavigationItem(title = "FUTO Chat", style = NavigationItemStyle.Misc, navigate = {
context.openURI("https://chat.futo.org/") 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") context.openURI("mailto:keyboard@futo.org")
}) })
} }