From 7df3315f163e41b58a3a2b717f959a16931b982d Mon Sep 17 00:00:00 2001
From: Benedikt Koeppel <be.public@gmail.com>
Date: Mon, 27 Nov 2023 11:32:33 +0100
Subject: [PATCH 01/34] Update to JDK 17

---
 .idea/compiler.xml                            |  2 +-
 .idea/gradle.xml                              |  2 +-
 .idea/misc.xml                                |  2 +-
 .../app/droidplane.app.androidTest.iml        | 20 +++++++----------
 .idea/modules/app/droidplane.app.iml          | 12 ++--------
 .idea/modules/app/droidplane.app.main.iml     | 20 +++++++----------
 .idea/modules/app/droidplane.app.unitTest.iml | 22 ++++++++-----------
 7 files changed, 30 insertions(+), 50 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index fb7f4a8..b589d56 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="17" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 6e5389e..ae388c2 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="Android Studio default JDK" />
+        <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1f88f4b..b7c82bf 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -44,7 +44,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/modules/app/droidplane.app.androidTest.iml b/.idea/modules/app/droidplane.app.androidTest.iml
index 05de916..d902a49 100644
--- a/.idea/modules/app/droidplane.app.androidTest.iml
+++ b/.idea/modules/app/droidplane.app.androidTest.iml
@@ -4,21 +4,17 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <afterSyncTasks>
-          <task>generateDebugSources</task>
-        </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/main/res;file://$MODULE_DIR$/../../../app/src/debug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="" />
         <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/androidTest/res;file://$MODULE_DIR$/../../../app/src/androidTestDebug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/androidTest/debug" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output-test url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debugAndroidTest/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debugAndroidTest/out" />
     <content url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debugAndroidTest/out" />
@@ -31,11 +27,6 @@
     <orderEntry type="jdk" jdkName="Android API 32 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="droidplane.app.main" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation:1.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.0.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.0.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection:1.0.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.constraintlayout:constraintlayout-solver:1.1.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.legacy:legacy-support-v4:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core:1.2.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.0.0@aar" level="project" />
@@ -73,6 +64,11 @@
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-process:2.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-service:2.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.constraintlayout:constraintlayout:1.1.3@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation:1.1.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.0.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.0.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection:1.0.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.constraintlayout:constraintlayout-solver:1.1.3" level="project" />
   </component>
   <component name="TestModuleProperties" production-module="droidplane.app.main" />
 </module>
\ No newline at end of file
diff --git a/.idea/modules/app/droidplane.app.iml b/.idea/modules/app/droidplane.app.iml
index 386a773..e9b7c79 100644
--- a/.idea/modules/app/droidplane.app.iml
+++ b/.idea/modules/app/droidplane.app.iml
@@ -3,7 +3,6 @@
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":app" />
         <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="7.3.1" />
         <option name="LAST_KNOWN_AGP_VERSION" value="7.3.1" />
       </configuration>
@@ -11,23 +10,16 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <afterSyncTasks>
-          <task>generateDebugSources</task>
-        </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/main/res;file://$MODULE_DIR$/../../../app/src/debug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug" />
-        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/androidTest/res;file://$MODULE_DIR$/../../../app/src/androidTestDebug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/androidTest/debug" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="" />
+        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
       </configuration>
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debug/classes" />
-    <output-test url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debugUnitTest/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../../app">
       <excludeFolder url="file://$MODULE_DIR$/../../../app/.gradle" />
diff --git a/.idea/modules/app/droidplane.app.main.iml b/.idea/modules/app/droidplane.app.main.iml
index bff8058..3de47f5 100644
--- a/.idea/modules/app/droidplane.app.main.iml
+++ b/.idea/modules/app/droidplane.app.main.iml
@@ -4,21 +4,17 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <afterSyncTasks>
-          <task>generateDebugSources</task>
-        </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
         <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/main/res;file://$MODULE_DIR$/../../../app/src/debug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug" />
-        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/androidTest/res;file://$MODULE_DIR$/../../../app/src/androidTestDebug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/androidTest/debug" />
+        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debug/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debug/out" />
     <content url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debug/out">
@@ -41,11 +37,6 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 32 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.collection:collection:1.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.constraintlayout:constraintlayout-solver:1.1.3" level="project" />
     <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-v4:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.core:core:1.2.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.0.0@aar" level="project" />
@@ -83,5 +74,10 @@
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-process:2.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-service:2.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.constraintlayout:constraintlayout:1.1.3@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.1.0" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.collection:collection:1.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.constraintlayout:constraintlayout-solver:1.1.3" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/modules/app/droidplane.app.unitTest.iml b/.idea/modules/app/droidplane.app.unitTest.iml
index 17fa79a..0433c28 100644
--- a/.idea/modules/app/droidplane.app.unitTest.iml
+++ b/.idea/modules/app/droidplane.app.unitTest.iml
@@ -4,21 +4,17 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <afterSyncTasks>
-          <task>generateDebugSources</task>
-        </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/main/res;file://$MODULE_DIR$/../../../app/src/debug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug" />
-        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/androidTest/res;file://$MODULE_DIR$/../../../app/src/androidTestDebug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/androidTest/debug" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="" />
+        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output-test url="file://$MODULE_DIR$/../../../app/build/intermediates/javac/debugUnitTest/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$/../../../app/build/generated/ap_generated_sources/debugUnitTest/out" />
     <content url="file://$MODULE_DIR$/../../../app/src/test" />
@@ -26,11 +22,6 @@
     <orderEntry type="jdk" jdkName="Android API 32 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="droidplane.app.main" scope="TEST" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation:1.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.0.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.0.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection:1.0.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.constraintlayout:constraintlayout-solver:1.1.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.legacy:legacy-support-v4:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core:1.2.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.0.0@aar" level="project" />
@@ -68,6 +59,11 @@
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-process:2.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-service:2.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.constraintlayout:constraintlayout:1.1.3@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation:1.1.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.0.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.0.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection:1.0.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.constraintlayout:constraintlayout-solver:1.1.3" level="project" />
   </component>
   <component name="TestModuleProperties" production-module="droidplane.app.main" />
 </module>
\ No newline at end of file

From e6a99c0dbb9e78e85e9cf7f4a2d494e4c8363013 Mon Sep 17 00:00:00 2001
From: Benedikt Koeppel <be.public@gmail.com>
Date: Mon, 27 Nov 2023 11:32:53 +0100
Subject: [PATCH 02/34] Update app to version 17

---
 app/src/main/AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d4ee971..9ff6b42 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="ch.benediktkoeppel.code.droidplane"
-    android:versionCode="16"
-    android:versionName="1.0.16">
+    android:versionCode="17"
+    android:versionName="1.0.17">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

From cdc7d355479c0c31adebb97b38d85fe79a68426f Mon Sep 17 00:00:00 2001
From: Benedikt Koeppel <be.public@gmail.com>
Date: Mon, 27 Nov 2023 11:33:21 +0100
Subject: [PATCH 03/34] Some ideas how to improve loading performance

---
 .idea/misc.xml                                |   7 +-
 .../code/droidplane/MainActivity.java         |  32 ++++--
 .../code/droidplane/Mindmap.java              | 101 +++++++++++++++---
 3 files changed, 115 insertions(+), 25 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index b7c82bf..611a243 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,11 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
     <option name="myNullables">
       <value>
-        <list size="14">
+        <list size="15">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
           <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
@@ -20,12 +19,13 @@
           <item index="11" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.Nullable" />
           <item index="12" class="java.lang.String" itemvalue="io.reactivex.annotations.Nullable" />
           <item index="13" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.Nullable" />
+          <item index="14" class="java.lang.String" itemvalue="org.jspecify.nullness.Nullable" />
         </list>
       </value>
     </option>
     <option name="myNotNulls">
       <value>
-        <list size="14">
+        <list size="15">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
@@ -40,6 +40,7 @@
           <item index="11" class="java.lang.String" itemvalue="io.reactivex.annotations.NonNull" />
           <item index="12" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.NonNull" />
           <item index="13" class="java.lang.String" itemvalue="lombok.NonNull" />
+          <item index="14" class="java.lang.String" itemvalue="org.jspecify.nullness.NonNull" />
         </list>
       </value>
     </option>
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/MainActivity.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/MainActivity.java
index c3108a4..f2fa78b 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/MainActivity.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/MainActivity.java
@@ -5,17 +5,23 @@
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
-import androidx.lifecycle.ViewModelProviders;
-import android.content.*;
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.ContentResolver;
+import android.content.DialogInterface;
+import android.content.Intent;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import androidx.fragment.app.FragmentActivity;
 import android.util.Log;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.widget.AdapterView;
 import android.widget.LinearLayout;
+
+import androidx.fragment.app.FragmentActivity;
+import androidx.lifecycle.ViewModelProviders;
+
 import com.google.android.gms.analytics.HitBuilders;
 import com.google.android.gms.analytics.Tracker;
 
@@ -35,6 +41,8 @@ public class MainActivity extends FragmentActivity {
 
     private Mindmap mindmap;
 
+    private final String openingMessage = "Opening Mindmap File...";
+
     /**
      * HorizontalMindmapView that contains all NodeColumns
      */
@@ -80,11 +88,11 @@ public void onCreate(Bundle savedInstanceState) {
         // otherwise, we already have a mindmap in the ViewModel, so we can just show the mindmap view again
         if (mindmap.getRootNode() == null) {
 
-            // create a ProgressDialog, and load the file asynchronously
+            // load the file asynchronously, continuously appending in the horizontal mindmap view
             ProgressDialog progressDialog = ProgressDialog.show(
                     this,
                     "DroidPlane",
-                    "Opening Mindmap File...",
+                    openingMessage,
                     true,
                     false
             );
@@ -126,7 +134,11 @@ public HorizontalMindmapView getHorizontalMindmapView() {
         return horizontalMindmapView;
     }
 
-    private class FileOpenTask extends AsyncTask<String, Void, Object> {
+    interface FileOpenTaskStatusCallback {
+        public void statusUpdate(String string);
+    }
+
+    private class FileOpenTask extends AsyncTask<String, Void, Object> implements FileOpenTaskStatusCallback {
 
         private final Intent intent;
         private final String action;
@@ -191,7 +203,7 @@ protected Object doInBackground(String... strings) {
 
             // load the mindmap
             Log.d(MainApplication.TAG, "InputStream fetched, now starting to load document");
-            mindmap.loadDocument(mm);
+            mindmap.loadDocument(mm, this);
 
             return null;
         }
@@ -207,6 +219,12 @@ protected void onPostExecute(Object o) {
                 progressDialog.dismiss();
             }
         }
+
+
+        @Override
+        public void statusUpdate(String string) {
+            progressDialog.setMessage(openingMessage + "\n" + string);
+        }
     }
 
 
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/Mindmap.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/Mindmap.java
index 1c0042f..b8262ed 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/Mindmap.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/Mindmap.java
@@ -1,20 +1,29 @@
 package ch.benediktkoeppel.code.droidplane;
 
-import androidx.lifecycle.ViewModel;
 import android.net.Uri;
 import android.util.Log;
+import android.util.Pair;
+
+import androidx.lifecycle.ViewModel;
+
 import com.google.android.gms.analytics.HitBuilders;
 import com.google.android.gms.analytics.Tracker;
+
 import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
 
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
+import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.Stack;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
 
 /**
  * Mindmap handles the loading and storing of a mind map document.
@@ -67,7 +76,10 @@ public void setUri(Uri uri) {
      *
      * @param inputStream the inputStream to load
      */
-    public void loadDocument(InputStream inputStream) {
+    public void loadDocument(InputStream inputStream, MainActivity.FileOpenTaskStatusCallback statusCallback) {
+
+        // idea: maybe move to a streaming parser, and just append elements to the view as they become available
+        // https://github.com/FasterXML/woodstox
 
         // start measuring the document load time
         long loadDocumentStartTime = System.currentTimeMillis();
@@ -79,13 +91,22 @@ public void loadDocument(InputStream inputStream) {
         // load the Mindmap from the InputStream
         Document document;
         try {
+            docBuilderFactory.setNamespaceAware(false);
+            docBuilderFactory.setValidating(false);
+            docBuilderFactory.setXIncludeAware(false);
+            docBuilderFactory.setFeature("http://xml.org/sax/features/namespaces", false);
+            docBuilderFactory.setFeature("http://xml.org/sax/features/validation", false);
+
             docBuilder = docBuilderFactory.newDocumentBuilder();
-            document = docBuilder.parse(inputStream);
+            statusCallback.statusUpdate("Parsing file");
+            document = docBuilder.parse(new BufferedInputStream(inputStream));
         } catch (ParserConfigurationException | SAXException | IOException e) {
             e.printStackTrace();
             return;
         }
 
+        statusCallback.statusUpdate("Loading nodes");
+
         // get the root node
         rootNode = new MindmapNode(
                 document.getDocumentElement().getElementsByTagName("node").item(0),
@@ -97,14 +118,21 @@ public void loadDocument(InputStream inputStream) {
         deepestSelectedMindmapNode = rootNode;
 
         // load all nodes of root node into simplified MindmapNode, and index them by ID for faster lookup
-        nodesById = new HashMap<>();
-        nodesByNumericId = new HashMap<>();
-        loadAndIndexNodesByIds(rootNode);
+        // other idea: already finish the mindmap loading, and do this in the background
+        statusCallback.statusUpdate("Indexing nodes");
+        MindmapIndexes mindmapIndexes = loadAndIndexNodesByIds(rootNode);
+
+        nodesById = mindmapIndexes.getNodesByIdIndex();
+        nodesByNumericId = mindmapIndexes.getNodesByNumericIndex();
+
 
         // Nodes can refer to other nodes with arrowlinks. We want to have the link on both ends of the link, so we can
         // now set the corresponding links
+        statusCallback.statusUpdate("Building links");
         fillArrowLinks();
 
+        statusCallback.statusUpdate("Done");
+
         long loadDocumentEndTime = System.currentTimeMillis();
         Tracker tracker = MainApplication.getTracker();
         tracker.send(new HitBuilders.TimingBuilder()
@@ -139,17 +167,41 @@ public MindmapNode getRootNode() {
     /**
      * Index all nodes (and child nodes) by their ID, for fast lookup
      *
-     * @param node
+     * @param root
      */
-    private void loadAndIndexNodesByIds(MindmapNode node) {
+    private MindmapIndexes loadAndIndexNodesByIds(MindmapNode root) {
 
-        nodesById.put(node.getId(), node);
-        nodesByNumericId.put(node.getNumericId(), node);
+        Stack<MindmapNode> stack = new Stack<>();
+        stack.push(root);
 
-        for (MindmapNode mindmapNode : node.getChildNodes()) {
-            loadAndIndexNodesByIds(mindmapNode);
+        // try first to just extract all IDs and the respective node, and
+        // only insert into the hashmap once we know the size of the hashmap
+        List<Pair<String, MindmapNode>> idAndNode = new ArrayList<>();
+        List<Pair<Integer, MindmapNode>> numericIdAndNode = new ArrayList<>();
+
+        while (!stack.isEmpty()) {
+            MindmapNode node = stack.pop();
+
+            idAndNode.add(new Pair<>(node.getId(), node));
+            numericIdAndNode.add(new Pair<>(node.getNumericId(), node));
+
+            for (MindmapNode mindmapNode : node.getChildNodes()) {
+                stack.push(mindmapNode);
+            }
         }
 
+        Map<String, MindmapNode> newNodesById = new HashMap<>(idAndNode.size());
+        Map<Integer, MindmapNode> newNodesByNumericId = new HashMap<>(numericIdAndNode.size());
+
+        for (Pair<String, MindmapNode> i : idAndNode) {
+            newNodesById.put(i.first, i.second);
+        }
+        for (Pair<Integer, MindmapNode> i : numericIdAndNode) {
+            newNodesByNumericId.put(i.first, i.second);
+        }
+
+        return new MindmapIndexes(newNodesById, newNodesByNumericId);
+
     }
 
     /**
@@ -189,4 +241,23 @@ private void fillArrowLinks() {
             }
         }
     }
+
+    private class MindmapIndexes {
+
+        private final Map<String, MindmapNode> nodesById;
+        private final Map<Integer, MindmapNode> nodesByNumericId;
+
+        private MindmapIndexes(Map<String, MindmapNode> nodesById, Map<Integer, MindmapNode> nodesByNumericId) {
+            this.nodesById = nodesById;
+            this.nodesByNumericId = nodesByNumericId;
+        }
+
+        public Map<String, MindmapNode> getNodesByIdIndex() {
+            return this.nodesById;
+        }
+
+        public Map<Integer, MindmapNode> getNodesByNumericIndex() {
+            return this.nodesByNumericId;
+        }
+    }
 }

From 20a1ac73e8368bab552bfb1639ba5b61020f2ee0 Mon Sep 17 00:00:00 2001
From: Benedikt Koeppel <be.public@gmail.com>
Date: Mon, 27 Nov 2023 11:33:38 +0100
Subject: [PATCH 04/34] Revert "Some ideas how to improve loading performance"

This reverts commit cdc7d355479c0c31adebb97b38d85fe79a68426f.
---
 .../code/droidplane/MainActivity.java         |  32 ++----
 .../code/droidplane/Mindmap.java              | 101 +++---------------
 2 files changed, 22 insertions(+), 111 deletions(-)

diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/MainActivity.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/MainActivity.java
index f2fa78b..c3108a4 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/MainActivity.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/MainActivity.java
@@ -5,23 +5,17 @@
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
-import android.content.ClipData;
-import android.content.ClipboardManager;
-import android.content.ContentResolver;
-import android.content.DialogInterface;
-import android.content.Intent;
+import androidx.lifecycle.ViewModelProviders;
+import android.content.*;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import androidx.fragment.app.FragmentActivity;
 import android.util.Log;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.widget.AdapterView;
 import android.widget.LinearLayout;
-
-import androidx.fragment.app.FragmentActivity;
-import androidx.lifecycle.ViewModelProviders;
-
 import com.google.android.gms.analytics.HitBuilders;
 import com.google.android.gms.analytics.Tracker;
 
@@ -41,8 +35,6 @@ public class MainActivity extends FragmentActivity {
 
     private Mindmap mindmap;
 
-    private final String openingMessage = "Opening Mindmap File...";
-
     /**
      * HorizontalMindmapView that contains all NodeColumns
      */
@@ -88,11 +80,11 @@ public void onCreate(Bundle savedInstanceState) {
         // otherwise, we already have a mindmap in the ViewModel, so we can just show the mindmap view again
         if (mindmap.getRootNode() == null) {
 
-            // load the file asynchronously, continuously appending in the horizontal mindmap view
+            // create a ProgressDialog, and load the file asynchronously
             ProgressDialog progressDialog = ProgressDialog.show(
                     this,
                     "DroidPlane",
-                    openingMessage,
+                    "Opening Mindmap File...",
                     true,
                     false
             );
@@ -134,11 +126,7 @@ public HorizontalMindmapView getHorizontalMindmapView() {
         return horizontalMindmapView;
     }
 
-    interface FileOpenTaskStatusCallback {
-        public void statusUpdate(String string);
-    }
-
-    private class FileOpenTask extends AsyncTask<String, Void, Object> implements FileOpenTaskStatusCallback {
+    private class FileOpenTask extends AsyncTask<String, Void, Object> {
 
         private final Intent intent;
         private final String action;
@@ -203,7 +191,7 @@ protected Object doInBackground(String... strings) {
 
             // load the mindmap
             Log.d(MainApplication.TAG, "InputStream fetched, now starting to load document");
-            mindmap.loadDocument(mm, this);
+            mindmap.loadDocument(mm);
 
             return null;
         }
@@ -219,12 +207,6 @@ protected void onPostExecute(Object o) {
                 progressDialog.dismiss();
             }
         }
-
-
-        @Override
-        public void statusUpdate(String string) {
-            progressDialog.setMessage(openingMessage + "\n" + string);
-        }
     }
 
 
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/Mindmap.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/Mindmap.java
index b8262ed..1c0042f 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/Mindmap.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/Mindmap.java
@@ -1,29 +1,20 @@
 package ch.benediktkoeppel.code.droidplane;
 
+import androidx.lifecycle.ViewModel;
 import android.net.Uri;
 import android.util.Log;
-import android.util.Pair;
-
-import androidx.lifecycle.ViewModel;
-
 import com.google.android.gms.analytics.HitBuilders;
 import com.google.android.gms.analytics.Tracker;
-
 import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
 
-import java.io.BufferedInputStream;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import java.util.Stack;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
 
 /**
  * Mindmap handles the loading and storing of a mind map document.
@@ -76,10 +67,7 @@ public void setUri(Uri uri) {
      *
      * @param inputStream the inputStream to load
      */
-    public void loadDocument(InputStream inputStream, MainActivity.FileOpenTaskStatusCallback statusCallback) {
-
-        // idea: maybe move to a streaming parser, and just append elements to the view as they become available
-        // https://github.com/FasterXML/woodstox
+    public void loadDocument(InputStream inputStream) {
 
         // start measuring the document load time
         long loadDocumentStartTime = System.currentTimeMillis();
@@ -91,22 +79,13 @@ public void loadDocument(InputStream inputStream, MainActivity.FileOpenTaskStatu
         // load the Mindmap from the InputStream
         Document document;
         try {
-            docBuilderFactory.setNamespaceAware(false);
-            docBuilderFactory.setValidating(false);
-            docBuilderFactory.setXIncludeAware(false);
-            docBuilderFactory.setFeature("http://xml.org/sax/features/namespaces", false);
-            docBuilderFactory.setFeature("http://xml.org/sax/features/validation", false);
-
             docBuilder = docBuilderFactory.newDocumentBuilder();
-            statusCallback.statusUpdate("Parsing file");
-            document = docBuilder.parse(new BufferedInputStream(inputStream));
+            document = docBuilder.parse(inputStream);
         } catch (ParserConfigurationException | SAXException | IOException e) {
             e.printStackTrace();
             return;
         }
 
-        statusCallback.statusUpdate("Loading nodes");
-
         // get the root node
         rootNode = new MindmapNode(
                 document.getDocumentElement().getElementsByTagName("node").item(0),
@@ -118,21 +97,14 @@ public void loadDocument(InputStream inputStream, MainActivity.FileOpenTaskStatu
         deepestSelectedMindmapNode = rootNode;
 
         // load all nodes of root node into simplified MindmapNode, and index them by ID for faster lookup
-        // other idea: already finish the mindmap loading, and do this in the background
-        statusCallback.statusUpdate("Indexing nodes");
-        MindmapIndexes mindmapIndexes = loadAndIndexNodesByIds(rootNode);
-
-        nodesById = mindmapIndexes.getNodesByIdIndex();
-        nodesByNumericId = mindmapIndexes.getNodesByNumericIndex();
-
+        nodesById = new HashMap<>();
+        nodesByNumericId = new HashMap<>();
+        loadAndIndexNodesByIds(rootNode);
 
         // Nodes can refer to other nodes with arrowlinks. We want to have the link on both ends of the link, so we can
         // now set the corresponding links
-        statusCallback.statusUpdate("Building links");
         fillArrowLinks();
 
-        statusCallback.statusUpdate("Done");
-
         long loadDocumentEndTime = System.currentTimeMillis();
         Tracker tracker = MainApplication.getTracker();
         tracker.send(new HitBuilders.TimingBuilder()
@@ -167,41 +139,17 @@ public MindmapNode getRootNode() {
     /**
      * Index all nodes (and child nodes) by their ID, for fast lookup
      *
-     * @param root
+     * @param node
      */
-    private MindmapIndexes loadAndIndexNodesByIds(MindmapNode root) {
+    private void loadAndIndexNodesByIds(MindmapNode node) {
 
-        Stack<MindmapNode> stack = new Stack<>();
-        stack.push(root);
+        nodesById.put(node.getId(), node);
+        nodesByNumericId.put(node.getNumericId(), node);
 
-        // try first to just extract all IDs and the respective node, and
-        // only insert into the hashmap once we know the size of the hashmap
-        List<Pair<String, MindmapNode>> idAndNode = new ArrayList<>();
-        List<Pair<Integer, MindmapNode>> numericIdAndNode = new ArrayList<>();
-
-        while (!stack.isEmpty()) {
-            MindmapNode node = stack.pop();
-
-            idAndNode.add(new Pair<>(node.getId(), node));
-            numericIdAndNode.add(new Pair<>(node.getNumericId(), node));
-
-            for (MindmapNode mindmapNode : node.getChildNodes()) {
-                stack.push(mindmapNode);
-            }
+        for (MindmapNode mindmapNode : node.getChildNodes()) {
+            loadAndIndexNodesByIds(mindmapNode);
         }
 
-        Map<String, MindmapNode> newNodesById = new HashMap<>(idAndNode.size());
-        Map<Integer, MindmapNode> newNodesByNumericId = new HashMap<>(numericIdAndNode.size());
-
-        for (Pair<String, MindmapNode> i : idAndNode) {
-            newNodesById.put(i.first, i.second);
-        }
-        for (Pair<Integer, MindmapNode> i : numericIdAndNode) {
-            newNodesByNumericId.put(i.first, i.second);
-        }
-
-        return new MindmapIndexes(newNodesById, newNodesByNumericId);
-
     }
 
     /**
@@ -241,23 +189,4 @@ private void fillArrowLinks() {
             }
         }
     }
-
-    private class MindmapIndexes {
-
-        private final Map<String, MindmapNode> nodesById;
-        private final Map<Integer, MindmapNode> nodesByNumericId;
-
-        private MindmapIndexes(Map<String, MindmapNode> nodesById, Map<Integer, MindmapNode> nodesByNumericId) {
-            this.nodesById = nodesById;
-            this.nodesByNumericId = nodesByNumericId;
-        }
-
-        public Map<String, MindmapNode> getNodesByIdIndex() {
-            return this.nodesById;
-        }
-
-        public Map<Integer, MindmapNode> getNodesByNumericIndex() {
-            return this.nodesByNumericId;
-        }
-    }
 }

From 2a8feb23e2e44b373a022cc83d3506b7ab172596 Mon Sep 17 00:00:00 2001
From: Benedikt Koeppel <be.public@gmail.com>
Date: Tue, 28 Nov 2023 04:27:52 +0100
Subject: [PATCH 05/34] Make loading of mindmap run in background

---
 .idea/misc.xml                                |   6 +-
 .../droidplane/HorizontalMindmapView.java     |   8 ++
 .../code/droidplane/MainActivity.java         |  71 +++++--------
 .../code/droidplane/Mindmap.java              | 100 +++++++++++++++---
 .../code/droidplane/MindmapNode.java          |   3 +-
 5 files changed, 126 insertions(+), 62 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 611a243..c94868c 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,7 +4,7 @@
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
     <option name="myNullables">
       <value>
-        <list size="15">
+        <list size="14">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
           <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
@@ -19,13 +19,12 @@
           <item index="11" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.Nullable" />
           <item index="12" class="java.lang.String" itemvalue="io.reactivex.annotations.Nullable" />
           <item index="13" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.Nullable" />
-          <item index="14" class="java.lang.String" itemvalue="org.jspecify.nullness.Nullable" />
         </list>
       </value>
     </option>
     <option name="myNotNulls">
       <value>
-        <list size="15">
+        <list size="14">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
@@ -40,7 +39,6 @@
           <item index="11" class="java.lang.String" itemvalue="io.reactivex.annotations.NonNull" />
           <item index="12" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.NonNull" />
           <item index="13" class="java.lang.String" itemvalue="lombok.NonNull" />
-          <item index="14" class="java.lang.String" itemvalue="org.jspecify.nullness.NonNull" />
         </list>
       </value>
     </option>
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/HorizontalMindmapView.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/HorizontalMindmapView.java
index 5176319..4ba96a3 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/HorizontalMindmapView.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/HorizontalMindmapView.java
@@ -93,6 +93,14 @@ public HorizontalMindmapView(Mindmap mindmap, MainActivity mainActivity) {
         // fix the widths of all columns
         resizeAllColumns(getContext());
 
+        // if we already have the root, we can already set up the columns; otherwise we do this when the root node is loaded
+        if (mindmap.getRootNode() != null) {
+            onRootNodeLoaded();
+        }
+    }
+
+    public void onRootNodeLoaded() {
+
         // expand the selected node chain
         downTo(getContext(), mindmap.getDeepestSelectedMindmapNode());
 
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/MainActivity.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/MainActivity.java
index c3108a4..386adaa 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/MainActivity.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/MainActivity.java
@@ -4,18 +4,23 @@
 import android.app.ActionBar;
 import android.app.Activity;
 import android.app.AlertDialog;
-import android.app.ProgressDialog;
-import androidx.lifecycle.ViewModelProviders;
-import android.content.*;
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.ContentResolver;
+import android.content.DialogInterface;
+import android.content.Intent;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import androidx.fragment.app.FragmentActivity;
 import android.util.Log;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.widget.AdapterView;
 import android.widget.LinearLayout;
+
+import androidx.fragment.app.FragmentActivity;
+import androidx.lifecycle.ViewModelProviders;
+
 import com.google.android.gms.analytics.HitBuilders;
 import com.google.android.gms.analytics.Tracker;
 
@@ -35,6 +40,8 @@ public class MainActivity extends FragmentActivity {
 
     private Mindmap mindmap;
 
+    private final String openingMessage = "Opening Mindmap File...";
+
     /**
      * HorizontalMindmapView that contains all NodeColumns
      */
@@ -80,26 +87,11 @@ public void onCreate(Bundle savedInstanceState) {
         // otherwise, we already have a mindmap in the ViewModel, so we can just show the mindmap view again
         if (mindmap.getRootNode() == null) {
 
-            // create a ProgressDialog, and load the file asynchronously
-            ProgressDialog progressDialog = ProgressDialog.show(
-                    this,
-                    "DroidPlane",
-                    "Opening Mindmap File...",
-                    true,
-                    false
-            );
-
-            // Once the FileOpenTask is complete, we want to set up the horizontal mindmap view. If we already have
-            // a mindmap, we run it immediately.
-            Runnable onPostExecuteTask = new Runnable() {
-                @Override
-                public void run() {
-                    setUpHorizontalMindmapView();
-                }
-            };
+            // set up horizontal mindmap view first, then in the background populate the map
+            setUpHorizontalMindmapView();
 
-            // open file
-            new FileOpenTask(intent, action, progressDialog, onPostExecuteTask).execute();
+            // load the file asynchronously, continuously appending in the horizontal mindmap view
+            new FileOpenTask(intent, action).execute();
 
         } else {
             setUpHorizontalMindmapView();
@@ -130,20 +122,14 @@ private class FileOpenTask extends AsyncTask<String, Void, Object> {
 
         private final Intent intent;
         private final String action;
-        private final ProgressDialog progressDialog;
-        private final Runnable onPostExecuteTask;
 
         FileOpenTask(
                 Intent intent,
-                String action,
-                ProgressDialog progressDialog,
-                Runnable onPostExecuteTask
+                String action
         ) {
 
             this.intent = intent;
             this.action = action;
-            this.progressDialog = progressDialog;
-            this.onPostExecuteTask = onPostExecuteTask;
         }
 
         @Override
@@ -191,21 +177,22 @@ protected Object doInBackground(String... strings) {
 
             // load the mindmap
             Log.d(MainApplication.TAG, "InputStream fetched, now starting to load document");
-            mindmap.loadDocument(mm);
-
-            return null;
-        }
+            mindmap.loadDocument(mm, new Runnable() {
+                @Override
+                public void run() {
+                    // TODO: this doesn't have to be two threads nested into each other
+                    runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            horizontalMindmapView.onRootNodeLoaded();
+                        }
+                    });
 
-        @Override
-        protected void onPostExecute(Object o) {
+                }
+            });
 
-            if (onPostExecuteTask != null) {
-                onPostExecuteTask.run();
-            }
 
-            if (progressDialog != null) {
-                progressDialog.dismiss();
-            }
+            return null;
         }
     }
 
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/Mindmap.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/Mindmap.java
index 1c0042f..43daa2e 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/Mindmap.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/Mindmap.java
@@ -1,20 +1,29 @@
 package ch.benediktkoeppel.code.droidplane;
 
-import androidx.lifecycle.ViewModel;
 import android.net.Uri;
 import android.util.Log;
+import android.util.Pair;
+
+import androidx.lifecycle.ViewModel;
+
 import com.google.android.gms.analytics.HitBuilders;
 import com.google.android.gms.analytics.Tracker;
+
 import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
 
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
+import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.Stack;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
 
 /**
  * Mindmap handles the loading and storing of a mind map document.
@@ -67,7 +76,10 @@ public void setUri(Uri uri) {
      *
      * @param inputStream the inputStream to load
      */
-    public void loadDocument(InputStream inputStream) {
+    public void loadDocument(InputStream inputStream, Runnable onRootNodeLoaded) {
+
+        // idea: maybe move to a streaming parser, and just append elements to the view as they become available
+        // https://github.com/FasterXML/woodstox
 
         // start measuring the document load time
         long loadDocumentStartTime = System.currentTimeMillis();
@@ -79,13 +91,19 @@ public void loadDocument(InputStream inputStream) {
         // load the Mindmap from the InputStream
         Document document;
         try {
+            docBuilderFactory.setNamespaceAware(false);
+            docBuilderFactory.setValidating(false);
+            docBuilderFactory.setFeature("http://xml.org/sax/features/namespaces", false);
+            docBuilderFactory.setFeature("http://xml.org/sax/features/validation", false);
+
             docBuilder = docBuilderFactory.newDocumentBuilder();
-            document = docBuilder.parse(inputStream);
+            document = docBuilder.parse(new BufferedInputStream(inputStream));
         } catch (ParserConfigurationException | SAXException | IOException e) {
             e.printStackTrace();
             return;
         }
 
+
         // get the root node
         rootNode = new MindmapNode(
                 document.getDocumentElement().getElementsByTagName("node").item(0),
@@ -96,15 +114,22 @@ public void loadDocument(InputStream inputStream) {
         // by default, the root node is the deepest node that is expanded
         deepestSelectedMindmapNode = rootNode;
 
+        // now set up the view
+        onRootNodeLoaded.run();
+
         // load all nodes of root node into simplified MindmapNode, and index them by ID for faster lookup
-        nodesById = new HashMap<>();
-        nodesByNumericId = new HashMap<>();
-        loadAndIndexNodesByIds(rootNode);
+        // other idea: already finish the mindmap loading, and do this in the background
+        MindmapIndexes mindmapIndexes = loadAndIndexNodesByIds(rootNode);
+
+        nodesById = mindmapIndexes.getNodesByIdIndex();
+        nodesByNumericId = mindmapIndexes.getNodesByNumericIndex();
+
 
         // Nodes can refer to other nodes with arrowlinks. We want to have the link on both ends of the link, so we can
         // now set the corresponding links
         fillArrowLinks();
 
+
         long loadDocumentEndTime = System.currentTimeMillis();
         Tracker tracker = MainApplication.getTracker();
         tracker.send(new HitBuilders.TimingBuilder()
@@ -115,6 +140,8 @@ public void loadDocument(InputStream inputStream) {
                 .build());
         Log.d(MainApplication.TAG, "Document loaded");
 
+        // TODO: currently we have to click on "top" once in the UI to make the view show up, after the document is loaded
+
         long numNodes = document.getElementsByTagName("node").getLength();
         tracker.send(new HitBuilders.EventBuilder()
                 .setCategory("document")
@@ -139,16 +166,40 @@ public MindmapNode getRootNode() {
     /**
      * Index all nodes (and child nodes) by their ID, for fast lookup
      *
-     * @param node
+     * @param root
      */
-    private void loadAndIndexNodesByIds(MindmapNode node) {
+    private MindmapIndexes loadAndIndexNodesByIds(MindmapNode root) {
+
+        Stack<MindmapNode> stack = new Stack<>();
+        stack.push(root);
+
+        // try first to just extract all IDs and the respective node, and
+        // only insert into the hashmap once we know the size of the hashmap
+        List<Pair<String, MindmapNode>> idAndNode = new ArrayList<>();
+        List<Pair<Integer, MindmapNode>> numericIdAndNode = new ArrayList<>();
+
+        while (!stack.isEmpty()) {
+            MindmapNode node = stack.pop();
+
+            idAndNode.add(new Pair<>(node.getId(), node));
+            numericIdAndNode.add(new Pair<>(node.getNumericId(), node));
 
-        nodesById.put(node.getId(), node);
-        nodesByNumericId.put(node.getNumericId(), node);
+            for (MindmapNode mindmapNode : node.getChildNodes()) {
+                stack.push(mindmapNode);
+            }
+        }
+
+        Map<String, MindmapNode> newNodesById = new HashMap<>(idAndNode.size());
+        Map<Integer, MindmapNode> newNodesByNumericId = new HashMap<>(numericIdAndNode.size());
 
-        for (MindmapNode mindmapNode : node.getChildNodes()) {
-            loadAndIndexNodesByIds(mindmapNode);
+        for (Pair<String, MindmapNode> i : idAndNode) {
+            newNodesById.put(i.first, i.second);
         }
+        for (Pair<Integer, MindmapNode> i : numericIdAndNode) {
+            newNodesByNumericId.put(i.first, i.second);
+        }
+
+        return new MindmapIndexes(newNodesById, newNodesByNumericId);
 
     }
 
@@ -189,4 +240,23 @@ private void fillArrowLinks() {
             }
         }
     }
+
+    private class MindmapIndexes {
+
+        private final Map<String, MindmapNode> nodesById;
+        private final Map<Integer, MindmapNode> nodesByNumericId;
+
+        private MindmapIndexes(Map<String, MindmapNode> nodesById, Map<Integer, MindmapNode> nodesByNumericId) {
+            this.nodesById = nodesById;
+            this.nodesByNumericId = nodesByNumericId;
+        }
+
+        public Map<String, MindmapNode> getNodesByIdIndex() {
+            return this.nodesById;
+        }
+
+        public Map<Integer, MindmapNode> getNodesByNumericIndex() {
+            return this.nodesByNumericId;
+        }
+    }
 }
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/MindmapNode.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/MindmapNode.java
index 46732b8..1e45a9e 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/MindmapNode.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/MindmapNode.java
@@ -363,7 +363,8 @@ public List<String> getIconNames() {
     public String getText() {
 
         // if this is a cloned node, get the text from the original node
-        if (treeIdAttribute != null) {
+        if (treeIdAttribute != null && !treeIdAttribute.equals("")) {
+            // TODO this now fails when loading, because the background indexing is not done yet - so we maybe should mark this as "pending", and put it into a queue, to be updated once the linked node is there
             MindmapNode linkedNode = mindmap.getNodeByID(treeIdAttribute);
             if (linkedNode != null) {
                 return linkedNode.getText();

From c9b3fd27459d5e142108ae71a19980f2f00f86b4 Mon Sep 17 00:00:00 2001
From: Benedikt Koeppel <be.public@gmail.com>
Date: Tue, 28 Nov 2023 04:37:58 +0100
Subject: [PATCH 06/34] Refactor helper package

---
 .../benediktkoeppel/code/droidplane/HorizontalMindmapView.java  | 2 ++
 .../code/droidplane/{ => helper}/AndroidHelper.java             | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
 rename app/src/main/java/ch/benediktkoeppel/code/droidplane/{ => helper}/AndroidHelper.java (90%)

diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/HorizontalMindmapView.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/HorizontalMindmapView.java
index 4ba96a3..0444b8f 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/HorizontalMindmapView.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/HorizontalMindmapView.java
@@ -18,6 +18,8 @@
 
 import java.util.*;
 
+import ch.benediktkoeppel.code.droidplane.helper.AndroidHelper;
+
 public class HorizontalMindmapView extends HorizontalScrollView implements OnTouchListener, OnItemClickListener {
 
     /**
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/AndroidHelper.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/helper/AndroidHelper.java
similarity index 90%
rename from app/src/main/java/ch/benediktkoeppel/code/droidplane/AndroidHelper.java
rename to app/src/main/java/ch/benediktkoeppel/code/droidplane/helper/AndroidHelper.java
index f55e212..0c3757e 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/AndroidHelper.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/helper/AndroidHelper.java
@@ -1,4 +1,4 @@
-package ch.benediktkoeppel.code.droidplane;
+package ch.benediktkoeppel.code.droidplane.helper;
 
 import android.app.Activity;
 import android.content.Context;

From 4dac248acd3649723fe62b3be4a53be63dcbe49d Mon Sep 17 00:00:00 2001
From: Benedikt Koeppel <be.public@gmail.com>
Date: Tue, 28 Nov 2023 04:53:45 +0100
Subject: [PATCH 07/34] Refactor into separate packages for view and model

---
 app/src/main/AndroidManifest.xml              |  2 +-
 .../code/droidplane/MainActivity.java         | 18 +++---
 .../code/droidplane/{ => model}/Mindmap.java  |  8 ++-
 .../droidplane/{ => model}/MindmapNode.java   |  9 ++-
 .../{ => view}/HorizontalMindmapView.java     | 14 ++++-
 .../droidplane/view/MindmapNodeAdapter.java   | 51 +++++++++++++++++
 .../{ => view}/MindmapNodeLayout.java         | 13 ++++-
 .../droidplane/{ => view}/NodeColumn.java     | 55 ++++---------------
 .../{ => view}/RichTextViewActivity.java      |  4 +-
 .../res/layout/activity_rich_text_view.xml    |  2 +-
 10 files changed, 117 insertions(+), 59 deletions(-)
 rename app/src/main/java/ch/benediktkoeppel/code/droidplane/{ => model}/Mindmap.java (96%)
 rename app/src/main/java/ch/benediktkoeppel/code/droidplane/{ => model}/MindmapNode.java (96%)
 rename app/src/main/java/ch/benediktkoeppel/code/droidplane/{ => view}/HorizontalMindmapView.java (97%)
 create mode 100644 app/src/main/java/ch/benediktkoeppel/code/droidplane/view/MindmapNodeAdapter.java
 rename app/src/main/java/ch/benediktkoeppel/code/droidplane/{ => view}/MindmapNodeLayout.java (96%)
 rename app/src/main/java/ch/benediktkoeppel/code/droidplane/{ => view}/NodeColumn.java (82%)
 rename app/src/main/java/ch/benediktkoeppel/code/droidplane/{ => view}/RichTextViewActivity.java (94%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9ff6b42..4505285 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -68,7 +68,7 @@
         <uses-library android:name="org.apache.http.legacy" android:required="false" />
 
         <activity
-            android:name=".RichTextViewActivity"
+            android:name=".view.RichTextViewActivity"
             android:label="@string/title_activity_rich_text_view"></activity>
     </application>
 
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/MainActivity.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/MainActivity.java
index 386adaa..0c305b3 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/MainActivity.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/MainActivity.java
@@ -27,6 +27,11 @@
 import java.io.FileNotFoundException;
 import java.io.InputStream;
 
+import ch.benediktkoeppel.code.droidplane.model.Mindmap;
+import ch.benediktkoeppel.code.droidplane.model.MindmapNode;
+import ch.benediktkoeppel.code.droidplane.view.HorizontalMindmapView;
+import ch.benediktkoeppel.code.droidplane.view.MindmapNodeLayout;
+
 /**
  * The MainActivity can be started from the App Launcher, or with a File Open intent. If the MainApplication was
  * already running, the previously used document is re-used. Also, most of the information about the mind map and the
@@ -40,8 +45,6 @@ public class MainActivity extends FragmentActivity {
 
     private Mindmap mindmap;
 
-    private final String openingMessage = "Opening Mindmap File...";
-
     /**
      * HorizontalMindmapView that contains all NodeColumns
      */
@@ -83,13 +86,14 @@ public void onCreate(Bundle savedInstanceState) {
         Intent intent = getIntent();
         String action = intent.getAction();
 
+        // set up horizontal mindmap view first
+        setUpHorizontalMindmapView();
+
+        // then populate view with mindmap
         // we didn't load a mindmap yet, we open it
         // otherwise, we already have a mindmap in the ViewModel, so we can just show the mindmap view again
         if (mindmap.getRootNode() == null) {
 
-            // set up horizontal mindmap view first, then in the background populate the map
-            setUpHorizontalMindmapView();
-
             // load the file asynchronously, continuously appending in the horizontal mindmap view
             new FileOpenTask(intent, action).execute();
 
@@ -201,7 +205,7 @@ public void run() {
      * Enables the home button if the Android version allows it
      */
     @SuppressLint("NewApi")
-    void enableHomeButton() {
+    public void enableHomeButton() {
         // menu bar: if we are at least at API 11, the Home button is kind of a back button in the app
         ActionBar bar = getActionBar();
         if (bar != null) {
@@ -213,7 +217,7 @@ void enableHomeButton() {
      * Disables the home button if the Android version allows it
      */
     @SuppressLint("NewApi")
-    void disableHomeButton() {
+    public void disableHomeButton() {
         // menu bar: if we are at least at API 11, the Home button is kind of a back button in the app
         ActionBar bar = getActionBar();
         if (bar != null) {
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/Mindmap.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/Mindmap.java
similarity index 96%
rename from app/src/main/java/ch/benediktkoeppel/code/droidplane/Mindmap.java
rename to app/src/main/java/ch/benediktkoeppel/code/droidplane/model/Mindmap.java
index 43daa2e..ab3d42b 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/Mindmap.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/Mindmap.java
@@ -1,4 +1,4 @@
-package ch.benediktkoeppel.code.droidplane;
+package ch.benediktkoeppel.code.droidplane.model;
 
 import android.net.Uri;
 import android.util.Log;
@@ -25,6 +25,8 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
+import ch.benediktkoeppel.code.droidplane.MainApplication;
+
 /**
  * Mindmap handles the loading and storing of a mind map document.
  */
@@ -49,6 +51,7 @@ public class Mindmap extends ViewModel {
     /**
      * The deepest selected mindmap node
      */
+    // TODO: this is not really part of the mindmap model
     private MindmapNode deepestSelectedMindmapNode;
 
     /**
@@ -76,6 +79,7 @@ public void setUri(Uri uri) {
      *
      * @param inputStream the inputStream to load
      */
+    // TODO: this should probably be a controller instead?
     public void loadDocument(InputStream inputStream, Runnable onRootNodeLoaded) {
 
         // idea: maybe move to a streaming parser, and just append elements to the view as they become available
@@ -170,6 +174,8 @@ public MindmapNode getRootNode() {
      */
     private MindmapIndexes loadAndIndexNodesByIds(MindmapNode root) {
 
+        // TODO: check if this optimization was necessary - otherwise go back to old implementation
+
         Stack<MindmapNode> stack = new Stack<>();
         stack.push(root);
 
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/MindmapNode.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java
similarity index 96%
rename from app/src/main/java/ch/benediktkoeppel/code/droidplane/MindmapNode.java
rename to app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java
index 1e45a9e..a6f50f8 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/MindmapNode.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java
@@ -1,4 +1,4 @@
-package ch.benediktkoeppel.code.droidplane;
+package ch.benediktkoeppel.code.droidplane.model;
 
 import android.net.Uri;
 import android.text.Html;
@@ -18,6 +18,8 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
+import ch.benediktkoeppel.code.droidplane.MainApplication;
+
 
 /**
  * A MindMapNode is a special type of DOM Node. A DOM Node can be converted to a MindMapNode if it has type ELEMENT,
@@ -73,6 +75,7 @@ public class MindmapNode {
     /**
      * Whether the node is expandable, i.e. whether it has child nodes
      */
+    // TODO: this is badly named, it should just be called "hasChildren", and then the view can decide that this means it's expandable
     private boolean isExpandable;
 
     /**
@@ -88,6 +91,7 @@ public class MindmapNode {
     /**
      * Whether the node is selected or not, will be set after it was clicked by the user
      */
+    // TODO: this has nothing to do with the model
     private boolean selected;
 
     /**
@@ -210,6 +214,7 @@ public MindmapNode(Node node, MindmapNode parentNode, Mindmap mindmap) {
         iconNames = getIcons();
 
         // find out if it has sub nodes
+        // TODO: this should just go into a getter
         isExpandable = (getNumChildMindmapNodes() > 0);
 
         // extract link
@@ -327,6 +332,8 @@ public int getNumChildMindmapNodes() {
      * Generates and returns the child nodes of this MindmapNode. getChildNodes() does lazy loading, i.e. it
      * generates the child nodes on demand and stores them in childMindmapNodes.
      *
+     * TODO: not so sure if this is really doing lazy loading. We probably call this already pretty early on. Should check.
+     *
      * @return ArrayList of this MindmapNode's child nodes
      */
     public List<MindmapNode> getChildNodes() {
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/HorizontalMindmapView.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/HorizontalMindmapView.java
similarity index 97%
rename from app/src/main/java/ch/benediktkoeppel/code/droidplane/HorizontalMindmapView.java
rename to app/src/main/java/ch/benediktkoeppel/code/droidplane/view/HorizontalMindmapView.java
index 0444b8f..cda7561 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/HorizontalMindmapView.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/HorizontalMindmapView.java
@@ -1,4 +1,4 @@
-package ch.benediktkoeppel.code.droidplane;
+package ch.benediktkoeppel.code.droidplane.view;
 
 import android.app.Activity;
 import android.content.Context;
@@ -18,7 +18,12 @@
 
 import java.util.*;
 
+import ch.benediktkoeppel.code.droidplane.MainActivity;
+import ch.benediktkoeppel.code.droidplane.MainApplication;
+import ch.benediktkoeppel.code.droidplane.model.Mindmap;
+import ch.benediktkoeppel.code.droidplane.R;
 import ch.benediktkoeppel.code.droidplane.helper.AndroidHelper;
+import ch.benediktkoeppel.code.droidplane.model.MindmapNode;
 
 public class HorizontalMindmapView extends HorizontalScrollView implements OnTouchListener, OnItemClickListener {
 
@@ -66,6 +71,8 @@ public HorizontalMindmapView(Mindmap mindmap, MainActivity mainActivity) {
         super(mainActivity);
 
         this.mindmap = mindmap;
+
+        // TODO: why does the view need access to the mainActivity?
         this.mainActivity = mainActivity;
 
         // list where all columns are stored
@@ -96,11 +103,13 @@ public HorizontalMindmapView(Mindmap mindmap, MainActivity mainActivity) {
         resizeAllColumns(getContext());
 
         // if we already have the root, we can already set up the columns; otherwise we do this when the root node is loaded
+        // TODO: this should maybe never be done here
         if (mindmap.getRootNode() != null) {
             onRootNodeLoaded();
         }
     }
 
+    // TODO: comment missing
     public void onRootNodeLoaded() {
 
         // expand the selected node chain
@@ -430,7 +439,8 @@ public void setApplicationTitle(Context context) {
     /**
      * Enables the Home button in the application if we have enough columns, i.e. if "Up" will remove a column.
      */
-    void enableHomeButtonIfEnoughColumns(Context context) {
+    // TODO: the view should not do this
+    public void enableHomeButtonIfEnoughColumns(Context context) {
         // if we only have one column (i.e. this is the root node), then we
         // disable the home button
         int numberOfColumns = getNumberOfColumns();
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/MindmapNodeAdapter.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/MindmapNodeAdapter.java
new file mode 100644
index 0000000..42d4b09
--- /dev/null
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/MindmapNodeAdapter.java
@@ -0,0 +1,51 @@
+package ch.benediktkoeppel.code.droidplane.view;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+
+import androidx.annotation.NonNull;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * The MindmapNodeAdapter is the data provider for the NodeColumn (respectively its ListView).
+ */
+class MindmapNodeAdapter extends ArrayAdapter<MindmapNodeLayout> {
+
+    private final List<MindmapNodeLayout> mindmapNodeLayouts;
+
+    public MindmapNodeAdapter(Context context, int textViewResourceId, ArrayList<MindmapNodeLayout> mindmapNodeLayouts) {
+
+        super(context, textViewResourceId, mindmapNodeLayouts);
+        this.mindmapNodeLayouts = mindmapNodeLayouts;
+    }
+
+    /* (non-Javadoc)
+     * getView is responsible to return a view for each individual element in the ListView
+     * @param int position: the position in the mindmapNodes array, for which we need to generate a view
+     * @param View convertView: the view we should recycle
+     * @param ViewGroup parent: not sure, is this the NodeColumn for which the Adapter is generating views?
+     * @see android.widget.ArrayAdapter#getView(int, android.view.View, android.view.ViewGroup)
+     */
+    @NonNull
+    @SuppressLint("InlinedApi")
+    @Override
+    public View getView(int position, View convertView, @NonNull ViewGroup parent) {
+
+        // when convertView != null, we should take the convertView and update it appropriately. Android is
+        // optimizing the performance and thus recycling GUI elements. However, we don't want to recycle anything,
+        // because these are genuine Mindmap nodes. Recycling the view here would show one node twice in the tree,
+        // while leaving out the actual node we should display.
+
+        MindmapNodeLayout view = mindmapNodeLayouts.get(position);
+
+        // tell the node to refresh it's view
+        view.refreshView();
+
+        return view;
+    }
+}
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/MindmapNodeLayout.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/MindmapNodeLayout.java
similarity index 96%
rename from app/src/main/java/ch/benediktkoeppel/code/droidplane/MindmapNodeLayout.java
rename to app/src/main/java/ch/benediktkoeppel/code/droidplane/view/MindmapNodeLayout.java
index 61b0fc6..4b5f760 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/MindmapNodeLayout.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/MindmapNodeLayout.java
@@ -1,4 +1,4 @@
-package ch.benediktkoeppel.code.droidplane;
+package ch.benediktkoeppel.code.droidplane.view;
 
 import android.annotation.SuppressLint;
 import android.content.ActivityNotFoundException;
@@ -15,13 +15,22 @@
 import android.view.Gravity;
 import android.view.View;
 import android.webkit.MimeTypeMap;
-import android.widget.*;
+import android.widget.AbsListView;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.widget.Toast;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
+import ch.benediktkoeppel.code.droidplane.MainActivity;
+import ch.benediktkoeppel.code.droidplane.MainApplication;
+import ch.benediktkoeppel.code.droidplane.R;
+import ch.benediktkoeppel.code.droidplane.model.MindmapNode;
+
 
 /**
  * A MindmapNodeLayout is the UI (layout) part of a MindmapNode.
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/NodeColumn.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/NodeColumn.java
similarity index 82%
rename from app/src/main/java/ch/benediktkoeppel/code/droidplane/NodeColumn.java
rename to app/src/main/java/ch/benediktkoeppel/code/droidplane/view/NodeColumn.java
index 0066598..5591405 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/NodeColumn.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/NodeColumn.java
@@ -1,23 +1,28 @@
-package ch.benediktkoeppel.code.droidplane;
+package ch.benediktkoeppel.code.droidplane.view;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Point;
-import androidx.annotation.NonNull;
 import android.util.Log;
-import android.view.*;
+import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
+import android.view.Display;
+import android.view.View;
 import android.view.View.OnCreateContextMenuListener;
+import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ArrayAdapter;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import ch.benediktkoeppel.code.droidplane.MainApplication;
+import ch.benediktkoeppel.code.droidplane.R;
+import ch.benediktkoeppel.code.droidplane.model.MindmapNode;
+
 /**
  * A column of MindmapNodes, i.e. one level in the mind map. It extends LinearLayout, and then embeds a ListView.
  * This is because we want to have a fine border around the ListView and we can only achieve this by having it
@@ -76,6 +81,7 @@ public NodeColumn(Context context, MindmapNode parent) {
         super(context);
 
         // extract all <node.../> elements from the parent node, create layouts, and add them to the mindmapNodes list
+        // TODO this comment here is explaining what getChildNodes does, too detailed
         mindmapNodeLayouts = new ArrayList<>();
         List<MindmapNode> mindmapNodes = parent.getChildNodes();
         for (MindmapNode mindmapNode : mindmapNodes) {
@@ -83,6 +89,7 @@ public NodeColumn(Context context, MindmapNode parent) {
         }
 
         // store the parent node
+        // TODO move up
         this.parent = parent;
 
 
@@ -269,41 +276,3 @@ public ListView getListView() {
 }
 
 
-/**
- * The MindmapNodeAdapter is the data provider for the NodeColumn (respectively its ListView).
- */
-class MindmapNodeAdapter extends ArrayAdapter<MindmapNodeLayout> {
-
-    private final List<MindmapNodeLayout> mindmapNodeLayouts;
-
-    public MindmapNodeAdapter(Context context, int textViewResourceId, ArrayList<MindmapNodeLayout> mindmapNodeLayouts) {
-
-        super(context, textViewResourceId, mindmapNodeLayouts);
-        this.mindmapNodeLayouts = mindmapNodeLayouts;
-    }
-
-    /* (non-Javadoc)
-     * getView is responsible to return a view for each individual element in the ListView
-     * @param int position: the position in the mindmapNodes array, for which we need to generate a view
-     * @param View convertView: the view we should recycle
-     * @param ViewGroup parent: not sure, is this the NodeColumn for which the Adapter is generating views?
-     * @see android.widget.ArrayAdapter#getView(int, android.view.View, android.view.ViewGroup)
-     */
-    @NonNull
-    @SuppressLint("InlinedApi")
-    @Override
-    public View getView(int position, View convertView, @NonNull ViewGroup parent) {
-
-        // when convertView != null, we should take the convertView and update it appropriately. Android is
-        // optimizing the performance and thus recycling GUI elements. However, we don't want to recycle anything,
-        // because these are genuine Mindmap nodes. Recycling the view here would show one node twice in the tree,
-        // while leaving out the actual node we should display.
-
-        MindmapNodeLayout view = mindmapNodeLayouts.get(position);
-
-        // tell the node to refresh it's view
-        view.refreshView();
-
-        return view;
-    }
-}
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/RichTextViewActivity.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/RichTextViewActivity.java
similarity index 94%
rename from app/src/main/java/ch/benediktkoeppel/code/droidplane/RichTextViewActivity.java
rename to app/src/main/java/ch/benediktkoeppel/code/droidplane/view/RichTextViewActivity.java
index ce2d6bd..c55ae02 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/RichTextViewActivity.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/RichTextViewActivity.java
@@ -1,10 +1,12 @@
-package ch.benediktkoeppel.code.droidplane;
+package ch.benediktkoeppel.code.droidplane.view;
 
 import android.app.Activity;
 import android.os.Bundle;
 import android.util.Base64;
 import android.webkit.WebView;
 
+import ch.benediktkoeppel.code.droidplane.R;
+
 public class RichTextViewActivity extends Activity {
 
     @Override
diff --git a/app/src/main/res/layout/activity_rich_text_view.xml b/app/src/main/res/layout/activity_rich_text_view.xml
index d82ff84..d11024a 100644
--- a/app/src/main/res/layout/activity_rich_text_view.xml
+++ b/app/src/main/res/layout/activity_rich_text_view.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".RichTextViewActivity">
+    tools:context=".view.RichTextViewActivity">
 
     <WebView
         android:id="@+id/webview"

From 60c1f347832dd67362bc02a09bbf057ae2e37373 Mon Sep 17 00:00:00 2001
From: Benedikt Koeppel <be.public@gmail.com>
Date: Tue, 28 Nov 2023 05:09:14 +0100
Subject: [PATCH 08/34] Move file loading to separate class

---
 .../code/droidplane/MainActivity.java         | 117 +++---------------
 .../controller/AsyncMindmapLoaderTask.java    | 101 +++++++++++++++
 .../code/droidplane/model/Mindmap.java        |  13 ++
 .../view/HorizontalMindmapView.java           |  13 +-
 4 files changed, 141 insertions(+), 103 deletions(-)
 create mode 100644 app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java

diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/MainActivity.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/MainActivity.java
index 0c305b3..3341ce4 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/MainActivity.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/MainActivity.java
@@ -6,11 +6,9 @@
 import android.app.AlertDialog;
 import android.content.ClipData;
 import android.content.ClipboardManager;
-import android.content.ContentResolver;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.MenuInflater;
@@ -24,9 +22,7 @@
 import com.google.android.gms.analytics.HitBuilders;
 import com.google.android.gms.analytics.Tracker;
 
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-
+import ch.benediktkoeppel.code.droidplane.controller.AsyncMindmapLoaderTask;
 import ch.benediktkoeppel.code.droidplane.model.Mindmap;
 import ch.benediktkoeppel.code.droidplane.model.MindmapNode;
 import ch.benediktkoeppel.code.droidplane.view.HorizontalMindmapView;
@@ -79,26 +75,27 @@ public void onCreate(Bundle savedInstanceState) {
         // enable the Android home button
         enableHomeButton();
 
-        // get the Mindmap ViewModel
-        mindmap = ViewModelProviders.of(this).get(Mindmap.class);
-
-        // intents (how we are called)
-        Intent intent = getIntent();
-        String action = intent.getAction();
-
         // set up horizontal mindmap view first
         setUpHorizontalMindmapView();
 
-        // then populate view with mindmap
-        // we didn't load a mindmap yet, we open it
-        // otherwise, we already have a mindmap in the ViewModel, so we can just show the mindmap view again
-        if (mindmap.getRootNode() == null) {
+        // get the Mindmap ViewModel
+        mindmap = ViewModelProviders.of(this).get(Mindmap.class);
 
-            // load the file asynchronously, continuously appending in the horizontal mindmap view
-            new FileOpenTask(intent, action).execute();
+        // then populate view with mindmap
+        // if we already have a loaded mindmap, use this; otherwise load from the intent
+        if (mindmap.isLoaded()) {
+            horizontalMindmapView.setMindmap(mindmap);
 
         } else {
-            setUpHorizontalMindmapView();
+
+            // load the file asynchronously
+            new AsyncMindmapLoaderTask(
+                    this,
+                    mindmap,
+                    horizontalMindmapView,
+                    getIntent()
+            ).execute();
+
         }
 
     }
@@ -106,7 +103,7 @@ public void onCreate(Bundle savedInstanceState) {
     private void setUpHorizontalMindmapView() {
 
         // create a new HorizontalMindmapView
-        horizontalMindmapView = new HorizontalMindmapView(mindmap, this);
+        horizontalMindmapView = new HorizontalMindmapView(this);
 
         ((LinearLayout)findViewById(R.id.layout_wrapper)).addView(horizontalMindmapView);
 
@@ -122,84 +119,6 @@ public HorizontalMindmapView getHorizontalMindmapView() {
         return horizontalMindmapView;
     }
 
-    private class FileOpenTask extends AsyncTask<String, Void, Object> {
-
-        private final Intent intent;
-        private final String action;
-
-        FileOpenTask(
-                Intent intent,
-                String action
-        ) {
-
-            this.intent = intent;
-            this.action = action;
-        }
-
-        @Override
-        protected Object doInBackground(String... strings) {
-
-            // prepare loading of the Mindmap file
-            InputStream mm = null;
-
-            // determine whether we are started from the EDIT or VIEW intent, or whether we are started from the
-            // launcher started from ACTION_EDIT/VIEW intent
-            if ((Intent.ACTION_EDIT.equals(action) || Intent.ACTION_VIEW.equals(action)) ||
-                Intent.ACTION_OPEN_DOCUMENT.equals(action)
-            ) {
-
-                Log.d(MainApplication.TAG, "started from ACTION_EDIT/VIEW intent");
-
-                // get the URI to the target document (the Mindmap we are opening) and open the InputStream
-                Uri uri = intent.getData();
-                if (uri != null) {
-                    ContentResolver cr = getContentResolver();
-                    try {
-                        mm = cr.openInputStream(uri);
-                    } catch (FileNotFoundException e) {
-
-                        abortWithPopup(R.string.filenotfound);
-                        e.printStackTrace();
-                    }
-                } else {
-                    abortWithPopup(R.string.novalidfile);
-                }
-
-                // store the Uri. Next time the MainActivity is started, we'll
-                // check whether the Uri has changed (-> load new document) or
-                // remained the same (-> reuse previous document)
-                mindmap.setUri(uri);
-            }
-
-            // started from the launcher
-            else {
-                Log.d(MainApplication.TAG, "started from app launcher intent");
-
-                // display the default Mindmap "example.mm", from the resources
-                mm = getApplicationContext().getResources().openRawResource(R.raw.example);
-            }
-
-            // load the mindmap
-            Log.d(MainApplication.TAG, "InputStream fetched, now starting to load document");
-            mindmap.loadDocument(mm, new Runnable() {
-                @Override
-                public void run() {
-                    // TODO: this doesn't have to be two threads nested into each other
-                    runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            horizontalMindmapView.onRootNodeLoaded();
-                        }
-                    });
-
-                }
-            });
-
-
-            return null;
-        }
-    }
-
 
     /**
      * Enables the home button if the Android version allows it
@@ -374,7 +293,7 @@ public boolean onContextItemSelected(MenuItem item) {
      *
      * @param stringResourceId
      */
-    private void abortWithPopup(int stringResourceId) {
+    public void abortWithPopup(int stringResourceId) {
 
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
         builder.setMessage(stringResourceId);
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
new file mode 100644
index 0000000..9931453
--- /dev/null
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
@@ -0,0 +1,101 @@
+package ch.benediktkoeppel.code.droidplane.controller;
+
+import android.content.ContentResolver;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.util.Log;
+
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+
+import ch.benediktkoeppel.code.droidplane.MainActivity;
+import ch.benediktkoeppel.code.droidplane.MainApplication;
+import ch.benediktkoeppel.code.droidplane.R;
+import ch.benediktkoeppel.code.droidplane.model.Mindmap;
+import ch.benediktkoeppel.code.droidplane.view.HorizontalMindmapView;
+
+public class AsyncMindmapLoaderTask extends AsyncTask<String, Void, Object> {
+
+    private final MainActivity mainActivity;
+    private final Intent intent;
+    private final String action;
+    private final HorizontalMindmapView horizontalMindmapView;
+
+    private final Mindmap mindmap;
+
+    public AsyncMindmapLoaderTask(MainActivity mainActivity,
+                                  Mindmap mindmap,
+                                  HorizontalMindmapView horizontalMindmapView,
+                                  Intent intent) {
+
+        this.mainActivity = mainActivity;
+        this.intent = intent;
+        this.action = intent.getAction();
+        this.horizontalMindmapView = horizontalMindmapView;
+        this.mindmap = mindmap;
+    }
+
+    @Override
+    protected Object doInBackground(String... strings) {
+
+        // prepare loading of the Mindmap file
+        InputStream mm = null;
+
+        // determine whether we are started from the EDIT or VIEW intent, or whether we are started from the
+        // launcher started from ACTION_EDIT/VIEW intent
+        if ((Intent.ACTION_EDIT.equals(action) || Intent.ACTION_VIEW.equals(action)) ||
+                Intent.ACTION_OPEN_DOCUMENT.equals(action)
+        ) {
+
+            Log.d(MainApplication.TAG, "started from ACTION_EDIT/VIEW intent");
+
+            // get the URI to the target document (the Mindmap we are opening) and open the InputStream
+            Uri uri = intent.getData();
+            if (uri != null) {
+                ContentResolver cr = mainActivity.getContentResolver();
+                try {
+                    mm = cr.openInputStream(uri);
+                } catch (FileNotFoundException e) {
+
+                    mainActivity.abortWithPopup(R.string.filenotfound);
+                    e.printStackTrace();
+                }
+            } else {
+                mainActivity.abortWithPopup(R.string.novalidfile);
+            }
+
+            // store the Uri. Next time the MainActivity is started, we'll
+            // check whether the Uri has changed (-> load new document) or
+            // remained the same (-> reuse previous document)
+            this.mindmap.setUri(uri);
+        }
+
+        // started from the launcher
+        else {
+            Log.d(MainApplication.TAG, "started from app launcher intent");
+
+            // display the default Mindmap "example.mm", from the resources
+            mm = mainActivity.getApplicationContext().getResources().openRawResource(R.raw.example);
+        }
+
+        // load the mindmap
+        Log.d(MainApplication.TAG, "InputStream fetched, now starting to load document");
+        this.mindmap.loadDocument(mm, new Runnable() {
+            @Override
+            public void run() {
+                // TODO: this doesn't have to be two threads nested into each other
+                mainActivity.runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        horizontalMindmapView.setMindmap(mindmap);
+                        horizontalMindmapView.onRootNodeLoaded();
+                    }
+                });
+
+            }
+        });
+
+        return null;
+    }
+}
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/Mindmap.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/Mindmap.java
index ab3d42b..59bd0f6 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/Mindmap.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/Mindmap.java
@@ -54,6 +54,9 @@ public class Mindmap extends ViewModel {
     // TODO: this is not really part of the mindmap model
     private MindmapNode deepestSelectedMindmapNode;
 
+    // whether the mindmap has finished loading
+    private boolean isLoaded = false;
+
     /**
      * Returns the Uri which is currently loaded in document.
      *
@@ -155,6 +158,8 @@ public void loadDocument(InputStream inputStream, Runnable onRootNodeLoaded) {
                 .build()
         );
 
+        this.isLoaded = true;
+
     }
 
     /**
@@ -247,6 +252,14 @@ private void fillArrowLinks() {
         }
     }
 
+    public boolean isLoaded() {
+        return isLoaded;
+    }
+
+    public void setLoaded(boolean loaded) {
+        isLoaded = loaded;
+    }
+
     private class MindmapIndexes {
 
         private final Map<String, MindmapNode> nodesById;
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/HorizontalMindmapView.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/HorizontalMindmapView.java
index cda7561..5ae5a74 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/HorizontalMindmapView.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/HorizontalMindmapView.java
@@ -55,7 +55,7 @@ public class HorizontalMindmapView extends HorizontalScrollView implements OnTou
      */
     private final Map<ListView, NodeColumn> listViewToNodeColumn = new HashMap<>();
 
-    private final Mindmap mindmap;
+    private Mindmap mindmap;
 
     private final MainActivity mainActivity;
 
@@ -66,12 +66,10 @@ public class HorizontalMindmapView extends HorizontalScrollView implements OnTou
      *
      * @param mainActivity the Application Context
      */
-    public HorizontalMindmapView(Mindmap mindmap, MainActivity mainActivity) {
+    public HorizontalMindmapView(MainActivity mainActivity) {
 
         super(mainActivity);
 
-        this.mindmap = mindmap;
-
         // TODO: why does the view need access to the mainActivity?
         this.mainActivity = mainActivity;
 
@@ -102,11 +100,18 @@ public HorizontalMindmapView(Mindmap mindmap, MainActivity mainActivity) {
         // fix the widths of all columns
         resizeAllColumns(getContext());
 
+    }
+
+    public void setMindmap(Mindmap mindmap) {
+
+        this.mindmap = mindmap;
+
         // if we already have the root, we can already set up the columns; otherwise we do this when the root node is loaded
         // TODO: this should maybe never be done here
         if (mindmap.getRootNode() != null) {
             onRootNodeLoaded();
         }
+
     }
 
     // TODO: comment missing

From 5e4e59420a2a4f519d00f8f534e7ed0202a87fb1 Mon Sep 17 00:00:00 2001
From: Benedikt Koeppel <be.public@gmail.com>
Date: Tue, 28 Nov 2023 05:25:47 +0100
Subject: [PATCH 09/34] Move document loading into AsnycMindmapLoaderTask

---
 .../code/droidplane/MainActivity.java         |   1 +
 .../controller/AsyncMindmapLoaderTask.java    | 182 ++++++++++++++-
 .../code/droidplane/model/Mindmap.java        | 210 +-----------------
 .../code/droidplane/model/MindmapIndexes.java |  24 ++
 .../view/HorizontalMindmapView.java           |  28 ++-
 5 files changed, 226 insertions(+), 219 deletions(-)
 create mode 100644 app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapIndexes.java

diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/MainActivity.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/MainActivity.java
index 3341ce4..fa52a9f 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/MainActivity.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/MainActivity.java
@@ -85,6 +85,7 @@ public void onCreate(Bundle savedInstanceState) {
         // if we already have a loaded mindmap, use this; otherwise load from the intent
         if (mindmap.isLoaded()) {
             horizontalMindmapView.setMindmap(mindmap);
+            horizontalMindmapView.onRootNodeLoaded();
 
         } else {
 
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
index 9931453..8cf84fa 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
@@ -5,14 +5,34 @@
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.util.Log;
+import android.util.Pair;
 
+import com.google.android.gms.analytics.HitBuilders;
+import com.google.android.gms.analytics.Tracker;
+
+import org.w3c.dom.Document;
+import org.xml.sax.SAXException;
+
+import java.io.BufferedInputStream;
 import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Stack;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
 
 import ch.benediktkoeppel.code.droidplane.MainActivity;
 import ch.benediktkoeppel.code.droidplane.MainApplication;
 import ch.benediktkoeppel.code.droidplane.R;
 import ch.benediktkoeppel.code.droidplane.model.Mindmap;
+import ch.benediktkoeppel.code.droidplane.model.MindmapIndexes;
+import ch.benediktkoeppel.code.droidplane.model.MindmapNode;
 import ch.benediktkoeppel.code.droidplane.view.HorizontalMindmapView;
 
 public class AsyncMindmapLoaderTask extends AsyncTask<String, Void, Object> {
@@ -81,21 +101,163 @@ protected Object doInBackground(String... strings) {
 
         // load the mindmap
         Log.d(MainApplication.TAG, "InputStream fetched, now starting to load document");
-        this.mindmap.loadDocument(mm, new Runnable() {
+
+        loadDocument(mm);
+
+        return null;
+    }
+
+
+    /**
+     * Loads a mind map (*.mm) XML document into its internal DOM tree
+     *
+     * @param inputStream the inputStream to load
+     */
+    public void loadDocument(InputStream inputStream) {
+
+        // idea: maybe move to a streaming parser, and just append elements to the view as they become available
+        // https://github.com/FasterXML/woodstox
+
+        // start measuring the document load time
+        long loadDocumentStartTime = System.currentTimeMillis();
+
+        // XML document builder
+        DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
+        DocumentBuilder docBuilder;
+
+        // load the Mindmap from the InputStream
+        Document document;
+        try {
+            docBuilderFactory.setNamespaceAware(false);
+            docBuilderFactory.setValidating(false);
+            docBuilderFactory.setFeature("http://xml.org/sax/features/namespaces", false);
+            docBuilderFactory.setFeature("http://xml.org/sax/features/validation", false);
+
+            docBuilder = docBuilderFactory.newDocumentBuilder();
+            document = docBuilder.parse(new BufferedInputStream(inputStream));
+        } catch (ParserConfigurationException | SAXException | IOException e) {
+            e.printStackTrace();
+            return;
+        }
+
+        // get the root node
+        MindmapNode rootNode = new MindmapNode(
+                document.getDocumentElement().getElementsByTagName("node").item(0),
+                null,
+                mindmap
+        );
+
+        mindmap.setRootNode(rootNode);
+
+        // now set up the view
+        mainActivity.runOnUiThread(new Runnable() {
             @Override
             public void run() {
-                // TODO: this doesn't have to be two threads nested into each other
-                mainActivity.runOnUiThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        horizontalMindmapView.setMindmap(mindmap);
-                        horizontalMindmapView.onRootNodeLoaded();
-                    }
-                });
 
+                horizontalMindmapView.setMindmap(mindmap);
+
+                // by default, the root node is the deepest node that is expanded
+                horizontalMindmapView.setDeepestSelectedMindmapNode(rootNode);
+
+                horizontalMindmapView.onRootNodeLoaded();
             }
         });
 
-        return null;
+
+        // load all nodes of root node into simplified MindmapNode, and index them by ID for faster lookup
+        // other idea: already finish the mindmap loading, and do this in the background
+        MindmapIndexes mindmapIndexes = loadAndIndexNodesByIds(rootNode);
+        mindmap.setMindmapIndexes(mindmapIndexes);
+
+
+        // Nodes can refer to other nodes with arrowlinks. We want to have the link on both ends of the link, so we can
+        // now set the corresponding links
+        fillArrowLinks();
+
+
+        long loadDocumentEndTime = System.currentTimeMillis();
+        Tracker tracker = MainApplication.getTracker();
+        tracker.send(new HitBuilders.TimingBuilder()
+                .setCategory("document")
+                .setValue(loadDocumentEndTime - loadDocumentStartTime)
+                .setVariable("loadDocument")
+                .setLabel("loadTime")
+                .build());
+        Log.d(MainApplication.TAG, "Document loaded");
+
+        // TODO: currently we have to click on "top" once in the UI to make the view show up, after the document is loaded
+
+        long numNodes = document.getElementsByTagName("node").getLength();
+        tracker.send(new HitBuilders.EventBuilder()
+                .setCategory("document")
+                .setAction("loadDocument")
+                .setLabel("numNodes")
+                .setValue(numNodes)
+                .build()
+        );
+
+        mindmap.setLoaded(true);
+
+    }
+
+
+
+    /**
+     * Index all nodes (and child nodes) by their ID, for fast lookup
+     *
+     * @param root
+     */
+    private MindmapIndexes loadAndIndexNodesByIds(MindmapNode root) {
+
+        // TODO: check if this optimization was necessary - otherwise go back to old implementation
+
+        Stack<MindmapNode> stack = new Stack<>();
+        stack.push(root);
+
+        // try first to just extract all IDs and the respective node, and
+        // only insert into the hashmap once we know the size of the hashmap
+        List<Pair<String, MindmapNode>> idAndNode = new ArrayList<>();
+        List<Pair<Integer, MindmapNode>> numericIdAndNode = new ArrayList<>();
+
+        while (!stack.isEmpty()) {
+            MindmapNode node = stack.pop();
+
+            idAndNode.add(new Pair<>(node.getId(), node));
+            numericIdAndNode.add(new Pair<>(node.getNumericId(), node));
+
+            for (MindmapNode mindmapNode : node.getChildNodes()) {
+                stack.push(mindmapNode);
+            }
+        }
+
+        Map<String, MindmapNode> newNodesById = new HashMap<>(idAndNode.size());
+        Map<Integer, MindmapNode> newNodesByNumericId = new HashMap<>(numericIdAndNode.size());
+
+        for (Pair<String, MindmapNode> i : idAndNode) {
+            newNodesById.put(i.first, i.second);
+        }
+        for (Pair<Integer, MindmapNode> i : numericIdAndNode) {
+            newNodesByNumericId.put(i.first, i.second);
+        }
+
+        return new MindmapIndexes(newNodesById, newNodesByNumericId);
+
+    }
+
+    private void fillArrowLinks() {
+
+        Map<String, MindmapNode> nodesById = mindmap.getMindmapIndexes().getNodesByIdIndex();
+
+        for (String nodeId : nodesById.keySet()) {
+            MindmapNode mindmapNode = nodesById.get(nodeId);
+            for (String linkDestinationId : mindmapNode.getArrowLinkDestinationIds()) {
+                MindmapNode destinationNode = nodesById.get(linkDestinationId);
+                if (destinationNode != null) {
+                    mindmapNode.getArrowLinkDestinationNodes().add(destinationNode);
+                    destinationNode.getArrowLinkIncomingNodes().add(mindmapNode);
+                }
+            }
+        }
     }
+
 }
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/Mindmap.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/Mindmap.java
index 59bd0f6..b6ac19e 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/Mindmap.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/Mindmap.java
@@ -1,32 +1,9 @@
 package ch.benediktkoeppel.code.droidplane.model;
 
 import android.net.Uri;
-import android.util.Log;
-import android.util.Pair;
 
 import androidx.lifecycle.ViewModel;
 
-import com.google.android.gms.analytics.HitBuilders;
-import com.google.android.gms.analytics.Tracker;
-
-import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
-
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Stack;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import ch.benediktkoeppel.code.droidplane.MainApplication;
-
 /**
  * Mindmap handles the loading and storing of a mind map document.
  */
@@ -45,14 +22,7 @@ public class Mindmap extends ViewModel {
     /**
      * A map that resolves node IDs to Node objects
      */
-    private Map<String, MindmapNode> nodesById;
-    private Map<Integer, MindmapNode> nodesByNumericId;
-
-    /**
-     * The deepest selected mindmap node
-     */
-    // TODO: this is not really part of the mindmap model
-    private MindmapNode deepestSelectedMindmapNode;
+    MindmapIndexes mindmapIndexes;
 
     // whether the mindmap has finished loading
     private boolean isLoaded = false;
@@ -77,91 +47,6 @@ public void setUri(Uri uri) {
         this.uri = uri;
     }
 
-    /**
-     * Loads a mind map (*.mm) XML document into its internal DOM tree
-     *
-     * @param inputStream the inputStream to load
-     */
-    // TODO: this should probably be a controller instead?
-    public void loadDocument(InputStream inputStream, Runnable onRootNodeLoaded) {
-
-        // idea: maybe move to a streaming parser, and just append elements to the view as they become available
-        // https://github.com/FasterXML/woodstox
-
-        // start measuring the document load time
-        long loadDocumentStartTime = System.currentTimeMillis();
-
-        // XML document builder
-        DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
-        DocumentBuilder docBuilder;
-
-        // load the Mindmap from the InputStream
-        Document document;
-        try {
-            docBuilderFactory.setNamespaceAware(false);
-            docBuilderFactory.setValidating(false);
-            docBuilderFactory.setFeature("http://xml.org/sax/features/namespaces", false);
-            docBuilderFactory.setFeature("http://xml.org/sax/features/validation", false);
-
-            docBuilder = docBuilderFactory.newDocumentBuilder();
-            document = docBuilder.parse(new BufferedInputStream(inputStream));
-        } catch (ParserConfigurationException | SAXException | IOException e) {
-            e.printStackTrace();
-            return;
-        }
-
-
-        // get the root node
-        rootNode = new MindmapNode(
-                document.getDocumentElement().getElementsByTagName("node").item(0),
-                null,
-                this
-        );
-
-        // by default, the root node is the deepest node that is expanded
-        deepestSelectedMindmapNode = rootNode;
-
-        // now set up the view
-        onRootNodeLoaded.run();
-
-        // load all nodes of root node into simplified MindmapNode, and index them by ID for faster lookup
-        // other idea: already finish the mindmap loading, and do this in the background
-        MindmapIndexes mindmapIndexes = loadAndIndexNodesByIds(rootNode);
-
-        nodesById = mindmapIndexes.getNodesByIdIndex();
-        nodesByNumericId = mindmapIndexes.getNodesByNumericIndex();
-
-
-        // Nodes can refer to other nodes with arrowlinks. We want to have the link on both ends of the link, so we can
-        // now set the corresponding links
-        fillArrowLinks();
-
-
-        long loadDocumentEndTime = System.currentTimeMillis();
-        Tracker tracker = MainApplication.getTracker();
-        tracker.send(new HitBuilders.TimingBuilder()
-                .setCategory("document")
-                .setValue(loadDocumentEndTime - loadDocumentStartTime)
-                .setVariable("loadDocument")
-                .setLabel("loadTime")
-                .build());
-        Log.d(MainApplication.TAG, "Document loaded");
-
-        // TODO: currently we have to click on "top" once in the UI to make the view show up, after the document is loaded
-
-        long numNodes = document.getElementsByTagName("node").getLength();
-        tracker.send(new HitBuilders.EventBuilder()
-                .setCategory("document")
-                .setAction("loadDocument")
-                .setLabel("numNodes")
-                .setValue(numNodes)
-                .build()
-        );
-
-        this.isLoaded = true;
-
-    }
-
     /**
      * Returns the root node of the currently loaded mind map
      *
@@ -172,48 +57,6 @@ public MindmapNode getRootNode() {
         return rootNode;
     }
 
-    /**
-     * Index all nodes (and child nodes) by their ID, for fast lookup
-     *
-     * @param root
-     */
-    private MindmapIndexes loadAndIndexNodesByIds(MindmapNode root) {
-
-        // TODO: check if this optimization was necessary - otherwise go back to old implementation
-
-        Stack<MindmapNode> stack = new Stack<>();
-        stack.push(root);
-
-        // try first to just extract all IDs and the respective node, and
-        // only insert into the hashmap once we know the size of the hashmap
-        List<Pair<String, MindmapNode>> idAndNode = new ArrayList<>();
-        List<Pair<Integer, MindmapNode>> numericIdAndNode = new ArrayList<>();
-
-        while (!stack.isEmpty()) {
-            MindmapNode node = stack.pop();
-
-            idAndNode.add(new Pair<>(node.getId(), node));
-            numericIdAndNode.add(new Pair<>(node.getNumericId(), node));
-
-            for (MindmapNode mindmapNode : node.getChildNodes()) {
-                stack.push(mindmapNode);
-            }
-        }
-
-        Map<String, MindmapNode> newNodesById = new HashMap<>(idAndNode.size());
-        Map<Integer, MindmapNode> newNodesByNumericId = new HashMap<>(numericIdAndNode.size());
-
-        for (Pair<String, MindmapNode> i : idAndNode) {
-            newNodesById.put(i.first, i.second);
-        }
-        for (Pair<Integer, MindmapNode> i : numericIdAndNode) {
-            newNodesByNumericId.put(i.first, i.second);
-        }
-
-        return new MindmapIndexes(newNodesById, newNodesByNumericId);
-
-    }
-
     /**
      * Returns the node for a given Node ID
      *
@@ -221,35 +64,11 @@ private MindmapIndexes loadAndIndexNodesByIds(MindmapNode root) {
      * @return
      */
     public MindmapNode getNodeByID(String id) {
-        return nodesById.get(id);
+        return mindmapIndexes.getNodesByIdIndex().get(id);
     }
 
     public MindmapNode getNodeByNumericID(Integer numericId) {
-        return nodesByNumericId.get(numericId);
-    }
-
-    public MindmapNode getDeepestSelectedMindmapNode() {
-
-        return deepestSelectedMindmapNode;
-    }
-
-    public void setDeepestSelectedMindmapNode(MindmapNode deepestSelectedMindmapNode) {
-
-        this.deepestSelectedMindmapNode = deepestSelectedMindmapNode;
-    }
-
-    private void fillArrowLinks() {
-
-        for (String nodeId : nodesById.keySet()) {
-            MindmapNode mindmapNode = nodesById.get(nodeId);
-            for (String linkDestinationId : mindmapNode.getArrowLinkDestinationIds()) {
-                MindmapNode destinationNode = nodesById.get(linkDestinationId);
-                if (destinationNode != null) {
-                    mindmapNode.getArrowLinkDestinationNodes().add(destinationNode);
-                    destinationNode.getArrowLinkIncomingNodes().add(mindmapNode);
-                }
-            }
-        }
+        return mindmapIndexes.getNodesByNumericIndex().get(numericId);
     }
 
     public boolean isLoaded() {
@@ -260,22 +79,15 @@ public void setLoaded(boolean loaded) {
         isLoaded = loaded;
     }
 
-    private class MindmapIndexes {
-
-        private final Map<String, MindmapNode> nodesById;
-        private final Map<Integer, MindmapNode> nodesByNumericId;
-
-        private MindmapIndexes(Map<String, MindmapNode> nodesById, Map<Integer, MindmapNode> nodesByNumericId) {
-            this.nodesById = nodesById;
-            this.nodesByNumericId = nodesByNumericId;
-        }
+    public void setRootNode(MindmapNode rootNode) {
+        this.rootNode = rootNode;
+    }
 
-        public Map<String, MindmapNode> getNodesByIdIndex() {
-            return this.nodesById;
-        }
+    public void setMindmapIndexes(MindmapIndexes mindmapIndexes) {
+        this.mindmapIndexes = mindmapIndexes;
+    }
 
-        public Map<Integer, MindmapNode> getNodesByNumericIndex() {
-            return this.nodesByNumericId;
-        }
+    public MindmapIndexes getMindmapIndexes() {
+        return mindmapIndexes;
     }
 }
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapIndexes.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapIndexes.java
new file mode 100644
index 0000000..306a8ef
--- /dev/null
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapIndexes.java
@@ -0,0 +1,24 @@
+package ch.benediktkoeppel.code.droidplane.model;
+
+import java.util.Map;
+
+import ch.benediktkoeppel.code.droidplane.model.MindmapNode;
+
+public class MindmapIndexes {
+
+    private final Map<String, MindmapNode> nodesById;
+    private final Map<Integer, MindmapNode> nodesByNumericId;
+
+    public MindmapIndexes(Map<String, MindmapNode> nodesById, Map<Integer, MindmapNode> nodesByNumericId) {
+        this.nodesById = nodesById;
+        this.nodesByNumericId = nodesByNumericId;
+    }
+
+    public Map<String, MindmapNode> getNodesByIdIndex() {
+        return this.nodesById;
+    }
+
+    public Map<Integer, MindmapNode> getNodesByNumericIndex() {
+        return this.nodesByNumericId;
+    }
+}
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/HorizontalMindmapView.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/HorizontalMindmapView.java
index 5ae5a74..795d6cb 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/HorizontalMindmapView.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/HorizontalMindmapView.java
@@ -60,6 +60,14 @@ public class HorizontalMindmapView extends HorizontalScrollView implements OnTou
     private final MainActivity mainActivity;
 
 
+
+
+    /**
+     * The deepest selected mindmap node
+     */
+    private MindmapNode deepestSelectedMindmapNode;
+
+
     /**
      * Setting up a HorizontalMindmapView. We initialize the nodeColumns, define the layout parameters for the
      * HorizontalScrollView and create the LinearLayout view inside the HorizontalScrollView.
@@ -103,27 +111,23 @@ public HorizontalMindmapView(MainActivity mainActivity) {
     }
 
     public void setMindmap(Mindmap mindmap) {
-
         this.mindmap = mindmap;
-
-        // if we already have the root, we can already set up the columns; otherwise we do this when the root node is loaded
-        // TODO: this should maybe never be done here
-        if (mindmap.getRootNode() != null) {
-            onRootNodeLoaded();
-        }
-
     }
 
     // TODO: comment missing
     public void onRootNodeLoaded() {
 
         // expand the selected node chain
-        downTo(getContext(), mindmap.getDeepestSelectedMindmapNode());
+        downTo(getContext(), this.getDeepestSelectedMindmapNode());
 
         // and then scroll to the right
         scrollToRight();
     }
 
+    private MindmapNode getDeepestSelectedMindmapNode() {
+        return this.deepestSelectedMindmapNode;
+    }
+
     /**
      * Add a new NodeColumn to the HorizontalMindmapView
      *
@@ -384,7 +388,7 @@ private void down(Context context, MindmapNode node) {
         node.setSelected(true);
 
         // keep track in the mind map which node is currently selected
-        mindmap.setDeepestSelectedMindmapNode(node);
+        this.setDeepestSelectedMindmapNode(node);
 
     }
 
@@ -630,6 +634,10 @@ private int getVisiblePixelOfLeftmostColumn() {
         return numVisiblePixelsOnColumn;
     }
 
+    public void setDeepestSelectedMindmapNode(MindmapNode deepestSelectedMindmapNode) {
+        this.deepestSelectedMindmapNode = deepestSelectedMindmapNode;
+    }
+
     /**
      * The HorizontalMindmapViewGestureDetector should detect the onFling event. However, it never receives the
      * onDown event, so when it gets the onFling the event1 is empty, and we can't detect the fling properly.

From ba645b33412260c5fd0540c32052070ea36c2bc3 Mon Sep 17 00:00:00 2001
From: Benedikt Koeppel <be.public@gmail.com>
Date: Tue, 28 Nov 2023 07:06:28 +0100
Subject: [PATCH 10/34] Show loading spinner

---
 .../code/droidplane/MainActivity.java         | 26 ++++++++++++++++++-
 .../controller/AsyncMindmapLoaderTask.java    |  8 ++++--
 .../code/droidplane/view/NodeColumn.java      | 16 +++++-------
 .../main/res/layout/action_bar_progress.xml   | 13 ++++++++++
 app/src/main/res/menu/main.xml                | 10 ++++++-
 app/src/main/res/values/strings.xml           |  1 +
 6 files changed, 61 insertions(+), 13 deletions(-)
 create mode 100644 app/src/main/res/layout/action_bar_progress.xml

diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/MainActivity.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/MainActivity.java
index fa52a9f..5397acf 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/MainActivity.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/MainActivity.java
@@ -11,6 +11,7 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.widget.AdapterView;
@@ -45,6 +46,8 @@ public class MainActivity extends FragmentActivity {
      * HorizontalMindmapView that contains all NodeColumns
      */
     private HorizontalMindmapView horizontalMindmapView;
+    private Menu menu;
+    private boolean mindmapIsLoading;
 
     @Override
     public void onStart() {
@@ -155,6 +158,8 @@ public boolean onCreateOptionsMenu(android.view.Menu menu) {
 
         MenuInflater inflater = getMenuInflater();
         inflater.inflate(R.menu.main, menu);
+        this.menu = menu;
+        updateLoadingIndicatorOnUiThread();
         return true;
     }
 
@@ -169,6 +174,7 @@ public void onBackPressed() {
         horizontalMindmapView.upOrClose();
     }
 
+
     /*
      * (non-Javadoc)
      *
@@ -206,7 +212,7 @@ public boolean onOptionsItemSelected(android.view.MenuItem item) {
                 performFileSearch();
                 break;
 
-                // App button (top left corner)
+            // App button (top left corner)
             case android.R.id.home:
                 horizontalMindmapView.up();
                 break;
@@ -353,4 +359,22 @@ public void onActivityResult(int requestCode, int resultCode,
             }
         }
     }
+
+
+    public void setMindmapIsLoading(boolean mindmapIsLoading) {
+
+        this.mindmapIsLoading = mindmapIsLoading;
+
+        // update the loading indicator in the menu
+        updateLoadingIndicatorOnUiThread();
+    }
+
+    private void updateLoadingIndicatorOnUiThread() {
+        if (menu != null && menu.findItem(R.id.mindmap_loading) != null) {
+
+            MenuItem mindmapLoadingIndicator = menu.findItem(R.id.mindmap_loading);
+
+            runOnUiThread(() -> mindmapLoadingIndicator.setVisible(mindmapIsLoading));
+        }
+    }
 }
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
index 8cf84fa..8b95fd3 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
@@ -115,6 +115,9 @@ protected Object doInBackground(String... strings) {
      */
     public void loadDocument(InputStream inputStream) {
 
+        // show loading indicator
+        mainActivity.setMindmapIsLoading(true);
+
         // idea: maybe move to a streaming parser, and just append elements to the view as they become available
         // https://github.com/FasterXML/woodstox
 
@@ -160,6 +163,7 @@ public void run() {
                 horizontalMindmapView.setDeepestSelectedMindmapNode(rootNode);
 
                 horizontalMindmapView.onRootNodeLoaded();
+
             }
         });
 
@@ -185,8 +189,6 @@ public void run() {
                 .build());
         Log.d(MainApplication.TAG, "Document loaded");
 
-        // TODO: currently we have to click on "top" once in the UI to make the view show up, after the document is loaded
-
         long numNodes = document.getElementsByTagName("node").getLength();
         tracker.send(new HitBuilders.EventBuilder()
                 .setCategory("document")
@@ -198,6 +200,8 @@ public void run() {
 
         mindmap.setLoaded(true);
 
+        mainActivity.setMindmapIsLoading(false);
+
     }
 
 
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/NodeColumn.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/NodeColumn.java
index 5591405..41d8792 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/NodeColumn.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/NodeColumn.java
@@ -80,19 +80,17 @@ public NodeColumn(Context context, MindmapNode parent) {
 
         super(context);
 
-        // extract all <node.../> elements from the parent node, create layouts, and add them to the mindmapNodes list
-        // TODO this comment here is explaining what getChildNodes does, too detailed
+        this.parent = parent;
+
+        // create list items for each child node
         mindmapNodeLayouts = new ArrayList<>();
         List<MindmapNode> mindmapNodes = parent.getChildNodes();
-        for (MindmapNode mindmapNode : mindmapNodes) {
-            mindmapNodeLayouts.add(new MindmapNodeLayout(context, mindmapNode));
+        synchronized (mindmapNodes) {
+            for (MindmapNode mindmapNode : mindmapNodes) {
+                mindmapNodeLayouts.add(new MindmapNodeLayout(context, mindmapNode));
+            }
         }
 
-        // store the parent node
-        // TODO move up
-        this.parent = parent;
-
-
         // define the layout of this LinearView
         int linearViewHeight = LayoutParams.MATCH_PARENT;
         int linearViewWidth = getOptimalColumnWidth(context);
diff --git a/app/src/main/res/layout/action_bar_progress.xml b/app/src/main/res/layout/action_bar_progress.xml
new file mode 100644
index 0000000..60ec1d3
--- /dev/null
+++ b/app/src/main/res/layout/action_bar_progress.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_height="wrap_content"
+    android:layout_width="wrap_content"
+    style="@android:style/Widget.ActionButton">
+    <ProgressBar
+        android:id="@+id/actionProgressBar"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:visibility="visible"
+        android:layout_gravity="center" />
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml
index 44a041d..eb17716 100644
--- a/app/src/main/res/menu/main.xml
+++ b/app/src/main/res/menu/main.xml
@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
     
     <!-- TODO: add icons -->
+    <item
+        android:id="@+id/mindmap_loading"
+        android:title="@string/mindmap_loading"
+        android:showAsAction="always"
+        android:actionLayout="@layout/action_bar_progress"
+        android:visible="false"
+    />
+
     <item android:id="@+id/up"
         android:title="@string/up"
         android:showAsAction="ifRoom" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dd4361d..8a5a427 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,4 +15,5 @@
     <string name="openrichtext">Open Rich Text Content</string>
     <string name="help">Help</string>
     <string name="title_activity_rich_text_view">Rich Text View</string>
+    <string name="mindmap_loading">Loading</string>
 </resources>
\ No newline at end of file

From 5826bc2f394e752cc818eaac1abcdecf80e546c8 Mon Sep 17 00:00:00 2001
From: Benedikt Koeppel <be.public@gmail.com>
Date: Tue, 28 Nov 2023 07:32:37 +0100
Subject: [PATCH 11/34] Fix concurrent modification of list

---
 .../code/droidplane/model/MindmapNode.java         | 14 +++++++++-----
 .../code/droidplane/view/NodeColumn.java           |  6 ++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java
index a6f50f8..635eb13 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java
@@ -10,6 +10,7 @@
 
 import java.io.ByteArrayOutputStream;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import javax.xml.transform.Transformer;
@@ -339,27 +340,30 @@ public int getNumChildMindmapNodes() {
     public List<MindmapNode> getChildNodes() {
 
         // if we haven't loaded the childMindmapNodes before
-        if (childMindmapNodes == null) {
+        if (this.childMindmapNodes == null) {
 
             // fetch all child DOM Nodes, convert them to MindmapNodes
-            childMindmapNodes = new ArrayList<>();
+            List<MindmapNode> newChildMindmapNodes = new ArrayList<>();
             NodeList childNodes = node.getChildNodes();
             for (int i = 0; i < childNodes.getLength(); i++) {
                 Node tmpNode = childNodes.item(i);
 
                 if (isMindmapNode(tmpNode)) {
                     MindmapNode mindmapNode = new MindmapNode(tmpNode, this, mindmap);
-                    childMindmapNodes.add(mindmapNode);
+                    newChildMindmapNodes.add(mindmapNode);
                 }
             }
-            return childMindmapNodes;
+
+            this.childMindmapNodes = Collections.unmodifiableList(newChildMindmapNodes);
+
         }
 
         // we already did that before, so return the previous result
         else {
             Log.d(MainApplication.TAG, "Returning cached childMindmapNodes");
-            return childMindmapNodes;
         }
+
+        return this.childMindmapNodes;
     }
 
     public List<String> getIconNames() {
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/NodeColumn.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/NodeColumn.java
index 41d8792..8122266 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/NodeColumn.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/NodeColumn.java
@@ -85,10 +85,8 @@ public NodeColumn(Context context, MindmapNode parent) {
         // create list items for each child node
         mindmapNodeLayouts = new ArrayList<>();
         List<MindmapNode> mindmapNodes = parent.getChildNodes();
-        synchronized (mindmapNodes) {
-            for (MindmapNode mindmapNode : mindmapNodes) {
-                mindmapNodeLayouts.add(new MindmapNodeLayout(context, mindmapNode));
-            }
+        for (MindmapNode mindmapNode : mindmapNodes) {
+            mindmapNodeLayouts.add(new MindmapNodeLayout(context, mindmapNode));
         }
 
         // define the layout of this LinearView

From b6c61001a947f0cf53d7d68acc8601c8685df316 Mon Sep 17 00:00:00 2001
From: Benedikt Koeppel <be.public@gmail.com>
Date: Tue, 28 Nov 2023 09:15:52 +0100
Subject: [PATCH 12/34] Fix bug that links were not visible in context menu

Issue caused by calling getChildNodes on the root MindmapNode, and then
immediately again from the UI thread, thus resulting in two separate
list of child nodes on the root node.

caching needs to be synchronized
---
 .../controller/AsyncMindmapLoaderTask.java         |  2 ++
 .../code/droidplane/model/MindmapNode.java         | 14 +++-----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
index 8b95fd3..114967b 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
@@ -215,6 +215,8 @@ private MindmapIndexes loadAndIndexNodesByIds(MindmapNode root) {
 
         // TODO: check if this optimization was necessary - otherwise go back to old implementation
 
+        // TODO: this causes us to load all mindmap nodes, defeating the lazy loading in ch.benediktkoeppel.code.droidplane.model.MindmapNode.getChildNodes
+
         Stack<MindmapNode> stack = new Stack<>();
         stack.push(root);
 
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java
index 635eb13..36dddd6 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java
@@ -335,9 +335,11 @@ public int getNumChildMindmapNodes() {
      *
      * TODO: not so sure if this is really doing lazy loading. We probably call this already pretty early on. Should check.
      *
+     * TODO: this should be called differently, to not confuse it with getChildNodes of Node
+     *
      * @return ArrayList of this MindmapNode's child nodes
      */
-    public List<MindmapNode> getChildNodes() {
+    public synchronized List<MindmapNode> getChildNodes() {
 
         // if we haven't loaded the childMindmapNodes before
         if (this.childMindmapNodes == null) {
@@ -435,21 +437,11 @@ public List<MindmapNode> getArrowLinkDestinationNodes() {
         return arrowLinkDestinationNodes;
     }
 
-    public void setArrowLinkDestinationNodes(List<MindmapNode> arrowLinkDestinationNodes) {
-
-        this.arrowLinkDestinationNodes = arrowLinkDestinationNodes;
-    }
-
     public List<MindmapNode> getArrowLinkIncomingNodes() {
 
         return arrowLinkIncomingNodes;
     }
 
-    public void setArrowLinkIncomingNodes(List<MindmapNode> arrowLinkIncomingNodes) {
-
-        this.arrowLinkIncomingNodes = arrowLinkIncomingNodes;
-    }
-
     public List<MindmapNode> getArrowLinks() {
         ArrayList<MindmapNode> combinedArrowLists = new ArrayList<>();
         combinedArrowLists.addAll(arrowLinkDestinationNodes);

From 2337bcabdd27e0eae8a4f28b9a4be7a6d61085bb Mon Sep 17 00:00:00 2001
From: Benedikt Koeppel <be.public@gmail.com>
Date: Tue, 28 Nov 2023 09:16:05 +0100
Subject: [PATCH 13/34] Some extra logging to be reverted

---
 .../code/droidplane/model/MindmapNode.java             | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java
index 36dddd6..af1b27b 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java
@@ -147,6 +147,10 @@ public MindmapNode(Node node, MindmapNode parentNode, Mindmap mindmap) {
         // extract the ID of the node
         id = tmpElement.getAttribute("ID");
 
+        if (this.id.equals("ID_209248072")) {
+            Log.d(MainApplication.TAG, "Created MindmapNode for ID \"ID_209248072\"");
+        }
+
         try {
             numericId = Integer.parseInt(id.replaceAll("\\D+", ""));
         } catch (NumberFormatException e) {
@@ -341,9 +345,15 @@ public int getNumChildMindmapNodes() {
      */
     public synchronized List<MindmapNode> getChildNodes() {
 
+        if (this.parentNode == null) {
+            Log.d(MainApplication.TAG, "Calling getChildNodes on root");
+        }
+
         // if we haven't loaded the childMindmapNodes before
         if (this.childMindmapNodes == null) {
 
+            //Log.d(MainApplication.TAG, "Loading child nodes of node " + this.id);
+
             // fetch all child DOM Nodes, convert them to MindmapNodes
             List<MindmapNode> newChildMindmapNodes = new ArrayList<>();
             NodeList childNodes = node.getChildNodes();

From d432ed2bbf5f415218fefa1d59460307f99fafc4 Mon Sep 17 00:00:00 2001
From: Benedikt Koeppel <be.public@gmail.com>
Date: Tue, 28 Nov 2023 09:16:11 +0100
Subject: [PATCH 14/34] Revert "Some extra logging to be reverted"

This reverts commit 2337bcabdd27e0eae8a4f28b9a4be7a6d61085bb.
---
 .../code/droidplane/model/MindmapNode.java             | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java
index af1b27b..36dddd6 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java
@@ -147,10 +147,6 @@ public MindmapNode(Node node, MindmapNode parentNode, Mindmap mindmap) {
         // extract the ID of the node
         id = tmpElement.getAttribute("ID");
 
-        if (this.id.equals("ID_209248072")) {
-            Log.d(MainApplication.TAG, "Created MindmapNode for ID \"ID_209248072\"");
-        }
-
         try {
             numericId = Integer.parseInt(id.replaceAll("\\D+", ""));
         } catch (NumberFormatException e) {
@@ -345,15 +341,9 @@ public int getNumChildMindmapNodes() {
      */
     public synchronized List<MindmapNode> getChildNodes() {
 
-        if (this.parentNode == null) {
-            Log.d(MainApplication.TAG, "Calling getChildNodes on root");
-        }
-
         // if we haven't loaded the childMindmapNodes before
         if (this.childMindmapNodes == null) {
 
-            //Log.d(MainApplication.TAG, "Loading child nodes of node " + this.id);
-
             // fetch all child DOM Nodes, convert them to MindmapNodes
             List<MindmapNode> newChildMindmapNodes = new ArrayList<>();
             NodeList childNodes = node.getChildNodes();

From 6ba38145154af6b1cea9a759581bbb1343ff5ae0 Mon Sep 17 00:00:00 2001
From: Benedikt Koeppel <be.public@gmail.com>
Date: Tue, 28 Nov 2023 11:51:32 +0100
Subject: [PATCH 15/34] Trying to split out XML parsing from MindmapNode

---
 .idea/modules/app/droidplane.app.main.iml     |   1 +
 app/build.gradle                              |   2 +
 .../controller/AsyncMindmapLoaderTask.java    |  11 +-
 .../controller/MindmapNodeFromXmlBuilder.java | 256 ++++++++++++
 .../code/droidplane/model/MindmapNode.java    | 366 +++++++-----------
 build.gradle                                  |   2 +
 6 files changed, 396 insertions(+), 242 deletions(-)
 create mode 100644 app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/MindmapNodeFromXmlBuilder.java

diff --git a/.idea/modules/app/droidplane.app.main.iml b/.idea/modules/app/droidplane.app.main.iml
index 3de47f5..15e1831 100644
--- a/.idea/modules/app/droidplane.app.main.iml
+++ b/.idea/modules/app/droidplane.app.main.iml
@@ -74,6 +74,7 @@
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-process:2.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-service:2.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.constraintlayout:constraintlayout:1.1.3@aar" level="project" />
+    <orderEntry type="library" name="Gradle: org.projectlombok:lombok:1.18.30" level="project" />
     <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.1.0" level="project" />
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.0.0" level="project" />
     <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.0.0" level="project" />
diff --git a/app/build.gradle b/app/build.gradle
index e10dc11..72a84c3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -28,4 +28,6 @@ dependencies {
     implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
     implementation 'androidx.lifecycle:lifecycle-viewmodel:2.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    compileOnly "org.projectlombok:lombok:1.18.30"
+    annotationProcessor 'org.projectlombok:lombok:1.18.30'
 }
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
index 114967b..89c43eb 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
@@ -144,7 +144,7 @@ public void loadDocument(InputStream inputStream) {
         }
 
         // get the root node
-        MindmapNode rootNode = new MindmapNode(
+        MindmapNode rootNode = MindmapNodeFromXmlBuilder.parse(
                 document.getDocumentElement().getElementsByTagName("node").item(0),
                 null,
                 mindmap
@@ -167,13 +167,10 @@ public void run() {
             }
         });
 
-
         // load all nodes of root node into simplified MindmapNode, and index them by ID for faster lookup
-        // other idea: already finish the mindmap loading, and do this in the background
         MindmapIndexes mindmapIndexes = loadAndIndexNodesByIds(rootNode);
         mindmap.setMindmapIndexes(mindmapIndexes);
 
-
         // Nodes can refer to other nodes with arrowlinks. We want to have the link on both ends of the link, so we can
         // now set the corresponding links
         fillArrowLinks();
@@ -198,14 +195,13 @@ public void run() {
                 .build()
         );
 
+        // now the full mindmap is loaded
         mindmap.setLoaded(true);
-
         mainActivity.setMindmapIsLoading(false);
 
     }
 
 
-
     /**
      * Index all nodes (and child nodes) by their ID, for fast lookup
      *
@@ -231,9 +227,10 @@ private MindmapIndexes loadAndIndexNodesByIds(MindmapNode root) {
             idAndNode.add(new Pair<>(node.getId(), node));
             numericIdAndNode.add(new Pair<>(node.getNumericId(), node));
 
-            for (MindmapNode mindmapNode : node.getChildNodes()) {
+            for (MindmapNode mindmapNode : node.getChildMindmapNodes()) {
                 stack.push(mindmapNode);
             }
+
         }
 
         Map<String, MindmapNode> newNodesById = new HashMap<>(idAndNode.size());
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/MindmapNodeFromXmlBuilder.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/MindmapNodeFromXmlBuilder.java
new file mode 100644
index 0000000..0530275
--- /dev/null
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/MindmapNodeFromXmlBuilder.java
@@ -0,0 +1,256 @@
+package ch.benediktkoeppel.code.droidplane.controller;
+
+import android.util.Log;
+
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import ch.benediktkoeppel.code.droidplane.MainApplication;
+import ch.benediktkoeppel.code.droidplane.model.Mindmap;
+import ch.benediktkoeppel.code.droidplane.model.MindmapNode;
+
+public class MindmapNodeFromXmlBuilder {
+
+
+    public static MindmapNode parse(Node node, MindmapNode parentNode, Mindmap mindmap) {
+        return null;
+
+//        // convert the XML Node to a XML Element
+//        Element tmpElement;
+//        if (isMindmapNode(node)) {
+//            tmpElement = (Element)node;
+//        } else {
+//            throw new ClassCastException("Can not convert Node to MindmapNode");
+//        }
+//
+//        // extract the ID of the node
+//        String id = tmpElement.getAttribute("ID");
+//
+//        int numericId;
+//        try {
+//            numericId = Integer.parseInt(id.replaceAll("\\D+", ""));
+//        } catch (NumberFormatException e) {
+//            numericId = id.hashCode();
+//        }
+//
+//        // extract the string (TEXT attribute) of the nodes
+//        String text = tmpElement.getAttribute("TEXT");
+//
+//        // extract the richcontent (HTML) of the node. This works both for nodes with a rich text content
+//        // (TYPE="NODE"), for "Notes" (TYPE="NOTE"), for "Details" (TYPE="DETAILS").
+//        String richTextContent = null;
+//        // find 'richcontent TYPE="NODE"' subnode, which will contain the rich text content
+//        NodeList richtextNodeList = tmpElement.getChildNodes();
+//        for (int i = 0; i < richtextNodeList.getLength(); i++) {
+//            Node n = richtextNodeList.item(i);
+//            if (n.getNodeType() == Node.ELEMENT_NODE && n.getNodeName().equals("richcontent")) {
+//                Element richcontentElement = (Element)n;
+//                String typeAttribute = richcontentElement.getAttribute("TYPE");
+//                if (typeAttribute.equals("NODE") || typeAttribute.equals("NOTE") || typeAttribute.equals("DETAILS")) {
+//
+//                    // extract the whole rich text (XML), to show in a WebView activity
+//                    try {
+//                        Transformer transformer = TransformerFactory.newInstance().newTransformer();
+//                        ByteArrayOutputStream boas = new ByteArrayOutputStream();
+//                        transformer.transform(new DOMSource(richtextNodeList.item(0)), new StreamResult(boas));
+//                        richTextContent = boas.toString();
+//                    } catch (TransformerException e) {
+//                        e.printStackTrace();
+//                    }
+//
+//                    // if the node has no text itself, then convert the rich text content to a text
+//                    if (text == null || text.equals("")) {
+//                        // convert the content (text only) into a string, to show in the normal list view
+//                        text = Html.fromHtml(richcontentElement.getTextContent()).toString();
+//                    }
+//                }
+//            }
+//        }
+//
+//        // extract styles
+//        NodeList styleNodeList = tmpElement.getChildNodes();
+//        boolean isBold = false;
+//        boolean isItalic = false;
+//        for (int i = 0; i < styleNodeList.getLength(); i++) {
+//            Node n = styleNodeList.item(i);
+//            if (n.getNodeType() == Node.ELEMENT_NODE && n.getNodeName().equals("font")) {
+//                Element fontElement = (Element)n;
+//                if (fontElement.hasAttribute("BOLD") && fontElement.getAttribute("BOLD").equals("true")) {
+//                    Log.d(MainApplication.TAG, "Found bold node");
+//                    isBold = true;
+//                }
+//                if (fontElement.hasAttribute("ITALIC") && fontElement.getAttribute("ITALIC").equals("true")) {
+//                    isItalic = true;
+//                }
+//            }
+//        }
+//
+//        // extract icons
+//        ArrayList<String> iconNames = getIcons(node);
+//
+//        // find out if it has sub nodes
+//        // TODO: this should just go into a getter
+//        boolean isExpandable = (getNumChildMindmapNodes(node) > 0);
+//
+//        // extract link
+//        String linkAttribute = tmpElement.getAttribute("LINK");
+//        Uri link;
+//        if (!linkAttribute.equals("")) {
+//            link = Uri.parse(linkAttribute);
+//        } else {
+//            link = null;
+//        }
+//
+//        // get cloned node's info
+//        String treeIdAttribute = tmpElement.getAttribute("TREE_ID");
+//
+//        // get arrow link destinations
+//        ArrayList<String> arrowLinkDestinationIds = new ArrayList<>();
+//        NodeList arrowlinkList = tmpElement.getChildNodes();
+//        for (int i = 0; i< arrowlinkList.getLength(); i++) {
+//            Node n = arrowlinkList.item(i);
+//            if (n.getNodeType() == Node.ELEMENT_NODE && n.getNodeName().equals("arrowlink")) {
+//                Element arrowlinkElement = (Element)n;
+//                String destinationId = arrowlinkElement.getAttribute("DESTINATION");
+//                arrowLinkDestinationIds.add(destinationId);
+//            }
+//        }
+//
+//
+//        MindmapNodeFromXmlBuilder.getChildNodes(mindmap, mindmapNode, node);
+//
+//        return MindmapNode.builder()
+//                .mindmap(mindmap)
+//                .parentNode(parentNode)
+//                .node(node)
+//                .id(id)
+//                .numericId(numericId)
+//                .richTextContent(richTextContent)
+//                .text(text)
+//                .isBold(isBold)
+//                .isItalic(isItalic)
+//                .iconNames(iconNames)
+//                .isExpandable(isExpandable)
+//                .link(link)
+//                .treeIdAttribute(treeIdAttribute)
+//                .arrowLinkDestinationIds(arrowLinkDestinationIds)
+//                .build();
+    }
+
+
+
+    /**
+     * Generates and returns the child nodes of this MindmapNode. getChildNodes() does lazy loading, i.e. it
+     * generates the child nodes on demand and stores them in childMindmapNodes.
+     *
+     * TODO: not so sure if this is really doing lazy loading. We probably call this already pretty early on. Should check.
+     *
+     * TODO: this should be called differently, to not confuse it with getChildNodes of Node
+     *
+     * @return ArrayList of this MindmapNode's child nodes
+     */
+    public static List<MindmapNode> getChildNodes(Mindmap mindmap, MindmapNode mindmapNode, Node node) {
+
+        synchronized (mindmapNode) {
+
+            // if we haven't loaded the childMindmapNodes before
+            if (mindmapNode.getChildMindmapNodes() == null) {
+
+                // fetch all child DOM Nodes, convert them to MindmapNodes
+                List<MindmapNode> newChildMindmapNodes = new ArrayList<>();
+                NodeList childNodes = node.getChildNodes();
+                for (int i = 0; i < childNodes.getLength(); i++) {
+                    Node tmpNode = childNodes.item(i);
+
+                    if (isMindmapNode(tmpNode)) {
+                        MindmapNode newChildMindmapNode = parse(tmpNode, mindmapNode, mindmap);
+                        newChildMindmapNodes.add(newChildMindmapNode);
+                    }
+                }
+
+                mindmapNode.setChildMindmapNodes(Collections.unmodifiableList(newChildMindmapNodes));
+
+            }
+
+            // we already did that before, so return the previous result
+            else {
+                Log.d(MainApplication.TAG, "Returning cached childMindmapNodes");
+            }
+
+            return mindmapNode.getChildMindmapNodes();
+        }
+    }
+
+
+    /**
+     * Checks whether a given node can be converted to a Mindmap node, i.e. whether it has type ELEMENT_NODE and tag
+     * "node"
+     *
+     * @param node
+     * @return
+     */
+    private static boolean isMindmapNode(Node node) {
+
+        if (node.getNodeType() == Node.ELEMENT_NODE) {
+            Element element = (Element)node;
+
+            return element.getTagName().equals("node");
+        }
+        return false;
+    }
+
+
+
+    /**
+     * Extracts the list of icons from a node and returns the names of the icons as ArrayList.
+     *
+     * @return list of names of the icons
+     */
+    private static ArrayList<String> getIcons(Node node) {
+
+        ArrayList<String> iconsNames = new ArrayList<>();
+
+        NodeList childNodes = node.getChildNodes();
+        for (int i = 0; i < childNodes.getLength(); i++) {
+
+            Node n = childNodes.item(i);
+            if (n.getNodeType() == Node.ELEMENT_NODE) {
+                Element e = (Element)n;
+
+                if (e.getTagName().equals("icon") && e.hasAttribute("BUILTIN")) {
+                    iconsNames.add(e.getAttribute("BUILTIN"));
+                }
+            }
+        }
+
+        return iconsNames;
+    }
+
+
+
+    /**
+     * Returns the number of child Mindmap nodes
+     *
+     * @return
+     */
+    public static int getNumChildMindmapNodes(Node node) {
+
+        int numMindmapNodes = 0;
+
+        NodeList childNodes = node.getChildNodes();
+        for (int i = 0; i < childNodes.getLength(); i++) {
+
+            Node n = childNodes.item(i);
+            if (isMindmapNode(n)) {
+                numMindmapNodes++;
+            }
+        }
+
+        return numMindmapNodes;
+    }
+}
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java
index 36dddd6..bfd9f3c 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java
@@ -1,31 +1,20 @@
 package ch.benediktkoeppel.code.droidplane.model;
 
 import android.net.Uri;
-import android.text.Html;
-import android.util.Log;
 
-import org.w3c.dom.Element;
 import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
 
-import java.io.ByteArrayOutputStream;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import ch.benediktkoeppel.code.droidplane.MainApplication;
+import lombok.Builder;
 
 
 /**
  * A MindMapNode is a special type of DOM Node. A DOM Node can be converted to a MindMapNode if it has type ELEMENT,
  * and tag "node".
  */
+@Builder
 public class MindmapNode {
 
     /**
@@ -87,6 +76,7 @@ public class MindmapNode {
     /**
      * The XML DOM node from which this MindMapNode is derived
      */
+    // TODO: MindmapNode should not need this node
     private final Node node;
 
     /**
@@ -113,12 +103,12 @@ public class MindmapNode {
     /**
      * List of outgoing arrow MindmapNodes
      */
-    private List<MindmapNode> arrowLinkDestinationNodes;
+    private List<MindmapNode> arrowLinkDestinationNodes = new ArrayList<>();
 
     /**
      * List of incoming arrow MindmapNodes
      */
-    private List<MindmapNode> arrowLinkIncomingNodes;
+    private List<MindmapNode> arrowLinkIncomingNodes = new ArrayList<>();
 
     /**
      * Creates a new MindMapNode from Node. The node needs to be of type ELEMENT and have tag "node". Throws a
@@ -126,124 +116,124 @@ public class MindmapNode {
      *
      * @param node
      */
-    public MindmapNode(Node node, MindmapNode parentNode, Mindmap mindmap) {
-
-        this.mindmap = mindmap;
-
-        // store the parentNode
-        this.parentNode = parentNode;
-
-        // convert the XML Node to a XML Element
-        Element tmpElement;
-        if (isMindmapNode(node)) {
-            tmpElement = (Element)node;
-        } else {
-            throw new ClassCastException("Can not convert Node to MindmapNode");
-        }
-
-        // store the Node
-        this.node = node;
-
-        // extract the ID of the node
-        id = tmpElement.getAttribute("ID");
-
-        try {
-            numericId = Integer.parseInt(id.replaceAll("\\D+", ""));
-        } catch (NumberFormatException e) {
-            numericId = id.hashCode();
-        }
-
-
-        // extract the string (TEXT attribute) of the nodes
-        String text = tmpElement.getAttribute("TEXT");
-
-        // extract the richcontent (HTML) of the node. This works both for nodes with a rich text content
-        // (TYPE="NODE"), for "Notes" (TYPE="NOTE"), for "Details" (TYPE="DETAILS").
-        String richTextContent = null;
-        // find 'richcontent TYPE="NODE"' subnode, which will contain the rich text content
-        NodeList richtextNodeList = tmpElement.getChildNodes();
-        for (int i = 0; i < richtextNodeList.getLength(); i++) {
-            Node n = richtextNodeList.item(i);
-            if (n.getNodeType() == Node.ELEMENT_NODE && n.getNodeName().equals("richcontent")) {
-                Element richcontentElement = (Element)n;
-                String typeAttribute = richcontentElement.getAttribute("TYPE");
-                if (typeAttribute.equals("NODE") || typeAttribute.equals("NOTE") || typeAttribute.equals("DETAILS")) {
-
-                    // extract the whole rich text (XML), to show in a WebView activity
-                    try {
-                        Transformer transformer = TransformerFactory.newInstance().newTransformer();
-                        ByteArrayOutputStream boas = new ByteArrayOutputStream();
-                        transformer.transform(new DOMSource(richtextNodeList.item(0)), new StreamResult(boas));
-                        richTextContent = boas.toString();
-                    } catch (TransformerException e) {
-                        e.printStackTrace();
-                    }
-
-                    // if the node has no text itself, then convert the rich text content to a text
-                    if (text == null || text.equals("")) {
-                        // convert the content (text only) into a string, to show in the normal list view
-                        text = Html.fromHtml(richcontentElement.getTextContent()).toString();
-                    }
-                }
-            }
-        }
-        this.richTextContent = richTextContent;
-        this.text = text;
-
-
-        // extract styles
-        NodeList styleNodeList = tmpElement.getChildNodes();
-        boolean isBold = false;
-        boolean isItalic = false;
-        for (int i = 0; i < styleNodeList.getLength(); i++) {
-            Node n = styleNodeList.item(i);
-            if (n.getNodeType() == Node.ELEMENT_NODE && n.getNodeName().equals("font")) {
-                Element fontElement = (Element)n;
-                if (fontElement.hasAttribute("BOLD") && fontElement.getAttribute("BOLD").equals("true")) {
-                    Log.d(MainApplication.TAG, "Found bold node");
-                    isBold = true;
-                }
-                if (fontElement.hasAttribute("ITALIC") && fontElement.getAttribute("ITALIC").equals("true")) {
-                    isItalic = true;
-                }
-            }
-        }
-        this.isBold = isBold;
-        this.isItalic = isItalic;
-
-        // extract icons
-        iconNames = getIcons();
-
-        // find out if it has sub nodes
-        // TODO: this should just go into a getter
-        isExpandable = (getNumChildMindmapNodes() > 0);
-
-        // extract link
-        String linkAttribute = tmpElement.getAttribute("LINK");
-        if (!linkAttribute.equals("")) {
-            link = Uri.parse(linkAttribute);
-        } else {
-            link = null;
-        }
-
-        // get cloned node's info
-        treeIdAttribute = tmpElement.getAttribute("TREE_ID");
-
-        // get arrow link destinations
-        arrowLinkDestinationIds = new ArrayList<>();
-        arrowLinkDestinationNodes = new ArrayList<>();
-        arrowLinkIncomingNodes = new ArrayList<>();
-        NodeList arrowlinkList = tmpElement.getChildNodes();
-        for (int i = 0; i< arrowlinkList.getLength(); i++) {
-            Node n = arrowlinkList.item(i);
-            if (n.getNodeType() == Node.ELEMENT_NODE && n.getNodeName().equals("arrowlink")) {
-                Element arrowlinkElement = (Element)n;
-                String destinationId = arrowlinkElement.getAttribute("DESTINATION");
-                arrowLinkDestinationIds.add(destinationId);
-            }
-        }
-
-    }
+//    public MindmapNode(Node node, MindmapNode parentNode, Mindmap mindmap) {
+//
+//        this.mindmap = mindmap;
+//
+//        // store the parentNode
+//        this.parentNode = parentNode;
+//
+//        // convert the XML Node to a XML Element
+//        Element tmpElement;
+//        if (isMindmapNode(node)) {
+//            tmpElement = (Element)node;
+//        } else {
+//            throw new ClassCastException("Can not convert Node to MindmapNode");
+//        }
+//
+//        // store the Node
+//        this.node = node;
+//
+//        // extract the ID of the node
+//        id = tmpElement.getAttribute("ID");
+//
+//        try {
+//            numericId = Integer.parseInt(id.replaceAll("\\D+", ""));
+//        } catch (NumberFormatException e) {
+//            numericId = id.hashCode();
+//        }
+//
+//
+//        // extract the string (TEXT attribute) of the nodes
+//        String text = tmpElement.getAttribute("TEXT");
+//
+//        // extract the richcontent (HTML) of the node. This works both for nodes with a rich text content
+//        // (TYPE="NODE"), for "Notes" (TYPE="NOTE"), for "Details" (TYPE="DETAILS").
+//        String richTextContent = null;
+//        // find 'richcontent TYPE="NODE"' subnode, which will contain the rich text content
+//        NodeList richtextNodeList = tmpElement.getChildNodes();
+//        for (int i = 0; i < richtextNodeList.getLength(); i++) {
+//            Node n = richtextNodeList.item(i);
+//            if (n.getNodeType() == Node.ELEMENT_NODE && n.getNodeName().equals("richcontent")) {
+//                Element richcontentElement = (Element)n;
+//                String typeAttribute = richcontentElement.getAttribute("TYPE");
+//                if (typeAttribute.equals("NODE") || typeAttribute.equals("NOTE") || typeAttribute.equals("DETAILS")) {
+//
+//                    // extract the whole rich text (XML), to show in a WebView activity
+//                    try {
+//                        Transformer transformer = TransformerFactory.newInstance().newTransformer();
+//                        ByteArrayOutputStream boas = new ByteArrayOutputStream();
+//                        transformer.transform(new DOMSource(richtextNodeList.item(0)), new StreamResult(boas));
+//                        richTextContent = boas.toString();
+//                    } catch (TransformerException e) {
+//                        e.printStackTrace();
+//                    }
+//
+//                    // if the node has no text itself, then convert the rich text content to a text
+//                    if (text == null || text.equals("")) {
+//                        // convert the content (text only) into a string, to show in the normal list view
+//                        text = Html.fromHtml(richcontentElement.getTextContent()).toString();
+//                    }
+//                }
+//            }
+//        }
+//        this.richTextContent = richTextContent;
+//        this.text = text;
+//
+//
+//        // extract styles
+//        NodeList styleNodeList = tmpElement.getChildNodes();
+//        boolean isBold = false;
+//        boolean isItalic = false;
+//        for (int i = 0; i < styleNodeList.getLength(); i++) {
+//            Node n = styleNodeList.item(i);
+//            if (n.getNodeType() == Node.ELEMENT_NODE && n.getNodeName().equals("font")) {
+//                Element fontElement = (Element)n;
+//                if (fontElement.hasAttribute("BOLD") && fontElement.getAttribute("BOLD").equals("true")) {
+//                    Log.d(MainApplication.TAG, "Found bold node");
+//                    isBold = true;
+//                }
+//                if (fontElement.hasAttribute("ITALIC") && fontElement.getAttribute("ITALIC").equals("true")) {
+//                    isItalic = true;
+//                }
+//            }
+//        }
+//        this.isBold = isBold;
+//        this.isItalic = isItalic;
+//
+//        // extract icons
+//        iconNames = getIcons();
+//
+//        // find out if it has sub nodes
+//        // TODO: this should just go into a getter
+//        isExpandable = (getNumChildMindmapNodes() > 0);
+//
+//        // extract link
+//        String linkAttribute = tmpElement.getAttribute("LINK");
+//        if (!linkAttribute.equals("")) {
+//            link = Uri.parse(linkAttribute);
+//        } else {
+//            link = null;
+//        }
+//
+//        // get cloned node's info
+//        treeIdAttribute = tmpElement.getAttribute("TREE_ID");
+//
+//        // get arrow link destinations
+//        arrowLinkDestinationIds = new ArrayList<>();
+//        arrowLinkDestinationNodes = new ArrayList<>();
+//        arrowLinkIncomingNodes = new ArrayList<>();
+//        NodeList arrowlinkList = tmpElement.getChildNodes();
+//        for (int i = 0; i< arrowlinkList.getLength(); i++) {
+//            Node n = arrowlinkList.item(i);
+//            if (n.getNodeType() == Node.ELEMENT_NODE && n.getNodeName().equals("arrowlink")) {
+//                Element arrowlinkElement = (Element)n;
+//                String destinationId = arrowlinkElement.getAttribute("DESTINATION");
+//                arrowLinkDestinationIds.add(destinationId);
+//            }
+//        }
+//
+//    }
 
 
     /**
@@ -264,109 +254,7 @@ public boolean getIsSelected() {
         return this.selected;
     }
 
-    /**
-     * Checks whether a given node can be converted to a Mindmap node, i.e. whether it has type ELEMENT_NODE and tag
-     * "node"
-     *
-     * @param node
-     * @return
-     */
-    private static boolean isMindmapNode(Node node) {
-
-        if (node.getNodeType() == Node.ELEMENT_NODE) {
-            Element element = (Element)node;
-
-            return element.getTagName().equals("node");
-        }
-        return false;
-    }
-
-
-    /**
-     * Extracts the list of icons from a node and returns the names of the icons as ArrayList.
-     *
-     * @return list of names of the icons
-     */
-    private ArrayList<String> getIcons() {
-
-        ArrayList<String> iconsNames = new ArrayList<>();
-
-        NodeList childNodes = node.getChildNodes();
-        for (int i = 0; i < childNodes.getLength(); i++) {
-
-            Node n = childNodes.item(i);
-            if (n.getNodeType() == Node.ELEMENT_NODE) {
-                Element e = (Element)n;
-
-                if (e.getTagName().equals("icon") && e.hasAttribute("BUILTIN")) {
-                    iconsNames.add(e.getAttribute("BUILTIN"));
-                }
-            }
-        }
-
-        return iconsNames;
-    }
-
-    /**
-     * Returns the number of child Mindmap nodes
-     *
-     * @return
-     */
-    public int getNumChildMindmapNodes() {
-
-        int numMindmapNodes = 0;
-
-        NodeList childNodes = node.getChildNodes();
-        for (int i = 0; i < childNodes.getLength(); i++) {
-
-            Node n = childNodes.item(i);
-            if (isMindmapNode(n)) {
-                numMindmapNodes++;
-            }
-        }
-
-        return numMindmapNodes;
-    }
-
-
-    /**
-     * Generates and returns the child nodes of this MindmapNode. getChildNodes() does lazy loading, i.e. it
-     * generates the child nodes on demand and stores them in childMindmapNodes.
-     *
-     * TODO: not so sure if this is really doing lazy loading. We probably call this already pretty early on. Should check.
-     *
-     * TODO: this should be called differently, to not confuse it with getChildNodes of Node
-     *
-     * @return ArrayList of this MindmapNode's child nodes
-     */
-    public synchronized List<MindmapNode> getChildNodes() {
-
-        // if we haven't loaded the childMindmapNodes before
-        if (this.childMindmapNodes == null) {
-
-            // fetch all child DOM Nodes, convert them to MindmapNodes
-            List<MindmapNode> newChildMindmapNodes = new ArrayList<>();
-            NodeList childNodes = node.getChildNodes();
-            for (int i = 0; i < childNodes.getLength(); i++) {
-                Node tmpNode = childNodes.item(i);
 
-                if (isMindmapNode(tmpNode)) {
-                    MindmapNode mindmapNode = new MindmapNode(tmpNode, this, mindmap);
-                    newChildMindmapNodes.add(mindmapNode);
-                }
-            }
-
-            this.childMindmapNodes = Collections.unmodifiableList(newChildMindmapNodes);
-
-        }
-
-        // we already did that before, so return the previous result
-        else {
-            Log.d(MainApplication.TAG, "Returning cached childMindmapNodes");
-        }
-
-        return this.childMindmapNodes;
-    }
 
     public List<String> getIconNames() {
 
@@ -453,4 +341,12 @@ public Integer getNumericId() {
 
         return numericId;
     }
+
+    public List<MindmapNode> getChildMindmapNodes() {
+        return this.childMindmapNodes;
+    }
+
+    public void setChildMindmapNodes(List<MindmapNode> childMindmapNodes) {
+        this.childMindmapNodes = childMindmapNodes;
+    }
 }
diff --git a/build.gradle b/build.gradle
index 532ded6..9accdc2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,6 +7,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:7.3.1'
         classpath 'com.google.gms:google-services:4.3.10'
+        classpath "org.projectlombok:lombok:1.18.30"
     }
 }
 
@@ -16,3 +17,4 @@ allprojects {
         jcenter()
     }
 }
+

From 8f117ac035751bbeefec6cfcd69fdad1db789664 Mon Sep 17 00:00:00 2001
From: Benedikt Koeppel <be.public@gmail.com>
Date: Tue, 28 Nov 2023 11:52:03 +0100
Subject: [PATCH 16/34] Trying to add Stax parser (woodstox or aalto), neither
 work on Android

---
 .../app/droidplane.app.androidTest.iml        |  2 +
 .idea/modules/app/droidplane.app.main.iml     |  2 +
 .idea/modules/app/droidplane.app.unitTest.iml |  2 +
 app/build.gradle                              |  3 ++
 .../controller/AsyncMindmapLoaderTask.java    | 41 +++++++++++++++++++
 5 files changed, 50 insertions(+)

diff --git a/.idea/modules/app/droidplane.app.androidTest.iml b/.idea/modules/app/droidplane.app.androidTest.iml
index d902a49..1aec074 100644
--- a/.idea/modules/app/droidplane.app.androidTest.iml
+++ b/.idea/modules/app/droidplane.app.androidTest.iml
@@ -69,6 +69,8 @@
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.0.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection:1.0.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.constraintlayout:constraintlayout-solver:1.1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.fasterxml:aalto-xml:1.3.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.codehaus.woodstox:stax2-api:4.2" level="project" />
   </component>
   <component name="TestModuleProperties" production-module="droidplane.app.main" />
 </module>
\ No newline at end of file
diff --git a/.idea/modules/app/droidplane.app.main.iml b/.idea/modules/app/droidplane.app.main.iml
index 15e1831..5a494a3 100644
--- a/.idea/modules/app/droidplane.app.main.iml
+++ b/.idea/modules/app/droidplane.app.main.iml
@@ -80,5 +80,7 @@
     <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.0.0" level="project" />
     <orderEntry type="library" name="Gradle: androidx.collection:collection:1.0.0" level="project" />
     <orderEntry type="library" name="Gradle: androidx.constraintlayout:constraintlayout-solver:1.1.3" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml:aalto-xml:1.3.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.codehaus.woodstox:stax2-api:4.2" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/modules/app/droidplane.app.unitTest.iml b/.idea/modules/app/droidplane.app.unitTest.iml
index 0433c28..c2830b1 100644
--- a/.idea/modules/app/droidplane.app.unitTest.iml
+++ b/.idea/modules/app/droidplane.app.unitTest.iml
@@ -64,6 +64,8 @@
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.0.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection:1.0.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.constraintlayout:constraintlayout-solver:1.1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.fasterxml:aalto-xml:1.3.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.codehaus.woodstox:stax2-api:4.2" level="project" />
   </component>
   <component name="TestModuleProperties" production-module="droidplane.app.main" />
 </module>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 72a84c3..dec4db2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -22,12 +22,15 @@ android {
     }
 }
 
+
 dependencies {
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'com.google.android.gms:play-services-analytics:18.0.2'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
     implementation 'androidx.lifecycle:lifecycle-viewmodel:2.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'com.fasterxml:aalto-xml:1.3.2'
     compileOnly "org.projectlombok:lombok:1.18.30"
     annotationProcessor 'org.projectlombok:lombok:1.18.30'
 }
+
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
index 89c43eb..e1da754 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
@@ -1,5 +1,7 @@
 package ch.benediktkoeppel.code.droidplane.controller;
 
+import static org.xmlpull.v1.XmlPullParser.END_DOCUMENT;
+
 import android.content.ContentResolver;
 import android.content.Intent;
 import android.net.Uri;
@@ -7,6 +9,11 @@
 import android.util.Log;
 import android.util.Pair;
 
+import com.fasterxml.aalto.AsyncByteArrayFeeder;
+import com.fasterxml.aalto.AsyncXMLInputFactory;
+import com.fasterxml.aalto.AsyncXMLStreamReader;
+import com.fasterxml.aalto.stax.InputFactoryImpl;
+import com.fasterxml.aalto.stax.StreamReaderImpl;
 import com.google.android.gms.analytics.HitBuilders;
 import com.google.android.gms.analytics.Tracker;
 
@@ -124,6 +131,40 @@ public void loadDocument(InputStream inputStream) {
         // start measuring the document load time
         long loadDocumentStartTime = System.currentTimeMillis();
 
+
+
+        int BLOCK_SIZE = 24;
+        final byte[] buf = new byte[BLOCK_SIZE];
+
+        byte[] xml = "<html>Very <b>simple</b> input document!</html>".getBytes();
+
+        int inputPtr = 0; // as we feed byte at a time
+        int type = 0;
+
+        AsyncXMLInputFactory inputF = new InputFactoryImpl(); // sub-class of XMLStreamReader2
+        AsyncXMLStreamReader<AsyncByteArrayFeeder> parser = inputF.createAsyncFor(xml);
+
+        StreamReaderImpl asyncReader = (StreamReaderImpl) parser;
+        AsyncByteArrayFeeder feeder = parser.getInputFeeder();
+
+        do {
+            // May need to feed multiple "segments"
+            while ((type = asyncReader.next()) == AsyncXMLStreamReader.EVENT_INCOMPLETE) {
+                feeder.feedInput(buf, inputPtr++, 1);
+                if (inputPtr >= xml.length) { // to indicate end-of-content (important for error handling)
+                    feeder.endOfInput();
+                }
+            }
+            // and once we have full event, we just dump out event type (for now)
+            System.out.println("Got event of type: "+type);
+            // could also just copy event as is, using Stax, or do any other normal non-blocking handling:
+            // xmlStreamWriter.copyEventFromReader(asyncReader, false);
+        } while (type != END_DOCUMENT);
+
+        asyncReader.close();
+
+
+
         // XML document builder
         DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
         DocumentBuilder docBuilder;

From 8e412bba9d44236f841dc184785e1c99b81a9c84 Mon Sep 17 00:00:00 2001
From: Benedikt Koeppel <be.public@gmail.com>
Date: Tue, 28 Nov 2023 11:52:14 +0100
Subject: [PATCH 17/34] Revert "Trying to add Stax parser (woodstox or aalto),
 neither work on Android"

This reverts commit 8f117ac035751bbeefec6cfcd69fdad1db789664.
---
 .../app/droidplane.app.androidTest.iml        |  2 -
 .idea/modules/app/droidplane.app.main.iml     |  2 -
 .idea/modules/app/droidplane.app.unitTest.iml |  2 -
 app/build.gradle                              |  3 --
 .../controller/AsyncMindmapLoaderTask.java    | 41 -------------------
 5 files changed, 50 deletions(-)

diff --git a/.idea/modules/app/droidplane.app.androidTest.iml b/.idea/modules/app/droidplane.app.androidTest.iml
index 1aec074..d902a49 100644
--- a/.idea/modules/app/droidplane.app.androidTest.iml
+++ b/.idea/modules/app/droidplane.app.androidTest.iml
@@ -69,8 +69,6 @@
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.0.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection:1.0.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.constraintlayout:constraintlayout-solver:1.1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.fasterxml:aalto-xml:1.3.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.codehaus.woodstox:stax2-api:4.2" level="project" />
   </component>
   <component name="TestModuleProperties" production-module="droidplane.app.main" />
 </module>
\ No newline at end of file
diff --git a/.idea/modules/app/droidplane.app.main.iml b/.idea/modules/app/droidplane.app.main.iml
index 5a494a3..15e1831 100644
--- a/.idea/modules/app/droidplane.app.main.iml
+++ b/.idea/modules/app/droidplane.app.main.iml
@@ -80,7 +80,5 @@
     <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.0.0" level="project" />
     <orderEntry type="library" name="Gradle: androidx.collection:collection:1.0.0" level="project" />
     <orderEntry type="library" name="Gradle: androidx.constraintlayout:constraintlayout-solver:1.1.3" level="project" />
-    <orderEntry type="library" name="Gradle: com.fasterxml:aalto-xml:1.3.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.codehaus.woodstox:stax2-api:4.2" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/modules/app/droidplane.app.unitTest.iml b/.idea/modules/app/droidplane.app.unitTest.iml
index c2830b1..0433c28 100644
--- a/.idea/modules/app/droidplane.app.unitTest.iml
+++ b/.idea/modules/app/droidplane.app.unitTest.iml
@@ -64,8 +64,6 @@
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.0.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection:1.0.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.constraintlayout:constraintlayout-solver:1.1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.fasterxml:aalto-xml:1.3.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.codehaus.woodstox:stax2-api:4.2" level="project" />
   </component>
   <component name="TestModuleProperties" production-module="droidplane.app.main" />
 </module>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index dec4db2..72a84c3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -22,15 +22,12 @@ android {
     }
 }
 
-
 dependencies {
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'com.google.android.gms:play-services-analytics:18.0.2'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
     implementation 'androidx.lifecycle:lifecycle-viewmodel:2.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'com.fasterxml:aalto-xml:1.3.2'
     compileOnly "org.projectlombok:lombok:1.18.30"
     annotationProcessor 'org.projectlombok:lombok:1.18.30'
 }
-
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
index e1da754..89c43eb 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
@@ -1,7 +1,5 @@
 package ch.benediktkoeppel.code.droidplane.controller;
 
-import static org.xmlpull.v1.XmlPullParser.END_DOCUMENT;
-
 import android.content.ContentResolver;
 import android.content.Intent;
 import android.net.Uri;
@@ -9,11 +7,6 @@
 import android.util.Log;
 import android.util.Pair;
 
-import com.fasterxml.aalto.AsyncByteArrayFeeder;
-import com.fasterxml.aalto.AsyncXMLInputFactory;
-import com.fasterxml.aalto.AsyncXMLStreamReader;
-import com.fasterxml.aalto.stax.InputFactoryImpl;
-import com.fasterxml.aalto.stax.StreamReaderImpl;
 import com.google.android.gms.analytics.HitBuilders;
 import com.google.android.gms.analytics.Tracker;
 
@@ -131,40 +124,6 @@ public void loadDocument(InputStream inputStream) {
         // start measuring the document load time
         long loadDocumentStartTime = System.currentTimeMillis();
 
-
-
-        int BLOCK_SIZE = 24;
-        final byte[] buf = new byte[BLOCK_SIZE];
-
-        byte[] xml = "<html>Very <b>simple</b> input document!</html>".getBytes();
-
-        int inputPtr = 0; // as we feed byte at a time
-        int type = 0;
-
-        AsyncXMLInputFactory inputF = new InputFactoryImpl(); // sub-class of XMLStreamReader2
-        AsyncXMLStreamReader<AsyncByteArrayFeeder> parser = inputF.createAsyncFor(xml);
-
-        StreamReaderImpl asyncReader = (StreamReaderImpl) parser;
-        AsyncByteArrayFeeder feeder = parser.getInputFeeder();
-
-        do {
-            // May need to feed multiple "segments"
-            while ((type = asyncReader.next()) == AsyncXMLStreamReader.EVENT_INCOMPLETE) {
-                feeder.feedInput(buf, inputPtr++, 1);
-                if (inputPtr >= xml.length) { // to indicate end-of-content (important for error handling)
-                    feeder.endOfInput();
-                }
-            }
-            // and once we have full event, we just dump out event type (for now)
-            System.out.println("Got event of type: "+type);
-            // could also just copy event as is, using Stax, or do any other normal non-blocking handling:
-            // xmlStreamWriter.copyEventFromReader(asyncReader, false);
-        } while (type != END_DOCUMENT);
-
-        asyncReader.close();
-
-
-
         // XML document builder
         DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
         DocumentBuilder docBuilder;

From 39b4cd761e9a8bf8644837e9b2c911a6800c331d Mon Sep 17 00:00:00 2001
From: Benedikt Koeppel <be.public@gmail.com>
Date: Tue, 28 Nov 2023 11:53:57 +0100
Subject: [PATCH 18/34] Revert "Revert "Trying to add Stax parser (woodstox or
 aalto), neither work on Android""

This reverts commit 8e412bba9d44236f841dc184785e1c99b81a9c84.
---
 .../app/droidplane.app.androidTest.iml        |  2 +
 .idea/modules/app/droidplane.app.main.iml     |  2 +
 .idea/modules/app/droidplane.app.unitTest.iml |  2 +
 app/build.gradle                              |  3 ++
 .../controller/AsyncMindmapLoaderTask.java    | 41 +++++++++++++++++++
 5 files changed, 50 insertions(+)

diff --git a/.idea/modules/app/droidplane.app.androidTest.iml b/.idea/modules/app/droidplane.app.androidTest.iml
index d902a49..1aec074 100644
--- a/.idea/modules/app/droidplane.app.androidTest.iml
+++ b/.idea/modules/app/droidplane.app.androidTest.iml
@@ -69,6 +69,8 @@
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.0.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection:1.0.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.constraintlayout:constraintlayout-solver:1.1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.fasterxml:aalto-xml:1.3.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.codehaus.woodstox:stax2-api:4.2" level="project" />
   </component>
   <component name="TestModuleProperties" production-module="droidplane.app.main" />
 </module>
\ No newline at end of file
diff --git a/.idea/modules/app/droidplane.app.main.iml b/.idea/modules/app/droidplane.app.main.iml
index 15e1831..5a494a3 100644
--- a/.idea/modules/app/droidplane.app.main.iml
+++ b/.idea/modules/app/droidplane.app.main.iml
@@ -80,5 +80,7 @@
     <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.0.0" level="project" />
     <orderEntry type="library" name="Gradle: androidx.collection:collection:1.0.0" level="project" />
     <orderEntry type="library" name="Gradle: androidx.constraintlayout:constraintlayout-solver:1.1.3" level="project" />
+    <orderEntry type="library" name="Gradle: com.fasterxml:aalto-xml:1.3.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.codehaus.woodstox:stax2-api:4.2" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/modules/app/droidplane.app.unitTest.iml b/.idea/modules/app/droidplane.app.unitTest.iml
index 0433c28..c2830b1 100644
--- a/.idea/modules/app/droidplane.app.unitTest.iml
+++ b/.idea/modules/app/droidplane.app.unitTest.iml
@@ -64,6 +64,8 @@
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.0.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection:1.0.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.constraintlayout:constraintlayout-solver:1.1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.fasterxml:aalto-xml:1.3.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.codehaus.woodstox:stax2-api:4.2" level="project" />
   </component>
   <component name="TestModuleProperties" production-module="droidplane.app.main" />
 </module>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 72a84c3..dec4db2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -22,12 +22,15 @@ android {
     }
 }
 
+
 dependencies {
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'com.google.android.gms:play-services-analytics:18.0.2'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
     implementation 'androidx.lifecycle:lifecycle-viewmodel:2.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'com.fasterxml:aalto-xml:1.3.2'
     compileOnly "org.projectlombok:lombok:1.18.30"
     annotationProcessor 'org.projectlombok:lombok:1.18.30'
 }
+
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
index 89c43eb..e1da754 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
@@ -1,5 +1,7 @@
 package ch.benediktkoeppel.code.droidplane.controller;
 
+import static org.xmlpull.v1.XmlPullParser.END_DOCUMENT;
+
 import android.content.ContentResolver;
 import android.content.Intent;
 import android.net.Uri;
@@ -7,6 +9,11 @@
 import android.util.Log;
 import android.util.Pair;
 
+import com.fasterxml.aalto.AsyncByteArrayFeeder;
+import com.fasterxml.aalto.AsyncXMLInputFactory;
+import com.fasterxml.aalto.AsyncXMLStreamReader;
+import com.fasterxml.aalto.stax.InputFactoryImpl;
+import com.fasterxml.aalto.stax.StreamReaderImpl;
 import com.google.android.gms.analytics.HitBuilders;
 import com.google.android.gms.analytics.Tracker;
 
@@ -124,6 +131,40 @@ public void loadDocument(InputStream inputStream) {
         // start measuring the document load time
         long loadDocumentStartTime = System.currentTimeMillis();
 
+
+
+        int BLOCK_SIZE = 24;
+        final byte[] buf = new byte[BLOCK_SIZE];
+
+        byte[] xml = "<html>Very <b>simple</b> input document!</html>".getBytes();
+
+        int inputPtr = 0; // as we feed byte at a time
+        int type = 0;
+
+        AsyncXMLInputFactory inputF = new InputFactoryImpl(); // sub-class of XMLStreamReader2
+        AsyncXMLStreamReader<AsyncByteArrayFeeder> parser = inputF.createAsyncFor(xml);
+
+        StreamReaderImpl asyncReader = (StreamReaderImpl) parser;
+        AsyncByteArrayFeeder feeder = parser.getInputFeeder();
+
+        do {
+            // May need to feed multiple "segments"
+            while ((type = asyncReader.next()) == AsyncXMLStreamReader.EVENT_INCOMPLETE) {
+                feeder.feedInput(buf, inputPtr++, 1);
+                if (inputPtr >= xml.length) { // to indicate end-of-content (important for error handling)
+                    feeder.endOfInput();
+                }
+            }
+            // and once we have full event, we just dump out event type (for now)
+            System.out.println("Got event of type: "+type);
+            // could also just copy event as is, using Stax, or do any other normal non-blocking handling:
+            // xmlStreamWriter.copyEventFromReader(asyncReader, false);
+        } while (type != END_DOCUMENT);
+
+        asyncReader.close();
+
+
+
         // XML document builder
         DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
         DocumentBuilder docBuilder;

From 7520202b31e619552d6f5436e89d42c4c1d4f782 Mon Sep 17 00:00:00 2001
From: Benedikt Koeppel <be.public@gmail.com>
Date: Tue, 28 Nov 2023 12:01:06 +0100
Subject: [PATCH 19/34] Another attempt, but this doesn't work either. Links in
 the description

Some links for future reference
https://github.com/CUTR-at-USF/SiriRestClient/wiki/Parsing-JSON-and-XML-on-Android
https://stackoverflow.com/questions/31360025/using-jackson-dataformat-xml-on-android
https://github.com/FasterXML/jackson-dataformat-xml/issues/116
---
 .idea/modules/app/droidplane.app.main.iml                        | 1 +
 .../resources/META-INF/services/javax.xml.stream.XMLInputFactory | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 app/src/main/resources/META-INF/services/javax.xml.stream.XMLInputFactory

diff --git a/.idea/modules/app/droidplane.app.main.iml b/.idea/modules/app/droidplane.app.main.iml
index 5a494a3..4cb9e87 100644
--- a/.idea/modules/app/droidplane.app.main.iml
+++ b/.idea/modules/app/droidplane.app.main.iml
@@ -34,6 +34,7 @@
     <content url="file://$MODULE_DIR$/../../../app/src/main">
       <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/resources" type="java-resource" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 32 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/app/src/main/resources/META-INF/services/javax.xml.stream.XMLInputFactory b/app/src/main/resources/META-INF/services/javax.xml.stream.XMLInputFactory
new file mode 100644
index 0000000..8937b1d
--- /dev/null
+++ b/app/src/main/resources/META-INF/services/javax.xml.stream.XMLInputFactory
@@ -0,0 +1 @@
+com.fasterxml.aalto.stax.InputFactoryImpl

From d63d0c7d48c15ddcb3abfbd3fcc9ac2f2c59fc91 Mon Sep 17 00:00:00 2001
From: Benedikt Koeppel <be.public@gmail.com>
Date: Tue, 28 Nov 2023 12:01:09 +0100
Subject: [PATCH 20/34] Revert "Another attempt, but this doesn't work either.
 Links in the description"

This reverts commit 7520202b31e619552d6f5436e89d42c4c1d4f782.
---
 .idea/modules/app/droidplane.app.main.iml                        | 1 -
 .../resources/META-INF/services/javax.xml.stream.XMLInputFactory | 1 -
 2 files changed, 2 deletions(-)
 delete mode 100644 app/src/main/resources/META-INF/services/javax.xml.stream.XMLInputFactory

diff --git a/.idea/modules/app/droidplane.app.main.iml b/.idea/modules/app/droidplane.app.main.iml
index 4cb9e87..5a494a3 100644
--- a/.idea/modules/app/droidplane.app.main.iml
+++ b/.idea/modules/app/droidplane.app.main.iml
@@ -34,7 +34,6 @@
     <content url="file://$MODULE_DIR$/../../../app/src/main">
       <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/src/main/resources" type="java-resource" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 32 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/app/src/main/resources/META-INF/services/javax.xml.stream.XMLInputFactory b/app/src/main/resources/META-INF/services/javax.xml.stream.XMLInputFactory
deleted file mode 100644
index 8937b1d..0000000
--- a/app/src/main/resources/META-INF/services/javax.xml.stream.XMLInputFactory
+++ /dev/null
@@ -1 +0,0 @@
-com.fasterxml.aalto.stax.InputFactoryImpl

From 979899362a5142ce71a0060ed63fbd45fa085e5d Mon Sep 17 00:00:00 2001
From: Benedikt Koeppel <be.public@gmail.com>
Date: Tue, 28 Nov 2023 12:03:13 +0100
Subject: [PATCH 21/34] Revert "Revert "Revert "Trying to add Stax parser
 (woodstox or aalto), neither work on Android"""

This reverts commit 39b4cd761e9a8bf8644837e9b2c911a6800c331d.
---
 .../app/droidplane.app.androidTest.iml        |  2 -
 .idea/modules/app/droidplane.app.main.iml     |  2 -
 .idea/modules/app/droidplane.app.unitTest.iml |  2 -
 app/build.gradle                              |  3 --
 .../controller/AsyncMindmapLoaderTask.java    | 41 -------------------
 5 files changed, 50 deletions(-)

diff --git a/.idea/modules/app/droidplane.app.androidTest.iml b/.idea/modules/app/droidplane.app.androidTest.iml
index 1aec074..d902a49 100644
--- a/.idea/modules/app/droidplane.app.androidTest.iml
+++ b/.idea/modules/app/droidplane.app.androidTest.iml
@@ -69,8 +69,6 @@
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.0.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection:1.0.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.constraintlayout:constraintlayout-solver:1.1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.fasterxml:aalto-xml:1.3.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.codehaus.woodstox:stax2-api:4.2" level="project" />
   </component>
   <component name="TestModuleProperties" production-module="droidplane.app.main" />
 </module>
\ No newline at end of file
diff --git a/.idea/modules/app/droidplane.app.main.iml b/.idea/modules/app/droidplane.app.main.iml
index 5a494a3..15e1831 100644
--- a/.idea/modules/app/droidplane.app.main.iml
+++ b/.idea/modules/app/droidplane.app.main.iml
@@ -80,7 +80,5 @@
     <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.0.0" level="project" />
     <orderEntry type="library" name="Gradle: androidx.collection:collection:1.0.0" level="project" />
     <orderEntry type="library" name="Gradle: androidx.constraintlayout:constraintlayout-solver:1.1.3" level="project" />
-    <orderEntry type="library" name="Gradle: com.fasterxml:aalto-xml:1.3.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.codehaus.woodstox:stax2-api:4.2" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/modules/app/droidplane.app.unitTest.iml b/.idea/modules/app/droidplane.app.unitTest.iml
index c2830b1..0433c28 100644
--- a/.idea/modules/app/droidplane.app.unitTest.iml
+++ b/.idea/modules/app/droidplane.app.unitTest.iml
@@ -64,8 +64,6 @@
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.0.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection:1.0.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.constraintlayout:constraintlayout-solver:1.1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.fasterxml:aalto-xml:1.3.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.codehaus.woodstox:stax2-api:4.2" level="project" />
   </component>
   <component name="TestModuleProperties" production-module="droidplane.app.main" />
 </module>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index dec4db2..72a84c3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -22,15 +22,12 @@ android {
     }
 }
 
-
 dependencies {
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'com.google.android.gms:play-services-analytics:18.0.2'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
     implementation 'androidx.lifecycle:lifecycle-viewmodel:2.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'com.fasterxml:aalto-xml:1.3.2'
     compileOnly "org.projectlombok:lombok:1.18.30"
     annotationProcessor 'org.projectlombok:lombok:1.18.30'
 }
-
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
index e1da754..89c43eb 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
@@ -1,7 +1,5 @@
 package ch.benediktkoeppel.code.droidplane.controller;
 
-import static org.xmlpull.v1.XmlPullParser.END_DOCUMENT;
-
 import android.content.ContentResolver;
 import android.content.Intent;
 import android.net.Uri;
@@ -9,11 +7,6 @@
 import android.util.Log;
 import android.util.Pair;
 
-import com.fasterxml.aalto.AsyncByteArrayFeeder;
-import com.fasterxml.aalto.AsyncXMLInputFactory;
-import com.fasterxml.aalto.AsyncXMLStreamReader;
-import com.fasterxml.aalto.stax.InputFactoryImpl;
-import com.fasterxml.aalto.stax.StreamReaderImpl;
 import com.google.android.gms.analytics.HitBuilders;
 import com.google.android.gms.analytics.Tracker;
 
@@ -131,40 +124,6 @@ public void loadDocument(InputStream inputStream) {
         // start measuring the document load time
         long loadDocumentStartTime = System.currentTimeMillis();
 
-
-
-        int BLOCK_SIZE = 24;
-        final byte[] buf = new byte[BLOCK_SIZE];
-
-        byte[] xml = "<html>Very <b>simple</b> input document!</html>".getBytes();
-
-        int inputPtr = 0; // as we feed byte at a time
-        int type = 0;
-
-        AsyncXMLInputFactory inputF = new InputFactoryImpl(); // sub-class of XMLStreamReader2
-        AsyncXMLStreamReader<AsyncByteArrayFeeder> parser = inputF.createAsyncFor(xml);
-
-        StreamReaderImpl asyncReader = (StreamReaderImpl) parser;
-        AsyncByteArrayFeeder feeder = parser.getInputFeeder();
-
-        do {
-            // May need to feed multiple "segments"
-            while ((type = asyncReader.next()) == AsyncXMLStreamReader.EVENT_INCOMPLETE) {
-                feeder.feedInput(buf, inputPtr++, 1);
-                if (inputPtr >= xml.length) { // to indicate end-of-content (important for error handling)
-                    feeder.endOfInput();
-                }
-            }
-            // and once we have full event, we just dump out event type (for now)
-            System.out.println("Got event of type: "+type);
-            // could also just copy event as is, using Stax, or do any other normal non-blocking handling:
-            // xmlStreamWriter.copyEventFromReader(asyncReader, false);
-        } while (type != END_DOCUMENT);
-
-        asyncReader.close();
-
-
-
         // XML document builder
         DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
         DocumentBuilder docBuilder;

From abb883d588140691d980b529263071b788d92108 Mon Sep 17 00:00:00 2001
From: Benedikt Koeppel <be.public@gmail.com>
Date: Wed, 29 Nov 2023 07:17:54 +0100
Subject: [PATCH 22/34] Fix crash when rotating screen

---
 .../java/ch/benediktkoeppel/code/droidplane/MainActivity.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/MainActivity.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/MainActivity.java
index 5397acf..6976a5a 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/MainActivity.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/MainActivity.java
@@ -88,6 +88,7 @@ public void onCreate(Bundle savedInstanceState) {
         // if we already have a loaded mindmap, use this; otherwise load from the intent
         if (mindmap.isLoaded()) {
             horizontalMindmapView.setMindmap(mindmap);
+            horizontalMindmapView.setDeepestSelectedMindmapNode(mindmap.getRootNode());
             horizontalMindmapView.onRootNodeLoaded();
 
         } else {

From 8e3b1671df0e1fe34b2b00164182466eb7edeb25 Mon Sep 17 00:00:00 2001
From: Benedikt Koeppel <be.public@gmail.com>
Date: Wed, 29 Nov 2023 07:21:28 +0100
Subject: [PATCH 23/34] Basic implementation of XML Pull Loader

loads document as we go, expanding the mindmap
not loading icons, links, etc. yet
---
 .../controller/AsyncMindmapLoaderTask.java    | 163 +++++++++++++-----
 .../controller/MindmapNodeFromXmlBuilder.java |   1 +
 .../code/droidplane/model/MindmapNode.java    |  61 +++++--
 .../view/HorizontalMindmapView.java           |   9 +-
 .../code/droidplane/view/NodeColumn.java      |  15 +-
 5 files changed, 192 insertions(+), 57 deletions(-)

diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
index 89c43eb..6bf4eaf 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
@@ -10,12 +10,10 @@
 import com.google.android.gms.analytics.HitBuilders;
 import com.google.android.gms.analytics.Tracker;
 
-import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserFactory;
 
-import java.io.BufferedInputStream;
 import java.io.FileNotFoundException;
-import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -23,10 +21,6 @@
 import java.util.Map;
 import java.util.Stack;
 
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
 import ch.benediktkoeppel.code.droidplane.MainActivity;
 import ch.benediktkoeppel.code.droidplane.MainApplication;
 import ch.benediktkoeppel.code.droidplane.R;
@@ -124,48 +118,135 @@ public void loadDocument(InputStream inputStream) {
         // start measuring the document load time
         long loadDocumentStartTime = System.currentTimeMillis();
 
-        // XML document builder
-        DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
-        DocumentBuilder docBuilder;
+        MindmapNode rootNode = null;
+
+        Stack<MindmapNode> nodeStack = new Stack<>();
+        int numNodes = 0;
 
-        // load the Mindmap from the InputStream
-        Document document;
         try {
-            docBuilderFactory.setNamespaceAware(false);
-            docBuilderFactory.setValidating(false);
-            docBuilderFactory.setFeature("http://xml.org/sax/features/namespaces", false);
-            docBuilderFactory.setFeature("http://xml.org/sax/features/validation", false);
-
-            docBuilder = docBuilderFactory.newDocumentBuilder();
-            document = docBuilder.parse(new BufferedInputStream(inputStream));
-        } catch (ParserConfigurationException | SAXException | IOException e) {
-            e.printStackTrace();
-            return;
-        }
+            XmlPullParserFactory factory = XmlPullParserFactory.newInstance();
+            factory.setNamespaceAware(true);
+            XmlPullParser xpp = factory.newPullParser();
 
-        // get the root node
-        MindmapNode rootNode = MindmapNodeFromXmlBuilder.parse(
-                document.getDocumentElement().getElementsByTagName("node").item(0),
-                null,
-                mindmap
-        );
+            xpp.setInput(inputStream, "UTF-8");
+            int eventType = xpp.getEventType();
+            while (eventType != XmlPullParser.END_DOCUMENT) {
+                if (eventType == XmlPullParser.START_DOCUMENT) {
+                    //System.out.println("Start document");
+
+                } else if(eventType == XmlPullParser.START_TAG) {
+                    //System.out.println("Start tag "+xpp.getName());
+
+                    if (xpp.getName().equals("node")) {
+
+                        MindmapNode parentNode = null;
+                        if (!nodeStack.empty()) {
+                            parentNode = nodeStack.peek();
+                        }
+
+                        String id = xpp.getAttributeValue(null, "ID");
+                        int numericId;
+                        try {
+                            numericId = Integer.parseInt(id.replaceAll("\\D+", ""));
+                        } catch (NumberFormatException e) {
+                            numericId = id.hashCode();
+                        }
+
+                        String text = xpp.getAttributeValue(null, "TEXT");
+
+                        MindmapNode newMindmapNode = new MindmapNode(mindmap, parentNode, id, numericId, text);
+                        numNodes += 1;
+
+                        if (parentNode == null) {
+                            rootNode = newMindmapNode;
+
+                            mindmap.setRootNode(rootNode);
+
+                            // now set up the view
+                            MindmapNode finalRootNode = rootNode;
+                            mainActivity.runOnUiThread(new Runnable() {
+                                @Override
+                                public void run() {
 
-        mindmap.setRootNode(rootNode);
+                                    horizontalMindmapView.setMindmap(mindmap);
 
-        // now set up the view
-        mainActivity.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
+                                    // by default, the root node is the deepest node that is expanded
+                                    horizontalMindmapView.setDeepestSelectedMindmapNode(finalRootNode);
 
-                horizontalMindmapView.setMindmap(mindmap);
+                                    horizontalMindmapView.onRootNodeLoaded();
 
-                // by default, the root node is the deepest node that is expanded
-                horizontalMindmapView.setDeepestSelectedMindmapNode(rootNode);
+                                }
+                            });
 
-                horizontalMindmapView.onRootNodeLoaded();
+                        } else {
+                            parentNode.addChildMindmapNode(newMindmapNode);
+                            if (parentNode.hasSubscribers()) {
+                                MindmapNode finalParentNode = parentNode;
+                                mainActivity.runOnUiThread(() -> {
+                                    finalParentNode.notifySubscribers(newMindmapNode);
+                                });
+                            }
+                        }
 
+                        nodeStack.push(newMindmapNode);
+
+                    }
+
+                } else if(eventType == XmlPullParser.END_TAG) {
+                    //System.out.println("End tag "+xpp.getName());
+                    if (xpp.getName().equals("node")) {
+                        MindmapNode completedMindmapNode = nodeStack.pop();
+                        completedMindmapNode.setLoaded(true);
+                    }
+
+                } else if(eventType == XmlPullParser.TEXT) {
+                    //System.out.println("Text "+xpp.getText());
+
+                } else {
+                    System.out.println("Other");
+                }
+                eventType = xpp.next();
             }
-        });
+            //System.out.println("End document");
+
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+        // stack should now be empty
+        if (!nodeStack.empty()) {
+            throw new RuntimeException("Stack should be empty");
+            // TODO: we could try to be lenient here to allow opening partial documents (which sometimes happens when dropbox doesn't fully sync)
+        }
+
+
+
+//        // XML document builder
+//        DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
+//        DocumentBuilder docBuilder;
+//
+//        // load the Mindmap from the InputStream
+//        Document document;
+//        try {
+//            docBuilderFactory.setNamespaceAware(false);
+//            docBuilderFactory.setValidating(false);
+//            docBuilderFactory.setFeature("http://xml.org/sax/features/namespaces", false);
+//            docBuilderFactory.setFeature("http://xml.org/sax/features/validation", false);
+//
+//            docBuilder = docBuilderFactory.newDocumentBuilder();
+//            document = docBuilder.parse(new BufferedInputStream(inputStream));
+//        } catch (ParserConfigurationException | SAXException | IOException e) {
+//            e.printStackTrace();
+//            return;
+//        }
+//
+//        // get the root node
+//        MindmapNode rootNode = MindmapNodeFromXmlBuilder.parse(
+//                document.getDocumentElement().getElementsByTagName("node").item(0),
+//                null,
+//                mindmap
+//        );
+
 
         // load all nodes of root node into simplified MindmapNode, and index them by ID for faster lookup
         MindmapIndexes mindmapIndexes = loadAndIndexNodesByIds(rootNode);
@@ -186,7 +267,7 @@ public void run() {
                 .build());
         Log.d(MainApplication.TAG, "Document loaded");
 
-        long numNodes = document.getElementsByTagName("node").getLength();
+        //long numNodes = document.getElementsByTagName("node").getLength();
         tracker.send(new HitBuilders.EventBuilder()
                 .setCategory("document")
                 .setAction("loadDocument")
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/MindmapNodeFromXmlBuilder.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/MindmapNodeFromXmlBuilder.java
index 0530275..d23d588 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/MindmapNodeFromXmlBuilder.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/MindmapNodeFromXmlBuilder.java
@@ -139,6 +139,7 @@ public static MindmapNode parse(Node node, MindmapNode parentNode, Mindmap mindm
 //                .link(link)
 //                .treeIdAttribute(treeIdAttribute)
 //                .arrowLinkDestinationIds(arrowLinkDestinationIds)
+//                .numChildMindmapNodes(getNumChildMindmapNodes())
 //                .build();
     }
 
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java
index bfd9f3c..5876548 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java
@@ -2,19 +2,18 @@
 
 import android.net.Uri;
 
-import org.w3c.dom.Node;
-
+import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;
 
-import lombok.Builder;
+import ch.benediktkoeppel.code.droidplane.view.NodeColumn;
 
 
 /**
  * A MindMapNode is a special type of DOM Node. A DOM Node can be converted to a MindMapNode if it has type ELEMENT,
  * and tag "node".
  */
-@Builder
+//@Builder
 public class MindmapNode {
 
     /**
@@ -62,12 +61,6 @@ public class MindmapNode {
      */
     private final List<String> iconNames;
 
-    /**
-     * Whether the node is expandable, i.e. whether it has child nodes
-     */
-    // TODO: this is badly named, it should just be called "hasChildren", and then the view can decide that this means it's expandable
-    private boolean isExpandable;
-
     /**
      * If the node has a LINK attribute, it will be stored in Uri link
      */
@@ -77,7 +70,7 @@ public class MindmapNode {
      * The XML DOM node from which this MindMapNode is derived
      */
     // TODO: MindmapNode should not need this node
-    private final Node node;
+    //private final Node node;
 
     /**
      * Whether the node is selected or not, will be set after it was clicked by the user
@@ -109,6 +102,25 @@ public class MindmapNode {
      * List of incoming arrow MindmapNodes
      */
     private List<MindmapNode> arrowLinkIncomingNodes = new ArrayList<>();
+    private WeakReference<NodeColumn> subscribedNodeColumn = null;
+    private boolean loaded;
+
+    public MindmapNode(Mindmap mindmap, MindmapNode parentNode, String id, int numericId, String text) {
+        this.mindmap = mindmap;
+        this.parentNode = parentNode;
+        this.id = id;
+        this.numericId = numericId;
+        this.text = text;
+        this.childMindmapNodes = new ArrayList<>();
+        richTextContent = null;
+        isBold = false;
+        isItalic = false;
+        iconNames = new ArrayList<>();
+        link = null;
+        treeIdAttribute = null;
+        arrowLinkDestinationIds = new ArrayList<>();
+        //node = null;
+    }
 
     /**
      * Creates a new MindMapNode from Node. The node needs to be of type ELEMENT and have tag "node". Throws a
@@ -287,7 +299,7 @@ public boolean isItalic() {
 
     public boolean isExpandable() {
 
-        return isExpandable;
+        return !childMindmapNodes.isEmpty();
     }
 
     public Uri getLink() {
@@ -349,4 +361,29 @@ public List<MindmapNode> getChildMindmapNodes() {
     public void setChildMindmapNodes(List<MindmapNode> childMindmapNodes) {
         this.childMindmapNodes = childMindmapNodes;
     }
+
+    public int getNumChildMindmapNodes() {
+        return childMindmapNodes.size();
+    }
+
+    public void subscribe(NodeColumn nodeColumn) {
+        this.subscribedNodeColumn = new WeakReference<>(nodeColumn);
+    }
+
+    public void addChildMindmapNode(MindmapNode newMindmapNode) {
+        this.childMindmapNodes.add(newMindmapNode);
+    }
+
+    public boolean hasSubscribers() {
+        return this.subscribedNodeColumn != null;
+    }
+    public void notifySubscribers(MindmapNode mindmapNode) {
+        if (this.subscribedNodeColumn != null) {
+            subscribedNodeColumn.get().notifyNewMindmapNode(mindmapNode);
+        }
+    }
+
+    public void setLoaded(boolean loaded) {
+        this.loaded = loaded;
+    }
 }
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/HorizontalMindmapView.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/HorizontalMindmapView.java
index 795d6cb..9c6c6b5 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/HorizontalMindmapView.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/HorizontalMindmapView.java
@@ -367,8 +367,11 @@ private void up(boolean force) {
     private void down(Context context, MindmapNode node) {
 
         // add a new column for this node and add it to the HorizontalMindmapView
-        NodeColumn nodeColumn = new NodeColumn(getContext(), node);
-        addColumn(nodeColumn);
+        NodeColumn nodeColumn;
+        synchronized (node) {
+            nodeColumn = new NodeColumn(getContext(), node);
+            addColumn(nodeColumn);
+        }
 
         // keep track of which list view belongs to which node column. This is necessary because onItemClick will get a
         // ListView (the one that was clicked), and we need to know which NodeColumn this is.
@@ -405,7 +408,7 @@ public void downTo(Context context, MindmapNode node) {
         // go upwards from the target node, and keep track of each node leading down to the target node
         List<MindmapNode> nodeHierarchy = new ArrayList<>();
         MindmapNode tmpNode = node;
-        while (tmpNode.getParentNode() != null) {
+        while (tmpNode.getParentNode() != null) {   // TODO: this gives a NPE when rotating the device
             nodeHierarchy.add(tmpNode);
             tmpNode = tmpNode.getParentNode();
         }
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/NodeColumn.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/NodeColumn.java
index 8122266..1787d12 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/NodeColumn.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/NodeColumn.java
@@ -34,6 +34,7 @@ public class NodeColumn extends LinearLayout implements OnCreateContextMenuListe
      * The parent node (i.e. the node that is parent to everything we display in this column)
      */
     private final MindmapNode parent;
+    private final Context context;
 
     /**
      * The list of all MindmapNodeLayouts which we display in this column
@@ -61,6 +62,7 @@ public NodeColumn(Context context) {
 
         super(context);
         parent = null;
+        this.context = context;
         if (!isInEditMode()) {
             throw new IllegalArgumentException(
                     "The constructor public NodeColumn(Context context) may only be called by graphical layout tools," +
@@ -80,11 +82,15 @@ public NodeColumn(Context context, MindmapNode parent) {
 
         super(context);
 
+        this.context = context;
+
         this.parent = parent;
 
+        parent.subscribe(this);
+
         // create list items for each child node
         mindmapNodeLayouts = new ArrayList<>();
-        List<MindmapNode> mindmapNodes = parent.getChildNodes();
+        List<MindmapNode> mindmapNodes = parent.getChildMindmapNodes();
         for (MindmapNode mindmapNode : mindmapNodes) {
             mindmapNodeLayouts.add(new MindmapNodeLayout(context, mindmapNode));
         }
@@ -123,6 +129,13 @@ public NodeColumn(Context context, MindmapNode parent) {
         this.addView(listView);
     }
 
+    public void notifyNewMindmapNode(MindmapNode mindmapNode) {
+
+        mindmapNodeLayouts.add(new MindmapNodeLayout(context, mindmapNode));
+        adapter.notifyDataSetChanged();
+
+    }
+
     /**
      * Sets the width of this column to columnWidth
      *

From fa583a2c772fa7d4cf329aae16cc776a49a7a71f Mon Sep 17 00:00:00 2001
From: Benedikt Koeppel <be.public@gmail.com>
Date: Sat, 2 Dec 2023 16:44:06 +0100
Subject: [PATCH 24/34] Upgrade dependencies

---
 .../app/droidplane.app.androidTest.iml        | 52 ++++++++++++-------
 .idea/modules/app/droidplane.app.main.iml     | 52 ++++++++++++-------
 .idea/modules/app/droidplane.app.unitTest.iml | 52 ++++++++++++-------
 app/build.gradle                              | 11 ++--
 4 files changed, 101 insertions(+), 66 deletions(-)

diff --git a/.idea/modules/app/droidplane.app.androidTest.iml b/.idea/modules/app/droidplane.app.androidTest.iml
index e79c50c..637448b 100644
--- a/.idea/modules/app/droidplane.app.androidTest.iml
+++ b/.idea/modules/app/droidplane.app.androidTest.iml
@@ -25,17 +25,18 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="droidplane.app.main" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.legacy:legacy-support-v4:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core:1.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core:1.9.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-experimental:1.3.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.1@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.media:media:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.documentfile:documentfile:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-runtime:2.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.0.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-runtime:2.1.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.6.2@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.print:print:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.legacy:legacy-support-core-ui:1.0.0@aar" level="project" />
@@ -48,24 +49,35 @@
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.swiperefreshlayout:swiperefreshlayout:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.asynclayoutinflater:asynclayoutinflater:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.fragment:fragment:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.google.android.gms:play-services-analytics:18.0.2@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.google.android.gms:play-services-analytics-impl:18.0.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.fragment:fragment:1.2.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.activity:activity:1.1.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.savedstate:savedstate:1.2.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core-ktx:1.2.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.google.android.gms:play-services-analytics:18.0.4@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.google.android.gms:play-services-analytics-impl:18.0.4@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.google.android.gms:play-services-ads-identifier:18.0.1@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.google.android.gms:play-services-basement:18.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.google.android.gms:play-services-base:18.0.1@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.google.android.gms:play-services-tasks:18.0.1@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.google.android.gms:play-services-stats:17.0.3@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.google.android.gms:play-services-tagmanager-v4-impl:18.0.2@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-extensions:2.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-process:2.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-service:2.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.constraintlayout:constraintlayout:1.1.3@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation:1.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.0.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.0.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection:1.0.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.constraintlayout:constraintlayout-solver:1.1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.google.android.gms:play-services-tagmanager-v4-impl:18.0.4@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-extensions:2.2.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-process:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.startup:startup-runtime:1.1.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-service:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.constraintlayout:constraintlayout:2.1.4@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation:1.2.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.8.10" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.2.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.6.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
   </component>
   <component name="TestModuleProperties" production-module="droidplane.app.main" />
 </module>
\ No newline at end of file
diff --git a/.idea/modules/app/droidplane.app.main.iml b/.idea/modules/app/droidplane.app.main.iml
index 4b3a540..1af2922 100644
--- a/.idea/modules/app/droidplane.app.main.iml
+++ b/.idea/modules/app/droidplane.app.main.iml
@@ -33,17 +33,18 @@
     <orderEntry type="jdk" jdkName="Android API 33, extension level 3 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-v4:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.core:core:1.2.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.core:core:1.9.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.annotation:annotation-experimental:1.3.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.6.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.1@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.media:media:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.documentfile:documentfile:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.6.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.2.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.6.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.6.2@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.print:print:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-ui:1.0.0@aar" level="project" />
@@ -56,23 +57,34 @@
     <orderEntry type="library" name="Gradle: androidx.swiperefreshlayout:swiperefreshlayout:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.asynclayoutinflater:asynclayoutinflater:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-analytics:18.0.2@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-analytics-impl:18.0.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.fragment:fragment:1.2.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.activity:activity:1.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.savedstate:savedstate:1.2.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.core:core-ktx:1.9.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-analytics:18.0.4@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-analytics-impl:18.0.4@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-ads-identifier:18.0.1@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-basement:18.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-base:18.0.1@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-tasks:18.0.1@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-stats:17.0.3@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-tagmanager-v4-impl:18.0.2@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-extensions:2.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-process:2.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-service:2.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.constraintlayout:constraintlayout:1.1.3@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.collection:collection:1.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.constraintlayout:constraintlayout-solver:1.1.3" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-tagmanager-v4-impl:18.0.4@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-extensions:2.2.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-process:2.6.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.startup:startup-runtime:1.1.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-service:2.6.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.constraintlayout:constraintlayout:2.1.4@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.2.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.8.10" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.2.0" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.6.2" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/modules/app/droidplane.app.unitTest.iml b/.idea/modules/app/droidplane.app.unitTest.iml
index 12c4022..54aa00f 100644
--- a/.idea/modules/app/droidplane.app.unitTest.iml
+++ b/.idea/modules/app/droidplane.app.unitTest.iml
@@ -23,17 +23,18 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="droidplane.app.main" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.legacy:legacy-support-v4:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core:1.2.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core:1.9.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation-experimental:1.3.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.1@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.media:media:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.documentfile:documentfile:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.loader:loader:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-runtime:2.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.0.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-runtime:2.2.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.6.2@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.print:print:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.legacy:legacy-support-core-ui:1.0.0@aar" level="project" />
@@ -46,24 +47,35 @@
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.swiperefreshlayout:swiperefreshlayout:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.asynclayoutinflater:asynclayoutinflater:1.0.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.fragment:fragment:1.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.google.android.gms:play-services-analytics:18.0.2@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.google.android.gms:play-services-analytics-impl:18.0.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.fragment:fragment:1.2.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.activity:activity:1.1.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.savedstate:savedstate:1.2.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.core:core-ktx:1.9.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.google.android.gms:play-services-analytics:18.0.4@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.google.android.gms:play-services-analytics-impl:18.0.4@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.google.android.gms:play-services-ads-identifier:18.0.1@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.google.android.gms:play-services-basement:18.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.google.android.gms:play-services-base:18.0.1@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.google.android.gms:play-services-tasks:18.0.1@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.google.android.gms:play-services-stats:17.0.3@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.google.android.gms:play-services-tagmanager-v4-impl:18.0.2@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-extensions:2.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-process:2.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-service:2.0.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.constraintlayout:constraintlayout:1.1.3@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation:1.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.0.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.0.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection:1.0.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: androidx.constraintlayout:constraintlayout-solver:1.1.3" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.google.android.gms:play-services-tagmanager-v4-impl:18.0.4@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-extensions:2.2.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-process:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.startup:startup-runtime:1.1.1@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-service:2.6.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.constraintlayout:constraintlayout:2.1.4@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation:1.2.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.8.10" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.2.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.6.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
   </component>
   <component name="TestModuleProperties" production-module="droidplane.app.main" />
 </module>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 5e74c9c..8591f55 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,10 +23,9 @@ android {
 
 dependencies {
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.google.android.gms:play-services-analytics:18.0.2'
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel:2.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    compileOnly "org.projectlombok:lombok:1.18.30"
-    annotationProcessor 'org.projectlombok:lombok:1.18.30'
+    implementation 'com.google.android.gms:play-services-analytics:18.0.4'
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel:2.6.2'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    annotationProcessor "org.projectlombok:lombok:1.18.30"
 }

From 39ede7cbcb3c09f69a006cdd36248e598cd14c3c Mon Sep 17 00:00:00 2001
From: Benedikt Koeppel <be.public@gmail.com>
Date: Wed, 3 Jan 2024 10:05:27 +0100
Subject: [PATCH 25/34] Version updates

---
 .idea/deploymentTargetDropDown.xml               | 10 ++++++++++
 .idea/gradle.xml                                 |  5 ++---
 .idea/jarRepositories.xml                        |  5 +++++
 .idea/migrations.xml                             | 10 ++++++++++
 .idea/modules/app/droidplane.app.androidTest.iml |  4 ++--
 .idea/modules/app/droidplane.app.iml             |  4 ++--
 .idea/modules/app/droidplane.app.main.iml        |  4 ++--
 .idea/modules/app/droidplane.app.unitTest.iml    |  4 ++--
 app/build.gradle                                 | 10 ++++++++++
 build.gradle                                     |  8 ++++----
 gradle/wrapper/gradle-wrapper.properties         |  2 +-
 11 files changed, 50 insertions(+), 16 deletions(-)
 create mode 100644 .idea/deploymentTargetDropDown.xml
 create mode 100644 .idea/migrations.xml

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 0000000..0c0c338
--- /dev/null
+++ b/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <value>
+      <entry key="app">
+        <State />
+      </entry>
+    </value>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index ae388c2..0897082 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,16 +4,15 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="jbr-17" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
+        <option name="resolveExternalAnnotations" value="false" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 6496250..f585069 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -36,5 +36,10 @@
       <option name="name" value="$USER_HOME$/Android/Sdk/extras/android/m2repository" />
       <option name="url" value="file:$USER_HOME$/Android/Sdk/extras/android/m2repository" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenRepo" />
+      <option name="name" value="MavenRepo" />
+      <option name="url" value="https://repo.maven.apache.org/maven2/" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/migrations.xml b/.idea/migrations.xml
new file mode 100644
index 0000000..f8051a6
--- /dev/null
+++ b/.idea/migrations.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectMigrations">
+    <option name="MigrateToGradleLocalJavaHome">
+      <set>
+        <option value="$PROJECT_DIR$" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules/app/droidplane.app.androidTest.iml b/.idea/modules/app/droidplane.app.androidTest.iml
index 637448b..bca8ed4 100644
--- a/.idea/modules/app/droidplane.app.androidTest.iml
+++ b/.idea/modules/app/droidplane.app.androidTest.iml
@@ -75,8 +75,8 @@
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.6.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
   </component>
   <component name="TestModuleProperties" production-module="droidplane.app.main" />
diff --git a/.idea/modules/app/droidplane.app.iml b/.idea/modules/app/droidplane.app.iml
index 26de54e..05491ac 100644
--- a/.idea/modules/app/droidplane.app.iml
+++ b/.idea/modules/app/droidplane.app.iml
@@ -3,8 +3,8 @@
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
-        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="8.1.2" />
-        <option name="LAST_KNOWN_AGP_VERSION" value="8.1.2" />
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="8.1.4" />
+        <option name="LAST_KNOWN_AGP_VERSION" value="8.2.0" />
       </configuration>
     </facet>
     <facet type="android" name="Android">
diff --git a/.idea/modules/app/droidplane.app.main.iml b/.idea/modules/app/droidplane.app.main.iml
index 1af2922..6244f40 100644
--- a/.idea/modules/app/droidplane.app.main.iml
+++ b/.idea/modules/app/droidplane.app.main.iml
@@ -83,8 +83,8 @@
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.6.2" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0" level="project" />
     <orderEntry type="library" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/modules/app/droidplane.app.unitTest.iml b/.idea/modules/app/droidplane.app.unitTest.iml
index 54aa00f..86b2a68 100644
--- a/.idea/modules/app/droidplane.app.unitTest.iml
+++ b/.idea/modules/app/droidplane.app.unitTest.iml
@@ -73,8 +73,8 @@
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.6.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
   </component>
   <component name="TestModuleProperties" production-module="droidplane.app.main" />
diff --git a/app/build.gradle b/app/build.gradle
index 8591f55..9ab61d5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -28,4 +28,14 @@ dependencies {
     implementation 'androidx.lifecycle:lifecycle-viewmodel:2.6.2'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     annotationProcessor "org.projectlombok:lombok:1.18.30"
+
+    // see https://stackoverflow.com/a/75298544/1067124
+    constraints {
+        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0") {
+            because("kotlin-stdlib-jdk7 is now a part of kotlin-stdlib")
+        }
+        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0") {
+            because("kotlin-stdlib-jdk8 is now a part of kotlin-stdlib")
+        }
+    }
 }
diff --git a/build.gradle b/build.gradle
index 6343c15..f6b750c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,11 +2,11 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.2'
-        classpath 'com.google.gms:google-services:4.3.10'
+        classpath 'com.android.tools.build:gradle:8.2.0'
+        classpath 'com.google.gms:google-services:4.4.0'
         classpath "org.projectlombok:lombok:1.18.30"
     }
 }
@@ -14,7 +14,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index da1db5f..15de902 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From ef7bb0688729bfa5a507463a88960d6c9650a913 Mon Sep 17 00:00:00 2001
From: Benedikt Koeppel <be.public@gmail.com>
Date: Wed, 3 Jan 2024 10:05:04 +0100
Subject: [PATCH 26/34] Load richtext content

---
 .../controller/AsyncMindmapLoaderTask.java    | 157 ++++++++++-
 .../controller/MindmapNodeFromXmlBuilder.java | 252 +++++++-----------
 .../code/droidplane/model/MindmapNode.java    |   6 +-
 .../view/HorizontalMindmapView.java           |  16 +-
 .../code/droidplane/view/NodeColumn.java      |   2 +
 5 files changed, 267 insertions(+), 166 deletions(-)

diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
index 6bf4eaf..32eaaf4 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
@@ -101,6 +101,12 @@ protected Object doInBackground(String... strings) {
         return null;
     }
 
+//    enum ParserStatus {
+//        START,  // looking for start of document
+//        RUNNING, // parsing nodes
+//        RICHCONTENT,    // parsing richcontent within a node (this separate state is required to allow having <node> elements within <richcontent>, and treating such <node> elements as richcontent, and not as a separate mindmap node)
+//    }
+
 
     /**
      * Loads a mind map (*.mm) XML document into its internal DOM tree
@@ -120,8 +126,14 @@ public void loadDocument(InputStream inputStream) {
 
         MindmapNode rootNode = null;
 
+
         Stack<MindmapNode> nodeStack = new Stack<>();
         int numNodes = 0;
+        //ParserStatus parserStatus = ParserStatus.START;
+
+        // extract the richcontent (HTML) of the node. This works both for nodes with a rich text content
+        // (TYPE="NODE"), for "Notes" (TYPE="NOTE"), for "Details" (TYPE="DETAILS").
+        String richTextContent = null;
 
         try {
             XmlPullParserFactory factory = XmlPullParserFactory.newInstance();
@@ -131,13 +143,12 @@ public void loadDocument(InputStream inputStream) {
             xpp.setInput(inputStream, "UTF-8");
             int eventType = xpp.getEventType();
             while (eventType != XmlPullParser.END_DOCUMENT) {
-                if (eventType == XmlPullParser.START_DOCUMENT) {
-                    //System.out.println("Start document");
+                if (eventType == XmlPullParser.START_DOCUMENT /*&& parserStatus.equals(ParserStatus.START)*/) {
+                    //parserStatus = ParserStatus.RUNNING;
 
-                } else if(eventType == XmlPullParser.START_TAG) {
-                    //System.out.println("Start tag "+xpp.getName());
+                } else if (eventType == XmlPullParser.START_TAG) {
 
-                    if (xpp.getName().equals("node")) {
+                    if (xpp.getName().equals("node") /*&& parserStatus.equals(ParserStatus.RUNNING)*/) {
 
                         MindmapNode parentNode = null;
                         if (!nodeStack.empty()) {
@@ -190,16 +201,147 @@ public void run() {
 
                         nodeStack.push(newMindmapNode);
 
+                    } else if (xpp.getName().equals("richcontent") /*&& parserStatus.equals(ParserStatus.RUNNING)*/
+                            && (
+                            xpp.getAttributeValue(null, "TYPE").equals("NODE")
+                                    || xpp.getAttributeValue(null, "TYPE").equals("NOTE")
+                                    || xpp.getAttributeValue(null, "TYPE").equals("DETAILS")
+                    )
+                    ) {
+                        // the "richcontent" node contains some HTML. In order to render it, we need to
+                        // load all of it, and then render HTML. So we need a sub-parser, that runs
+                        // until the whole richcontent node is consumed.
+
+                        // the "richcontent" node just starts the RICHCONTENT parser status; no content is collected yet
+                        richTextContent = "";
+
+                        int startingDepth = xpp.getDepth();
+
+                        // eagerly parse until richcontent node is closed
+                        int richContentSubParserEventType = xpp.next();
+                        // stop parsing once we have come out far enough from the XML to be at the starting depth again
+                        do {
+
+                            // EVENT TYPES as reported by next()
+                            switch (richContentSubParserEventType) {
+                                /**
+                                 * Signalize that parser is at the very beginning of the document
+                                 * and nothing was read yet.
+                                 * This event type can only be observed by calling getEvent()
+                                 * before the first call to next(), nextToken, or nextTag()</a>).
+                                 */
+                                case XmlPullParser.START_DOCUMENT:
+                                    throw new IllegalStateException("Received START_DOCUMENT but were already within the document");
+
+                                /**
+                                 * Logical end of the xml document. Returned from getEventType, next()
+                                 * and nextToken()
+                                 * when the end of the input document has been reached.
+                                 * <p><strong>NOTE:</strong> subsequent calls to
+                                 * <a href="#next()">next()</a> or <a href="#nextToken()">nextToken()</a>
+                                 * may result in exception being thrown.
+                                 */
+                                case XmlPullParser.END_DOCUMENT:
+                                    throw new IllegalStateException("Received END_DOCUMENT but expected to just parse a sub-document");
+
+                                /**
+                                 * Returned from getEventType(),
+                                 * <a href="#next()">next()</a>, <a href="#nextToken()">nextToken()</a> when
+                                 * a start tag was read.
+                                 * The name of start tag is available from getName(), its namespace and prefix are
+                                 * available from getNamespace() and getPrefix()
+                                 * if <a href='#FEATURE_PROCESS_NAMESPACES'>namespaces are enabled</a>.
+                                 * See getAttribute* methods to retrieve element attributes.
+                                 * See getNamespace* methods to retrieve newly declared namespaces.
+                                 */
+                                case XmlPullParser.START_TAG: {
+                                    String tagString = "";
+
+                                    String tagName = xpp.getName();
+                                    tagString += "<" + tagName;
+
+                                    for (int i = 0; i < xpp.getAttributeCount(); i++) {
+                                        String attributeName = xpp.getAttributeName(i);
+                                        String attributeValue = xpp.getAttributeValue(i);
+
+                                        String attributeString = " " + attributeName + "=" + '"' + attributeValue + '"';
+                                        tagString += attributeString;
+                                    }
+
+                                    tagString += ">";
+
+                                    richTextContent += tagString;
+
+                                    break;
+                                }
+
+                                /**
+                                 * Returned from getEventType(), <a href="#next()">next()</a>, or
+                                 * <a href="#nextToken()">nextToken()</a> when an end tag was read.
+                                 * The name of start tag is available from getName(), its
+                                 * namespace and prefix are
+                                 * available from getNamespace() and getPrefix().
+                                 */
+                                case XmlPullParser.END_TAG: {
+                                    String tagName = xpp.getName();
+                                    String tagString = "</" + tagName + ">";
+                                    richTextContent += tagString;
+                                    break;
+                                }
+
+                                /**
+                                 * Character data was read and will is available by calling getText().
+                                 * <p><strong>Please note:</strong> <a href="#next()">next()</a> will
+                                 * accumulate multiple
+                                 * events into one TEXT event, skipping IGNORABLE_WHITESPACE,
+                                 * PROCESSING_INSTRUCTION and COMMENT events,
+                                 * In contrast, <a href="#nextToken()">nextToken()</a> will stop reading
+                                 * text when any other event is observed.
+                                 * Also, when the state was reached by calling next(), the text value will
+                                 * be normalized, whereas getText() will
+                                 * return unnormalized content in the case of nextToken(). This allows
+                                 * an exact roundtrip without changing line ends when examining low
+                                 * level events, whereas for high level applications the text is
+                                 * normalized appropriately.
+                                 */
+                                case XmlPullParser.TEXT: {
+                                    String text = xpp.getText();
+                                    richTextContent += text;
+                                    break;
+                                }
+
+                                default:
+                                    throw new IllegalStateException("Received unexpected event type " + richContentSubParserEventType);
+
+                            }
+
+                            richContentSubParserEventType = xpp.next();
+                        } while (xpp.getDepth() != startingDepth);
+
+                        // if we have no parent node, something went seriously wrong - we can't have a richcontent that is not part of a mindmap node
+                        if (nodeStack.empty()) {
+                            throw new IllegalStateException("Received richtext without a parent node");
+                        }
+
+                        MindmapNode parentNode = nodeStack.peek();
+                        parentNode.setRichTextContent(richTextContent);
+                        //parentNode.notifySubscribers(TODO);
+
+                        // exit from RICHCONTENT mode, back into RUNNING mode
+                        //parserStatus = ParserStatus.RUNNING;
+
+
                     }
 
-                } else if(eventType == XmlPullParser.END_TAG) {
+
+                } else if (eventType == XmlPullParser.END_TAG) {
                     //System.out.println("End tag "+xpp.getName());
                     if (xpp.getName().equals("node")) {
                         MindmapNode completedMindmapNode = nodeStack.pop();
                         completedMindmapNode.setLoaded(true);
                     }
 
-                } else if(eventType == XmlPullParser.TEXT) {
+                } else if (eventType == XmlPullParser.TEXT) {
                     //System.out.println("Text "+xpp.getText());
 
                 } else {
@@ -220,7 +362,6 @@ public void run() {
         }
 
 
-
 //        // XML document builder
 //        DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
 //        DocumentBuilder docBuilder;
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/MindmapNodeFromXmlBuilder.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/MindmapNodeFromXmlBuilder.java
index d23d588..fa7404d 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/MindmapNodeFromXmlBuilder.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/MindmapNodeFromXmlBuilder.java
@@ -1,50 +1,11 @@
 package ch.benediktkoeppel.code.droidplane.controller;
 
-import android.util.Log;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import ch.benediktkoeppel.code.droidplane.MainApplication;
-import ch.benediktkoeppel.code.droidplane.model.Mindmap;
-import ch.benediktkoeppel.code.droidplane.model.MindmapNode;
-
 public class MindmapNodeFromXmlBuilder {
 
 
-    public static MindmapNode parse(Node node, MindmapNode parentNode, Mindmap mindmap) {
-        return null;
-
-//        // convert the XML Node to a XML Element
-//        Element tmpElement;
-//        if (isMindmapNode(node)) {
-//            tmpElement = (Element)node;
-//        } else {
-//            throw new ClassCastException("Can not convert Node to MindmapNode");
-//        }
-//
-//        // extract the ID of the node
-//        String id = tmpElement.getAttribute("ID");
-//
-//        int numericId;
-//        try {
-//            numericId = Integer.parseInt(id.replaceAll("\\D+", ""));
-//        } catch (NumberFormatException e) {
-//            numericId = id.hashCode();
-//        }
+//    public static MindmapNode parse(Node node, MindmapNode parentNode, Mindmap mindmap) {
+//        return null;
 //
-//        // extract the string (TEXT attribute) of the nodes
-//        String text = tmpElement.getAttribute("TEXT");
-//
-//        // extract the richcontent (HTML) of the node. This works both for nodes with a rich text content
-//        // (TYPE="NODE"), for "Notes" (TYPE="NOTE"), for "Details" (TYPE="DETAILS").
-//        String richTextContent = null;
-//        // find 'richcontent TYPE="NODE"' subnode, which will contain the rich text content
 //        NodeList richtextNodeList = tmpElement.getChildNodes();
 //        for (int i = 0; i < richtextNodeList.getLength(); i++) {
 //            Node n = richtextNodeList.item(i);
@@ -141,117 +102,100 @@ public static MindmapNode parse(Node node, MindmapNode parentNode, Mindmap mindm
 //                .arrowLinkDestinationIds(arrowLinkDestinationIds)
 //                .numChildMindmapNodes(getNumChildMindmapNodes())
 //                .build();
-    }
-
-
-
-    /**
-     * Generates and returns the child nodes of this MindmapNode. getChildNodes() does lazy loading, i.e. it
-     * generates the child nodes on demand and stores them in childMindmapNodes.
-     *
-     * TODO: not so sure if this is really doing lazy loading. We probably call this already pretty early on. Should check.
-     *
-     * TODO: this should be called differently, to not confuse it with getChildNodes of Node
-     *
-     * @return ArrayList of this MindmapNode's child nodes
-     */
-    public static List<MindmapNode> getChildNodes(Mindmap mindmap, MindmapNode mindmapNode, Node node) {
-
-        synchronized (mindmapNode) {
-
-            // if we haven't loaded the childMindmapNodes before
-            if (mindmapNode.getChildMindmapNodes() == null) {
-
-                // fetch all child DOM Nodes, convert them to MindmapNodes
-                List<MindmapNode> newChildMindmapNodes = new ArrayList<>();
-                NodeList childNodes = node.getChildNodes();
-                for (int i = 0; i < childNodes.getLength(); i++) {
-                    Node tmpNode = childNodes.item(i);
-
-                    if (isMindmapNode(tmpNode)) {
-                        MindmapNode newChildMindmapNode = parse(tmpNode, mindmapNode, mindmap);
-                        newChildMindmapNodes.add(newChildMindmapNode);
-                    }
-                }
-
-                mindmapNode.setChildMindmapNodes(Collections.unmodifiableList(newChildMindmapNodes));
-
-            }
-
-            // we already did that before, so return the previous result
-            else {
-                Log.d(MainApplication.TAG, "Returning cached childMindmapNodes");
-            }
-
-            return mindmapNode.getChildMindmapNodes();
-        }
-    }
-
-
-    /**
-     * Checks whether a given node can be converted to a Mindmap node, i.e. whether it has type ELEMENT_NODE and tag
-     * "node"
-     *
-     * @param node
-     * @return
-     */
-    private static boolean isMindmapNode(Node node) {
-
-        if (node.getNodeType() == Node.ELEMENT_NODE) {
-            Element element = (Element)node;
-
-            return element.getTagName().equals("node");
-        }
-        return false;
-    }
-
-
-
-    /**
-     * Extracts the list of icons from a node and returns the names of the icons as ArrayList.
-     *
-     * @return list of names of the icons
-     */
-    private static ArrayList<String> getIcons(Node node) {
-
-        ArrayList<String> iconsNames = new ArrayList<>();
-
-        NodeList childNodes = node.getChildNodes();
-        for (int i = 0; i < childNodes.getLength(); i++) {
-
-            Node n = childNodes.item(i);
-            if (n.getNodeType() == Node.ELEMENT_NODE) {
-                Element e = (Element)n;
-
-                if (e.getTagName().equals("icon") && e.hasAttribute("BUILTIN")) {
-                    iconsNames.add(e.getAttribute("BUILTIN"));
-                }
-            }
-        }
-
-        return iconsNames;
-    }
-
-
-
-    /**
-     * Returns the number of child Mindmap nodes
-     *
-     * @return
-     */
-    public static int getNumChildMindmapNodes(Node node) {
-
-        int numMindmapNodes = 0;
-
-        NodeList childNodes = node.getChildNodes();
-        for (int i = 0; i < childNodes.getLength(); i++) {
-
-            Node n = childNodes.item(i);
-            if (isMindmapNode(n)) {
-                numMindmapNodes++;
-            }
-        }
-
-        return numMindmapNodes;
-    }
+//    }
+//
+//
+//
+//    /**
+//     * Generates and returns the child nodes of this MindmapNode. getChildNodes() does lazy loading, i.e. it
+//     * generates the child nodes on demand and stores them in childMindmapNodes.
+//     *
+//     * TODO: not so sure if this is really doing lazy loading. We probably call this already pretty early on. Should check.
+//     *
+//     * TODO: this should be called differently, to not confuse it with getChildNodes of Node
+//     *
+//     * @return ArrayList of this MindmapNode's child nodes
+//     */
+//    public static List<MindmapNode> getChildNodes(Mindmap mindmap, MindmapNode mindmapNode, Node node) {
+//
+//        synchronized (mindmapNode) {
+//
+//            // if we haven't loaded the childMindmapNodes before
+//            if (mindmapNode.getChildMindmapNodes() == null) {
+//
+//                // fetch all child DOM Nodes, convert them to MindmapNodes
+//                List<MindmapNode> newChildMindmapNodes = new ArrayList<>();
+//                NodeList childNodes = node.getChildNodes();
+//                for (int i = 0; i < childNodes.getLength(); i++) {
+//                    Node tmpNode = childNodes.item(i);
+//
+//                    if (isMindmapNode(tmpNode)) {
+//                        MindmapNode newChildMindmapNode = parse(tmpNode, mindmapNode, mindmap);
+//                        newChildMindmapNodes.add(newChildMindmapNode);
+//                    }
+//                }
+//
+//                mindmapNode.setChildMindmapNodes(Collections.unmodifiableList(newChildMindmapNodes));
+//
+//            }
+//
+//            // we already did that before, so return the previous result
+//            else {
+//                Log.d(MainApplication.TAG, "Returning cached childMindmapNodes");
+//            }
+//
+//            return mindmapNode.getChildMindmapNodes();
+//        }
+//    }
+//
+//
+//
+//
+//    /**
+//     * Extracts the list of icons from a node and returns the names of the icons as ArrayList.
+//     *
+//     * @return list of names of the icons
+//     */
+//    private static ArrayList<String> getIcons(Node node) {
+//
+//        ArrayList<String> iconsNames = new ArrayList<>();
+//
+//        NodeList childNodes = node.getChildNodes();
+//        for (int i = 0; i < childNodes.getLength(); i++) {
+//
+//            Node n = childNodes.item(i);
+//            if (n.getNodeType() == Node.ELEMENT_NODE) {
+//                Element e = (Element)n;
+//
+//                if (e.getTagName().equals("icon") && e.hasAttribute("BUILTIN")) {
+//                    iconsNames.add(e.getAttribute("BUILTIN"));
+//                }
+//            }
+//        }
+//
+//        return iconsNames;
+//    }
+//
+//
+//
+//    /**
+//     * Returns the number of child Mindmap nodes
+//     *
+//     * @return
+//     */
+//    public static int getNumChildMindmapNodes(Node node) {
+//
+//        int numMindmapNodes = 0;
+//
+//        NodeList childNodes = node.getChildNodes();
+//        for (int i = 0; i < childNodes.getLength(); i++) {
+//
+//            Node n = childNodes.item(i);
+//            if (isMindmapNode(n)) {
+//                numMindmapNodes++;
+//            }
+//        }
+//
+//        return numMindmapNodes;
+//    }
 }
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java
index 5876548..dfe20ed 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java
@@ -44,7 +44,7 @@ public class MindmapNode {
     /**
      * The Rich Text content of the node (if any)
      */
-    private final String richTextContent;
+    private String richTextContent;
 
     /**
      * Bold style
@@ -327,6 +327,10 @@ public String getRichTextContent() {
         return richTextContent;
     }
 
+    public void setRichTextContent(String richTextContent) {
+        this.richTextContent = richTextContent;
+    }
+
     public List<String> getArrowLinkDestinationIds() {
 
         return arrowLinkDestinationIds;
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/HorizontalMindmapView.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/HorizontalMindmapView.java
index 9c6c6b5..4faa1bf 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/HorizontalMindmapView.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/HorizontalMindmapView.java
@@ -264,6 +264,7 @@ private int getNumberOfColumns() {
      */
     private String getTitleOfRightmostParent() {
 
+        // TODO this needs to update when notify is called
         if (!nodeColumns.isEmpty()) {
 
             MindmapNode parent = nodeColumns.get(nodeColumns.size() - 1).getParentNode();
@@ -369,8 +370,15 @@ private void down(Context context, MindmapNode node) {
         // add a new column for this node and add it to the HorizontalMindmapView
         NodeColumn nodeColumn;
         synchronized (node) {
-            nodeColumn = new NodeColumn(getContext(), node);
-            addColumn(nodeColumn);
+            if (node.getParentNode() != null) {
+                synchronized (node.getParentNode()) {
+                    nodeColumn = new NodeColumn(getContext(), node);
+                    addColumn(nodeColumn);
+                }
+            } else {
+                nodeColumn = new NodeColumn(getContext(), node);
+                addColumn(nodeColumn);
+            }
         }
 
         // keep track of which list view belongs to which node column. This is necessary because onItemClick will get a
@@ -432,13 +440,15 @@ public void downTo(Context context, MindmapNode node) {
      */
     public void setApplicationTitle(Context context) {
 
+        // TODO: this needs to update when richtext content is loaded
+
         // get the title of the parent of the rightmost column (i.e. the
         // selected node in the 2nd-rightmost column)
         // set the application title to this nodeTitle. If the nodeTitle is
         // empty, we set the default Application title
         String nodeTitle = getTitleOfRightmostParent();
         Log.d(MainApplication.TAG, "nodeTitle = " + nodeTitle);
-        if (nodeTitle.equals("")) {
+        if (nodeTitle == null || nodeTitle.equals("")) {
             Log.d(MainApplication.TAG, "Setting application title to default string: " +
                                        getResources().getString(R.string.app_name));
             AndroidHelper.getActivity(context, Activity.class).setTitle(R.string.app_name);
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/NodeColumn.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/NodeColumn.java
index 1787d12..b68b6cb 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/NodeColumn.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/NodeColumn.java
@@ -136,6 +136,8 @@ public void notifyNewMindmapNode(MindmapNode mindmapNode) {
 
     }
 
+    // TODO we need a new notifier, if the node itself has updated (if text was updated, or icon was updated)
+
     /**
      * Sets the width of this column to columnWidth
      *

From 986b1e81d1716eb968e201f068ac13e86cc3f660 Mon Sep 17 00:00:00 2001
From: Benedikt Koeppel <be.public@gmail.com>
Date: Wed, 3 Jan 2024 12:00:39 +0100
Subject: [PATCH 27/34] Rich content loading seems to work

---
 .../code/droidplane/MainActivity.java         |   7 +-
 .../controller/AsyncMindmapLoaderTask.java    | 110 ++++++++----------
 .../code/droidplane/model/MindmapNode.java    |  33 ++++--
 .../view/HorizontalMindmapView.java           |  29 ++++-
 .../droidplane/view/MindmapNodeLayout.java    |   6 +-
 5 files changed, 109 insertions(+), 76 deletions(-)

diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/MainActivity.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/MainActivity.java
index 6976a5a..8c89de9 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/MainActivity.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/MainActivity.java
@@ -90,6 +90,7 @@ public void onCreate(Bundle savedInstanceState) {
             horizontalMindmapView.setMindmap(mindmap);
             horizontalMindmapView.setDeepestSelectedMindmapNode(mindmap.getRootNode());
             horizontalMindmapView.onRootNodeLoaded();
+            mindmap.getRootNode().subscribeNodeContentChanged(this);
 
         } else {
 
@@ -273,7 +274,7 @@ public boolean onContextItemSelected(MenuItem item) {
                     // open RichText content
                     case R.id.openrichtext:
                         Log.d(MainApplication.TAG,
-                                "Opening rich text of node " + mindmapNodeLayout.getMindmapNode().getRichTextContent()
+                                "Opening rich text of node " + mindmapNodeLayout.getMindmapNode().getRichTextContents()
                         );
                         mindmapNodeLayout.openRichText(this);
 
@@ -378,4 +379,8 @@ private void updateLoadingIndicatorOnUiThread() {
             runOnUiThread(() -> mindmapLoadingIndicator.setVisible(mindmapIsLoading));
         }
     }
+
+    public void notifyNodeContentChanged() {
+        this.horizontalMindmapView.notifyNodeContentChanged(this);
+    }
 }
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
index 32eaaf4..41413c5 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
@@ -101,12 +101,6 @@ protected Object doInBackground(String... strings) {
         return null;
     }
 
-//    enum ParserStatus {
-//        START,  // looking for start of document
-//        RUNNING, // parsing nodes
-//        RICHCONTENT,    // parsing richcontent within a node (this separate state is required to allow having <node> elements within <richcontent>, and treating such <node> elements as richcontent, and not as a separate mindmap node)
-//    }
-
 
     /**
      * Loads a mind map (*.mm) XML document into its internal DOM tree
@@ -129,11 +123,6 @@ public void loadDocument(InputStream inputStream) {
 
         Stack<MindmapNode> nodeStack = new Stack<>();
         int numNodes = 0;
-        //ParserStatus parserStatus = ParserStatus.START;
-
-        // extract the richcontent (HTML) of the node. This works both for nodes with a rich text content
-        // (TYPE="NODE"), for "Notes" (TYPE="NOTE"), for "Details" (TYPE="DETAILS").
-        String richTextContent = null;
 
         try {
             XmlPullParserFactory factory = XmlPullParserFactory.newInstance();
@@ -143,12 +132,11 @@ public void loadDocument(InputStream inputStream) {
             xpp.setInput(inputStream, "UTF-8");
             int eventType = xpp.getEventType();
             while (eventType != XmlPullParser.END_DOCUMENT) {
-                if (eventType == XmlPullParser.START_DOCUMENT /*&& parserStatus.equals(ParserStatus.START)*/) {
-                    //parserStatus = ParserStatus.RUNNING;
+                if (eventType == XmlPullParser.START_DOCUMENT) {
 
                 } else if (eventType == XmlPullParser.START_TAG) {
 
-                    if (xpp.getName().equals("node") /*&& parserStatus.equals(ParserStatus.RUNNING)*/) {
+                    if (xpp.getName().equals("node")) {
 
                         MindmapNode parentNode = null;
                         if (!nodeStack.empty()) {
@@ -166,6 +154,7 @@ public void loadDocument(InputStream inputStream) {
                         String text = xpp.getAttributeValue(null, "TEXT");
 
                         MindmapNode newMindmapNode = new MindmapNode(mindmap, parentNode, id, numericId, text);
+                        newMindmapNode.subscribeNodeContentChanged(mainActivity);
                         numNodes += 1;
 
                         if (parentNode == null) {
@@ -191,35 +180,35 @@ public void run() {
 
                         } else {
                             parentNode.addChildMindmapNode(newMindmapNode);
-                            if (parentNode.hasSubscribers()) {
+                            if (parentNode.hasAddedChildMindmapNodeSubscribers()) {
                                 MindmapNode finalParentNode = parentNode;
                                 mainActivity.runOnUiThread(() -> {
-                                    finalParentNode.notifySubscribers(newMindmapNode);
+                                    finalParentNode.notifySubscribersAddedChildMindmapNode(newMindmapNode);
                                 });
                             }
                         }
 
                         nodeStack.push(newMindmapNode);
 
-                    } else if (xpp.getName().equals("richcontent") /*&& parserStatus.equals(ParserStatus.RUNNING)*/
+                    } else if (xpp.getName().equals("richcontent")
                             && (
                             xpp.getAttributeValue(null, "TYPE").equals("NODE")
                                     || xpp.getAttributeValue(null, "TYPE").equals("NOTE")
                                     || xpp.getAttributeValue(null, "TYPE").equals("DETAILS")
                     )
                     ) {
-                        // the "richcontent" node contains some HTML. In order to render it, we need to
-                        // load all of it, and then render HTML. So we need a sub-parser, that runs
-                        // until the whole richcontent node is consumed.
 
-                        // the "richcontent" node just starts the RICHCONTENT parser status; no content is collected yet
-                        richTextContent = "";
+                        // extract the richcontent (HTML) of the node. This works both for nodes with a rich text content
+                        // (TYPE="NODE"), for "Notes" (TYPE="NOTE"), for "Details" (TYPE="DETAILS").
+                        String richTextContent = "";
 
+                        // as we are stream processing the XML, we need to consume the full XML until the
+                        // richcontent tag is closed (i.e. until we're back at the current parsing depth)
+                        // eagerly parse until richcontent node is closed
                         int startingDepth = xpp.getDepth();
 
-                        // eagerly parse until richcontent node is closed
                         int richContentSubParserEventType = xpp.next();
-                        // stop parsing once we have come out far enough from the XML to be at the starting depth again
+
                         do {
 
                             // EVENT TYPES as reported by next()
@@ -286,6 +275,28 @@ public void run() {
                                     String tagName = xpp.getName();
                                     String tagString = "</" + tagName + ">";
                                     richTextContent += tagString;
+
+//                                    if (xpp.isEmptyElementTag()) {
+//                                        String tagString = "";
+//
+//                                        String tagName = xpp.getName();
+//                                        tagString += "<" + tagName;
+//
+//                                        for (int i = 0; i < xpp.getAttributeCount(); i++) {
+//                                            String attributeName = xpp.getAttributeName(i);
+//                                            String attributeValue = xpp.getAttributeValue(i);
+//
+//                                            String attributeString = " " + attributeName + "=" + '"' + attributeValue + '"';
+//                                            tagString += attributeString;
+//                                        }
+//
+//                                        tagString += " />";
+//
+//                                        richTextContent += tagString;
+//
+//                                    } else {
+//
+//                                    }
                                     break;
                                 }
 
@@ -316,6 +327,8 @@ public void run() {
                             }
 
                             richContentSubParserEventType = xpp.next();
+
+                        // stop parsing once we have come out far enough from the XML to be at the starting depth again
                         } while (xpp.getDepth() != startingDepth);
 
                         // if we have no parent node, something went seriously wrong - we can't have a richcontent that is not part of a mindmap node
@@ -324,32 +337,36 @@ public void run() {
                         }
 
                         MindmapNode parentNode = nodeStack.peek();
-                        parentNode.setRichTextContent(richTextContent);
-                        //parentNode.notifySubscribers(TODO);
+                        parentNode.addRichTextContent(richTextContent);
 
-                        // exit from RICHCONTENT mode, back into RUNNING mode
-                        //parserStatus = ParserStatus.RUNNING;
+                        // let view know that node content has changed
+                        if (parentNode.hasNodeContentChangedSubscribers()) {
+                            MindmapNode finalParentNode = parentNode;
+                            mainActivity.runOnUiThread(() -> {
+                                finalParentNode.notifySubscribersNodeContentChanged();
+                            });
+                        }
 
 
+                    } else {
+                        // Log.d(MainApplication.TAG, "Received unknown node " + xpp.getName());
                     }
 
 
                 } else if (eventType == XmlPullParser.END_TAG) {
-                    //System.out.println("End tag "+xpp.getName());
                     if (xpp.getName().equals("node")) {
                         MindmapNode completedMindmapNode = nodeStack.pop();
                         completedMindmapNode.setLoaded(true);
                     }
 
                 } else if (eventType == XmlPullParser.TEXT) {
-                    //System.out.println("Text "+xpp.getText());
+                    // TODO: do we have TEXT nodes in the mindmap at all?
 
                 } else {
-                    System.out.println("Other");
+                    throw new IllegalStateException("Received unknown event " + eventType);
                 }
                 eventType = xpp.next();
             }
-            //System.out.println("End document");
 
         } catch (Exception e) {
             throw new RuntimeException(e);
@@ -358,36 +375,11 @@ public void run() {
         // stack should now be empty
         if (!nodeStack.empty()) {
             throw new RuntimeException("Stack should be empty");
-            // TODO: we could try to be lenient here to allow opening partial documents (which sometimes happens when dropbox doesn't fully sync)
+            // TODO: we could try to be lenient here to allow opening partial documents (which sometimes happens when dropbox doesn't fully sync). Probably doesn't work anyways, as we already throw a runtime exception above if we receive garbage
         }
 
 
-//        // XML document builder
-//        DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
-//        DocumentBuilder docBuilder;
-//
-//        // load the Mindmap from the InputStream
-//        Document document;
-//        try {
-//            docBuilderFactory.setNamespaceAware(false);
-//            docBuilderFactory.setValidating(false);
-//            docBuilderFactory.setFeature("http://xml.org/sax/features/namespaces", false);
-//            docBuilderFactory.setFeature("http://xml.org/sax/features/validation", false);
-//
-//            docBuilder = docBuilderFactory.newDocumentBuilder();
-//            document = docBuilder.parse(new BufferedInputStream(inputStream));
-//        } catch (ParserConfigurationException | SAXException | IOException e) {
-//            e.printStackTrace();
-//            return;
-//        }
-//
-//        // get the root node
-//        MindmapNode rootNode = MindmapNodeFromXmlBuilder.parse(
-//                document.getDocumentElement().getElementsByTagName("node").item(0),
-//                null,
-//                mindmap
-//        );
-
+        // TODO: can we do this as we stream through the XML above?
 
         // load all nodes of root node into simplified MindmapNode, and index them by ID for faster lookup
         MindmapIndexes mindmapIndexes = loadAndIndexNodesByIds(rootNode);
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java
index dfe20ed..8e53003 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java
@@ -6,6 +6,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import ch.benediktkoeppel.code.droidplane.MainActivity;
 import ch.benediktkoeppel.code.droidplane.view.NodeColumn;
 
 
@@ -44,7 +45,7 @@ public class MindmapNode {
     /**
      * The Rich Text content of the node (if any)
      */
-    private String richTextContent;
+    private final List<String> richTextContents;
 
     /**
      * Bold style
@@ -103,6 +104,7 @@ public class MindmapNode {
      */
     private List<MindmapNode> arrowLinkIncomingNodes = new ArrayList<>();
     private WeakReference<NodeColumn> subscribedNodeColumn = null;
+    private WeakReference<MainActivity> subscribedMainActivity = null;
     private boolean loaded;
 
     public MindmapNode(Mindmap mindmap, MindmapNode parentNode, String id, int numericId, String text) {
@@ -112,7 +114,7 @@ public MindmapNode(Mindmap mindmap, MindmapNode parentNode, String id, int numer
         this.numericId = numericId;
         this.text = text;
         this.childMindmapNodes = new ArrayList<>();
-        richTextContent = null;
+        this.richTextContents = new ArrayList<>();
         isBold = false;
         isItalic = false;
         iconNames = new ArrayList<>();
@@ -322,13 +324,13 @@ public MindmapNode getParentNode() {
         return parentNode;
     }
 
-    public String getRichTextContent() {
+    public List<String> getRichTextContents() {
 
-        return richTextContent;
+        return richTextContents;
     }
 
-    public void setRichTextContent(String richTextContent) {
-        this.richTextContent = richTextContent;
+    public void addRichTextContent(String richTextContent) {
+        this.richTextContents.add(richTextContent);
     }
 
     public List<String> getArrowLinkDestinationIds() {
@@ -378,15 +380,30 @@ public void addChildMindmapNode(MindmapNode newMindmapNode) {
         this.childMindmapNodes.add(newMindmapNode);
     }
 
-    public boolean hasSubscribers() {
+    public boolean hasAddedChildMindmapNodeSubscribers() {
         return this.subscribedNodeColumn != null;
     }
-    public void notifySubscribers(MindmapNode mindmapNode) {
+    public void notifySubscribersAddedChildMindmapNode(MindmapNode mindmapNode) {
         if (this.subscribedNodeColumn != null) {
             subscribedNodeColumn.get().notifyNewMindmapNode(mindmapNode);
         }
     }
 
+    public boolean hasNodeContentChangedSubscribers() {
+        return this.subscribedMainActivity != null;
+    }
+
+    public void notifySubscribersNodeContentChanged() {
+        if (this.subscribedMainActivity != null) {
+            subscribedMainActivity.get().notifyNodeContentChanged();
+        }
+    }
+
+    // TODO: ugly that MainActivity is needed here. Would be better to introduce an listener interface (same for node column above)
+    public void subscribeNodeContentChanged(MainActivity mainActivity) {
+        this.subscribedMainActivity = new WeakReference<>(mainActivity);
+    }
+
     public void setLoaded(boolean loaded) {
         this.loaded = loaded;
     }
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/HorizontalMindmapView.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/HorizontalMindmapView.java
index 4faa1bf..f319104 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/HorizontalMindmapView.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/HorizontalMindmapView.java
@@ -3,6 +3,7 @@
 import android.app.Activity;
 import android.content.Context;
 import android.os.Handler;
+import android.text.Html;
 import android.util.Log;
 import android.view.GestureDetector;
 import android.view.GestureDetector.SimpleOnGestureListener;
@@ -16,13 +17,18 @@
 import android.widget.LinearLayout;
 import android.widget.ListView;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 
 import ch.benediktkoeppel.code.droidplane.MainActivity;
 import ch.benediktkoeppel.code.droidplane.MainApplication;
-import ch.benediktkoeppel.code.droidplane.model.Mindmap;
 import ch.benediktkoeppel.code.droidplane.R;
 import ch.benediktkoeppel.code.droidplane.helper.AndroidHelper;
+import ch.benediktkoeppel.code.droidplane.model.Mindmap;
 import ch.benediktkoeppel.code.droidplane.model.MindmapNode;
 
 public class HorizontalMindmapView extends HorizontalScrollView implements OnTouchListener, OnItemClickListener {
@@ -264,11 +270,18 @@ private int getNumberOfColumns() {
      */
     private String getTitleOfRightmostParent() {
 
-        // TODO this needs to update when notify is called
         if (!nodeColumns.isEmpty()) {
 
             MindmapNode parent = nodeColumns.get(nodeColumns.size() - 1).getParentNode();
-            return parent.getText();
+            String text = parent.getText();
+            if (text != null && !text.isEmpty()) {
+                return text;
+            } else if (parent.getRichTextContents() != null && !parent.getRichTextContents().isEmpty()) {
+                String richTextContent = parent.getRichTextContents().get(0);
+                return Html.fromHtml(richTextContent).toString();
+            } else {
+                return "";
+            }
 
         }
 
@@ -452,9 +465,11 @@ public void setApplicationTitle(Context context) {
             Log.d(MainApplication.TAG, "Setting application title to default string: " +
                                        getResources().getString(R.string.app_name));
             AndroidHelper.getActivity(context, Activity.class).setTitle(R.string.app_name);
+
         } else {
             Log.d(MainApplication.TAG, "Setting application title to node name: " + nodeTitle);
             AndroidHelper.getActivity(context, Activity.class).setTitle(nodeTitle);
+            // TODO: java.lang.NullPointerException: Attempt to invoke virtual method 'void android.app.Activity.setTitle(java.lang.CharSequence)' on a null object reference
         }
     }
 
@@ -512,7 +527,7 @@ else if (clickedNode.getMindmapNode().getLink() != null) {
         }
 
         // if the clicked node has a rich text content (and is a leaf), open the rich text
-        else if (clickedNode.getMindmapNode().getRichTextContent() != null) {
+        else if (clickedNode.getMindmapNode().getRichTextContents() != null && !clickedNode.getMindmapNode().getRichTextContents().isEmpty()) {
             clickedNode.openRichText(mainActivity);
         }
 
@@ -651,6 +666,10 @@ public void setDeepestSelectedMindmapNode(MindmapNode deepestSelectedMindmapNode
         this.deepestSelectedMindmapNode = deepestSelectedMindmapNode;
     }
 
+    public void notifyNodeContentChanged(Context context) {
+        setApplicationTitle(context);
+    }
+
     /**
      * The HorizontalMindmapViewGestureDetector should detect the onFling event. However, it never receives the
      * onDown event, so when it gets the onFling the event1 is empty, and we can't detect the fling properly.
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/MindmapNodeLayout.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/MindmapNodeLayout.java
index 4b5f760..ba1a325 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/MindmapNodeLayout.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/MindmapNodeLayout.java
@@ -92,7 +92,7 @@ public MindmapNodeLayout(Context context, MindmapNode mindmapNode) {
         }
 
         // set the rich text icon if it has
-        if (mindmapNode.getRichTextContent() != null) {
+        if (mindmapNode.getRichTextContents() != null && !mindmapNode.getRichTextContents().isEmpty()) {
             iconResourceIds.add(0, resources.getIdentifier("@drawable/richtext", "id", packageName));
         }
 
@@ -217,7 +217,7 @@ public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuIn
         }
 
         // add menu to show rich text, if the node has
-        if (mindmapNode.getRichTextContent() != null) {
+        if (mindmapNode.getRichTextContents() != null && !mindmapNode.getRichTextContents().isEmpty()) {
             menu.add(CONTEXT_MENU_NORMAL_GROUP_ID, R.id.openrichtext, 0, R.string.openrichtext);
         }
 
@@ -347,7 +347,7 @@ public MindmapNode getMindmapNode() {
 
     public void openRichText(MainActivity mainActivity) {
 
-        String richTextContent = getMindmapNode().getRichTextContent();
+        String richTextContent = getMindmapNode().getRichTextContents().get(0);
         Intent intent = new Intent(mainActivity, RichTextViewActivity.class);
         intent.putExtra("richTextContent", richTextContent);
         mainActivity.startActivity(intent);

From fd5bb17639f6cd773a7112c36a6b12ce0bc25313 Mon Sep 17 00:00:00 2001
From: Benedikt Koeppel <be.public@gmail.com>
Date: Wed, 3 Jan 2024 14:39:38 +0100
Subject: [PATCH 28/34] Skip empty richcontent tags

---
 .../controller/AsyncMindmapLoaderTask.java    | 264 +++++++++---------
 1 file changed, 134 insertions(+), 130 deletions(-)

diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
index 41413c5..288c121 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
@@ -202,151 +202,155 @@ public void run() {
                         // (TYPE="NODE"), for "Notes" (TYPE="NOTE"), for "Details" (TYPE="DETAILS").
                         String richTextContent = "";
 
-                        // as we are stream processing the XML, we need to consume the full XML until the
-                        // richcontent tag is closed (i.e. until we're back at the current parsing depth)
-                        // eagerly parse until richcontent node is closed
-                        int startingDepth = xpp.getDepth();
-
-                        int richContentSubParserEventType = xpp.next();
-
-                        do {
-
-                            // EVENT TYPES as reported by next()
-                            switch (richContentSubParserEventType) {
-                                /**
-                                 * Signalize that parser is at the very beginning of the document
-                                 * and nothing was read yet.
-                                 * This event type can only be observed by calling getEvent()
-                                 * before the first call to next(), nextToken, or nextTag()</a>).
-                                 */
-                                case XmlPullParser.START_DOCUMENT:
-                                    throw new IllegalStateException("Received START_DOCUMENT but were already within the document");
-
-                                /**
-                                 * Logical end of the xml document. Returned from getEventType, next()
-                                 * and nextToken()
-                                 * when the end of the input document has been reached.
-                                 * <p><strong>NOTE:</strong> subsequent calls to
-                                 * <a href="#next()">next()</a> or <a href="#nextToken()">nextToken()</a>
-                                 * may result in exception being thrown.
-                                 */
-                                case XmlPullParser.END_DOCUMENT:
-                                    throw new IllegalStateException("Received END_DOCUMENT but expected to just parse a sub-document");
-
-                                /**
-                                 * Returned from getEventType(),
-                                 * <a href="#next()">next()</a>, <a href="#nextToken()">nextToken()</a> when
-                                 * a start tag was read.
-                                 * The name of start tag is available from getName(), its namespace and prefix are
-                                 * available from getNamespace() and getPrefix()
-                                 * if <a href='#FEATURE_PROCESS_NAMESPACES'>namespaces are enabled</a>.
-                                 * See getAttribute* methods to retrieve element attributes.
-                                 * See getNamespace* methods to retrieve newly declared namespaces.
-                                 */
-                                case XmlPullParser.START_TAG: {
-                                    String tagString = "";
-
-                                    String tagName = xpp.getName();
-                                    tagString += "<" + tagName;
-
-                                    for (int i = 0; i < xpp.getAttributeCount(); i++) {
-                                        String attributeName = xpp.getAttributeName(i);
-                                        String attributeValue = xpp.getAttributeValue(i);
-
-                                        String attributeString = " " + attributeName + "=" + '"' + attributeValue + '"';
-                                        tagString += attributeString;
-                                    }
-
-                                    tagString += ">";
+                        // if this is an empty tag, we won't need to bother trying to read its content
+                        // we don't even need to read the <richcontent> node's attributes, as we would
+                        // only be interested in it's children
+                        if (xpp.isEmptyElementTag()) {
 
-                                    richTextContent += tagString;
-
-                                    break;
-                                }
-
-                                /**
-                                 * Returned from getEventType(), <a href="#next()">next()</a>, or
-                                 * <a href="#nextToken()">nextToken()</a> when an end tag was read.
-                                 * The name of start tag is available from getName(), its
-                                 * namespace and prefix are
-                                 * available from getNamespace() and getPrefix().
-                                 */
-                                case XmlPullParser.END_TAG: {
-                                    String tagName = xpp.getName();
-                                    String tagString = "</" + tagName + ">";
-                                    richTextContent += tagString;
-
-//                                    if (xpp.isEmptyElementTag()) {
-//                                        String tagString = "";
-//
-//                                        String tagName = xpp.getName();
-//                                        tagString += "<" + tagName;
-//
-//                                        for (int i = 0; i < xpp.getAttributeCount(); i++) {
-//                                            String attributeName = xpp.getAttributeName(i);
-//                                            String attributeValue = xpp.getAttributeValue(i);
+//                            String tagString = "";
 //
-//                                            String attributeString = " " + attributeName + "=" + '"' + attributeValue + '"';
-//                                            tagString += attributeString;
-//                                        }
+//                            String tagName = xpp.getName();
+//                            tagString += "<" + tagName;
 //
-//                                        tagString += " />";
+//                            for (int i = 0; i < xpp.getAttributeCount(); i++) {
+//                                String attributeName = xpp.getAttributeName(i);
+//                                String attributeValue = xpp.getAttributeValue(i);
 //
-//                                        richTextContent += tagString;
+//                                String attributeString = " " + attributeName + "=" + '"' + attributeValue + '"';
+//                                tagString += attributeString;
+//                            }
 //
-//                                    } else {
+//                            tagString += " />";
 //
-//                                    }
-                                    break;
-                                }
+//                            richTextContent += tagString;
 
-                                /**
-                                 * Character data was read and will is available by calling getText().
-                                 * <p><strong>Please note:</strong> <a href="#next()">next()</a> will
-                                 * accumulate multiple
-                                 * events into one TEXT event, skipping IGNORABLE_WHITESPACE,
-                                 * PROCESSING_INSTRUCTION and COMMENT events,
-                                 * In contrast, <a href="#nextToken()">nextToken()</a> will stop reading
-                                 * text when any other event is observed.
-                                 * Also, when the state was reached by calling next(), the text value will
-                                 * be normalized, whereas getText() will
-                                 * return unnormalized content in the case of nextToken(). This allows
-                                 * an exact roundtrip without changing line ends when examining low
-                                 * level events, whereas for high level applications the text is
-                                 * normalized appropriately.
-                                 */
-                                case XmlPullParser.TEXT: {
-                                    String text = xpp.getText();
-                                    richTextContent += text;
-                                    break;
-                                }
+                            richTextContent = "";
 
-                                default:
-                                    throw new IllegalStateException("Received unexpected event type " + richContentSubParserEventType);
+                        } else {
 
-                            }
+                            // as we are stream processing the XML, we need to consume the full XML until the
+                            // richcontent tag is closed (i.e. until we're back at the current parsing depth)
+                            // eagerly parse until richcontent node is closed
+                            int startingDepth = xpp.getDepth();
+
+                            int richContentSubParserEventType = xpp.next();
+
+                            do {
+
+                                // EVENT TYPES as reported by next()
+                                switch (richContentSubParserEventType) {
+                                    /**
+                                     * Signalize that parser is at the very beginning of the document
+                                     * and nothing was read yet.
+                                     * This event type can only be observed by calling getEvent()
+                                     * before the first call to next(), nextToken, or nextTag()</a>).
+                                     */
+                                    case XmlPullParser.START_DOCUMENT:
+                                        throw new IllegalStateException("Received START_DOCUMENT but were already within the document");
+
+                                    /**
+                                     * Logical end of the xml document. Returned from getEventType, next()
+                                     * and nextToken()
+                                     * when the end of the input document has been reached.
+                                     * <p><strong>NOTE:</strong> subsequent calls to
+                                     * <a href="#next()">next()</a> or <a href="#nextToken()">nextToken()</a>
+                                     * may result in exception being thrown.
+                                     */
+                                    case XmlPullParser.END_DOCUMENT:
+                                        throw new IllegalStateException("Received END_DOCUMENT but expected to just parse a sub-document");
+
+                                    /**
+                                     * Returned from getEventType(),
+                                     * <a href="#next()">next()</a>, <a href="#nextToken()">nextToken()</a> when
+                                     * a start tag was read.
+                                     * The name of start tag is available from getName(), its namespace and prefix are
+                                     * available from getNamespace() and getPrefix()
+                                     * if <a href='#FEATURE_PROCESS_NAMESPACES'>namespaces are enabled</a>.
+                                     * See getAttribute* methods to retrieve element attributes.
+                                     * See getNamespace* methods to retrieve newly declared namespaces.
+                                     */
+                                    case XmlPullParser.START_TAG: {
+                                        String tagString = "";
+
+                                        String tagName = xpp.getName();
+                                        tagString += "<" + tagName;
+
+                                        for (int i = 0; i < xpp.getAttributeCount(); i++) {
+                                            String attributeName = xpp.getAttributeName(i);
+                                            String attributeValue = xpp.getAttributeValue(i);
+
+                                            String attributeString = " " + attributeName + "=" + '"' + attributeValue + '"';
+                                            tagString += attributeString;
+                                        }
+
+                                        tagString += ">";
+
+                                        richTextContent += tagString;
+
+                                        break;
+                                    }
 
-                            richContentSubParserEventType = xpp.next();
+                                    /**
+                                     * Returned from getEventType(), <a href="#next()">next()</a>, or
+                                     * <a href="#nextToken()">nextToken()</a> when an end tag was read.
+                                     * The name of start tag is available from getName(), its
+                                     * namespace and prefix are
+                                     * available from getNamespace() and getPrefix().
+                                     */
+                                    case XmlPullParser.END_TAG: {
+                                        String tagName = xpp.getName();
+                                        String tagString = "</" + tagName + ">";
+                                        richTextContent += tagString;
+                                        break;
+                                    }
 
-                        // stop parsing once we have come out far enough from the XML to be at the starting depth again
-                        } while (xpp.getDepth() != startingDepth);
+                                    /**
+                                     * Character data was read and will is available by calling getText().
+                                     * <p><strong>Please note:</strong> <a href="#next()">next()</a> will
+                                     * accumulate multiple
+                                     * events into one TEXT event, skipping IGNORABLE_WHITESPACE,
+                                     * PROCESSING_INSTRUCTION and COMMENT events,
+                                     * In contrast, <a href="#nextToken()">nextToken()</a> will stop reading
+                                     * text when any other event is observed.
+                                     * Also, when the state was reached by calling next(), the text value will
+                                     * be normalized, whereas getText() will
+                                     * return unnormalized content in the case of nextToken(). This allows
+                                     * an exact roundtrip without changing line ends when examining low
+                                     * level events, whereas for high level applications the text is
+                                     * normalized appropriately.
+                                     */
+                                    case XmlPullParser.TEXT: {
+                                        String text = xpp.getText();
+                                        richTextContent += text;
+                                        break;
+                                    }
 
-                        // if we have no parent node, something went seriously wrong - we can't have a richcontent that is not part of a mindmap node
-                        if (nodeStack.empty()) {
-                            throw new IllegalStateException("Received richtext without a parent node");
-                        }
+                                    default:
+                                        throw new IllegalStateException("Received unexpected event type " + richContentSubParserEventType);
 
-                        MindmapNode parentNode = nodeStack.peek();
-                        parentNode.addRichTextContent(richTextContent);
+                                }
 
-                        // let view know that node content has changed
-                        if (parentNode.hasNodeContentChangedSubscribers()) {
-                            MindmapNode finalParentNode = parentNode;
-                            mainActivity.runOnUiThread(() -> {
-                                finalParentNode.notifySubscribersNodeContentChanged();
-                            });
-                        }
+                                richContentSubParserEventType = xpp.next();
+
+                            // stop parsing once we have come out far enough from the XML to be at the starting depth again
+                            } while (xpp.getDepth() != startingDepth);
+
+                            // if we have no parent node, something went seriously wrong - we can't have a richcontent that is not part of a mindmap node
+                            if (nodeStack.empty()) {
+                                throw new IllegalStateException("Received richtext without a parent node");
+                            }
 
+                            MindmapNode parentNode = nodeStack.peek();
+                            parentNode.addRichTextContent(richTextContent);
+
+                            // let view know that node content has changed
+                            if (parentNode.hasNodeContentChangedSubscribers()) {
+                                MindmapNode finalParentNode = parentNode;
+                                mainActivity.runOnUiThread(() -> {
+                                    finalParentNode.notifySubscribersNodeContentChanged();
+                                });
+                            }
+                        }
 
                     } else {
                         // Log.d(MainApplication.TAG, "Received unknown node " + xpp.getName());

From 9be3413d1139b2e47ca7c167057355570975c9fe Mon Sep 17 00:00:00 2001
From: Benedikt Koeppel <be.public@gmail.com>
Date: Wed, 3 Jan 2024 15:00:55 +0100
Subject: [PATCH 29/34] Change content subscriber to richtext content
 subscriber

---
 .../code/droidplane/MainActivity.java         |  4 +--
 .../controller/AsyncMindmapLoaderTask.java    |  6 ++--
 .../controller/MindmapNodeFromXmlBuilder.java | 29 -------------------
 3 files changed, 5 insertions(+), 34 deletions(-)

diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/MainActivity.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/MainActivity.java
index 8c89de9..ace97ad 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/MainActivity.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/MainActivity.java
@@ -90,7 +90,7 @@ public void onCreate(Bundle savedInstanceState) {
             horizontalMindmapView.setMindmap(mindmap);
             horizontalMindmapView.setDeepestSelectedMindmapNode(mindmap.getRootNode());
             horizontalMindmapView.onRootNodeLoaded();
-            mindmap.getRootNode().subscribeNodeContentChanged(this);
+            mindmap.getRootNode().subscribeNodeRichContentChanged(this);
 
         } else {
 
@@ -380,7 +380,7 @@ private void updateLoadingIndicatorOnUiThread() {
         }
     }
 
-    public void notifyNodeContentChanged() {
+    public void notifyNodeRichContentChanged() {
         this.horizontalMindmapView.notifyNodeContentChanged(this);
     }
 }
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
index 288c121..6bc2751 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
@@ -154,7 +154,7 @@ public void loadDocument(InputStream inputStream) {
                         String text = xpp.getAttributeValue(null, "TEXT");
 
                         MindmapNode newMindmapNode = new MindmapNode(mindmap, parentNode, id, numericId, text);
-                        newMindmapNode.subscribeNodeContentChanged(mainActivity);
+                        newMindmapNode.subscribeNodeRichContentChanged(mainActivity);
                         numNodes += 1;
 
                         if (parentNode == null) {
@@ -344,10 +344,10 @@ public void run() {
                             parentNode.addRichTextContent(richTextContent);
 
                             // let view know that node content has changed
-                            if (parentNode.hasNodeContentChangedSubscribers()) {
+                            if (parentNode.hasNodeRichContentChangedSubscribers()) {
                                 MindmapNode finalParentNode = parentNode;
                                 mainActivity.runOnUiThread(() -> {
-                                    finalParentNode.notifySubscribersNodeContentChanged();
+                                    finalParentNode.notifySubscribersNodeRichContentChanged();
                                 });
                             }
                         }
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/MindmapNodeFromXmlBuilder.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/MindmapNodeFromXmlBuilder.java
index fa7404d..68cf6d8 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/MindmapNodeFromXmlBuilder.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/MindmapNodeFromXmlBuilder.java
@@ -3,35 +3,6 @@
 public class MindmapNodeFromXmlBuilder {
 
 
-//    public static MindmapNode parse(Node node, MindmapNode parentNode, Mindmap mindmap) {
-//        return null;
-//
-//        NodeList richtextNodeList = tmpElement.getChildNodes();
-//        for (int i = 0; i < richtextNodeList.getLength(); i++) {
-//            Node n = richtextNodeList.item(i);
-//            if (n.getNodeType() == Node.ELEMENT_NODE && n.getNodeName().equals("richcontent")) {
-//                Element richcontentElement = (Element)n;
-//                String typeAttribute = richcontentElement.getAttribute("TYPE");
-//                if (typeAttribute.equals("NODE") || typeAttribute.equals("NOTE") || typeAttribute.equals("DETAILS")) {
-//
-//                    // extract the whole rich text (XML), to show in a WebView activity
-//                    try {
-//                        Transformer transformer = TransformerFactory.newInstance().newTransformer();
-//                        ByteArrayOutputStream boas = new ByteArrayOutputStream();
-//                        transformer.transform(new DOMSource(richtextNodeList.item(0)), new StreamResult(boas));
-//                        richTextContent = boas.toString();
-//                    } catch (TransformerException e) {
-//                        e.printStackTrace();
-//                    }
-//
-//                    // if the node has no text itself, then convert the rich text content to a text
-//                    if (text == null || text.equals("")) {
-//                        // convert the content (text only) into a string, to show in the normal list view
-//                        text = Html.fromHtml(richcontentElement.getTextContent()).toString();
-//                    }
-//                }
-//            }
-//        }
 //
 //        // extract styles
 //        NodeList styleNodeList = tmpElement.getChildNodes();

From 3a3a849ab46ebe387f4df3123418c8593c77cf60 Mon Sep 17 00:00:00 2001
From: Benedikt Koeppel <be.public@gmail.com>
Date: Wed, 3 Jan 2024 15:01:03 +0100
Subject: [PATCH 30/34] Load bold and italics

---
 .../controller/AsyncMindmapLoaderTask.java    | 36 ++++++++++++++-
 .../controller/MindmapNodeFromXmlBuilder.java | 19 +-------
 .../code/droidplane/model/MindmapNode.java    | 46 ++++++++++++++++---
 .../droidplane/view/MindmapNodeLayout.java    |  5 ++
 4 files changed, 80 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
index 6bc2751..2d1c3db 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
@@ -190,7 +190,9 @@ public void run() {
 
                         nodeStack.push(newMindmapNode);
 
-                    } else if (xpp.getName().equals("richcontent")
+                    }
+
+                    else if (xpp.getName().equals("richcontent")
                             && (
                             xpp.getAttributeValue(null, "TYPE").equals("NODE")
                                     || xpp.getAttributeValue(null, "TYPE").equals("NOTE")
@@ -352,7 +354,37 @@ public void run() {
                             }
                         }
 
-                    } else {
+                    }
+
+                    else if (xpp.getName().equals("font")) {
+                        String boldAttribute = xpp.getAttributeValue(null, "BOLD");
+
+                        // if we have no parent node, something went seriously wrong - we can't have a font node that is not part of a mindmap node
+                        if (nodeStack.empty()) {
+                            throw new IllegalStateException("Received richtext without a parent node");
+                        }
+                        MindmapNode parentNode = nodeStack.peek();
+
+                        if (boldAttribute != null && boldAttribute.equals("true")) {
+                            parentNode.setBold(true);
+                        }
+
+                        String italicsAttribute = xpp.getAttributeValue(null, "ITALIC");
+                        if (italicsAttribute != null && italicsAttribute.equals("true")) {
+                            parentNode.setItalic(true);
+                        }
+
+                        // let view know that node content has changed
+                        if (parentNode.hasNodeRichContentChangedSubscribers()) {
+                            MindmapNode finalParentNode = parentNode;
+                            mainActivity.runOnUiThread(() -> {
+                                finalParentNode.notifySubscribersNodeStyleChanged();
+                            });
+                        }
+
+                    }
+
+                    else {
                         // Log.d(MainApplication.TAG, "Received unknown node " + xpp.getName());
                     }
 
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/MindmapNodeFromXmlBuilder.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/MindmapNodeFromXmlBuilder.java
index 68cf6d8..c8e8ddb 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/MindmapNodeFromXmlBuilder.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/MindmapNodeFromXmlBuilder.java
@@ -3,24 +3,7 @@
 public class MindmapNodeFromXmlBuilder {
 
 
-//
-//        // extract styles
-//        NodeList styleNodeList = tmpElement.getChildNodes();
-//        boolean isBold = false;
-//        boolean isItalic = false;
-//        for (int i = 0; i < styleNodeList.getLength(); i++) {
-//            Node n = styleNodeList.item(i);
-//            if (n.getNodeType() == Node.ELEMENT_NODE && n.getNodeName().equals("font")) {
-//                Element fontElement = (Element)n;
-//                if (fontElement.hasAttribute("BOLD") && fontElement.getAttribute("BOLD").equals("true")) {
-//                    Log.d(MainApplication.TAG, "Found bold node");
-//                    isBold = true;
-//                }
-//                if (fontElement.hasAttribute("ITALIC") && fontElement.getAttribute("ITALIC").equals("true")) {
-//                    isItalic = true;
-//                }
-//            }
-//        }
+
 //
 //        // extract icons
 //        ArrayList<String> iconNames = getIcons(node);
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java
index 8e53003..d4bc1b3 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java
@@ -1,12 +1,14 @@
 package ch.benediktkoeppel.code.droidplane.model;
 
 import android.net.Uri;
+import android.text.Html;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;
 
 import ch.benediktkoeppel.code.droidplane.MainActivity;
+import ch.benediktkoeppel.code.droidplane.view.MindmapNodeLayout;
 import ch.benediktkoeppel.code.droidplane.view.NodeColumn;
 
 
@@ -50,12 +52,12 @@ public class MindmapNode {
     /**
      * Bold style
      */
-    private final boolean isBold;
+    private boolean isBold;
 
     /**
      * Italic style
      */
-    private final boolean isItalic;
+    private boolean isItalic;
 
     /**
      * The names of the icon
@@ -105,6 +107,7 @@ public class MindmapNode {
     private List<MindmapNode> arrowLinkIncomingNodes = new ArrayList<>();
     private WeakReference<NodeColumn> subscribedNodeColumn = null;
     private WeakReference<MainActivity> subscribedMainActivity = null;
+    private WeakReference<MindmapNodeLayout> subscribedNodeLayout = null;
     private boolean loaded;
 
     public MindmapNode(Mindmap mindmap, MindmapNode parentNode, String id, int numericId, String text) {
@@ -275,6 +278,7 @@ public List<String> getIconNames() {
         return iconNames;
     }
 
+    // TODO: this should probably live in a view controller, not here
     public String getText() {
 
         // if this is a cloned node, get the text from the original node
@@ -286,6 +290,14 @@ public String getText() {
             }
         }
 
+        // if this is a rich text node, get the HTML content instead
+        if (this.text == null && this.getRichTextContents() != null && !this.getRichTextContents().isEmpty()) {
+
+            String richTextContent = this.getRichTextContents().get(0);
+            return Html.fromHtml(richTextContent).toString();
+
+        }
+
         return text;
     }
 
@@ -389,22 +401,44 @@ public void notifySubscribersAddedChildMindmapNode(MindmapNode mindmapNode) {
         }
     }
 
-    public boolean hasNodeContentChangedSubscribers() {
+    public boolean hasNodeRichContentChangedSubscribers() {
         return this.subscribedMainActivity != null;
     }
 
-    public void notifySubscribersNodeContentChanged() {
+    public void notifySubscribersNodeRichContentChanged() {
         if (this.subscribedMainActivity != null) {
-            subscribedMainActivity.get().notifyNodeContentChanged();
+            subscribedMainActivity.get().notifyNodeRichContentChanged();
         }
     }
 
     // TODO: ugly that MainActivity is needed here. Would be better to introduce an listener interface (same for node column above)
-    public void subscribeNodeContentChanged(MainActivity mainActivity) {
+    public void subscribeNodeRichContentChanged(MainActivity mainActivity) {
         this.subscribedMainActivity = new WeakReference<>(mainActivity);
     }
 
     public void setLoaded(boolean loaded) {
         this.loaded = loaded;
     }
+
+    public void setBold(boolean bold) {
+        isBold = bold;
+    }
+
+    public void setItalic(boolean italic) {
+        isItalic = italic;
+    }
+
+    public boolean hasNodeStyleChangedSubscribers() {
+        return this.subscribedNodeLayout != null;
+    }
+
+    public void subscribeNodeStyleChanged(MindmapNodeLayout nodeLayout) {
+        this.subscribedNodeLayout = new WeakReference<>(nodeLayout);
+    }
+
+    public void notifySubscribersNodeStyleChanged() {
+        if (this.subscribedNodeLayout != null) {
+            this.subscribedNodeLayout.get().notifyNodeStyleChanged();
+        }
+    }
 }
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/MindmapNodeLayout.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/MindmapNodeLayout.java
index ba1a325..891fd18 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/MindmapNodeLayout.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/view/MindmapNodeLayout.java
@@ -74,6 +74,7 @@ public MindmapNodeLayout(Context context, MindmapNode mindmapNode) {
         super(context);
 
         this.mindmapNode = mindmapNode;
+        mindmapNode.subscribeNodeStyleChanged(this);
 
         // extract icons
         Resources resources = context.getResources();
@@ -353,4 +354,8 @@ public void openRichText(MainActivity mainActivity) {
         mainActivity.startActivity(intent);
 
     }
+
+    public void notifyNodeStyleChanged() {
+        this.refreshView();
+    }
 }

From 4fb2c35cc2adf7f97bf4966372ec3f94dcb0626f Mon Sep 17 00:00:00 2001
From: Benedikt Koeppel <be.public@gmail.com>
Date: Wed, 3 Jan 2024 15:06:22 +0100
Subject: [PATCH 31/34] Load icons

---
 .../controller/AsyncMindmapLoaderTask.java    | 23 ++++++++++++++++-
 .../controller/MindmapNodeFromXmlBuilder.java | 25 -------------------
 .../code/droidplane/model/MindmapNode.java    |  4 +++
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
index 2d1c3db..c79fe91 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
@@ -375,7 +375,28 @@ else if (xpp.getName().equals("font")) {
                         }
 
                         // let view know that node content has changed
-                        if (parentNode.hasNodeRichContentChangedSubscribers()) {
+                        if (parentNode.hasNodeStyleChangedSubscribers()) {
+                            MindmapNode finalParentNode = parentNode;
+                            mainActivity.runOnUiThread(() -> {
+                                finalParentNode.notifySubscribersNodeStyleChanged();
+                            });
+                        }
+
+                    }
+
+                    else if (xpp.getName().equals("icon") && xpp.getAttributeValue(null, "BUILTIN") != null) {
+                        String iconName = xpp.getAttributeValue(null, "BUILTIN");
+
+                        // if we have no parent node, something went seriously wrong - we can't have icons that is not part of a mindmap node
+                        if (nodeStack.empty()) {
+                            throw new IllegalStateException("Received icon without a parent node");
+                        }
+
+                        MindmapNode parentNode = nodeStack.peek();
+                        parentNode.addIconName(iconName);
+
+                        // let view know that node content has changed
+                        if (parentNode.hasNodeStyleChangedSubscribers()) {
                             MindmapNode finalParentNode = parentNode;
                             mainActivity.runOnUiThread(() -> {
                                 finalParentNode.notifySubscribersNodeStyleChanged();
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/MindmapNodeFromXmlBuilder.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/MindmapNodeFromXmlBuilder.java
index c8e8ddb..107900b 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/MindmapNodeFromXmlBuilder.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/MindmapNodeFromXmlBuilder.java
@@ -105,31 +105,6 @@ public class MindmapNodeFromXmlBuilder {
 //
 //
 //
-//    /**
-//     * Extracts the list of icons from a node and returns the names of the icons as ArrayList.
-//     *
-//     * @return list of names of the icons
-//     */
-//    private static ArrayList<String> getIcons(Node node) {
-//
-//        ArrayList<String> iconsNames = new ArrayList<>();
-//
-//        NodeList childNodes = node.getChildNodes();
-//        for (int i = 0; i < childNodes.getLength(); i++) {
-//
-//            Node n = childNodes.item(i);
-//            if (n.getNodeType() == Node.ELEMENT_NODE) {
-//                Element e = (Element)n;
-//
-//                if (e.getTagName().equals("icon") && e.hasAttribute("BUILTIN")) {
-//                    iconsNames.add(e.getAttribute("BUILTIN"));
-//                }
-//            }
-//        }
-//
-//        return iconsNames;
-//    }
-//
 //
 //
 //    /**
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java
index d4bc1b3..566044c 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java
@@ -441,4 +441,8 @@ public void notifySubscribersNodeStyleChanged() {
             this.subscribedNodeLayout.get().notifyNodeStyleChanged();
         }
     }
+
+    public void addIconName(String iconName) {
+        this.iconNames.add(iconName);
+    }
 }

From 1b11545c231b2c9b88052d934af7cd7bbecd544c Mon Sep 17 00:00:00 2001
From: Benedikt Koeppel <be.public@gmail.com>
Date: Wed, 3 Jan 2024 15:10:38 +0100
Subject: [PATCH 32/34] Load links

---
 .../controller/AsyncMindmapLoaderTask.java       | 10 +++++++++-
 .../controller/MindmapNodeFromXmlBuilder.java    | 16 ----------------
 .../code/droidplane/model/MindmapNode.java       |  4 ++--
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
index c79fe91..aeaeac2 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
@@ -153,7 +153,15 @@ public void loadDocument(InputStream inputStream) {
 
                         String text = xpp.getAttributeValue(null, "TEXT");
 
-                        MindmapNode newMindmapNode = new MindmapNode(mindmap, parentNode, id, numericId, text);
+                        String linkAttribute = xpp.getAttributeValue(null, "LINK");
+                        Uri link;
+                        if (linkAttribute != null && !linkAttribute.equals("")) {
+                            link = Uri.parse(linkAttribute);
+                        } else {
+                            link = null;
+                        }
+
+                        MindmapNode newMindmapNode = new MindmapNode(mindmap, parentNode, id, numericId, text, link);
                         newMindmapNode.subscribeNodeRichContentChanged(mainActivity);
                         numNodes += 1;
 
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/MindmapNodeFromXmlBuilder.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/MindmapNodeFromXmlBuilder.java
index 107900b..ff13c77 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/MindmapNodeFromXmlBuilder.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/MindmapNodeFromXmlBuilder.java
@@ -4,22 +4,6 @@ public class MindmapNodeFromXmlBuilder {
 
 
 
-//
-//        // extract icons
-//        ArrayList<String> iconNames = getIcons(node);
-//
-//        // find out if it has sub nodes
-//        // TODO: this should just go into a getter
-//        boolean isExpandable = (getNumChildMindmapNodes(node) > 0);
-//
-//        // extract link
-//        String linkAttribute = tmpElement.getAttribute("LINK");
-//        Uri link;
-//        if (!linkAttribute.equals("")) {
-//            link = Uri.parse(linkAttribute);
-//        } else {
-//            link = null;
-//        }
 //
 //        // get cloned node's info
 //        String treeIdAttribute = tmpElement.getAttribute("TREE_ID");
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java
index 566044c..b22d7c4 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java
@@ -110,7 +110,7 @@ public class MindmapNode {
     private WeakReference<MindmapNodeLayout> subscribedNodeLayout = null;
     private boolean loaded;
 
-    public MindmapNode(Mindmap mindmap, MindmapNode parentNode, String id, int numericId, String text) {
+    public MindmapNode(Mindmap mindmap, MindmapNode parentNode, String id, int numericId, String text, Uri link) {
         this.mindmap = mindmap;
         this.parentNode = parentNode;
         this.id = id;
@@ -121,7 +121,7 @@ public MindmapNode(Mindmap mindmap, MindmapNode parentNode, String id, int numer
         isBold = false;
         isItalic = false;
         iconNames = new ArrayList<>();
-        link = null;
+        this.link = link;
         treeIdAttribute = null;
         arrowLinkDestinationIds = new ArrayList<>();
         //node = null;

From a412b0b38e78b60773cd3d4cf2abc01a94aa37df Mon Sep 17 00:00:00 2001
From: Benedikt Koeppel <be.public@gmail.com>
Date: Wed, 3 Jan 2024 15:34:17 +0100
Subject: [PATCH 33/34] Load links, cloned nodes and arrows

---
 .../controller/AsyncMindmapLoaderTask.java    |  19 ++-
 .../controller/MindmapNodeFromXmlBuilder.java | 108 +-----------------
 .../code/droidplane/model/MindmapNode.java    |   8 +-
 3 files changed, 25 insertions(+), 110 deletions(-)

diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
index aeaeac2..d7a1d7f 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
@@ -153,6 +153,7 @@ public void loadDocument(InputStream inputStream) {
 
                         String text = xpp.getAttributeValue(null, "TEXT");
 
+                        // get link
                         String linkAttribute = xpp.getAttributeValue(null, "LINK");
                         Uri link;
                         if (linkAttribute != null && !linkAttribute.equals("")) {
@@ -161,7 +162,10 @@ public void loadDocument(InputStream inputStream) {
                             link = null;
                         }
 
-                        MindmapNode newMindmapNode = new MindmapNode(mindmap, parentNode, id, numericId, text, link);
+                        // get tree ID (of cloned node)
+                        String treeIdAttribute = xpp.getAttributeValue(null, "TREE_ID");
+
+                        MindmapNode newMindmapNode = new MindmapNode(mindmap, parentNode, id, numericId, text, link, treeIdAttribute);
                         newMindmapNode.subscribeNodeRichContentChanged(mainActivity);
                         numNodes += 1;
 
@@ -413,6 +417,19 @@ else if (xpp.getName().equals("icon") && xpp.getAttributeValue(null, "BUILTIN")
 
                     }
 
+                    else if (xpp.getName().equals("arrowlink")) {
+                        String destinationId = xpp.getAttributeValue(null, "DESTINATION");
+
+                        // if we have no parent node, something went seriously wrong - we can't have icons that is not part of a mindmap node
+                        if (nodeStack.empty()) {
+                            throw new IllegalStateException("Received arrowlink without a parent node");
+                        }
+
+                        MindmapNode parentNode = nodeStack.peek();
+                        parentNode.addArrowLinkDestinationId(destinationId);
+
+                    }
+
                     else {
                         // Log.d(MainApplication.TAG, "Received unknown node " + xpp.getName());
                     }
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/MindmapNodeFromXmlBuilder.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/MindmapNodeFromXmlBuilder.java
index ff13c77..8d15df6 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/MindmapNodeFromXmlBuilder.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/MindmapNodeFromXmlBuilder.java
@@ -4,111 +4,5 @@ public class MindmapNodeFromXmlBuilder {
 
 
 
-//
-//        // get cloned node's info
-//        String treeIdAttribute = tmpElement.getAttribute("TREE_ID");
-//
-//        // get arrow link destinations
-//        ArrayList<String> arrowLinkDestinationIds = new ArrayList<>();
-//        NodeList arrowlinkList = tmpElement.getChildNodes();
-//        for (int i = 0; i< arrowlinkList.getLength(); i++) {
-//            Node n = arrowlinkList.item(i);
-//            if (n.getNodeType() == Node.ELEMENT_NODE && n.getNodeName().equals("arrowlink")) {
-//                Element arrowlinkElement = (Element)n;
-//                String destinationId = arrowlinkElement.getAttribute("DESTINATION");
-//                arrowLinkDestinationIds.add(destinationId);
-//            }
-//        }
-//
-//
-//        MindmapNodeFromXmlBuilder.getChildNodes(mindmap, mindmapNode, node);
-//
-//        return MindmapNode.builder()
-//                .mindmap(mindmap)
-//                .parentNode(parentNode)
-//                .node(node)
-//                .id(id)
-//                .numericId(numericId)
-//                .richTextContent(richTextContent)
-//                .text(text)
-//                .isBold(isBold)
-//                .isItalic(isItalic)
-//                .iconNames(iconNames)
-//                .isExpandable(isExpandable)
-//                .link(link)
-//                .treeIdAttribute(treeIdAttribute)
-//                .arrowLinkDestinationIds(arrowLinkDestinationIds)
-//                .numChildMindmapNodes(getNumChildMindmapNodes())
-//                .build();
-//    }
-//
-//
-//
-//    /**
-//     * Generates and returns the child nodes of this MindmapNode. getChildNodes() does lazy loading, i.e. it
-//     * generates the child nodes on demand and stores them in childMindmapNodes.
-//     *
-//     * TODO: not so sure if this is really doing lazy loading. We probably call this already pretty early on. Should check.
-//     *
-//     * TODO: this should be called differently, to not confuse it with getChildNodes of Node
-//     *
-//     * @return ArrayList of this MindmapNode's child nodes
-//     */
-//    public static List<MindmapNode> getChildNodes(Mindmap mindmap, MindmapNode mindmapNode, Node node) {
-//
-//        synchronized (mindmapNode) {
-//
-//            // if we haven't loaded the childMindmapNodes before
-//            if (mindmapNode.getChildMindmapNodes() == null) {
-//
-//                // fetch all child DOM Nodes, convert them to MindmapNodes
-//                List<MindmapNode> newChildMindmapNodes = new ArrayList<>();
-//                NodeList childNodes = node.getChildNodes();
-//                for (int i = 0; i < childNodes.getLength(); i++) {
-//                    Node tmpNode = childNodes.item(i);
-//
-//                    if (isMindmapNode(tmpNode)) {
-//                        MindmapNode newChildMindmapNode = parse(tmpNode, mindmapNode, mindmap);
-//                        newChildMindmapNodes.add(newChildMindmapNode);
-//                    }
-//                }
-//
-//                mindmapNode.setChildMindmapNodes(Collections.unmodifiableList(newChildMindmapNodes));
-//
-//            }
-//
-//            // we already did that before, so return the previous result
-//            else {
-//                Log.d(MainApplication.TAG, "Returning cached childMindmapNodes");
-//            }
-//
-//            return mindmapNode.getChildMindmapNodes();
-//        }
-//    }
-//
-//
-//
-//
-//
-//
-//    /**
-//     * Returns the number of child Mindmap nodes
-//     *
-//     * @return
-//     */
-//    public static int getNumChildMindmapNodes(Node node) {
-//
-//        int numMindmapNodes = 0;
-//
-//        NodeList childNodes = node.getChildNodes();
-//        for (int i = 0; i < childNodes.getLength(); i++) {
-//
-//            Node n = childNodes.item(i);
-//            if (isMindmapNode(n)) {
-//                numMindmapNodes++;
-//            }
-//        }
-//
-//        return numMindmapNodes;
-//    }
+
 }
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java
index b22d7c4..979ec68 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/model/MindmapNode.java
@@ -110,7 +110,7 @@ public class MindmapNode {
     private WeakReference<MindmapNodeLayout> subscribedNodeLayout = null;
     private boolean loaded;
 
-    public MindmapNode(Mindmap mindmap, MindmapNode parentNode, String id, int numericId, String text, Uri link) {
+    public MindmapNode(Mindmap mindmap, MindmapNode parentNode, String id, int numericId, String text, Uri link, String treeIdAttribute) {
         this.mindmap = mindmap;
         this.parentNode = parentNode;
         this.id = id;
@@ -122,7 +122,7 @@ public MindmapNode(Mindmap mindmap, MindmapNode parentNode, String id, int numer
         isItalic = false;
         iconNames = new ArrayList<>();
         this.link = link;
-        treeIdAttribute = null;
+        this.treeIdAttribute = treeIdAttribute;
         arrowLinkDestinationIds = new ArrayList<>();
         //node = null;
     }
@@ -445,4 +445,8 @@ public void notifySubscribersNodeStyleChanged() {
     public void addIconName(String iconName) {
         this.iconNames.add(iconName);
     }
+
+    public void addArrowLinkDestinationId(String destinationId) {
+        this.arrowLinkDestinationIds.add(destinationId);
+    }
 }

From 0744596d1e5536820505abb283db09709818fdc5 Mon Sep 17 00:00:00 2001
From: Benedikt Koeppel <be.public@gmail.com>
Date: Wed, 3 Jan 2024 15:51:44 +0100
Subject: [PATCH 34/34] Code cleanup

---
 .../code/droidplane/MainActivity.java         |  24 ++
 .../controller/AsyncMindmapLoaderTask.java    | 333 +++++++++---------
 .../controller/MindmapNodeFromXmlBuilder.java |   8 -
 .../controller/OnRootNodeLoadedListener.java  |   9 +
 4 files changed, 190 insertions(+), 184 deletions(-)
 delete mode 100644 app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/MindmapNodeFromXmlBuilder.java
 create mode 100644 app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/OnRootNodeLoadedListener.java

diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/MainActivity.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/MainActivity.java
index ace97ad..ee9b4f8 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/MainActivity.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/MainActivity.java
@@ -24,6 +24,7 @@
 import com.google.android.gms.analytics.Tracker;
 
 import ch.benediktkoeppel.code.droidplane.controller.AsyncMindmapLoaderTask;
+import ch.benediktkoeppel.code.droidplane.controller.OnRootNodeLoadedListener;
 import ch.benediktkoeppel.code.droidplane.model.Mindmap;
 import ch.benediktkoeppel.code.droidplane.model.MindmapNode;
 import ch.benediktkoeppel.code.droidplane.view.HorizontalMindmapView;
@@ -94,9 +95,32 @@ public void onCreate(Bundle savedInstanceState) {
 
         } else {
 
+            OnRootNodeLoadedListener onRootNodeLoadedListener = new OnRootNodeLoadedListener() {
+                @Override
+                public void rootNodeLoaded(Mindmap mindmap, MindmapNode rootNode) {
+                    // now set up the view
+                    MindmapNode finalRootNode = rootNode;
+                    runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+
+                            horizontalMindmapView.setMindmap(mindmap);
+
+                            // by default, the root node is the deepest node that is expanded
+                            horizontalMindmapView.setDeepestSelectedMindmapNode(finalRootNode);
+
+                            horizontalMindmapView.onRootNodeLoaded();
+
+                        }
+                    });
+
+                }
+            };
+
             // load the file asynchronously
             new AsyncMindmapLoaderTask(
                     this,
+                    onRootNodeLoadedListener,
                     mindmap,
                     horizontalMindmapView,
                     getIntent()
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
index d7a1d7f..e15948f 100644
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/AsyncMindmapLoaderTask.java
@@ -11,9 +11,11 @@
 import com.google.android.gms.analytics.Tracker;
 
 import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
 import org.xmlpull.v1.XmlPullParserFactory;
 
 import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -31,19 +33,25 @@
 
 public class AsyncMindmapLoaderTask extends AsyncTask<String, Void, Object> {
 
+    // TODO: why is MainActivty needed here?
     private final MainActivity mainActivity;
     private final Intent intent;
     private final String action;
+
+    // TODO: why is HorizontalMindmapView needed here?
     private final HorizontalMindmapView horizontalMindmapView;
 
     private final Mindmap mindmap;
+    private final OnRootNodeLoadedListener onRootNodeLoadedListener;
 
     public AsyncMindmapLoaderTask(MainActivity mainActivity,
+                                  OnRootNodeLoadedListener onRootNodeLoadedListener,
                                   Mindmap mindmap,
                                   HorizontalMindmapView horizontalMindmapView,
                                   Intent intent) {
 
         this.mainActivity = mainActivity;
+        this.onRootNodeLoadedListener = onRootNodeLoadedListener;
         this.intent = intent;
         this.action = intent.getAction();
         this.horizontalMindmapView = horizontalMindmapView;
@@ -112,27 +120,25 @@ public void loadDocument(InputStream inputStream) {
         // show loading indicator
         mainActivity.setMindmapIsLoading(true);
 
-        // idea: maybe move to a streaming parser, and just append elements to the view as they become available
-        // https://github.com/FasterXML/woodstox
-
         // start measuring the document load time
         long loadDocumentStartTime = System.currentTimeMillis();
 
         MindmapNode rootNode = null;
-
-
         Stack<MindmapNode> nodeStack = new Stack<>();
         int numNodes = 0;
 
         try {
+            // set up XML pull parsing
             XmlPullParserFactory factory = XmlPullParserFactory.newInstance();
             factory.setNamespaceAware(true);
             XmlPullParser xpp = factory.newPullParser();
-
             xpp.setInput(inputStream, "UTF-8");
+
+            // stream parse the XML
             int eventType = xpp.getEventType();
             while (eventType != XmlPullParser.END_DOCUMENT) {
                 if (eventType == XmlPullParser.START_DOCUMENT) {
+                    Log.d(MainApplication.TAG, "Received XML Start Document");
 
                 } else if (eventType == XmlPullParser.START_TAG) {
 
@@ -143,52 +149,17 @@ public void loadDocument(InputStream inputStream) {
                             parentNode = nodeStack.peek();
                         }
 
-                        String id = xpp.getAttributeValue(null, "ID");
-                        int numericId;
-                        try {
-                            numericId = Integer.parseInt(id.replaceAll("\\D+", ""));
-                        } catch (NumberFormatException e) {
-                            numericId = id.hashCode();
-                        }
-
-                        String text = xpp.getAttributeValue(null, "TEXT");
-
-                        // get link
-                        String linkAttribute = xpp.getAttributeValue(null, "LINK");
-                        Uri link;
-                        if (linkAttribute != null && !linkAttribute.equals("")) {
-                            link = Uri.parse(linkAttribute);
-                        } else {
-                            link = null;
-                        }
-
-                        // get tree ID (of cloned node)
-                        String treeIdAttribute = xpp.getAttributeValue(null, "TREE_ID");
+                        MindmapNode newMindmapNode = parseNodeTag(xpp, parentNode);
+                        nodeStack.push(newMindmapNode);
+                        numNodes += 1;
 
-                        MindmapNode newMindmapNode = new MindmapNode(mindmap, parentNode, id, numericId, text, link, treeIdAttribute);
                         newMindmapNode.subscribeNodeRichContentChanged(mainActivity);
-                        numNodes += 1;
 
+                        // if we don't have a parent node, then this is the root node
                         if (parentNode == null) {
                             rootNode = newMindmapNode;
-
                             mindmap.setRootNode(rootNode);
-
-                            // now set up the view
-                            MindmapNode finalRootNode = rootNode;
-                            mainActivity.runOnUiThread(new Runnable() {
-                                @Override
-                                public void run() {
-
-                                    horizontalMindmapView.setMindmap(mindmap);
-
-                                    // by default, the root node is the deepest node that is expanded
-                                    horizontalMindmapView.setDeepestSelectedMindmapNode(finalRootNode);
-
-                                    horizontalMindmapView.onRootNodeLoaded();
-
-                                }
-                            });
+                            onRootNodeLoadedListener.rootNodeLoaded(mindmap, rootNode);
 
                         } else {
                             parentNode.addChildMindmapNode(newMindmapNode);
@@ -200,8 +171,6 @@ public void run() {
                             }
                         }
 
-                        nodeStack.push(newMindmapNode);
-
                     }
 
                     else if (xpp.getName().equals("richcontent")
@@ -214,140 +183,15 @@ else if (xpp.getName().equals("richcontent")
 
                         // extract the richcontent (HTML) of the node. This works both for nodes with a rich text content
                         // (TYPE="NODE"), for "Notes" (TYPE="NOTE"), for "Details" (TYPE="DETAILS").
-                        String richTextContent = "";
 
                         // if this is an empty tag, we won't need to bother trying to read its content
                         // we don't even need to read the <richcontent> node's attributes, as we would
                         // only be interested in it's children
                         if (xpp.isEmptyElementTag()) {
-
-//                            String tagString = "";
-//
-//                            String tagName = xpp.getName();
-//                            tagString += "<" + tagName;
-//
-//                            for (int i = 0; i < xpp.getAttributeCount(); i++) {
-//                                String attributeName = xpp.getAttributeName(i);
-//                                String attributeValue = xpp.getAttributeValue(i);
-//
-//                                String attributeString = " " + attributeName + "=" + '"' + attributeValue + '"';
-//                                tagString += attributeString;
-//                            }
-//
-//                            tagString += " />";
-//
-//                            richTextContent += tagString;
-
-                            richTextContent = "";
+                            Log.d(MainApplication.TAG, "Received empty richcontent node - skipping");
 
                         } else {
-
-                            // as we are stream processing the XML, we need to consume the full XML until the
-                            // richcontent tag is closed (i.e. until we're back at the current parsing depth)
-                            // eagerly parse until richcontent node is closed
-                            int startingDepth = xpp.getDepth();
-
-                            int richContentSubParserEventType = xpp.next();
-
-                            do {
-
-                                // EVENT TYPES as reported by next()
-                                switch (richContentSubParserEventType) {
-                                    /**
-                                     * Signalize that parser is at the very beginning of the document
-                                     * and nothing was read yet.
-                                     * This event type can only be observed by calling getEvent()
-                                     * before the first call to next(), nextToken, or nextTag()</a>).
-                                     */
-                                    case XmlPullParser.START_DOCUMENT:
-                                        throw new IllegalStateException("Received START_DOCUMENT but were already within the document");
-
-                                    /**
-                                     * Logical end of the xml document. Returned from getEventType, next()
-                                     * and nextToken()
-                                     * when the end of the input document has been reached.
-                                     * <p><strong>NOTE:</strong> subsequent calls to
-                                     * <a href="#next()">next()</a> or <a href="#nextToken()">nextToken()</a>
-                                     * may result in exception being thrown.
-                                     */
-                                    case XmlPullParser.END_DOCUMENT:
-                                        throw new IllegalStateException("Received END_DOCUMENT but expected to just parse a sub-document");
-
-                                    /**
-                                     * Returned from getEventType(),
-                                     * <a href="#next()">next()</a>, <a href="#nextToken()">nextToken()</a> when
-                                     * a start tag was read.
-                                     * The name of start tag is available from getName(), its namespace and prefix are
-                                     * available from getNamespace() and getPrefix()
-                                     * if <a href='#FEATURE_PROCESS_NAMESPACES'>namespaces are enabled</a>.
-                                     * See getAttribute* methods to retrieve element attributes.
-                                     * See getNamespace* methods to retrieve newly declared namespaces.
-                                     */
-                                    case XmlPullParser.START_TAG: {
-                                        String tagString = "";
-
-                                        String tagName = xpp.getName();
-                                        tagString += "<" + tagName;
-
-                                        for (int i = 0; i < xpp.getAttributeCount(); i++) {
-                                            String attributeName = xpp.getAttributeName(i);
-                                            String attributeValue = xpp.getAttributeValue(i);
-
-                                            String attributeString = " " + attributeName + "=" + '"' + attributeValue + '"';
-                                            tagString += attributeString;
-                                        }
-
-                                        tagString += ">";
-
-                                        richTextContent += tagString;
-
-                                        break;
-                                    }
-
-                                    /**
-                                     * Returned from getEventType(), <a href="#next()">next()</a>, or
-                                     * <a href="#nextToken()">nextToken()</a> when an end tag was read.
-                                     * The name of start tag is available from getName(), its
-                                     * namespace and prefix are
-                                     * available from getNamespace() and getPrefix().
-                                     */
-                                    case XmlPullParser.END_TAG: {
-                                        String tagName = xpp.getName();
-                                        String tagString = "</" + tagName + ">";
-                                        richTextContent += tagString;
-                                        break;
-                                    }
-
-                                    /**
-                                     * Character data was read and will is available by calling getText().
-                                     * <p><strong>Please note:</strong> <a href="#next()">next()</a> will
-                                     * accumulate multiple
-                                     * events into one TEXT event, skipping IGNORABLE_WHITESPACE,
-                                     * PROCESSING_INSTRUCTION and COMMENT events,
-                                     * In contrast, <a href="#nextToken()">nextToken()</a> will stop reading
-                                     * text when any other event is observed.
-                                     * Also, when the state was reached by calling next(), the text value will
-                                     * be normalized, whereas getText() will
-                                     * return unnormalized content in the case of nextToken(). This allows
-                                     * an exact roundtrip without changing line ends when examining low
-                                     * level events, whereas for high level applications the text is
-                                     * normalized appropriately.
-                                     */
-                                    case XmlPullParser.TEXT: {
-                                        String text = xpp.getText();
-                                        richTextContent += text;
-                                        break;
-                                    }
-
-                                    default:
-                                        throw new IllegalStateException("Received unexpected event type " + richContentSubParserEventType);
-
-                                }
-
-                                richContentSubParserEventType = xpp.next();
-
-                            // stop parsing once we have come out far enough from the XML to be at the starting depth again
-                            } while (xpp.getDepth() != startingDepth);
+                            String richTextContent = loadRichContentNodes(xpp);
 
                             // if we have no parent node, something went seriously wrong - we can't have a richcontent that is not part of a mindmap node
                             if (nodeStack.empty()) {
@@ -365,7 +209,6 @@ else if (xpp.getName().equals("richcontent")
                                 });
                             }
                         }
-
                     }
 
                     else if (xpp.getName().equals("font")) {
@@ -497,6 +340,144 @@ else if (xpp.getName().equals("arrowlink")) {
 
     }
 
+    private String loadRichContentNodes(XmlPullParser xpp) throws IOException, XmlPullParserException {
+        // as we are stream processing the XML, we need to consume the full XML until the
+        // richcontent tag is closed (i.e. until we're back at the current parsing depth)
+        // eagerly parse until richcontent node is closed
+        int startingDepth = xpp.getDepth();
+        String richTextContent = "";
+
+        int richContentSubParserEventType = xpp.next();
+
+        do {
+
+            // EVENT TYPES as reported by next()
+            switch (richContentSubParserEventType) {
+                /**
+                 * Signalize that parser is at the very beginning of the document
+                 * and nothing was read yet.
+                 * This event type can only be observed by calling getEvent()
+                 * before the first call to next(), nextToken, or nextTag()</a>).
+                 */
+                case XmlPullParser.START_DOCUMENT:
+                    throw new IllegalStateException("Received START_DOCUMENT but were already within the document");
+
+                /**
+                 * Logical end of the xml document. Returned from getEventType, next()
+                 * and nextToken()
+                 * when the end of the input document has been reached.
+                 * <p><strong>NOTE:</strong> subsequent calls to
+                 * <a href="#next()">next()</a> or <a href="#nextToken()">nextToken()</a>
+                 * may result in exception being thrown.
+                 */
+                case XmlPullParser.END_DOCUMENT:
+                    throw new IllegalStateException("Received END_DOCUMENT but expected to just parse a sub-document");
+
+                /**
+                 * Returned from getEventType(),
+                 * <a href="#next()">next()</a>, <a href="#nextToken()">nextToken()</a> when
+                 * a start tag was read.
+                 * The name of start tag is available from getName(), its namespace and prefix are
+                 * available from getNamespace() and getPrefix()
+                 * if <a href='#FEATURE_PROCESS_NAMESPACES'>namespaces are enabled</a>.
+                 * See getAttribute* methods to retrieve element attributes.
+                 * See getNamespace* methods to retrieve newly declared namespaces.
+                 */
+                case XmlPullParser.START_TAG: {
+                    String tagString = "";
+
+                    String tagName = xpp.getName();
+                    tagString += "<" + tagName;
+
+                    for (int i = 0; i < xpp.getAttributeCount(); i++) {
+                        String attributeName = xpp.getAttributeName(i);
+                        String attributeValue = xpp.getAttributeValue(i);
+
+                        String attributeString = " " + attributeName + "=" + '"' + attributeValue + '"';
+                        tagString += attributeString;
+                    }
+
+                    tagString += ">";
+
+                    richTextContent += tagString;
+
+                    break;
+                }
+
+                /**
+                 * Returned from getEventType(), <a href="#next()">next()</a>, or
+                 * <a href="#nextToken()">nextToken()</a> when an end tag was read.
+                 * The name of start tag is available from getName(), its
+                 * namespace and prefix are
+                 * available from getNamespace() and getPrefix().
+                 */
+                case XmlPullParser.END_TAG: {
+                    String tagName = xpp.getName();
+                    String tagString = "</" + tagName + ">";
+                    richTextContent += tagString;
+                    break;
+                }
+
+                /**
+                 * Character data was read and will is available by calling getText().
+                 * <p><strong>Please note:</strong> <a href="#next()">next()</a> will
+                 * accumulate multiple
+                 * events into one TEXT event, skipping IGNORABLE_WHITESPACE,
+                 * PROCESSING_INSTRUCTION and COMMENT events,
+                 * In contrast, <a href="#nextToken()">nextToken()</a> will stop reading
+                 * text when any other event is observed.
+                 * Also, when the state was reached by calling next(), the text value will
+                 * be normalized, whereas getText() will
+                 * return unnormalized content in the case of nextToken(). This allows
+                 * an exact roundtrip without changing line ends when examining low
+                 * level events, whereas for high level applications the text is
+                 * normalized appropriately.
+                 */
+                case XmlPullParser.TEXT: {
+                    String text = xpp.getText();
+                    richTextContent += text;
+                    break;
+                }
+
+                default:
+                    throw new IllegalStateException("Received unexpected event type " + richContentSubParserEventType);
+
+            }
+
+            richContentSubParserEventType = xpp.next();
+
+        // stop parsing once we have come out far enough from the XML to be at the starting depth again
+        } while (xpp.getDepth() != startingDepth);
+        return richTextContent;
+    }
+
+    private MindmapNode parseNodeTag(XmlPullParser xpp, MindmapNode parentNode) {
+        String id = xpp.getAttributeValue(null, "ID");
+        int numericId;
+        try {
+            numericId = Integer.parseInt(id.replaceAll("\\D+", ""));
+        } catch (NumberFormatException e) {
+            numericId = id.hashCode();
+        }
+
+        String text = xpp.getAttributeValue(null, "TEXT");
+
+        // get link
+        String linkAttribute = xpp.getAttributeValue(null, "LINK");
+        Uri link;
+        if (linkAttribute != null && !linkAttribute.equals("")) {
+            link = Uri.parse(linkAttribute);
+        } else {
+            link = null;
+        }
+
+        // get tree ID (of cloned node)
+        String treeIdAttribute = xpp.getAttributeValue(null, "TREE_ID");
+
+        MindmapNode newMindmapNode = new MindmapNode(mindmap, parentNode, id, numericId, text, link, treeIdAttribute);
+        return newMindmapNode;
+    }
+
 
     /**
      * Index all nodes (and child nodes) by their ID, for fast lookup
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/MindmapNodeFromXmlBuilder.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/MindmapNodeFromXmlBuilder.java
deleted file mode 100644
index 8d15df6..0000000
--- a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/MindmapNodeFromXmlBuilder.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package ch.benediktkoeppel.code.droidplane.controller;
-
-public class MindmapNodeFromXmlBuilder {
-
-
-
-
-}
diff --git a/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/OnRootNodeLoadedListener.java b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/OnRootNodeLoadedListener.java
new file mode 100644
index 0000000..2d28d14
--- /dev/null
+++ b/app/src/main/java/ch/benediktkoeppel/code/droidplane/controller/OnRootNodeLoadedListener.java
@@ -0,0 +1,9 @@
+package ch.benediktkoeppel.code.droidplane.controller;
+
+import ch.benediktkoeppel.code.droidplane.model.Mindmap;
+import ch.benediktkoeppel.code.droidplane.model.MindmapNode;
+
+public interface OnRootNodeLoadedListener {
+
+    void rootNodeLoaded(Mindmap mindmap, MindmapNode rootNode);
+}