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
pull/3/head
DebuggerX 4 years ago
parent 6df7543262
commit bc2b514392
5 changed files with 58 additions and 83 deletions
Show Stats Download Patch File Download Diff File

4
app/lib/constants/supported_locales.dart
Unescape View File

@ -18,5 +18,7 @@ const supportedLocaleNames = {
SupportedLocale.en: 'English', SupportedLocale.en: 'English',
}; };
Locale getSupportedLocale(SupportedLocale supportedLocale) => supportedLocales[supportedLocale.index]; Locale transformSupportedLocale(SupportedLocale supportedLocale) => supportedLocales[supportedLocale.index];
SupportedLocale? getSupportedLocale(Locale? locale) =>
supportedLocales.contains(locale) ? SupportedLocale.values[supportedLocales.indexOf(locale!)] : null;

28
app/lib/pages/gesture_editor.dart
Unescape View File

@ -167,7 +167,7 @@ List<DDataRow> _buildDataRows(List<GestureProp>? gestures, BuildContext context)
} }
}, },
selected: selected, selected: selected,
cells: editing ? _buildRowCellsEditing(gesture) : _buildRowCellsNormal(selected, gesture), cells: editing ? _buildRowCellsEditing(gesture) : _buildRowCellsNormal(context, selected, gesture),
); );
}).toList(); }).toList();
@ -180,51 +180,37 @@ List<DDataCell> _buildRowCellsEditing(GestureProp gesture) => [
TextField(controller: TextEditingController(text: gesture.remark)), TextField(controller: TextEditingController(text: gesture.remark)),
].map((e) => DDataCell(e)).toList(); ].map((e) => DDataCell(e)).toList();
List<DDataCell> _buildRowCellsNormal(bool selected, GestureProp gesture) => [ List<DDataCell> _buildRowCellsNormal(BuildContext context, bool selected, GestureProp gesture) => [
Center( Center(
child: Text( child: Text(
'${LocaleKeys.gesture_editor_gestures}.${H.getGestureName(gesture.gesture)}', '${LocaleKeys.gesture_editor_gestures}.${H.getGestureName(gesture.gesture)}',
style: TextStyle(
color: selected ? Colors.white : null,
),
).tr(), ).tr(),
), ),
Center( Center(
child: Text( child: Text(
'${LocaleKeys.gesture_editor_directions}.${H.getGestureDirectionName(gesture.direction)}', '${LocaleKeys.gesture_editor_directions}.${H.getGestureDirectionName(gesture.direction)}',
style: TextStyle(
color: selected ? Colors.white : null,
),
).tr()), ).tr()),
Center( Center(
child: Text( child: Text(
'${gesture.fingers}', '${gesture.fingers}',
style: TextStyle(
color: selected ? Colors.white : null,
),
), ),
), ),
Center( Center(
child: Text( child: Text(
'${LocaleKeys.gesture_editor_types}.${H.getGestureTypeName(gesture.type)}', '${LocaleKeys.gesture_editor_types}.${H.getGestureTypeName(gesture.type)}',
style: TextStyle(
color: selected ? Colors.white : null,
),
).tr()), ).tr()),
Text( Text(
gesture.command ?? '', gesture.command ?? '',
style: TextStyle(
color: selected ? Colors.white : null,
),
), ),
Text( Text(
gesture.remark ?? '', gesture.remark ?? '',
style: TextStyle(
color: selected ? Colors.white : null,
),
), ),
] ]
.map( .map(
(ele) => DDataCell(ele), (ele) => DDataCell(DefaultTextStyle(
style: context.t.textTheme.bodyText2!.copyWith(
color: selected ? Colors.white : null,
),
child: ele)),
) )
.toList(); .toList();

17
app/lib/pages/local_manager.dart
Unescape View File

@ -123,12 +123,17 @@ class _LocalManagerState extends State<LocalManager> {
color: _getItemBackgroundColor(index), color: _getItemBackgroundColor(index),
child: Padding( child: Padding(
padding: const EdgeInsets.only(left: 6, right: 12.0), padding: const EdgeInsets.only(left: 6, right: 12.0),
child: Row( child: DefaultTextStyle(
mainAxisAlignment: MainAxisAlignment.spaceBetween, style: context.t.textTheme.bodyText2!.copyWith(
children: [ color: _selectedIndex == index ? Colors.white : null,
Text(localSchemes[index].scheme.name ?? ''), ),
Text('456'), child: Row(
], mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(localSchemes[index].scheme.name ?? ''),
Text('456'),
],
),
), ),
), ),
), ),

52
app/lib/widgets/language_switcher.dart
Unescape 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/sp_keys.dart';
import 'package:dde_gesture_manager/constants/supported_locales.dart'; import 'package:dde_gesture_manager/constants/supported_locales.dart';
import 'package:dde_gesture_manager/extensions.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/generated/locale_keys.g.dart';
import 'package:dde_gesture_manager/models/local_schemes_provider.dart'; import 'package:dde_gesture_manager/models/local_schemes_provider.dart';
import 'package:dde_gesture_manager/utils/helper.dart'; import 'package:dde_gesture_manager/utils/helper.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:window_manager/window_manager.dart'; import 'package:window_manager/window_manager.dart';
@ -18,7 +16,7 @@ class LanguageSwitcher extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
var _locale = EasyLocalization.of(context)?.currentLocale; var _locale = EasyLocalization.of(context)?.currentLocale;
var _supportedLocale = supportedLocales.firstWhereOrNull((element) => element == _locale); var _supportedLocale = getSupportedLocale(_locale) ?? SupportedLocale.zh_CN;
return PopupMenuButton<SupportedLocale>( return PopupMenuButton<SupportedLocale>(
tooltip: LocaleKeys.language_tip.tr(), 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( .map(
(locale) => PopupMenuItem( (supportedLocale) => CheckedPopupMenuItem(
value: SupportedLocale.zh_CN, value: supportedLocale,
child: ListTile( checked: EasyLocalization.of(context)?.locale == transformSupportedLocale(supportedLocale),
leading: Visibility( child: Text(supportedLocaleNames[supportedLocale] ?? ''),
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));
},
), ),
) )
.toList(), .toList(),

40
app/lib/widgets/theme_switcher.dart
Unescape View File

@ -11,7 +11,7 @@ class ThemeSwitcher extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
var _brightnessMode = context.watch<ConfigsProvider>().brightnessMode; var _brightnessMode = context.watch<ConfigsProvider>().brightnessMode;
return PopupMenuButton( return PopupMenuButton<BrightnessMode>(
initialValue: _brightnessMode, initialValue: _brightnessMode,
child: Row( child: Row(
children: [ children: [
@ -23,35 +23,23 @@ class ThemeSwitcher extends StatelessWidget {
], ],
), ),
padding: EdgeInsets.zero, padding: EdgeInsets.zero,
onSelected: (value) => context.read<ConfigsProvider>().setProps(brightnessMode: value),
tooltip: LocaleKeys.theme_tip.tr(), tooltip: LocaleKeys.theme_tip.tr(),
itemBuilder: (BuildContext context) => [ itemBuilder: (BuildContext context) => [
PopupMenuItem<BrightnessMode>( CheckedPopupMenuItem<BrightnessMode>(
child: ListTile( child: Text(LocaleKeys.theme_system).tr(),
leading: Visibility( checked: _brightnessMode == BrightnessMode.system,
child: Icon(CupertinoIcons.check_mark), value: BrightnessMode.system,
visible: _brightnessMode == BrightnessMode.system,
),
title: Text(LocaleKeys.theme_system).tr(),
),
onTap: () => context.read<ConfigsProvider>().setProps(brightnessMode: BrightnessMode.system),
), ),
PopupMenuItem<BrightnessMode>( CheckedPopupMenuItem<BrightnessMode>(
child: ListTile( child: Text(LocaleKeys.theme_light).tr(),
leading: Visibility( checked: _brightnessMode == BrightnessMode.light,
child: Icon(CupertinoIcons.check_mark), value: BrightnessMode.light,
visible: _brightnessMode == BrightnessMode.light,
),
title: Text(LocaleKeys.theme_light).tr()),
onTap: () => context.read<ConfigsProvider>().setProps(brightnessMode: BrightnessMode.light),
), ),
PopupMenuItem<BrightnessMode>( CheckedPopupMenuItem<BrightnessMode>(
child: ListTile( child: Text(LocaleKeys.theme_dark).tr(),
leading: Visibility( checked: _brightnessMode == BrightnessMode.dark,
child: Icon(CupertinoIcons.check_mark), value: BrightnessMode.dark,
visible: _brightnessMode == BrightnessMode.dark,
),
title: Text(LocaleKeys.theme_dark).tr()),
onTap: () => context.read<ConfigsProvider>().setProps(brightnessMode: BrightnessMode.dark),
), ),
], ],
); );

Write Preview
Loading…
Cancel
Save