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

wip: show error when scheme name conflict.

Browse Source
This commit is contained in:
DebuggerX
2021-12-14 18:47:21 +08:00
parent cbaf61f70b
commit 214b06cac8
5 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/lib/models/scheme.dart
+1 -1
View File
@@ -156,7 +156,7 @@ class Scheme {
this.gestures = [];
this.fromMarket = false;
this.uploaded = false;
this.name = 'new xxx';
this.name = LocaleKeys.str_new_scheme.tr();
}
SchemeTree buildSchemeTree() {
app/lib/pages/gesture_editor.dart
+5 -2
View File
@@ -274,8 +274,11 @@ class GestureEditor extends StatelessWidget {
schemeProvider.setProps(name: val);
var localSchemesProvider = context.read<LocalSchemesProvider>();
if (!localSchemesProvider.schemes!.every((element) => element.scheme.name != val)) {
/// show error info;
'duplicate name'.sout();
Notificator.error(
context,
title: LocaleKeys.info_scheme_name_conflict_title.tr(),
description: LocaleKeys.info_scheme_name_conflict_description.tr(),
);
return;
}
;
app/lib/pages/local_manager.dart
+18 -6
View File
@@ -56,8 +56,7 @@ class _LocalManagerState extends State<LocalManager> {
return _color;
}
Icon _getItemIcon(Scheme scheme, String? appliedId) {
if (scheme.id == appliedId) return Icon(Icons.done_rounded, size: 22);
Icon _getItemIcon(Scheme scheme) {
if (scheme.id == Uuid.NAMESPACE_NIL) return Icon(Icons.restore_rounded, size: 22);
if (scheme.fromMarket == true) return Icon(Icons.local_grocery_store_rounded, size: 20);
if (scheme.uploaded == true) return Icon(Icons.cloud_done_rounded, size: 18);
@@ -159,9 +158,22 @@ class _LocalManagerState extends State<LocalManager> {
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(localSchemes[index].scheme.name ?? ''),
_getItemIcon(localSchemes[index].scheme,
context.watch<ConfigsProvider>().appliedSchemeId),
Row(
children: [
Opacity(
opacity: context.watch<ConfigsProvider>().appliedSchemeId ==
localSchemes[index].scheme.id
? 1
: 0,
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 2.0),
child: Icon(Icons.done_rounded, size: 20),
),
),
Text(localSchemes[index].scheme.name ?? ''),
],
),
_getItemIcon(localSchemes[index].scheme),
],
),
),
@@ -204,7 +216,7 @@ class _LocalManagerState extends State<LocalManager> {
),
DButton.duplicate(enabled: _selectedItemPath.notNull),
DButton.apply(
enabled: _selectedItemPath.notNull,
enabled: true,
onTap: () {
var appliedId =
localSchemes.firstWhere((ele) => ele.path == _selectedItemPath).scheme.id!;