feat: save scheme gestures logic.
This commit is contained in:
@@ -1,5 +1,7 @@
|
|||||||
import 'package:dde_gesture_manager/models/scheme.dart';
|
import 'package:dde_gesture_manager/models/scheme.dart';
|
||||||
|
|
||||||
|
import 'local_schemes_provider.dart';
|
||||||
|
|
||||||
export 'local_schemes_web.dart' if (dart.library.io) 'local_schemes_linux.dart';
|
export 'local_schemes_web.dart' if (dart.library.io) 'local_schemes_linux.dart';
|
||||||
|
|
||||||
abstract class LocalSchemeEntry implements Comparable {
|
abstract class LocalSchemeEntry implements Comparable {
|
||||||
@@ -20,7 +22,7 @@ abstract class LocalSchemeEntry implements Comparable {
|
|||||||
/// max value of DateTime 
|
/// max value of DateTime 
|
||||||
this.lastModifyTime = DateTime.fromMillisecondsSinceEpoch(8640000000000000);
|
this.lastModifyTime = DateTime.fromMillisecondsSinceEpoch(8640000000000000);
|
||||||
|
|
||||||
save();
|
save(LocalSchemesProvider provider);
|
||||||
}
|
}
|
||||||
|
|
||||||
abstract class LocalSchemesInterface<T extends LocalSchemeEntry> {
|
abstract class LocalSchemesInterface<T extends LocalSchemeEntry> {
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import 'package:path/path.dart' show join;
|
|||||||
import 'package:path_provider/path_provider.dart';
|
import 'package:path_provider/path_provider.dart';
|
||||||
|
|
||||||
import 'local_schemes.dart';
|
import 'local_schemes.dart';
|
||||||
|
import 'local_schemes_provider.dart';
|
||||||
|
|
||||||
export 'local_schemes.dart';
|
export 'local_schemes.dart';
|
||||||
|
|
||||||
@@ -68,9 +69,11 @@ class LocalSchemeEntryLinux implements LocalSchemeEntry {
|
|||||||
this.lastModifyTime = DateTime.fromMillisecondsSinceEpoch(8640000000000000);
|
this.lastModifyTime = DateTime.fromMillisecondsSinceEpoch(8640000000000000);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
save() {
|
save(LocalSchemesProvider provider) {
|
||||||
var file = File(path);
|
var file = File(path);
|
||||||
file.writeAsStringSync(json.encode(scheme));
|
file.writeAsStringSync(JsonEncoder.withIndent(' ' * 4).convert(scheme));
|
||||||
|
provider.schemes!.firstWhere((ele) => ele.scheme.id == scheme.id).lastModifyTime = DateTime.now();
|
||||||
|
provider.setProps(schemes: [...provider.schemes!]..sort());
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import 'dart:html';
|
|||||||
|
|
||||||
import 'package:dde_gesture_manager/builder/provider_annotation.dart';
|
import 'package:dde_gesture_manager/builder/provider_annotation.dart';
|
||||||
import 'package:dde_gesture_manager/extensions.dart';
|
import 'package:dde_gesture_manager/extensions.dart';
|
||||||
|
import 'package:dde_gesture_manager/models/local_schemes_provider.dart';
|
||||||
import 'package:dde_gesture_manager/models/scheme.dart';
|
import 'package:dde_gesture_manager/models/scheme.dart';
|
||||||
|
|
||||||
import 'local_schemes.dart';
|
import 'local_schemes.dart';
|
||||||
@@ -68,7 +69,7 @@ class LocalSchemeEntryWeb implements LocalSchemeEntry {
|
|||||||
this.lastModifyTime = DateTime.fromMillisecondsSinceEpoch(8640000000000000);
|
this.lastModifyTime = DateTime.fromMillisecondsSinceEpoch(8640000000000000);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
save() {
|
save(LocalSchemesProvider provider) {
|
||||||
// TODO: implement save
|
// TODO: implement save
|
||||||
throw UnimplementedError();
|
throw UnimplementedError();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -116,6 +116,9 @@ class Scheme {
|
|||||||
@ProviderModelProp()
|
@ProviderModelProp()
|
||||||
String? id;
|
String? id;
|
||||||
|
|
||||||
|
@ProviderModelProp()
|
||||||
|
bool? readOnly;
|
||||||
|
|
||||||
@ProviderModelProp()
|
@ProviderModelProp()
|
||||||
String? name;
|
String? name;
|
||||||
|
|
||||||
@@ -129,6 +132,7 @@ class Scheme {
|
|||||||
if (scheme is String) scheme = json.decode(scheme);
|
if (scheme is String) scheme = json.decode(scheme);
|
||||||
assert(scheme is Map);
|
assert(scheme is Map);
|
||||||
id = scheme['id'] ?? Uuid().v1();
|
id = scheme['id'] ?? Uuid().v1();
|
||||||
|
readOnly = scheme['readOnly'] ?? false;
|
||||||
name = scheme['name'];
|
name = scheme['name'];
|
||||||
description = scheme['desc'];
|
description = scheme['desc'];
|
||||||
gestures = (scheme['gestures'] as List? ?? []).map<GestureProp>((ele) => GestureProp.parse(ele)).toList()..sort();
|
gestures = (scheme['gestures'] as List? ?? []).map<GestureProp>((ele) => GestureProp.parse(ele)).toList()..sort();
|
||||||
@@ -136,6 +140,7 @@ class Scheme {
|
|||||||
|
|
||||||
Scheme.systemDefault() {
|
Scheme.systemDefault() {
|
||||||
this.id = Uuid.NAMESPACE_NIL;
|
this.id = Uuid.NAMESPACE_NIL;
|
||||||
|
this.readOnly = true;
|
||||||
this.name = LocaleKeys.local_manager_default_scheme_label.tr();
|
this.name = LocaleKeys.local_manager_default_scheme_label.tr();
|
||||||
this.description = LocaleKeys.local_manager_default_scheme_description.tr();
|
this.description = LocaleKeys.local_manager_default_scheme_description.tr();
|
||||||
this.gestures = [];
|
this.gestures = [];
|
||||||
@@ -157,6 +162,7 @@ class Scheme {
|
|||||||
|
|
||||||
Map toJson() => {
|
Map toJson() => {
|
||||||
'id': id,
|
'id': id,
|
||||||
|
'readOnly': readOnly,
|
||||||
'name': name,
|
'name': name,
|
||||||
'desc': description,
|
'desc': description,
|
||||||
'gestures': gestures,
|
'gestures': gestures,
|
||||||
|
|||||||
@@ -126,14 +126,18 @@ class GestureEditor extends StatelessWidget {
|
|||||||
controller: horizontalCtrl,
|
controller: horizontalCtrl,
|
||||||
child: ConstrainedBox(
|
child: ConstrainedBox(
|
||||||
constraints: BoxConstraints(minWidth: constraints.maxWidth),
|
constraints: BoxConstraints(minWidth: constraints.maxWidth),
|
||||||
|
child: IgnorePointer(
|
||||||
|
ignoring: schemeProvider.readOnly ?? false,
|
||||||
child: DDataTable(
|
child: DDataTable(
|
||||||
showBottomBorder: true,
|
showBottomBorder: true,
|
||||||
headingRowHeight: _headingRowHeight,
|
headingRowHeight: _headingRowHeight,
|
||||||
showCheckboxColumn: true,
|
showCheckboxColumn: true,
|
||||||
headerBackgroundColor: context.t.dialogBackgroundColor,
|
headerBackgroundColor: context.t.dialogBackgroundColor,
|
||||||
verticalScrollController: verticalCtrl,
|
verticalScrollController: verticalCtrl,
|
||||||
dataRowColor: MaterialStateProperty.resolveWith<Color?>((Set<MaterialState> states) {
|
dataRowColor:
|
||||||
if (states.contains(MaterialState.hovered)) return context.t.dialogBackgroundColor;
|
MaterialStateProperty.resolveWith<Color?>((Set<MaterialState> states) {
|
||||||
|
if (states.contains(MaterialState.hovered))
|
||||||
|
return context.t.dialogBackgroundColor;
|
||||||
if (states.contains(MaterialState.selected))
|
if (states.contains(MaterialState.selected))
|
||||||
return context.read<SettingsProvider>().currentActiveColor;
|
return context.read<SettingsProvider>().currentActiveColor;
|
||||||
return null;
|
return null;
|
||||||
@@ -151,6 +155,7 @@ class GestureEditor extends StatelessWidget {
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
),
|
||||||
);
|
);
|
||||||
}),
|
}),
|
||||||
),
|
),
|
||||||
@@ -164,18 +169,23 @@ class GestureEditor extends StatelessWidget {
|
|||||||
mainAxisAlignment: MainAxisAlignment.end,
|
mainAxisAlignment: MainAxisAlignment.end,
|
||||||
children: [
|
children: [
|
||||||
DButton.add(
|
DButton.add(
|
||||||
enabled: !gesturePropProvider.editMode! && !schemeTree.fullFiled,
|
enabled: !(schemeProvider.readOnly ?? false) &&
|
||||||
|
!gesturePropProvider.editMode! &&
|
||||||
|
!schemeTree.fullFiled,
|
||||||
onTap: () {
|
onTap: () {
|
||||||
var schemeProvider = context.read<SchemeProvider>();
|
var schemeProvider = context.read<SchemeProvider>();
|
||||||
context.read<SchemeProvider>().setProps(
|
var newGestures = [
|
||||||
gestures: [
|
|
||||||
...?schemeProvider.gestures,
|
...?schemeProvider.gestures,
|
||||||
H.getNextAvailableGestureProp(schemeProvider.buildSchemeTree())!,
|
H.getNextAvailableGestureProp(schemeProvider.buildSchemeTree())!,
|
||||||
]..sort());
|
]..sort();
|
||||||
|
context.read<SchemeProvider>().setProps(gestures: newGestures);
|
||||||
|
saveGesturesToLocal(context, schemeProvider, newGestures);
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
DButton.delete(
|
DButton.delete(
|
||||||
enabled: gesturePropProvider != GestureProp.empty() && !gesturePropProvider.editMode!,
|
enabled: !(schemeProvider.readOnly ?? false) &&
|
||||||
|
gesturePropProvider != GestureProp.empty() &&
|
||||||
|
!gesturePropProvider.editMode!,
|
||||||
onTap: () {
|
onTap: () {
|
||||||
var schemeProvider = context.read<SchemeProvider>();
|
var schemeProvider = context.read<SchemeProvider>();
|
||||||
var index = schemeProvider.gestures?.indexWhere((e) => e.id == gesturePropProvider.id);
|
var index = schemeProvider.gestures?.indexWhere((e) => e.id == gesturePropProvider.id);
|
||||||
@@ -187,10 +197,13 @@ class GestureEditor extends StatelessWidget {
|
|||||||
gesturePropProvider.copyFrom(
|
gesturePropProvider.copyFrom(
|
||||||
newGestures[(index ?? 0) > newGestures.length - 1 ? newGestures.length - 1 : index ?? 0]
|
newGestures[(index ?? 0) > newGestures.length - 1 ? newGestures.length - 1 : index ?? 0]
|
||||||
..editMode = false);
|
..editMode = false);
|
||||||
|
saveGesturesToLocal(context, schemeProvider, newGestures);
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
DButton.duplicate(
|
DButton.duplicate(
|
||||||
enabled: gesturePropProvider != GestureProp.empty() && !gesturePropProvider.editMode!,
|
enabled: !(schemeProvider.readOnly ?? false) &&
|
||||||
|
gesturePropProvider != GestureProp.empty() &&
|
||||||
|
!gesturePropProvider.editMode!,
|
||||||
onTap: () {
|
onTap: () {
|
||||||
var schemeProvider = context.read<SchemeProvider>();
|
var schemeProvider = context.read<SchemeProvider>();
|
||||||
context.read<CopiedGesturePropProvider>().copyFrom(
|
context.read<CopiedGesturePropProvider>().copyFrom(
|
||||||
@@ -200,7 +213,8 @@ class GestureEditor extends StatelessWidget {
|
|||||||
},
|
},
|
||||||
),
|
),
|
||||||
DButton.paste(
|
DButton.paste(
|
||||||
enabled: copiedGesturePropProvider != CopiedGesturePropProvider.empty() &&
|
enabled: !(schemeProvider.readOnly ?? false) &&
|
||||||
|
copiedGesturePropProvider != CopiedGesturePropProvider.empty() &&
|
||||||
!gesturePropProvider.editMode! &&
|
!gesturePropProvider.editMode! &&
|
||||||
!schemeTree.fullFiled,
|
!schemeTree.fullFiled,
|
||||||
onTap: () {
|
onTap: () {
|
||||||
@@ -221,11 +235,12 @@ class GestureEditor extends StatelessWidget {
|
|||||||
newGestureProp.remark = copiedGesturePropProvider.remark;
|
newGestureProp.remark = copiedGesturePropProvider.remark;
|
||||||
}
|
}
|
||||||
newGestureProp.id = Uuid().v1();
|
newGestureProp.id = Uuid().v1();
|
||||||
context.read<SchemeProvider>().setProps(
|
var newGestures = [
|
||||||
gestures: [
|
|
||||||
...?schemeProvider.gestures,
|
...?schemeProvider.gestures,
|
||||||
newGestureProp,
|
newGestureProp,
|
||||||
]..sort());
|
]..sort();
|
||||||
|
context.read<SchemeProvider>().setProps(gestures: newGestures);
|
||||||
|
saveGesturesToLocal(context, schemeProvider, newGestures);
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
@@ -258,6 +273,7 @@ class GestureEditor extends StatelessWidget {
|
|||||||
Expanded(
|
Expanded(
|
||||||
child: DTextField(
|
child: DTextField(
|
||||||
initText: schemeProvider.name,
|
initText: schemeProvider.name,
|
||||||
|
readOnly: schemeProvider.readOnly ?? false,
|
||||||
onComplete: (val) {
|
onComplete: (val) {
|
||||||
val = val.trim();
|
val = val.trim();
|
||||||
schemeProvider.setProps(name: val);
|
schemeProvider.setProps(name: val);
|
||||||
@@ -271,11 +287,7 @@ class GestureEditor extends StatelessWidget {
|
|||||||
var localSchemeEntry = localSchemesProvider.schemes!
|
var localSchemeEntry = localSchemesProvider.schemes!
|
||||||
.firstWhere((ele) => ele.scheme.id == schemeProvider.id);
|
.firstWhere((ele) => ele.scheme.id == schemeProvider.id);
|
||||||
localSchemeEntry.scheme.name = val;
|
localSchemeEntry.scheme.name = val;
|
||||||
localSchemeEntry.save();
|
localSchemeEntry.save(localSchemesProvider);
|
||||||
localSchemesProvider.schemeEntries.then((value) {
|
|
||||||
localSchemesProvider
|
|
||||||
.setProps(schemes: [localSchemesProvider.schemes!.first, ...value..sort()]);
|
|
||||||
});
|
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
@@ -314,9 +326,11 @@ List<DDataRow> _buildDataRows(List<GestureProp>? gestures, BuildContext context)
|
|||||||
var newGestures = List<GestureProp>.of(schemeProvider.gestures!);
|
var newGestures = List<GestureProp>.of(schemeProvider.gestures!);
|
||||||
var index = newGestures.indexWhere((element) => element == prop);
|
var index = newGestures.indexWhere((element) => element == prop);
|
||||||
newGestures[index].copyFrom(prop);
|
newGestures[index].copyFrom(prop);
|
||||||
|
newGestures.sort();
|
||||||
context.read<SchemeProvider>().setProps(
|
context.read<SchemeProvider>().setProps(
|
||||||
gestures: newGestures..sort(),
|
gestures: newGestures,
|
||||||
);
|
);
|
||||||
|
saveGesturesToLocal(context, schemeProvider, newGestures);
|
||||||
};
|
};
|
||||||
provider.copyFrom(
|
provider.copyFrom(
|
||||||
gesture..editMode = true,
|
gesture..editMode = true,
|
||||||
@@ -328,6 +342,13 @@ List<DDataRow> _buildDataRows(List<GestureProp>? gestures, BuildContext context)
|
|||||||
);
|
);
|
||||||
}).toList();
|
}).toList();
|
||||||
|
|
||||||
|
void saveGesturesToLocal(BuildContext context, SchemeProvider schemeProvider, List<GestureProp> newGestures) {
|
||||||
|
var localSchemesProvider = context.read<LocalSchemesProvider>();
|
||||||
|
var localSchemeEntry = localSchemesProvider.schemes!.firstWhere((ele) => ele.scheme.id == schemeProvider.id);
|
||||||
|
localSchemeEntry.scheme.gestures = newGestures;
|
||||||
|
localSchemeEntry.save(localSchemesProvider);
|
||||||
|
}
|
||||||
|
|
||||||
List<DDataCell> _buildRowCellsEditing(BuildContext context) {
|
List<DDataCell> _buildRowCellsEditing(BuildContext context) {
|
||||||
var gesture = context.read<GesturePropProvider>();
|
var gesture = context.read<GesturePropProvider>();
|
||||||
var schemeTree = context.read<SchemeProvider>().buildSchemeTree();
|
var schemeTree = context.read<SchemeProvider>().buildSchemeTree();
|
||||||
|
|||||||
+2
-48
@@ -18,55 +18,9 @@ class _HomePageState extends State<HomePage> {
|
|||||||
return Scaffold(
|
return Scaffold(
|
||||||
body: MultiProvider(
|
body: MultiProvider(
|
||||||
providers: [
|
providers: [
|
||||||
ChangeNotifierProvider(create: (context) => SchemeProvider.parse('''
|
ChangeNotifierProvider(create: (context) => SchemeProvider.systemDefault()),
|
||||||
{
|
|
||||||
"name": "test",
|
|
||||||
"desc": "some desc",
|
|
||||||
"gestures": [
|
|
||||||
{
|
|
||||||
"gesture": "swipe",
|
|
||||||
"direction": "down",
|
|
||||||
"fingers": 3,
|
|
||||||
"type": "shortcut",
|
|
||||||
"command": "Control_L+w",
|
|
||||||
"remark": "close current page."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"gesture": "swipe",
|
|
||||||
"direction": "up",
|
|
||||||
"fingers": 3,
|
|
||||||
"type": "shortcut",
|
|
||||||
"command": "Control_L+Alt_L+t",
|
|
||||||
"remark": "reopen last closed page."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"gesture": "pinch",
|
|
||||||
"direction": "in",
|
|
||||||
"fingers": 4,
|
|
||||||
"type": "shortcut",
|
|
||||||
"command": "Control_L+Alt_L+f",
|
|
||||||
"remark": "search files."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"gesture": "tap",
|
|
||||||
"fingers": 4,
|
|
||||||
"type": "built_in",
|
|
||||||
"command": "handle4FingersTap",
|
|
||||||
"remark": "handle4FingersTap."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"gesture": "swipe",
|
|
||||||
"direction": "down",
|
|
||||||
"fingers": 5,
|
|
||||||
"type": "commandline",
|
|
||||||
"command": "dbus-send --type=method_call --dest=com.deepin.dde.Launcher /com/deepin/dde/Launcher com.deepin.dde.Launcher.Toggle",
|
|
||||||
"remark": "toggle launcher."
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
''')),
|
|
||||||
ChangeNotifierProvider(create: (context) => GesturePropProvider.empty()),
|
ChangeNotifierProvider(create: (context) => GesturePropProvider.empty()),
|
||||||
ChangeNotifierProvider(create: (context) => LocalSchemesProvider(),lazy: false),
|
ChangeNotifierProvider(create: (context) => LocalSchemesProvider(), lazy: false),
|
||||||
],
|
],
|
||||||
child: Column(
|
child: Column(
|
||||||
mainAxisSize: MainAxisSize.max,
|
mainAxisSize: MainAxisSize.max,
|
||||||
|
|||||||
@@ -143,7 +143,7 @@ class _DButtonState extends State<DButton> {
|
|||||||
begin: Alignment.topCenter,
|
begin: Alignment.topCenter,
|
||||||
end: Alignment.bottomCenter,
|
end: Alignment.bottomCenter,
|
||||||
),
|
),
|
||||||
borderColor: _hovering
|
borderColor: _hovering && widget.onTap != null
|
||||||
? (widget.activeBorderColor ?? context.watch<SettingsProvider>().currentActiveColor)
|
? (widget.activeBorderColor ?? context.watch<SettingsProvider>().currentActiveColor)
|
||||||
: Color(0xff565656),
|
: Color(0xff565656),
|
||||||
borderWidth: 2,
|
borderWidth: 2,
|
||||||
|
|||||||
@@ -7,12 +7,14 @@ import 'package:provider/provider.dart';
|
|||||||
class DTextField extends StatefulWidget {
|
class DTextField extends StatefulWidget {
|
||||||
final String? initText;
|
final String? initText;
|
||||||
final String? hint;
|
final String? hint;
|
||||||
|
final bool readOnly;
|
||||||
final Function(String value) onComplete;
|
final Function(String value) onComplete;
|
||||||
|
|
||||||
const DTextField({
|
const DTextField({
|
||||||
Key? key,
|
Key? key,
|
||||||
this.initText,
|
this.initText,
|
||||||
this.hint,
|
this.hint,
|
||||||
|
this.readOnly = false,
|
||||||
required this.onComplete,
|
required this.onComplete,
|
||||||
}) : super(key: key);
|
}) : super(key: key);
|
||||||
|
|
||||||
@@ -62,7 +64,7 @@ class _DTextFieldState extends State<DTextField> {
|
|||||||
color: Colors.grey.withOpacity(.3),
|
color: Colors.grey.withOpacity(.3),
|
||||||
border: Border.all(
|
border: Border.all(
|
||||||
width: 2,
|
width: 2,
|
||||||
color: Focus.of(context).hasFocus
|
color: Focus.of(context).hasFocus && !widget.readOnly
|
||||||
? context.watch<SettingsProvider>().activeColor ?? Color(0xff565656)
|
? context.watch<SettingsProvider>().activeColor ?? Color(0xff565656)
|
||||||
: Color(0xff565656)),
|
: Color(0xff565656)),
|
||||||
),
|
),
|
||||||
@@ -71,6 +73,7 @@ class _DTextFieldState extends State<DTextField> {
|
|||||||
child: Padding(
|
child: Padding(
|
||||||
padding: const EdgeInsets.only(left: 15),
|
padding: const EdgeInsets.only(left: 15),
|
||||||
child: TextField(
|
child: TextField(
|
||||||
|
readOnly: widget.readOnly,
|
||||||
focusNode: _focusNode,
|
focusNode: _focusNode,
|
||||||
cursorColor: context.watch<SettingsProvider>().activeColor,
|
cursorColor: context.watch<SettingsProvider>().activeColor,
|
||||||
decoration: InputDecoration.collapsed(hintText: widget.hint),
|
decoration: InputDecoration.collapsed(hintText: widget.hint),
|
||||||
|
|||||||
Reference in New Issue
Block a user