add theme

lib/base/routes.dart

@@ -1,6 +1,8 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:qinglong_app/module/config/config_edit_page.dart';
+import 'package:qinglong_app/module/env/add_env_page.dart';
+import 'package:qinglong_app/module/env/env_bean.dart';
 import 'package:qinglong_app/module/home/home_page.dart';
 import 'package:qinglong_app/module/login/login_page.dart';
 import 'package:qinglong_app/module/task/add_task_page.dart';
@@ -10,6 +12,7 @@ class Routes {
   static const String route_HomePage = "/home/homepage";
   static const String route_LOGIN = "/login";
   static const String route_AddTask = "/task/add";
+  static const String route_AddEnv = "/env/add";
   static const String route_ConfigEdit = "/config/edit";
 
   static Route<dynamic>? generateRoute(RouteSettings settings) {
@@ -27,6 +30,15 @@ class Routes {
         } else {
           return CupertinoPageRoute(builder: (context) => const AddTaskPage());
         }
+      case route_AddEnv:
+        if (settings.arguments != null) {
+          return CupertinoPageRoute(
+              builder: (context) => AddEnvPage(
+                    taskBean: settings.arguments as EnvBean,
+                  ));
+        } else {
+          return CupertinoPageRoute(builder: (context) => const AddEnvPage());
+        }
       case route_ConfigEdit:
         return CupertinoPageRoute(
           builder: (context) => ConfigEditPage(

lib/module/config/config_page.dart

@@ -57,6 +57,9 @@ class ConfigPageState extends State<ConfigPage> with SingleTickerProviderStateMi
                         child: HighlightView(
                           model.content[e.title] ?? "",
                           language: "sh",
+                          padding: const EdgeInsets.symmetric(
+                            horizontal: 15,
+                          ),
                           theme: ref.watch(themeProvider).themeColor.codeEditorTheme(),
                           tabSize: 14,
                         ),

lib/module/env/add_env_page.dart

@@ -0,0 +1,199 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:qinglong_app/base/common_dialog.dart';
+import 'package:qinglong_app/base/http/api.dart';
+import 'package:qinglong_app/base/http/http.dart';
+import 'package:qinglong_app/base/ql_app_bar.dart';
+import 'package:qinglong_app/module/env/env_bean.dart';
+import 'package:qinglong_app/module/env/env_viewmodel.dart';
+import 'package:qinglong_app/module/task/task_bean.dart';
+import 'package:qinglong_app/module/task/task_detail/task_detail_bean.dart';
+import 'package:qinglong_app/module/task/task_viewmodel.dart';
+
+class AddEnvPage extends ConsumerStatefulWidget {
+  final EnvBean? taskBean;
+
+  const AddEnvPage({Key? key, this.taskBean}) : super(key: key);
+
+  @override
+  ConsumerState<AddEnvPage> createState() => _AddEnvPageState();
+}
+
+class _AddEnvPageState extends ConsumerState<AddEnvPage> {
+  late EnvBean envBean;
+
+  final TextEditingController _nameController = TextEditingController();
+  final TextEditingController _valueController = TextEditingController();
+  final TextEditingController _remarkController = TextEditingController();
+
+  @override
+  void initState() {
+    super.initState();
+    if (widget.taskBean != null) {
+      envBean = widget.taskBean!;
+      _nameController.text = envBean.name ?? "";
+      _valueController.text = envBean.value ?? "";
+      _remarkController.text = envBean.remarks ?? "";
+    } else {
+      envBean = EnvBean();
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: QlAppBar(
+        canBack: true,
+        backCall: () {
+          Navigator.of(context).pop();
+        },
+        title: envBean.name == null ? "新增环境变量" : "编辑环境变量",
+        actions: [
+          InkWell(
+            onTap: () {
+              submit();
+            },
+            child: const Padding(
+              padding: EdgeInsets.symmetric(
+                horizontal: 15,
+              ),
+              child: Center(
+                child: Text("提交"),
+              ),
+            ),
+          )
+        ],
+      ),
+      body: Column(
+        mainAxisSize: MainAxisSize.min,
+        crossAxisAlignment: CrossAxisAlignment.start,
+        mainAxisAlignment: MainAxisAlignment.start,
+        children: [
+          Padding(
+            padding: const EdgeInsets.symmetric(
+              horizontal: 15,
+            ),
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                const SizedBox(
+                  height: 10,
+                ),
+                const Text(
+                  "名称:",
+                  style: TextStyle(
+                    fontSize: 16,
+                    fontWeight: FontWeight.w600,
+                  ),
+                ),
+                const SizedBox(
+                  height: 10,
+                ),
+                TextField(
+                  controller: _nameController,
+                  decoration: const InputDecoration(
+                    contentPadding: EdgeInsets.fromLTRB(0, 5, 0, 5),
+                    hintText: "请输入名称",
+                  ),
+                  autofocus: false,
+                ),
+              ],
+            ),
+          ),
+          Padding(
+            padding: const EdgeInsets.symmetric(
+              horizontal: 15,
+            ),
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                const SizedBox(
+                  height: 10,
+                ),
+                const Text(
+                  "值:",
+                  style: TextStyle(
+                    fontSize: 16,
+                    fontWeight: FontWeight.w600,
+                  ),
+                ),
+                const SizedBox(
+                  height: 10,
+                ),
+                TextField(
+                  controller: _valueController,
+                  maxLines: 8,
+                  minLines: 1,
+                  decoration: const InputDecoration(
+                    contentPadding: EdgeInsets.fromLTRB(0, 5, 0, 5),
+                    hintText: "请输入值",
+                  ),
+                  autofocus: false,
+                ),
+              ],
+            ),
+          ),
+          Padding(
+            padding: const EdgeInsets.symmetric(
+              horizontal: 15,
+            ),
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                const SizedBox(
+                  height: 10,
+                ),
+                const Text(
+                  "备注:",
+                  style: TextStyle(
+                    fontSize: 16,
+                    fontWeight: FontWeight.w600,
+                  ),
+                ),
+                const SizedBox(
+                  height: 10,
+                ),
+                TextField(
+                  controller: _remarkController,
+                  decoration: const InputDecoration(
+                    contentPadding: EdgeInsets.fromLTRB(0, 5, 0, 5),
+                    hintText: "请输入备注",
+                  ),
+                  autofocus: false,
+                ),
+              ],
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  void submit() async {
+    if (_nameController.text.isEmpty) {
+      failDialog(context, "名称不能为空");
+      return;
+    }
+    if (_valueController.text.isEmpty) {
+      failDialog(context, "值不能为空");
+      return;
+    }
+
+    envBean.name = _nameController.text;
+    envBean.value = _valueController.text;
+    envBean.remarks = _remarkController.text;
+    HttpResponse<EnvBean> response = await Api.addEnv(_nameController.text, _valueController.text, _remarkController.text, id: envBean.sId);
+
+    if (response.success) {
+      successDialog(context, "操作成功").then((value) {
+        ref.read(envProvider).updateEnv(envBean);
+        Navigator.of(context).pop();
+      });
+    } else {
+      failDialog(context, response.message ?? "");
+    }
+  }
+}

lib/module/env/env_page.dart

@@ -5,6 +5,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_slidable/flutter_slidable.dart';
 import 'package:qinglong_app/base/base_state_widget.dart';
 import 'package:qinglong_app/base/common_dialog.dart';
+import 'package:qinglong_app/base/routes.dart';
 import 'package:qinglong_app/base/theme.dart';
 import 'package:qinglong_app/base/ui/empty_widget.dart';
 import 'package:qinglong_app/module/env/env_bean.dart';
@@ -31,7 +32,11 @@ class _EnvPageState extends State<EnvPage> {
               (value.name?.contains(_searchController.text) ?? false) ||
               (value.value?.contains(_searchController.text) ?? false) ||
               (value.remarks?.contains(_searchController.text) ?? false)) {
-            list.add(EnvItemCell(value, ref,key: ValueKey(value.sId),));
+            list.add(EnvItemCell(
+              value,
+              ref,
+              key: ValueKey(value.sId),
+            ));
           }
         }
 
@@ -126,7 +131,9 @@ class EnvItemCell extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Slidable(
+    return ColoredBox(
+      color: ref.watch(themeProvider).themeColor.settingBgColor(),
+      child: Slidable(
         key: ValueKey(bean.sId),
         endActionPane: ActionPane(
           motion: const ScrollMotion(),
@@ -135,9 +142,11 @@ class EnvItemCell extends StatelessWidget {
             SlidableAction(
               backgroundColor: Colors.grey,
               flex: 1,
-            onPressed: (_) {},
+              onPressed: (_) {
+                Navigator.of(context).pushNamed(Routes.route_AddEnv, arguments: bean);
+              },
               foregroundColor: Colors.white,
-            icon: CupertinoIcons.pencil_outline,
+              icon: CupertinoIcons.pencil,
             ),
             SlidableAction(
               backgroundColor: Colors.orange,
@@ -234,6 +243,7 @@ class EnvItemCell extends StatelessWidget {
             ],
           ),
         ),
+      ),
     );
   }
 

lib/module/home/home_page.dart

@@ -3,7 +3,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:qinglong_app/base/ql_app_bar.dart';
 import 'package:qinglong_app/base/routes.dart';
-import 'package:qinglong_app/base/theme.dart';
 import 'package:qinglong_app/module/config/config_page.dart';
 import 'package:qinglong_app/module/env/env_page.dart';
 import 'package:qinglong_app/module/others/other_page.dart';
@@ -54,6 +53,25 @@ class _HomePageState extends ConsumerState<HomePage> {
           ),
         ),
       ));
+    } else if (_index == 1) {
+      actions.add(InkWell(
+        onTap: () {
+          Navigator.of(context).pushNamed(
+            Routes.route_AddEnv,
+          );
+        },
+        child: const Padding(
+          padding: EdgeInsets.symmetric(
+            horizontal: 15,
+          ),
+          child: Center(
+            child: Icon(
+              CupertinoIcons.add,
+              size: 20,
+            ),
+          ),
+        ),
+      ));
     } else if (_index == 2) {
       actions.add(InkWell(
         onTap: () {

lib/module/task/task_page.dart

@@ -99,7 +99,10 @@ class _TaskPageState extends State<TaskPage> {
               itemBuilder: (context, index) {
                 TaskBean item = list[index];
 
-                if ((item.name == null || item.name!.contains(_searchKey ?? "")) || (item.command == null || item.command!.contains(_searchKey ?? ""))) {
+                if (_searchController.text.isEmpty ||
+                    (item.name?.contains(_searchController.text) ?? false) ||
+                    (item.command?.contains(_searchController.text) ?? false) ||
+                    (item.schedule?.contains(_searchController.text) ?? false)) {
                   return TaskItemCell(item, ref);
                 } else {
                   return const SizedBox.shrink();
@@ -163,7 +166,9 @@ class TaskItemCell extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return CupertinoContextMenu(
+    return ColoredBox(
+      color: ref.watch(themeProvider).themeColor.settingBgColor(),
+      child: CupertinoContextMenu(
         actions: [
           QLCupertinoContextMenuAction(
             child: Text(
@@ -315,6 +320,7 @@ class TaskItemCell extends StatelessWidget {
             ),
           ],
         ),
+      ),
     );
   }