enhancement: add Google Play and user manual references (#493)

This commit is contained in:
Diego Beraldin 2024-01-27 13:44:08 +01:00 committed by GitHub
parent bccd20cfda
commit 1874e7bba0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
36 changed files with 114 additions and 11 deletions

View File

@ -37,6 +37,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.ColorFilter
import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.layout.onGloballyPositioned
import androidx.compose.ui.platform.LocalUriHandler
import androidx.compose.ui.text.buildAnnotatedString
import androidx.compose.ui.unit.toSize
import cafe.adriel.voyager.core.screen.Screen
@ -49,6 +50,7 @@ import com.github.diegoberaldin.raccoonforlemmy.core.architecture.bindToLifecycl
import com.github.diegoberaldin.raccoonforlemmy.core.commonui.lemmyui.SettingsHeader
import com.github.diegoberaldin.raccoonforlemmy.core.commonui.lemmyui.SettingsRow
import com.github.diegoberaldin.raccoonforlemmy.core.commonui.lemmyui.SettingsSwitchRow
import com.github.diegoberaldin.raccoonforlemmy.core.commonui.lemmyui.handleUrl
import com.github.diegoberaldin.raccoonforlemmy.core.commonui.modals.BarThemeBottomSheet
import com.github.diegoberaldin.raccoonforlemmy.core.commonui.modals.DurationBottomSheet
import com.github.diegoberaldin.raccoonforlemmy.core.commonui.modals.InboxTypeSheet
@ -82,6 +84,7 @@ import com.github.diegoberaldin.raccoonforlemmy.unit.about.AboutDialog
import com.github.diegoberaldin.raccoonforlemmy.unit.accountsettings.AccountSettingsScreen
import com.github.diegoberaldin.raccoonforlemmy.unit.configureswipeactions.ConfigureSwipeActionsScreen
import com.github.diegoberaldin.raccoonforlemmy.unit.manageban.ManageBanScreen
import com.github.diegoberaldin.raccoonforlemmy.unit.web.WebViewScreen
import dev.icerock.moko.resources.compose.stringResource
import dev.icerock.moko.resources.desc.desc
import kotlinx.coroutines.flow.launchIn
@ -107,6 +110,7 @@ class SettingsScreen : Screen {
val lang by languageRepository.currentLanguage.collectAsState()
var infoDialogOpened by remember { mutableStateOf(false) }
val scope = rememberCoroutineScope()
val uriHandler = LocalUriHandler.current
LaunchedEffect(Unit) {
navigationCoordinator.onDoubleTabSelection.onEach { section ->
@ -569,11 +573,29 @@ class SettingsScreen : Screen {
SettingsRow(
title = stringResource(MR.strings.settings_about),
value = "",
disclosureIndicator = true,
onTap = rememberCallback {
infoDialogOpened = true
},
)
// user manual
SettingsRow(
title = stringResource(MR.strings.settings_user_manual),
value = "",
disclosureIndicator = true,
onTap = rememberCallback {
navigationCoordinator.handleUrl(
url = "https://diegoberaldin.github.io/RaccoonForLemmy/user_manual/main",
openExternal = uiState.openUrlsInExternalBrowser,
uriHandler = uriHandler,
onOpenWeb = { url ->
navigationCoordinator.pushScreen(WebViewScreen(url))
},
)
},
)
Spacer(modifier = Modifier.height(Spacing.xxxl))
}
}

View File

@ -324,4 +324,6 @@
<string name="bar_theme_transparent">شفاف</string>
<string name="settings_bar_theme">موضوع الحالة وشريط التنقل</string>
<string name="settings_colors_and_fonts">الألوان والخطوط</string>
<string name="settings_about_view_google_play">عرض على جوجل بلاي</string>
<string name="settings_user_manual">دليل الاستخدام</string>
</resources>

View File

@ -357,4 +357,6 @@
<string name="bar_theme_transparent">Transparent</string>
<string name="settings_bar_theme">System notification and navigation bar theme</string>
<string name="settings_colors_and_fonts">Colors and fonts</string>
<string name="settings_about_view_google_play">View on Google Play</string>
<string name="settings_user_manual">User manual</string>
</resources>

View File

@ -334,4 +334,6 @@
<string name="bar_theme_transparent">Прозрачен</string>
<string name="settings_bar_theme">Тема на лентата за състояние и навигация</string>
<string name="settings_colors_and_fonts">Цветове и шрифтове</string>
<string name="settings_about_view_google_play">Вижте в Google Play</string>
<string name="settings_user_manual">Ръководство за употреба</string>
</resources>

View File

@ -326,4 +326,6 @@
<string name="bar_theme_transparent">Průhledný</string>
<string name="settings_bar_theme">Téma stavové a navigační lišty</string>
<string name="settings_colors_and_fonts">Barvy a písma</string>
<string name="settings_about_view_google_play">Zobrazit na Google Play</string>
<string name="settings_user_manual">Uživatelský manuál</string>
</resources>

View File

@ -326,4 +326,6 @@
<string name="bar_theme_transparent">Gennemsigtig</string>
<string name="settings_bar_theme">Tema for status- og navigationslinjen</string>
<string name="settings_colors_and_fonts">Farver og skrifttyper</string>
<string name="settings_about_view_google_play">Se på Google Play</string>
<string name="settings_user_manual">Brugermanual</string>
</resources>

View File

@ -334,4 +334,6 @@
<string name="bar_theme_transparent">Transparent</string>
<string name="settings_bar_theme">Thema der Status- und Navigationsleiste</string>
<string name="settings_colors_and_fonts">Farben und Schriftarten</string>
<string name="settings_about_view_google_play">Auf Google Play ansehen</string>
<string name="settings_user_manual">Benutzerhandbuch</string>
</resources>

View File

@ -337,4 +337,6 @@
<string name="bar_theme_transparent">Διαφανής</string>
<string name="settings_bar_theme">Θέμα της γραμμής κατάστασης και πλοήγησης</string>
<string name="settings_colors_and_fonts">Χρώματα και γραμματοσειρές</string>
<string name="settings_about_view_google_play">Προβολή στο Google Play</string>
<string name="settings_user_manual">Εγχειρίδιο χρήστη</string>
</resources>

View File

@ -325,4 +325,6 @@
<string name="bar_theme_transparent">Travidebla</string>
<string name="settings_bar_theme">Temo de la statuso kaj navigadbreto</string>
<string name="settings_colors_and_fonts">Koloroj kaj tiparoj</string>
<string name="settings_about_view_google_play">Vidi sur Google Play</string>
<string name="settings_user_manual">Uzantmanlibro</string>
</resources>

View File

@ -327,4 +327,6 @@
<string name="bar_theme_transparent">Transparente</string>
<string name="settings_bar_theme">Tema barra de estado y navegación</string>
<string name="settings_colors_and_fonts">Colores y fuentes</string>
<string name="settings_about_view_google_play">Ver en Google Play</string>
<string name="settings_user_manual">Manual de usuario</string>
</resources>

View File

@ -326,4 +326,6 @@
<string name="bar_theme_transparent">Läbipaistev</string>
<string name="settings_bar_theme">Oleku- ja navigeerimisriba teema</string>
<string name="settings_colors_and_fonts">Värvid ja fondid</string>
<string name="settings_about_view_google_play">Vaata Google Plays</string>
<string name="settings_user_manual">Kasutusjuhend</string>
</resources>

View File

@ -326,4 +326,6 @@
<string name="bar_theme_transparent">Läpinäkyvä</string>
<string name="settings_bar_theme">Tila- ja navigointipalkin teema</string>
<string name="settings_colors_and_fonts">Värit ja fontit</string>
<string name="settings_about_view_google_play">Katso Google Playssa</string>
<string name="settings_user_manual">Ohjekirja</string>
</resources>

View File

@ -331,4 +331,6 @@
<string name="bar_theme_transparent">Transparent</string>
<string name="settings_bar_theme">Thème barre d\'état et de navigation</string>
<string name="settings_colors_and_fonts">Couleurs et polices</string>
<string name="settings_about_view_google_play">Voir sur Google Play</string>
<string name="settings_user_manual">Manuel de l\'utilisateur</string>
</resources>

View File

@ -335,4 +335,6 @@
<string name="bar_theme_transparent">Trédhearcach</string>
<string name="settings_bar_theme">Téama an bharra stádais agus nascleanúna</string>
<string name="settings_colors_and_fonts">Dathanna agus clónna</string>
<string name="settings_about_view_google_play">Amharc ar Google Play</string>
<string name="settings_user_manual">Lámhleabhar úsáideora</string>
</resources>

View File

@ -331,4 +331,6 @@
<string name="bar_theme_transparent">Transparentan</string>
<string name="settings_bar_theme">Tema statusne i navigacijske trake</string>
<string name="settings_colors_and_fonts">Boje i fontovi</string>
<string name="settings_about_view_google_play">Pogledajte na Google Playu</string>
<string name="settings_user_manual">Korisnički priručnik</string>
</resources>

View File

@ -330,4 +330,6 @@
<string name="bar_theme_transparent">Átlátszó</string>
<string name="settings_bar_theme">Az állapot és a navigációs sáv témája</string>
<string name="settings_colors_and_fonts">Színek és betűtípusok</string>
<string name="settings_about_view_google_play">Megtekintés a Google Playen</string>
<string name="settings_user_manual">Használati utasítás</string>
</resources>

View File

@ -330,4 +330,6 @@
<string name="bar_theme_transparent">Trasparente</string>
<string name="settings_bar_theme">Tema barra notifiche di sistema e navigazione</string>
<string name="settings_colors_and_fonts">Colori e font</string>
<string name="settings_about_view_google_play">Vedi su Google Play</string>
<string name="settings_user_manual">Manuale utente</string>
</resources>

View File

@ -328,4 +328,6 @@
<string name="bar_theme_transparent">Skaidrus</string>
<string name="settings_bar_theme">Būsenos ir naršymo juostos tema</string>
<string name="settings_colors_and_fonts">Spalvos ir šriftai</string>
<string name="settings_about_view_google_play">Žiūrėti Google Play</string>
<string name="settings_user_manual">Vartotojo vadovas</string>
</resources>

View File

@ -330,4 +330,6 @@
<string name="bar_theme_transparent">Caurspīdīgs</string>
<string name="settings_bar_theme">Statusa un navigācijas joslas motīvs</string>
<string name="settings_colors_and_fonts">Krāsas un fonti</string>
<string name="settings_about_view_google_play">Skatīt pakalpojumā Google Play</string>
<string name="settings_user_manual">Lietotāja rokasgrāmata</string>
</resources>

View File

@ -331,4 +331,6 @@
<string name="bar_theme_transparent">Trasparenti</string>
<string name="settings_bar_theme">Tema tal-istatus u l-bar tan-navigazzjoni</string>
<string name="settings_colors_and_fonts">Kuluri u fonts</string>
<string name="settings_about_view_google_play">Ara fuq Google Play</string>
<string name="settings_user_manual">Manwal għall-utent</string>
</resources>

View File

@ -329,4 +329,6 @@
<string name="bar_theme_transparent">Transparant</string>
<string name="settings_bar_theme">Thema van de status- en navigatiebalk</string>
<string name="settings_colors_and_fonts">Kleuren en lettertypen</string>
<string name="settings_about_view_google_play">Bekijk op Google Play</string>
<string name="settings_user_manual">Handleiding</string>
</resources>

View File

@ -328,4 +328,6 @@
<string name="bar_theme_transparent">Gjennomsiktig</string>
<string name="settings_bar_theme">Tema for status- og navigasjonslinjen</string>
<string name="settings_colors_and_fonts">Farger og fonter</string>
<string name="settings_about_view_google_play">Se på Google Play</string>
<string name="settings_user_manual">Brukermanual</string>
</resources>

View File

@ -329,4 +329,6 @@
<string name="bar_theme_transparent">Przezroczysty</string>
<string name="settings_bar_theme">Motyw paska stanu i nawigacji</string>
<string name="settings_colors_and_fonts">Kolory i czcionki</string>
<string name="settings_about_view_google_play">Zobacz w Google Play</string>
<string name="settings_user_manual">Instrukcja obsługi</string>
</resources>

View File

@ -326,4 +326,6 @@
<string name="bar_theme_transparent">Transparente</string>
<string name="settings_bar_theme">Tema da barra de status e navegação</string>
<string name="settings_colors_and_fonts">Cores e fontes</string>
<string name="settings_about_view_google_play">Ver no Google Play</string>
<string name="settings_user_manual">Manual do usuário</string>
</resources>

View File

@ -328,4 +328,6 @@
<string name="bar_theme_transparent">Transparente</string>
<string name="settings_bar_theme">Tema da barra de status e navegação</string>
<string name="settings_colors_and_fonts">Cores e fontes</string>
<string name="settings_about_view_google_play">Ver no Google Play</string>
<string name="settings_user_manual">Manual do usuário</string>
</resources>

View File

@ -327,4 +327,6 @@
<string name="bar_theme_transparent">Transparent</string>
<string name="settings_bar_theme">Tema barei de stare și navigare</string>
<string name="settings_colors_and_fonts">Culori și fonturi</string>
<string name="settings_about_view_google_play">Vizualizează pe Google Play</string>
<string name="settings_user_manual">Manual de utilizare</string>
</resources>

View File

@ -330,4 +330,6 @@
<string name="bar_theme_transparent">Прозрачный</string>
<string name="settings_bar_theme">Тема статусной и навигационной панели</string>
<string name="settings_colors_and_fonts">Цвета и шрифты</string>
<string name="settings_about_view_google_play">Посмотреть в Google Play</string>
<string name="settings_user_manual">Руководство пользователя</string>
</resources>

View File

@ -327,4 +327,6 @@
<string name="bar_theme_transparent">Transparent</string>
<string name="settings_bar_theme">Tema för status- och navigeringsfältet</string>
<string name="settings_colors_and_fonts">Färger och typsnitt</string>
<string name="settings_about_view_google_play">Visa på Google Play</string>
<string name="settings_user_manual">Användarmanual</string>
</resources>

View File

@ -328,4 +328,6 @@
<string name="bar_theme_transparent">Transparentné</string>
<string name="settings_bar_theme">Téma stavovej a navigačnej lišty</string>
<string name="settings_colors_and_fonts">Farby a písma</string>
<string name="settings_about_view_google_play">Zobraziť v službe Google Play</string>
<string name="settings_user_manual">Používateľská príručka</string>
</resources>

View File

@ -326,4 +326,6 @@
<string name="bar_theme_transparent">Pregleden</string>
<string name="settings_bar_theme">Tema statusne in navigacijske vrstice</string>
<string name="settings_colors_and_fonts">Barve in pisave</string>
<string name="settings_about_view_google_play">Ogled v Google Play</string>
<string name="settings_user_manual">Navodila za uporabo</string>
</resources>

View File

@ -332,4 +332,6 @@
<string name="bar_theme_transparent">Transparente</string>
<string name="settings_bar_theme">Tema e shiritit të statusit dhe navigimit</string>
<string name="settings_colors_and_fonts">Ngjyrat dhe shkronjat</string>
<string name="settings_about_view_google_play">Shikoni në Google Play</string>
<string name="settings_user_manual">Manuali i perdoruesit</string>
</resources>

View File

@ -157,7 +157,7 @@
<string name="settings_about_report_github">o moli e pipi (GitHub)</string>
<string name="settings_about_report_email">o moli e pipi (lipu toki)</string>
<string name="settings_about_view_github">o lukin lon ilo Kitapu</string>
<string name="settings_about_view_lemmy">kulupu pi ilo Lemi</string>
<string name="settings_about_view_lemmy">kulupu pi ma Lemi</string>
<string name="settings_auto_expand_comments">o suli e toki lili kepeken jan ala</string>
<string name="settings_auto_load_images">o kama jo e sitelen kepeken jan ala</string>
<string name="settings_blur_nsfw">o lukin ala e sitelen NSFW</string>
@ -238,9 +238,9 @@
<string name="report_list_type_unresolved">wile weka</string>
<string name="report_action_resolve">o weka</string>
<string name="report_action_unresolve">o weka ala</string>
<string name="sidebar_not_logged_message">o kama pona lon ilo Rakun tawa ilo Lemi!\n\nsina tawa
<string name="sidebar_not_logged_message">o kama pona lon ilo Rakun tawa ma Lemi!\n\nsina tawa
insa ala la, o kepeken e ilo (▼) tawa ante e ilo nanpa.\n\nwile la, tenpo ale la, sina ken
tawa insa e ilo nanpa sina lon lipo \&quot;sona jan\&quot;.\n\no musi lon ilo Lemi!
tawa insa e ilo nanpa sina lon lipo \&quot;sona jan\&quot;.\n\no musi lon ma Lemi!
</string>
<string name="settings_default_inbox_type">nasin pi poki toki</string>
<string name="mod_action_add_mod">o sin e jan lawa</string>
@ -325,4 +325,6 @@
<string name="bar_theme_transparent">lukin</string>
<string name="settings_bar_theme">nasin lukin pi linja sewi pi linja anpa</string>
<string name="settings_colors_and_fonts">Kule en sitelen</string>
<string name="settings_about_view_google_play">o lukin lon ma Kuko Pileji</string>
<string name="settings_user_manual">lipu sona pi ilo ni</string>
</resources>

View File

@ -329,4 +329,6 @@
<string name="bar_theme_transparent">Şeffaf</string>
<string name="settings_bar_theme">Durum ve gezinme çubuğunun teması</string>
<string name="settings_colors_and_fonts">Renkler ve yazı tipleri</string>
<string name="settings_about_view_google_play">Google Play\'de görüntüle</string>
<string name="settings_user_manual">Kullanım kılavuzu</string>
</resources>

View File

@ -329,4 +329,6 @@
<string name="bar_theme_transparent">Прозорий</string>
<string name="settings_bar_theme">Тема панелі стану та навігації</string>
<string name="settings_colors_and_fonts">Кольори та шрифти</string>
<string name="settings_about_view_google_play">Переглянути в Google Play</string>
<string name="settings_user_manual">Посібник користувача</string>
</resources>

View File

@ -7,6 +7,7 @@ internal object AboutConstants {
"https://github.com/diegoberaldin/RaccoonForLemmy/releases/latest"
const val REPORT_EMAIL_ADDRESS = "raccoonforlemmy@gmail.com"
const val WEBSITE_URL = "https://github.com/diegoberaldin/RaccoonForLemmy"
const val GOOGLE_PLAY_URL = "https://play.google.com/store/apps/details?id=com.github.diegoberaldin.raccoonforlemmy.android"
const val LEMMY_COMMUNITY_NAME = "raccoonforlemmy"
const val LEMMY_COMMUNITY_INSTANCE = "lemmy.world"
const val MATRIX_URL = "https://matrix.to/#/#raccoonforlemmy:matrix.org"

View File

@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.OpenInBrowser
import androidx.compose.material.icons.filled.Shop
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Button
import androidx.compose.material3.ExperimentalMaterial3Api
@ -45,10 +46,6 @@ import com.github.diegoberaldin.raccoonforlemmy.core.utils.compose.onClick
import com.github.diegoberaldin.raccoonforlemmy.core.utils.compose.rememberCallback
import com.github.diegoberaldin.raccoonforlemmy.domain.lemmy.data.CommunityModel
import com.github.diegoberaldin.raccoonforlemmy.resources.MR
import com.github.diegoberaldin.raccoonforlemmy.unit.about.AboutConstants.CHANGELOG_URL
import com.github.diegoberaldin.raccoonforlemmy.unit.about.AboutConstants.REPORT_EMAIL_ADDRESS
import com.github.diegoberaldin.raccoonforlemmy.unit.about.AboutConstants.REPORT_URL
import com.github.diegoberaldin.raccoonforlemmy.unit.about.AboutConstants.WEBSITE_URL
import com.github.diegoberaldin.raccoonforlemmy.unit.web.WebViewScreen
import dev.icerock.moko.resources.compose.painterResource
import dev.icerock.moko.resources.compose.stringResource
@ -106,7 +103,7 @@ class AboutDialog : Screen {
textDecoration = TextDecoration.Underline,
onClick = rememberCallback {
navigationCoordinator.handleUrl(
url = CHANGELOG_URL,
url = AboutConstants.CHANGELOG_URL,
openExternal = settings.openUrlsInExternalBrowser,
uriHandler = uriHandler,
onOpenWeb = { url ->
@ -120,7 +117,7 @@ class AboutDialog : Screen {
Button(
onClick = rememberCallback {
navigationCoordinator.handleUrl(
url = REPORT_URL,
url = AboutConstants.REPORT_URL,
openExternal = settings.openUrlsInExternalBrowser,
uriHandler = uriHandler,
onOpenWeb = { url ->
@ -138,7 +135,7 @@ class AboutDialog : Screen {
Button(
onClick = {
runCatching {
uriHandler.openUri("mailto:$REPORT_EMAIL_ADDRESS")
uriHandler.openUri("mailto:${ AboutConstants.REPORT_EMAIL_ADDRESS}")
}
},
) {
@ -156,7 +153,24 @@ class AboutDialog : Screen {
textDecoration = TextDecoration.Underline,
onClick = rememberCallback {
navigationCoordinator.handleUrl(
url = WEBSITE_URL,
url = AboutConstants.WEBSITE_URL,
openExternal = settings.openUrlsInExternalBrowser,
uriHandler = uriHandler,
onOpenWeb = { url ->
navigationCoordinator.pushScreen(WebViewScreen(url))
},
)
},
)
}
item {
AboutItem(
vector = Icons.Default.Shop,
text = stringResource(MR.strings.settings_about_view_google_play),
textDecoration = TextDecoration.Underline,
onClick = rememberCallback {
navigationCoordinator.handleUrl(
url = AboutConstants.GOOGLE_PLAY_URL,
openExternal = settings.openUrlsInExternalBrowser,
uriHandler = uriHandler,
onOpenWeb = { url ->