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

Add additional Lemmy styled user/community formats #1183

Merged
merged 1 commit into from
Mar 11, 2024
Merged

Add additional Lemmy styled user/community formats #1183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions lib/core/enums/full_name_separator.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,9 @@ import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:thunder/thunder/bloc/thunder_bloc.dart';

enum FullNameSeparator {
dot('name · instance.tld'),
at('name@instance.tld');

final String label;

const FullNameSeparator(this.label);
dot, // name · instance.tld
at, // name@instance.tld
lemmy; // '@name@instance.tld or !name@instance.tld'
}

String generateUserFullName(BuildContext? context, name, instance, {FullNameSeparator? userSeparator}) {
Expand All @@ -17,6 +14,7 @@ String generateUserFullName(BuildContext? context, name, instance, {FullNameSepa
return switch (userSeparator) {
FullNameSeparator.dot => '$name · $instance',
FullNameSeparator.at => '$name@$instance',
FullNameSeparator.lemmy => '@$name@$instance',
};
}

Expand All @@ -26,6 +24,7 @@ String generateUserFullNameSuffix(BuildContext? context, instance, {FullNameSepa
return switch (userSeparator) {
FullNameSeparator.dot => ' · $instance',
FullNameSeparator.at => '@$instance',
FullNameSeparator.lemmy => '@$instance',
};
}

Expand All @@ -35,5 +34,6 @@ String generateCommunityFullName(BuildContext? context, name, instance, {FullNam
return switch (communitySeparator) {
FullNameSeparator.dot => '$name · $instance',
FullNameSeparator.at => '$name@$instance',
FullNameSeparator.lemmy => '!$name@$instance',
};
}
54 changes: 48 additions & 6 deletions lib/settings/pages/general_settings_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,10 +635,31 @@ class _GeneralSettingsPageState extends State<GeneralSettingsPage> with SingleTi
SliverToBoxAdapter(
child: ListOption(
description: l10n.userFormat,
value: ListPickerItem(label: userSeparator.label, icon: Icons.person_rounded, payload: userSeparator, capitalizeLabel: false),
value: ListPickerItem(
label: generateUserFullName(null, 'name', 'instance.tld', userSeparator: userSeparator),
icon: Icons.person_rounded,
payload: userSeparator,
capitalizeLabel: false,
),
options: [
ListPickerItem(icon: const IconData(0x2022), label: FullNameSeparator.dot.label, payload: FullNameSeparator.dot, capitalizeLabel: false),
ListPickerItem(icon: Icons.alternate_email_rounded, label: FullNameSeparator.at.label, payload: FullNameSeparator.at, capitalizeLabel: false),
ListPickerItem(
icon: const IconData(0x2022),
label: generateUserFullName(null, 'name', 'instance.tld', userSeparator: FullNameSeparator.dot),
payload: FullNameSeparator.dot,
capitalizeLabel: false,
),
ListPickerItem(
icon: Icons.alternate_email_rounded,
label: generateUserFullName(null, 'name', 'instance.tld', userSeparator: FullNameSeparator.at),
payload: FullNameSeparator.at,
capitalizeLabel: false,
),
ListPickerItem(
icon: Icons.alternate_email_rounded,
label: generateUserFullName(null, 'name', 'instance.tld', userSeparator: FullNameSeparator.lemmy),
payload: FullNameSeparator.lemmy,
capitalizeLabel: false,
),
],
icon: Icons.person_rounded,
onChanged: (value) => setPreferences(LocalSettings.userFormat, value.payload.name),
Expand All @@ -648,10 +669,31 @@ class _GeneralSettingsPageState extends State<GeneralSettingsPage> with SingleTi
SliverToBoxAdapter(
child: ListOption(
description: l10n.communityFormat,
value: ListPickerItem(label: communitySeparator.label, icon: Icons.person_rounded, payload: communitySeparator, capitalizeLabel: false),
value: ListPickerItem(
label: generateCommunityFullName(null, 'name', 'instance.tld', communitySeparator: communitySeparator),
icon: Icons.person_rounded,
payload: communitySeparator,
capitalizeLabel: false,
),
options: [
ListPickerItem(icon: const IconData(0x2022), label: FullNameSeparator.dot.label, payload: FullNameSeparator.dot, capitalizeLabel: false),
ListPickerItem(icon: Icons.alternate_email_rounded, label: FullNameSeparator.at.label, payload: FullNameSeparator.at, capitalizeLabel: false),
ListPickerItem(
icon: const IconData(0x2022),
label: generateCommunityFullName(null, 'name', 'instance.tld', communitySeparator: FullNameSeparator.dot),
payload: FullNameSeparator.dot,
capitalizeLabel: false,
),
ListPickerItem(
icon: Icons.alternate_email_rounded,
label: generateCommunityFullName(null, 'name', 'instance.tld', communitySeparator: FullNameSeparator.at),
payload: FullNameSeparator.at,
capitalizeLabel: false,
),
ListPickerItem(
icon: Icons.priority_high_rounded,
label: generateCommunityFullName(null, 'name', 'instance.tld', communitySeparator: FullNameSeparator.lemmy),
payload: FullNameSeparator.lemmy,
capitalizeLabel: false,
),
],
icon: Icons.people_rounded,
onChanged: (value) => setPreferences(LocalSettings.communityFormat, value.payload.name),
Expand Down
Loading