debuggerx/dde_gesture_manager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

feat: use CheckedPopupMenuItem instead of PopupMenuItem; use DefaultTextStyle to reduce duplicate code.

Browse Source
This commit is contained in:
DebuggerX
2021-10-13 15:05:57 +08:00
parent 6df7543262
commit bc2b514392
5 changed files with 58 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/lib/widgets/language_switcher.dart
+23 -29
View File
@@ -1,4 +1,3 @@
import 'package:collection/collection.dart';
import 'package:dde_gesture_manager/constants/sp_keys.dart';
import 'package:dde_gesture_manager/constants/supported_locales.dart';
import 'package:dde_gesture_manager/extensions.dart';
@@ -6,7 +5,6 @@ import 'package:dde_gesture_manager/generated/codegen_loader.g.dart';
import 'package:dde_gesture_manager/generated/locale_keys.g.dart';
import 'package:dde_gesture_manager/models/local_schemes_provider.dart';
import 'package:dde_gesture_manager/utils/helper.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:window_manager/window_manager.dart';
@@ -18,7 +16,7 @@ class LanguageSwitcher extends StatelessWidget {
@override
Widget build(BuildContext context) {
var _locale = EasyLocalization.of(context)?.currentLocale;
var _supportedLocale = supportedLocales.firstWhereOrNull((element) => element == _locale);
var _supportedLocale = getSupportedLocale(_locale) ?? SupportedLocale.zh_CN;
return PopupMenuButton<SupportedLocale>(
tooltip: LocaleKeys.language_tip.tr(),
@@ -31,33 +29,29 @@ class LanguageSwitcher extends StatelessWidget {
),
],
),
itemBuilder: (BuildContext context) => supportedLocales
initialValue: _supportedLocale,
onSelected: (value) {
EasyLocalization.of(context)?.setLocale(transformSupportedLocale(value)).then((_) {
var localeMap = Translations(CodegenLoader.mapLocales[context.locale.toString()]!);
if (!kIsWeb) WindowManager.instance.setTitle(localeMap.get(LocaleKeys.app_name)!);
var localSchemesProvider = context.read<LocalSchemesProvider>();
var schemes = localSchemesProvider.schemes!;
var newSchemes = [
schemes.first
..scheme.name = localeMap.get(LocaleKeys.local_manager_default_scheme_label)
..scheme.description = localeMap.get(LocaleKeys.local_manager_default_scheme_description),
...schemes.skip(1),
];
localSchemesProvider.setProps(schemes: newSchemes);
});
H().sp.setInt(SPKeys.userLanguage, value.index);
},
itemBuilder: (BuildContext context) => SupportedLocale.values
.map(
(locale) => PopupMenuItem(
value: SupportedLocale.zh_CN,
child: ListTile(
leading: Visibility(
child: Icon(CupertinoIcons.check_mark),
visible: _supportedLocale == locale,
),
title: Text(supportedLocaleNames[SupportedLocale.values[supportedLocales.indexOf(locale)]] ?? ''),
),
onTap: () {
EasyLocalization.of(context)?.setLocale(locale).then((_) {
var localeMap = Translations(CodegenLoader.mapLocales[context.locale.toString()]!);
if (!kIsWeb) WindowManager.instance.setTitle(localeMap.get(LocaleKeys.app_name)!);
var localSchemesProvider = context.read<LocalSchemesProvider>();
var schemes = localSchemesProvider.schemes!;
var newSchemes = [
schemes.first
..scheme.name = localeMap.get(LocaleKeys.local_manager_default_scheme_label)
..scheme.description = localeMap.get(LocaleKeys.local_manager_default_scheme_description),
...schemes.skip(1),
];
localSchemesProvider.setProps(schemes: newSchemes);
});
H().sp.setInt(SPKeys.userLanguage, supportedLocales.indexOf(locale));
},
(supportedLocale) => CheckedPopupMenuItem(
value: supportedLocale,
checked: EasyLocalization.of(context)?.locale == transformSupportedLocale(supportedLocale),
child: Text(supportedLocaleNames[supportedLocale] ?? ''),
),
)
.toList(),
app/lib/widgets/theme_switcher.dart
+14 -26
View File
@@ -11,7 +11,7 @@ class ThemeSwitcher extends StatelessWidget {
@override
Widget build(BuildContext context) {
var _brightnessMode = context.watch<ConfigsProvider>().brightnessMode;
return PopupMenuButton(
return PopupMenuButton<BrightnessMode>(
initialValue: _brightnessMode,
child: Row(
children: [
@@ -23,35 +23,23 @@ class ThemeSwitcher extends StatelessWidget {
],
),
padding: EdgeInsets.zero,
onSelected: (value) => context.read<ConfigsProvider>().setProps(brightnessMode: value),
tooltip: LocaleKeys.theme_tip.tr(),
itemBuilder: (BuildContext context) => [
PopupMenuItem<BrightnessMode>(
child: ListTile(
leading: Visibility(
child: Icon(CupertinoIcons.check_mark),
visible: _brightnessMode == BrightnessMode.system,
),
title: Text(LocaleKeys.theme_system).tr(),
),
onTap: () => context.read<ConfigsProvider>().setProps(brightnessMode: BrightnessMode.system),
CheckedPopupMenuItem<BrightnessMode>(
child: Text(LocaleKeys.theme_system).tr(),
checked: _brightnessMode == BrightnessMode.system,
value: BrightnessMode.system,
),
PopupMenuItem<BrightnessMode>(
child: ListTile(
leading: Visibility(
child: Icon(CupertinoIcons.check_mark),
visible: _brightnessMode == BrightnessMode.light,
),
title: Text(LocaleKeys.theme_light).tr()),
onTap: () => context.read<ConfigsProvider>().setProps(brightnessMode: BrightnessMode.light),
CheckedPopupMenuItem<BrightnessMode>(
child: Text(LocaleKeys.theme_light).tr(),
checked: _brightnessMode == BrightnessMode.light,
value: BrightnessMode.light,
),
PopupMenuItem<BrightnessMode>(
child: ListTile(
leading: Visibility(
child: Icon(CupertinoIcons.check_mark),
visible: _brightnessMode == BrightnessMode.dark,
),
title: Text(LocaleKeys.theme_dark).tr()),
onTap: () => context.read<ConfigsProvider>().setProps(brightnessMode: BrightnessMode.dark),
CheckedPopupMenuItem<BrightnessMode>(
child: Text(LocaleKeys.theme_dark).tr(),
checked: _brightnessMode == BrightnessMode.dark,
value: BrightnessMode.dark,
),
],
);