Merge pull request 'feat: update angel3_orm.' (#13) from dev into master

Reviewed-on: #13

.gitignore

@@ -1,3 +1,2 @@
 .idea/
 .vscode/
-db_data/

LICENSE

@@ -1,29 +0,0 @@
-BSD 3-Clause License
-
-Copyright (c) 2022, dx8917312@gmail.com
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

@@ -1,160 +1,2 @@
 # DDE Gesture Manager
-
+专为 DDE 桌面环境打造的触摸板手势管理工具
-![logo](https://github.com/debuggerx01/dde_gesture_manager/blob/master/app/web/icons/Icon-192.png?raw=true)
-
-专为 [DDE](https://www.deepin.org/zh/dde/) 桌面环境打造的触摸板手势管理工具（缩写：dgm），客户端使用 [Flutter](https://flutter.dev/) 构建，后端技术栈为 [dart](https://dart.dev/) 的 [Angel3 框架](https://github.com/dukefirehawk/angel) + [PostgreSQL](https://www.postgresql.org/) + [Redis](https://redis.io/) + docker。
-
-# web版
-
-[DDE手势管理器-web版](http://www.debuggerx.com/dgm_web/#/)
-
-# 功能
-- 创建、编辑、删除本地手势配置方案
-- 将选定手势方案应用到系统中
-- 注册登陆后可以上传、分享自己创建的配置方案
-- 可以下载、点赞他人分享的配置方案
-- 贴合 DDE 的 UI 设计风格，支持系统主题切换和活动色
-- 支持多语言
-
-# 手册
-[DDE手势管理器-说明手册](https://www.debuggerx.com/2022/01/21/dgm-manual/)
-
-# 运行
-
-## api
-
-- 使用docker(推荐)
-
-  首先安装 docker 及 docker-compose，然后在`/api`目录下执行：
-
-    ```shell
-    bash start.sh
-    ```
-
-- 手动运行
-    1. 首先配置 dart 环境（如果已经配置 flutter 开发环境则无需再配置）：
-       [Dart SDK overview](https://dart.dev/tools/sdk)
-       
-    2. 安装项目依赖，运行代码生成命令：
-       在`/api`目录下执行：
-       ```shell
-        bash source_gen.sh
-       ```
-       
-    3. 安装 PostgreSQL 及 Redis
-        - [PostgreSQL Downloads](https://www.postgresql.org/download/)
-        - [Redis Downloads](https://redis.io/download)
-    
-        然后在 `/config/development.yaml` 设置如下配置：
-        ```yaml
-        # Development-only server configuration.
-        debug: true
-        postgres:
-          host: [db host]
-          port: 5432
-          database_name: gesture_manager
-          username: postgres
-          password: [db password]
-          use_ssl: false
-          time_zone: Asia/Shanghai
-        redis:
-          host: [redis host]
-          port: 6379
-          password: [redis password]
-        smtp:
-          username: [smtp account name]
-          password: [smtp account password]
-          host: [smtp server host]
-        ```
-        
-    4. 设置数据库
-        - 登录数据库，创建名为 `gesture_manager` 的数据库
-          
-            ```sql
-            create database gesture_manager;
-            ```
-            
-        - 运行 Migration：
-        
-            ```bash
-            dart bin/migrate.dart
-            ```
-    5. 运行 api
-        ```bash
-        dart bin/dev.dart
-        ```
-
-## app
-
-1. 配置 flutter 开发环境，并启用 Linux 支持：
-    - [Linux install](https://docs.flutter.dev/get-started/install/linux)
-    - [Additional Linux requirements](https://docs.flutter.dev/get-started/install/linux#additional-linux-requirements)
-
-2. 修改服务器连接地址
-    在 `/api` 目录下修改 `lib/apis.dart`:
-   ```dart
-   class Apis {
-     static const apiScheme = 'http';
-     static const apiHost = 'localhost';  // 设置为api的地址
-     static const apiPort = 3000;         // 设置为api监听的端口
-    
-     static const appNewVersionUrl = 'https://www.debuggerx.com';
-    
-     ……
-   }
-   ```
-   
-3. 安装项目依赖，运行代码生成命令：
-   在`/app`目录下执行：
-   ```shell
-   bash source_gen.sh
-   ```
-   
-4. 运行app项目：
-    - Linux：
-    ```shell
-   flutter run -d linux
-   ```
-   
-    - web:
-    ```shell
-   flutter run -d chrome
-    ```
-
-
-
-# RoadMap
-
-
-- [x] 方案下载功能实现
-- [x] 方案应用功能实现
-- [ ] BugFix
-- [x] MD 编辑器中的UI文本国际化
-- [x] 编写帮助说明文档
-- [ ] 浅色模式界面优化
-- [ ] 打包上架 Deepin/UOS 应用商店
-
-
-# FAQ
-
-- Q：为什么要开发这个工具
-    
-    A：本人是 [Deepin Linux](https://www.deepin.org/zh/) 的老粉了，日常学习工作和生活娱乐几乎完全在 Deepin/UOS 系统下进行。同时我还是个手势重度依赖者，除了鼠标手势，对笔记本的触摸板手势一样有很强的自定义需求。但是从 Deepin 系统增加手势功能到如今也有5年多了，官方一直没有在系统层面给出自定义触摸板手势的功能入口，我不得不经常通过手工修改系统手势配置文件的方式来实现自定义。但是长久以来，一方面是自己每次新装系统都需要重新设置，一方面是不断看到论坛和用户群有朋友反馈询问修改方法，遂决定动手写一个方便使用，并支持配置分享下载的GUI工具
-    
-- Q：为什么使用 flutter 开发而不是 Qt/DTK/GTK ……
-
-    A：因为本人对 flutter 比较熟悉，有4年多的研究积累，而且对于 flutter 的跨平台效果非常看好，而C/C++的经验相对缺乏，又恰逢2021下半年这个时间点，google官方的一大重点就是对桌面应用开发的支持，于是决定尝试通过使用 flutter 实现本工具。
-
-- Q：为何还要兼容开发Web版本
-
-    A：得益于 flutter 的跨平台能力，在开发 Linux 桌面版应用的基础上，可以以很低的成本同步开发出 Web 版，于是一方面出于技术探索的目的，从一开始的功能规划我就将 Web 支持放在了基础需求中。另外，Web 版还有三个明显的好处：
-
-    1.  用户可以不必安装桌面应用，仅仅通过浏览器打开网页就能体验本工具的功能，方便了用户预览体验，也方便本项目的转发推广；
-    2. 由于 UOS 系统默认是锁 root 权限的，某些情况下的用户（比如机关单位的普通员工）可能不方便安装运行第三方软件，虽然我有将本工具上架 UOS 软件商店的打算，但是并不一定能够保证及时更新，所以此时可以通过使用 Web 版来实现和桌面版相同的功能和接近的体验；
-    3. 还有一部分用户可能使用的是国产CPU，可能并不是 flutter 的编译工具所支持的，或者虽然 flutter 支持，但是由于我没有对应的机器进项编译打包，所以可能暂时无法为这些用户提供二进制的程序使用，此时这些用户一样可以通过使用 Web 版来解决。
-
-- Q：为何使用 dart 编写服务端，而不用其他更流行常见的语言和技术
-
-  A：作为全栈开发，虽然有多种其他语言和流行框架的后端开发经验，但是那些方案，有些是框架本身太重太吃资源，不适合这个小项目使用，有些是语言本身实在是写烦了，开发起来没有动力……在看到一些朋友和大佬分享使用 dart 开发后端的经验之后，我想，是不是可以让前后端项目使用相同的语言，以"同构"的方式开发，并将前后端的一些"弱关联"转变成由语法来保证正确性的"强依赖"呢？
-  
-  所以在这个项目中，我让`api`直接作为`app`的依赖，`app`的网络请求处理中直接使用`api`侧导出的请求参数定义和结果模型，探索一种可以不用再通过文档进行前后端配合的开发模式——因为我相信，文档总是不可靠的，只有代码本身不会骗人 :joy:

api/bin/dev.dart

@@ -8,11 +8,12 @@ import 'package:logging/logging.dart';
 
 void main() async {
   // Watch the config/ and web/ directories for changes, and hot-reload the server.
+  hierarchicalLoggingEnabled = true;
+
   var hot = HotReloader(() async {
-    Logger.root
+    var logger = Logger.detached('dde_gesture_manager_api')
       ..level = Level.ALL
       ..onRecord.listen(prettyLog);
-    var logger = Logger.detached('dde_gesture_manager_api');
     var app = Angel(logger: logger, reflector: MirrorsReflector());
     await app.configure(configureServer);
     return app;
@@ -22,5 +23,6 @@ void main() async {
   ]);
 
   var server = await hot.startServer('127.0.0.1', 3000);
-  print('dde_gesture_manager_api server listening at http://${server.address.address}:${server.port}');
+  print(
+      'dde_gesture_manager_api server listening at http://${server.address.address}:${server.port}');
 }

api/lib/apis.dart

@@ -1,15 +1,9 @@
 class Apis {
   static const apiScheme = 'http';
-  static const apiHost = 'dgm_api.debuggerx.com';
+  static const apiHost = 'home.debuggerx.com';
-  static const apiPort = 3000;
+  static const apiPort = 30000;
 
-  static const appNewVersionUrl = 'https://www.debuggerx.com/2022/01/21/dgm-changelog?from=app';
+  static const appNewVersionUrl = 'https://www.debuggerx.com';
-
-  static appBulletinUrl(bool isWeb) =>
-      'https://www.debuggerx.com/dgm_web/bulletin.json?from=app_${isWeb ? 'web' : 'linux'}';
-
-  static appManualUrl(bool isWeb) =>
-      'https://www.debuggerx.com/2022/01/21/dgm-manual?from=app_${isWeb ? 'web' : 'linux'}';
 
   static final system = SystemApis();
   static final auth = AuthApis();
@@ -19,9 +13,9 @@ class Apis {
 class AuthApis {
   static final String path = '/auth';
 
-  String get loginOrSignup => [path, 'login-or-signup'].joinPath();
+  String get loginOrSignup => [path, 'login_or_signup'].joinPath();
 
-  String confirmSignup({required StringParam accessKey}) => [path, 'confirm-sign-up', accessKey].joinPath();
+  String confirmSignup({required StringParam accessKey}) => [path, 'confirm_sign_up', accessKey].joinPath();
 
   String get status => [path, 'status'].joinPath();
 }
@@ -37,17 +31,15 @@ class SchemeApis {
 
   String get upload => [path, 'upload'].joinPath();
 
-  String markAsShared({required StringParam schemeId}) => [path, 'mark-as-shared', schemeId].joinPath();
+  String markAsShared({required StringParam schemeId}) => [path, 'mark_as_shared', schemeId].joinPath();
 
   String user({required StringParam type}) => [path, 'user', type].joinPath();
 
-  String market({required StringParam type, required IntParam page, required IntParam pageSize}) =>
+  String market({required StringParam type, required IntParam page, required IntParam pageSize}) => [path, 'market', type, page, pageSize].joinPath();
-      [path, 'market', type, page, pageSize].joinPath();
 
   String download({required StringParam schemeId}) => [path, 'download', schemeId].joinPath();
 
-  String like({required StringParam schemeId, required StringParam isLike}) =>
+  String like({required StringParam schemeId, required StringParam isLike}) => [path, 'like', schemeId, isLike].joinPath();
-      [path, 'like', schemeId, isLike].joinPath();
 
   String get userLikes => [path, 'user-likes'].joinPath();
 }

api/lib/src/config/plugins/orm.dart

@@ -3,32 +3,11 @@ import 'dart:io';
 import 'package:angel3_framework/angel3_framework.dart';
 import 'package:angel3_orm/angel3_orm.dart';
 import 'package:angel3_orm_postgres/angel3_orm_postgres.dart';
-import 'package:logging/logging.dart';
 import 'package:postgres/postgres.dart';
 
-const times = ['', 'st', 'nd', 'rd'];
-
-const retryTimeOut = Duration(seconds: 30);
-
 Future<void> configureServer(Angel app) async {
-  final _log = Logger('OrmPlugin');
+  var connection = await connectToPostgres(app.configuration);
-  late PostgreSQLConnection connection;
-  var _startTime = DateTime.now();
-  var _retry = 1;
-  while (_startTime.difference(DateTime.now()).abs() <= retryTimeOut) {
-    try {
-      connection = await connectToPostgres(app.configuration);
   await connection.open();
-      break;
-    } catch (e, st) {
-      await connection.close();
-      _log.severe(
-          'Failed to connect, the $_retry${_retry <= 3 ? times[_retry] : 'th'} retry will do in a second.', e, st);
-      sleep(Duration(seconds: 1));
-      _retry++;
-      if (_startTime.difference(DateTime.now()).abs() > retryTimeOut) rethrow;
-    }
-  }
 
   var logger = app.environment.isProduction ? null : app.logger;
   var executor = PostgreSqlExecutor(connection, logger: logger);

api/lib/src/models/scheme.dart

@@ -111,9 +111,6 @@ abstract class _SchemeForDownload {
   @SerializableField(isNullable: false)
   String? get name;
 
-  @SerializableField(defaultValue: false, isNullable: false)
-  bool? get shared;
-
   @Column(type: ColumnType.text)
   String? description;
 
@@ -127,7 +124,6 @@ SchemeForDownload transSchemeForDownload(Scheme scheme) => SchemeForDownload(
       name: scheme.name,
       description: scheme.description,
       gestures: scheme.gestures,
-      shared: scheme.shared,
     );
 
 @serializable
@@ -182,4 +178,4 @@ MarketSchemeTransMetaData transMarketSchemeMetaData(MarketScheme scheme) => Mark
   name: scheme.name,
   likes: scheme.metadata?['likes'] ?? 0,
   downloads: scheme.metadata?['downloads'] ?? 0,
-    );
+);

api/lib/src/models/user.dart

@@ -16,7 +16,7 @@ abstract class _User extends BaseModel {
   @SerializableField(isNullable: false)
   String? get email;
 
-  @Column(isNullable: false, length: 64)
+  @Column(isNullable: false, length: 32)
   @SerializableField(isNullable: true, exclude: true)
   String? get password;
 

api/lib/src/routes/controllers/auth_controllers.dart

@@ -6,7 +6,6 @@ import 'package:angel3_framework/angel3_framework.dart';
 import 'package:dde_gesture_manager_api/apis.dart';
 import 'package:dde_gesture_manager_api/models.dart';
 import 'package:dde_gesture_manager_api/src/routes/controllers/middlewares.dart';
-import 'package:logging/logging.dart';
 import 'package:mailer/mailer.dart';
 import 'package:mailer/smtp_server.dart';
 import 'package:uuid/uuid.dart';
@@ -46,9 +45,7 @@ Future configureServer(Angel app) async {
           },
         );
 
-      SendReport report = await send(message, smtpServer);
+      send(message, smtpServer);
-      Logger('auth_controller').info(report);
-
       return res.notFound();
     } else if (user.value.password != userParams.password) {
       return res.unauthorized();

api/lib/src/routes/controllers/scheme_controllers.dart

@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:io';
 
 import 'package:angel3_framework/angel3_framework.dart';
 import 'package:dde_gesture_manager_api/apis.dart';
@@ -22,21 +21,13 @@ Future configureServer(Angel app) async {
           try {
             var scheme = SchemeSerializer.fromMap(req.bodyAsMap);
             var schemeQuery = SchemeQuery();
-            schemeQuery.where!.uuid.notEquals(scheme.uuid!);
-            schemeQuery.where!.name.equals(scheme.name!);
-            if ((await schemeQuery.getOne(req.queryExecutor)).isNotEmpty) {
-              res.statusCode = HttpStatus.locked;
-              return res.close();
-            }
-            req.queryExecutor.transaction((tx) async {
-              schemeQuery = SchemeQuery();
             schemeQuery.where!.uuid.equals(scheme.uuid!);
+            req.queryExecutor.transaction((tx) async {
               var one = await schemeQuery.getOne(tx);
               schemeQuery = SchemeQuery();
               schemeQuery.values.copyFrom(scheme);
               schemeQuery.values.uid = req.user!.idAsInt;
               if (one.isEmpty) {
-                schemeQuery.values.metadata = {'author': req.user!.email};
                 return await schemeQuery.insert(tx);
               } else {
                 schemeQuery.whereId = one.value.idAsInt;

api/lib/src/routes/routes.dart

@@ -1,6 +1,5 @@
 import 'package:angel3_framework/angel3_framework.dart';
 import 'package:angel3_cors/angel3_cors.dart';
-import 'package:angel3_static/angel3_static.dart';
 import 'package:file/file.dart';
 import 'controllers/auth_controllers.dart' as auth_controllers;
 import 'controllers/system_controllers.dart' as system_controllers;
@@ -29,9 +28,6 @@ AngelConfigurer configureServer(FileSystem fileSystem) {
     await app.configure(auth_controllers.configureServer);
     await app.configure(scheme_controllers.configureServer);
 
-    var vDir = VirtualDirectory(app, fileSystem, source: fileSystem.directory('web'));
-    app.fallback(vDir.handleRequest);
-
     // Throw a 404 if no route matched the request.
     app.fallback((req, res) => throw AngelHttpException.notFound());
 

api/pubspec.yaml

@@ -12,7 +12,6 @@ dependencies:
   angel3_orm: ^4.0.6
   angel3_orm_postgres: ^3.3.0
   angel3_serialize: ^4.1.0
-  angel3_static: ^4.1.0
   angel3_production: ^3.1.2
   belatuk_pretty_logging: ^4.0.0
   optional: ^6.0.0

api/views/layout.html

@@ -1,13 +1,10 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
+  <head>
-    <meta charset="utf-8"/>
+    <meta charset="utf-8" />
     <title>{% block title %}{% endblock %}</title>
-    <link rel="shortcut icon" href="/images/favicon.png"/>
+  </head>
-    <link rel="bookmark" href="/images/favicon.png"/>
+  <body>
-    <link rel="stylesheet" type="text/css" href="/css/site.css"/>
+    {% block body %}{% endblock %}
-</head>
+  </body>
-<body>
-{% block body %}{% endblock %}
-</body>
 </html>

api/web/css/site.css

@@ -1,9 +1,27 @@
 html, body {
     height: 100%;
-    padding: 0;
-    margin: 0;
 }
 
 body {
-    margin: .5em;
+    margin: 0;
+    padding: 0;
+    width: 100%;
+    display: table;
+    font-weight: 100;
+    font-family: 'Lato', sans-serif;
+}
+
+.container {
+    text-align: center;
+    display: table-cell;
+    vertical-align: middle;
+}
+
+.content {
+    text-align: center;
+    display: inline-block;
+}
+
+.title {
+    font-size: 96px;
 }

app/.gitignore

@@ -45,6 +45,3 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
-
-/deb_builder/
-*.deb

app/3rd_party/cherry_toast/lib/cherry_toast.dart

@@ -288,8 +288,6 @@ class _CherryToastState extends State<CherryToast> with TickerProviderStateMixin
   late AnimationController slideController;
   late BoxDecoration toastDecoration;
 
-  bool _dismissed = false;
-
   @override
   void initState() {
     super.initState();
@@ -313,10 +311,7 @@ class _CherryToastState extends State<CherryToast> with TickerProviderStateMixin
       Timer(this.widget.toastDuration, () {
         slideController.reverse();
         Timer(this.widget.animationDuration, () {
-          if (mounted && !_dismissed) {
+          if (mounted) Navigator.pop(context);
-            _dismissed = true;
-            Navigator.pop(context);
-          }
         });
       });
     }
@@ -468,10 +463,7 @@ class _CherryToastState extends State<CherryToast> with TickerProviderStateMixin
       onTap: () {
         slideController.reverse();
         Timer(this.widget.animationDuration, () {
-          if (mounted && !_dismissed) {
+          if (mounted) Navigator.pop(context);
-            _dismissed = true;
-            Navigator.pop(context);
-          }
         });
       },
       child: Icon(Icons.close, color: Colors.grey[500], size: CLOSE_BUTTON_SIZE),

app/3rd_party/markdown_core/lib/builder.dart

@@ -19,7 +19,6 @@ class MarkdownBuilder implements md.NodeVisitor {
     this.defaultTextStyle, {
     this.tagTextStyle = defaultTagTextStyle,
     required this.onCodeCopied,
-    this.richTap,
   });
 
   final _widgets = <Widget>[];
@@ -31,7 +30,6 @@ class MarkdownBuilder implements md.NodeVisitor {
 
   final BuildContext context;
   final LinkTap linkTap;
-  final VoidCallback? richTap;
   final WidgetImage widgetImage;
   final double maxWidth;
   final Function onCodeCopied;
@@ -127,7 +125,6 @@ class MarkdownBuilder implements md.NodeVisitor {
               children: last.textSpans,
               style: last.textStyle,
             ),
-            onTap: richTap,
           );
         }
       }

app/3rd_party/markdown_core/lib/markdown.dart

@@ -14,7 +14,6 @@ class Markdown extends StatefulWidget {
     required this.onCodeCopied,
     this.maxWidth,
     this.textStyle,
-    this.richTap,
   }) : super(key: key);
 
   final String data;
@@ -29,8 +28,6 @@ class Markdown extends StatefulWidget {
 
   final Function onCodeCopied;
 
-  final VoidCallback? richTap;
-
   @override
   MarkdownState createState() => MarkdownState();
 }
@@ -65,7 +62,6 @@ class MarkdownState extends State<Markdown> {
       widget.maxWidth ?? MediaQuery.of(context).size.width,
       widget.textStyle ?? defaultTextStyle(context),
       onCodeCopied: widget.onCodeCopied,
-      richTap: widget.richTap,
     ).build(nodes);
   }
 }

app/3rd_party/markdown_editor_ot/lib/markdown_editor.dart

@@ -2,4 +2,3 @@ library markdown_editor;
 
 export 'package:markdown_editor_ot/src/editor.dart';
 export 'package:markdown_editor_ot/src/preview.dart';
-export 'package:markdown_editor_ot/src/action.dart';

app/3rd_party/markdown_editor_ot/lib/src/action.dart

@@ -11,7 +11,6 @@ class ActionImage extends StatefulWidget {
     this.imageSelect,
     required this.color,
     this.getCursorPosition,
-    required this.message,
   })  : super(key: key);
 
   final ActionType type;
@@ -21,8 +20,6 @@ class ActionImage extends StatefulWidget {
 
   final Color? color;
 
-  final String? message;
-
   @override
   ActionImageState createState() => ActionImageState();
 }
@@ -63,7 +60,7 @@ class ActionImageState extends State<ActionImage> {
   Widget build(BuildContext context) {
     return Tooltip(
       preferBelow: false,
-      message: widget.message ?? _defaultImageAttributes
+      message: _defaultImageAttributes
           .firstWhere((img) => img.type == widget.type)
           .tip,
       child: IconButton(
@@ -246,6 +243,7 @@ enum ActionType {
   fontBold,
   fontItalic,
   fontStrikethrough,
+  fontDeleteLine,
   textQuote,
   list,
   h1,

app/3rd_party/markdown_editor_ot/lib/src/editor.dart

@@ -24,7 +24,6 @@ class MdEditor extends StatefulWidget {
     this.appendBottomWidget,
     this.splitWidget,
     this.textFocusNode,
-    required this.actionMessages,
     required this.onComplete,
   }) : super(key: key);
 
@@ -52,8 +51,6 @@ class MdEditor extends StatefulWidget {
 
   final OnComplete onComplete;
 
-  final Map<ActionType, String> actionMessages;
-
   @override
   State<StatefulWidget> createState() => MdEditorState();
 }
@@ -189,7 +186,6 @@ class MdEditorState extends State<MdEditor> with AutomaticKeepAliveClientMixin {
 
                   widgets.add(ActionImage(
                     type: ActionType.done,
-                    message: widget.actionMessages[ActionType.done],
                     color: widget.actionIconColor,
                     tap: (t, s, i, [p]) {
                       widget.onComplete(getText());
@@ -198,7 +194,6 @@ class MdEditorState extends State<MdEditor> with AutomaticKeepAliveClientMixin {
 
                   widgets.add(ActionImage(
                     type: ActionType.undo,
-                    message: widget.actionMessages[ActionType.undo],
                     color: widget.actionIconColor,
                     tap: (t, s, i, [p]) {
                       _editPerform.undo();
@@ -206,7 +201,6 @@ class MdEditorState extends State<MdEditor> with AutomaticKeepAliveClientMixin {
                   ));
                   widgets.add(ActionImage(
                     type: ActionType.redo,
-                    message: widget.actionMessages[ActionType.redo],
                     color: widget.actionIconColor,
                     tap: (t, s, i, [p]) {
                       _editPerform.redo();
@@ -243,7 +237,6 @@ class MdEditorState extends State<MdEditor> with AutomaticKeepAliveClientMixin {
       sortValue: getSortValue(ActionType.image),
       widget: ActionImage(
         type: ActionType.image,
-        message: widget.actionMessages[ActionType.image],
         color: widget.actionIconColor,
         tap: _disposeText,
         imageSelect: widget.imageSelect,
@@ -254,7 +247,6 @@ class MdEditorState extends State<MdEditor> with AutomaticKeepAliveClientMixin {
       sortValue: getSortValue(ActionType.link),
       widget: ActionImage(
         type: ActionType.link,
-        message: widget.actionMessages[ActionType.link],
         color: widget.actionIconColor,
         tap: _disposeText,
       ),
@@ -263,7 +255,6 @@ class MdEditorState extends State<MdEditor> with AutomaticKeepAliveClientMixin {
       sortValue: getSortValue(ActionType.fontBold),
       widget: ActionImage(
         type: ActionType.fontBold,
-        message: widget.actionMessages[ActionType.fontBold],
         color: widget.actionIconColor,
         tap: _disposeText,
       ),
@@ -272,7 +263,6 @@ class MdEditorState extends State<MdEditor> with AutomaticKeepAliveClientMixin {
       sortValue: getSortValue(ActionType.fontItalic),
       widget: ActionImage(
         type: ActionType.fontItalic,
-        message: widget.actionMessages[ActionType.fontItalic],
         color: widget.actionIconColor,
         tap: _disposeText,
       ),
@@ -281,7 +271,6 @@ class MdEditorState extends State<MdEditor> with AutomaticKeepAliveClientMixin {
       sortValue: getSortValue(ActionType.fontStrikethrough),
       widget: ActionImage(
         type: ActionType.fontStrikethrough,
-        message: widget.actionMessages[ActionType.fontStrikethrough],
         color: widget.actionIconColor,
         tap: _disposeText,
       ),
@@ -290,7 +279,6 @@ class MdEditorState extends State<MdEditor> with AutomaticKeepAliveClientMixin {
       sortValue: getSortValue(ActionType.textQuote),
       widget: ActionImage(
         type: ActionType.textQuote,
-        message: widget.actionMessages[ActionType.textQuote],
         color: widget.actionIconColor,
         tap: _disposeText,
       ),
@@ -299,7 +287,6 @@ class MdEditorState extends State<MdEditor> with AutomaticKeepAliveClientMixin {
       sortValue: getSortValue(ActionType.list),
       widget: ActionImage(
         type: ActionType.list,
-        message: widget.actionMessages[ActionType.list],
         color: widget.actionIconColor,
         tap: _disposeText,
       ),
@@ -308,7 +295,6 @@ class MdEditorState extends State<MdEditor> with AutomaticKeepAliveClientMixin {
       sortValue: getSortValue(ActionType.h4),
       widget: ActionImage(
         type: ActionType.h4,
-        message: widget.actionMessages[ActionType.h4],
         color: widget.actionIconColor,
         tap: _disposeText,
       ),
@@ -317,7 +303,6 @@ class MdEditorState extends State<MdEditor> with AutomaticKeepAliveClientMixin {
       sortValue: getSortValue(ActionType.h5),
       widget: ActionImage(
         type: ActionType.h5,
-        message: widget.actionMessages[ActionType.h5],
         color: widget.actionIconColor,
         tap: _disposeText,
       ),
@@ -326,7 +311,6 @@ class MdEditorState extends State<MdEditor> with AutomaticKeepAliveClientMixin {
       sortValue: getSortValue(ActionType.h1),
       widget: ActionImage(
         type: ActionType.h1,
-        message: widget.actionMessages[ActionType.h1],
         color: widget.actionIconColor,
         tap: _disposeText,
       ),
@@ -335,7 +319,6 @@ class MdEditorState extends State<MdEditor> with AutomaticKeepAliveClientMixin {
       sortValue: getSortValue(ActionType.h2),
       widget: ActionImage(
         type: ActionType.h2,
-        message: widget.actionMessages[ActionType.h2],
         color: widget.actionIconColor,
         tap: _disposeText,
       ),
@@ -344,7 +327,6 @@ class MdEditorState extends State<MdEditor> with AutomaticKeepAliveClientMixin {
       sortValue: getSortValue(ActionType.h3),
       widget: ActionImage(
         type: ActionType.h3,
-        message: widget.actionMessages[ActionType.h3],
         color: widget.actionIconColor,
         tap: _disposeText,
       ),

app/3rd_party/markdown_editor_ot/lib/src/preview.dart

@@ -11,7 +11,6 @@ class MdPreview extends StatefulWidget {
     required this.widgetImage,
     required this.onCodeCopied,
     this.textStyle,
-    this.richTap,
   }) : super(key: key);
 
   final String text;
@@ -25,8 +24,6 @@ class MdPreview extends StatefulWidget {
   /// If [onTapLink] is null,it will open the link with your default browser.
   final TapLinkCallback? onTapLink;
 
-  final VoidCallback? richTap;
-
   @override
   State<StatefulWidget> createState() => MdPreviewState();
 }
@@ -53,7 +50,6 @@ class MdPreviewState extends State<MdPreview>
               image: widget.widgetImage,
               textStyle: widget.textStyle,
               onCodeCopied: widget.onCodeCopied,
-              richTap: widget.richTap,
             );
           },
         ),

app/build_deb.sh

@@ -1,89 +0,0 @@
-#!/usr/bin/env bash
-
-cd ../api || exit
-bash source_gen.sh
-
-cd ../app || exit
-bash source_gen.sh
-
-
-VERSION=$(dart version.dart)
-
-if [ -e pubspec.yaml.bak ]; then
-    mv pubspec.yaml.bak pubspec.yaml
-fi
-
-flutter clean
-
-cp pubspec.yaml pubspec.yaml.bak
-ln -s /usr/share/fonts/opentype/noto/ noto_fonts
-
-cat >> pubspec.yaml << EOF
-  fonts:
-    - family: NotoSansSC
-      fonts:
-        - asset: noto_fonts/NotoSansCJK-Regular.ttc
-          weight: 400
-        - asset: noto_fonts/NotoSansCJK-Bold.ttc
-          weight: 700
-
-EOF
-
-flutter build linux
-
-rm pubspec.yaml
-rm noto_fonts
-mv pubspec.yaml.bak pubspec.yaml
-
-if [ -e deb_builder ]; then
-    rm -rf deb_builder
-fi
-
-
-mkdir "deb_builder"
-
-cp -r debian deb_builder/DEBIAN
-
-cp ../LICENSE deb_builder/DEBIAN/copyright
-
-echo "设置版本号为: $VERSION"
-
-echo Version: "$VERSION" >> deb_builder/DEBIAN/control
-
-mkdir -p deb_builder/opt/apps/com.debuggerx.dde-gesture-manager/
-
-cp -r dde_package_info/* deb_builder/opt/apps/com.debuggerx.dde-gesture-manager/
-
-ARCH="x64"
-
-if [[ $(uname -m) == aarch64 ]]; then
-  ARCH="arm64"
-  sed -i "s/amd64/$ARCH/g" deb_builder/opt/apps/com.debuggerx.dde-gesture-manager/info
-  sed -i "s/amd64/$ARCH/g" deb_builder/DEBIAN/control
-fi
-
-cp -r build/linux/"$ARCH"/release/bundle deb_builder/opt/apps/com.debuggerx.dde-gesture-manager/files
-
-rm -rf deb_builder/opt/apps/com.debuggerx.dde-gesture-manager/files/data/flutter_assets/noto_fonts/
-
-ln -s /usr/share/fonts/opentype/noto/ deb_builder/opt/apps/com.debuggerx.dde-gesture-manager/files/data/flutter_assets/noto_fonts
-
-mkdir -p deb_builder/opt/apps/com.debuggerx.dde-gesture-manager/entries/icons/hicolor/scalable/apps/
-
-cp web/icons/Icon-512.png deb_builder/opt/apps/com.debuggerx.dde-gesture-manager/entries/icons/hicolor/scalable/apps/dgm.png
-
-sed -i "s/VERSION/$VERSION/g" deb_builder/opt/apps/com.debuggerx.dde-gesture-manager/info
-
-sed -i "s/VERSION/$VERSION/g" deb_builder/opt/apps/com.debuggerx.dde-gesture-manager/entries/applications/com.debuggerx.dde-gesture-manager.desktop
-
-echo "开始打包 $ARCH deb"
-
-fakeroot dpkg-deb -b deb_builder
-
-if [[ $ARCH == "x64" ]]; then
-    ARCH="amd64"
-fi
-
-mv deb_builder.deb com.debuggerx.dde-gesture-manager_"$VERSION"_"$ARCH".deb
-
-echo "打包完成！"

app/build_web.sh

@@ -8,10 +8,7 @@ echo "Downloading WASM from $wasmLocation"
 curl -o build/web/canvaskit.js "$wasmLocation/canvaskit.js"
 curl -o build/web/canvaskit.wasm "$wasmLocation/canvaskit.wasm"
 sed -i -e "s!$wasmLocation!.!" \
-  -e "s!https://fonts.gstatic.com/s/roboto/v20/KFOmCnqEu92Fr1Me5WZLCzYlKw.ttf!./google_fonts/Roboto-Regular.ttf!" \
+  -e "s!https://fonts.gstatic.com/s/roboto/v20/KFOmCnqEu92Fr1Me5WZLCzYlKw.ttf!./assets/packages/amos_mobile_widgets/assets/google_fonts/Roboto-Regular.ttf!" \
   -e "s!https://fonts.googleapis.com/css2?family=Noto+Sans+Symbols!./assets/assets/css/Noto-Sans-Symbols.css!" \
   -e "s!https://fonts.googleapis.com/css2?family=Noto+Color+Emoji+Compat!./assets/assets/css/Noto-Color-Emoji-Compat.css!" \
   build/web/main.dart.js
-
-
-# git init && git add . && git commit -m 'update' && git remote add origin git@github.com:debuggerx01/dgm_web.git && git push --set-upstream origin master -f

app/dde_package_info/entries/applications/com.debuggerx.dde-gesture-manager.desktop

@@ -1,10 +0,0 @@
-[Desktop Entry]
-Categories=Utility;
-Comment=专为 DDE 桌面环境打造的触摸板手势管理工具（缩写：dgm），使用 Flutter 构建。
-Exec=/opt/apps/com.debuggerx.dde-gesture-manager/files/dde-gesture-manager
-Icon=dgm
-Name=DDE Gesture Manager
-Name[zh_CN]=DDE手势管理器
-Type=Application
-Version=VERSION
-X-Deepin-Vendor=user-custom

app/dde_package_info/info

@@ -1,17 +0,0 @@
-{
-    "appid": "com.debuggerx.dde-gesture-manager",
-    "name": "dde-gesture-manager",
-    "version": "VERSION",
-    "arch": ["amd64"],
-    "permissions": {
-        "autostart": true,
-        "notification": true,
-        "trayicon": false,
-        "clipboard": true,
-        "account": false,
-        "bluetooth": false,
-        "camera": false,
-        "audio_record": false,
-        "installed_apps": false
-    }
-}

app/debian/control

@@ -1,14 +0,0 @@
-Source: dde-gesture-manager
-Section: utils
-Priority: optional
-Maintainer: DebuggerX <dx8913712@163.com>
-Build-Depends:
- clang,
- cmake,
- libgtk-3-dev,
- ninja-build,
-Homepage: https://github.com/debuggerx01/dde_gesture_manager
-Package: com.debuggerx.dde-gesture-manager
-Architecture: amd64
-Depends: fonts-noto-cjk
-Description: 专为 DDE 桌面环境打造的触摸板手势管理工具（缩写：dgm），使用 Flutter 构建。

app/lib/constants/constants.dart

@@ -19,18 +19,6 @@ const double defaultBorderRadius = 8;
 
 const double defaultButtonHeight = 36;
 
-const userGestureConfigFilePath = 'deepin/dde-daemon/gesture.json';
-
-const defaultFontFamily = 'NotoSansSC';
-
-const deepinLogoutCommands = [
-  'dbus-send',
-  '--type=method_call',
-  '--dest=com.deepin.SessionManager',
-  '/com/deepin/SessionManager',
-  'com.deepin.SessionManager.RequestLogout'
-];
-
 const List<String> builtInCommands = [
   'ShowWorkspace',
   'Handle4Or5FingersSwipeUp',
@@ -52,9 +40,3 @@ enum PanelType {
   local_manager,
   market_or_me,
 }
-
-enum UploadRespStatus {
-  done,
-  name_occupied,
-  error,
-}

app/lib/constants/sp_keys.dart

@@ -5,5 +5,4 @@ class SPKeys {
   static final String accessToken = 'USER_ACCESS_TOKEN';
   static final String loginEmail = 'USER_LOGIN_EMAIL';
   static final String ignoredUpdateVersion = 'IGNORED_UPDATE_VERSION';
-  static final String readBulletinId = 'READ_BULLETIN_ID';
 }

app/lib/extensions/context_extension.dart

@@ -1,13 +1,7 @@
-import 'package:dde_gesture_manager/models/configs.provider.dart';
 import 'package:flutter/material.dart';
-import 'package:dde_gesture_manager/extensions.dart';
 
 extension ContextExtension on BuildContext {
   ThemeData get t => Theme.of(this);
 
   NavigatorState get n => Navigator.of(this);
-
-  bool get hasToken => this.read<ConfigsProvider>().accessToken.notNull;
-
-  bool get watchHasToken => this.watch<ConfigsProvider>().accessToken.notNull;
 }

app/lib/http/api.dart

@@ -1,7 +1,6 @@
 import 'dart:convert';
 import 'dart:io';
 
-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/scheme.dart' as AppScheme;
@@ -52,8 +51,6 @@ class Api {
         if (builder is GetStatusCodeFunc) return builder({"statusCode": resp.statusCode});
         T? res;
         try {
-          if (resp.statusCode != HttpStatus.ok && resp.bodyBytes.length == 0)
-            throw HttpErrorCode(resp.statusCode, message: 'No resp body from ${resp.request!.url.path}');
           var decodeBody = json.decode(utf8.decode(resp.bodyBytes));
           res = decodeBody is Map ? builder(decodeBody) : builder({'list': decodeBody});
         } catch (e) {
@@ -63,8 +60,6 @@ class Api {
         return res;
       };
 
-  static final _fullPathRegExp = RegExp('http(s?)://');
-
   static Future<T?> _get<T>(
     String path,
     BeanBuilder<T> builder, {
@@ -74,9 +69,7 @@ class Api {
   }) =>
       http
           .get(
-        path.startsWith(_fullPathRegExp)
+        Uri(
-            ? Uri.parse(path)
-            : Uri(
           scheme: Apis.apiScheme,
           host: Apis.apiHost,
           port: Apis.apiPort,
@@ -107,9 +100,7 @@ class Api {
   }) =>
       http
           .post(
-        path.startsWith(_fullPathRegExp)
+        Uri(
-            ? Uri.parse(path)
-            : Uri(
           scheme: Apis.apiScheme,
           host: Apis.apiHost,
           port: Apis.apiPort,
@@ -140,7 +131,7 @@ class Api {
         LoginSuccessSerializer.fromMap,
         body: {
           UserFields.email: email,
-          UserFields.password: User(email: email, password: password).secret('dgm_password'),
+          UserFields.password: password,
         },
         ignoreToken: true,
       );
@@ -155,7 +146,7 @@ class Api {
   static Future<bool> checkAuthStatus() => _get<int>(Apis.auth.status, getStatusCodeFunc, ignoreErrorHandle: true)
       .then((value) => value == HttpStatus.noContent);
 
-  static Future<UploadRespStatus> uploadScheme({required AppScheme.Scheme scheme, required bool share}) => _post(
+  static Future<bool> uploadScheme({required AppScheme.Scheme scheme, required bool share}) => _post(
         Apis.scheme.upload,
         getStatusCodeFunc,
         body: SchemeSerializer.toMap(
@@ -167,17 +158,7 @@ class Api {
             shared: share,
           ),
         ),
-      ).then((value) {
+      ).then((value) => value == HttpStatus.noContent);
-        switch (value) {
-          case HttpStatus.noContent:
-            return UploadRespStatus.done;
-          case HttpStatus.locked:
-            return UploadRespStatus.name_occupied;
-          case HttpStatus.unprocessableEntity:
-          default:
-            return UploadRespStatus.error;
-        }
-      });
 
   static Future<List<SimpleSchemeTransMetaData>?> userSchemes({required SchemeListType type}) =>
       _get(Apis.scheme.user(type: type.name.param), listRespBuilderWrap(SimpleSchemeTransMetaDataSerializer.fromMap));
@@ -205,26 +186,6 @@ class Api {
         Apis.scheme.userLikes,
         (e) => (e['list'] as List).cast<int>(),
       );
-
-  static Future<AppBulletinResp?> checkBulletin(bool isWeb) => _get(
-        Apis.appBulletinUrl(isWeb),
-        AppBulletinResp.fromMap,
-        ignoreErrorHandle: true,
-        ignoreToken: true,
-      ).catchError((_) {});
-}
-
-class AppBulletinResp {
-  int? id;
-  bool? once;
-  String? title;
-  String? content;
-
-  AppBulletinResp.fromMap(Map map)
-      : id = map['id'],
-        once = map['once'],
-        title = map['title'],
-        content = map['content'];
 }
 
 class MarketSchemeTransMetaDataResp {

app/lib/main.dart

@@ -11,11 +11,8 @@ import 'package:dde_gesture_manager/themes/dark.dart';
 import 'package:dde_gesture_manager/themes/light.dart';
 import 'package:dde_gesture_manager/utils/helper.dart';
 import 'package:dde_gesture_manager/utils/init.dart';
-import 'package:dde_gesture_manager/utils/notificator.dart';
 import 'package:dde_gesture_manager/utils/simple_throttle.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:sentry_flutter/sentry_flutter.dart';
 
 import 'pages/home.dart';
 
@@ -24,23 +21,13 @@ Future<void> main() async {
   EasyLocalization.logger.enableLevels = [];
   await EasyLocalization.ensureInitialized();
   await initConfigs();
-  await SentryFlutter.init(
+  runApp(EasyLocalization(
-    (options) {
-      options.dsn = 'https://febbfdeac6874a01b5fee56b2ba9515c@o644838.ingest.sentry.io/6216990';
-      // Set tracesSampleRate to 1.0 to capture 100% of transactions for performance monitoring.
-      // We recommend adjusting this value in production.
-      options.tracesSampleRate = kReleaseMode ? 0.1 : 1.0;
-      options.reportPackages = false;
-      options.maxDeduplicationItems = 3;
-    },
-    appRunner: () => runApp(EasyLocalization(
     supportedLocales: supportedLocales,
     fallbackLocale: zh_CN,
     path: 'resources/langs',
     assetLoader: CodegenLoader(),
     child: MyApp(),
-    )),
+  ));
-  );
 }
 
 class MyApp extends StatelessWidget {
@@ -86,11 +73,6 @@ class MyApp extends StatelessWidget {
               Future.microtask(() {
                 initEvents(context);
                 SimpleThrottle.throttledFunc(_checkAuthStatus, timeout: const Duration(minutes: 5))?.call(context);
-                SimpleThrottle.throttledFunc(
-                  Sentry.captureMessage,
-                  timeout: const Duration(days: 1),
-                )?.call('App launched');
-                SimpleThrottle.throttledFunc(_checkBulletin, timeout: const Duration(days: 1))?.call(context);
               });
               return Container();
             }),
@@ -106,7 +88,7 @@ class MyApp extends StatelessWidget {
 void _checkAuthStatus(BuildContext context) {
   if (H().lastCheckAuthStatusTime != null &&
       H().lastCheckAuthStatusTime!.difference(DateTime.now()) < Duration(minutes: 10)) return;
-  if (context.hasToken) {
+  if (context.read<ConfigsProvider>().accessToken.notNull) {
     Api.checkAuthStatus().then((value) {
       if (!value) context.read<ConfigsProvider>().setProps(email: '', accessToken: '');
     });
@@ -114,14 +96,3 @@ void _checkAuthStatus(BuildContext context) {
     H().lastCheckAuthStatusTime = DateTime.now();
   }
 }
-
-void _checkBulletin(BuildContext context) {
-  Api.checkBulletin(kIsWeb).then((value) {
-    if (value != null && value.id != null) {
-      if (value.once == false || (H().sp.getInt(SPKeys.readBulletinId) ?? 0) < value.id!) {
-        Notificator.showAlert(title: value.title ?? '', description: value.content ?? '');
-      }
-      H().sp.setInt(SPKeys.readBulletinId, value.id!);
-    }
-  });
-}

app/lib/models/configs.dart

@@ -2,7 +2,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';
-import 'package:sentry_flutter/sentry_flutter.dart';
 
 enum BrightnessMode {
   system,
@@ -46,12 +45,9 @@ class Configs {
 
   set email(String? emailAddress) {
     _email = emailAddress;
-    if (emailAddress.notNull) {
+    if (emailAddress.notNull)
       H().sp.updateString(SPKeys.loginEmail, emailAddress!);
-      Sentry.configureScope(
+    else
-        (scope) => scope.user = SentryUser(email: emailAddress),
-      );
-    } else
       H().sp.remove(SPKeys.loginEmail);
   }
 

app/lib/models/local_schemes_web.dart

@@ -19,26 +19,28 @@ class LocalSchemes implements LocalSchemesInterface<LocalSchemeEntryWeb> {
 
   @override
   Future<List<LocalSchemeEntryWeb>> get schemeEntries async {
-    List<LocalSchemeEntryWeb> _localeSchemes = [];
+    return window.localStorage.keys
-    for (var key in window.localStorage.keys) {
+        .map<LocalSchemeEntryWeb?>((key) {
           if (key.startsWith('schemes.')) {
-        var content = window.localStorage[key] ?? '';
+            LocalSchemeEntryWeb? entry;
-        var schemeJson;
             try {
-          schemeJson = json.decode(content);
+              var content = window.localStorage[key] ?? '';
-        } catch (e) {
+              var schemeJson = json.decode(content);
-          e.sout();
+              entry = LocalSchemeEntryWeb(
-        }
-        if (schemeJson != null) {
-          _localeSchemes.add(LocalSchemeEntryWeb(
                 path: key,
                 scheme: Scheme.parse(schemeJson),
                 lastModifyTime: DateTime.parse(schemeJson['modified_at']),
-          ));
+              );
+            } catch (e) {
+              e.sout();
             }
+            return entry;
           }
-    }
+          return null;
-    return Future.value(_localeSchemes);
+        })
+        .where((e) => e != null)
+        .cast<LocalSchemeEntryWeb>()
+        .toList();
   }
 
   @ProviderModelProp()
@@ -47,7 +49,7 @@ class LocalSchemes implements LocalSchemesInterface<LocalSchemeEntryWeb> {
   @override
   Future<LocalSchemeEntry> create() => Future.value(
         LocalSchemeEntryWeb(
-          path: 'schemes.${Uuid().v1()}',
+          path: Uuid().v1(),
           scheme: Scheme.create(),
           lastModifyTime: DateTime.now(),
         ),
@@ -82,9 +84,7 @@ class LocalSchemeEntryWeb implements LocalSchemeEntry {
 
   @override
   save(LocalSchemesProvider provider) {
-    var schemeMap = scheme.toJson();
+    window.localStorage[path] = JsonEncoder.withIndent(' ' * 4).convert(scheme);
-    schemeMap['modified_at'] = DateTime.now().toIso8601String();
-    window.localStorage[path] = JsonEncoder.withIndent(' ' * 4).convert(schemeMap);
     provider.schemes!.firstWhere((ele) => ele.scheme.id == scheme.id).lastModifyTime = DateTime.now();
     provider.setProps(schemes: [...provider.schemes!]..sort());
   }

app/lib/pages/content.dart

@@ -54,7 +54,7 @@ class _ContentState extends State<Content> {
           mainAxisSize: MainAxisSize.max,
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: [
-            LocalManager(key: H.localManagerKey),
+            LocalManager(),
             GestureEditor(),
             MarketOrMe(),
           ],

app/lib/pages/gesture_editor.dart

@@ -2,6 +2,7 @@ import 'package:adaptive_scrollbar/adaptive_scrollbar.dart';
 import 'package:dde_gesture_manager/constants/constants.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/content_layout.provider.dart';
 import 'package:dde_gesture_manager/models/local_schemes_provider.dart';
 import 'package:dde_gesture_manager/models/scheme.dart';
@@ -300,11 +301,7 @@ class GestureEditor extends StatelessWidget {
                               child: DButton.upload(
                                 enabled: schemeProvider.readOnly == false,
                                 onTap: () async {
-                                  if (schemeProvider.description.isNull) {
+                                  if (context.read<ConfigsProvider>().accessToken.isNull) {
-                                    Notificator.error(context, title: LocaleKeys.info_upload_pls_add_description.tr());
-                                    return;
-                                  }
-                                  if (!context.hasToken) {
                                     return Notificator.showAlert(
                                       title: LocaleKeys.info_login_for_upload_title.tr(),
                                       description: LocaleKeys.info_login_for_upload_description.tr(),
@@ -329,7 +326,7 @@ class GestureEditor extends StatelessWidget {
 
                                     if (_share != null) {
                                       Api.uploadScheme(scheme: schemeProvider, share: _share).then((value) {
-                                        if (value == UploadRespStatus.done) {
+                                        if (value) {
                                           Notificator.success(context, title: LocaleKeys.info_upload_success.tr());
                                           var localSchemesProvider = context.read<LocalSchemesProvider>();
                                           var localSchemeEntry = localSchemesProvider.schemes!
@@ -339,12 +336,6 @@ class GestureEditor extends StatelessWidget {
                                           context
                                               .read<SchemeListRefreshKeyProvider>()
                                               .setProps(refreshKey: DateTime.now().millisecondsSinceEpoch);
-                                        } else if (value == UploadRespStatus.name_occupied) {
-                                          Notificator.error(
-                                            context,
-                                            title: LocaleKeys.info_upload_name_occupied.tr(),
-                                            description: LocaleKeys.info_upload_pls_rename.tr(),
-                                          );
                                         } else {
                                           Notificator.error(context, title: LocaleKeys.info_upload_failed.tr());
                                         }
@@ -604,11 +595,13 @@ Widget _buildCommandCellsEditing(BuildContext context) {
                     ('${LocaleKeys.built_in_commands}.$e').tr(),
                     textScaleFactor: .8,
                   ),
-                  value: e,
+                  value: ('${LocaleKeys.built_in_commands}.$e').tr(),
                 ),
               )
               .toList(),
-          value: (builtInCommands.contains(gesture.command) ? gesture.command : builtInCommands.first)!,
+          value:
+              ('${LocaleKeys.built_in_commands}.${(builtInCommands.contains(gesture.command) ? gesture.command : builtInCommands.first)!}')
+                  .tr(),
           onChanged: (value) => context.read<GesturePropProvider>().setProps(
                 command: value,
                 editMode: true,

app/lib/pages/local_manager.dart

@@ -8,12 +8,9 @@ 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/apply_scheme_interface.dart';
 import 'package:dde_gesture_manager/widgets/dde_button.dart';
-import 'package:dde_gesture_manager_api/models.dart' show SchemeForDownload;
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:sentry_flutter/sentry_flutter.dart';
 import 'package:uuid/uuid.dart';
 
 class LocalManager extends StatefulWidget {
@@ -22,10 +19,10 @@ class LocalManager extends StatefulWidget {
   }) : super(key: key);
 
   @override
-  State<LocalManager> createState() => LocalManagerState();
+  State<LocalManager> createState() => _LocalManagerState();
 }
 
-class LocalManagerState extends State<LocalManager> {
+class _LocalManagerState extends State<LocalManager> {
   late ScrollController _scrollController;
   String? _hoveringItemPath;
   late String _selectedItemPath;
@@ -72,28 +69,6 @@ class LocalManagerState extends State<LocalManager> {
     context.read<GesturePropProvider>().copyFrom(GestureProp.empty());
   }
 
-  Future addLocalScheme(BuildContext context, [SchemeForDownload? downloadedScheme = null]) async {
-    var localSchemesProvider = context.read<LocalSchemesProvider>();
-    var newSchemes = [...?localSchemesProvider.schemes];
-    var newEntry = await localSchemesProvider.create();
-    if (downloadedScheme != null) {
-      newEntry.scheme
-        ..id = downloadedScheme.uuid
-        ..name = downloadedScheme.name
-        ..description = downloadedScheme.description
-        ..uploaded = true
-        ..fromMarket = downloadedScheme.shared == true
-        ..gestures = (downloadedScheme.gestures ?? []).map(GestureProp.parse).toList();
-    }
-    newSchemes.add(newEntry);
-    localSchemesProvider.setProps(schemes: newSchemes..sort());
-    newEntry.save(localSchemesProvider);
-    setState(() {
-      _selectedItemPath = newEntry.path;
-    });
-    _handleItemClick(context, newEntry);
-  }
-
   @override
   Widget build(BuildContext context) {
     var isOpen = context.watch<ContentLayoutProvider>().localManagerOpened == true;
@@ -217,7 +192,15 @@ class LocalManagerState extends State<LocalManager> {
                               DButton.add(
                                 enabled: true,
                                 onTap: () async {
-                                  await addLocalScheme(context);
+                                  var localSchemesProvider = context.read<LocalSchemesProvider>();
+                                  var newSchemes = [...?localSchemesProvider.schemes];
+                                  var newEntry = await localSchemesProvider.create();
+                                  newSchemes.add(newEntry);
+                                  localSchemesProvider.setProps(schemes: newSchemes..sort());
+                                  setState(() {
+                                    _selectedItemPath = newEntry.path;
+                                  });
+                                  _handleItemClick(context, newEntry);
                                 },
                               ),
                               DButton.delete(
@@ -259,11 +242,10 @@ class LocalManagerState extends State<LocalManager> {
                               DButton.apply(
                                 enabled: true,
                                 onTap: () {
-                                  var appliedScheme =
+                                  var appliedId =
-                                      localSchemes.firstWhere((ele) => ele.path == _selectedItemPath).scheme;
+                                      localSchemes.firstWhere((ele) => ele.path == _selectedItemPath).scheme.id!;
-                                  context.read<ConfigsProvider>().setProps(appliedSchemeId: appliedScheme.id);
+                                  appliedId.sout();
-                                  SchemeApplyUtil().apply(context, appliedScheme);
+                                  context.read<ConfigsProvider>().setProps(appliedSchemeId: appliedId);
-                                  Sentry.captureMessage('Scheme applied: [${appliedScheme.name}](${appliedScheme.id})');
                                 },
                               ),
                             ]

app/lib/pages/market_or_me.dart

@@ -1,5 +1,6 @@
 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';
@@ -78,11 +79,11 @@ class MarketOrMe extends StatelessWidget {
     );
   }
 
-  Widget buildMeContent(BuildContext context) => context.watchHasToken
+  Widget buildMeContent(BuildContext context) {
-      ? Expanded(
+    var accessToken = context.watch<ConfigsProvider>().accessToken;
-          child: MeWidget(),
+    if (accessToken.isNull) return LoginWidget();
-        )
+    return Expanded(child: MeWidget());
-      : LoginWidget();
+  }
 
   Widget buildMarketContent(BuildContext context) => Expanded(child: MarketWidget());
 }

app/lib/themes/dark.dart

@@ -1,13 +1,7 @@
-import 'package:dde_gesture_manager/constants/constants.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:dde_gesture_manager/constants/constants.dart';
 
-final _darkTheme = ThemeData(
+var darkTheme = ThemeData.dark().copyWith(
-  brightness: Brightness.dark,
-  fontFamily: kIsWeb ? null : defaultFontFamily,
-);
-
-var darkTheme = _darkTheme.copyWith(
   primaryColor: Colors.grey,
   scaffoldBackgroundColor: Color(0xff252525),
   backgroundColor: Color(0xff282828),
@@ -15,26 +9,23 @@ var darkTheme = _darkTheme.copyWith(
     color: Color(0xffc0c6d4),
   ),
   dividerColor: Color(0xfff3f3f3),
-  textTheme: _darkTheme.textTheme.copyWith(
+  textTheme: ThemeData.dark().textTheme.copyWith(
         headline1: TextStyle(
           color: Color(0xffc0c6d4),
-          fontFamily: kIsWeb ? null : defaultFontFamily,
         ),
         bodyText2: TextStyle(
           color: Color(0xffc0c6d4),
-          fontFamily: kIsWeb ? null : defaultFontFamily,
         ),
       ),
-  popupMenuTheme: _darkTheme.popupMenuTheme.copyWith(
+  popupMenuTheme: ThemeData.dark().popupMenuTheme.copyWith(
         shape: RoundedRectangleBorder(
           borderRadius: BorderRadius.circular(defaultBorderRadius),
         ),
       ),
   dialogBackgroundColor: Color(0xff202020),
-  tooltipTheme: _darkTheme.tooltipTheme.copyWith(
+  tooltipTheme: ThemeData.dark().tooltipTheme.copyWith(
         textStyle: TextStyle(
           color: Colors.grey,
-          fontFamily: kIsWeb ? null : defaultFontFamily,
         ),
         padding: EdgeInsets.symmetric(horizontal: 3, vertical: 2),
         decoration: BoxDecoration(

app/lib/themes/light.dart

@@ -1,40 +1,31 @@
 import 'package:dde_gesture_manager/constants/constants.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
-final _lightTheme = ThemeData(
+var lightTheme = ThemeData.light().copyWith(
-  brightness: Brightness.light,
-  fontFamily: kIsWeb ? null : defaultFontFamily,
-);
-
-var lightTheme = _lightTheme.copyWith(
   primaryColor: Colors.blue,
   scaffoldBackgroundColor: Color(0xfff8f8f8),
   backgroundColor: Color(0xffffffff),
   iconTheme: IconThemeData(
     color: Color(0xff414d68),
   ),
-  dividerColor: Colors.grey.shade600,
+  dividerColor: Color(0xfff3f3f3),
-  textTheme: _lightTheme.textTheme.copyWith(
+  textTheme: ThemeData.light().textTheme.copyWith(
         headline1: TextStyle(
           color: Color(0xff414d68),
-          fontFamily: kIsWeb ? null : defaultFontFamily,
         ),
         bodyText2: TextStyle(
           color: Color(0xff414d68),
-          fontFamily: kIsWeb ? null : defaultFontFamily,
         ),
       ),
-  popupMenuTheme: _lightTheme.popupMenuTheme.copyWith(
+  popupMenuTheme: ThemeData.dark().popupMenuTheme.copyWith(
         shape: RoundedRectangleBorder(
           borderRadius: BorderRadius.circular(defaultBorderRadius),
         ),
       ),
   dialogBackgroundColor: Color(0xfffefefe),
-  tooltipTheme: _lightTheme.tooltipTheme.copyWith(
+  tooltipTheme: ThemeData.dark().tooltipTheme.copyWith(
         textStyle: TextStyle(
           color: Colors.grey.shade600,
-          fontFamily: kIsWeb ? null : defaultFontFamily,
         ),
         padding: EdgeInsets.symmetric(horizontal: 3, vertical: 2),
         decoration: BoxDecoration(

app/lib/utils/apply_scheme_interface.dart

@@ -1,7 +0,0 @@
-import 'package:dde_gesture_manager/models/scheme.dart';
-import 'package:flutter/material.dart';
-export 'apply_scheme_web.dart' if (dart.library.io) 'apply_scheme_linux.dart';
-
-abstract class SchemeApplyUtilStub {
-  void apply(BuildContext context, Scheme scheme);
-}

app/lib/utils/apply_scheme_linux.dart

@@ -1,40 +0,0 @@
-import 'dart:io';
-
-import 'package:dde_gesture_manager/constants/constants.dart';
-import 'package:dde_gesture_manager/extensions.dart';
-import 'package:dde_gesture_manager/models/scheme.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_platform_alert/flutter_platform_alert.dart';
-import 'package:uuid/uuid.dart';
-import 'apply_scheme_interface.dart';
-import 'package:xdg_directories/xdg_directories.dart' as xdg;
-import 'package:path/path.dart' show join;
-
-class SchemeApplyUtil implements SchemeApplyUtilStub {
-  void apply(BuildContext context, Scheme scheme) {
-    var configFilePath = join(xdg.configHome.path, userGestureConfigFilePath);
-    configFilePath.sout();
-    var file = File(configFilePath);
-    if (scheme.id == Uuid.NAMESPACE_NIL) {
-      if (file.existsSync()) file.deleteSync();
-    } else {
-      if (!file.existsSync()) file.createSync(recursive: true);
-      file.writeAsStringSync(
-        H.transGesturePropsToConfig(scheme.gestures ?? []),
-        flush: true,
-      );
-      Notificator.showConfirm(
-        title: LocaleKeys.info_apply_scheme_success.tr(),
-        description: LocaleKeys.info_apply_scheme_description.tr(),
-        positiveButtonTitle: LocaleKeys.info_apply_scheme_logout_immediately.tr(),
-        negativeButtonTitle: LocaleKeys.str_cancel.tr(),
-      ).then((value) {
-        if (value == CustomButton.positiveButton) {
-          Process.run(deepinLogoutCommands.first, deepinLogoutCommands.skip(1).toList());
-        }
-      });
-    }
-  }
-}

app/lib/utils/apply_scheme_web.dart

@@ -1,38 +0,0 @@
-import 'package:dde_gesture_manager/constants/constants.dart';
-import 'package:dde_gesture_manager/extensions.dart';
-import 'package:dde_gesture_manager/models/scheme.dart';
-import 'package:dde_gesture_manager/utils/helper.dart';
-import 'package:dde_gesture_manager/utils/notificator.dart';
-import 'package:flutter/material.dart';
-import 'package:uuid/uuid.dart';
-import 'apply_scheme_interface.dart';
-import 'package:flutter/services.dart';
-
-class SchemeApplyUtil implements SchemeApplyUtilStub {
-  void apply(BuildContext context, Scheme scheme) {
-    var cmd = scheme.id == Uuid.NAMESPACE_NIL
-        ? [
-            'rm \$XDG_CONFIG_HOME/${userGestureConfigFilePath}',
-          ]
-        : [
-            'cat > \$XDG_CONFIG_HOME/${userGestureConfigFilePath} << EOF',
-            '${H.transGesturePropsToConfig(scheme.gestures ?? [])}',
-            'EOF',
-          ];
-    cmd.add('dialog'
-        ' --title "${LocaleKeys.info_apply_scheme_success.tr()}"'
-        ' --yes-label "${LocaleKeys.info_apply_scheme_logout_immediately.tr()}"'
-        ' --no-label "${LocaleKeys.str_cancel.tr()}"'
-        ' --yesno "${LocaleKeys.info_apply_scheme_description.tr()}"'
-        ' 8 30'
-        ' && ${deepinLogoutCommands.join(' ')}');
-    Clipboard.setData(ClipboardData(
-      text: cmd.join('\n'),
-    ));
-    Notificator.success(
-      context,
-      title: LocaleKeys.info_apply_scheme_commands_copied_title.tr(),
-      description: LocaleKeys.info_apply_scheme_commands_copied_description.tr(),
-    );
-  }
-}

app/lib/utils/helper.dart

@@ -1,14 +1,9 @@
-import 'dart:convert';
-
 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/models/scheme.dart';
-import 'package:dde_gesture_manager/pages/local_manager.dart';
-import 'package:dde_gesture_manager_api/src/models/scheme.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:url_launcher/url_launcher.dart';
 import 'package:uuid/uuid.dart';
 
 extension EnumByName<T extends Enum> on Iterable<T> {
@@ -41,8 +36,6 @@ class H {
 
   DateTime? lastCheckAuthStatusTime;
 
-  static final localManagerKey = GlobalKey<LocalManagerState>();
-
   initTopContext(BuildContext context) {
     _topContext = context;
   }
@@ -121,34 +114,6 @@ class H {
     gestureProp.direction = tree.availableNode.availableNode.availableNode.direction;
     return gestureProp;
   }
-
-  static void launchURL(String url) async {
-    if (await canLaunch(url)) {
-      await launch(url);
-    } else {
-      throw 'Could not launch $url';
-    }
-  }
-
-  static void handleDownloadScheme(BuildContext context, SchemeForDownload value) =>
-      localManagerKey.currentState?.addLocalScheme(context, value);
-
-  static String transGesturePropsToConfig(List<GestureProp> gestures) =>
-      JsonEncoder.withIndent(' ' * 4).convert(gestures
-          .map(
-            (gesture) => {
-              "Event": {
-                "Name": gesture.gesture!.name,
-                "Direction": H.getGestureDirectionName(gesture.direction),
-                "Fingers": gesture.fingers,
-              },
-              "Action": {
-                "Type": gesture.type!.name,
-                "Action": gesture.command,
-              },
-            },
-          )
-          .toList());
 }
 
 class PreferredPanelsStatus {

app/lib/widgets/dde_button.dart

@@ -24,7 +24,7 @@ class DButton extends StatefulWidget {
 
   factory DButton.add({
     Key? key,
-    required bool enabled,
+    required enabled,
     GestureTapCallback? onTap,
     height = defaultButtonHeight * .7,
     width = defaultButtonHeight * .7,
@@ -41,7 +41,7 @@ class DButton extends StatefulWidget {
 
   factory DButton.delete({
     Key? key,
-    required bool enabled,
+    required enabled,
     GestureTapCallback? onTap,
     height = defaultButtonHeight * .7,
     width = defaultButtonHeight * .7,
@@ -58,7 +58,7 @@ class DButton extends StatefulWidget {
 
   factory DButton.apply({
     Key? key,
-    required bool enabled,
+    required enabled,
     GestureTapCallback? onTap,
     height = defaultButtonHeight * .7,
     width = defaultButtonHeight * .7,
@@ -75,7 +75,7 @@ class DButton extends StatefulWidget {
 
   factory DButton.duplicate({
     Key? key,
-    required bool enabled,
+    required enabled,
     GestureTapCallback? onTap,
     height = defaultButtonHeight * .7,
     width = defaultButtonHeight * .7,
@@ -92,7 +92,7 @@ class DButton extends StatefulWidget {
 
   factory DButton.paste({
     Key? key,
-    required bool enabled,
+    required enabled,
     GestureTapCallback? onTap,
     height = defaultButtonHeight * .7,
     width = defaultButtonHeight * .7,
@@ -109,7 +109,7 @@ class DButton extends StatefulWidget {
 
   factory DButton.logout({
     Key? key,
-    required bool enabled,
+    required enabled,
     GestureTapCallback? onTap,
     height = defaultButtonHeight,
     width = defaultButtonHeight,
@@ -126,7 +126,7 @@ class DButton extends StatefulWidget {
 
   factory DButton.upload({
     Key? key,
-    required bool enabled,
+    required enabled,
     GestureTapCallback? onTap,
     height = defaultButtonHeight,
     width = defaultButtonHeight,
@@ -143,7 +143,7 @@ class DButton extends StatefulWidget {
 
   factory DButton.download({
     Key? key,
-    required bool enabled,
+    required enabled,
     GestureTapCallback? onTap,
     height = defaultButtonHeight * .7,
     width = defaultButtonHeight * .7,
@@ -160,7 +160,7 @@ class DButton extends StatefulWidget {
 
   factory DButton.share({
     Key? key,
-    required bool enabled,
+    required enabled,
     GestureTapCallback? onTap,
     height = defaultButtonHeight * .7,
     width = defaultButtonHeight * .7,
@@ -177,7 +177,7 @@ class DButton extends StatefulWidget {
 
   factory DButton.like({
     Key? key,
-    required bool enabled,
+    required enabled,
     GestureTapCallback? onTap,
     height = defaultButtonHeight * .7,
     width = defaultButtonHeight * .7,

app/lib/widgets/dde_markdown_field.dart

@@ -2,10 +2,10 @@ 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/helper.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';
 
 class DMarkdownField extends StatefulWidget {
   const DMarkdownField({
@@ -36,6 +36,14 @@ class _DMarkdownFieldState extends State<DMarkdownField> {
     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) {
@@ -46,14 +54,6 @@ class _DMarkdownFieldState extends State<DMarkdownField> {
     super.didUpdateWidget(oldWidget);
   }
 
-  VoidCallback? get _onMdPreviewTap => widget.readOnly
-      ? null
-      : () {
-          setState(() {
-            _previewText = null;
-          });
-        };
-
   @override
   Widget build(BuildContext context) {
     return Focus(
@@ -70,15 +70,19 @@ class _DMarkdownFieldState extends State<DMarkdownField> {
           ),
           child: isPreview
               ? GestureDetector(
-                  onTap: _onMdPreviewTap,
+                  onTap: widget.readOnly
+                      ? null
+                      : () {
+                          setState(() {
+                            _previewText = null;
+                          });
+                        },
                   child: MouseRegion(
                     cursor: widget.readOnly ? SystemMouseCursors.basic : SystemMouseCursors.text,
                     child: MdPreview(
                       text: _previewText ?? '',
                       padding: EdgeInsets.only(left: 15),
-                      onTapLink: H.launchURL,
+                      onTapLink: _launchURL,
-                      richTap: _onMdPreviewTap,
-                      textStyle: context.t.textTheme.bodyText2,
                       onCodeCopied: () {
                         Notificator.success(
                           context,
@@ -100,7 +104,6 @@ class _DMarkdownFieldState extends State<DMarkdownField> {
                 )
               : MdEditor(
                   initText: widget.initText,
-                  hintText: LocaleKeys.md_editor_init_text.tr(),
                   textFocusNode: _focusNode,
                   padding: EdgeInsets.symmetric(horizontal: 5),
                   onComplete: (content) {
@@ -111,23 +114,6 @@ class _DMarkdownFieldState extends State<DMarkdownField> {
                     else
                       widget.onComplete(content);
                   },
-                  actionMessages: {
-                    ActionType.done: LocaleKeys.md_editor_done.tr(),
-                    ActionType.undo: LocaleKeys.md_editor_undo.tr(),
-                    ActionType.redo: LocaleKeys.md_editor_redo.tr(),
-                    ActionType.image: LocaleKeys.md_editor_image.tr(),
-                    ActionType.link: LocaleKeys.md_editor_link.tr(),
-                    ActionType.fontBold: LocaleKeys.md_editor_font_bold.tr(),
-                    ActionType.fontItalic: LocaleKeys.md_editor_font_italic.tr(),
-                    ActionType.fontStrikethrough: LocaleKeys.md_editor_font_strikethrough.tr(),
-                    ActionType.textQuote: LocaleKeys.md_editor_text_quote.tr(),
-                    ActionType.list: LocaleKeys.md_editor_list.tr(),
-                    ActionType.h1: LocaleKeys.md_editor_h1.tr(),
-                    ActionType.h2: LocaleKeys.md_editor_h2.tr(),
-                    ActionType.h3: LocaleKeys.md_editor_h3.tr(),
-                    ActionType.h4: LocaleKeys.md_editor_h4.tr(),
-                    ActionType.h5: LocaleKeys.md_editor_h5.tr(),
-                  },
                 ),
         );
       }),

app/lib/widgets/help_button.dart

@@ -1,8 +1,5 @@
 import 'package:dde_gesture_manager/extensions.dart';
-import 'package:dde_gesture_manager_api/apis.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:url_launcher/url_launcher.dart';
 
 class HelpButton extends StatelessWidget {
   const HelpButton({Key? key}) : super(key: key);
@@ -10,11 +7,7 @@ class HelpButton extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return GestureDetector(
-      onTap: () async {
+      onTap: () {},
-        if (await canLaunch(Apis.appManualUrl(kIsWeb))) {
-          await launch(Apis.appManualUrl(kIsWeb));
-        }
-      },
       child: MouseRegion(
         cursor: SystemMouseCursors.click,
         child: Tooltip(

app/lib/widgets/market.dart

@@ -2,9 +2,8 @@ import 'package:auto_size_text/auto_size_text.dart';
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:dde_gesture_manager/constants/constants.dart';
 import 'package:dde_gesture_manager/http/api.dart';
-import 'package:dde_gesture_manager/models/local_schemes_provider.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/widgets/dde_button.dart';
 import 'package:dde_gesture_manager_api/models.dart';
 import 'package:flutter/material.dart';
@@ -34,12 +33,12 @@ class _MarketWidgetState extends State<MarketWidget> {
   MarketSortType _type = MarketSortType.recommend;
   String? _selected;
   String? _hovering;
+  int _refreshKey = 0;
   List<int> _likedSchemes = [];
 
   @override
   void initState() {
     super.initState();
-    if (context.hasToken)
     Api.userLikes().then((value) {
       if (mounted && value != null)
         setState(() {
@@ -132,9 +131,6 @@ class _MarketWidgetState extends State<MarketWidget> {
           ),
         ),
         Expanded(
-          child: Column(
-            children: [
-              Flexible(
           child: Container(
             decoration: BoxDecoration(
               border: Border.all(
@@ -143,6 +139,9 @@ class _MarketWidgetState extends State<MarketWidget> {
               ),
               borderRadius: BorderRadius.circular(defaultBorderRadius),
             ),
+            child: Column(
+              children: [
+                Flexible(
                   child: Padding(
                     padding: EdgeInsets.symmetric(horizontal: 1, vertical: 2),
                     child: ListView.builder(
@@ -222,19 +221,8 @@ class _MarketWidgetState extends State<MarketWidget> {
                     ),
                   ),
                 ),
-              ),
+                Divider(thickness: .5),
-              Container(height: 10),
                 Flexible(
-                child: Container(
-                  height: double.infinity,
-                  width: double.infinity,
-                  decoration: BoxDecoration(
-                    border: Border.all(
-                      width: .3,
-                      color: context.t.dividerColor,
-                    ),
-                    borderRadius: BorderRadius.circular(defaultBorderRadius),
-                  ),
                   child: Padding(
                     padding: const EdgeInsets.only(left: 8),
                     child: MdPreview(
@@ -248,23 +236,21 @@ class _MarketWidgetState extends State<MarketWidget> {
                         ),
                         errorWidget: (context, url, error) => const Icon(Icons.error),
                       ),
-                      onTapLink: H.launchURL,
-                      textStyle: context.t.textTheme.bodyText2,
                       onCodeCopied: () {},
                     ),
                   ),
                 ),
-              ),
               ],
             ),
           ),
+        ),
         Padding(
           padding: const EdgeInsets.only(top: 5),
           child: Row(
             mainAxisAlignment: MainAxisAlignment.end,
             children: [
               DButton.like(
-                enabled: context.watchHasToken,
+                enabled: context.watch<ConfigsProvider>().accessToken.notNull,
                 onTap: () {
                   bool liked = _likedSchemes.contains(currentSelectedScheme!.id!);
                   Api.likeScheme(schemeId: currentSelectedScheme.uuid!, isLike: !liked).then((value) {
@@ -283,15 +269,14 @@ class _MarketWidgetState extends State<MarketWidget> {
                 },
               ),
               DButton.download(
-                enabled: (context.watch<LocalSchemesProvider>().schemes ?? []).every((e) => e.scheme.id != _selected),
+                enabled: true,
                 onTap: () {
                   Api.downloadScheme(schemeId: currentSelectedScheme!.uuid!).then((value) {
-                    if (value != null) {
+                    /// todo: 下载逻辑
-                      H.handleDownloadScheme(context, value);
+                    value.sout();
                     setState(() {
                       currentSelectedScheme.downloads = currentSelectedScheme.downloads! + 1;
                     });
-                    }
                   });
                 },
               ),

app/lib/widgets/me.dart

@@ -5,10 +5,8 @@ import 'package:dde_gesture_manager/constants/constants.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/local_schemes_provider.dart';
 import 'package:dde_gesture_manager/models/scheme_list_refresh_key.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:dde_gesture_manager/utils/simple_throttle.dart';
 import 'package:dde_gesture_manager_api/models.dart';
@@ -143,9 +141,6 @@ class _MeWidgetState extends State<MeWidget> {
             ),
           ),
           Expanded(
-            child: Column(
-              children: [
-                Flexible(
             child: Container(
               decoration: BoxDecoration(
                 border: Border.all(
@@ -154,6 +149,9 @@ class _MeWidgetState extends State<MeWidget> {
                 ),
                 borderRadius: BorderRadius.circular(defaultBorderRadius),
               ),
+              child: Column(
+                children: [
+                  Flexible(
                     child: Padding(
                       padding: EdgeInsets.symmetric(horizontal: 1, vertical: 2),
                       child: ListView.builder(
@@ -227,25 +225,12 @@ class _MeWidgetState extends State<MeWidget> {
                       ),
                     ),
                   ),
-                ),
+                  Divider(thickness: .5),
-                Container(height: 10),
                   Flexible(
-                  child: Container(
-                    width: double.infinity,
-                    height: double.infinity,
-                    decoration: BoxDecoration(
-                      border: Border.all(
-                        width: .3,
-                        color: context.t.dividerColor,
-                      ),
-                      borderRadius: BorderRadius.circular(defaultBorderRadius),
-                    ),
                     child: Padding(
                       padding: const EdgeInsets.only(left: 8),
                       child: MdPreview(
                         text: _schemes.firstWhereOrNull((e) => e.uuid == _selected)?.description ?? '',
-                        onTapLink: H.launchURL,
-                        textStyle: context.t.textTheme.bodyText2,
                         widgetImage: (imageUrl) => CachedNetworkImage(
                           imageUrl: imageUrl,
                           placeholder: (context, url) => const SizedBox(
@@ -258,11 +243,11 @@ class _MeWidgetState extends State<MeWidget> {
                         onCodeCopied: () {},
                       ),
                     ),
-                  ),
                   )
                 ],
               ),
             ),
+          ),
           Padding(
             padding: const EdgeInsets.only(top: 5),
             child: Row(
@@ -296,15 +281,14 @@ class _MeWidgetState extends State<MeWidget> {
                   },
                 ),
                 DButton.download(
-                  enabled: (context.watch<LocalSchemesProvider>().schemes ?? []).every((e) => e.scheme.id != _selected),
+                  enabled: true,
                   onTap: () {
                     Api.downloadScheme(schemeId: currentSelectedScheme!.uuid!).then((value) {
-                      if (value != null) {
+                      /// todo: 下载逻辑
-                        H.handleDownloadScheme(context, value);
+                      value.sout();
                       context
                           .read<SchemeListRefreshKeyProvider>()
                           .setProps(refreshKey: DateTime.now().millisecondsSinceEpoch);
-                      }
                     });
                   },
                 ),

app/lib/widgets/table_cell_shortcut_listener.dart

@@ -23,7 +23,8 @@ class TableCellShortcutListener extends StatefulWidget {
 
 class _TableCellShortcutListenerState extends State<TableCellShortcutListener> {
   List<KeyNames> _shortcut = [];
-  final FocusNode _focusNode = FocusNode();
+  bool inputMode = false;
+  FocusNode _focusNode = FocusNode();
 
   _handleFocusChange() {
     if (!_focusNode.hasFocus) {
@@ -42,7 +43,6 @@ class _TableCellShortcutListenerState extends State<TableCellShortcutListener> {
 
   @override
   void initState() {
-    super.initState();
     var __shortcut = widget.initShortcut.split('+');
     __shortcut.forEach((name) {
       var keyNames = getPhysicalKeyNamesByRealName(name);
@@ -50,6 +50,7 @@ class _TableCellShortcutListenerState extends State<TableCellShortcutListener> {
     });
     _shortcut.sort();
     _focusNode.addListener(_handleFocusChange);
+    super.initState();
   }
 
   @override
@@ -69,8 +70,8 @@ class _TableCellShortcutListenerState extends State<TableCellShortcutListener> {
         onTap: () {
           setState(() {
             _shortcut = [];
+            inputMode = true;
           });
-          _focusNode.requestFocus();
         },
         child: Focus(
           autofocus: true,

app/linux/flutter/generated_plugin_registrant.cc

@@ -7,7 +7,6 @@
 #include "generated_plugin_registrant.h"
 
 #include <flutter_platform_alert/flutter_platform_alert_plugin.h>
-#include <sentry_flutter/sentry_flutter_plugin.h>
 #include <url_launcher_linux/url_launcher_plugin.h>
 #include <window_manager/window_manager_plugin.h>
 
@@ -15,9 +14,6 @@ void fl_register_plugins(FlPluginRegistry* registry) {
   g_autoptr(FlPluginRegistrar) flutter_platform_alert_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterPlatformAlertPlugin");
   flutter_platform_alert_plugin_register_with_registrar(flutter_platform_alert_registrar);
-  g_autoptr(FlPluginRegistrar) sentry_flutter_registrar =
-      fl_plugin_registry_get_registrar_for_plugin(registry, "SentryFlutterPlugin");
-  sentry_flutter_plugin_register_with_registrar(sentry_flutter_registrar);
   g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin");
   url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar);

app/linux/flutter/generated_plugins.cmake

@@ -4,7 +4,6 @@
 
 list(APPEND FLUTTER_PLUGIN_LIST
   flutter_platform_alert
-  sentry_flutter
   url_launcher_linux
   window_manager
 )

app/pubspec.yaml

@@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.0.1+1
+version: 1.0.0+1
 
 environment:
   sdk: ">=2.15.0 <3.0.0"
@@ -30,7 +30,7 @@ dependencies:
   xdg_directories: ^0.2.0
   gsettings: 0.2.3
   provider: ^6.0.2
-  package_info_plus: 1.3.0
+  package_info_plus: ^1.3.0
   easy_localization: ^3.0.0
   glass_kit: ^2.0.1
   rect_getter: ^1.0.0
@@ -43,7 +43,6 @@ dependencies:
   flutter_login: ^3.1.0
   auto_size_text: ^3.0.0
   numeral: ^1.2.5
-  sentry_flutter: ^6.3.0
   markdown_editor_ot:
     path: 3rd_party/markdown_editor_ot
   cherry_toast:
@@ -58,7 +57,6 @@ dev_dependencies:
     sdk: flutter
   build_runner: 2.1.7
   source_gen: 1.2.1
-  yaml: any
 
 
 # For information on the generic Dart part of this file, see the

app/resources/langs/en.json

@@ -154,22 +154,12 @@
     },
     "upload": {
       "success": "Upload success ~",
-      "failed": "Upload failed..",
+      "failed": "Upload failed.."
-      "name_occupied": "Name occupied……",
-      "pls_rename": "Please rename",
-      "pls_add_description": "Please enter the scheme description"
     },
     "share": {
       "title": "Are you sure to sharing?",
       "description": "Other users can see this scheme and download it after share",
       "success": "Share success"
-    },
-    "apply_scheme": {
-      "success": "Apply success",
-      "description": "The gesture scheme will take effect after logout, pay attention to the save work data~",
-      "logout_immediately": "Logout",
-      "commands_copied_title": "Commands copied!",
-      "commands_copied_description": "Please open the terminal and paste the command to execute"
     }
   },
   "me": {
@@ -185,23 +175,5 @@
       "downloaded": "Downloaded",
       "liked": "Liked"
     }
-  },
-  "md_editor": {
-    "init_text": "Please enter a description",
-    "done": "Done",
-    "undo": "Undo",
-    "redo": "redo",
-    "image": "Image",
-    "link": "Link",
-    "font_bold": "FontBold",
-    "font_italic": "FontItalic",
-    "font_strikethrough": "FontStrikethrough",
-    "text_quote": "TextQuote",
-    "list": "List",
-    "h1": "H1",
-    "h2": "H2",
-    "h3": "H3",
-    "h4": "H4",
-    "h5": "H5"
   }
 }

app/resources/langs/zh-CN.json

@@ -154,22 +154,12 @@
     },
     "upload": {
       "success": "上传成功～",
-      "failed": "上传失败。。",
+      "failed": "上传失败。。"
-      "name_occupied": "名称被占用……",
-      "pls_rename": "请重新命名",
-      "pls_add_description": "请填写方案描述～"
     },
     "share": {
       "title": "确定分享？",
       "description": "分享后其他用户可以看到本方案并下载使用",
       "success": "分享成功"
-    },
-    "apply_scheme": {
-      "success": "设置成功",
-      "description": "手势方案需注销后才能生效，注销前注意保存工作进度~",
-      "logout_immediately": "立即注销",
-      "commands_copied_title": "命令复制成功！",
-      "commands_copied_description": "请打开终端后粘贴命令并执行"
     }
   },
   "me": {
@@ -185,23 +175,5 @@
       "downloaded": "我的下载",
       "liked": "我的点赞"
     }
-  },
-  "md_editor": {
-    "init_text": "请输入描述",
-    "done": "完成",
-    "undo": "撤销",
-    "redo": "重做",
-    "image": "图片",
-    "link": "链接",
-    "font_bold": "加粗",
-    "font_italic": "斜体",
-    "font_strikethrough": "删除线",
-    "text_quote": "文字引用",
-    "list": "无序列表",
-    "h1": "一级标题",
-    "h2": "二级标题",
-    "h3": "三级标题",
-    "h4": "四级标题",
-    "h5": "五级标题"
   }
 }

app/version.dart

@@ -1,8 +0,0 @@
-import 'dart:io';
-
-import 'package:yaml/yaml.dart';
-
-void main() async {
-  var document = loadYaml(File('pubspec.yaml').readAsStringSync());
-  print(document['version'].replaceAll('+', '.'));
-}

app/web/bulletin.json

@@ -1,6 +0,0 @@
-{
-  "id": 1,
-  "once": true,
-  "title": "欢迎",
-  "content": "感谢使用本工具，使用前建议先点击右下角阅读使用说明哦～"
-}

app/web/index.html

@@ -17,8 +17,6 @@
   <meta content="IE=Edge" http-equiv="X-UA-Compatible">
   <meta name="description" content="A new Flutter project.">
 
-  <link rel="shortcut icon" href="icons/Icon-192.png" type="image/x-icon" />
-
   <!-- iOS meta tags & icons -->
   <meta name="apple-mobile-web-app-capable" content="yes">
   <meta name="apple-mobile-web-app-status-bar-style" content="black">
@@ -27,16 +25,6 @@
 
   <title>dde_gesture_manager</title>
   <link rel="manifest" href="manifest.json">
-  <!-- Baidu statistics -->
-  <script>
-    var _hmt = _hmt || [];
-    (function() {
-      var hm = document.createElement("script");
-      hm.src = "https://hm.baidu.com/hm.js?45acc9824a216a8f1792b419eb91f090";
-      var s = document.getElementsByTagName("script")[0];
-      s.parentNode.insertBefore(hm, s);
-    })();
-  </script>
 </head>
 <body>
   <!-- This script installs service_worker.js to provide PWA functionality to