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

wip: add md editor for scheme description.

Browse Source
This commit is contained in:
DebuggerX
2021-12-15 18:52:31 +08:00
parent 214b06cac8
commit f794515cc7
31 changed files with 2907 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/lib/main.dart
+4 -1
View File
@@ -39,6 +39,7 @@ class MyApp extends StatelessWidget {
builder: (context, child) {
var isDarkMode = context.watch<SettingsProvider>().isDarkMode;
var brightnessMode = context.watch<ConfigsProvider>().brightnessMode;
var activeColor = context.watch<SettingsProvider>().currentActiveColor;
H().sp.updateInt(SPKeys.brightnessMode, brightnessMode?.index ?? 0);
late bool showDarkMode;
if (brightnessMode == BrightnessMode.system) {
@@ -48,7 +49,9 @@ class MyApp extends StatelessWidget {
}
return MaterialApp(
title: CodegenLoader.mapLocales[context.locale.toString()]?[LocaleKeys.app_name],
theme: showDarkMode ? darkTheme : lightTheme,
theme: (showDarkMode ? darkTheme : lightTheme).copyWith(
highlightColor: activeColor,
),
localizationsDelegates: context.localizationDelegates,
supportedLocales: context.supportedLocales,
locale: context.locale,
app/lib/pages/gesture_editor.dart
+38 -4
View File
@@ -12,6 +12,7 @@ import 'package:dde_gesture_manager/utils/keyboard_mapper.dart';
import 'package:dde_gesture_manager/utils/notificator.dart';
import 'package:dde_gesture_manager/widgets/dde_button.dart';
import 'package:dde_gesture_manager/widgets/dde_data_table.dart';
import 'package:dde_gesture_manager/widgets/dde_markdown_field.dart';
import 'package:dde_gesture_manager/widgets/dde_text_field.dart';
import 'package:dde_gesture_manager/widgets/table_cell_shortcut_listener.dart';
import 'package:dde_gesture_manager/widgets/table_cell_text_field.dart';
@@ -263,7 +264,7 @@ class GestureEditor extends StatelessWidget {
children: [
Padding(
padding: const EdgeInsets.all(8.0),
child: Text('name:'),
child: Text(LocaleKeys.gesture_editor_info_name).tr(),
),
Expanded(
child: DTextField(
@@ -273,24 +274,57 @@ class GestureEditor extends StatelessWidget {
val = val.trim();
schemeProvider.setProps(name: val);
var localSchemesProvider = context.read<LocalSchemesProvider>();
if (!localSchemesProvider.schemes!.every((element) => element.scheme.name != val)) {
if (!localSchemesProvider.schemes!
.where((element) => element.scheme.id != schemeProvider.id)
.every((element) => element.scheme.name != val)) {
Notificator.error(
context,
title: LocaleKeys.info_scheme_name_conflict_title.tr(),
description: LocaleKeys.info_scheme_name_conflict_description.tr(),
);
return;
return false;
}
;
var localSchemeEntry = localSchemesProvider.schemes!
.firstWhere((ele) => ele.scheme.id == schemeProvider.id);
localSchemeEntry.scheme.name = val;
localSchemeEntry.save(localSchemesProvider);
return true;
},
),
),
],
),
Divider(),
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: const EdgeInsets.all(8.0),
child: Padding(
padding: const EdgeInsets.only(top: 5),
child: Text(LocaleKeys.gesture_editor_info_description).tr(),
),
),
Expanded(
child: ConstrainedBox(
constraints: BoxConstraints(minHeight: kMinInteractiveDimension, maxHeight: 300),
child: DMarkdownField(
initText: schemeProvider.description,
readOnly: schemeProvider.readOnly,
onComplete: (content) {
content = content.trim();
schemeProvider.setProps(description: content);
var localSchemesProvider = context.read<LocalSchemesProvider>();
var localSchemeEntry = localSchemesProvider.schemes!
.firstWhere((ele) => ele.scheme.id == schemeProvider.id);
localSchemeEntry.scheme.description = content;
localSchemeEntry.save(localSchemesProvider);
},
),
),
),
],
),
],
),
),
app/lib/widgets/dde_markdown_field.dart
+112
View File
@@ -0,0 +1,112 @@
import 'package:cached_network_image/cached_network_image.dart';
import 'package:dde_gesture_manager/constants/constants.dart';
import 'package:dde_gesture_manager/extensions.dart';
import 'package:dde_gesture_manager/models/settings.provider.dart';
import 'package:flutter/material.dart';
import 'package:markdown_editor_ot/markdown_editor.dart';
import 'package:url_launcher/url_launcher.dart';
class DMarkdownField extends StatefulWidget {
const DMarkdownField({
Key? key,
required this.initText,
required this.onComplete,
required this.readOnly,
}) : super(key: key);
final bool readOnly;
final String? initText;
final OnComplete onComplete;
@override
_DMarkdownFieldState createState() => _DMarkdownFieldState();
}
class _DMarkdownFieldState extends State<DMarkdownField> {
String? _previewText;
bool get isPreview => _previewText != null || widget.readOnly;
final FocusNode _focusNode = FocusNode();
@override
void initState() {
_previewText = widget.initText;
super.initState();
}
_launchURL(String url) async {
if (await canLaunch(url)) {
await launch(url);
} else {
throw 'Could not launch $url';
}
}
@override
void didUpdateWidget(covariant DMarkdownField oldWidget) {
if (oldWidget.initText != widget.initText) {
setState(() {
_previewText = widget.initText;
});
}
super.didUpdateWidget(oldWidget);
}
@override
Widget build(BuildContext context) {
return Focus(
child: Builder(builder: (context) {
return Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(defaultBorderRadius),
color: Colors.grey.withOpacity(.3),
border: Border.all(
width: 2,
color: Focus.of(context).hasFocus && !widget.readOnly
? context.watch<SettingsProvider>().activeColor ?? Color(0xff565656)
: Color(0xff565656)),
),
child: isPreview
? GestureDetector(
onTap: widget.readOnly
? null
: () {
setState(() {
_previewText = null;
});
},
child: MouseRegion(
cursor: widget.readOnly ? SystemMouseCursors.basic : SystemMouseCursors.click,
child: MdPreview(
text: _previewText ?? '',
padding: EdgeInsets.only(left: 15),
onTapLink: _launchURL,
widgetImage: (imageUrl) => CachedNetworkImage(
imageUrl: imageUrl,
placeholder: (context, url) => const SizedBox(
width: double.infinity,
height: 300,
child: Center(child: CircularProgressIndicator()),
),
errorWidget: (context, url, error) => const Icon(Icons.error),
),
),
),
)
: MdEditor(
initText: widget.initText,
textFocusNode: _focusNode,
padding: EdgeInsets.symmetric(horizontal: 5),
onComplete: (content) {
setState(() {
_previewText = content;
});
widget.onComplete(content);
},
),
);
}),
);
}
}
app/lib/widgets/dde_text_field.dart
+7 -3
View File
@@ -8,7 +8,7 @@ class DTextField extends StatefulWidget {
final String? initText;
final String? hint;
final bool readOnly;
final Function(String value) onComplete;
final bool Function(String value) onComplete;
const DTextField({
Key? key,
@@ -40,8 +40,11 @@ class _DTextFieldState extends State<DTextField> {
}
_handleFocusChange() {
if (!_focusNode.hasFocus) {
widget.onComplete(_controller.text);
if (!_focusNode.hasFocus && !widget.readOnly) {
var ok = widget.onComplete(_controller.text);
if (!ok) {
_focusNode.requestFocus();
}
}
}
@@ -74,6 +77,7 @@ class _DTextFieldState extends State<DTextField> {
padding: const EdgeInsets.only(left: 15),
child: TextField(
readOnly: widget.readOnly,
style: widget.readOnly ? TextStyle(color: Colors.grey) : null,
focusNode: _focusNode,
cursorColor: context.watch<SettingsProvider>().activeColor,
decoration: InputDecoration.collapsed(hintText: widget.hint),