From 056f641b139f0b894c317d6523fdf1a795374eda Mon Sep 17 00:00:00 2001 From: Ashinch Date: Thu, 16 Jun 2022 20:27:48 +0800 Subject: [PATCH] Include built-in terms of service (#113) --- .../ash/reader/ui/page/startup/StartupPage.kt | 88 ++++++++---- app/src/main/res/values-cs-rCZ/strings.xml | 118 +++++++++++++++- app/src/main/res/values-de-rDE/strings.xml | 120 ++++++++++++++++- app/src/main/res/values-fr-rFR/strings.xml | 118 +++++++++++++++- app/src/main/res/values-it/strings.xml | 119 +++++++++++++++- app/src/main/res/values-zh-rCN/strings.xml | 114 +++++++++++++++- app/src/main/res/values/strings.xml | 127 +++++++++++++++++- 7 files changed, 752 insertions(+), 52 deletions(-) diff --git a/app/src/main/java/me/ash/reader/ui/page/startup/StartupPage.kt b/app/src/main/java/me/ash/reader/ui/page/startup/StartupPage.kt index 36ac290..cc8f0e5 100644 --- a/app/src/main/java/me/ash/reader/ui/page/startup/StartupPage.kt +++ b/app/src/main/java/me/ash/reader/ui/page/startup/StartupPage.kt @@ -1,16 +1,18 @@ package me.ash.reader.ui.page.startup -import android.content.Intent -import android.net.Uri import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.text.selection.SelectionContainer +import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.rounded.Balance import androidx.compose.material.icons.rounded.CheckCircleOutline import androidx.compose.material3.* -import androidx.compose.runtime.Composable -import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.* import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource @@ -19,10 +21,7 @@ import androidx.navigation.NavHostController import com.ireward.htmlcompose.HtmlText import kotlinx.coroutines.launch import me.ash.reader.R -import me.ash.reader.ui.component.base.DisplayText -import me.ash.reader.ui.component.base.DynamicSVGImage -import me.ash.reader.ui.component.base.RYScaffold -import me.ash.reader.ui.component.base.Tips +import me.ash.reader.ui.component.base.* import me.ash.reader.ui.ext.DataStoreKeys import me.ash.reader.ui.ext.dataStore import me.ash.reader.ui.ext.put @@ -36,10 +35,13 @@ fun StartupPage( ) { val context = LocalContext.current val scope = rememberCoroutineScope() + var tosVisible by remember { mutableStateOf(false) } RYScaffold( content = { - LazyColumn { + LazyColumn( + modifier = Modifier.navigationBarsPadding(), + ) { item { Spacer(modifier = Modifier.height(64.dp)) DisplayText(text = stringResource(R.string.welcome), desc = "") @@ -55,25 +57,16 @@ fun StartupPage( item { Tips( modifier = Modifier.padding(top = 40.dp), - text = stringResource(R.string.agree_terms), + text = stringResource(R.string.tos_tips), ) } item { TextButton( modifier = Modifier.padding(horizontal = 12.dp), - onClick = { - context.let { - it.startActivity( - Intent( - Intent.ACTION_VIEW, - Uri.parse(it.getString(R.string.terms_link)) - ) - ) - } - } + onClick = { tosVisible = true } ) { HtmlText( - text = stringResource(R.string.view_terms), + text = stringResource(R.string.browse_tos_tips), style = MaterialTheme.typography.bodySmall.copy( color = MaterialTheme.colorScheme.outline, ), @@ -86,6 +79,7 @@ fun StartupPage( bottomBar = null, floatingActionButton = { ExtendedFloatingActionButton( + modifier = Modifier.navigationBarsPadding(), onClick = { navController.navigate(RouteName.FEEDS) { launchSingleTop = true @@ -97,11 +91,57 @@ fun StartupPage( icon = { Icon( Icons.Rounded.CheckCircleOutline, - stringResource(R.string.agree_and_continue) + stringResource(R.string.agree) ) }, - text = { Text(text = stringResource(R.string.agree_and_continue)) }, + text = { Text(text = stringResource(R.string.agree)) }, ) } ) -} \ No newline at end of file + + RYDialog( + visible = tosVisible, + onDismissRequest = { tosVisible = false }, + icon = { + Icon( + imageVector = Icons.Rounded.Balance, + contentDescription = stringResource(R.string.change_log), + ) + }, + title = { + Text(text = stringResource(R.string.terms_of_service)) + }, + text = { + SelectionContainer { + HtmlText( + modifier = Modifier.verticalScroll(rememberScrollState()), + text = stringResource(R.string.tos_content), + style = MaterialTheme.typography.bodySmall.copy( + color = MaterialTheme.colorScheme.onSurfaceVariant, + ), + ) + } + }, + confirmButton = { + TextButton( + onClick = { + navController.navigate(RouteName.FEEDS) { + launchSingleTop = true + } + scope.launch { + context.dataStore.put(DataStoreKeys.IsFirstLaunch, false) + } + } + ) { + Text(text = stringResource(R.string.agree)) + } + }, + dismissButton = { + TextButton( + onClick = { tosVisible = false } + ) { + Text(text = stringResource(R.string.cancel)) + } + } + ) +} diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml index 4050e68..44a5b15 100644 --- a/app/src/main/res/values-cs-rCZ/strings.xml +++ b/app/src/main/res/values-cs-rCZ/strings.xml @@ -110,10 +110,120 @@ Tipy a podpora O aplikaci, open source Vítejte - Než budete moci pokračovat, musíte souhlasit s podmínkami služby a zásadami ochrany osobních údajů aplikace Read You. - Podívejte se na <i><u>podmínky služby a zásady ochrany osobních údajů</u></i> - https://github.com/Ashinch/ReadYou/blob/main/TERMS_OF_SERVICE_AND_PRIVACY_POLICY.md - Souhlasím + Než budete moci pokračovat, musíte souhlasit s podmínkami služby a zásadami ochrany osobních údajů aplikace Read You. + Podívejte se na <i><u>podmínky služby a zásady ochrany osobních údajů</u></i> + Podmínky služby + + <h5> + + Privacy Policy + + </h5> + <br/> + <p> + + I take your privacy very seriously. + + </p> + <br/> + <p> + <b>Read You</b> + + does not collect any user data, and all sensitive information (passwords and other account information) is + securely stored in the local application database on your device. + + </p> + <br/> + <p> + <b>Read You</b> + + will use the following permissions to provide you with the service. + + </p> + <br/> + <p> + + - Access Network permission (for accessing online content as you specify) + + </p> + <p> + + - Get network status permission (for getting whether the device currently has available network conditions) + + </p> + <p> + + - Background service permission (to automatically sync your favorites for you on a regular + basis) + + </p> + <br/> + <br/> + <h5> + + Third Party Services + + </h5> + <br/> + <p> + + This policy does not apply to third-party services that you use with <b>Read You</b>. You can review + the privacy policies of the third-party services you use on their websites + + </p> + <br/> + <br/> + <h5> + + Disclaimers + + </h5> + <br/> + <p> + <b>Read You</b> + + is a content collection tool only. Your use of <b>Read You</b> is subject to the laws and + regulations of your country and region, and any liability arising from your actions will be borne by you + personally. + + </p> + <br/> + <br/> + <h5> + + Open Source License + + </h5> + <br/> + <p> + <b>Read You</b> + + is an open source project under the GNU GPL 3.0 Open Source License[1], which allows you to use, reference, and + modify the source code of <b>Read You</b> for free, but does not allow the + modified and derived code to be distributed and sold as closed-source commercial software. For details, please + see the full GNU GPL 3.0 Open Source License[2]. + + </p> + <br/> + <br/> + <h5> + + Appendix + + </h5> + <br/> + <p> + + - [1] https://github.com/Ashinch/ReadYou + + </p> + <p> + + - [2] https://www.gnu.org/licenses/gpl-3.0.html + + </p> + + Souhlasím Barvy pozadí Žádné palety Pouze Android 8.1+ diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml index cd7d151..4a280e8 100644 --- a/app/src/main/res/values-de-rDE/strings.xml +++ b/app/src/main/res/values-de-rDE/strings.xml @@ -104,10 +104,120 @@ Tipps & Support Über, Open Source Willkommen - Bevor Sie fortfahren können, müssen Sie den Nutzungsbedingungen und der Datenschutzrichtlinie von Read You zustimmen. - Siehe die <i><u>Nutzungsbedingungen & Datenschutzrichtlinie</u></i> - https://github.com/Ashinch/ReadYou/blob/main/TERMS_OF_SERVICE_AND_PRIVACY_POLICY-de.md - Zustimmen + Bevor Sie fortfahren können, müssen Sie den Nutzungsbedingungen und der Datenschutzrichtlinie von Read You zustimmen. + Siehe die <i><u>Nutzungsbedingungen & Datenschutzrichtlinie</u></i> + Nutzungsbedingungen + + <h5> + + Datenschutzrichtlinie + + </h5> + <br/> + <p> + + Ich nehme Ihre Privatsphäre sehr ernst. + + </p> + <br/> + <p> + <b>Read You</b> + + sammelt keine Benutzerdaten, und alle sensiblen Informationen (Passwörter und andere Kontoinformationen) werden + sicher in der lokalen Anwendungsdatenbank auf Ihrem Gerät gespeichert. + + </p> + <br/> + <p> + <b>Read You</b> + + wird die folgenden Berechtigungen nutzen, um Ihnen den Dienst zur Verfügung zu stellen. + + </p> + <br/> + <p> + + - Netzwerkzugriffsberechtigung (für den Zugriff auf die von Ihnen angegebenen Online-Inhalte) + + </p> + <p> + + - Berechtigung zum Abrufen des Netzwerkstatus (um festzustellen, ob das Gerät derzeit über ein verfügbares + Netzwerk verfügt) + + </p> + <p> + + - Berechtigung für den Hintergrunddienst (um Ihre Favoriten automatisch und regelmäßig zu synchronisieren) + + </p> + <br/> + <br/> + <h5> + + Dienstleistungen von Dritten + + </h5> + <br/> + <p> + + Diese Richtlinie gilt nicht für Dienste Dritter, die Sie mit <b>Read You</b> nutzen. Sie können die + Datenschutzrichtlinien der von Ihnen genutzten Dienste Dritter auf den jeweiligen Websites einsehen. + + </p> + <br/> + <br/> + <h5> + + Haftungsausschlüsse + + </h5> + <br/> + <p> + <b>Read You</b> + + ist ein reines Tool zur Sammlung von Inhalten. Ihre Nutzung von <b>Read You</b> unterliegt den + Gesetzen und Vorschriften Ihres Landes und Ihrer Region, und jede Haftung, die sich aus Ihren Handlungen ergibt, + wird von Ihnen persönlich getragen. + + </p> + <br/> + <br/> + <h5> + + Open Source Lizenz + + </h5> + <br/> + <p> + <b>Read You</b> + + ist ein Open Source Projekt unter der GNU GPL 3.0 Open Source Lizenz[1], die es Ihnen erlaubt, den Quellcode + von Read You kostenlos zu verwenden, zu referenzieren und zu modifizieren, aber nicht erlaubt, den + modifizierten und abgeleiteten Code als kommerzielle Closed-Source-Software zu vertreiben und zu verkaufen. + Details finden Sie in der vollständigen GNU GPL 3.0 Open Source Lizenz[2]. + + </p> + <br/> + <br/> + <h5> + + Anhang + + </h5> + <br/> + <p> + + - [1] https://github.com/Ashinch/ReadYou + + </p> + <p> + + - [2] https://www.gnu.org/licenses/gpl-3.0.html + + </p> + + Zustimmen Hintergrundfarben Keine Paletten Nur Android 8.1+ @@ -170,4 +280,4 @@ Das farbliche Hervorheben der Gruppenliste ist nur für das helle Design verfügbar. Aktie Berühren, um Video abzuspielen - \ No newline at end of file + diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml index fa52e3e..914ef0a 100644 --- a/app/src/main/res/values-fr-rFR/strings.xml +++ b/app/src/main/res/values-fr-rFR/strings.xml @@ -107,10 +107,120 @@ Aide et assistance À propos, Open Source Bienvenue - Avant de continuer, vous devez accepter les conditions d\'utilisation et la politique de confidentialité de Read You. - Lire les <i><u>conditions d\'utilisation et la politique de confidentialité</u></i> - https://github.com/Ashinch/ReadYou/blob/main/TERMS_OF_SERVICE_AND_PRIVACY_POLICY.md - J\'accepte + Avant de continuer, vous devez accepter les conditions d\'utilisation et la politique de confidentialité de Read You. + Lire les <i><u>conditions d\'utilisation et la politique de confidentialité</u></i> + Conditions + + <h5> + + Privacy Policy + + </h5> + <br/> + <p> + + I take your privacy very seriously. + + </p> + <br/> + <p> + <b>Read You</b> + + does not collect any user data, and all sensitive information (passwords and other account information) is + securely stored in the local application database on your device. + + </p> + <br/> + <p> + <b>Read You</b> + + will use the following permissions to provide you with the service. + + </p> + <br/> + <p> + + - Access Network permission (for accessing online content as you specify) + + </p> + <p> + + - Get network status permission (for getting whether the device currently has available network conditions) + + </p> + <p> + + - Background service permission (to automatically sync your favorites for you on a regular + basis) + + </p> + <br/> + <br/> + <h5> + + Third Party Services + + </h5> + <br/> + <p> + + This policy does not apply to third-party services that you use with <b>Read You</b>. You can review + the privacy policies of the third-party services you use on their websites + + </p> + <br/> + <br/> + <h5> + + Disclaimers + + </h5> + <br/> + <p> + <b>Read You</b> + + is a content collection tool only. Your use of <b>Read You</b> is subject to the laws and + regulations of your country and region, and any liability arising from your actions will be borne by you + personally. + + </p> + <br/> + <br/> + <h5> + + Open Source License + + </h5> + <br/> + <p> + <b>Read You</b> + + is an open source project under the GNU GPL 3.0 Open Source License[1], which allows you to use, reference, and + modify the source code of <b>Read You</b> for free, but does not allow the + modified and derived code to be distributed and sold as closed-source commercial software. For details, please + see the full GNU GPL 3.0 Open Source License[2]. + + </p> + <br/> + <br/> + <h5> + + Appendix + + </h5> + <br/> + <p> + + - [1] https://github.com/Ashinch/ReadYou + + </p> + <p> + + - [2] https://www.gnu.org/licenses/gpl-3.0.html + + </p> + + J\'accepte Couleurs du fond d\'écran Aucune palette Android 8.1+ uniquement diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 111e1cb..4a641b2 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -104,10 +104,120 @@ Trucchi e supporto Info, licenze open source Benvenuto - Leggi e accetta i Termini di servizio e l\'Informativa sulla privacy di Read You per continuare. - Sfoglia i<i><u>Termini di servizio e l\'Informativa sulla privacy</u></i> - https://github.com/Ashinch/ReadYou/blob/main/TERMS_OF_SERVICE_AND_PRIVACY_POLICY.md - Accetto + Leggi e accetta i Termini di servizio e l\'Informativa sulla privacy di Read You per continuare. + Sfoglia i<i><u>Termini di servizio e l\'Informativa sulla privacy</u></i> + Termini di servizio + + <h5> + + Privacy Policy + + </h5> + <br/> + <p> + + I take your privacy very seriously. + + </p> + <br/> + <p> + <b>Read You</b> + + does not collect any user data, and all sensitive information (passwords and other account information) is + securely stored in the local application database on your device. + + </p> + <br/> + <p> + <b>Read You</b> + + will use the following permissions to provide you with the service. + + </p> + <br/> + <p> + + - Access Network permission (for accessing online content as you specify) + + </p> + <p> + + - Get network status permission (for getting whether the device currently has available network conditions) + + </p> + <p> + + - Background service permission (to automatically sync your favorites for you on a regular + basis) + + </p> + <br/> + <br/> + <h5> + + Third Party Services + + </h5> + <br/> + <p> + + This policy does not apply to third-party services that you use with <b>Read You</b>. You can review + the privacy policies of the third-party services you use on their websites + + </p> + <br/> + <br/> + <h5> + + Disclaimers + + </h5> + <br/> + <p> + <b>Read You</b> + + is a content collection tool only. Your use of <b>Read You</b> is subject to the laws and + regulations of your country and region, and any liability arising from your actions will be borne by you + personally. + + </p> + <br/> + <br/> + <h5> + + Open Source License + + </h5> + <br/> + <p> + <b>Read You</b> + + is an open source project under the GNU GPL 3.0 Open Source License[1], which allows you to use, reference, and + modify the source code of <b>Read You</b> for free, but does not allow the + modified and derived code to be distributed and sold as closed-source commercial software. For details, please + see the full GNU GPL 3.0 Open Source License[2]. + + </p> + <br/> + <br/> + <h5> + + Appendix + + </h5> + <br/> + <p> + + - [1] https://github.com/Ashinch/ReadYou + + </p> + <p> + + - [2] https://www.gnu.org/licenses/gpl-3.0.html + + </p> + + Accetto Colori dallo sfondo Nessuna tavolozza Solo Android 8.1+ @@ -130,6 +240,7 @@ Pagina di lettura Sponsorizza Licenze open source + https://api.github.com/repos/Ashinch/ReadYou/releases/latest Changelog Aggiorna Salta questa versione diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index d70d2ef..6f46a71 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -101,10 +101,114 @@ 提示和支持 关于、开源 欢迎 - 在此之前，您需要同意 Read You 的服务条款与隐私政策后才能继续。 - 查看《<u>服务条款与隐私政策</u>》 - https://gitee.com/Ashinch/ReadYou/blob/main/TERMS_OF_SERVICE_AND_PRIVACY_POLICY-zh.md - 同意并继续 + 在此之前，您需要同意 Read You 的服务条款与隐私政策后才能继续。 + 查看《<u>服务条款与隐私政策</u>》 + 服务条款 + + <h5> + + 隐私政策 + + </h5> + <br/> + <p> + + 我非常重视您的隐私。 + + </p> + <br/> + <p> + <b>Read You</b> + + 不收集任何用户数据，所有敏感信息（密码和其他账户信息）都安全地存储在您设备上的本地应用数据库中。 + + </p> + <br/> + <p> + <b>Read You</b> + + 将使用以下权限为您提供服务： + + </p> + <br/> + <p> + + - 访问网络权限（用于访问您所指定的在线内容） + + </p> + <p> + + - 获取网络状态权限（用于获取当前设备是否拥有可用的网络条件） + + </p> + <p> + + - 后台服务权限（用于定时自动地为您同步已收藏的内容） + + </p> + <br/> + <br/> + <h5> + + 第三方服务 + + </h5> + <br/> + <p> + + 本政策不适用于您与 <b>Read You</b> 一起使用的第三方服务。您可以在所使用的第三方服务的网站上查阅相关的隐私政策。 + + </p> + <br/> + <br/> + <h5> + + 免责声明 + + </h5> + <br/> + <p> + + <b>Read You</b> 仅是一款内容收藏工具。您在使用 <b>Read You</b> + 的过程中，应遵守所在国家和地区的法律法规，因您的行为所产生的一切责任将由您个人承担。 + + </p> + <br/> + <br/> + <h5> + + 开源许可 + + </h5> + <br/> + <p> + <b>Read You</b> + + 是一个使用 GNU GPL 3.0 开源许可协议的开源项目[1]，允许您免费使用、引用、修改 <b>Read You</b> + 的源代码，但不允许修改后和其衍生的代码作为闭源的商业软件进行发布和销售。具体细节请查看完整的 GNU GPL 3.0 开源许可协议 + [2]。 + + </p> + <br/> + <br/> + <h5> + + 附录 + + </h5> + <br/> + <p> + + - [1] https://github.com/Ashinch/ReadYou + + </p> + <p> + + - [2] https://www.gnu.org/licenses/gpl-3.0.html + + </p> + + 同意并继续 壁纸颜色 暂无色板 仅限 Android 8.1+ @@ -167,4 +271,4 @@ 分组列表的色调海拔仅在亮色主题时可用。 分享 轻触播放视频 - \ No newline at end of file + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3d980e8..63d30db 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -47,7 +47,9 @@ Parse Full Content Full content parsing of all articles in the \"%1$s\" group. Full content parsing of all articles in the \"%1$s\" group - No more full content parsing of all articles in the \"%1$s\" group + No more full content parsing of all articles in the \"%1$s\" + group + Clear Articles Cleaned all archived of articles in the \"%1$s\" feed Cleaned all archived of articles in the \"%1$s\" group @@ -112,10 +114,121 @@ Tips & support About, open source licenses Welcome - Read and agree to Read You\'s Terms of Service and Privacy Policy to continue. - Browse the <i><u>Terms of Service and Privacy Policy</u></i> - https://github.com/Ashinch/ReadYou/blob/main/TERMS_OF_SERVICE_AND_PRIVACY_POLICY.md - Agree + Read and agree to Read You\'s Terms of Service and Privacy Policy to continue. + Browse the <i><u>Terms of Service and Privacy Policy</u></i> + + Terms of Service + + <h5> + + Privacy Policy + + </h5> + <br/> + <p> + + I take your privacy very seriously. + + </p> + <br/> + <p> + <b>Read You</b> + + does not collect any user data, and all sensitive information (passwords and other account information) is + securely stored in the local application database on your device. + + </p> + <br/> + <p> + <b>Read You</b> + + will use the following permissions to provide you with the service. + + </p> + <br/> + <p> + + - Access Network permission (for accessing online content as you specify) + + </p> + <p> + + - Get network status permission (for getting whether the device currently has available network conditions) + + </p> + <p> + + - Background service permission (to automatically sync your favorites for you on a regular + basis) + + </p> + <br/> + <br/> + <h5> + + Third Party Services + + </h5> + <br/> + <p> + + This policy does not apply to third-party services that you use with <b>Read You</b>. You can review + the privacy policies of the third-party services you use on their websites + + </p> + <br/> + <br/> + <h5> + + Disclaimers + + </h5> + <br/> + <p> + <b>Read You</b> + + is a content collection tool only. Your use of <b>Read You</b> is subject to the laws and + regulations of your country and region, and any liability arising from your actions will be borne by you + personally. + + </p> + <br/> + <br/> + <h5> + + Open Source License + + </h5> + <br/> + <p> + <b>Read You</b> + + is an open source project under the GNU GPL 3.0 Open Source License[1], which allows you to use, reference, and + modify the source code of <b>Read You</b> for free, but does not allow the + modified and derived code to be distributed and sold as closed-source commercial software. For details, please + see the full GNU GPL 3.0 Open Source License[2]. + + </p> + <br/> + <br/> + <h5> + + Appendix + + </h5> + <br/> + <p> + + - [1] https://github.com/Ashinch/ReadYou + + </p> + <p> + + - [2] https://www.gnu.org/licenses/gpl-3.0.html + + </p> + + Agree Wallpaper colors No Palettes Only Android 8.1+ @@ -154,7 +267,9 @@ Initial page Initial filter The novel "Lord of the Mysteries" has finally come to an end - The Fool is the eighth and final volume of the Lord of the Mysteries series written by Cuttlefish That Loves Diving. + The Fool is the eighth and final volume of the Lord of the Mysteries series + written by Cuttlefish That Loves Diving. + Reddit value Padding on both ends