moved editing page to popup

.gitea/workflows/build.yaml

@@ -2,10 +2,13 @@ name: Build CI
 # on: [push]
 on:
   push:
+    tags:
+      - "v*"
     branches:
       - master
     paths:
       - "lib/**"
+      - ".gitea/**"
 
 jobs:
   AMD64:
@@ -48,66 +51,25 @@ jobs:
       # - name: Test project
       #   run: flutter test
 
-      - name: Build
+      - name: Build App
         run: flutter build linux
 
-      - name: Copy Build Files
+      - name: Build AppImage
-        run: cp -r build/linux/*/release/bundle prod/
+        uses: AppImageCrafters/build-appimage-action@master
+        with:
+          recipe: configs/AppImageBuilder_amd64.yml
+      
+      - name: print built images
+        run: ls -hla 
         
       - name: Save Artifacts
         uses: actions/upload-artifact@v3
         with:
-          name: PROD.amd64
+          name: Prod-${{ github.ref_type == 'tag' && github.ref_name || 'master' }}-x86_64.AppImage
-          path: prod/
+          path: Prod-latest-x86_64.AppImage
 
-  ARM64:
+      - name: Create New Release
-    name: ARM64 Build
+        uses: akkuman/gitea-release-action@v1
-    runs-on: linux-arm64
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
         with:
-          channel: master
+          files: Prod-latest-x86_64.AppImage
-
+          prerelease: ${{ github.ref_type == 'tag' }}
-      - uses: actions/cache@v4
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ gitea.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
-
-      - name: Install Framework Dependencies
-        run: |
-          sudo apt-get update -y
-          sudo apt install -y ninja-build  cmake clang libgtk-3-dev
-
-      - name: Install Flutter
-        uses: subosito/flutter-action@v2
-        with:
-          channel: master
-          flutter-version: 3.38.9
-
-      - name: Check Flutter Installation
-        run: flutter doctor -v
-
-      - name: Get Project Dependencies
-        run: flutter pub get
-
-      # - name: Analyze project
-      #   run: flutter analyze
-
-      # - name: Test project
-      #   run: flutter test
-
-      - name: Build
-        run: flutter build linux
-
-      - name: Copy Build Files
-        run: cp -r build/linux/*/release/bundle prod/
-
-      - name: Save Artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: PROD.arm64
-          path: prod/

analysis_options.yaml

@@ -26,5 +26,3 @@ linter:
 
 # Additional information about this file can be found at
 # https://dart.dev/guides/language/analysis-options
-plugins:
-  riverpod_lint: ^3.1.3

configs/AppImageBuilder_amd64.yml

@@ -0,0 +1,27 @@
+# appimage-builder recipe see https://appimage-builder.readthedocs.io for details
+version: 1
+script:
+  - which mksquashfs || apt install squashfs-tools
+  - rm -rf AppDir | true
+  - cp -r build/linux/x64/release/bundle AppDir
+  - mkdir -p AppDir/usr/share/icons/hicolor/64x64/apps/
+  - cp configs/prodIcon.png AppDir/usr/share/icons/hicolor/64x64/apps/
+AppDir:
+  path: ./AppDir
+  app_info:
+    id: net.inaph.prod
+    name: Prod
+    icon: prodIcon
+    version: latest
+    exec: prod
+    exec_args: $@
+  files:
+    exclude:
+      - usr/share/man
+      - usr/share/doc/*/README.*
+      - usr/share/doc/*/changelog.*
+      - usr/share/doc/*/NEWS.*
+      - usr/share/doc/*/TODO.*
+AppImage:
+  arch: x86_64
+  update-information: guess

dockerfile

@@ -1,6 +0,0 @@
-FROM ghcr.io/cirruslabs/flutter:3.38.9
-COPY ./ /build
-WORKDIR /build
-RUN apt update -y && apt install clang cmake ninja-build pkg-config libgtk-3-dev libstdc++-12-dev -y
-RUN flutter build linux --release
-RUN cp build/linux/*/release/bundle/prod /prod

lib/main.dart

@@ -28,7 +28,6 @@ class MyApp extends StatelessWidget {
               routes: {
                 "/": (context) => HomePage(),
                 "/editors": (context) => EditorEditor(),
-                "/manageprj": (context) => ManageProject(),
               },
               initialRoute: "/",
             );

lib/models/globalModel.dart

@@ -17,22 +17,20 @@ class GlobalModel extends ChangeNotifier {
 
   GlobalModel() {
     SharedPreferences.getInstance().then((a) {
-      print("Loaded sp");
       prefs = a;
-      editors = [Editor("", "None", "NANII", "", "")];
+      editors = [];
-      id2EdtMap = {"NANII": 0};
+      id2EdtMap = {};
       if (prefs.containsKey(kEditorsKey)) {
         String edtData = prefs.getString(kEditorsKey)!;
         List<dynamic> data = jsonDecode(edtData);
         for (var (i, d) in data.indexed) {
           var localEdt = Editor.fromJson(d);
           editors.add(localEdt);
-          id2EdtMap[localEdt.id] = i + 1;
+          id2EdtMap[localEdt.id] = i;
         }
       } else {
         prefs.setString(kEditorsKey, jsonEncode(editors));
       }
-      print(id2EdtMap);
       final List<String> idList = id2EdtMap.keys.toList();
 
       projects = [];
@@ -45,6 +43,7 @@ class GlobalModel extends ChangeNotifier {
       } else {
         prefs.setString(kProjectsKey, jsonEncode(projects));
       }
+      print("Project List:");
       print(projects);
 
       hoverShow = List.filled(projects.length, false, growable: true);
@@ -61,7 +60,6 @@ class GlobalModel extends ChangeNotifier {
 
   void saveEditorState() {
     var tempEditors = editors;
-    tempEditors.removeWhere((a) => a.id == "");
     List<Map<String, dynamic>> arst = tempEditors
         .map((a) => a.toJson())
         .toList();
@@ -115,8 +113,7 @@ class GlobalModel extends ChangeNotifier {
 
   void addEdt(Editor edt) {
     editors.add(edt);
-    print(editors);
+    rebuildIndex();
-    id2EdtMap[edt.id] = editors.length - 1;
     saveEditorState();
     notifyListeners();
   }
@@ -124,11 +121,19 @@ class GlobalModel extends ChangeNotifier {
   void delEdt(int index) {
     Editor removed = editors.removeAt(index);
     int remmedID = id2EdtMap.remove(removed.id)!;
-    assert(index == remmedID);
+    assert(index == remmedID, "Index: $index removedID: $remmedID");
+    rebuildIndex();
     saveEditorState();
     notifyListeners();
   }
 
+  void rebuildIndex() {
+    id2EdtMap.clear();
+    for (var (i, e) in editors.indexed) {
+      id2EdtMap[e.id] = i;
+    }
+  }
+
   int get lenEdt {
     return editors.length;
   }
@@ -138,7 +143,7 @@ class GlobalModel extends ChangeNotifier {
   }
 
   int getEdtPosFromID(String id) {
-    return id2EdtMap[id] ?? 0;
+    return id2EdtMap[id] ?? -1;
   }
 
   // Editing controller

lib/views/editors.dart

@@ -14,7 +14,7 @@ class EditorEditor extends StatelessWidget {
     return Scaffold(
       appBar: AppBar(title: Text("/ PROject Dashboard / Editors")),
       floatingActionButton: EditorFAB(),
-      body: gm.lenEdt - 1 > 0
+      body: gm.lenEdt > 0
           ? LayoutBuilder(
               builder: (context, constraints) {
                 int cols = (constraints.maxWidth / 250).floor();
@@ -25,7 +25,7 @@ class EditorEditor extends StatelessWidget {
                     mainAxisSpacing: 10,
                     childAspectRatio: 1.5,
                   ),
-                  itemCount: gm.lenEdt - 1,
+                  itemCount: gm.lenEdt,
                   itemBuilder: (context, index) => EditorCard(index),
                 );
               },

lib/views/managePrj.dart

@@ -7,11 +7,11 @@ import "package:prod/widgets/editorSelector.dart";
 import "package:provider/provider.dart";
 
 class ManageProject extends StatelessWidget {
-  const ManageProject({super.key});
+  const ManageProject(this.id, {super.key});
+  final int id;
 
   @override
   Widget build(BuildContext context) {
-    final id = ModalRoute.of(context)?.settings.arguments as int;
     GlobalModel gm = Provider.of(context);
     final Project prj = gm.nthPrj(id);
     TextEditingController nameController = TextEditingController();
@@ -20,24 +20,36 @@ class ManageProject extends StatelessWidget {
     nameController.text = prj.name;
     pathController.text = prj.path.path;
     langController.text = prj.language;
-    return Scaffold(
+    return SimpleDialog(
-      appBar: AppBar(title: Text("/ PROject Dashboard / Editing ${prj.name} ")),
+      title: Row(
-      body: Container(
+        mainAxisAlignment: .spaceBetween,
-        // constraints: BoxConstraints(maxWidth: 500),
+        children: [
-        child: CustomScrollView(
+          OutlinedButton(
-          slivers: [
+            child: Text("Cancel"),
-            SliverAppBar(
+            onPressed: () => Navigator.pop(context),
-              // title: gm.isEdited ? Text("Unsaved Changes") : null,
-              pinned: false,
-              snap: false,
-              floating: false,
-              automaticallyImplyLeading: false,
-              automaticallyImplyActions: false,
-              backgroundColor: Colors.transparent,
-              shape: LinearBorder(),
           ),
-            SliverToBoxAdapter(
+          Text("Edit Project"),
-              child: TextField(
+          FilledButton(
+            child: Text("Save"),
+            onPressed: () {
+              prj.name = nameController.text;
+              prj.path = File(pathController.text);
+              prj.language = langController.text;
+              gm.updatePrj(id, prj);
+              ScaffoldMessenger.of(context).showSnackBar(
+                SnackBar(
+                  content: Text("Updated Project Details"),
+                  duration: Duration(milliseconds: 2000),
+                ),
+              );
+              Navigator.pop(context);
+            },
+            // gm.updateEdited(false);
+          ),
+        ],
+      ),
+      children: [
+        TextField(
           style: TextStyle(fontSize: 50),
           controller: nameController,
           textAlign: .center,
@@ -48,11 +60,7 @@ class ManageProject extends StatelessWidget {
             fillColor: Colors.transparent,
           ),
         ),
-            ),
+        TextField(
-            SliverToBoxAdapter(
-              child: Padding(
-                padding: const EdgeInsets.all(8.0),
-                child: TextField(
           style: TextStyle(fontSize: 30),
           controller: pathController,
           textAlign: .center,
@@ -64,10 +72,7 @@ class ManageProject extends StatelessWidget {
             fillColor: Colors.transparent,
           ),
         ),
-              ),
+        TextField(
-            ),
-            SliverToBoxAdapter(
-              child: TextField(
           style: TextStyle(fontSize: 30),
           controller: langController,
           textAlign: .center,
@@ -79,77 +84,57 @@ class ManageProject extends StatelessWidget {
             fillColor: Colors.transparent,
           ),
         ),
-            ),
+        Padding(
-            SliverList.list(
+          padding: const EdgeInsets.all(8.0),
+          child: Card(
+            child: Padding(
+              padding: const EdgeInsets.all(8.0),
+              child: Column(
+                mainAxisAlignment: .spaceEvenly,
+                crossAxisAlignment: .start,
                 children: [
+                  Text("Select Editors:"),
+                  SizedBox(height: 10),
                   Row(
                     mainAxisAlignment: .spaceEvenly,
                     children: [
-                    EditorSelector(0, id),
-                    EditorSelector(1, id),
-                    EditorSelector(2, id),
                       EditorSelector(3, id),
+                      SizedBox(width: 10),
+                      EditorSelector(0, id),
                     ],
                   ),
-              ],
+                  SizedBox(height: 10),
-            ),
-
-            SliverList.list(
-              children: [
                   Row(
+                    mainAxisAlignment: .spaceEvenly,
                     children: [
-                    OutlinedButton(
+                      EditorSelector(2, id),
-                      child: Text("Delete"),
+                      SizedBox(width: 10),
-                      onPressed: () {
+                      EditorSelector(1, id),
-                        Navigator.pop(context);
-                        gm.delPrj(id);
-                        ScaffoldMessenger.of(context).showSnackBar(
-                          SnackBar(
-                            content: Text("Deleted ${prj.name}"),
-                            duration: Duration(milliseconds: 2350),
-                          ),
-                        );
-                      },
-                    ),
-
-                    OutlinedButton(
-                      child: Text("Cancel"),
-                      onPressed: () => Navigator.pop(context),
-                    ),
-                    OutlinedButton(
-                      child: Text("Save"),
-                      onPressed: () {
-                        gm.updatePrj(
-                          id,
-                          Project(
-                            nameController.text,
-                            langController.text,
-                            File(pathController.text),
-                            prj.isGit,
-                          ),
-                        );
-                        ScaffoldMessenger.of(context).showSnackBar(
-                          SnackBar(
-                            content: Text("Updated Project Details"),
-                            duration: Duration(milliseconds: 2500),
-                          ),
-                        );
-                      },
-                      // gm.updateEdited(false);
-                    ),
                     ],
                   ),
                 ],
               ),
-            // SliverList.builder(
+            ),
-            //   itemCount: 3,
+          ),
-            //   itemBuilder: (context, index) {
+        ),
-            //     return Placeholder();
+        // Row(
+        //   children: [
+        //     OutlinedButton(
+        //       child: Text("Delete"),
+        //       onPressed: () {
+        //         Navigator.pop(context);
+        //         gm.delPrj(id);
+        //         ScaffoldMessenger.of(context).showSnackBar(
+        //           SnackBar(
+        //             content: Text("Deleted ${prj.name}"),
+        //             duration: Duration(milliseconds: 2350),
+        //           ),
+        //         );
         //       },
         //     ),
+        //   ],
+        // ),
       ],
-        ),
-      ),
     );
   }
 }

lib/widgets/editorCard.dart

@@ -1,13 +1,11 @@
 import "package:flutter/material.dart";
 import "package:prod/models/editor.dart";
 import "package:prod/models/globalModel.dart";
-import "package:prod/models/project.dart";
 import "package:provider/provider.dart";
 import "package:yaru/yaru.dart";
-import "package:process_run/shell.dart";
 
 class EditorCard extends StatelessWidget {
-  const EditorCard(id, {super.key}) : id = id + 1;
+  const EditorCard(this.id, {super.key});
   final int id;
 
   @override

lib/widgets/editorSelector.dart

@@ -3,7 +3,6 @@ import "package:prod/models/editor.dart";
 import "package:prod/models/globalModel.dart";
 import "package:prod/models/project.dart";
 import "package:provider/provider.dart";
-import "package:yaru/yaru.dart";
 
 class EditorSelector extends StatelessWidget {
   const EditorSelector(this.turns, this.id, {super.key});
@@ -23,12 +22,15 @@ class EditorSelector extends StatelessWidget {
         quarterTurns: turns,
       ),
       onSelected: (a) {
-        // print("$a");
         prj.setEditor(turns, a ?? "");
         gm.updatePrj(id, prj);
       },
 
-      dropdownMenuEntries: Provider.of<GlobalModel>(context).editors.map((a) {
+      dropdownMenuEntries:
+          [
+            const Editor("", "None", "", "", ""),
+            ...Provider.of<GlobalModel>(context).editors,
+          ].map((a) {
             return DropdownMenuEntry(
               label: a.name,
               labelWidget: Column(

lib/widgets/edtFAB.dart

@@ -10,15 +10,6 @@ class EditorFAB extends StatelessWidget {
   Widget build(BuildContext context) {
     return FloatingActionButton(
       onPressed: () {
-        // gm.add(
-        //   Project.validated(
-        //     "Kimi",
-        //     "Rust",
-        //     "/home/arrow/Gitted/cowin",
-        //     [],
-        //     true,
-        //   ),
-        // );
         TextEditingController nameController = TextEditingController();
         TextEditingController commandController = TextEditingController();
         TextEditingController commandTemplateController =

lib/widgets/launcherButton.dart

@@ -13,7 +13,11 @@ class LauncherButton extends StatelessWidget {
   Widget build(BuildContext context) {
     // print("EDITOR ID: $eid");
     GlobalModel gm = Provider.of<GlobalModel>(context, listen: false);
-    final Editor edt = gm.nthEdt(gm.getEdtPosFromID(eid));
+    final int enumb = gm.getEdtPosFromID(eid);
+    if (enumb == -1) {
+      return Container();
+    }
+    final Editor edt = gm.nthEdt(enumb);
     // print("GRABBED EDITOR: ${edt.name}");
     return eid == ""
         ? Container()

lib/widgets/projectCard.dart

@@ -2,6 +2,7 @@ import "package:flutter/material.dart";
 import "package:prod/models/editor.dart";
 import "package:prod/models/globalModel.dart";
 import "package:prod/models/project.dart";
+import "package:prod/views/managePrj.dart";
 import "package:prod/widgets/launcherButton.dart";
 import "package:provider/provider.dart";
 import "package:yaru/yaru.dart";
@@ -18,8 +19,9 @@ class ProjectCard extends StatelessWidget {
     return InkWell(
       onHover: (st) => gm.setHoverShow(id, st),
       borderRadius: .circular(kYaruContainerRadius),
-      onTap: () async {
+      onTap: () {
-        await Navigator.pushNamed(context, "/manageprj", arguments: id);
+        // await Navigator.pushNamed(context, "/manageprj", arguments: id);
+        showDialog(context: context, builder: (context) => ManageProject(id));
       },
       child: Card(
         // decoration: BoxDecoration(
@@ -77,14 +79,14 @@ class ProjectCard extends StatelessWidget {
               children: [
                 Column(
                   children: [
-                    LauncherButton(prj.e0, prj.path.path),
+                    LauncherButton(prj.e3, prj.path.path),
-                    LauncherButton(prj.e1, prj.path.path),
+                    LauncherButton(prj.e2, prj.path.path),
                   ],
                 ),
                 Column(
                   children: [
-                    LauncherButton(prj.e2, prj.path.path),
+                    LauncherButton(prj.e0, prj.path.path),
-                    LauncherButton(prj.e3, prj.path.path),
+                    LauncherButton(prj.e1, prj.path.path),
                   ],
                 ),
               ],

pubspec.yaml

@@ -1,39 +1,15 @@
 name: prod
-description: "A new Flutter project."
+description: "Simple Dashboard to bookmark projects with custom editors."
-# The following line prevents the package from being accidentally published to
+publish_to: "none"
-# pub.dev using `flutter pub publish`. This is preferred for private packages.
-publish_to: "none" # Remove this line if you wish to publish to pub.dev
 
-# The following defines the version and build number for your application.
+version: 0.0.1
-# A version number is three numbers separated by dots, like 1.2.43
-# followed by an optional build number separated by a +.
-# Both the version and the builder number may be overridden in flutter
-# build by specifying --build-name and --build-number, respectively.
-# In Android, build-name is used as versionName while build-number used as versionCode.
-# Read more about Android versioning at https://developer.android.com/studio/publish/versioning
-# In iOS, build-name is used as CFBundleShortVersionString while build-number is used as CFBundleVersion.
-# Read more about iOS versioning at
-# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-# In Windows, build-name is used as the major, minor, and patch parts
-# of the product and file versions while build-number is used as the build suffix.
-version: 1.0.0+1
 
 environment:
   sdk: ^3.10.8
 
-# Dependencies specify other packages that your package needs in order to work.
-# To automatically upgrade your package dependencies to the latest versions
-# consider running `flutter pub upgrade --major-versions`. Alternatively,
-# dependencies can be manually updated by changing the version numbers below to
-# the latest version available on pub.dev. To see which dependencies have newer
-# versions available, run `flutter pub outdated`.
 dependencies:
   flutter:
     sdk: flutter
-
-  # The following adds the Cupertino Icons font to your application.
-  # Use with the CupertinoIcons class for iOS style icons.
-  cupertino_icons: ^1.0.8
   process_run: ^1.3.0
   yaru: ^9.0.1
   path: ^1.9.1
@@ -45,49 +21,5 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
 
-  # The "flutter_lints" package below contains a set of recommended lints to
-  # encourage good coding practices. The lint set provided by the package is
-  # activated in the `analysis_options.yaml` file located at the root of your
-  # package. See that file for information about deactivating specific lint
-  # rules and activating additional ones.
-
-# For information on the generic Dart part of this file, see the
-# following page: https://dart.dev/tools/pub/pubspec
-
-# The following section is specific to Flutter packages.
 flutter:
-  # The following line ensures that the Material Icons font is
-  # included with your application, so that you can use the icons in
-  # the material Icons class.
   uses-material-design: true
-
-  # To add assets to your application, add an assets section, like this:
-  # assets:
-  #   - images/a_dot_burr.jpeg
-  #   - images/a_dot_ham.jpeg
-
-  # An image asset can refer to one or more resolution-specific "variants", see
-  # https://flutter.dev/to/resolution-aware-images
-
-  # For details regarding adding assets from package dependencies, see
-  # https://flutter.dev/to/asset-from-package
-
-  # To add custom fonts to your application, add a fonts section here,
-  # in this "flutter" section. Each entry in this list should have a
-  # "family" key with the font family name, and a "fonts" key with a
-  # list giving the asset and other descriptors for the font. For
-  # example:
-  # fonts:
-  #   - family: Schyler
-  #     fonts:
-  #       - asset: fonts/Schyler-Regular.ttf
-  #       - asset: fonts/Schyler-Italic.ttf
-  #         style: italic
-  #   - family: Trajan Pro
-  #     fonts:
-  #       - asset: fonts/TrajanPro.ttf
-  #       - asset: fonts/TrajanPro_Bold.ttf
-  #         weight: 700
-  #
-  # For details regarding fonts from package dependencies,
-  # see https://flutter.dev/to/font-from-package