beautified project editing window, added theme

.gitea/workflows/build.yaml

@@ -14,19 +14,32 @@ jobs:
   AMD64:
     name: AMD64 Build
     runs-on: linux-amd64
-
+    env:
+        RUNNER_TOOL_CACHE: /toolcache
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
           channel: master
 
-      - uses: actions/cache@v4
+      - uses: actions/setup-go@v3
         with:
-          path: /tmp/.buildx-cache
+          go-version: '1.20'
-          key: ${{ runner.os }}-buildx-${{ gitea.sha }}
+
+      - name: Generate Pub Hash
+        uses: https://gitea.com/actions/go-hashfiles@v0.0.1
+        id: pub-hash
+        with:
+          patterns: pubspec.lock
+
+      - name: Cache Pub Dependencies
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.pub-cache
+          key: ${{ runner.os }}-pub-${{ steps.pub-hash.outputs.hash }}
           restore-keys: |
-            ${{ runner.os }}-buildx-
+            ${{ runner.os }}-pub-${{ steps.pub-hash.outputs.hash }}
 
       - name: Install Framework Dependencies
         run: |
@@ -38,6 +51,7 @@ jobs:
         with:
           channel: master
           flutter-version: 3.38.9
+          cache: true
 
       - name: Check Flutter Installation
         run: flutter doctor -v
@@ -65,11 +79,11 @@ jobs:
       - name: Save Artifacts
         uses: actions/upload-artifact@v3
         with:
-          name: Prod-${{ github.ref_type == 'tag' && github.ref_name || 'master' }}-x86_64.AppImage
+          name: Prod-${{ github.ref_type == 'v*' && github.ref_name || 'master' }}-x86_64.AppImage
           path: Prod-latest-x86_64.AppImage
 
       - name: Create New Release
         uses: akkuman/gitea-release-action@v1
         with:
           files: Prod-latest-x86_64.AppImage
-          prerelease: ${{ github.ref_type == 'tag' }}
+          prerelease: ${{ github.ref_type != 'v*' }}

lib/main.dart

@@ -22,7 +22,7 @@ class MyApp extends StatelessWidget {
         return YaruTheme(
           builder: (context, yaru, child) {
             return MaterialApp(
-              theme: yaru.theme,
+              theme: yaruLight,
               themeMode: .system,
               darkTheme: yaru.darkTheme,
               routes: {

lib/models/globalModel.dart

@@ -3,7 +3,6 @@ import 'package:prod/models/editor.dart';
 import 'package:prod/models/project.dart';
 import "package:shared_preferences/shared_preferences.dart";
 import "package:prod/models/constants.dart";
-// import "package:json_annotation/json_annotation.dart";
 import "dart:convert";
 
 class GlobalModel extends ChangeNotifier {

lib/views/editors.dart

@@ -1,5 +1,4 @@
 import "package:flutter/material.dart";
-import "package:prod/models/editor.dart";
 import "package:prod/models/globalModel.dart";
 import "package:prod/widgets/editorCard.dart";
 import "package:prod/widgets/edtFAB.dart";

lib/views/managePrj.dart

@@ -21,16 +21,17 @@ class ManageProject extends StatelessWidget {
     pathController.text = prj.path.path;
     langController.text = prj.language;
     return SimpleDialog(
+      backgroundColor: Color(0xfff6f6f6),
       title: Row(
         mainAxisAlignment: .spaceBetween,
         children: [
-          OutlinedButton(
+          FilledButton(
             child: Text("Cancel"),
             onPressed: () => Navigator.pop(context),
           ),
           Text("Edit Project"),
-          FilledButton(
+          ElevatedButton(
-            child: Text("Save"),
+            child: Text(" Save "),
             onPressed: () {
               prj.name = nameController.text;
               prj.path = File(pathController.text);
@@ -38,7 +39,9 @@ class ManageProject extends StatelessWidget {
               gm.updatePrj(id, prj);
               ScaffoldMessenger.of(context).showSnackBar(
                 SnackBar(
-                  content: Text("Updated Project Details"),
+                  content: Text(
+                    "Project Details Updated ✅",
+                  ), // The empty space as rendered by Zed is a green check mark. Dont remove it.
                   duration: Duration(milliseconds: 2000),
                 ),
               );
@@ -48,52 +51,109 @@ class ManageProject extends StatelessWidget {
           ),
         ],
       ),
+      children: [
+        Padding(
+          padding: const EdgeInsets.all(8.0),
+          child: Card(
+            shape: RoundedRectangleBorder(
+              side: BorderSide(width: 1, color: Colors.grey[350]!),
+              borderRadius: BorderRadius.circular(10),
+            ),
+            color: Color(0xffffffff),
+            child: Column(
               children: [
                 TextField(
-          style: TextStyle(fontSize: 50),
+                  style: TextStyle(fontSize: 35),
                   controller: nameController,
-          textAlign: .center,
+                  textAlign: .left,
-          // onEditingComplete: () => gm.updateEdited(true),
                   decoration: InputDecoration(
-            border: .none,
+                    label: Text(
+                      "Name",
+                      style: TextStyle(color: Colors.grey[700]),
+                    ),
+                    // border: .none,
                     enabledBorder: .none,
                     fillColor: Colors.transparent,
+                    focusedBorder: OutlineInputBorder(
+                      borderSide: BorderSide(color: Colors.transparent),
+                      gapPadding: 0,
+                    ),
+                    border: OutlineInputBorder(
+                      borderSide: BorderSide(color: Colors.transparent),
+                      gapPadding: 0,
                     ),
                   ),
+                ),
+                Divider(thickness: 1),
                 TextField(
-          style: TextStyle(fontSize: 30),
+                  style: TextStyle(fontSize: 20),
                   controller: pathController,
-          textAlign: .center,
+                  textAlign: .left,
-          // onEditingComplete: () => gm.updateEdited(true),
                   decoration: InputDecoration(
-            labelText: "Path",
+                    label: Text(
-            border: .none,
+                      "Path",
-            // enabledBorder: .none,
+                      style: TextStyle(color: Colors.grey[700]),
-            fillColor: Colors.transparent,
                     ),
-        ),
+                    isCollapsed: false,
-        TextField(
+                    // border: .none,
-          style: TextStyle(fontSize: 30),
-          controller: langController,
-          textAlign: .center,
-          // onEditingComplete: () => gm.updateEdited(true),
-          decoration: InputDecoration(
-            labelText: "Language",
-            border: .none,
                     enabledBorder: .none,
                     fillColor: Colors.transparent,
+                    focusedBorder: OutlineInputBorder(
+                      borderSide: BorderSide(color: Colors.transparent),
+                      gapPadding: 0,
+                    ),
+                    border: OutlineInputBorder(
+                      borderSide: BorderSide(color: Colors.transparent),
+                      gapPadding: 0,
+                    ),
+                  ),
+                ),
+                Divider(thickness: 1),
+                TextField(
+                  style: TextStyle(fontSize: 20),
+                  controller: langController,
+                  textAlign: .left,
+                  decoration: InputDecoration(
+                    label: Text(
+                      "Language",
+                      style: TextStyle(color: Colors.grey[700]),
+                    ),
+                    // border: .none,
+                    enabledBorder: .none,
+                    fillColor: Colors.transparent,
+
+                    focusedBorder: OutlineInputBorder(
+                      borderSide: BorderSide(color: Colors.transparent),
+                      gapPadding: 0,
+                    ),
+                    border: OutlineInputBorder(
+                      borderSide: BorderSide(color: Colors.transparent),
+                      gapPadding: 0,
+                    ),
+                  ),
+                ),
+              ],
+            ),
           ),
         ),
         Padding(
           padding: const EdgeInsets.all(8.0),
           child: Card(
+            shape: RoundedRectangleBorder(
+              side: BorderSide(width: 1, color: Colors.grey[350]!),
+              borderRadius: BorderRadius.circular(10),
+            ),
+            color: Color(0xffffffff),
             child: Padding(
               padding: const EdgeInsets.all(8.0),
               child: Column(
                 mainAxisAlignment: .spaceEvenly,
                 crossAxisAlignment: .start,
                 children: [
-                  Text("Select Editors:"),
+                  Padding(
+                    padding: const EdgeInsets.symmetric(horizontal: 8.0),
+                    child: Text("Editors:", style: TextStyle(fontSize: 20)),
+                  ),
                   SizedBox(height: 10),
                   Row(
                     mainAxisAlignment: .spaceEvenly,
@@ -117,23 +177,20 @@ class ManageProject extends StatelessWidget {
             ),
           ),
         ),
-        // Row(
+        Padding(
-        //   children: [
+          padding: const EdgeInsets.symmetric(horizontal: 13.0),
-        //     OutlinedButton(
+          child: ElevatedButton(
-        //       child: Text("Delete"),
+            style: ElevatedButton.styleFrom(
-        //       onPressed: () {
+              backgroundColor: Colors.red[100],
-        //         Navigator.pop(context);
+              foregroundColor: Colors.red[900],
-        //         gm.delPrj(id);
+            ),
-        //         ScaffoldMessenger.of(context).showSnackBar(
+            onPressed: () {
-        //           SnackBar(
+              gm.delPrj(id);
-        //             content: Text("Deleted ${prj.name}"),
+              Navigator.pop(context);
-        //             duration: Duration(milliseconds: 2350),
+            },
-        //           ),
+            child: Row(mainAxisAlignment: .center, children: [Text("Delete")]),
-        //         );
+          ),
-        //       },
+        ),
-        //     ),
-        //   ],
-        // ),
       ],
     );
   }

lib/widgets/edtFAB.dart

@@ -17,7 +17,30 @@ class EditorFAB extends StatelessWidget {
         showDialog(
           context: context,
           builder: (context) => SimpleDialog(
-            title: Text("Add Editor"),
+            title: Row(
+              mainAxisAlignment: .spaceBetween,
+              children: [
+                FilledButton(
+                  child: Text("Cancel"),
+                  onPressed: () => Navigator.pop(context),
+                ),
+                Text("Add Editor"),
+                ElevatedButton(
+                  child: Text("  Add  "),
+                  onPressed: () {
+                    Provider.of<GlobalModel>(context, listen: false).addEdt(
+                      Editor.create(
+                        nameController.text,
+                        commandController.text,
+                        commandTemplateController.text,
+                      ),
+                    );
+
+                    Navigator.pop(context);
+                  },
+                ),
+              ],
+            ),
             children: [
               Padding(
                 padding: const EdgeInsets.all(8.0),
@@ -45,30 +68,6 @@ class EditorFAB extends StatelessWidget {
                 child: const Text("Example: zed -n \$path"),
                 padding: const EdgeInsets.all(9.0),
               ),
-
-              Row(
-                mainAxisAlignment: .end,
-                children: [
-                  TextButton(
-                    child: Text("Cancel"),
-                    onPressed: () => Navigator.pop(context),
-                  ),
-                  TextButton(
-                    child: Text("Add"),
-                    onPressed: () {
-                      Provider.of<GlobalModel>(context, listen: false).addEdt(
-                        Editor.create(
-                          nameController.text,
-                          commandController.text,
-                          commandTemplateController.text,
-                        ),
-                      );
-
-                      Navigator.pop(context);
-                    },
-                  ),
-                ],
-              ),
             ],
           ),
         );