Move option to select a language from Account -> General
This commit is contained in:
parent
1a15410f0d
commit
bd7402fe38
|
@ -102,7 +102,7 @@
|
||||||
"no": "No",
|
"no": "No",
|
||||||
"email": "Email",
|
"email": "Email",
|
||||||
"support": "Support",
|
"support": "Support",
|
||||||
"advanced": "Advanced",
|
"general": "General",
|
||||||
"settings": "Settings",
|
"settings": "Settings",
|
||||||
"copied": "Copied",
|
"copied": "Copied",
|
||||||
"pleaseTryAgain": "Please try again",
|
"pleaseTryAgain": "Please try again",
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
|
|
||||||
|
|
||||||
import 'package:ente_auth/app/view/app.dart';
|
|
||||||
import 'package:ente_auth/l10n/l10n.dart';
|
import 'package:ente_auth/l10n/l10n.dart';
|
||||||
import 'package:ente_auth/locale.dart';
|
|
||||||
import 'package:ente_auth/services/local_authentication_service.dart';
|
import 'package:ente_auth/services/local_authentication_service.dart';
|
||||||
import 'package:ente_auth/services/user_service.dart';
|
import 'package:ente_auth/services/user_service.dart';
|
||||||
import 'package:ente_auth/theme/ente_theme.dart';
|
import 'package:ente_auth/theme/ente_theme.dart';
|
||||||
|
@ -13,7 +11,6 @@ import 'package:ente_auth/ui/components/captioned_text_widget.dart';
|
||||||
import 'package:ente_auth/ui/components/expandable_menu_item_widget.dart';
|
import 'package:ente_auth/ui/components/expandable_menu_item_widget.dart';
|
||||||
import 'package:ente_auth/ui/components/menu_item_widget.dart';
|
import 'package:ente_auth/ui/components/menu_item_widget.dart';
|
||||||
import 'package:ente_auth/ui/settings/common_settings.dart';
|
import 'package:ente_auth/ui/settings/common_settings.dart';
|
||||||
import 'package:ente_auth/ui/settings/language_picker.dart';
|
|
||||||
import 'package:ente_auth/utils/dialog_util.dart';
|
import 'package:ente_auth/utils/dialog_util.dart';
|
||||||
import 'package:ente_auth/utils/navigation_util.dart';
|
import 'package:ente_auth/utils/navigation_util.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
@ -89,29 +86,6 @@ class AccountSectionWidget extends StatelessWidget {
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
sectionOptionSpacing,
|
sectionOptionSpacing,
|
||||||
MenuItemWidget(
|
|
||||||
captionedTextWidget: CaptionedTextWidget(
|
|
||||||
title: l10n.language,
|
|
||||||
),
|
|
||||||
pressedColor: getEnteColorScheme(context).fillFaint,
|
|
||||||
trailingIcon: Icons.chevron_right_outlined,
|
|
||||||
trailingIconIsMuted: true,
|
|
||||||
onTap: () async {
|
|
||||||
final locale = await getLocale();
|
|
||||||
routeToPage(
|
|
||||||
context,
|
|
||||||
LanguageSelectorPage(
|
|
||||||
appSupportedLocales,
|
|
||||||
(locale) async {
|
|
||||||
await setLocale(locale);
|
|
||||||
App.setLocale(context, locale);
|
|
||||||
},
|
|
||||||
locale,
|
|
||||||
),
|
|
||||||
);
|
|
||||||
},
|
|
||||||
),
|
|
||||||
sectionOptionSpacing,
|
|
||||||
MenuItemWidget(
|
MenuItemWidget(
|
||||||
captionedTextWidget: CaptionedTextWidget(
|
captionedTextWidget: CaptionedTextWidget(
|
||||||
title: context.l10n.logout,
|
title: context.l10n.logout,
|
||||||
|
|
|
@ -1,11 +1,16 @@
|
||||||
|
import 'package:ente_auth/app/view/app.dart';
|
||||||
import 'package:ente_auth/core/logging/super_logging.dart';
|
import 'package:ente_auth/core/logging/super_logging.dart';
|
||||||
import 'package:ente_auth/l10n/l10n.dart';
|
import 'package:ente_auth/l10n/l10n.dart';
|
||||||
|
import 'package:ente_auth/locale.dart';
|
||||||
import 'package:ente_auth/services/preference_service.dart';
|
import 'package:ente_auth/services/preference_service.dart';
|
||||||
|
import 'package:ente_auth/theme/ente_theme.dart';
|
||||||
import 'package:ente_auth/ui/components/captioned_text_widget.dart';
|
import 'package:ente_auth/ui/components/captioned_text_widget.dart';
|
||||||
import 'package:ente_auth/ui/components/expandable_menu_item_widget.dart';
|
import 'package:ente_auth/ui/components/expandable_menu_item_widget.dart';
|
||||||
import 'package:ente_auth/ui/components/menu_item_widget.dart';
|
import 'package:ente_auth/ui/components/menu_item_widget.dart';
|
||||||
import 'package:ente_auth/ui/components/toggle_switch_widget.dart';
|
import 'package:ente_auth/ui/components/toggle_switch_widget.dart';
|
||||||
import 'package:ente_auth/ui/settings/common_settings.dart';
|
import 'package:ente_auth/ui/settings/common_settings.dart';
|
||||||
|
import 'package:ente_auth/ui/settings/language_picker.dart';
|
||||||
|
import 'package:ente_auth/utils/navigation_util.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
class AdvancedSectionWidget extends StatefulWidget {
|
class AdvancedSectionWidget extends StatefulWidget {
|
||||||
|
@ -20,7 +25,7 @@ class _AdvancedSectionWidgetState extends State<AdvancedSectionWidget> {
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
final l10n = context.l10n;
|
final l10n = context.l10n;
|
||||||
return ExpandableMenuItemWidget(
|
return ExpandableMenuItemWidget(
|
||||||
title: l10n.advanced,
|
title: l10n.general,
|
||||||
selectionOptionsWidget: _getSectionOptions(context),
|
selectionOptionsWidget: _getSectionOptions(context),
|
||||||
leadingIcon: Icons.graphic_eq,
|
leadingIcon: Icons.graphic_eq,
|
||||||
);
|
);
|
||||||
|
@ -30,6 +35,29 @@ class _AdvancedSectionWidgetState extends State<AdvancedSectionWidget> {
|
||||||
final l10n = context.l10n;
|
final l10n = context.l10n;
|
||||||
return Column(
|
return Column(
|
||||||
children: [
|
children: [
|
||||||
|
sectionOptionSpacing,
|
||||||
|
MenuItemWidget(
|
||||||
|
captionedTextWidget: CaptionedTextWidget(
|
||||||
|
title: l10n.language,
|
||||||
|
),
|
||||||
|
pressedColor: getEnteColorScheme(context).fillFaint,
|
||||||
|
trailingIcon: Icons.chevron_right_outlined,
|
||||||
|
trailingIconIsMuted: true,
|
||||||
|
onTap: () async {
|
||||||
|
final locale = await getLocale();
|
||||||
|
routeToPage(
|
||||||
|
context,
|
||||||
|
LanguageSelectorPage(
|
||||||
|
appSupportedLocales,
|
||||||
|
(locale) async {
|
||||||
|
await setLocale(locale);
|
||||||
|
App.setLocale(context, locale);
|
||||||
|
},
|
||||||
|
locale,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
),
|
||||||
sectionOptionSpacing,
|
sectionOptionSpacing,
|
||||||
MenuItemWidget(
|
MenuItemWidget(
|
||||||
captionedTextWidget: CaptionedTextWidget(
|
captionedTextWidget: CaptionedTextWidget(
|
|
@ -14,7 +14,7 @@ import 'package:ente_auth/ui/settings/account_section_widget.dart';
|
||||||
import 'package:ente_auth/ui/settings/app_version_widget.dart';
|
import 'package:ente_auth/ui/settings/app_version_widget.dart';
|
||||||
import 'package:ente_auth/ui/settings/data/data_section_widget.dart';
|
import 'package:ente_auth/ui/settings/data/data_section_widget.dart';
|
||||||
import 'package:ente_auth/ui/settings/data/export_widget.dart';
|
import 'package:ente_auth/ui/settings/data/export_widget.dart';
|
||||||
import 'package:ente_auth/ui/settings/advanced_section_widget.dart';
|
import 'package:ente_auth/ui/settings/general_section_widget.dart';
|
||||||
import 'package:ente_auth/ui/settings/security_section_widget.dart';
|
import 'package:ente_auth/ui/settings/security_section_widget.dart';
|
||||||
import 'package:ente_auth/ui/settings/social_section_widget.dart';
|
import 'package:ente_auth/ui/settings/social_section_widget.dart';
|
||||||
import 'package:ente_auth/ui/settings/support_dev_widget.dart';
|
import 'package:ente_auth/ui/settings/support_dev_widget.dart';
|
||||||
|
|
Loading…
Reference in a new issue