WIP: Desktop support

.github/workflows/manual-build.yml

@@ -111,11 +111,11 @@ jobs:
 
       - name: Build Linux packages (.deb, .rpm, and AppImage)
         run: |
-          # Add submodule Flutter to PATH first (so flutter_distributor uses it)
+          # Add submodule Flutter to PATH first (so fastforge uses it)
           export PATH="$(pwd)/submodules/flutter/bin:$PATH"
 
-          # Install flutter_distributor
-          dart pub global activate flutter_distributor
+          # Install fastforge
+          dart pub global activate fastforge
           export PATH="$HOME/.pub-cache/bin:$PATH"
 
           # Install tools for building .rpm and AppImage packages
@@ -131,7 +131,7 @@ jobs:
           flutter --version
 
           # Build .deb, .rpm, and AppImage packages
-          flutter_distributor release --name=linux-release --jobs=release-linux-deb,release-linux-rpm,release-linux-appimage
+          fastforge release --name=linux-release --jobs=release-linux-deb,release-linux-rpm,release-linux-appimage
 
       - name: Upload .deb as artifact
         uses: actions/upload-artifact@v4

.github/workflows/on-release.yml

@@ -227,11 +227,11 @@ jobs:
 
       - name: Build Linux packages (.deb, .rpm, and AppImage)
         run: |
-          # Add submodule Flutter to PATH first (so flutter_distributor uses it)
+          # Add submodule Flutter to PATH first (so fastforge uses it)
           export PATH="$(pwd)/submodules/flutter/bin:$PATH"
 
-          # Install flutter_distributor
-          dart pub global activate flutter_distributor
+          # Install fastforge
+          dart pub global activate fastforge
           export PATH="$HOME/.pub-cache/bin:$PATH"
 
           # Install tools for building .rpm and AppImage packages
@@ -247,7 +247,7 @@ jobs:
           flutter --version
 
           # Build .deb, .rpm, and AppImage packages
-          flutter_distributor release --name=linux-release --jobs=release-linux-deb,release-linux-rpm,release-linux-appimage
+          fastforge release --name=linux-release --jobs=release-linux-deb,release-linux-rpm,release-linux-appimage
 
       - name: Upload Linux packages as Release asset
         uses: softprops/action-gh-release@v1

.gitignore

@@ -76,7 +76,7 @@
 /build-debug-file/
 /tmp_build
 .flutter-plugins-dependencies
-ios/Flutter/flutter_export_environment.sh
+**/ios/Flutter/flutter_export_environment.sh
 macos/Flutter/ephemeral/flutter_export_environment.sh
 macos/Flutter/ephemeral/Flutter-Generated.xcconfig
 

.metadata

@@ -4,7 +4,7 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: "b45fa18946ecc2d9b4009952c636ba7e2ffbb787"
+  revision: "8b872868494e429d94fa06dca855c306438b22c0"
   channel: "stable"
 
 project_type: app
@@ -13,11 +13,11 @@ project_type: app
 migration:
   platforms:
     - platform: root
-      create_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
-      base_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
-    - platform: linux
-      create_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
-      base_revision: b45fa18946ecc2d9b4009952c636ba7e2ffbb787
+      create_revision: 8b872868494e429d94fa06dca855c306438b22c0
+      base_revision: 8b872868494e429d94fa06dca855c306438b22c0
+    - platform: macos
+      create_revision: 8b872868494e429d94fa06dca855c306438b22c0
+      base_revision: 8b872868494e429d94fa06dca855c306438b22c0
 
   # User provided section
 

.vscode/extensions.json

@@ -0,0 +1,6 @@
+{
+    "recommendations": [
+        "dart-code.dart-code",
+        "dart-code.flutter"
+    ]
+}

.vscode/launch.json

@@ -7,7 +7,8 @@
         {
             "name": "Flutter",
             "request": "launch",
-            "type": "dart"
+            "type": "dart",
+            "flutterMode": "debug"
         }
     ]
 }

.vscode/settings.json

@@ -0,0 +1,20 @@
+{
+	"search.exclude": {
+		"**/submodules": true,
+	},
+	"terminal.integrated.defaultProfile.linux": "bash",
+	"terminal.integrated.profiles.linux": {
+	  "bash": {
+		"path": "/usr/bin/flatpak-spawn",
+		"args": ["--host", "--env=TERM=xterm-256color", "bash"],
+		"icon": "terminal-bash",
+		"overrideName": true
+	  }
+	},
+	"dart.flutterSdkPath": "~/development/flutter",
+	"[dart]": {
+		"editor.defaultFormatter": "Dart-Code.dart-code",
+		"editor.formatOnSave": true,
+		"editor.formatOnType": true,
+	}
+}

build_linux.sh

@@ -93,18 +93,18 @@ if ! pkg-config --exists gtk+-3.0 2>/dev/null; then
 fi
 echo -e "${GREEN}✓ GTK3 development libraries found${NC}"
 
-# Find flutter_distributor
-DISTRIBUTOR_CMD="$HOME/.pub-cache/bin/flutter_distributor"
+# Find fastforge
+DISTRIBUTOR_CMD="$HOME/.pub-cache/bin/fastforge"
 if [ ! -f "$DISTRIBUTOR_CMD" ]; then
-    echo -e "${YELLOW}flutter_distributor not found, installing...${NC}"
-    $FLUTTER_CMD pub global activate flutter_distributor
+    echo -e "${YELLOW}fastforge not found, installing...${NC}"
+    $FLUTTER_CMD pub global activate fastforge
 
     if [ ! -f "$DISTRIBUTOR_CMD" ]; then
-        echo -e "${RED}Error: Failed to install flutter_distributor${NC}"
+        echo -e "${RED}Error: Failed to install fastforge${NC}"
         exit 1
     fi
 fi
-echo -e "${GREEN}✓ flutter_distributor ready${NC}"
+echo -e "${GREEN}✓ fastforge ready${NC}"
 
 echo ""
 echo "==================================="

lib/categories/categories-grid.dart

@@ -22,7 +22,6 @@ class CategoriesGrid extends StatefulWidget {
 }
 
 class CategoriesGridState extends State<CategoriesGrid> {
-
   List<Category?> orderedCategories = [];
   bool enableManualSorting = false;
   late ScrollController _scrollController;
@@ -76,7 +75,7 @@ class CategoriesGridState extends State<CategoriesGrid> {
           child: Container(
             child: Column(
               children: [
-                  CategoryIconCircle(
+                CategoryIconCircle(
                   iconEmoji: category.iconEmoji,
                   iconDataFromDefaultIconSet: category.icon,
                   backgroundColor: category.color,

lib/categories/categories-list.dart

@@ -55,8 +55,7 @@ class CategoriesListState extends State<CategoriesList> {
               iconEmoji: category.iconEmoji,
               iconDataFromDefaultIconSet: category.icon,
               backgroundColor: category.color,
-              overlayIcon: category.isArchived ? Icons.archive : null
-          ),
+              overlayIcon: category.isArchived ? Icons.archive : null),
           title: Text(category.name!, style: _biggerFont),
         ),
       ),

lib/categories/categories-tab-page-edit.dart

@@ -48,7 +48,8 @@ class TabCategoriesState extends State<TabCategories>
 
   void _handleTabChange() {
     // Check if the tab index has actually changed (works for both clicks and swipes)
-    if (_tabController!.index != _previousTabIndex && !_tabController!.indexIsChanging) {
+    if (_tabController!.index != _previousTabIndex &&
+        !_tabController!.indexIsChanging) {
       setState(() {
         _fabRotation += 3.14159; // 180 degrees rotation
         _previousTabIndex = _tabController!.index;
@@ -408,21 +409,17 @@ class TabCategoriesState extends State<TabCategories>
                       await Navigator.push(
                         context,
                         MaterialPageRoute(
-                          builder: (context) => EditCategoryPage(
-                            categoryType: CategoryType.expense
-                          )
-                        ),
+                            builder: (context) => EditCategoryPage(
+                                categoryType: CategoryType.expense)),
                       );
                       await refreshCategoriesAndHighlightsTab(0);
                     } else {
                       // Income tab
                       await Navigator.push(
                         context,
                         MaterialPageRoute(
-                          builder: (context) => EditCategoryPage(
-                            categoryType: CategoryType.income
-                          )
-                        ),
+                            builder: (context) => EditCategoryPage(
+                                categoryType: CategoryType.income)),
                       );
                       await refreshCategoriesAndHighlightsTab(1);
                     }

lib/categories/categories-tab-page-view.dart

@@ -111,7 +111,8 @@ class CategoryTabPageViewState extends State<CategoryTabPageView> {
                       Row(
                         children: [
                           Checkbox(
-                            value: _isDefaultOrder || _selectedSortOption == _storedDefaultOption,
+                            value: _isDefaultOrder ||
+                                _selectedSortOption == _storedDefaultOption,
                             onChanged: (value) {
                               setModalState(() {
                                 _isDefaultOrder = value ?? false;
@@ -161,7 +162,7 @@ class CategoryTabPageViewState extends State<CategoryTabPageView> {
                   ),
                   trailing: _selectedSortOption == SortOption.alphabetical
                       ? Icon(Icons.check,
-                      color: Theme.of(context).colorScheme.primary)
+                          color: Theme.of(context).colorScheme.primary)
                       : null,
                   onTap: () {
                     setModalState(() {
@@ -306,9 +307,7 @@ class CategoryTabPageViewState extends State<CategoryTabPageView> {
             tabs: [
               Semantics(
                 identifier: 'expenses-tab',
-                child: Tab(
-                    text: "Expenses".i18n.toUpperCase()
-                ),
+                child: Tab(text: "Expenses".i18n.toUpperCase()),
               ),
               Semantics(
                 identifier: 'income-tab',

lib/categories/edit-category-page.dart

@@ -111,7 +111,8 @@ class EditCategoryPageState extends State<EditCategoryPage> {
   Widget _getIconsGrid() {
     var surfaceContainer = Theme.of(context).colorScheme.surfaceContainer;
     var bottonActionColor = Theme.of(context).colorScheme.surfaceContainerLow;
-    var buttonColors = Theme.of(context).colorScheme.onSurface.withValues(alpha: 0.6);
+    var buttonColors =
+        Theme.of(context).colorScheme.onSurface.withValues(alpha: 0.6);
     return Column(
       children: [
         Offstage(
@@ -507,8 +508,8 @@ class EditCategoryPageState extends State<EditCategoryPage> {
               // Prompt confirmation
               AlertDialogBuilder archiveDialog =
                   AlertDialogBuilder(dialogMessage)
-                      .addTrueButtonName("Yes".i18n)
-                      .addFalseButtonName("No".i18n);
+                      .renameTrueButtonName("Yes".i18n)
+                      .renameFalseButtonName("No".i18n);
 
               if (!isCurrentlyArchived) {
                 archiveDialog.addSubtitle(
@@ -546,8 +547,8 @@ class EditCategoryPageState extends State<EditCategoryPage> {
                   .addSubtitle(
                       "Deleting the category you will remove all the associated records"
                           .i18n)
-                  .addTrueButtonName("Yes".i18n)
-                  .addFalseButtonName("No".i18n);
+                  .renameTrueButtonName("Yes".i18n)
+                  .renameFalseButtonName("No".i18n);
 
               var continueDelete = await showDialog(
                   context: context,

lib/components/category_icon_circle.dart

@@ -32,20 +32,19 @@ class CategoryIconCircle extends StatelessWidget {
         color: backgroundColor,
       ),
       child: iconEmoji != null
-            ?
-            Center(
+          ? Center(
               child: Text(
                 iconEmoji!, // Display the emoji
                 style: TextStyle(
                   fontSize: mainIconSize, // Adjust the emoji size
                 ),
               ),
             )
-            : Icon(
-          iconDataFromDefaultIconSet, // Fallback to the icon
-          size: mainIconSize,
-          color: iconColor ?? Theme.of(context).colorScheme.onSurface,
-        ),
+          : Icon(
+              iconDataFromDefaultIconSet, // Fallback to the icon
+              size: mainIconSize,
+              color: iconColor ?? Theme.of(context).colorScheme.onSurface,
+            ),
     );
   }
 
@@ -60,7 +59,10 @@ class CategoryIconCircle extends StatelessWidget {
         shape: BoxShape.circle,
         color: iconBackground
             ? Theme.of(context).colorScheme.surface
-            : Theme.of(context).colorScheme.surfaceContainer.withValues(alpha: 0.8),
+            : Theme.of(context)
+                .colorScheme
+                .surfaceContainer
+                .withValues(alpha: 0.8),
       ),
       child: Icon(
         overlayIcon,
@@ -83,8 +85,7 @@ class CategoryIconCircle extends StatelessWidget {
           backgroundColor ?? Theme.of(context).colorScheme.surface,
         ),
         if (overlayIcon != null)
-          _buildOverlayIcon(
-              context, overlayIcon, backgroundColor != null),
+          _buildOverlayIcon(context, overlayIcon, backgroundColor != null),
       ],
     );
   }

lib/components/year-picker.dart

@@ -393,7 +393,7 @@ class _DatePickerDialogState extends State<_DatePickerDialog> {
       // been updated to 4, so we will use that here for the Date Picker, but
       // only if there isn't one provided in the theme.
       shape: const RoundedRectangleBorder(
-              borderRadius: BorderRadius.all(Radius.circular(4.0))),
+          borderRadius: BorderRadius.all(Radius.circular(4.0))),
       clipBehavior: Clip.antiAlias,
     );
   }