Blazor Hybrid android

.config/dotnet-tools.json

@@ -8,6 +8,13 @@
         "dotnet-ef"
       ],
       "rollForward": false
+    },
+    "dotnet-typegen": {
+      "version": "6.0.2",
+      "commands": [
+        "dotnet-typegen"
+      ],
+      "rollForward": false
     }
   }
-}
+}

.github/workflows/fw-lite.yaml

@@ -19,11 +19,12 @@ on:
     branches:
       - develop
       - main
-
+env:
+  VIEWER_BUILD_OUTPUT_DIR: backend/FwLite/FwLiteShared/wwwroot/viewer
 jobs:
   build-and-test:
     name: Build FW Lite and run tests
-    timeout-minutes: 30
+    timeout-minutes: 40
     runs-on: windows-latest
     outputs:
       version: ${{ steps.setVersion.outputs.VERSION }}
@@ -40,9 +41,6 @@ jobs:
         with:
           node-version-file: './frontend/package.json'
 
-      - name: Setup Maui
-        run: dotnet workload install maui-windows
-
       - name: Set Version
         id: setVersion
         shell: bash
@@ -59,20 +57,15 @@ jobs:
           pnpm install
           pnpm run build-app
 
-      - name: Dotnet build
-        working-directory: backend/FwLite/FwLiteDesktop
-        run: |
-          dotnet build --configuration Release
-
       - name: Dotnet test
-        run: dotnet test FwLiteOnly.slnf --configuration Release  --logger GitHubActions
+        run: dotnet test FwLiteOnly.slnf --logger GitHubActions
 
       - name: Upload viewer artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: fw-lite-viewer-app
+          name: fw-lite-viewer-js
           if-no-files-found: error
-          path: frontend/viewer/dist
+          path: ${{ env.VIEWER_BUILD_OUTPUT_DIR }}
 
   publish-mac:
     name: Publish FW Lite app for Mac
@@ -86,8 +79,8 @@ jobs:
           submodules: true
       - uses: actions/download-artifact@v4
         with:
-          name: fw-lite-viewer-app
-          path: frontend/viewer/dist
+          name: fw-lite-viewer-js
+          path: ${{ env.VIEWER_BUILD_OUTPUT_DIR }}
       - uses: actions/setup-dotnet@v4
         with:
           dotnet-version: '9.x'
@@ -123,16 +116,12 @@ jobs:
           submodules: true
       - uses: actions/download-artifact@v4
         with:
-          name: fw-lite-viewer-app
-          path: frontend/viewer/dist
+          name: fw-lite-viewer-js
+          path: ${{ env.VIEWER_BUILD_OUTPUT_DIR }}
       - uses: actions/setup-dotnet@v4
         with:
           dotnet-version: '9.x'
 
-      - name: Dotnet build
-        working-directory: backend/FwLite/LocalWebApp
-        run: dotnet build --configuration Release
-
       - name: Publish Linux
         working-directory: backend/FwLite/LocalWebApp
         run: dotnet publish -r linux-x64 --artifacts-path ../artifacts -p:PublishSingleFile=true -p:Version=${{ needs.build-and-test.outputs.semver-version }}
@@ -144,6 +133,38 @@ jobs:
           if-no-files-found: error
           path: backend/FwLite/artifacts/publish/LocalWebApp/*
 
+  publish-android:
+    name: Publish FW Lite app for Android
+    needs: build-and-test
+    timeout-minutes: 30
+    runs-on: macos-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+      - uses: actions/download-artifact@v4
+        with:
+          name: fw-lite-viewer-js
+          path: ${{ env.VIEWER_BUILD_OUTPUT_DIR }}
+      - uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '9.x'
+
+      - name: Setup Maui
+        run: dotnet workload install maui
+
+      - name: Publish Android
+        working-directory: backend/FwLite/FwLiteDesktop
+        run: dotnet publish -f net9.0-android --artifacts-path ../artifacts -p:ApplicationDisplayVersion=${{ needs.build-and-test.outputs.semver-version }} -p:InformationalVersion=${{ needs.build-and-test.outputs.version }}
+
+      - name: Upload FWLite App artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: fw-lite-android
+          if-no-files-found: error
+          path: backend/FwLite/artifacts/publish/FwLiteDesktop/*/*
+
   publish-win:
     name: Publish FW Lite app for Windows
     needs: build-and-test
@@ -156,30 +177,26 @@ jobs:
           submodules: true
       - uses: actions/download-artifact@v4
         with:
-          name: fw-lite-viewer-app
-          path: frontend/viewer/dist
+          name: fw-lite-viewer-js
+          path: ${{ env.VIEWER_BUILD_OUTPUT_DIR }}
       - uses: actions/setup-dotnet@v4
         with:
           dotnet-version: '9.x'
 
       - name: Setup Maui
         run: dotnet workload install maui-windows
 
-      - name: Dotnet build
-        working-directory: backend/FwLite/LocalWebApp
-        run: dotnet build --configuration Release
-
       - name: Publish Windows MAUI portable app
         working-directory: backend/FwLite/FwLiteDesktop
         run: |
-          dotnet publish -r win-x64 --artifacts-path ../artifacts -p:WindowsPackageType=None -p:ApplicationDisplayVersion=${{ needs.build-and-test.outputs.semver-version }} -p:InformationalVersion=${{ needs.build-and-test.outputs.version }}
+          dotnet publish -f net9.0-windows10.0.19041.0 --artifacts-path ../artifacts -p:WindowsPackageType=None -p:ApplicationDisplayVersion=${{ needs.build-and-test.outputs.semver-version }} -p:InformationalVersion=${{ needs.build-and-test.outputs.version }}
           mkdir -p ../artifacts/sign/portable
           cp -r ../artifacts/publish/FwLiteDesktop/* ../artifacts/sign/portable/
 
       - name: Publish Windows MAUI msix app
         working-directory: backend/FwLite/FwLiteDesktop
         run: |
-          dotnet publish -r win-x64 --artifacts-path ../artifacts -p:ApplicationDisplayVersion=${{ needs.build-and-test.outputs.semver-version }} -p:InformationalVersion=${{ needs.build-and-test.outputs.version }}
+          dotnet publish -f net9.0-windows10.0.19041.0 --artifacts-path ../artifacts -p:ApplicationDisplayVersion=${{ needs.build-and-test.outputs.semver-version }} -p:InformationalVersion=${{ needs.build-and-test.outputs.version }}
           mkdir -p ../artifacts/msix
           cp ../artifacts/bin/FwLiteDesktop/*/AppPackages/*/*.msix ../artifacts/msix/
 
@@ -223,7 +240,7 @@ jobs:
   create-release:
     if: ${{ github.ref_name == 'main' }}
     name: Create Release
-    needs: [ build-and-test, publish-win, publish-linux, publish-mac]
+    needs: [ build-and-test, publish-win, publish-linux, publish-mac, publish-android]
     runs-on: ubuntu-latest
 
     steps:
@@ -239,6 +256,10 @@ jobs:
         with:
           name: fw-lite-local-web-app-linux
           path: fw-lite-local-web-app-linux
+      - uses: actions/download-artifact@v4
+        with:
+          name: fw-lite-android
+          path: fw-lite-android
 
       - name: Zip artifacts
         run: |
@@ -256,6 +277,9 @@ jobs:
             fw-lite-msix/*
             fw-lite-portable.zip
             fw-lite-local-web-app-linux.zip
+            fw-lite-android/*.apk
+            fw-lite-android/*.aab
+
       - name: Invalidate Lexbox Release endpoint
         continue-on-error: true
         run: |

.gitignore

@@ -24,3 +24,6 @@ artifacts/
 
 #Verify
 *.received.*
+backend/FwLite/FwLiteShared/wwwroot/viewer
+
+*.csproj.user

backend/Directory.Build.props

@@ -10,7 +10,7 @@
     </PropertyGroup>
     <PropertyGroup>
         <InformationalVersion>dev</InformationalVersion>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework Condition="'$(TargetFramework)' == ''">net9.0</TargetFramework>
         <EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>

backend/FwHeadless/Program.cs

@@ -130,7 +130,7 @@ static async Task<Results<Ok<SyncResult>, NotFound, ProblemHttpResult>> ExecuteM
 }
 
 static async Task<Results<Ok<ProjectSyncStatus>, NotFound>> GetMergeStatus(
-    ProjectContext projectContext,
+    CurrentProjectService projectContext,
     ProjectLookupService projectLookupService,
     SyncJobStatusService syncJobStatusService,
     IServiceProvider services,
@@ -139,7 +139,7 @@ static async Task<Results<Ok<ProjectSyncStatus>, NotFound>> GetMergeStatus(
 {
     var jobStatus = syncJobStatusService.SyncStatus(projectId);
     if (jobStatus == SyncJobStatus.Running) return TypedResults.Ok(ProjectSyncStatus.Syncing);
-    var project = projectContext.Project;
+    var project = projectContext.MaybeProject;
     if (project is null)
     {
         // 404 only means "project doesn't exist"; if we don't know the status, then it hasn't synced before and is therefore ready to sync

backend/FwHeadless/Services/ProjectContextFromIdService.cs

@@ -18,8 +18,7 @@ public async Task PopulateProjectContext(HttpContext context, Func<Task> next)
                 if (File.Exists(crdtFile))
                 {
                     var project = new CrdtProject("crdt", crdtFile);
-                    projectsService.SetProjectScope(project);
-                    await context.RequestServices.GetRequiredService<CurrentProjectService>().PopulateProjectDataCache();
+                    await context.RequestServices.GetRequiredService<CurrentProjectService>().SetupProjectContext(project);
                 }
             }
         }

backend/FwLite/FwDataMiniLcmBridge.Tests/Fixtures/MockFwProjectList.cs

@@ -3,7 +3,8 @@
 
 namespace FwDataMiniLcmBridge.Tests.Fixtures;
 
-public class MockFwProjectList(IOptions<FwDataBridgeConfig> config, MockFwProjectLoader loader) : FieldWorksProjectList(config)
+public class MockFwProjectList(IOptions<FwDataBridgeConfig> config, MockFwProjectLoader loader,
+    FwDataFactory fwDataFactory) : FieldWorksProjectList(config, fwDataFactory)
 {
     public override IEnumerable<IProjectIdentifier> EnumerateProjects()
     {

backend/FwLite/FwDataMiniLcmBridge.Tests/Fixtures/ProjectLoaderFixture.cs

@@ -22,16 +22,12 @@ public ProjectLoaderFixture()
         _config = provider.GetRequiredService<IOptions<FwDataBridgeConfig>>();
     }
 
-    public FwDataMiniLcmApi CreateApi(string projectName)
-    {
-        return _fwDataFactory.GetFwDataMiniLcmApi(projectName, false);
-    }
-
     public FwDataMiniLcmApi NewProjectApi(string projectName, string analysisWs, string vernacularWs)
     {
         projectName = $"{projectName}_{Guid.NewGuid()}";
-        MockFwProjectLoader.NewProject(new FwDataProject(projectName, _config.Value.ProjectsFolder), analysisWs, vernacularWs);
-        return CreateApi(projectName);
+        var fwDataProject = new FwDataProject(projectName, _config.Value.ProjectsFolder);
+        MockFwProjectLoader.NewProject(fwDataProject, analysisWs, vernacularWs);
+        return _fwDataFactory.GetFwDataMiniLcmApi(fwDataProject, false);
     }
 
     public void Dispose()

backend/FwLite/FwDataMiniLcmBridge/FieldWorksProjectList.cs

@@ -1,12 +1,24 @@
 using FwDataMiniLcmBridge.LcmUtils;
 using Microsoft.Extensions.Options;
+using MiniLcm;
 using MiniLcm.Models;
+using MiniLcm.Project;
 
 namespace FwDataMiniLcmBridge;
 
-public class FieldWorksProjectList(IOptions<FwDataBridgeConfig> config)
+public class FieldWorksProjectList(IOptions<FwDataBridgeConfig> config, FwDataFactory fwDataFactory) : IProjectProvider
 {
+    public ProjectDataFormat DataFormat => ProjectDataFormat.FwData;
     protected readonly IOptions<FwDataBridgeConfig> _config = config;
+    IEnumerable<IProjectIdentifier> IProjectProvider.ListProjects()
+    {
+        return EnumerateProjects();
+    }
+
+    IProjectIdentifier? IProjectProvider.GetProject(string name)
+    {
+        return GetProject(name);
+    }
 
     public virtual IEnumerable<IProjectIdentifier> EnumerateProjects()
     {
@@ -24,4 +36,10 @@ public virtual IEnumerable<IProjectIdentifier> EnumerateProjects()
     {
         return EnumerateProjects().OfType<FwDataProject>().FirstOrDefault(p => p.Name == name);
     }
+
+    public IMiniLcmApi OpenProject(IProjectIdentifier project, bool saveOnDispose = true)
+    {
+        if (project is not FwDataProject fwDataProject) throw new ArgumentException("Project is not a fwdata project");
+        return fwDataFactory.GetFwDataMiniLcmApi(fwDataProject, saveOnDispose);
+    }
 }

backend/FwLite/FwDataMiniLcmBridge/FwDataBridgeKernel.cs

@@ -1,6 +1,7 @@
 using FwDataMiniLcmBridge.LcmUtils;
 using Microsoft.Extensions.DependencyInjection;
 using MiniLcm;
+using MiniLcm.Project;
 using MiniLcm.Validators;
 
 namespace FwDataMiniLcmBridge;
@@ -15,10 +16,17 @@ public static IServiceCollection AddFwDataBridge(this IServiceCollection service
         services.AddOptions<FwDataBridgeConfig>().BindConfiguration("FwDataBridge");
         services.AddSingleton<FwDataFactory>();
         services.AddSingleton<FieldWorksProjectList>();
+        services.AddSingleton<IProjectProvider>(s => s.GetRequiredService<FieldWorksProjectList>());
         services.AddSingleton<IProjectLoader, ProjectLoader>();
-        services.AddKeyedScoped<IMiniLcmApi>(FwDataApiKey, (provider, o) => provider.GetRequiredService<FwDataFactory>().GetCurrentFwDataMiniLcmApi(true));
+        services.AddKeyedScoped<IMiniLcmApi>(FwDataApiKey,
+            (provider, o) =>
+            {
+                var projectList = provider.GetRequiredService<FieldWorksProjectList>();
+                var projectContext = provider.GetRequiredService<FwDataProjectContext>();
+                return projectList.OpenProject(projectContext.Project ?? throw new InvalidOperationException("No project is set in the context."));
+            });
         services.AddMiniLcmValidators();
-        services.AddSingleton<FwDataProjectContext>();
+        services.AddScoped<FwDataProjectContext>();
         return services;
     }
 }