196 lines
7.7 KiB
Diff
196 lines
7.7 KiB
Diff
diff --git a/src/screens/Settings/AboutSettings.tsx b/src/screens/Settings/AboutSettings.tsx
|
|
index 6b8257b91..48ba7909e 100644
|
|
--- a/src/screens/Settings/AboutSettings.tsx
|
|
+++ b/src/screens/Settings/AboutSettings.tsx
|
|
@@ -78,14 +78,14 @@ export function AboutSettingsScreen({}: Props) {
|
|
<Layout.Content>
|
|
<SettingsList.Container>
|
|
<SettingsList.LinkItem
|
|
- to="https://bsky.social/about/support/tos"
|
|
+ to="/support/tos"
|
|
label={_(msg`Terms of Service`)}>
|
|
<SettingsList.ItemIcon icon={NewspaperIcon} />
|
|
<SettingsList.ItemText>
|
|
<Trans>Terms of Service</Trans>
|
|
</SettingsList.ItemText>
|
|
</SettingsList.LinkItem>
|
|
<SettingsList.LinkItem
|
|
- to="https://bsky.social/about/support/privacy-policy"
|
|
+ to="/support/privacy-policy"
|
|
label={_(msg`Privacy Policy`)}>
|
|
<SettingsList.ItemIcon icon={NewspaperIcon} />
|
|
<SettingsList.ItemText>
|
|
diff --git a/src/screens/Takendown.tsx b/src/screens/Takendown.tsx
|
|
index 77f219e55..53f5e0cc0 100644
|
|
--- a/src/screens/Takendown.tsx
|
|
+++ b/src/screens/Takendown.tsx
|
|
@@ -214,10 +214,10 @@ export function Takendown() {
|
|
<Trans>
|
|
Your account was found to be in violation of the{' '}
|
|
<SimpleInlineLinkText
|
|
- label={_(msg`Bluesky Social Terms of Service`)}
|
|
- to="https://bsky.social/about/support/tos"
|
|
+ label={_(msg`syu.is Terms of Service`)}
|
|
+ to="/support/tos"
|
|
style={[a.text_md, a.leading_snug]}>
|
|
- Bluesky Social Terms of Service
|
|
+ syu.is Terms of Service
|
|
</SimpleInlineLinkText>
|
|
. You have been sent an email outlining the specific violation
|
|
and suspension period, if applicable. You can appeal this
|
|
diff --git a/src/view/screens/PrivacyPolicy.tsx b/src/view/screens/PrivacyPolicy.tsx
|
|
index a89eaadc4..1da393f03 100644
|
|
--- a/src/view/screens/PrivacyPolicy.tsx
|
|
+++ b/src/view/screens/PrivacyPolicy.tsx
|
|
@@ -1,52 +1,38 @@
|
|
import React from 'react'
|
|
-import {View} from 'react-native'
|
|
-import {msg, Trans} from '@lingui/macro'
|
|
-import {useLingui} from '@lingui/react'
|
|
+import {View, ScrollView} from 'react-native'
|
|
+import {msg} from '@lingui/macro'
|
|
import {useFocusEffect} from '@react-navigation/native'
|
|
-
|
|
-import {usePalette} from '#/lib/hooks/usePalette'
|
|
-import {
|
|
- type CommonNavigatorParams,
|
|
- type NativeStackScreenProps,
|
|
-} from '#/lib/routes/types'
|
|
-import {s} from '#/lib/styles'
|
|
+import {useLingui} from '@lingui/react'
|
|
import {useSetMinimalShellMode} from '#/state/shell'
|
|
-import {TextLink} from '#/view/com/util/Link'
|
|
-import {Text} from '#/view/com/util/text/Text'
|
|
-import {ScrollView} from '#/view/com/util/Views'
|
|
import * as Layout from '#/components/Layout'
|
|
-import {ViewHeader} from '../com/util/ViewHeader'
|
|
+import {Text} from '#/components/Typography'
|
|
+import {atoms as a, useTheme} from '#/alf'
|
|
|
|
-type Props = NativeStackScreenProps<CommonNavigatorParams, 'PrivacyPolicy'>
|
|
-export const PrivacyPolicyScreen = (_props: Props) => {
|
|
- const pal = usePalette('default')
|
|
+export function PrivacyPolicyScreen() {
|
|
+ const t = useTheme()
|
|
const {_} = useLingui()
|
|
const setMinimalShellMode = useSetMinimalShellMode()
|
|
-
|
|
useFocusEffect(
|
|
React.useCallback(() => {
|
|
setMinimalShellMode(false)
|
|
}, [setMinimalShellMode]),
|
|
)
|
|
-
|
|
return (
|
|
- <Layout.Screen>
|
|
- <ViewHeader title={_(msg`Privacy Policy`)} />
|
|
- <ScrollView style={[s.hContentRegion, pal.view]}>
|
|
- <View style={[s.p20]}>
|
|
- <Text style={pal.text}>
|
|
- <Trans>
|
|
- The Privacy Policy has been moved to{' '}
|
|
- <TextLink
|
|
- style={pal.link}
|
|
- href="https://bsky.social/about/support/privacy-policy"
|
|
- text="bsky.social/about/support/privacy-policy"
|
|
- />
|
|
- </Trans>
|
|
- </Text>
|
|
+ <Layout.Screen testID="privacyPolicyScreen">
|
|
+ <Layout.Header.Outer>
|
|
+ <Layout.Header.BackButton />
|
|
+ <Layout.Header.Content>
|
|
+ <Layout.Header.TitleText>{_(msg`Privacy Policy`)}</Layout.Header.TitleText>
|
|
+ </Layout.Header.Content>
|
|
+ <Layout.Header.Slot />
|
|
+ </Layout.Header.Outer>
|
|
+ <Layout.Content>
|
|
+ <View style={[a.p_lg]}>
|
|
+ <Text style={[a.text_md, t.atoms.text]}>
|
|
+ syu.is respects your privacy. We collect minimal data necessary to provide the service. Your posts and interactions are stored on the AT Protocol network. For questions, contact the administrator.
|
|
+ </Text>
|
|
</View>
|
|
- <View style={s.footerSpacer} />
|
|
- </ScrollView>
|
|
+ </Layout.Content>
|
|
</Layout.Screen>
|
|
)
|
|
}
|
|
diff --git a/src/view/screens/TermsOfService.tsx b/src/view/screens/TermsOfService.tsx
|
|
index d843c713c..b81767bd5 100644
|
|
--- a/src/view/screens/TermsOfService.tsx
|
|
+++ b/src/view/screens/TermsOfService.tsx
|
|
@@ -1,50 +1,38 @@
|
|
import React from 'react'
|
|
-import {View} from 'react-native'
|
|
-import {msg, Trans} from '@lingui/macro'
|
|
-import {useLingui} from '@lingui/react'
|
|
+import {View, ScrollView} from 'react-native'
|
|
+import {msg} from '@lingui/macro'
|
|
import {useFocusEffect} from '@react-navigation/native'
|
|
-
|
|
-import {usePalette} from '#/lib/hooks/usePalette'
|
|
-import {
|
|
- type CommonNavigatorParams,
|
|
- type NativeStackScreenProps,
|
|
-} from '#/lib/routes/types'
|
|
-import {s} from '#/lib/styles'
|
|
+import {useLingui} from '@lingui/react'
|
|
import {useSetMinimalShellMode} from '#/state/shell'
|
|
-import {TextLink} from '#/view/com/util/Link'
|
|
-import {Text} from '#/view/com/util/text/Text'
|
|
-import {ScrollView} from '#/view/com/util/Views'
|
|
import * as Layout from '#/components/Layout'
|
|
-import {ViewHeader} from '../com/util/ViewHeader'
|
|
+import {Text} from '#/components/Typography'
|
|
+import {atoms as a, useTheme} from '#/alf'
|
|
|
|
-type Props = NativeStackScreenProps<CommonNavigatorParams, 'TermsOfService'>
|
|
-export const TermsOfServiceScreen = (_props: Props) => {
|
|
- const pal = usePalette('default')
|
|
- const setMinimalShellMode = useSetMinimalShellMode()
|
|
+export function TermsOfServiceScreen() {
|
|
+ const t = useTheme()
|
|
const {_} = useLingui()
|
|
-
|
|
+ const setMinimalShellMode = useSetMinimalShellMode()
|
|
useFocusEffect(
|
|
React.useCallback(() => {
|
|
setMinimalShellMode(false)
|
|
}, [setMinimalShellMode]),
|
|
)
|
|
-
|
|
return (
|
|
- <Layout.Screen>
|
|
- <ViewHeader title={_(msg`Terms of Service`)} />
|
|
- <ScrollView style={[s.hContentRegion, pal.view]}>
|
|
- <View style={[s.p20]}>
|
|
- <Text style={pal.text}>
|
|
- <Trans>The Terms of Service have been moved to</Trans>{' '}
|
|
- <TextLink
|
|
- style={pal.link}
|
|
- href="https://bsky.social/about/support/tos"
|
|
- text="bsky.social/about/support/tos"
|
|
- />
|
|
- </Text>
|
|
+ <Layout.Screen testID="termsOfServiceScreen">
|
|
+ <Layout.Header.Outer>
|
|
+ <Layout.Header.BackButton />
|
|
+ <Layout.Header.Content>
|
|
+ <Layout.Header.TitleText>{_(msg`Terms of Service`)}</Layout.Header.TitleText>
|
|
+ </Layout.Header.Content>
|
|
+ <Layout.Header.Slot />
|
|
+ </Layout.Header.Outer>
|
|
+ <Layout.Content>
|
|
+ <View style={[a.p_lg]}>
|
|
+ <Text style={[a.text_md, t.atoms.text]}>
|
|
+ By using syu.is, you agree to use the service responsibly. Do not post illegal content, spam, or harass others. The administrator reserves the right to suspend accounts that violate these terms. This service is provided as-is without warranty.
|
|
+ </Text>
|
|
</View>
|
|
- <View style={s.footerSpacer} />
|
|
- </ScrollView>
|
|
+ </Layout.Content>
|
|
</Layout.Screen>
|
|
)
|
|
}
|