ci: fix key properties filename

.gitea/workflows/release-latest-android.yml

@@ -11,6 +11,20 @@ jobs:
       - name: Checkout Code
         uses: actions/checkout@v4
 
+      - name: Decode keystore
+        run: echo "$KEYSTORE_BASE64" | base64 --decode > android/app/keystore.jks
+        env:
+          KEYSTORE_BASE64: ${{ secrets.FRAJUL_KEYSTORE_BASE64 }}
+
+      - name: Create keystore.properties
+        run: |
+          cat <<EOF > android/key.properties
+          storeFile=keystore.jks
+          storePassword=${{ secrets.FRAJUL_KEYSTORE_PASSWORD }}
+          keyAlias=${{ secrets.FRAJUL_KEYSTORE_ALIAS }}
+          keyPassword=${{ secrets.FRAJUL_KEYSTORE_KEY_PASSWORD }}
+          EOF
+        
       - name: Build apk
         run: devenv shell build-android
 

.gitea/workflows/release-versioned-android.yml

@@ -11,6 +11,22 @@ jobs:
       - name: Checkout Code
         uses: actions/checkout@v4
 
+      - name: Decode keystore
+        run: echo "$KEYSTORE_BASE64" | base64 --decode > android/app/keystore.jks
+        env:
+          KEYSTORE_BASE64: ${{ secrets.FRAJUL_KEYSTORE_BASE64 }}
+
+      - name: Create keystore.properties
+        run: |
+          cat <<EOF > android/key.properties
+          storeFile=keystore.jks
+          storePassword=${{ secrets.FRAJUL_KEYSTORE_PASSWORD }}
+          keyAlias=${{ secrets.FRAJUL_KEYSTORE_ALIAS }}
+          keyPassword=${{ secrets.FRAJUL_KEYSTORE_KEY_PASSWORD }}
+          EOF
+        
+      - name: Build apk
+        run: devenv shell build-android
       - name: Build apk
         run: devenv shell build-android
         

.metadata

@@ -15,24 +15,9 @@ migration:
     - platform: root
       create_revision: nixpkgs000000000000000000000000000000000
       base_revision: nixpkgs000000000000000000000000000000000
-    - platform: android
-      create_revision: nixpkgs000000000000000000000000000000000
-      base_revision: nixpkgs000000000000000000000000000000000
-    - platform: ios
-      create_revision: nixpkgs000000000000000000000000000000000
-      base_revision: nixpkgs000000000000000000000000000000000
     - platform: linux
       create_revision: nixpkgs000000000000000000000000000000000
       base_revision: nixpkgs000000000000000000000000000000000
-    - platform: macos
-      create_revision: nixpkgs000000000000000000000000000000000
-      base_revision: nixpkgs000000000000000000000000000000000
-    - platform: web
-      create_revision: nixpkgs000000000000000000000000000000000
-      base_revision: nixpkgs000000000000000000000000000000000
-    - platform: windows
-      create_revision: nixpkgs000000000000000000000000000000000
-      base_revision: nixpkgs000000000000000000000000000000000
 
   # User provided section
 

android/app/build.gradle.kts

@@ -1,3 +1,6 @@
+import java.util.Properties
+import java.io.FileInputStream
+
 plugins {
     id("com.android.application")
     id("kotlin-android")
@@ -5,6 +8,12 @@ plugins {
     id("dev.flutter.flutter-gradle-plugin")
 }
 
+val keystoreProperties = Properties()
+val keystorePropertiesFile = rootProject.file("key.properties")
+if (keystorePropertiesFile.exists()) {
+    keystoreProperties.load(FileInputStream(keystorePropertiesFile))
+}
+
 android {
     namespace = "com.example.sheetless"
     compileSdk = flutter.compileSdkVersion
@@ -30,11 +39,18 @@ android {
         versionName = flutter.versionName
     }
 
+    signingConfigs {
+        create("release") {
+            keyAlias = keystoreProperties["keyAlias"] as String
+            keyPassword = keystoreProperties["keyPassword"] as String
+            storeFile = keystoreProperties["storeFile"]?.let { file(it) }
+            storePassword = keystoreProperties["storePassword"] as String
+        }
+    }
+
     buildTypes {
         release {
-            // TODO: Add your own signing config for the release build.
+            signingConfig = signingConfigs.getByName("release")
-            // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig = signingConfigs.getByName("debug")
         }
     }
 }

lib/core/services/annotation_sync_service.dart

@@ -15,24 +15,26 @@ class AnnotationSyncService {
   AnnotationSyncService({
     required ApiClient apiClient,
     required StorageService storageService,
-  })  : _apiClient = apiClient,
+  }) : _apiClient = apiClient,
-        _storageService = storageService;
+       _storageService = storageService;
 
   /// Downloads annotations from server and merges with local storage.
   ///
   /// For each page, compares server's lastModified with local lastModified.
   /// If server is newer, overwrites local. Local annotations that are newer
   /// are preserved.
-  Future<void> syncFromServer(String sheetUuid) async {
+  Future<void> syncAnnotationsFromServer(String sheetUuid) async {
     try {
       _log.info('Syncing annotations from server for sheet $sheetUuid');
 
       // Fetch all annotations from server
       final serverAnnotations = await _apiClient.fetchAnnotations(sheetUuid);
 
+      _log.fine('Fetched annotations from server for sheet $sheetUuid');
+
       // Get all local annotations with metadata
-      final localAnnotations =
+      final localAnnotations = await _storageService
-          await _storageService.readAllAnnotationsWithMetadata(sheetUuid);
+          .readAllAnnotationsWithMetadata(sheetUuid);
 
       int updatedCount = 0;
 
@@ -118,7 +120,8 @@ class AnnotationSyncService {
       return false;
     } catch (e) {
       _log.warning(
-          'Unexpected error uploading annotation, queuing for later: $e');
+        'Unexpected error uploading annotation, queuing for later: $e',
+      );
       await _queueForLaterUpload(
         sheetUuid: sheetUuid,
         page: page,

lib/features/sheet_viewer/sheet_viewer_page.dart

@@ -40,6 +40,7 @@ class _SheetViewerPageState extends State<SheetViewerPage>
 
   PdfDocument? _document;
   late Future<bool> _documentLoaded;
+  late Future<void> _annotationsLoaded;
   int _currentPage = 1;
   int _totalPages = 1;
   bool _isPaintMode = false;
@@ -69,6 +70,15 @@ class _SheetViewerPageState extends State<SheetViewerPage>
       FullScreen.setFullScreen(widget.config.fullscreen);
     }
     _documentLoaded = _loadPdf();
+    _syncAnnotations();
+  }
+
+  void _syncAnnotations() {
+    setState(() {
+      _annotationsLoaded = _syncService.syncAnnotationsFromServer(
+        widget.sheet.uuid,
+      );
+    });
   }
 
   @override
@@ -97,20 +107,22 @@ class _SheetViewerPageState extends State<SheetViewerPage>
     } else {
       // Native: use file cache
       final file = await widget.apiClient.getPdfFileCached(widget.sheet.uuid);
+      _log.fine("Found file, opening...");
       _document = await PdfDocument.openFile(file.path);
       widget.sheet.availableOffline = true;
     }
 
+    _log.fine("Pdf loaded");
+
     setState(() {
       _totalPages = _document!.pages.length;
     });
 
-    // Sync annotations from server (downloads newer versions)
-    await _syncService.syncFromServer(widget.sheet.uuid);
-
     // Load annotations for current page(s)
     await _loadAnnotationsForCurrentPages();
 
+    _log.fine("Annotations loaded");
+
     return true;
   }
 
@@ -304,6 +316,26 @@ class _SheetViewerPageState extends State<SheetViewerPage>
               : 'Enter Fullscreen',
           onPressed: _toggleFullscreen,
         ),
+        FutureBuilder<void>(
+          future: _annotationsLoaded,
+          builder: (context, snapshot) {
+            if (snapshot.hasError) {
+              _log.warning('Error loading annotations', snapshot.error);
+              return IconButton(
+                onPressed: _syncAnnotations,
+                icon: Icon(Icons.error, color: Colors.red),
+              );
+            }
+            if (snapshot.connectionState == ConnectionState.done) {
+              _loadAnnotationsForCurrentPages();
+              return IconButton(
+                onPressed: _syncAnnotations,
+                icon: Icon(Icons.refresh),
+              );
+            }
+            return const CircularProgressIndicator();
+          },
+        ),
         IconButton(
           icon: Icon(_isPaintMode ? Icons.brush : Icons.brush_outlined),
           tooltip: _isPaintMode ? 'Exit Paint Mode' : 'Enter Paint Mode',

linux/CMakeLists.txt

@@ -1,5 +1,5 @@
 # Project-level configuration.
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.13)
 project(runner LANGUAGES CXX)
 
 # The name of the executable created for the application. Change this to change
@@ -54,25 +54,8 @@ add_subdirectory(${FLUTTER_MANAGED_DIR})
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0)
 
-add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}")
+# Application build; see runner/CMakeLists.txt.
-
+add_subdirectory("runner")
-# Define the application target. To change its name, change BINARY_NAME above,
-# not the value here, or `flutter run` will no longer work.
-#
-# Any new source files that you add to the application should be added here.
-add_executable(${BINARY_NAME}
-  "main.cc"
-  "my_application.cc"
-  "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc"
-)
-
-# Apply the standard set of build settings. This can be removed for applications
-# that need different build settings.
-apply_standard_settings(${BINARY_NAME})
-
-# Add dependency libraries. Add any application-specific dependencies here.
-target_link_libraries(${BINARY_NAME} PRIVATE flutter)
-target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK)
 
 # Run the Flutter tool portions of the build. This must not be removed.
 add_dependencies(${BINARY_NAME} flutter_assemble)
@@ -86,6 +69,7 @@ set_target_properties(${BINARY_NAME}
   RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/intermediates_do_not_run"
 )
 
+
 # Generated plugin build rules, which manage building the plugins and adding
 # them to the application.
 include(flutter/generated_plugins.cmake)
@@ -122,6 +106,12 @@ foreach(bundled_library ${PLUGIN_BUNDLED_LIBRARIES})
     COMPONENT Runtime)
 endforeach(bundled_library)
 
+# Copy the native assets provided by the build.dart from all packages.
+set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/linux/")
+install(DIRECTORY "${NATIVE_ASSETS_DIR}"
+   DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
+   COMPONENT Runtime)
+
 # Fully re-copy the assets directory on each build to avoid having stale files
 # from a previous install.
 set(FLUTTER_ASSET_DIR_NAME "flutter_assets")

linux/main.cc

@@ -1,6 +0,0 @@
-#include "my_application.h"
-
-int main(int argc, char** argv) {
-  g_autoptr(MyApplication) app = my_application_new();
-  return g_application_run(G_APPLICATION(app), argc, argv);
-}

linux/my_application.cc

@@ -1,104 +0,0 @@
-#include "my_application.h"
-
-#include <flutter_linux/flutter_linux.h>
-#ifdef GDK_WINDOWING_X11
-#include <gdk/gdkx.h>
-#endif
-
-#include "flutter/generated_plugin_registrant.h"
-
-struct _MyApplication {
-  GtkApplication parent_instance;
-  char** dart_entrypoint_arguments;
-};
-
-G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION)
-
-// Implements GApplication::activate.
-static void my_application_activate(GApplication* application) {
-  MyApplication* self = MY_APPLICATION(application);
-  GtkWindow* window =
-      GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application)));
-
-  // Use a header bar when running in GNOME as this is the common style used
-  // by applications and is the setup most users will be using (e.g. Ubuntu
-  // desktop).
-  // If running on X and not using GNOME then just use a traditional title bar
-  // in case the window manager does more exotic layout, e.g. tiling.
-  // If running on Wayland assume the header bar will work (may need changing
-  // if future cases occur).
-  gboolean use_header_bar = TRUE;
-#ifdef GDK_WINDOWING_X11
-  GdkScreen* screen = gtk_window_get_screen(window);
-  if (GDK_IS_X11_SCREEN(screen)) {
-    const gchar* wm_name = gdk_x11_screen_get_window_manager_name(screen);
-    if (g_strcmp0(wm_name, "GNOME Shell") != 0) {
-      use_header_bar = FALSE;
-    }
-  }
-#endif
-  if (use_header_bar) {
-    GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new());
-    gtk_widget_show(GTK_WIDGET(header_bar));
-    gtk_header_bar_set_title(header_bar, "sheetless");
-    gtk_header_bar_set_show_close_button(header_bar, TRUE);
-    gtk_window_set_titlebar(window, GTK_WIDGET(header_bar));
-  } else {
-    gtk_window_set_title(window, "sheetless");
-  }
-
-  gtk_window_set_default_size(window, 1280, 720);
-  gtk_widget_show(GTK_WIDGET(window));
-
-  g_autoptr(FlDartProject) project = fl_dart_project_new();
-  fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments);
-
-  FlView* view = fl_view_new(project);
-  gtk_widget_show(GTK_WIDGET(view));
-  gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view));
-
-  fl_register_plugins(FL_PLUGIN_REGISTRY(view));
-
-  gtk_widget_grab_focus(GTK_WIDGET(view));
-}
-
-// Implements GApplication::local_command_line.
-static gboolean my_application_local_command_line(GApplication* application, gchar*** arguments, int* exit_status) {
-  MyApplication* self = MY_APPLICATION(application);
-  // Strip out the first argument as it is the binary name.
-  self->dart_entrypoint_arguments = g_strdupv(*arguments + 1);
-
-  g_autoptr(GError) error = nullptr;
-  if (!g_application_register(application, nullptr, &error)) {
-     g_warning("Failed to register: %s", error->message);
-     *exit_status = 1;
-     return TRUE;
-  }
-
-  g_application_activate(application);
-  *exit_status = 0;
-
-  return TRUE;
-}
-
-// Implements GObject::dispose.
-static void my_application_dispose(GObject* object) {
-  MyApplication* self = MY_APPLICATION(object);
-  g_clear_pointer(&self->dart_entrypoint_arguments, g_strfreev);
-  G_OBJECT_CLASS(my_application_parent_class)->dispose(object);
-}
-
-static void my_application_class_init(MyApplicationClass* klass) {
-  G_APPLICATION_CLASS(klass)->activate = my_application_activate;
-  G_APPLICATION_CLASS(klass)->local_command_line = my_application_local_command_line;
-  G_OBJECT_CLASS(klass)->dispose = my_application_dispose;
-}
-
-static void my_application_init(MyApplication* self) {}
-
-MyApplication* my_application_new() {
-  return MY_APPLICATION(g_object_new(my_application_get_type(),
-                                     "application-id", APPLICATION_ID,
-                                     "flags", G_APPLICATION_NON_UNIQUE,
-                                     nullptr));
-}

linux/my_application.h

@@ -1,18 +0,0 @@
-#ifndef FLUTTER_MY_APPLICATION_H_
-#define FLUTTER_MY_APPLICATION_H_
-
-#include <gtk/gtk.h>
-
-G_DECLARE_FINAL_TYPE(MyApplication, my_application, MY, APPLICATION,
-                     GtkApplication)
-
-/**
- * my_application_new:
- *
- * Creates a new Flutter-based application.
- *
- * Returns: a new #MyApplication.
- */
-MyApplication* my_application_new();
-
-#endif  // FLUTTER_MY_APPLICATION_H_

linux/runner/my_application.cc

@@ -14,6 +14,11 @@ struct _MyApplication {
 
 G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION)
 
+// Called when first Flutter frame received.
+static void first_frame_cb(MyApplication* self, FlView* view) {
+  gtk_widget_show(gtk_widget_get_toplevel(GTK_WIDGET(view)));
+}
+
 // Implements GApplication::activate.
 static void my_application_activate(GApplication* application) {
   MyApplication* self = MY_APPLICATION(application);
@@ -48,31 +53,44 @@ static void my_application_activate(GApplication* application) {
   }
 
   gtk_window_set_default_size(window, 1280, 720);
-  gtk_widget_show(GTK_WIDGET(window));
 
   g_autoptr(FlDartProject) project = fl_dart_project_new();
-  fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments);
+  fl_dart_project_set_dart_entrypoint_arguments(
+      project, self->dart_entrypoint_arguments);
 
   FlView* view = fl_view_new(project);
+  GdkRGBA background_color;
+  // Background defaults to black, override it here if necessary, e.g. #00000000
+  // for transparent.
+  gdk_rgba_parse(&background_color, "#000000");
+  fl_view_set_background_color(view, &background_color);
   gtk_widget_show(GTK_WIDGET(view));
   gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view));
 
+  // Show the window when Flutter renders.
+  // Requires the view to be realized so we can start rendering.
+  g_signal_connect_swapped(view, "first-frame", G_CALLBACK(first_frame_cb),
+                           self);
+  gtk_widget_realize(GTK_WIDGET(view));
+
   fl_register_plugins(FL_PLUGIN_REGISTRY(view));
 
   gtk_widget_grab_focus(GTK_WIDGET(view));
 }
 
 // Implements GApplication::local_command_line.
-static gboolean my_application_local_command_line(GApplication* application, gchar*** arguments, int* exit_status) {
+static gboolean my_application_local_command_line(GApplication* application,
+                                                  gchar*** arguments,
+                                                  int* exit_status) {
   MyApplication* self = MY_APPLICATION(application);
   // Strip out the first argument as it is the binary name.
   self->dart_entrypoint_arguments = g_strdupv(*arguments + 1);
 
   g_autoptr(GError) error = nullptr;
   if (!g_application_register(application, nullptr, &error)) {
-     g_warning("Failed to register: %s", error->message);
+    g_warning("Failed to register: %s", error->message);
-     *exit_status = 1;
+    *exit_status = 1;
-     return TRUE;
+    return TRUE;
   }
 
   g_application_activate(application);
@@ -83,7 +101,7 @@ static gboolean my_application_local_command_line(GApplication* application, gch
 
 // Implements GApplication::startup.
 static void my_application_startup(GApplication* application) {
-  //MyApplication* self = MY_APPLICATION(object);
+  // MyApplication* self = MY_APPLICATION(object);
 
   // Perform any actions required at application startup.
 
@@ -92,7 +110,7 @@ static void my_application_startup(GApplication* application) {
 
 // Implements GApplication::shutdown.
 static void my_application_shutdown(GApplication* application) {
-  //MyApplication* self = MY_APPLICATION(object);
+  // MyApplication* self = MY_APPLICATION(object);
 
   // Perform any actions required at application shutdown.
 
@@ -108,7 +126,8 @@ static void my_application_dispose(GObject* object) {
 
 static void my_application_class_init(MyApplicationClass* klass) {
   G_APPLICATION_CLASS(klass)->activate = my_application_activate;
-  G_APPLICATION_CLASS(klass)->local_command_line = my_application_local_command_line;
+  G_APPLICATION_CLASS(klass)->local_command_line =
+      my_application_local_command_line;
   G_APPLICATION_CLASS(klass)->startup = my_application_startup;
   G_APPLICATION_CLASS(klass)->shutdown = my_application_shutdown;
   G_OBJECT_CLASS(klass)->dispose = my_application_dispose;
@@ -124,7 +143,6 @@ MyApplication* my_application_new() {
   g_set_prgname(APPLICATION_ID);
 
   return MY_APPLICATION(g_object_new(my_application_get_type(),
-                                     "application-id", APPLICATION_ID,
+                                     "application-id", APPLICATION_ID, "flags",
-                                     "flags", G_APPLICATION_NON_UNIQUE,
+                                     G_APPLICATION_NON_UNIQUE, nullptr));
-                                     nullptr));
 }

linux/runner/my_application.h

@@ -3,7 +3,10 @@
 
 #include <gtk/gtk.h>
 
-G_DECLARE_FINAL_TYPE(MyApplication, my_application, MY, APPLICATION,
+G_DECLARE_FINAL_TYPE(MyApplication,
+                     my_application,
+                     MY,
+                     APPLICATION,
                      GtkApplication)
 
 /**

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # 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: 0.2.1
+version: 0.2.1+2
 
 environment:
   sdk: ^3.0.0