HyperNet/Surface
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

✨ Able to set account preffered language

Browse Source
This commit is contained in:
LittleSheep 2025-05-17 21:41:13 +08:00
parent 641fcb4419
commit 7ccaf737a9
10 changed files with 330 additions and 243 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/i18n/en-US.json
View File

@ -151,8 +151,10 @@
"statusActivityTitle": "{} is {} {}",
"statusActivityEndedTitle": "{} is {} {} until {}",
"appSettings": "App Settings",
"accountSettings": "Account Settings",
"settings": "Settings",
"language": "Language",
"accountLanguageHint": "This language will be used for email and push notifications.",
"settingsDisplayLanguage": "Display Language",
"languageFollowSystem": "Follow System",
"postsCreatedCount": "Posts",

1
lib/route.dart
View File

@ -25,6 +25,7 @@ class AppRouter extends RootStackRouter {
AutoRoute(page: LoginRoute.page, path: '/auth/login'),
AutoRoute(page: CreateAccountRoute.page, path: '/auth/create-account'),
AutoRoute(page: MyselfProfileRoute.page, path: '/account/me'),
AutoRoute(page: AccountSettingsRoute.page, path: '/account/settings'),
AutoRoute(
page: MyselfEventCalendarRoute.page,
path: '/account/me/calendar',

479
lib/route.gr.dart
View File

File diff suppressed because it is too large Load Diff

8
lib/screens/account/me/event_calendar.dart
View File

@ -111,7 +111,13 @@ class MyselfEventCalendarScreen extends HookConsumerWidget {
fontSize: 9,
color:
isSameDay(selectedDay.value, day)
? Theme.of(context).colorScheme.onPrimary
? Theme.of(
context,
).colorScheme.onPrimaryContainer
: isSameDay(DateTime.now(), day)
? Theme.of(
context,
).colorScheme.onSecondaryContainer
: Theme.of(context).colorScheme.onSurface,
),
),

18
lib/screens/account/me/settings.dart Normal file
View File

@ -0,0 +1,18 @@
import 'package:auto_route/annotations.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:island/widgets/app_scaffold.dart';
@RoutePage()
class AccountSettingsScreen extends HookConsumerWidget {
const AccountSettingsScreen({super.key});
@override
Widget build(BuildContext context, WidgetRef ref) {
return AppScaffold(
appBar: AppBar(title: Text('accountSettings').tr()),
body: SingleChildScrollView(child: Column(children: [])),
);
}
}

41
lib/screens/account/me/update.dart
View File

@ -1,5 +1,6 @@
import 'package:auto_route/auto_route.dart';
import 'package:croppy/croppy.dart' hide cropImage;
import 'package:dropdown_button2/dropdown_button2.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
@ -15,6 +16,8 @@ import 'package:island/widgets/content/cloud_files.dart';
import 'package:material_symbols_icons/symbols.dart';
import 'package:styled_widget/styled_widget.dart';
const kServerSupportedLanguages = {'en-US': 'en-us', 'zh-CN': 'zh-hans'};
@RoutePage()
class UpdateProfileScreen extends HookConsumerWidget {
const UpdateProfileScreen({super.key});
@ -94,6 +97,7 @@ class UpdateProfileScreen extends HookConsumerWidget {
final formKeyBasicInfo = useMemoized(GlobalKey<FormState>.new, const []);
final usernameController = useTextEditingController(text: user.value!.name);
final nicknameController = useTextEditingController(text: user.value!.nick);
final language = useState(user.value!.language);
void updateBasicInfo() async {
if (!formKeyBasicInfo.currentState!.validate()) return;
@ -106,6 +110,7 @@ class UpdateProfileScreen extends HookConsumerWidget {
data: {
'name': usernameController.text,
'nick': nicknameController.text,
'language': language.value,
},
);
final userNotifier = ref.read(userInfoProvider.notifier);
@ -161,9 +166,9 @@ class UpdateProfileScreen extends HookConsumerWidget {
child: Container(
color: Theme.of(context).colorScheme.surfaceContainerHigh,
child:
user.value!.profile.background != null
? CloudFileWidget(
item: user.value!.profile.background!,
user.value!.profile.backgroundId != null
? CloudImageWidget(
fileId: user.value!.profile.backgroundId!,
fit: BoxFit.cover,
)
: const SizedBox.shrink(),
@ -196,7 +201,7 @@ class UpdateProfileScreen extends HookConsumerWidget {
Form(
key: formKeyBasicInfo,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.stretch,
spacing: 16,
children: [
TextFormField(
@ -216,6 +221,34 @@ class UpdateProfileScreen extends HookConsumerWidget {
onTapOutside:
(_) => FocusManager.instance.primaryFocus?.unfocus(),
),
DropdownButtonFormField2<String>(
decoration: InputDecoration(
labelText: 'language'.tr(),
helperText: 'accountLanguageHint'.tr(),
),
items: [
...kServerSupportedLanguages.values.map(
(e) => DropdownMenuItem(value: e, child: Text(e)),
),
if (!kServerSupportedLanguages.containsValue(
language.value,
))
DropdownMenuItem(
value: language.value,
child: Text(language.value),
),
],
value: language.value,
onChanged: (value) {
language.value = value ?? language.value;
},
customButton: Row(
children: [
Expanded(child: Text(language.value)),
Icon(Symbols.arrow_drop_down),
],
),
),
Align(
alignment: Alignment.centerRight,
child: TextButton.icon(

7
lib/screens/auth/create_account.dart
View File

@ -7,6 +7,7 @@ import 'package:gap/gap.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:island/pods/network.dart';
import 'package:island/route.gr.dart';
import 'package:island/screens/account/me/update.dart';
import 'package:island/widgets/alert.dart';
import 'package:island/widgets/app_scaffold.dart';
import 'package:material_symbols_icons/symbols.dart';
@ -56,7 +57,11 @@ class CreateAccountScreen extends HookConsumerWidget {
'nick': nicknameController.text,
'email': emailController.text,
'password': passwordController.text,
'language': EasyLocalization.of(context)!.currentLocale.toString(),
'language':
kServerSupportedLanguages[EasyLocalization.of(
context,
)!.currentLocale.toString()] ??
'en-us',
'captcha_token': captchaTk,
},
);

12
lib/screens/creators/hub.dart
View File

@ -36,7 +36,7 @@ class CreatorHubScreen extends HookConsumerWidget {
publishers.value?.firstOrNull,
);
final publishersMenu = publishers.when(
final List<DropdownMenuItem<SnPublisher>> publishersMenu = publishers.when(
data:
(data) =>
data
@ -92,10 +92,12 @@ class CreatorHubScreen extends HookConsumerWidget {
},
selectedItemBuilder: (context) {
return [
ProfilePictureWidget(
radius: 16,
fileId: currentPublisher.value?.pictureId,
).center().padding(right: 8),
...publishersMenu.map(
(e) => ProfilePictureWidget(
radius: 16,
fileId: e.value?.pictureId,
).center().padding(right: 8),
),
];
},
buttonStyleData: ButtonStyleData(

3
lib/widgets/check_in.dart
View File

@ -8,6 +8,7 @@ import 'package:gap/gap.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:island/models/activity.dart';
import 'package:island/pods/network.dart';
import 'package:island/pods/userinfo.dart';
import 'package:island/route.gr.dart';
import 'package:island/screens/auth/captcha.dart';
import 'package:island/widgets/alert.dart';
@ -58,6 +59,8 @@ class CheckInWidget extends HookConsumerWidget {
data: jsonEncode(captchaTk),
);
ref.invalidate(checkInResultTodayProvider);
final userNotifier = ref.read(userInfoProvider.notifier);
userNotifier.fetchUser();
return;
}
}

2
lib/widgets/post/post_item.dart
View File

@ -38,7 +38,7 @@ class PostItem extends HookConsumerWidget {
final user = ref.watch(userInfoProvider);
final isAuthor = useMemoized(
() => user.hasValue && user.value!.id == item.publisher.accountId,
() => user.hasValue && user.value?.id == item.publisher.accountId,
[user],
);