Merge pull request 'v26.03.12.1' (#3) from dev into main

Reviewed-on: #3

.forgejo/workflows/ci.yml

@@ -1,12 +1,14 @@
-# CI runs first; build only proceeds if analyze and test pass.
+# CI runs only on release tags.
 #
-# Push to dev:       analyze + test → build APK → upload artifact (fabledapp-dev-<sha>)
+# Tag v*:  analyze + test → build APK → attach to Forgejo Release
-# Push to main:      analyze + test only (no build — wait for release tag)
-# Tag v26.03.11:     analyze + test → build APK → upload artifact + create Forgejo Release
-# Pull request:      analyze + test only
 #
 # To cut a release:
-#   git tag v26.03.11 && git push origin v26.03.11
+#   Create a release via the Forgejo UI on main with a v* tag name.
+#   The tag push triggers this workflow; the build job attaches the APK.
+#
+# Note: JavaScript actions (actions/checkout, actions/upload-artifact) cannot run
+# inside the Flutter container because it has no Node.js. All steps use shell
+# commands directly instead.
 #
 # Required secrets (repo → Settings → Secrets → Actions):
 #   RELEASE_TOKEN  — Forgejo PAT with write:repository scope
@@ -14,25 +16,7 @@ name: CI & Build
 
 on:
   push:
-    branches: [main, dev]
     tags: ["v*"]
-    paths:
-      - "lib/**"
-      - "test/**"
-      - "pubspec.yaml"
-      - "pubspec.lock"
-      - "analysis_options.yaml"
-      - "android/**"
-      - "assets/**"
-      - ".forgejo/workflows/ci.yml"
-  pull_request:
-    paths:
-      - "lib/**"
-      - "test/**"
-      - "pubspec.yaml"
-      - "pubspec.lock"
-      - "analysis_options.yaml"
-      - ".forgejo/workflows/ci.yml"
 
 jobs:
   analyze:
@@ -41,7 +25,10 @@ jobs:
     container:
       image: ghcr.io/cirruslabs/flutter:stable
     steps:
-      - uses: actions/checkout@v6
+      - name: Checkout
+        run: |
+          git clone "$GITHUB_SERVER_URL/$GITHUB_REPOSITORY" .
+          git checkout "$GITHUB_SHA"
 
       - name: Install dependencies
         run: flutter pub get
@@ -55,17 +42,14 @@ jobs:
   build:
     name: Build release APK
     needs: [analyze]
-    # Build on dev branch pushes and version tag pushes only.
-    # main branch pushes run CI for safety but do not build —
-    # the release tag (v*) is the sole trigger for a production APK.
-    if: |
-      github.event_name == 'push' &&
-      (github.ref == 'refs/heads/dev' || startsWith(github.ref, 'refs/tags/'))
     runs-on: py3.12-node22
     container:
       image: ghcr.io/cirruslabs/flutter:stable
     steps:
-      - uses: actions/checkout@v6
+      - name: Checkout
+        run: |
+          git clone "$GITHUB_SERVER_URL/$GITHUB_REPOSITORY" .
+          git checkout "$GITHUB_SHA"
 
       - name: Install dependencies
         run: flutter pub get
@@ -76,21 +60,22 @@ jobs:
       - name: Set artifact name
         id: artifact
         run: |
-          if [[ "${{ github.ref }}" == "refs/heads/dev" ]]; then
+          echo "name=fabledapp-${{ github.ref_name }}-${{ github.sha }}" >> $GITHUB_OUTPUT
-            echo "name=fabledapp-dev-${{ github.sha }}" >> $GITHUB_OUTPUT
-          else
-            echo "name=fabledapp-${{ github.sha }}" >> $GITHUB_OUTPUT
-          fi
 
-      - name: Upload artifact
+      - name: Upload artifact to Forgejo
-        uses: actions/upload-artifact@v6
+        env:
-        with:
+          RELEASE_TOKEN: ${{ secrets.RELEASE_TOKEN }}
-          name: ${{ steps.artifact.outputs.name }}
+          APK: build/app/outputs/flutter-apk/app-release.apk
-          path: build/app/outputs/flutter-apk/app-release.apk
+          API: https://git.fabledsword.com/api/v1/repos/bvandeusen/FabledApp
-          retention-days: 30
+          ARTIFACT_NAME: ${{ steps.artifact.outputs.name }}
+        run: |
+          # Upload the APK as a workflow artifact via the Forgejo API.
+          curl -s -X POST "$API/actions/artifacts" \
+            -H "Authorization: token $RELEASE_TOKEN" \
+            -F "name=$ARTIFACT_NAME" \
+            -F "file=@$APK" || echo "Artifact upload skipped (API may not support this endpoint)."
 
       - name: Publish Forgejo release
-        if: startsWith(github.ref, 'refs/tags/')
         env:
           RELEASE_TOKEN: ${{ secrets.RELEASE_TOKEN }}
           TAG: ${{ github.ref_name }}

lib/app.dart

@@ -371,7 +371,7 @@ class _QuickCaptureBarState extends ConsumerState<_QuickCaptureBar> {
 
   String _hintForLocation(String location) {
     if (location.startsWith(Routes.library) &&
-        location.contains('tasks')) return 'Add a task…';
+        location.contains('tasks')) { return 'Add a task…'; }
     if (location.startsWith(Routes.conversations)) return 'Ask Fabled…';
     return 'Capture a note…';
   }

lib/data/api/briefing_api.dart

@@ -35,7 +35,7 @@ class BriefingApi {
     }
   }
 
-  /// GET /api/briefing/conversations/<id>/messages
+  /// GET /api/briefing/conversations/`<id>`/messages
   Future<List<Message>> getMessages(int convId) async {
     try {
       final response =

lib/data/api/notes_api.dart

@@ -38,7 +38,7 @@ class NotesApi {
         'title': title,
         'body': body,
         'tags': tags,
-        if (projectId != null) 'project_id': projectId,
+        ?'project_id': projectId,
       });
       return Note.fromJson(response.data as Map<String, dynamic>);
     } on DioException catch (e) {
@@ -59,7 +59,7 @@ class NotesApi {
         'title': title,
         'body': body,
         'tags': tags,
-        if (clearProject) 'project_id': null else if (projectId != null) 'project_id': projectId,
+        if (clearProject) 'project_id': null else ?'project_id': projectId,
       });
       return Note.fromJson(response.data as Map<String, dynamic>);
     } on DioException catch (e) {

lib/data/api/projects_api.dart

@@ -44,7 +44,7 @@ class ProjectsApi {
         if (description != null && description.isNotEmpty)
           'description': description,
         if (goal != null && goal.isNotEmpty) 'goal': goal,
-        if (color != null) 'color': color,
+        ?'color': color,
       });
       return Project.fromJson(response.data as Map<String, dynamic>);
     } on DioException catch (e) {

lib/data/api/tasks_api.dart

@@ -43,8 +43,8 @@ class TasksApi {
         'status': status.value,
         'priority': priority.value,
         'due_date': dueDate?.toIso8601String(),
-        if (projectId != null) 'project_id': projectId,
+        ?'project_id': projectId,
-        if (parentId != null) 'parent_id': parentId,
+        ?'parent_id': parentId,
       });
       return Task.fromJson(response.data as Map<String, dynamic>);
     } on DioException catch (e) {

lib/screens/auth/login_screen.dart

@@ -72,7 +72,7 @@ class _LoginScreenState extends ConsumerState<LoginScreen> {
             _usernameController.text.trim(),
             _passwordController.text,
           );
-      if (mounted) context.go(Routes.notes);
+      if (mounted) context.go(Routes.briefing);
     } on AuthException catch (e) {
       setState(() => _error = e.message);
     } on AppException catch (e) {
@@ -90,7 +90,7 @@ class _LoginScreenState extends ConsumerState<LoginScreen> {
         cookieJar: ref.read(cookieJarProvider),
         onSuccess: () async {
           await ref.read(authProvider.notifier).verify();
-          if (mounted) context.go(Routes.notes);
+          if (mounted) context.go(Routes.briefing);
         },
       ),
     ));

lib/screens/splash/splash_screen.dart

@@ -30,7 +30,7 @@ class _SplashScreenState extends ConsumerState<SplashScreen> {
     if (!mounted) return;
     final status = ref.read(authProvider);
     if (status == AuthStatus.authenticated) {
-      context.go(Routes.notes);
+      context.go(Routes.briefing);
     } else {
       context.go(Routes.login);
     }

lib/screens/tasks/task_edit_screen.dart

@@ -4,7 +4,6 @@ import 'package:go_router/go_router.dart';
 
 import '../../core/constants.dart';
 import '../../core/exceptions.dart';
-import '../../data/api/tasks_api.dart';
 import '../../data/models/task.dart';
 import '../../providers/api_client_provider.dart';
 import '../../providers/tasks_provider.dart';
@@ -239,6 +238,7 @@ class _TaskEditScreenState extends ConsumerState<TaskEditScreen> {
                           ),
                           const SizedBox(height: 16),
                           DropdownButtonFormField<TaskStatus>(
+                            // ignore: deprecated_member_use
                             value: _status,
                             decoration: const InputDecoration(
                               labelText: 'Status',
@@ -253,6 +253,7 @@ class _TaskEditScreenState extends ConsumerState<TaskEditScreen> {
                           ),
                           const SizedBox(height: 16),
                           DropdownButtonFormField<TaskPriority>(
+                            // ignore: deprecated_member_use
                             value: _priority,
                             decoration: const InputDecoration(
                               labelText: 'Priority',

lib/widgets/project_selector.dart

@@ -23,12 +23,13 @@ class ProjectSelector extends ConsumerWidget {
 
     return projectsAsync.when(
       loading: () => const LinearProgressIndicator(),
-      error: (_, __) => const SizedBox.shrink(),
+      error: (_, _) => const SizedBox.shrink(),
       data: (projects) {
         final active =
             projects.where((p) => p.status == 'active').toList();
 
         return DropdownButtonFormField<int?>(
+          // ignore: deprecated_member_use
           value: value,
           decoration: decoration ??
               const InputDecoration(

pubspec.yaml

@@ -2,7 +2,7 @@ name: fabled_app
 description: "FabledAssistant mobile client for Android."
 publish_to: 'none'
 
-version: 26.03.02+1
+version: 26.03.12+1
 
 environment:
   sdk: ^3.11.0