feat: implement some api; add md editor to app; login and signup logic.
This commit is contained in:
+3
@@ -0,0 +1,3 @@
|
||||
## 1.0.0
|
||||
|
||||
* first version
|
||||
Vendored
+201
@@ -0,0 +1,201 @@
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright [yyyy] [name of copyright owner]
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
+17
@@ -0,0 +1,17 @@
|
||||
# markdown_core
|
||||
|
||||
Parse markdown and render it into rich text.
|
||||
|
||||
|
||||
|
||||
``` dart
|
||||
Markdown(
|
||||
data: markdownDataString,
|
||||
linkTap: (link) => print('点击了链接 $link'),
|
||||
textStyle: // your text style ,
|
||||
image: (imageUrl) {
|
||||
print('imageUrl $imageUrl');
|
||||
return // Your image widget ;
|
||||
},
|
||||
)
|
||||
```
|
||||
+340
@@ -0,0 +1,340 @@
|
||||
import 'package:flutter/gestures.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:html_unescape/html_unescape_small.dart';
|
||||
import 'package:markdown/markdown.dart' as md;
|
||||
import 'package:markdown_core/text_style.dart';
|
||||
|
||||
/// 递归解析标签
|
||||
/// [_elementList] 每个标签依次放入该集合
|
||||
/// 在[visitElementBefore]时添加
|
||||
/// 在[visitElementAfter]时将其移除
|
||||
|
||||
class MarkdownBuilder implements md.NodeVisitor {
|
||||
MarkdownBuilder(
|
||||
this.context,
|
||||
this.linkTap,
|
||||
this.widgetImage,
|
||||
this.maxWidth,
|
||||
this.defaultTextStyle, {
|
||||
this.tagTextStyle = defaultTagTextStyle,
|
||||
required this.onCodeCopied,
|
||||
});
|
||||
|
||||
final _widgets = <Widget>[];
|
||||
// int _level = 0;
|
||||
List<_Element> _elementList = <_Element>[];
|
||||
|
||||
final TextStyle defaultTextStyle;
|
||||
final TagTextStyle tagTextStyle;
|
||||
|
||||
final BuildContext context;
|
||||
final LinkTap linkTap;
|
||||
final WidgetImage widgetImage;
|
||||
final double maxWidth;
|
||||
final Function onCodeCopied;
|
||||
|
||||
@override
|
||||
bool visitElementBefore(md.Element element) {
|
||||
// _level++;
|
||||
// debugPrint('visitElementBefore $_level ${element.textContent}');
|
||||
|
||||
String lastTag = '';
|
||||
if (_elementList.isNotEmpty) {
|
||||
lastTag = _elementList.last.tag;
|
||||
}
|
||||
|
||||
var textStyle = tagTextStyle(
|
||||
lastTag,
|
||||
element.tag,
|
||||
_elementList.isNotEmpty ? _elementList.last.textStyle : defaultTextStyle,
|
||||
);
|
||||
|
||||
_elementList.add(_Element(
|
||||
element.tag,
|
||||
textStyle,
|
||||
element.attributes,
|
||||
));
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@override
|
||||
void visitText(md.Text text) {
|
||||
// debugPrint('text ${text.text}');
|
||||
|
||||
if (_elementList.isEmpty) return;
|
||||
var last = _elementList.last;
|
||||
last.textSpans ??= [];
|
||||
|
||||
// 替换特定字符串
|
||||
var content = text.text.replaceAll('>', '>');
|
||||
content = content.replaceAll('<', '<');
|
||||
|
||||
if (last.tag == 'a') {
|
||||
last.textSpans?.add(TextSpan(
|
||||
text: content,
|
||||
style: last.textStyle,
|
||||
recognizer: TapGestureRecognizer()
|
||||
..onTap = () {
|
||||
debugPrint(last.attributes.toString());
|
||||
linkTap(last.attributes['href'] ?? '');
|
||||
},
|
||||
));
|
||||
return;
|
||||
}
|
||||
|
||||
last.textSpans?.add(TextSpan(
|
||||
text: content,
|
||||
style: last.textStyle,
|
||||
));
|
||||
}
|
||||
|
||||
final padding = const EdgeInsets.fromLTRB(0, 5, 0, 5);
|
||||
|
||||
String getTextFromElement(dynamic element) {
|
||||
String result = '';
|
||||
if (element is List) {
|
||||
result = element.map(getTextFromElement).join('\n');
|
||||
} else if (element is md.Element) {
|
||||
result = result = element.children?.map(getTextFromElement).join('\n') ?? '';
|
||||
} else {
|
||||
result = element.text;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
@override
|
||||
void visitElementAfter(md.Element element) {
|
||||
// debugPrint('visitElementAfter $_level ${element.tag}');
|
||||
// _level--;
|
||||
|
||||
if (_elementList.isEmpty) return;
|
||||
var last = _elementList.last;
|
||||
_elementList.removeLast();
|
||||
var tempWidget;
|
||||
if (kTextTags.indexOf(element.tag) != -1) {
|
||||
if (_elementList.isNotEmpty && kTextParentTags.indexOf(_elementList.last.tag) != -1) {
|
||||
// 内联标签处理
|
||||
_elementList.last.textSpans ??= [];
|
||||
_elementList.last.textSpans?.addAll(last.textSpans ?? []);
|
||||
} else {
|
||||
if (last.textSpans?.isNotEmpty ?? false) {
|
||||
tempWidget = SelectableText.rich(
|
||||
TextSpan(
|
||||
children: last.textSpans,
|
||||
style: last.textStyle,
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
} else if ('li' == element.tag) {
|
||||
tempWidget = _resolveToLi(last);
|
||||
} else if ('pre' == element.tag) {
|
||||
var preCode = HtmlUnescape().convert(getTextFromElement(element.children));
|
||||
tempWidget = _resolveToPre(last, preCode);
|
||||
} else if ('blockquote' == element.tag) {
|
||||
tempWidget = _resolveToBlockquote(last);
|
||||
} else if ('img' == element.tag) {
|
||||
if (_elementList.isNotEmpty && (_elementList.last.textSpans?.isNotEmpty ?? false)) {
|
||||
_widgets.add(
|
||||
Padding(
|
||||
padding: padding,
|
||||
child: RichText(
|
||||
text: TextSpan(
|
||||
children: _elementList.last.textSpans,
|
||||
style: _elementList.last.textStyle,
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
_elementList.last.textSpans = null;
|
||||
}
|
||||
// debugPrint(element.attributes.toString());
|
||||
//_elementList.clear();
|
||||
_widgets.add(
|
||||
Padding(
|
||||
padding: padding,
|
||||
child: widgetImage(element.attributes['src'] ?? ''),
|
||||
),
|
||||
);
|
||||
} else if (last.widgets?.isNotEmpty ?? false) {
|
||||
if (last.widgets?.length == 1) {
|
||||
tempWidget = last.widgets?[0];
|
||||
} else {
|
||||
tempWidget = Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: last.widgets ?? [],
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
if (tempWidget != null) {
|
||||
if (_elementList.isEmpty) {
|
||||
_widgets.add(
|
||||
Padding(
|
||||
padding: padding,
|
||||
child: tempWidget,
|
||||
),
|
||||
);
|
||||
} else {
|
||||
_elementList.last.widgets ??= [];
|
||||
if (tempWidget is List<Widget>) {
|
||||
_elementList.last.widgets?.addAll(tempWidget);
|
||||
} else {
|
||||
_elementList.last.widgets?.add(tempWidget);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
List<Widget> build(List<md.Node> nodes) {
|
||||
_widgets.clear();
|
||||
|
||||
for (md.Node node in nodes) {
|
||||
// _level = 0;
|
||||
_elementList.clear();
|
||||
|
||||
node.accept(this);
|
||||
}
|
||||
return _widgets;
|
||||
}
|
||||
|
||||
dynamic _resolveToLi(_Element last) {
|
||||
int liNum = 1;
|
||||
_elementList.forEach((element) {
|
||||
if (element.tag == 'li') liNum++;
|
||||
});
|
||||
List<Widget> widgets = last.widgets ?? [];
|
||||
List<InlineSpan> spans = [];
|
||||
spans.addAll(last.textSpans ?? []);
|
||||
widgets.insert(
|
||||
0,
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.end,
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Container(
|
||||
padding: EdgeInsets.fromLTRB(
|
||||
8,
|
||||
((last.textStyle.fontSize ?? 0) * 2 - 10) / 2.2,
|
||||
8,
|
||||
0,
|
||||
),
|
||||
child: Icon(
|
||||
Icons.circle,
|
||||
size: 10,
|
||||
color: last.textStyle.color,
|
||||
),
|
||||
),
|
||||
Container(
|
||||
width: maxWidth - (26 * liNum),
|
||||
child: RichText(
|
||||
strutStyle: StrutStyle(
|
||||
height: 1,
|
||||
fontSize: last.textStyle.fontSize,
|
||||
forceStrutHeight: true,
|
||||
leading: 1,
|
||||
),
|
||||
// textAlign: TextAlign.center,
|
||||
text: TextSpan(
|
||||
children: spans,
|
||||
style: last.textStyle,
|
||||
),
|
||||
),
|
||||
)
|
||||
],
|
||||
));
|
||||
|
||||
/// 如果是顶层，返回column
|
||||
if (liNum == 1) {
|
||||
return Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
mainAxisAlignment: MainAxisAlignment.start,
|
||||
children: widgets,
|
||||
);
|
||||
} else {
|
||||
return widgets;
|
||||
}
|
||||
}
|
||||
|
||||
Widget _resolveToPre(_Element last, String preCode) {
|
||||
return Padding(
|
||||
padding: const EdgeInsets.fromLTRB(0, 5, 15, 5),
|
||||
child: Stack(
|
||||
children: [
|
||||
Container(
|
||||
width: double.infinity,
|
||||
decoration: BoxDecoration(
|
||||
color: Theme.of(context).brightness == Brightness.dark ? const Color(0xff111111) : const Color(0xffeeeeee),
|
||||
borderRadius: BorderRadius.circular(10),
|
||||
),
|
||||
padding: const EdgeInsets.fromLTRB(8, 14, 8, 0),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: last.widgets ?? [],
|
||||
),
|
||||
),
|
||||
Align(
|
||||
alignment: Alignment.topRight,
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(10),
|
||||
child: IconButton(
|
||||
icon: Icon(Icons.copy_outlined),
|
||||
onPressed: () {
|
||||
Clipboard.setData(ClipboardData(text: preCode)).then((_) {
|
||||
onCodeCopied();
|
||||
});
|
||||
},
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _resolveToBlockquote(_Element last) {
|
||||
return IntrinsicHeight(
|
||||
child: Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
mainAxisAlignment: MainAxisAlignment.start,
|
||||
children: [
|
||||
Container(
|
||||
width: 7,
|
||||
height: double.infinity,
|
||||
color: Colors.grey.shade400,
|
||||
),
|
||||
SizedBox(width: 12),
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: last.widgets ?? [],
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _Element {
|
||||
_Element(
|
||||
this.tag,
|
||||
this.textStyle,
|
||||
this.attributes,
|
||||
);
|
||||
|
||||
final String tag;
|
||||
List<Widget>? widgets;
|
||||
List<TextSpan>? textSpans;
|
||||
TextStyle textStyle;
|
||||
Map<String, String> attributes;
|
||||
}
|
||||
|
||||
/// 链接点击
|
||||
typedef void LinkTap(String link);
|
||||
|
||||
typedef Widget WidgetImage(String imageUrl);
|
||||
|
||||
typedef TextStyle TagTextStyle(String lastTag, String tag, TextStyle textStyle);
|
||||
+67
@@ -0,0 +1,67 @@
|
||||
library markdown_core;
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:markdown/markdown.dart';
|
||||
import 'package:markdown_core/builder.dart';
|
||||
import 'package:markdown_core/text_style.dart';
|
||||
|
||||
class Markdown extends StatefulWidget {
|
||||
const Markdown({
|
||||
Key? key,
|
||||
required this.data,
|
||||
required this.linkTap,
|
||||
required this.image,
|
||||
required this.onCodeCopied,
|
||||
this.maxWidth,
|
||||
this.textStyle,
|
||||
}) : super(key: key);
|
||||
|
||||
final String data;
|
||||
|
||||
final LinkTap linkTap;
|
||||
|
||||
final WidgetImage image;
|
||||
|
||||
final double? maxWidth;
|
||||
|
||||
final TextStyle? textStyle;
|
||||
|
||||
final Function onCodeCopied;
|
||||
|
||||
@override
|
||||
MarkdownState createState() => MarkdownState();
|
||||
}
|
||||
|
||||
class MarkdownState extends State<Markdown> {
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: _parseMarkdown(),
|
||||
);
|
||||
}
|
||||
|
||||
List<Widget> _parseMarkdown() {
|
||||
// debugPrint(markdownToHtml(
|
||||
// widget.data,
|
||||
// extensionSet: ExtensionSet.gi法inaltHubWeb,
|
||||
// ));
|
||||
final List<String> lines = widget.data.split(RegExp(r'\r?\n'));
|
||||
final nodes = Document(
|
||||
extensionSet: ExtensionSet.gitHubWeb,
|
||||
).parseLines(lines);
|
||||
return MarkdownBuilder(
|
||||
context,
|
||||
widget.linkTap,
|
||||
widget.image,
|
||||
widget.maxWidth ?? MediaQuery.of(context).size.width,
|
||||
widget.textStyle ?? defaultTextStyle(context),
|
||||
onCodeCopied: widget.onCodeCopied,
|
||||
).build(nodes);
|
||||
}
|
||||
}
|
||||
+107
@@ -0,0 +1,107 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
const List<String> kTextTags = const <String>[
|
||||
'h1',
|
||||
'h2',
|
||||
'h3',
|
||||
'h4',
|
||||
'h5',
|
||||
'h6',
|
||||
'p',
|
||||
'code',
|
||||
'strong',
|
||||
'em',
|
||||
'del',
|
||||
'a',
|
||||
];
|
||||
|
||||
const List<String> kTextParentTags = const <String>[
|
||||
'h1',
|
||||
'h2',
|
||||
'h3',
|
||||
'h4',
|
||||
'h5',
|
||||
'h6',
|
||||
'p',
|
||||
'li',
|
||||
];
|
||||
|
||||
TextStyle defaultTextStyle(BuildContext context) => TextStyle(
|
||||
fontSize: 18,
|
||||
height: 1.8,
|
||||
color: Theme.of(context).brightness == Brightness.dark
|
||||
? const Color(0xffaaaaaa)
|
||||
: const Color(0xff444444),
|
||||
);
|
||||
|
||||
TextStyle defaultTagTextStyle(String lastTag, String tag, TextStyle textStyle) {
|
||||
switch (tag) {
|
||||
case 'h1':
|
||||
textStyle = textStyle.copyWith(
|
||||
fontSize: (textStyle.fontSize ?? 0) + 9,
|
||||
);
|
||||
break;
|
||||
case 'h2':
|
||||
textStyle = textStyle.copyWith(
|
||||
fontSize: (textStyle.fontSize ?? 0) + 6,
|
||||
);
|
||||
break;
|
||||
case 'h3':
|
||||
textStyle = textStyle.copyWith(
|
||||
fontSize: (textStyle.fontSize ?? 0) + 4,
|
||||
);
|
||||
break;
|
||||
case 'h4':
|
||||
textStyle = textStyle.copyWith(
|
||||
fontSize: (textStyle.fontSize ?? 0) + 3,
|
||||
);
|
||||
break;
|
||||
case 'h5':
|
||||
textStyle = textStyle.copyWith(
|
||||
fontSize: (textStyle.fontSize ?? 0) + 2,
|
||||
);
|
||||
break;
|
||||
case 'h6':
|
||||
textStyle = textStyle.copyWith(
|
||||
fontSize: (textStyle.fontSize ?? 0) + 1,
|
||||
);
|
||||
break;
|
||||
case 'p':
|
||||
break;
|
||||
case 'li':
|
||||
break;
|
||||
case 'code':
|
||||
textStyle = textStyle.copyWith(
|
||||
fontSize: (textStyle.fontSize ?? 0) - 3,
|
||||
color: textStyle.color?.withAlpha(200),
|
||||
);
|
||||
if (lastTag == 'p') {
|
||||
textStyle = textStyle.copyWith(
|
||||
color: Colors.red.shade800,
|
||||
);
|
||||
}
|
||||
|
||||
break;
|
||||
case 'strong':
|
||||
textStyle = textStyle.copyWith(
|
||||
fontWeight: FontWeight.bold,
|
||||
);
|
||||
break;
|
||||
case 'em':
|
||||
textStyle = textStyle.copyWith(
|
||||
fontStyle: FontStyle.italic,
|
||||
);
|
||||
break;
|
||||
case 'del':
|
||||
textStyle = textStyle.copyWith(
|
||||
decoration: TextDecoration.lineThrough,
|
||||
);
|
||||
break;
|
||||
case 'a':
|
||||
textStyle = textStyle.copyWith(
|
||||
color: Colors.blue,
|
||||
);
|
||||
break;
|
||||
}
|
||||
return textStyle;
|
||||
}
|
||||
+56
@@ -0,0 +1,56 @@
|
||||
name: markdown_core
|
||||
description: Parse markdown and render it into rich text.
|
||||
version: 1.0.0
|
||||
homepage: https://github.com/xia-weiyang/markdown_core
|
||||
repository: https://github.com/xia-weiyang/markdown_core
|
||||
|
||||
environment:
|
||||
sdk: '>=2.12.0 <3.0.0'
|
||||
|
||||
dependencies:
|
||||
flutter:
|
||||
sdk: flutter
|
||||
|
||||
markdown: ^4.0.1
|
||||
html_unescape: ^2.0.0
|
||||
|
||||
dev_dependencies:
|
||||
flutter_test:
|
||||
sdk: flutter
|
||||
|
||||
# For information on the generic Dart part of this file, see the
|
||||
# following page: https://dart.dev/tools/pub/pubspec
|
||||
|
||||
# The following section is specific to Flutter.
|
||||
flutter:
|
||||
|
||||
# To add assets to your package, add an assets section, like this:
|
||||
# assets:
|
||||
# - images/a_dot_burr.jpeg
|
||||
# - images/a_dot_ham.jpeg
|
||||
#
|
||||
# For details regarding assets in packages, see
|
||||
# https://flutter.dev/assets-and-images/#from-packages
|
||||
#
|
||||
# An image asset can refer to one or more resolution-specific "variants", see
|
||||
# https://flutter.dev/assets-and-images/#resolution-aware.
|
||||
|
||||
# To add custom fonts to your package, add a fonts section here,
|
||||
# in this "flutter" section. Each entry in this list should have a
|
||||
# "family" key with the font family name, and a "fonts" key with a
|
||||
# list giving the asset and other descriptors for the font. For
|
||||
# example:
|
||||
# fonts:
|
||||
# - family: Schyler
|
||||
# fonts:
|
||||
# - asset: fonts/Schyler-Regular.ttf
|
||||
# - asset: fonts/Schyler-Italic.ttf
|
||||
# style: italic
|
||||
# - family: Trajan Pro
|
||||
# fonts:
|
||||
# - asset: fonts/TrajanPro.ttf
|
||||
# - asset: fonts/TrajanPro_Bold.ttf
|
||||
# weight: 700
|
||||
#
|
||||
# For details regarding fonts in packages, see
|
||||
# https://flutter.dev/custom-fonts/#from-packages
|
||||
@@ -9,6 +9,7 @@ class MdPreview extends StatefulWidget {
|
||||
this.padding = const EdgeInsets.all(0.0),
|
||||
this.onTapLink,
|
||||
required this.widgetImage,
|
||||
required this.onCodeCopied,
|
||||
this.textStyle,
|
||||
}) : super(key: key);
|
||||
|
||||
@@ -17,6 +18,8 @@ class MdPreview extends StatefulWidget {
|
||||
final WidgetImage widgetImage;
|
||||
final TextStyle? textStyle;
|
||||
|
||||
final Function onCodeCopied;
|
||||
|
||||
/// Call this method when it tap link of markdown.
|
||||
/// If [onTapLink] is null,it will open the link with your default browser.
|
||||
final TapLinkCallback? onTapLink;
|
||||
@@ -46,6 +49,7 @@ class MdPreviewState extends State<MdPreview>
|
||||
},
|
||||
image: widget.widgetImage,
|
||||
textStyle: widget.textStyle,
|
||||
onCodeCopied: widget.onCodeCopied,
|
||||
);
|
||||
},
|
||||
),
|
||||
|
||||
+3
-1
@@ -11,7 +11,9 @@ dependencies:
|
||||
sdk: flutter
|
||||
|
||||
shared_preferences: ^2.0.4
|
||||
markdown_core: ^1.0.0
|
||||
markdown_core:
|
||||
path:
|
||||
../markdown_core
|
||||
|
||||
dev_dependencies:
|
||||
flutter_test:
|
||||
|
||||
@@ -1,10 +1,9 @@
|
||||
import 'package:flutter/cupertino.dart';
|
||||
|
||||
/// [UOS设计指南](https://docs.uniontech.com/zh/content/t_dbG3kBK9iDf9B963ok)
|
||||
|
||||
const double localManagerPanelWidth = 260;
|
||||
|
||||
const double marketPanelWidth = 300;
|
||||
const double marketOrMePanelWidth = 300;
|
||||
|
||||
const shortDuration = const Duration(milliseconds: 100);
|
||||
|
||||
@@ -39,5 +38,5 @@ const List<String> builtInCommands = [
|
||||
|
||||
enum PanelType {
|
||||
local_manager,
|
||||
market,
|
||||
market_or_me,
|
||||
}
|
||||
|
||||
@@ -2,4 +2,7 @@ class SPKeys {
|
||||
static final String brightnessMode = 'BRIGHTNESS_MODE';
|
||||
static final String appliedSchemeId = 'APPLIED_SCHEME_ID';
|
||||
static final String userLanguage = 'USER_LANGUAGE';
|
||||
static final String accessToken = 'USER_ACCESS_TOKEN';
|
||||
static final String loginEmail = 'USER_LOGIN_EMAIL';
|
||||
static final String ignoredUpdateVersion = 'IGNORED_UPDATE_VERSION';
|
||||
}
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
extension StringNotNull on String? {
|
||||
bool get notNull => this != null && this != '';
|
||||
|
||||
bool get isNull => !notNull;
|
||||
}
|
||||
@@ -0,0 +1,135 @@
|
||||
import 'dart:convert';
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:dde_gesture_manager/constants/sp_keys.dart';
|
||||
import 'package:dde_gesture_manager/extensions.dart';
|
||||
import 'package:dde_gesture_manager/utils/helper.dart';
|
||||
import 'package:dde_gesture_manager/utils/notificator.dart';
|
||||
import 'package:dde_gesture_manager_api/apis.dart';
|
||||
import 'package:dde_gesture_manager_api/models.dart';
|
||||
import 'package:http/http.dart' as http;
|
||||
|
||||
typedef T BeanBuilder<T>(Map res);
|
||||
|
||||
typedef T HandleRespBuild<T>(http.Response resp);
|
||||
|
||||
getStatusCodeFunc<int>(Map resp) => resp["statusCode"];
|
||||
|
||||
class HttpErrorCode extends Error {
|
||||
int statusCode;
|
||||
|
||||
HttpErrorCode(this.statusCode, {this.message});
|
||||
|
||||
String? message;
|
||||
|
||||
@override
|
||||
String toString() => '[$statusCode] $message';
|
||||
}
|
||||
|
||||
class Api {
|
||||
static _handleHttpError(e) {
|
||||
if (e is SocketException) {
|
||||
Notificator.error(
|
||||
H().topContext,
|
||||
title: LocaleKeys.info_server_error_title.tr(),
|
||||
description: LocaleKeys.info_server_error_description.tr(),
|
||||
);
|
||||
} else {
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
|
||||
static HandleRespBuild<T> _handleRespBuild<T>(BeanBuilder<T> builder) => (http.Response resp) {
|
||||
if (builder == getStatusCodeFunc) return builder({"statusCode": resp.statusCode});
|
||||
T res;
|
||||
try {
|
||||
res = builder(json.decode(resp.body));
|
||||
} catch (e) {
|
||||
throw HttpErrorCode(resp.statusCode, message: resp.body);
|
||||
}
|
||||
return res;
|
||||
};
|
||||
|
||||
static Future<T> _get<T>(
|
||||
String path,
|
||||
BeanBuilder<T> builder, {
|
||||
Map<String, dynamic>? queryParams,
|
||||
bool ignoreToken = false,
|
||||
bool ignoreErrorHandle = false,
|
||||
}) =>
|
||||
http
|
||||
.get(
|
||||
Uri(
|
||||
scheme: Apis.apiScheme,
|
||||
host: Apis.apiHost,
|
||||
port: Apis.apiPort,
|
||||
queryParameters: queryParams,
|
||||
path: path,
|
||||
),
|
||||
headers: <String, String>{
|
||||
HttpHeaders.contentTypeHeader: ContentType.json.value,
|
||||
}..addAll(
|
||||
ignoreToken ? {} : {HttpHeaders.authorizationHeader: 'Bearer ${H().sp.getString(SPKeys.accessToken)}'}),
|
||||
)
|
||||
.then(
|
||||
_handleRespBuild<T>(builder),
|
||||
onError: (e) {
|
||||
if (ignoreErrorHandle)
|
||||
throw e;
|
||||
else
|
||||
return _handleHttpError(e);
|
||||
},
|
||||
);
|
||||
|
||||
static Future<T> _post<T>(
|
||||
String path,
|
||||
BeanBuilder<T> builder, {
|
||||
Map<String, dynamic>? body,
|
||||
bool ignoreToken = false,
|
||||
bool ignoreErrorHandle = false,
|
||||
}) =>
|
||||
http
|
||||
.post(
|
||||
Uri(
|
||||
scheme: Apis.apiScheme,
|
||||
host: Apis.apiHost,
|
||||
port: Apis.apiPort,
|
||||
path: path,
|
||||
),
|
||||
body: jsonEncode(body),
|
||||
headers: <String, String>{
|
||||
HttpHeaders.contentTypeHeader: ContentType.json.value,
|
||||
}..addAll(
|
||||
ignoreToken ? {} : {HttpHeaders.authorizationHeader: 'Bearer ${H().sp.getString(SPKeys.accessToken)}'}),
|
||||
)
|
||||
.then(
|
||||
_handleRespBuild<T>(builder),
|
||||
onError: (e) {
|
||||
if (ignoreErrorHandle)
|
||||
throw e;
|
||||
else
|
||||
return _handleHttpError(e);
|
||||
},
|
||||
);
|
||||
|
||||
static Future<LoginSuccess?> loginOrSignup({
|
||||
required String email,
|
||||
required String password,
|
||||
}) =>
|
||||
_post<LoginSuccess?>(
|
||||
Apis.auth.loginOrSignup,
|
||||
LoginSuccessSerializer.fromMap,
|
||||
body: {
|
||||
UserFields.email: email,
|
||||
UserFields.password: password,
|
||||
},
|
||||
ignoreToken: true,
|
||||
);
|
||||
|
||||
static Future<AppVersion?> checkAppVersion({ignoreErrorHandle = false}) => _get<AppVersion?>(
|
||||
Apis.system.appVersion,
|
||||
AppVersionSerializer.fromMap,
|
||||
ignoreToken: true,
|
||||
ignoreErrorHandle: ignoreErrorHandle,
|
||||
);
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
import 'package:dde_gesture_manager/builder/provider_annotation.dart';
|
||||
import 'package:dde_gesture_manager/constants/sp_keys.dart';
|
||||
import 'package:dde_gesture_manager/extensions.dart';
|
||||
import 'package:dde_gesture_manager/utils/helper.dart';
|
||||
|
||||
enum BrightnessMode {
|
||||
@@ -14,11 +15,49 @@ class Configs {
|
||||
BrightnessMode? brightnessMode;
|
||||
|
||||
@ProviderModelProp()
|
||||
String? appliedSchemeId;
|
||||
String? get appliedSchemeId => _appliedSchemeId;
|
||||
|
||||
set appliedSchemeId(String? schemeId) {
|
||||
_appliedSchemeId = schemeId;
|
||||
if (schemeId.notNull)
|
||||
H().sp.updateString(SPKeys.appliedSchemeId, schemeId!);
|
||||
else
|
||||
H().sp.remove(SPKeys.appliedSchemeId);
|
||||
}
|
||||
|
||||
String? _appliedSchemeId;
|
||||
|
||||
@ProviderModelProp()
|
||||
String? get accessToken => _accessToken;
|
||||
|
||||
set accessToken(String? token) {
|
||||
_accessToken = token;
|
||||
if (token.notNull)
|
||||
H().sp.updateString(SPKeys.accessToken, token!);
|
||||
else
|
||||
H().sp.remove(SPKeys.accessToken);
|
||||
}
|
||||
|
||||
String? _accessToken;
|
||||
|
||||
@ProviderModelProp()
|
||||
String? get email => _email;
|
||||
|
||||
set email(String? emailAddress) {
|
||||
_email = emailAddress;
|
||||
if (emailAddress.notNull)
|
||||
H().sp.updateString(SPKeys.loginEmail, emailAddress!);
|
||||
else
|
||||
H().sp.remove(SPKeys.loginEmail);
|
||||
}
|
||||
|
||||
String? _email;
|
||||
|
||||
Configs() {
|
||||
this.brightnessMode =
|
||||
BrightnessMode.values[H().sp.getInt(SPKeys.brightnessMode)?.clamp(0, BrightnessMode.values.length - 1) ?? 0];
|
||||
this.appliedSchemeId = H().sp.getString(SPKeys.appliedSchemeId);
|
||||
this.accessToken = H().sp.getString(SPKeys.accessToken);
|
||||
this.email = H().sp.getString(SPKeys.loginEmail);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,5 +6,10 @@ class ContentLayout {
|
||||
bool? localManagerOpened;
|
||||
|
||||
@ProviderModelProp()
|
||||
bool? marketOpened;
|
||||
bool? marketOrMeOpened;
|
||||
|
||||
@ProviderModelProp()
|
||||
bool? currentIsMarket = true;
|
||||
|
||||
bool get isMarket => currentIsMarket ?? true;
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@ import 'package:dde_gesture_manager/models/content_layout.provider.dart';
|
||||
import 'package:dde_gesture_manager/models/scheme.provider.dart';
|
||||
import 'package:dde_gesture_manager/pages/gesture_editor.dart';
|
||||
import 'package:dde_gesture_manager/pages/local_manager.dart';
|
||||
import 'package:dde_gesture_manager/pages/market.dart';
|
||||
import 'package:dde_gesture_manager/pages/market_or_me.dart';
|
||||
import 'package:dde_gesture_manager/utils/helper.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
@@ -31,7 +31,7 @@ class _ContentState extends State<Content> {
|
||||
ChangeNotifierProvider(
|
||||
create: (context) => ContentLayoutProvider()
|
||||
..localManagerOpened = preferredPanelsStatus.localManagerPanelOpened
|
||||
..marketOpened = preferredPanelsStatus.marketPanelOpened,
|
||||
..marketOrMeOpened = preferredPanelsStatus.marketOrMePanelOpened,
|
||||
),
|
||||
ChangeNotifierProvider(
|
||||
create: (context) => CopiedGesturePropProvider.empty(),
|
||||
@@ -42,7 +42,7 @@ class _ContentState extends State<Content> {
|
||||
Future.microtask(
|
||||
() => context.read<ContentLayoutProvider>().setProps(
|
||||
localManagerOpened: preferredPanelsStatus.localManagerPanelOpened,
|
||||
marketOpened: preferredPanelsStatus.marketPanelOpened,
|
||||
marketOrMeOpened: preferredPanelsStatus.marketOrMePanelOpened,
|
||||
),
|
||||
);
|
||||
}
|
||||
@@ -52,7 +52,7 @@ class _ContentState extends State<Content> {
|
||||
children: [
|
||||
LocalManager(),
|
||||
GestureEditor(),
|
||||
Market(),
|
||||
MarketOrMe(),
|
||||
],
|
||||
);
|
||||
},
|
||||
|
||||
@@ -68,12 +68,12 @@ class GestureEditor extends StatelessWidget {
|
||||
),
|
||||
).tr(),
|
||||
Visibility(
|
||||
visible: layoutProvider.marketOpened == false,
|
||||
visible: layoutProvider.marketOrMeOpened == false,
|
||||
child: DButton(
|
||||
width: defaultButtonHeight,
|
||||
onTap: () => H.openPanel(context, PanelType.market),
|
||||
onTap: () => H.openPanel(context, PanelType.market_or_me),
|
||||
child: Icon(
|
||||
CupertinoIcons.cart,
|
||||
layoutProvider.isMarket ? CupertinoIcons.cart : CupertinoIcons.person,
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import 'package:collection/collection.dart';
|
||||
import 'package:dde_gesture_manager/constants/constants.dart';
|
||||
import 'package:dde_gesture_manager/constants/sp_keys.dart';
|
||||
import 'package:dde_gesture_manager/extensions.dart';
|
||||
import 'package:dde_gesture_manager/models/configs.provider.dart';
|
||||
import 'package:dde_gesture_manager/models/content_layout.provider.dart';
|
||||
@@ -9,7 +8,6 @@ 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.provider.dart';
|
||||
import 'package:dde_gesture_manager/models/settings.provider.dart';
|
||||
import 'package:dde_gesture_manager/utils/helper.dart';
|
||||
import 'package:dde_gesture_manager/widgets/dde_button.dart';
|
||||
import 'package:flutter/cupertino.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
@@ -247,7 +245,6 @@ class _LocalManagerState extends State<LocalManager> {
|
||||
var appliedId =
|
||||
localSchemes.firstWhere((ele) => ele.path == _selectedItemPath).scheme.id!;
|
||||
appliedId.sout();
|
||||
H().sp.updateString(SPKeys.appliedSchemeId, appliedId);
|
||||
context.read<ConfigsProvider>().setProps(appliedSchemeId: appliedId);
|
||||
},
|
||||
),
|
||||
|
||||
@@ -1,65 +0,0 @@
|
||||
import 'package:dde_gesture_manager/constants/constants.dart';
|
||||
import 'package:dde_gesture_manager/extensions.dart';
|
||||
import 'package:dde_gesture_manager/models/content_layout.provider.dart';
|
||||
import 'package:dde_gesture_manager/widgets/dde_button.dart';
|
||||
import 'package:flutter/cupertino.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
class Market extends StatelessWidget {
|
||||
const Market({
|
||||
Key? key,
|
||||
}) : super(key: key);
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
var isOpen = context.watch<ContentLayoutProvider>().marketOpened == true;
|
||||
return AnimatedContainer(
|
||||
duration: mediumDuration,
|
||||
curve: Curves.easeInOut,
|
||||
width: isOpen ? marketPanelWidth : 0,
|
||||
child: OverflowBox(
|
||||
alignment: Alignment.centerLeft,
|
||||
maxWidth: marketPanelWidth,
|
||||
minWidth: marketPanelWidth,
|
||||
child: Material(
|
||||
color: context.t.backgroundColor,
|
||||
elevation: isOpen ? 10 : 0,
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(8.0),
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.start,
|
||||
children: [
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
DButton(
|
||||
width: defaultButtonHeight - 2,
|
||||
height: defaultButtonHeight - 2,
|
||||
onTap: () => context.read<ContentLayoutProvider>().setProps(marketOpened: !isOpen),
|
||||
child: Icon(
|
||||
CupertinoIcons.chevron_right_2,
|
||||
size: 20,
|
||||
),
|
||||
),
|
||||
Flexible(
|
||||
child: Center(
|
||||
child: Text(
|
||||
LocaleKeys.market_title,
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
).tr(),
|
||||
),
|
||||
),
|
||||
Container(width: defaultButtonHeight),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,117 @@
|
||||
import 'package:auto_size_text/auto_size_text.dart';
|
||||
import 'package:dde_gesture_manager/constants/constants.dart';
|
||||
import 'package:dde_gesture_manager/extensions.dart';
|
||||
import 'package:dde_gesture_manager/models/configs.provider.dart';
|
||||
import 'package:dde_gesture_manager/models/content_layout.provider.dart';
|
||||
import 'package:dde_gesture_manager/widgets/dde_button.dart';
|
||||
import 'package:dde_gesture_manager/widgets/login.dart';
|
||||
import 'package:flutter/cupertino.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
class MarketOrMe extends StatelessWidget {
|
||||
const MarketOrMe({
|
||||
Key? key,
|
||||
}) : super(key: key);
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
var layoutProvider = context.watch<ContentLayoutProvider>();
|
||||
bool isOpen = layoutProvider.marketOrMeOpened == true;
|
||||
bool isMarket = layoutProvider.isMarket;
|
||||
bool showLogin = context.watch<ConfigsProvider>().accessToken.isNull && !isMarket;
|
||||
return AnimatedContainer(
|
||||
duration: mediumDuration,
|
||||
curve: Curves.easeInOut,
|
||||
width: isOpen ? marketOrMePanelWidth * (showLogin ? 1.5 : 1) : 0,
|
||||
child: OverflowBox(
|
||||
alignment: Alignment.centerLeft,
|
||||
maxWidth: marketOrMePanelWidth * (showLogin ? 1.5 : 1),
|
||||
minWidth: marketOrMePanelWidth * (showLogin ? 1.5 : 1),
|
||||
child: Material(
|
||||
color: context.t.backgroundColor,
|
||||
elevation: isOpen ? 10 : 0,
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(8.0),
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.start,
|
||||
children: [
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
DButton(
|
||||
width: defaultButtonHeight - 2,
|
||||
height: defaultButtonHeight - 2,
|
||||
onTap: () => context.read<ContentLayoutProvider>().setProps(marketOrMeOpened: !isOpen),
|
||||
child: Icon(
|
||||
CupertinoIcons.chevron_right_2,
|
||||
size: 20,
|
||||
),
|
||||
),
|
||||
Flexible(
|
||||
child: Center(
|
||||
child: Text(
|
||||
isMarket ? LocaleKeys.market_title : LocaleKeys.me_title,
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
).tr(),
|
||||
),
|
||||
),
|
||||
DButton(
|
||||
width: defaultButtonHeight - 2,
|
||||
height: defaultButtonHeight - 2,
|
||||
onTap: () => context.read<ContentLayoutProvider>().setProps(currentIsMarket: !isMarket),
|
||||
child: Icon(
|
||||
!isMarket ? CupertinoIcons.cart : CupertinoIcons.person,
|
||||
size: 20,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
if (isMarket) buildMarketContent(context),
|
||||
if (!isMarket) buildMeContent(context),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget buildMeContent(BuildContext context) {
|
||||
var accessToken = context.watch<ConfigsProvider>().accessToken;
|
||||
if (accessToken.isNull) return LoginWidget();
|
||||
|
||||
return Padding(
|
||||
padding: EdgeInsets.symmetric(vertical: 10),
|
||||
child: Column(
|
||||
children: [
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
Icon(Icons.person, size: defaultButtonHeight),
|
||||
Flexible(
|
||||
child: AutoSizeText(
|
||||
context.watch<ConfigsProvider>().email ?? '',
|
||||
style: TextStyle(
|
||||
fontSize: 18,
|
||||
),
|
||||
maxLines: 1,
|
||||
),
|
||||
),
|
||||
DButton.logout(
|
||||
enabled: true,
|
||||
onTap: () => context.read<ConfigsProvider>().setProps(accessToken: '', email: ''),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget buildMarketContent(BuildContext context) {
|
||||
return Container();
|
||||
}
|
||||
}
|
||||
+19
-11
@@ -29,34 +29,42 @@ class H {
|
||||
initSharedPreference() async {
|
||||
_sp = await SharedPreferences.getInstance();
|
||||
}
|
||||
|
||||
late BuildContext _topContext;
|
||||
|
||||
BuildContext get topContext => _topContext;
|
||||
|
||||
initTopContext(BuildContext context) {
|
||||
_topContext = context;
|
||||
}
|
||||
|
||||
static void openPanel(BuildContext context, PanelType panelType) {
|
||||
var windowWidth = MediaQuery.of(context).size.width;
|
||||
if (windowWidth < minWindowSize.width + localManagerPanelWidth + marketPanelWidth) {
|
||||
if (windowWidth < minWindowSize.width + localManagerPanelWidth + marketOrMePanelWidth) {
|
||||
context.read<ContentLayoutProvider>().setProps(
|
||||
localManagerOpened: panelType == PanelType.local_manager,
|
||||
marketOpened: panelType == PanelType.market,
|
||||
marketOrMeOpened: panelType == PanelType.market_or_me,
|
||||
);
|
||||
} else {
|
||||
switch (panelType) {
|
||||
case PanelType.local_manager:
|
||||
return context.read<ContentLayoutProvider>().setProps(localManagerOpened: true);
|
||||
case PanelType.market:
|
||||
return context.read<ContentLayoutProvider>().setProps(marketOpened: true);
|
||||
case PanelType.market_or_me:
|
||||
return context.read<ContentLayoutProvider>().setProps(marketOrMeOpened: true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static PreferredPanelsStatus getPreferredPanelsStatus(double windowWidth) {
|
||||
var preferredPanelsStatus = PreferredPanelsStatus(localManagerPanelOpened: true, marketPanelOpened: true);
|
||||
if (windowWidth > minWindowSize.width + localManagerPanelWidth + marketPanelWidth)
|
||||
var preferredPanelsStatus = PreferredPanelsStatus(localManagerPanelOpened: true, marketOrMePanelOpened: true);
|
||||
if (windowWidth > minWindowSize.width + localManagerPanelWidth + marketOrMePanelWidth)
|
||||
return preferredPanelsStatus;
|
||||
else if (windowWidth < minWindowSize.width + localManagerPanelWidth)
|
||||
return preferredPanelsStatus
|
||||
..marketPanelOpened = false
|
||||
..marketOrMePanelOpened = false
|
||||
..localManagerPanelOpened = false;
|
||||
else
|
||||
return preferredPanelsStatus..marketPanelOpened = false;
|
||||
return preferredPanelsStatus..marketOrMePanelOpened = false;
|
||||
}
|
||||
|
||||
static Gesture getGestureByName(String gestureName) => Gesture.values.findByName(gestureName) ?? Gesture.swipe;
|
||||
@@ -108,15 +116,15 @@ class H {
|
||||
|
||||
class PreferredPanelsStatus {
|
||||
bool localManagerPanelOpened;
|
||||
bool marketPanelOpened;
|
||||
bool marketOrMePanelOpened;
|
||||
|
||||
PreferredPanelsStatus({
|
||||
required this.localManagerPanelOpened,
|
||||
required this.marketPanelOpened,
|
||||
required this.marketOrMePanelOpened,
|
||||
});
|
||||
|
||||
@override
|
||||
String toString() {
|
||||
return 'PreferredPanelsStatus{localManagerPanelOpened: $localManagerPanelOpened, marketPanelOpened: $marketPanelOpened}';
|
||||
return 'PreferredPanelsStatus{localManagerPanelOpened: $localManagerPanelOpened, marketOrMePanelOpened: $marketOrMePanelOpened}';
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,13 +3,22 @@ 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';
|
||||
import 'package:dde_gesture_manager/generated/codegen_loader.g.dart';
|
||||
import 'package:dde_gesture_manager/http/api.dart';
|
||||
import 'package:dde_gesture_manager/models/settings.provider.dart';
|
||||
import 'package:dde_gesture_manager/utils/helper.dart';
|
||||
import 'package:dde_gesture_manager/utils/notificator.dart';
|
||||
import 'package:dde_gesture_manager_api/apis.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_platform_alert/flutter_platform_alert.dart';
|
||||
import 'package:gsettings/gsettings.dart';
|
||||
import 'package:package_info_plus/package_info_plus.dart';
|
||||
import 'package:url_launcher/url_launcher.dart';
|
||||
import 'package:window_manager/window_manager.dart';
|
||||
|
||||
bool _updateChecked = false;
|
||||
|
||||
Future<void> initEvents(BuildContext context) async {
|
||||
H().initTopContext(context);
|
||||
var isDark = MediaQuery.of(context).platformBrightness == Brightness.dark;
|
||||
if (isDark) {
|
||||
context.read<SettingsProvider>().setProps(isDarkMode: isDark);
|
||||
@@ -39,6 +48,32 @@ Future<void> initEvents(BuildContext context) async {
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
if (!_updateChecked)
|
||||
Api.checkAppVersion(ignoreErrorHandle: true).then((value) async {
|
||||
_updateChecked = true;
|
||||
var info = await PackageInfo.fromPlatform();
|
||||
var _buildNumber = int.parse(info.buildNumber);
|
||||
var _newVersionCode = value?.versionCode ?? 0;
|
||||
var _ignoredVersionCode = H().sp.getInt(SPKeys.ignoredUpdateVersion) ?? 0;
|
||||
if (_buildNumber < _newVersionCode && _ignoredVersionCode < _newVersionCode) {
|
||||
Notificator.showConfirm(
|
||||
title: LocaleKeys.info_new_version_title.tr(namedArgs: {'version': '${value?.versionName}'}),
|
||||
description: LocaleKeys.info_new_version_description_for_startup.tr(namedArgs: {
|
||||
'yes': LocaleKeys.str_yes.tr(),
|
||||
'no': LocaleKeys.str_no.tr(),
|
||||
}),
|
||||
).then((confirmed) async {
|
||||
if (confirmed == CustomButton.positiveButton) {
|
||||
if (await canLaunch(Apis.appNewVersionUrl)) {
|
||||
await launch(Apis.appNewVersionUrl);
|
||||
}
|
||||
} else if (confirmed == CustomButton.negativeButton) {
|
||||
H().sp.updateInt(SPKeys.ignoredUpdateVersion, value?.versionCode ?? 0);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
Future<void> initConfigs() async {
|
||||
|
||||
@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
|
||||
Future<void> initEvents(BuildContext context) async {
|
||||
H().initTopContext(context);
|
||||
var isDark = MediaQuery.of(context).platformBrightness == Brightness.dark;
|
||||
context.read<SettingsProvider>().setProps(isDarkMode: isDark);
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import 'package:cherry_toast/cherry_toast.dart';
|
||||
import 'package:cherry_toast/resources/arrays.dart';
|
||||
import 'package:dde_gesture_manager/extensions.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_platform_alert/flutter_platform_alert.dart';
|
||||
|
||||
@@ -27,8 +28,8 @@ class Notificator {
|
||||
return AlertImpl().showConfirm(
|
||||
windowTitle: title,
|
||||
text: description,
|
||||
positiveButtonTitle: positiveButtonTitle,
|
||||
negativeButtonTitle: negativeButtonTitle,
|
||||
positiveButtonTitle: positiveButtonTitle ?? LocaleKeys.str_yes.tr(),
|
||||
negativeButtonTitle: negativeButtonTitle ?? LocaleKeys.str_no.tr(),
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -107,6 +107,23 @@ class DButton extends StatefulWidget {
|
||||
message: LocaleKeys.operation_paste.tr(),
|
||||
));
|
||||
|
||||
factory DButton.logout({
|
||||
Key? key,
|
||||
required enabled,
|
||||
GestureTapCallback? onTap,
|
||||
height = defaultButtonHeight,
|
||||
width = defaultButtonHeight,
|
||||
}) =>
|
||||
DButton(
|
||||
key: key,
|
||||
width: width,
|
||||
height: height,
|
||||
onTap: enabled ? onTap : null,
|
||||
child: Tooltip(
|
||||
child: Opacity(opacity: enabled ? 1 : 0.4, child: const Icon(Icons.logout_rounded, size: 20)),
|
||||
message: LocaleKeys.operation_logout.tr(),
|
||||
));
|
||||
|
||||
factory DButton.dropdown({
|
||||
Key? key,
|
||||
width = 60.0,
|
||||
|
||||
@@ -2,6 +2,7 @@ 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:dde_gesture_manager/utils/notificator.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:markdown_editor_ot/markdown_editor.dart';
|
||||
import 'package:url_launcher/url_launcher.dart';
|
||||
@@ -77,11 +78,18 @@ class _DMarkdownFieldState extends State<DMarkdownField> {
|
||||
});
|
||||
},
|
||||
child: MouseRegion(
|
||||
cursor: widget.readOnly ? SystemMouseCursors.basic : SystemMouseCursors.click,
|
||||
cursor: widget.readOnly ? SystemMouseCursors.basic : SystemMouseCursors.text,
|
||||
child: MdPreview(
|
||||
text: _previewText ?? '',
|
||||
padding: EdgeInsets.only(left: 15),
|
||||
onTapLink: _launchURL,
|
||||
onCodeCopied: () {
|
||||
Notificator.success(
|
||||
context,
|
||||
title: LocaleKeys.info_code_copied_titte.tr(),
|
||||
description: LocaleKeys.info_code_copied_description.tr(),
|
||||
);
|
||||
},
|
||||
widgetImage: (imageUrl) => CachedNetworkImage(
|
||||
imageUrl: imageUrl,
|
||||
placeholder: (context, url) => const SizedBox(
|
||||
|
||||
@@ -0,0 +1,102 @@
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:dde_gesture_manager/constants/sp_keys.dart';
|
||||
import 'package:dde_gesture_manager/extensions.dart';
|
||||
import 'package:dde_gesture_manager/http/api.dart';
|
||||
import 'package:dde_gesture_manager/models/configs.provider.dart';
|
||||
import 'package:dde_gesture_manager/models/settings.provider.dart';
|
||||
import 'package:dde_gesture_manager/utils/helper.dart';
|
||||
import 'package:dde_gesture_manager/utils/notificator.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_login/flutter_login.dart';
|
||||
|
||||
class LoginWidget extends StatefulWidget {
|
||||
const LoginWidget({
|
||||
Key? key,
|
||||
}) : super(key: key);
|
||||
|
||||
@override
|
||||
_LoginWidgetState createState() => _LoginWidgetState();
|
||||
}
|
||||
|
||||
class _LoginWidgetState extends State<LoginWidget> {
|
||||
ValueKey<int> _key = ValueKey(0);
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Expanded(
|
||||
child: OverflowBox(
|
||||
alignment: Alignment.topCenter,
|
||||
child: Container(
|
||||
child: ScrollConfiguration(
|
||||
behavior: const ScrollBehavior().copyWith(
|
||||
physics: const NeverScrollableScrollPhysics(),
|
||||
),
|
||||
child: FlutterLogin(
|
||||
key: _key,
|
||||
onLogin: (loginData) async {
|
||||
try {
|
||||
var res = await Api.loginOrSignup(email: loginData.name, password: loginData.password);
|
||||
if (res != null && res.token.notNull)
|
||||
context.read<ConfigsProvider>().setProps(accessToken: res.token, email: loginData.name);
|
||||
} catch (e) {
|
||||
if (!(e is HttpErrorCode)) return;
|
||||
var code = e.statusCode;
|
||||
if (code == HttpStatus.unauthorized)
|
||||
Notificator.error(
|
||||
context,
|
||||
title: LocaleKeys.info_login_failed_title.tr(),
|
||||
description: LocaleKeys.info_login_failed_description.tr(),
|
||||
);
|
||||
else if (code == HttpStatus.notFound)
|
||||
Notificator.info(
|
||||
context,
|
||||
title: LocaleKeys.info_sign_up_hint_title.tr(),
|
||||
description: LocaleKeys.info_sign_up_hint_description.tr(),
|
||||
);
|
||||
else
|
||||
throw e;
|
||||
}
|
||||
},
|
||||
onSubmitAnimationCompleted: () {
|
||||
var token = H().sp.getString(SPKeys.accessToken);
|
||||
if (token.isNull)
|
||||
setState(() {
|
||||
_key = ValueKey(_key.value + 1);
|
||||
});
|
||||
else if (context.read<ConfigsProvider>().accessToken != token)
|
||||
context
|
||||
.read<ConfigsProvider>()
|
||||
.setProps(accessToken: token, email: H().sp.getString(SPKeys.loginEmail));
|
||||
},
|
||||
onRecoverPassword: (_) {},
|
||||
hideForgotPasswordButton: true,
|
||||
disableCustomPageTransformer: true,
|
||||
messages: LoginMessages(
|
||||
userHint: LocaleKeys.me_login_email_hint.tr(),
|
||||
passwordHint: LocaleKeys.me_login_password_hint.tr(),
|
||||
loginButton: LocaleKeys.me_login_login_or_signup.tr(),
|
||||
),
|
||||
userValidator: (value) {
|
||||
if (FlutterLogin.defaultEmailValidator(value) != null) {
|
||||
return LocaleKeys.me_login_email_error_hint.tr();
|
||||
}
|
||||
},
|
||||
passwordValidator: (value) {
|
||||
if (value!.isEmpty || value.length < 8 || value.length > 16) {
|
||||
return LocaleKeys.me_login_password_hint.tr();
|
||||
}
|
||||
},
|
||||
theme: LoginTheme(
|
||||
pageColorDark: Colors.transparent,
|
||||
pageColorLight: Colors.transparent,
|
||||
primaryColor: context.watch<SettingsProvider>().currentActiveColor,
|
||||
footerBackgroundColor: Colors.transparent,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -1,11 +1,12 @@
|
||||
import 'dart:convert';
|
||||
|
||||
import 'package:dde_gesture_manager/extensions.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:package_info_plus/package_info_plus.dart';
|
||||
import 'package:http/http.dart' as http;
|
||||
import 'package:dde_gesture_manager/http/api.dart';
|
||||
import 'package:dde_gesture_manager/utils/notificator.dart';
|
||||
import 'package:dde_gesture_manager_api/apis.dart';
|
||||
import 'package:dde_gesture_manager_api/models.dart';
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_platform_alert/flutter_platform_alert.dart';
|
||||
import 'package:package_info_plus/package_info_plus.dart';
|
||||
import 'package:url_launcher/url_launcher.dart';
|
||||
|
||||
class VersionChecker extends StatelessWidget {
|
||||
const VersionChecker({Key? key}) : super(key: key);
|
||||
@@ -22,20 +23,31 @@ class VersionChecker extends StatelessWidget {
|
||||
Text(
|
||||
'${LocaleKeys.version_current.tr()} : ${snapshot.data?.version ?? ''}',
|
||||
),
|
||||
Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 3),
|
||||
child: TextButton(
|
||||
child: Text(LocaleKeys.version_check_update).tr(),
|
||||
onPressed: () {
|
||||
http.get(Uri.parse('http://127.0.0.1:3000' + Apis.system.appVersion)).then((value) {
|
||||
var appVersion = AppVersionSerializer.fromMap(json.decode(value.body));
|
||||
appVersion.versionName.sout();
|
||||
appVersion.versionCode.sout();
|
||||
appVersion.sout();
|
||||
});
|
||||
},
|
||||
if (!kIsWeb)
|
||||
Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 3),
|
||||
child: TextButton(
|
||||
child: Text(LocaleKeys.version_check_update).tr(),
|
||||
onPressed: () {
|
||||
Api.checkAppVersion().then((value) {
|
||||
if (value != null && (value.versionCode ?? 0) > int.parse(snapshot.data?.buildNumber ?? '0')) {
|
||||
Notificator.showConfirm(
|
||||
title: LocaleKeys.info_new_version_title.tr(namedArgs: {'version': '${value.versionName}'}),
|
||||
description: LocaleKeys.info_new_version_description_for_manual.tr(),
|
||||
).then((value) async {
|
||||
if (value == CustomButton.positiveButton) {
|
||||
if (await canLaunch(Apis.appNewVersionUrl)) {
|
||||
await launch(Apis.appNewVersionUrl);
|
||||
}
|
||||
}
|
||||
});
|
||||
} else {
|
||||
Notificator.info(context, title: LocaleKeys.info_new_version_title_already_latest.tr());
|
||||
}
|
||||
});
|
||||
},
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
|
||||
@@ -40,6 +40,8 @@ dependencies:
|
||||
flutter_platform_alert: ^0.2.1
|
||||
cached_network_image: ^3.2.0
|
||||
url_launcher: ^6.0.17
|
||||
flutter_login: ^3.1.0
|
||||
auto_size_text: ^3.0.0
|
||||
markdown_editor_ot:
|
||||
path: 3rd_party/markdown_editor_ot
|
||||
cherry_toast:
|
||||
|
||||
@@ -70,12 +70,15 @@
|
||||
"delete": "delete",
|
||||
"duplicate": "duplicate",
|
||||
"apply": "apply",
|
||||
"paste": "paste"
|
||||
"paste": "paste",
|
||||
"logout": "sign out"
|
||||
},
|
||||
"str": {
|
||||
"null": "Null",
|
||||
"new_scheme": "New gesture scheme",
|
||||
"copy": "copy"
|
||||
"copy": "copy",
|
||||
"yes": "Yes",
|
||||
"no": "No"
|
||||
},
|
||||
"built_in_commands": {
|
||||
"ShowWorkspace": "ShowWorkspace",
|
||||
@@ -101,6 +104,37 @@
|
||||
"scheme_name_conflict": {
|
||||
"title": "Save failed!",
|
||||
"description": "Scheme name conflict, please rename it!"
|
||||
},
|
||||
"code_copied": {
|
||||
"titte": "Code has been copied!",
|
||||
"description": "Please paste it into the terminal and run ~"
|
||||
},
|
||||
"server_error": {
|
||||
"title": "Server connection error",
|
||||
"description": "Please try again later ~"
|
||||
},
|
||||
"login_failed": {
|
||||
"title": "Login failed",
|
||||
"description": "Please check the password ~"
|
||||
},
|
||||
"sign_up_hint": {
|
||||
"title": "Verification code has been sent",
|
||||
"description": "Please log in to the mailbox to continue the registration ~"
|
||||
},
|
||||
"new_version": {
|
||||
"title": "Update found(v{version})",
|
||||
"description_for_startup": "Click [{YES}] to view, click [{NO}] ignore this update",
|
||||
"title_already_latest": "Already the latest version ~",
|
||||
"description_for_manual": "Visit the official website to see more?"
|
||||
}
|
||||
},
|
||||
"me": {
|
||||
"title": "Me",
|
||||
"login": {
|
||||
"login_or_signup": "Login/Signup",
|
||||
"email_hint": "Please enter email",
|
||||
"password_hint": "Please enter 8-16-bit password",
|
||||
"email_error_hint": "Please enter your vaild email"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -70,12 +70,15 @@
|
||||
"delete": "删除",
|
||||
"duplicate": "复制",
|
||||
"apply": "应用",
|
||||
"paste": "粘贴"
|
||||
"paste": "粘贴",
|
||||
"logout": "退出登录"
|
||||
},
|
||||
"str": {
|
||||
"null": "无",
|
||||
"new_scheme": "新建手势方案",
|
||||
"copy": "副本"
|
||||
"copy": "副本",
|
||||
"yes": "是",
|
||||
"no": "否"
|
||||
},
|
||||
"built_in_commands": {
|
||||
"ShowWorkspace": "显示工作区",
|
||||
@@ -101,6 +104,37 @@
|
||||
"scheme_name_conflict": {
|
||||
"title": "保存失败！",
|
||||
"description": "方案名冲突，请重新命名！"
|
||||
},
|
||||
"code_copied": {
|
||||
"titte": "代码已复制！",
|
||||
"description": "请粘贴到终端中执行～"
|
||||
},
|
||||
"server_error": {
|
||||
"title": "连接服务器异常",
|
||||
"description": "请稍后再试～"
|
||||
},
|
||||
"login_failed": {
|
||||
"title": "登录失败",
|
||||
"description": "请检查账号密码是否正确～"
|
||||
},
|
||||
"sign_up_hint": {
|
||||
"title": "验证码已发送",
|
||||
"description": "请登录邮箱继续完成注册～"
|
||||
},
|
||||
"new_version": {
|
||||
"title": "发现新版本(v{version})",
|
||||
"description_for_startup": "点击[{yes}]查看，点击[{no}]忽略本次更新",
|
||||
"title_already_latest": "已经是最新版本～",
|
||||
"description_for_manual": "是否前去官网查看？"
|
||||
}
|
||||
},
|
||||
"me": {
|
||||
"title": "我的",
|
||||
"login": {
|
||||
"login_or_signup": "登录/注册",
|
||||
"email_hint": "请输入邮箱",
|
||||
"password_hint": "请输入8-16位密码",
|
||||
"email_error_hint": "请输入正确的邮箱"
|
||||
}
|
||||
}
|
||||
}
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
flutter packages pub get
|
||||
flutter packages pub run build_runner build --delete-conflicting-outputs
|
||||
flutter pub run easy_localization:generate
|
||||
flutter pub run easy_localization:generate -f keys -o locale_keys.g.dart
|
||||
flutter pub run easy_localization:generate -f keys -o locale_keys.g.dart
|
||||
flutter packages pub run build_runner build --delete-conflicting-outputs
|
||||
|
||||
Reference in New Issue
Block a user