Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nag for donations upon deletion/deactivation #509

Merged
merged 2 commits into from
Dec 18, 2024
Merged

Nag for donations upon deletion/deactivation #509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
acf49d2
Upgrade packages
duogenesis Dec 18, 2024
993788e
Nag for donations upon exit
duogenesis Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions components/option-screen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ import {
OptionGroupTextShort,
OptionGroupThemePicker,
OptionGroupVerificationChecker,
descriptionStyle,
isOptionGroupButtons,
isOptionGroupCheckChips,
isOptionGroupDate,
Expand All @@ -58,8 +59,8 @@ import {
isOptionGroupTextShort,
isOptionGroupThemePicker,
isOptionGroupVerificationChecker,
noneFontSize,
maxDailySelfies,
noneFontSize,
} from '../data/option-groups';
import {
PrimaryImage,
Expand Down Expand Up @@ -1316,7 +1317,7 @@ const OptionScreen = ({navigation, route}) => {

const {
title,
description,
description: Description,
input,
scrollView,
buttonLabel,
Expand Down Expand Up @@ -1455,17 +1456,15 @@ const OptionScreen = ({navigation, route}) => {
>
{title}
</DefaultText>
<DefaultText
{typeof Description === 'string' && <DefaultText
style={{
color: color || '#777',
textAlign: 'center',
paddingLeft: 20,
paddingRight: 20,
paddingTop: 10,
...descriptionStyle.style,
color: color || descriptionStyle.style.color
}}
>
{description}
</DefaultText>
{Description}
</DefaultText>}
{typeof Description !== 'string' && <Description/>}
</View>
<View
style={{
Expand Down
67 changes: 63 additions & 4 deletions data/option-groups.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import { ClubItem } from '../club/club';
import { DefaultText } from '../components/default-text';
import {
Linking,
Platform,
StyleSheet,
View,
} from 'react-native';
Expand All @@ -37,6 +38,16 @@ const noneFontSize = 16;

const maxDailySelfies = 'eight';

const descriptionStyle = StyleSheet.create({
style: {
color: '#777',
textAlign: 'center',
paddingLeft: 20,
paddingRight: 20,
paddingTop: 10,
}
});

type OptionGroupButtons = {
buttons: {
values: string[],
Expand Down Expand Up @@ -182,7 +193,7 @@ type OptionGroupInputs
type OptionGroup<T extends OptionGroupInputs> = {
title: string,
Icon?: any,
description: string,
description: string | FC,
input: T,
scrollView?: boolean,
buttonLabel?: string,
Expand Down Expand Up @@ -494,6 +505,53 @@ const FinishOnboardingDescription = () => (
</View>
);

const DeletionDescription = () => (
<DefaultText style={descriptionStyle.style} >
Are you sure you want to delete your account? {}
<DefaultText style={{ fontWeight: '700' }}>
This will
permanently delete your account data and
immediately log you out.
</DefaultText> {}
If you’re sure, type “delete” to confirm.
{Platform.OS === 'web' &&
<DefaultText>
{'\n\n'}
Please consider donating before leaving by pressing {}
<DefaultText
onPress={() => Linking.openURL('https://ko-fi.com/duolicious')}
style={{ fontWeight: '700' }}
>
here{'\xa0'}💕
</DefaultText>
</DefaultText>
}
</DefaultText>
);

const DeactivationDescription = () => (
<DefaultText style={descriptionStyle.style} >
Are you sure you want to deactivate your account? {}
<DefaultText style={{ fontWeight: '700' }}>
This will hide you from other users and log you out.
</DefaultText> {}
The next time you sign in, your account will be reactivated. Press
“continue” to deactivate your account.
{Platform.OS === 'web' &&
<DefaultText>
{'\n\n'}
Please consider donating before leaving by pressing {}
<DefaultText
onPress={() => Linking.openURL('https://ko-fi.com/duolicious')}
style={{ fontWeight: '700' }}
>
here{'\xa0'}💕
</DefaultText>
</DefaultText>
}
</DefaultText>
);

const genderOptionGroup: OptionGroup<OptionGroupButtons> = {
title: 'Gender',
Icon: () => (
Expand Down Expand Up @@ -946,7 +1004,7 @@ const notificationSettingsOptionGroups: OptionGroup<OptionGroupButtons>[] = [
const deletionOptionGroups: OptionGroup<OptionGroupTextShort>[] = [
{
title: 'Delete My Account',
description: `Are you sure you want to delete your account? This will immediately log you out and permanently delete your account data. If you’re sure, type “delete” to confirm.`,
description: DeletionDescription,
input: {
textShort: {
submit: async (input: string) => {
Expand Down Expand Up @@ -975,7 +1033,7 @@ const deletionOptionGroups: OptionGroup<OptionGroupTextShort>[] = [
const deactivationOptionGroups: OptionGroup<OptionGroupNone>[] = [
{
title: 'Deactivate My Account',
description: 'Are you sure you want to deactivate your account? This will hide you from other users and log you out. The next time you sign in, your account will be reactivated. Press “continue” to deactivate your account.',
description: DeactivationDescription,
input: {
none: {
submit: async () => {
Expand Down Expand Up @@ -1936,6 +1994,7 @@ export {
createAccountOptionGroups,
deactivationOptionGroups,
deletionOptionGroups,
descriptionStyle,
generalSettingsOptionGroups,
getCurrentValue,
isOptionGroupButtons,
Expand All @@ -1952,8 +2011,8 @@ export {
isOptionGroupTextShort,
isOptionGroupThemePicker,
isOptionGroupVerificationChecker,
noneFontSize,
maxDailySelfies,
noneFontSize,
notificationSettingsOptionGroups,
privacySettingsOptionGroups,
searchInteractionsOptionGroups,
Expand Down
Loading
Loading