rudimentary sync maybe?

Author: desperateCoder

.idea/runConfigurations/JavaFX.xml

@@ -15,13 +15,22 @@ import it.niedermann.nextcloud.deck.AndroidKeyValueStore
 import it.niedermann.nextcloud.deck.app.shared.Constants.DECK_DB_NAME
 import it.niedermann.nextcloud.deck.data.local.DeckDatabase
 import it.niedermann.nextcloud.deck.domain.state.KeyValueStore
+import it.niedermann.nextcloud.deck.app.shared.di.NamedVerbose
 import jakarta.inject.Singleton
 import kotlinx.coroutines.Dispatchers
 
 @Module
 @InstallIn(SingletonComponent::class)
 object AppModule {
 
+    @Provides
+    @NamedVerbose
+    fun provideVerbose(): Boolean {
+        // For Android, we could link this to a setting, but for now we'll just use false
+        // or true if you want it always on in debug.
+        return false
+    }
+
     @Provides
     @Singleton
     fun provideDatabase(@ApplicationContext context: Context): DeckDatabase {

app/android/src/main/java/it/niedermann/nextcloud/deck/di/AppModule.kt

@@ -203,10 +203,10 @@ fun BoardScreen(
                     Crossfade(targetState = isRefreshing, label = "SyncProgress") { refreshing ->
                         if (refreshing) {
                             val currentStatus = syncStatus
-                            val total = currentStatus?.boardsTotalCount() ?: 0
+                            val total = currentStatus?.boardsTotal ?: 0
                             if (currentStatus != null && total > 0) {
                                 CircularProgressIndicator(
-                                    progress = { currentStatus.boardsFinishedCount().toFloat() / total },
+                                    progress = { currentStatus.boardsFinished.toFloat() / total },
                                     modifier = Modifier.size(24.dp),
                                     color = MaterialTheme.colorScheme.primary,
                                     strokeWidth = 3.dp,

app/android/src/main/java/it/niedermann/nextcloud/deck/ui/board/BoardScreen.kt

@@ -94,10 +94,10 @@ fun BoardListScreen(
                     Crossfade(targetState = isRefreshing, label = "SyncProgress") { refreshing ->
                         if (refreshing) {
                             val currentStatus = syncStatus
-                            val total = currentStatus?.boardsTotalCount() ?: 0
+                            val total = currentStatus?.boardsTotal ?: 0
                             if (currentStatus != null && total > 0) {
                                 CircularProgressIndicator(
-                                    progress = { currentStatus.boardsFinishedCount().toFloat() / total },
+                                    progress = { currentStatus.boardsFinished.toFloat() / total },
                                     modifier = Modifier.size(24.dp),
                                     color = MaterialTheme.colorScheme.primary,
                                     strokeWidth = 3.dp,

app/android/src/main/java/it/niedermann/nextcloud/deck/ui/boards/BoardListScreen.kt

@@ -93,14 +93,14 @@ fun LoginScreen(
             if (viewModel.isLoading) {
                 Spacer(modifier = Modifier.height(16.dp))
                 val status = viewModel.syncStatus
-                if (status != null && status.boardsTotalCount() > 0) {
-                    val progress = status.boardsFinishedCount().toFloat() / status.boardsTotalCount()
+                if (status != null && status.boardsTotal > 0) {
+                    val progress = status.boardsFinished.toFloat() / status.boardsTotal
                     LinearProgressIndicator(
                         progress = { progress },
                         modifier = Modifier.fillMaxWidth(),
                     )
                     Text(
-                        text = "Importing boards: ${status.boardsFinishedCount()} / ${status.boardsTotalCount()}",
+                        text = "Importing boards: ${status.boardsFinished} / ${status.boardsTotal}",
                         style = MaterialTheme.typography.bodySmall,
                         modifier = Modifier.padding(top = 4.dp)
                     )

app/android/src/main/java/it/niedermann/nextcloud/deck/ui/login/LoginScreen.kt

@@ -1,5 +1,6 @@
 package it.niedermann.nextcloud.deck.cli;
 
+import java.util.Arrays;
 import java.util.prefs.Preferences;
 
 import it.niedermann.nextcloud.deck.app.shared.Util;
@@ -14,19 +15,20 @@ public class Launcher {
 
     static void main(String[] args) {
 
-        final var appComponent = createAppComponent();
+        final var verbose = Arrays.asList(args).contains("-v");
+        final var appComponent = createAppComponent(verbose);
         new CliApplication(appComponent, args);
 
     }
 
-    private static AppComponent createAppComponent() {
+    private static AppComponent createAppComponent(boolean verbose) {
 
         final var pathDatabase = Util.getDatabasePath();
         final var database = DeckDatabase.Companion.getDatabaseBuilder(pathDatabase).build();
 
         final var prefs = Preferences.userRoot().node(String.valueOf(preferencesVersion));
         final var keyValueStore = new PreferencesKeyValueStore(prefs);
 
-        return DaggerAppComponent.factory().create(database, keyValueStore);
+        return DaggerAppComponent.factory().create(database, keyValueStore, verbose);
     }
-}
+}

app/cli/src/main/java/it/niedermann/nextcloud/deck/cli/Launcher.java

@@ -3,6 +3,7 @@
 
 import dagger.BindsInstance;
 import dagger.Component;
+import it.niedermann.nextcloud.deck.app.shared.di.NamedVerbose;
 import it.niedermann.nextcloud.deck.app.shared.di.SharedModule;
 import it.niedermann.nextcloud.deck.cli.commands.account.AccountCmd;
 import it.niedermann.nextcloud.deck.cli.commands.account.subcommands.AccountAddCmd;
@@ -25,7 +26,8 @@ public interface AppComponent {
     @Component.Factory
     interface Factory {
         AppComponent create(@BindsInstance DeckDatabase database,
-                            @BindsInstance KeyValueStore keyValueStore);
+                            @BindsInstance KeyValueStore keyValueStore,
+                            @BindsInstance @NamedVerbose boolean verbose);
     }
 
     void inject(AccountCmd cmd);

app/cli/src/main/java/it/niedermann/nextcloud/deck/cli/di/AppComponent.java

@@ -1,12 +1,15 @@
 package it.niedermann.nextcloud.deck.javafx;
 
+import java.util.Arrays;
+
 import it.niedermann.nextcloud.deck.javafx.di.application.DaggerAppComponent;
 
 public class Launcher {
 
     static void main(String[] args) {
 
-        final var appComponent = DaggerAppComponent.factory().create();
+        final var verbose = Arrays.asList(args).contains("-v");
+        final var appComponent = DaggerAppComponent.factory().create(verbose);
 
         if (args.length == 1 && "--purge".equals(args[0])) {
             // TODO Provide Purge-Button in ExceptionDialog

app/javafx/src/main/java/it/niedermann/nextcloud/deck/javafx/Launcher.java

@@ -1,7 +1,9 @@
 package it.niedermann.nextcloud.deck.javafx.di.application;
 
 
+import dagger.BindsInstance;
 import dagger.Component;
+import it.niedermann.nextcloud.deck.app.shared.di.NamedVerbose;
 import it.niedermann.nextcloud.deck.app.shared.di.SharedModule;
 import it.niedermann.nextcloud.deck.javafx.di.fx.FxComponent;
 import it.niedermann.nextcloud.deck.javafx.services.application.PurgeService;
@@ -17,7 +19,7 @@ public interface AppComponent {
 
     @Component.Factory
     interface Factory {
-        AppComponent create();
+        AppComponent create(@BindsInstance @NamedVerbose boolean verbose);
     }
 
     FxComponent.Factory getFxComponentFactory();

app/javafx/src/main/java/it/niedermann/nextcloud/deck/javafx/di/application/AppComponent.java

@@ -116,8 +116,8 @@ public void initialize(URL location, ResourceBundle resources) {
                 .switchMap(_ -> syncStatus)
                 .observeOn(JavaFxScheduler.platform())
                 .subscribe(syncStatus -> {
-                    if (syncStatus.boardsFinishedCount() > 0) {
-                        this.progress.setProgress(Math.min(1, (double) syncStatus.boardsFinishedCount() / syncStatus.boardsTotalCount()));
+                    if (syncStatus.boardsFinished() > 0) {
+                        this.progress.setProgress(Math.min(1, (double) syncStatus.boardsFinished() / syncStatus.boardsTotal()));
                     }
                 });