mirror of
https://gitlab.com/nkming2/nc-photos.git
synced 2025-02-02 06:46:22 +01:00
Redesign language settings
This commit is contained in:
parent
bde05103e0
commit
10daa15c7e
11 changed files with 475 additions and 114 deletions
|
@ -1,5 +1,7 @@
|
||||||
import 'package:logging/logging.dart';
|
import 'package:logging/logging.dart';
|
||||||
import 'package:nc_photos/di_container.dart';
|
import 'package:nc_photos/di_container.dart';
|
||||||
|
import 'package:nc_photos/language_util.dart' as language_util;
|
||||||
|
import 'package:nc_photos/lazy.dart';
|
||||||
import 'package:np_codegen/np_codegen.dart';
|
import 'package:np_codegen/np_codegen.dart';
|
||||||
import 'package:rxdart/rxdart.dart';
|
import 'package:rxdart/rxdart.dart';
|
||||||
|
|
||||||
|
@ -9,6 +11,23 @@ part 'pref_controller.g.dart';
|
||||||
class PrefController {
|
class PrefController {
|
||||||
PrefController(this._c);
|
PrefController(this._c);
|
||||||
|
|
||||||
|
ValueStream<language_util.AppLanguage> get language => _languageStream();
|
||||||
|
|
||||||
|
Future<void> setAppLanguage(language_util.AppLanguage value) async {
|
||||||
|
final backup = _languageController.value;
|
||||||
|
_languageController.add(value.langId);
|
||||||
|
try {
|
||||||
|
if (!await _c.pref.setLanguage(value.langId)) {
|
||||||
|
throw StateError("Unknown error");
|
||||||
|
}
|
||||||
|
} catch (e, stackTrace) {
|
||||||
|
_log.severe("[setAppLanguage] Failed setting preference", e, stackTrace);
|
||||||
|
_languageController
|
||||||
|
..addError(e, stackTrace)
|
||||||
|
..add(backup);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
ValueStream<int> get albumBrowserZoomLevel =>
|
ValueStream<int> get albumBrowserZoomLevel =>
|
||||||
_albumBrowserZoomLevelController.stream;
|
_albumBrowserZoomLevelController.stream;
|
||||||
|
|
||||||
|
@ -46,7 +65,23 @@ class PrefController {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
language_util.AppLanguage _langIdToAppLanguage(int langId) {
|
||||||
|
try {
|
||||||
|
return language_util.supportedLanguages[langId]!;
|
||||||
|
} catch (_) {
|
||||||
|
return language_util.supportedLanguages[0]!;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
final DiContainer _c;
|
final DiContainer _c;
|
||||||
|
late final _languageController =
|
||||||
|
BehaviorSubject.seeded(_c.pref.getLanguageOr(0));
|
||||||
|
late final _languageStream = Lazy(
|
||||||
|
() => _languageController
|
||||||
|
.map(_langIdToAppLanguage)
|
||||||
|
.publishValueSeeded(_langIdToAppLanguage(_languageController.value))
|
||||||
|
..connect(),
|
||||||
|
);
|
||||||
late final _albumBrowserZoomLevelController =
|
late final _albumBrowserZoomLevelController =
|
||||||
BehaviorSubject.seeded(_c.pref.getAlbumBrowserZoomLevelOr(0));
|
BehaviorSubject.seeded(_c.pref.getAlbumBrowserZoomLevelOr(0));
|
||||||
late final _homeAlbumsSortController =
|
late final _homeAlbumsSortController =
|
||||||
|
|
|
@ -119,8 +119,6 @@ class FavoriteResyncedEvent {
|
||||||
|
|
||||||
class ThemeChangedEvent {}
|
class ThemeChangedEvent {}
|
||||||
|
|
||||||
class LanguageChangedEvent {}
|
|
||||||
|
|
||||||
enum MetadataTaskState {
|
enum MetadataTaskState {
|
||||||
/// No work is being done
|
/// No work is being done
|
||||||
idle,
|
idle,
|
||||||
|
|
|
@ -23,16 +23,7 @@ class AppLanguage {
|
||||||
final Locale? locale;
|
final Locale? locale;
|
||||||
}
|
}
|
||||||
|
|
||||||
AppLanguage getSelectedLanguage() {
|
Locale? getSelectedLocale() => _getSelectedLanguage().locale;
|
||||||
try {
|
|
||||||
final lang = Pref().getLanguageOr(0);
|
|
||||||
return supportedLanguages[lang]!;
|
|
||||||
} catch (_) {
|
|
||||||
return supportedLanguages[_AppLanguageEnum.systemDefault.index]!;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Locale? getSelectedLocale() => getSelectedLanguage().locale;
|
|
||||||
|
|
||||||
final supportedLanguages = {
|
final supportedLanguages = {
|
||||||
_AppLanguageEnum.systemDefault.index: AppLanguage(
|
_AppLanguageEnum.systemDefault.index: AppLanguage(
|
||||||
|
@ -89,3 +80,12 @@ enum _AppLanguageEnum {
|
||||||
chineseHans,
|
chineseHans,
|
||||||
chineseHant,
|
chineseHant,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
AppLanguage _getSelectedLanguage() {
|
||||||
|
try {
|
||||||
|
final lang = Pref().getLanguageOr(0);
|
||||||
|
return supportedLanguages[lang]!;
|
||||||
|
} catch (_) {
|
||||||
|
return supportedLanguages[_AppLanguageEnum.systemDefault.index]!;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
13
app/lib/stream_util.dart
Normal file
13
app/lib/stream_util.dart
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:rxdart/rxdart.dart';
|
||||||
|
|
||||||
|
class ValueStreamBuilder<T> extends StreamBuilder<T> {
|
||||||
|
ValueStreamBuilder({
|
||||||
|
super.key,
|
||||||
|
ValueStream<T>? stream,
|
||||||
|
required super.builder,
|
||||||
|
}) : super(
|
||||||
|
stream: stream,
|
||||||
|
initialData: stream?.value,
|
||||||
|
);
|
||||||
|
}
|
|
@ -1,7 +1,8 @@
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:nc_photos/object_extension.dart';
|
||||||
|
|
||||||
class FancyOptionPickerItem {
|
class FancyOptionPickerItem {
|
||||||
FancyOptionPickerItem({
|
const FancyOptionPickerItem({
|
||||||
required this.label,
|
required this.label,
|
||||||
this.description,
|
this.description,
|
||||||
this.isSelected = false,
|
this.isSelected = false,
|
||||||
|
@ -10,12 +11,12 @@ class FancyOptionPickerItem {
|
||||||
this.dense = false,
|
this.dense = false,
|
||||||
});
|
});
|
||||||
|
|
||||||
String label;
|
final String label;
|
||||||
String? description;
|
final String? description;
|
||||||
bool isSelected;
|
final bool isSelected;
|
||||||
VoidCallback? onSelect;
|
final VoidCallback? onSelect;
|
||||||
VoidCallback? onUnselect;
|
final VoidCallback? onUnselect;
|
||||||
bool dense;
|
final bool dense;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// A fancy looking dialog to pick an option
|
/// A fancy looking dialog to pick an option
|
||||||
|
@ -27,26 +28,17 @@ class FancyOptionPicker extends StatelessWidget {
|
||||||
}) : super(key: key);
|
}) : super(key: key);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return SimpleDialog(
|
return SimpleDialog(
|
||||||
title: title != null ? Text(title!) : null,
|
title: title != null ? Text(title!) : null,
|
||||||
children: items
|
children: items
|
||||||
.map((e) => SimpleDialogOption(
|
.map((e) => SimpleDialogOption(
|
||||||
child: ListTile(
|
child: FancyOptionPickerItemView(
|
||||||
leading: Icon(
|
label: e.label,
|
||||||
e.isSelected ? Icons.check : null,
|
description: e.description,
|
||||||
color: Theme.of(context).colorScheme.primary,
|
isSelected: e.isSelected,
|
||||||
),
|
onSelect: e.onSelect,
|
||||||
title: Text(
|
onUnselect: e.onUnselect,
|
||||||
e.label,
|
|
||||||
style: e.isSelected
|
|
||||||
? TextStyle(
|
|
||||||
color: Theme.of(context).colorScheme.primary,
|
|
||||||
)
|
|
||||||
: null,
|
|
||||||
),
|
|
||||||
subtitle: e.description == null ? null : Text(e.description!),
|
|
||||||
onTap: e.isSelected ? e.onUnselect : e.onSelect,
|
|
||||||
dense: e.dense,
|
dense: e.dense,
|
||||||
),
|
),
|
||||||
))
|
))
|
||||||
|
@ -57,3 +49,43 @@ class FancyOptionPicker extends StatelessWidget {
|
||||||
final String? title;
|
final String? title;
|
||||||
final List<FancyOptionPickerItem> items;
|
final List<FancyOptionPickerItem> items;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class FancyOptionPickerItemView extends StatelessWidget {
|
||||||
|
const FancyOptionPickerItemView({
|
||||||
|
super.key,
|
||||||
|
required this.label,
|
||||||
|
this.description,
|
||||||
|
required this.isSelected,
|
||||||
|
this.onSelect,
|
||||||
|
this.onUnselect,
|
||||||
|
required this.dense,
|
||||||
|
});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return ListTile(
|
||||||
|
leading: Icon(
|
||||||
|
isSelected ? Icons.check : null,
|
||||||
|
color: Theme.of(context).colorScheme.primary,
|
||||||
|
),
|
||||||
|
title: Text(
|
||||||
|
label,
|
||||||
|
style: isSelected
|
||||||
|
? TextStyle(
|
||||||
|
color: Theme.of(context).colorScheme.primary,
|
||||||
|
)
|
||||||
|
: null,
|
||||||
|
),
|
||||||
|
subtitle: description?.run(Text.new),
|
||||||
|
onTap: isSelected ? onUnselect : onSelect,
|
||||||
|
dense: dense,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
final String label;
|
||||||
|
final String? description;
|
||||||
|
final bool isSelected;
|
||||||
|
final VoidCallback? onSelect;
|
||||||
|
final VoidCallback? onUnselect;
|
||||||
|
final bool dense;
|
||||||
|
}
|
||||||
|
|
|
@ -14,6 +14,7 @@ import 'package:nc_photos/legacy/sign_in.dart' as legacy;
|
||||||
import 'package:nc_photos/navigation_manager.dart';
|
import 'package:nc_photos/navigation_manager.dart';
|
||||||
import 'package:nc_photos/pref.dart';
|
import 'package:nc_photos/pref.dart';
|
||||||
import 'package:nc_photos/snack_bar_manager.dart';
|
import 'package:nc_photos/snack_bar_manager.dart';
|
||||||
|
import 'package:nc_photos/stream_util.dart';
|
||||||
import 'package:nc_photos/theme.dart';
|
import 'package:nc_photos/theme.dart';
|
||||||
import 'package:nc_photos/widget/album_dir_picker.dart';
|
import 'package:nc_photos/widget/album_dir_picker.dart';
|
||||||
import 'package:nc_photos/widget/album_importer.dart';
|
import 'package:nc_photos/widget/album_importer.dart';
|
||||||
|
@ -33,6 +34,7 @@ import 'package:nc_photos/widget/places_browser.dart';
|
||||||
import 'package:nc_photos/widget/result_viewer.dart';
|
import 'package:nc_photos/widget/result_viewer.dart';
|
||||||
import 'package:nc_photos/widget/root_picker.dart';
|
import 'package:nc_photos/widget/root_picker.dart';
|
||||||
import 'package:nc_photos/widget/settings.dart';
|
import 'package:nc_photos/widget/settings.dart';
|
||||||
|
import 'package:nc_photos/widget/settings/language_settings.dart';
|
||||||
import 'package:nc_photos/widget/setup.dart';
|
import 'package:nc_photos/widget/setup.dart';
|
||||||
import 'package:nc_photos/widget/share_folder_picker.dart';
|
import 'package:nc_photos/widget/share_folder_picker.dart';
|
||||||
import 'package:nc_photos/widget/shared_file_viewer.dart';
|
import 'package:nc_photos/widget/shared_file_viewer.dart';
|
||||||
|
@ -91,8 +93,6 @@ class _WrappedAppState extends State<_WrappedApp>
|
||||||
NavigationManager().setHandler(this);
|
NavigationManager().setHandler(this);
|
||||||
_themeChangedListener =
|
_themeChangedListener =
|
||||||
AppEventListener<ThemeChangedEvent>(_onThemeChangedEvent)..begin();
|
AppEventListener<ThemeChangedEvent>(_onThemeChangedEvent)..begin();
|
||||||
_langChangedListener =
|
|
||||||
AppEventListener<LanguageChangedEvent>(_onLangChangedEvent)..begin();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
|
@ -104,40 +104,44 @@ class _WrappedAppState extends State<_WrappedApp>
|
||||||
themeMode =
|
themeMode =
|
||||||
Pref().isDarkThemeOr(false) ? ThemeMode.dark : ThemeMode.light;
|
Pref().isDarkThemeOr(false) ? ThemeMode.dark : ThemeMode.light;
|
||||||
}
|
}
|
||||||
return MaterialApp(
|
final prefController = context.read<PrefController>();
|
||||||
onGenerateTitle: (context) => AppLocalizations.of(context)!.appTitle,
|
return ValueStreamBuilder<language_util.AppLanguage>(
|
||||||
theme: buildLightTheme(),
|
stream: prefController.language,
|
||||||
darkTheme: buildDarkTheme(),
|
builder: (context, snapshot) => MaterialApp(
|
||||||
themeMode: themeMode,
|
onGenerateTitle: (context) => AppLocalizations.of(context)!.appTitle,
|
||||||
initialRoute: Splash.routeName,
|
theme: buildLightTheme(),
|
||||||
onGenerateRoute: _onGenerateRoute,
|
darkTheme: buildDarkTheme(),
|
||||||
navigatorObservers: <NavigatorObserver>[MyApp.routeObserver],
|
themeMode: themeMode,
|
||||||
navigatorKey: _navigatorKey,
|
initialRoute: Splash.routeName,
|
||||||
scaffoldMessengerKey: _scaffoldMessengerKey,
|
onGenerateRoute: _onGenerateRoute,
|
||||||
locale: language_util.getSelectedLocale(),
|
navigatorObservers: <NavigatorObserver>[MyApp.routeObserver],
|
||||||
localizationsDelegates: AppLocalizations.localizationsDelegates,
|
navigatorKey: _navigatorKey,
|
||||||
supportedLocales: const <Locale>[
|
scaffoldMessengerKey: _scaffoldMessengerKey,
|
||||||
// the order here doesn't matter, except for the first one, which must
|
locale: snapshot.requireData.locale,
|
||||||
// be en
|
localizationsDelegates: AppLocalizations.localizationsDelegates,
|
||||||
Locale("en"),
|
supportedLocales: const <Locale>[
|
||||||
Locale("el"),
|
// the order here doesn't matter, except for the first one, which must
|
||||||
Locale("es"),
|
// be en
|
||||||
Locale("fr"),
|
Locale("en"),
|
||||||
Locale("ru"),
|
Locale("el"),
|
||||||
Locale("de"),
|
Locale("es"),
|
||||||
Locale("cs"),
|
Locale("fr"),
|
||||||
Locale("fi"),
|
Locale("ru"),
|
||||||
Locale("pl"),
|
Locale("de"),
|
||||||
Locale("pt"),
|
Locale("cs"),
|
||||||
Locale.fromSubtags(languageCode: "zh", scriptCode: "Hans"),
|
Locale("fi"),
|
||||||
Locale.fromSubtags(languageCode: "zh", scriptCode: "Hant"),
|
Locale("pl"),
|
||||||
],
|
Locale("pt"),
|
||||||
builder: (context, child) {
|
Locale.fromSubtags(languageCode: "zh", scriptCode: "Hans"),
|
||||||
MyApp._globalContext = context;
|
Locale.fromSubtags(languageCode: "zh", scriptCode: "Hant"),
|
||||||
return child!;
|
],
|
||||||
},
|
builder: (context, child) {
|
||||||
debugShowCheckedModeBanner: false,
|
MyApp._globalContext = context;
|
||||||
scrollBehavior: const _MyScrollBehavior(),
|
return child!;
|
||||||
|
},
|
||||||
|
debugShowCheckedModeBanner: false,
|
||||||
|
scrollBehavior: const _MyScrollBehavior(),
|
||||||
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -147,7 +151,6 @@ class _WrappedAppState extends State<_WrappedApp>
|
||||||
SnackBarManager().unregisterHandler(this);
|
SnackBarManager().unregisterHandler(this);
|
||||||
NavigationManager().unsetHandler(this);
|
NavigationManager().unsetHandler(this);
|
||||||
_themeChangedListener.end();
|
_themeChangedListener.end();
|
||||||
_langChangedListener.end();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
|
@ -171,6 +174,7 @@ class _WrappedAppState extends State<_WrappedApp>
|
||||||
builder: (context) => const legacy.SignIn(),
|
builder: (context) => const legacy.SignIn(),
|
||||||
),
|
),
|
||||||
CollectionPicker.routeName: CollectionPicker.buildRoute,
|
CollectionPicker.routeName: CollectionPicker.buildRoute,
|
||||||
|
LanguageSettings.routeName: LanguageSettings.buildRoute,
|
||||||
};
|
};
|
||||||
|
|
||||||
Route<dynamic>? _onGenerateRoute(RouteSettings settings) {
|
Route<dynamic>? _onGenerateRoute(RouteSettings settings) {
|
||||||
|
@ -211,10 +215,6 @@ class _WrappedAppState extends State<_WrappedApp>
|
||||||
setState(() {});
|
setState(() {});
|
||||||
}
|
}
|
||||||
|
|
||||||
void _onLangChangedEvent(LanguageChangedEvent ev) {
|
|
||||||
setState(() {});
|
|
||||||
}
|
|
||||||
|
|
||||||
Route<dynamic>? _handleBasicRoute(RouteSettings settings) {
|
Route<dynamic>? _handleBasicRoute(RouteSettings settings) {
|
||||||
for (final e in _getRouter().entries) {
|
for (final e in _getRouter().entries) {
|
||||||
if (e.key == settings.name) {
|
if (e.key == settings.name) {
|
||||||
|
@ -604,7 +604,6 @@ class _WrappedAppState extends State<_WrappedApp>
|
||||||
final _navigatorKey = GlobalKey<NavigatorState>();
|
final _navigatorKey = GlobalKey<NavigatorState>();
|
||||||
|
|
||||||
late AppEventListener<ThemeChangedEvent> _themeChangedListener;
|
late AppEventListener<ThemeChangedEvent> _themeChangedListener;
|
||||||
late AppEventListener<LanguageChangedEvent> _langChangedListener;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
class _MyScrollBehavior extends MaterialScrollBehavior {
|
class _MyScrollBehavior extends MaterialScrollBehavior {
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
import 'dart:async';
|
import 'dart:async';
|
||||||
|
|
||||||
import 'package:event_bus/event_bus.dart';
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:kiwi/kiwi.dart';
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||||
import 'package:logging/logging.dart';
|
import 'package:logging/logging.dart';
|
||||||
import 'package:nc_photos/account.dart';
|
import 'package:nc_photos/account.dart';
|
||||||
import 'package:nc_photos/app_localizations.dart';
|
import 'package:nc_photos/app_localizations.dart';
|
||||||
|
import 'package:nc_photos/controller/pref_controller.dart';
|
||||||
import 'package:nc_photos/debug_util.dart';
|
import 'package:nc_photos/debug_util.dart';
|
||||||
import 'package:nc_photos/event/event.dart';
|
import 'package:nc_photos/event/event.dart';
|
||||||
import 'package:nc_photos/exception_util.dart' as exception_util;
|
import 'package:nc_photos/exception_util.dart' as exception_util;
|
||||||
|
@ -19,6 +19,7 @@ import 'package:nc_photos/platform/notification.dart';
|
||||||
import 'package:nc_photos/pref.dart';
|
import 'package:nc_photos/pref.dart';
|
||||||
import 'package:nc_photos/service.dart';
|
import 'package:nc_photos/service.dart';
|
||||||
import 'package:nc_photos/snack_bar_manager.dart';
|
import 'package:nc_photos/snack_bar_manager.dart';
|
||||||
|
import 'package:nc_photos/stream_util.dart';
|
||||||
import 'package:nc_photos/url_launcher_util.dart';
|
import 'package:nc_photos/url_launcher_util.dart';
|
||||||
import 'package:nc_photos/widget/fancy_option_picker.dart';
|
import 'package:nc_photos/widget/fancy_option_picker.dart';
|
||||||
import 'package:nc_photos/widget/gps_map.dart';
|
import 'package:nc_photos/widget/gps_map.dart';
|
||||||
|
@ -27,6 +28,7 @@ import 'package:nc_photos/widget/list_tile_center_leading.dart';
|
||||||
import 'package:nc_photos/widget/root_picker.dart';
|
import 'package:nc_photos/widget/root_picker.dart';
|
||||||
import 'package:nc_photos/widget/settings/developer_settings.dart';
|
import 'package:nc_photos/widget/settings/developer_settings.dart';
|
||||||
import 'package:nc_photos/widget/settings/expert_settings.dart';
|
import 'package:nc_photos/widget/settings/expert_settings.dart';
|
||||||
|
import 'package:nc_photos/widget/settings/language_settings.dart';
|
||||||
import 'package:nc_photos/widget/settings/theme_settings.dart';
|
import 'package:nc_photos/widget/settings/theme_settings.dart';
|
||||||
import 'package:nc_photos/widget/share_folder_picker.dart';
|
import 'package:nc_photos/widget/share_folder_picker.dart';
|
||||||
import 'package:nc_photos/widget/simple_input_dialog.dart';
|
import 'package:nc_photos/widget/simple_input_dialog.dart';
|
||||||
|
@ -104,13 +106,18 @@ class _SettingsState extends State<Settings> {
|
||||||
SliverList(
|
SliverList(
|
||||||
delegate: SliverChildListDelegate(
|
delegate: SliverChildListDelegate(
|
||||||
[
|
[
|
||||||
ListTile(
|
ValueStreamBuilder<language_util.AppLanguage>(
|
||||||
leading: const ListTileCenterLeading(
|
stream: context.read<PrefController>().language,
|
||||||
child: Icon(Icons.translate_outlined),
|
builder: (context, snapshot) => ListTile(
|
||||||
|
leading: const ListTileCenterLeading(
|
||||||
|
child: Icon(Icons.translate_outlined),
|
||||||
|
),
|
||||||
|
title: Text(L10n.global().settingsLanguageTitle),
|
||||||
|
subtitle: Text(snapshot.requireData.nativeName),
|
||||||
|
onTap: () {
|
||||||
|
Navigator.of(context).pushNamed(LanguageSettings.routeName);
|
||||||
|
},
|
||||||
),
|
),
|
||||||
title: Text(L10n.global().settingsLanguageTitle),
|
|
||||||
subtitle: Text(language_util.getSelectedLanguage().nativeName),
|
|
||||||
onTap: () => _onLanguageTap(context),
|
|
||||||
),
|
),
|
||||||
SwitchListTile(
|
SwitchListTile(
|
||||||
title: Text(L10n.global().settingsExifSupportTitle),
|
title: Text(L10n.global().settingsExifSupportTitle),
|
||||||
|
@ -270,35 +277,6 @@ class _SettingsState extends State<Settings> {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
void _onLanguageTap(BuildContext context) {
|
|
||||||
final selected =
|
|
||||||
Pref().getLanguageOr(language_util.supportedLanguages[0]!.langId);
|
|
||||||
showDialog(
|
|
||||||
context: context,
|
|
||||||
builder: (context) => FancyOptionPicker(
|
|
||||||
items: language_util.supportedLanguages.values
|
|
||||||
.map((lang) => FancyOptionPickerItem(
|
|
||||||
label: lang.nativeName,
|
|
||||||
description: lang.isoName,
|
|
||||||
isSelected: lang.langId == selected,
|
|
||||||
onSelect: () {
|
|
||||||
_log.info(
|
|
||||||
"[_onLanguageTap] Set language: ${lang.nativeName}");
|
|
||||||
Navigator.of(context).pop(lang.langId);
|
|
||||||
},
|
|
||||||
dense: true,
|
|
||||||
))
|
|
||||||
.toList(),
|
|
||||||
),
|
|
||||||
).then((value) {
|
|
||||||
if (value != null) {
|
|
||||||
Pref().setLanguage(value).then((_) {
|
|
||||||
KiwiContainer().resolve<EventBus>().fire(LanguageChangedEvent());
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
void _onExifSupportChanged(BuildContext context, bool value) {
|
void _onExifSupportChanged(BuildContext context, bool value) {
|
||||||
if (value) {
|
if (value) {
|
||||||
showDialog(
|
showDialog(
|
||||||
|
|
60
app/lib/widget/settings/language/bloc.dart
Normal file
60
app/lib/widget/settings/language/bloc.dart
Normal file
|
@ -0,0 +1,60 @@
|
||||||
|
part of '../language_settings.dart';
|
||||||
|
|
||||||
|
@npLog
|
||||||
|
class _Bloc extends Bloc<_Event, _State> implements BlocTag {
|
||||||
|
_Bloc({
|
||||||
|
required this.prefController,
|
||||||
|
}) : super(_State.init(
|
||||||
|
selected: prefController.language.value,
|
||||||
|
)) {
|
||||||
|
on<_Init>(_onInit);
|
||||||
|
on<_SelectLanguage>(_onSelectLanguage);
|
||||||
|
on<_SetError>(_onSetError);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get tag => _log.fullName;
|
||||||
|
|
||||||
|
@override
|
||||||
|
void onError(Object error, StackTrace stackTrace) {
|
||||||
|
// we need this to prevent onError being triggered recursively
|
||||||
|
if (!isClosed && !_isHandlingError) {
|
||||||
|
_isHandlingError = true;
|
||||||
|
try {
|
||||||
|
add(_SetError(error, stackTrace));
|
||||||
|
} catch (_) {}
|
||||||
|
_isHandlingError = false;
|
||||||
|
}
|
||||||
|
super.onError(error, stackTrace);
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _onInit(_Init ev, Emitter<_State> emit) {
|
||||||
|
_log.info(ev);
|
||||||
|
return emit.forEach<language_util.AppLanguage>(
|
||||||
|
prefController.language,
|
||||||
|
onData: (data) => state.copyWith(
|
||||||
|
selected: data,
|
||||||
|
),
|
||||||
|
onError: (e, stackTrace) {
|
||||||
|
_log.severe("[_onInit] Uncaught exception", e, stackTrace);
|
||||||
|
return state.copyWith(
|
||||||
|
error: ExceptionEvent(e, stackTrace),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
void _onSelectLanguage(_SelectLanguage ev, Emitter<_State> emit) {
|
||||||
|
_log.info(ev);
|
||||||
|
prefController.setAppLanguage(ev.lang);
|
||||||
|
}
|
||||||
|
|
||||||
|
void _onSetError(_SetError ev, Emitter<_State> emit) {
|
||||||
|
_log.info(ev);
|
||||||
|
emit(state.copyWith(error: ExceptionEvent(ev.error, ev.stackTrace)));
|
||||||
|
}
|
||||||
|
|
||||||
|
final PrefController prefController;
|
||||||
|
|
||||||
|
var _isHandlingError = false;
|
||||||
|
}
|
58
app/lib/widget/settings/language/state_event.dart
Normal file
58
app/lib/widget/settings/language/state_event.dart
Normal file
|
@ -0,0 +1,58 @@
|
||||||
|
part of '../language_settings.dart';
|
||||||
|
|
||||||
|
@genCopyWith
|
||||||
|
@toString
|
||||||
|
class _State {
|
||||||
|
const _State({
|
||||||
|
required this.selected,
|
||||||
|
this.error,
|
||||||
|
});
|
||||||
|
|
||||||
|
factory _State.init({
|
||||||
|
required language_util.AppLanguage selected,
|
||||||
|
}) {
|
||||||
|
return _State(
|
||||||
|
selected: selected,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
String toString() => _$toString();
|
||||||
|
|
||||||
|
final language_util.AppLanguage selected;
|
||||||
|
|
||||||
|
final ExceptionEvent? error;
|
||||||
|
}
|
||||||
|
|
||||||
|
abstract class _Event {
|
||||||
|
const _Event();
|
||||||
|
}
|
||||||
|
|
||||||
|
@toString
|
||||||
|
class _Init implements _Event {
|
||||||
|
const _Init();
|
||||||
|
|
||||||
|
@override
|
||||||
|
String toString() => _$toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
@toString
|
||||||
|
class _SelectLanguage implements _Event {
|
||||||
|
const _SelectLanguage(this.lang);
|
||||||
|
|
||||||
|
@override
|
||||||
|
String toString() => _$toString();
|
||||||
|
|
||||||
|
final language_util.AppLanguage lang;
|
||||||
|
}
|
||||||
|
|
||||||
|
@toString
|
||||||
|
class _SetError implements _Event {
|
||||||
|
const _SetError(this.error, [this.stackTrace]);
|
||||||
|
|
||||||
|
@override
|
||||||
|
String toString() => _$toString();
|
||||||
|
|
||||||
|
final Object error;
|
||||||
|
final StackTrace? stackTrace;
|
||||||
|
}
|
110
app/lib/widget/settings/language_settings.dart
Normal file
110
app/lib/widget/settings/language_settings.dart
Normal file
|
@ -0,0 +1,110 @@
|
||||||
|
import 'package:copy_with/copy_with.dart';
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||||
|
import 'package:logging/logging.dart';
|
||||||
|
import 'package:nc_photos/app_localizations.dart';
|
||||||
|
import 'package:nc_photos/bloc_util.dart';
|
||||||
|
import 'package:nc_photos/controller/pref_controller.dart';
|
||||||
|
import 'package:nc_photos/exception_event.dart';
|
||||||
|
import 'package:nc_photos/exception_util.dart' as exception_util;
|
||||||
|
import 'package:nc_photos/k.dart' as k;
|
||||||
|
import 'package:nc_photos/language_util.dart' as language_util;
|
||||||
|
import 'package:nc_photos/snack_bar_manager.dart';
|
||||||
|
import 'package:nc_photos/widget/fancy_option_picker.dart';
|
||||||
|
import 'package:nc_photos/widget/page_visibility_mixin.dart';
|
||||||
|
import 'package:np_codegen/np_codegen.dart';
|
||||||
|
import 'package:to_string/to_string.dart';
|
||||||
|
|
||||||
|
part 'language/bloc.dart';
|
||||||
|
part 'language/state_event.dart';
|
||||||
|
part 'language_settings.g.dart';
|
||||||
|
|
||||||
|
typedef _BlocBuilder = BlocBuilder<_Bloc, _State>;
|
||||||
|
typedef _BlocListener = BlocListener<_Bloc, _State>;
|
||||||
|
|
||||||
|
class LanguageSettings extends StatelessWidget {
|
||||||
|
static const routeName = "/language-settings";
|
||||||
|
|
||||||
|
static Route buildRoute() => MaterialPageRoute(
|
||||||
|
builder: (_) => const LanguageSettings(),
|
||||||
|
);
|
||||||
|
|
||||||
|
const LanguageSettings({super.key});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return BlocProvider(
|
||||||
|
create: (_) => _Bloc(
|
||||||
|
prefController: context.read(),
|
||||||
|
),
|
||||||
|
child: const _WrappedLanguageSettings(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class _WrappedLanguageSettings extends StatefulWidget {
|
||||||
|
const _WrappedLanguageSettings();
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<StatefulWidget> createState() => _WrappedLanguageSettingsState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _WrappedLanguageSettingsState extends State<_WrappedLanguageSettings>
|
||||||
|
with RouteAware, PageVisibilityMixin {
|
||||||
|
@override
|
||||||
|
void initState() {
|
||||||
|
super.initState();
|
||||||
|
context.read<_Bloc>().add(const _Init());
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return MultiBlocListener(
|
||||||
|
listeners: [
|
||||||
|
_BlocListener(
|
||||||
|
listenWhen: (previous, current) => previous.error != current.error,
|
||||||
|
listener: (context, state) {
|
||||||
|
if (state.error != null && isPageVisible()) {
|
||||||
|
SnackBarManager().showSnackBar(SnackBar(
|
||||||
|
content: Text(exception_util.toUserString(state.error!.error)),
|
||||||
|
duration: k.snackBarDurationNormal,
|
||||||
|
));
|
||||||
|
}
|
||||||
|
},
|
||||||
|
),
|
||||||
|
],
|
||||||
|
child: Scaffold(
|
||||||
|
appBar: AppBar(
|
||||||
|
title: _BlocBuilder(
|
||||||
|
buildWhen: (previous, current) =>
|
||||||
|
previous.selected != current.selected,
|
||||||
|
builder: (context, state) =>
|
||||||
|
Text(L10n.global().settingsLanguageTitle),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
body: _BlocBuilder(
|
||||||
|
buildWhen: (previous, current) =>
|
||||||
|
previous.selected != current.selected,
|
||||||
|
builder: (context, state) {
|
||||||
|
final langs = language_util.supportedLanguages.values.toList();
|
||||||
|
return ListView.builder(
|
||||||
|
itemCount: langs.length,
|
||||||
|
itemBuilder: (context, index) {
|
||||||
|
final lang = langs[index];
|
||||||
|
return FancyOptionPickerItemView(
|
||||||
|
label: lang.nativeName,
|
||||||
|
description: lang.isoName,
|
||||||
|
isSelected: lang.langId == state.selected.langId,
|
||||||
|
onSelect: () {
|
||||||
|
context.read<_Bloc>().add(_SelectLanguage(lang));
|
||||||
|
},
|
||||||
|
dense: true,
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
78
app/lib/widget/settings/language_settings.g.dart
Normal file
78
app/lib/widget/settings/language_settings.g.dart
Normal file
|
@ -0,0 +1,78 @@
|
||||||
|
// GENERATED CODE - DO NOT MODIFY BY HAND
|
||||||
|
|
||||||
|
part of 'language_settings.dart';
|
||||||
|
|
||||||
|
// **************************************************************************
|
||||||
|
// CopyWithLintRuleGenerator
|
||||||
|
// **************************************************************************
|
||||||
|
|
||||||
|
// ignore_for_file: library_private_types_in_public_api, duplicate_ignore
|
||||||
|
|
||||||
|
// **************************************************************************
|
||||||
|
// CopyWithGenerator
|
||||||
|
// **************************************************************************
|
||||||
|
|
||||||
|
abstract class $_StateCopyWithWorker {
|
||||||
|
_State call({language_util.AppLanguage? selected, ExceptionEvent? error});
|
||||||
|
}
|
||||||
|
|
||||||
|
class _$_StateCopyWithWorkerImpl implements $_StateCopyWithWorker {
|
||||||
|
_$_StateCopyWithWorkerImpl(this.that);
|
||||||
|
|
||||||
|
@override
|
||||||
|
_State call({dynamic selected, dynamic error = copyWithNull}) {
|
||||||
|
return _State(
|
||||||
|
selected: selected as language_util.AppLanguage? ?? that.selected,
|
||||||
|
error: error == copyWithNull ? that.error : error as ExceptionEvent?);
|
||||||
|
}
|
||||||
|
|
||||||
|
final _State that;
|
||||||
|
}
|
||||||
|
|
||||||
|
extension $_StateCopyWith on _State {
|
||||||
|
$_StateCopyWithWorker get copyWith => _$copyWith;
|
||||||
|
$_StateCopyWithWorker get _$copyWith => _$_StateCopyWithWorkerImpl(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
// **************************************************************************
|
||||||
|
// NpLogGenerator
|
||||||
|
// **************************************************************************
|
||||||
|
|
||||||
|
extension _$_BlocNpLog on _Bloc {
|
||||||
|
// ignore: unused_element
|
||||||
|
Logger get _log => log;
|
||||||
|
|
||||||
|
static final log = Logger("widget.settings.language_settings._Bloc");
|
||||||
|
}
|
||||||
|
|
||||||
|
// **************************************************************************
|
||||||
|
// ToStringGenerator
|
||||||
|
// **************************************************************************
|
||||||
|
|
||||||
|
extension _$_StateToString on _State {
|
||||||
|
String _$toString() {
|
||||||
|
// ignore: unnecessary_string_interpolations
|
||||||
|
return "_State {selected: $selected, error: $error}";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
extension _$_InitToString on _Init {
|
||||||
|
String _$toString() {
|
||||||
|
// ignore: unnecessary_string_interpolations
|
||||||
|
return "_Init {}";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
extension _$_SelectLanguageToString on _SelectLanguage {
|
||||||
|
String _$toString() {
|
||||||
|
// ignore: unnecessary_string_interpolations
|
||||||
|
return "_SelectLanguage {lang: $lang}";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
extension _$_SetErrorToString on _SetError {
|
||||||
|
String _$toString() {
|
||||||
|
// ignore: unnecessary_string_interpolations
|
||||||
|
return "_SetError {error: $error, stackTrace: $stackTrace}";
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in a new issue