π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Share language selector across mobile apps
Neeraj Guptaf2f8e01d0983
diff --git a/mobile/apps/auth/lib/ui/settings/language_picker.dart b/mobile/apps/auth/lib/ui/settings/language_picker.dartindex 75e6a99791..93368691f0 100644--- a/mobile/apps/auth/lib/ui/settings/language_picker.dart+++ b/mobile/apps/auth/lib/ui/settings/language_picker.dart@@ -1,8 +1,6 @@import 'package:ente_auth/ui/settings/components/auth_settings_page_scaffold.dart';-import 'package:ente_components/ente_components.dart';-import 'package:ente_pure_utils/ente_pure_utils.dart';import 'package:ente_strings/ente_strings.dart';-import 'package:flutter/foundation.dart';+import 'package:ente_ui/components/language_selector_list.dart';import 'package:flutter/material.dart';class LanguageSelectorPage extends StatelessWidget {@@ -21,86 +19,15 @@ class LanguageSelectorPage extends StatelessWidget {Widget build(BuildContext context) {return AuthSettingsPageScaffold(title: context.strings.selectLanguage,- children: [ItemsWidget(supportedLocales, onLocaleChanged, currentLocale)],+ children: [+ LanguageSelectorList(+ supportedLocales,+ onLocaleChanged,+ currentLocale,+ semanticsIdentifier: 'auth_language_list',+ ),+ const SizedBox(height: 24),+ ],);}}--class ItemsWidget extends StatefulWidget {- final List<Locale> supportedLocales;- final ValueChanged<Locale> onLocaleChanged;- final Locale currentLocale;-- const ItemsWidget(- this.supportedLocales,- this.onLocaleChanged,- this.currentLocale, {- super.key,- });-- @override- State<ItemsWidget> createState() => _ItemsWidgetState();-}--class _ItemsWidgetState extends State<ItemsWidget> {- late Locale currentLocale;-- @override- void initState() {- currentLocale = _resolvedCurrentLocale(- widget.currentLocale,- widget.supportedLocales,- );- super.initState();- }-- @override- Widget build(BuildContext context) {- return Semantics(- identifier: 'auth_language_list',- child: MenuGroupComponent(- showDividers: true,- dividerPadding: const EdgeInsets.only(left: Spacing.lg),- items: [- for (final locale in widget.supportedLocales)- _menuItemForPicker(locale),- ],- ),- );- }-- MenuComponent _menuItemForPicker(Locale locale) {- final selected = currentLocale == locale;- return MenuComponent(- key: ValueKey(locale.toString()),- title: getLocaleDisplayName(locale) + (kDebugMode ? ' ($locale)' : ''),- selected: selected,- trailing: RadioComponent(- selected: selected,- onChanged: (_) => _selectLocale(locale),- ),- showOnlyLoadingState: true,- onTap: () => _selectLocale(locale),- );- }-- void _selectLocale(Locale locale) {- widget.onLocaleChanged(locale);- currentLocale = locale;- setState(() {});- }-}--Locale _resolvedCurrentLocale(Locale current, List<Locale> supported) {- if (supported.contains(current)) return current;-- final languageMatches = supported- .where((locale) => locale.languageCode == current.languageCode)- .toList();- if (languageMatches.isEmpty) return current;-- return languageMatches.firstWhere(- (locale) => locale.countryCode == null,- orElse: () => languageMatches.first,- );-}diff --git a/mobile/apps/auth/test/ui/settings/settings_subpages_test.dart b/mobile/apps/auth/test/ui/settings/settings_subpages_test.dartdeleted file mode 100644index 00d2aa3f59..0000000000--- a/mobile/apps/auth/test/ui/settings/settings_subpages_test.dart+++ /dev/null@@ -1,40 +0,0 @@-import 'package:ente_auth/ui/settings/language_picker.dart';-import 'package:ente_components/ente_components.dart';-import 'package:ente_strings/ente_strings.dart';-import 'package:flutter/material.dart';-import 'package:flutter_test/flutter_test.dart';--void main() {- testWidgets(- 'language picker normalizes a device locale to its supported row',- (tester) async {- await _pumpPage(- tester,- LanguageSelectorPage(- const [Locale('en'), Locale('fr')],- (_) {},- const Locale('en', 'US'),- ),- );-- final englishRow = find.widgetWithText(MenuComponent, 'English (en)');- final radio = tester.widget<RadioComponent>(- find.descendant(of: englishRow, matching: find.byType(RadioComponent)),- );-- expect(radio.selected, isTrue);- expect(find.byType(MenuGroupComponent), findsOneWidget);- },- );-}--Future<void> _pumpPage(WidgetTester tester, Widget page) {- return tester.pumpWidget(- MaterialApp(- theme: ComponentTheme.lightTheme(app: ComponentApp.auth),- localizationsDelegates: StringsLocalizations.localizationsDelegates,- supportedLocales: StringsLocalizations.supportedLocales,- home: page,- ),- );-}diff --git a/mobile/apps/locker/lib/ui/settings/language_selector_page.dart b/mobile/apps/locker/lib/ui/settings/language_selector_page.dartdeleted file mode 100644index 048cb29ebe..0000000000--- a/mobile/apps/locker/lib/ui/settings/language_selector_page.dart+++ /dev/null@@ -1,81 +0,0 @@-import "package:ente_components/ente_components.dart";-import "package:ente_pure_utils/ente_pure_utils.dart";-import "package:ente_strings/ente_strings.dart";-import "package:flutter/foundation.dart";-import "package:flutter/material.dart";--class LanguageSelectorPage extends StatelessWidget {- final List<Locale> supportedLocales;- final ValueChanged<Locale> onLocaleChanged;- final Locale currentLocale;-- const LanguageSelectorPage(- this.supportedLocales,- this.onLocaleChanged,- this.currentLocale, {- super.key,- });-- @override- Widget build(BuildContext context) {- return SettingsPageScaffold(- title: context.strings.selectLanguage,- children: [- _LanguageItemsWidget(supportedLocales, onLocaleChanged, currentLocale),- const SizedBox(height: 24),- ],- );- }-}--class _LanguageItemsWidget extends StatefulWidget {- final List<Locale> supportedLocales;- final ValueChanged<Locale> onLocaleChanged;- final Locale currentLocale;-- const _LanguageItemsWidget(- this.supportedLocales,- this.onLocaleChanged,- this.currentLocale,- );-- @override- State<_LanguageItemsWidget> createState() => _LanguageItemsWidgetState();-}--class _LanguageItemsWidgetState extends State<_LanguageItemsWidget> {- late Locale currentLocale;-- @override- void initState() {- currentLocale = widget.currentLocale;- super.initState();- }-- @override- Widget build(BuildContext context) {- return MenuGroupComponent(- items: [- for (final locale in widget.supportedLocales)- _menuItemForPicker(locale),- ],- );- }-- Widget _menuItemForPicker(Locale locale) {- return SettingsItem(- key: ValueKey(locale.toString()),- title: getLocaleDisplayName(locale) + (kDebugMode ? ' ($locale)' : ''),- showChevron: false,- trailing: currentLocale == locale- ? Icon(Icons.check, color: context.componentColors.primary)- : null,- showOnlyLoadingState: true,- onTap: () async {- widget.onLocaleChanged(locale);- currentLocale = locale;- setState(() {});- },- );- }-}diff --git a/mobile/apps/locker/lib/ui/settings/pages/general_settings_page.dart b/mobile/apps/locker/lib/ui/settings/pages/general_settings_page.dartindex 5fd4455d08..4f18be0403 100644--- a/mobile/apps/locker/lib/ui/settings/pages/general_settings_page.dart+++ b/mobile/apps/locker/lib/ui/settings/pages/general_settings_page.dart@@ -1,10 +1,10 @@import "package:ente_components/ente_components.dart";import "package:ente_strings/ente_strings.dart";+import "package:ente_ui/pages/language_selector_page.dart";import "package:flutter/material.dart";import "package:hugeicons/hugeicons.dart";import "package:locker/app.dart";import "package:locker/core/locale.dart";-import "package:locker/ui/settings/language_selector_page.dart";class GeneralSettingsPage extends StatelessWidget {const GeneralSettingsPage({super.key});diff --git a/mobile/apps/photos/lib/ui/home/landing_page_widget.dart b/mobile/apps/photos/lib/ui/home/landing_page_widget.dartindex 9c5c734c2d..b7f4e858a5 100644--- a/mobile/apps/photos/lib/ui/home/landing_page_widget.dart+++ b/mobile/apps/photos/lib/ui/home/landing_page_widget.dart@@ -4,6 +4,7 @@ import "dart:math";import "package:ente_components/ente_components.dart";import "package:ente_pure_utils/ente_pure_utils.dart";import "package:ente_strings/ente_strings.dart";+import "package:ente_ui/pages/language_selector_page.dart";import "package:flutter/foundation.dart";import 'package:flutter/material.dart';import "package:photos/app.dart";@@ -21,7 +22,6 @@ import 'package:photos/ui/components/models/button_type.dart';import 'package:photos/ui/payment/subscription.dart';import "package:photos/ui/settings/developer_settings_tap_area.dart";import "package:photos/ui/settings/developer_settings_widget.dart";-import "package:photos/ui/settings/language_picker.dart";import "package:rive/rive.dart" as rive;class LandingPageWidget extends StatefulWidget {diff --git a/mobile/apps/photos/lib/ui/settings/appearance/appearance_settings_page.dart b/mobile/apps/photos/lib/ui/settings/appearance/appearance_settings_page.dartindex 6bf5086b0a..f488f30081 100644--- a/mobile/apps/photos/lib/ui/settings/appearance/appearance_settings_page.dart+++ b/mobile/apps/photos/lib/ui/settings/appearance/appearance_settings_page.dart@@ -4,6 +4,7 @@ import "package:adaptive_theme/adaptive_theme.dart";import "package:ente_components/ente_components.dart";import "package:ente_pure_utils/ente_pure_utils.dart";import "package:ente_strings/ente_strings.dart";+import "package:ente_ui/pages/language_selector_page.dart";import "package:flutter/foundation.dart";import "package:flutter/material.dart";import "package:hugeicons/hugeicons.dart";@@ -11,7 +12,6 @@ import "package:photos/app.dart";import "package:photos/locale.dart";import "package:photos/ui/settings/app_icon_selection_screen.dart";import "package:photos/ui/settings/gallery_settings_screen.dart";-import "package:photos/ui/settings/language_picker.dart";class AppearanceSettingsPage extends StatefulWidget {const AppearanceSettingsPage({super.key});diff --git a/mobile/apps/photos/lib/ui/settings/language_picker.dart b/mobile/apps/photos/lib/ui/settings/language_picker.dartdeleted file mode 100644index 07b1ca2c55..0000000000--- a/mobile/apps/photos/lib/ui/settings/language_picker.dart+++ /dev/null@@ -1,103 +0,0 @@-import "package:ente_components/ente_components.dart";-import "package:ente_pure_utils/ente_pure_utils.dart";-import "package:ente_strings/ente_strings.dart";-import "package:flutter/foundation.dart";-import "package:flutter/material.dart";--class LanguageSelectorPage extends StatelessWidget {- final List<Locale> supportedLocales;- final ValueChanged<Locale> onLocaleChanged;- final Locale currentLocale;-- const LanguageSelectorPage(- this.supportedLocales,- this.onLocaleChanged,- this.currentLocale, {- super.key,- });-- @override- Widget build(BuildContext context) {- return SettingsPageScaffold(- title: context.strings.selectLanguage,- children: [- ItemsWidget(supportedLocales, onLocaleChanged, currentLocale),- const SizedBox(height: 12),- ],- );- }-}--class ItemsWidget extends StatefulWidget {- final List<Locale> supportedLocales;- final ValueChanged<Locale> onLocaleChanged;- final Locale currentLocale;-- const ItemsWidget(- this.supportedLocales,- this.onLocaleChanged,- this.currentLocale, {- super.key,- });-- @override- State<ItemsWidget> createState() => _ItemsWidgetState();-}--class _ItemsWidgetState extends State<ItemsWidget> {- late Locale currentLocale;-- @override- void initState() {- currentLocale = widget.currentLocale;- super.initState();- }-- @override- Widget build(BuildContext context) {- final items = <MenuComponent>[];- bool foundMatch = false;- for (Locale locale in widget.supportedLocales) {- if (currentLocale == locale) {- foundMatch = true;- }- items.add(_menuItemForPicker(locale));- }- final debugLocaleText = !foundMatch && kDebugMode- ? Padding(- padding: const EdgeInsets.only(bottom: Spacing.md),- child: Text(- "(i) Locale : ${currentLocale.toString()}",- style: TextStyles.mini.copyWith(- color: context.componentColors.textLight,- ),- ),- )- : null;-- final children = <Widget>[- ?debugLocaleText,- MenuGroupComponent(items: items),- ];- return Column(mainAxisSize: MainAxisSize.min, children: children);- }-- MenuComponent _menuItemForPicker(Locale locale) {- final isSelected = currentLocale == locale;- return MenuComponent(- key: ValueKey(locale.toString()),- title: getLocaleDisplayName(locale) + (kDebugMode ? ' ($locale)' : ''),- trailing: isSelected- ? Icon(Icons.check, color: context.componentColors.primary)- : null,- showOnlyLoadingState: true,- onTap: () async => _selectLocale(locale),- );- }-- void _selectLocale(Locale locale) {- widget.onLocaleChanged(locale);- currentLocale = locale;- setState(() {});- }-}diff --git a/mobile/packages/ui/lib/components/language_selector_list.dart b/mobile/packages/ui/lib/components/language_selector_list.dartnew file mode 100644index 0000000000..45d6526fa8--- /dev/null+++ b/mobile/packages/ui/lib/components/language_selector_list.dart@@ -0,0 +1,83 @@+import 'package:ente_components/ente_components.dart';+import 'package:ente_pure_utils/ente_pure_utils.dart';+import 'package:flutter/foundation.dart';+import 'package:flutter/material.dart';++class LanguageSelectorList extends StatefulWidget {+ const LanguageSelectorList(+ this.supportedLocales,+ this.onLocaleChanged,+ this.currentLocale, {+ this.semanticsIdentifier = 'language_selector_list',+ super.key,+ });++ final List<Locale> supportedLocales;+ final ValueChanged<Locale> onLocaleChanged;+ final Locale currentLocale;+ final String semanticsIdentifier;++ @override+ State<LanguageSelectorList> createState() => _LanguageSelectorListState();+}++class _LanguageSelectorListState extends State<LanguageSelectorList> {+ late Locale currentLocale;++ @override+ void initState() {+ currentLocale = _resolveCurrentLocale(+ widget.currentLocale,+ widget.supportedLocales,+ );+ super.initState();+ }++ @override+ Widget build(BuildContext context) {+ return Semantics(+ identifier: widget.semanticsIdentifier,+ child: MenuGroupComponent(+ showDividers: true,+ dividerPadding: const EdgeInsets.only(left: Spacing.lg),+ items: [+ for (final locale in widget.supportedLocales)+ _menuItemForPicker(locale),+ ],+ ),+ );+ }++ MenuComponent _menuItemForPicker(Locale locale) {+ final selected = currentLocale == locale;+ return MenuComponent(+ key: ValueKey(locale.toString()),+ title: getLocaleDisplayName(locale) + (kDebugMode ? ' ($locale)' : ''),+ trailing: selected+ ? Icon(Icons.check, color: context.componentColors.primary)+ : null,+ showOnlyLoadingState: true,+ onTap: () => _selectLocale(locale),+ );+ }++ void _selectLocale(Locale locale) {+ widget.onLocaleChanged(locale);+ currentLocale = locale;+ setState(() {});+ }+}++Locale _resolveCurrentLocale(Locale current, List<Locale> supported) {+ if (supported.contains(current)) return current;++ final languageMatches = supported+ .where((locale) => locale.languageCode == current.languageCode)+ .toList();+ if (languageMatches.isEmpty) return current;++ return languageMatches.firstWhere(+ (locale) => locale.countryCode == null,+ orElse: () => languageMatches.first,+ );+}diff --git a/mobile/packages/ui/lib/pages/language_selector_page.dart b/mobile/packages/ui/lib/pages/language_selector_page.dartnew file mode 100644index 0000000000..9134df2caa--- /dev/null+++ b/mobile/packages/ui/lib/pages/language_selector_page.dart@@ -0,0 +1,28 @@+import 'package:ente_components/ente_components.dart';+import 'package:ente_strings/ente_strings.dart';+import 'package:ente_ui/components/language_selector_list.dart';+import 'package:flutter/material.dart';++class LanguageSelectorPage extends StatelessWidget {+ const LanguageSelectorPage(+ this.supportedLocales,+ this.onLocaleChanged,+ this.currentLocale, {+ super.key,+ });++ final List<Locale> supportedLocales;+ final ValueChanged<Locale> onLocaleChanged;+ final Locale currentLocale;++ @override+ Widget build(BuildContext context) {+ return SettingsPageScaffold(+ title: context.strings.selectLanguage,+ children: [+ LanguageSelectorList(supportedLocales, onLocaleChanged, currentLocale),+ const SizedBox(height: 24),+ ],+ );+ }+}diff --git a/mobile/packages/ui/pubspec.yaml b/mobile/packages/ui/pubspec.yamlindex c10606cc06..59ba5d0d3b 100644--- a/mobile/packages/ui/pubspec.yaml+++ b/mobile/packages/ui/pubspec.yaml@@ -10,6 +10,8 @@ dependencies:dio: 5.9.2ente_base:path: ../../packages/base+ ente_components:+ path: ../ente_componentsente_logging:path: ../../packages/loggingente_pure_utils: