Integrate Dependency Loading

Author: jkmassel

android/app/src/main/AndroidManifest.xml

@@ -36,6 +36,9 @@
         <activity
             android:name=".EditorActivity"
             android:exported="false" />
+        <activity
+            android:name=".SitePreparationActivity"
+            android:exported="false" />
     </application>
     <uses-permission android:name="android.permission.INTERNET"/>
 </manifest>

android/app/src/main/java/com/example/gutenbergkit/EditorActivity.kt

@@ -41,6 +41,7 @@ import com.example.gutenbergkit.ui.theme.AppTheme
 import kotlinx.coroutines.launch
 import org.wordpress.gutenberg.model.EditorConfiguration
 import org.wordpress.gutenberg.GutenbergView
+import org.wordpress.gutenberg.model.EditorDependencies
 
 class EditorActivity : ComponentActivity() {
     private var gutenbergView: GutenbergView? = null
@@ -75,12 +76,16 @@ class EditorActivity : ComponentActivity() {
             } else {
                 @Suppress("DEPRECATION")
                 intent.getParcelableExtra<EditorConfiguration>(MainActivity.EXTRA_CONFIGURATION)
-            } ?: EditorConfiguration.builder().build()
+            } ?: EditorConfiguration.bundled()
+
+        // Get dependencies from the holder (set by SitePreparationActivity)
+        val dependencies = EditorDependenciesHolder.getAndClear()
 
         setContent {
             AppTheme {
                 EditorScreen(
                     configuration = configuration,
+                    dependencies = dependencies,
                     onClose = { finish() },
                     onGutenbergViewCreated = { view ->
                         gutenbergView = view
@@ -102,6 +107,7 @@ class EditorActivity : ComponentActivity() {
 @Composable
 fun EditorScreen(
     configuration: EditorConfiguration,
+    dependencies: EditorDependencies? = null,
     onClose: () -> Unit,
     onGutenbergViewCreated: (GutenbergView) -> Unit = {}
 ) {
@@ -255,7 +261,7 @@ fun EditorScreen(
                             }
                         }
                     })
-                    start(configuration)
+                    start(configuration, dependencies)
                     onGutenbergViewCreated(this)
                 }
             },

android/app/src/main/java/com/example/gutenbergkit/EditorDependenciesHolder.kt

@@ -0,0 +1,37 @@
+package com.example.gutenbergkit
+
+import org.wordpress.gutenberg.model.EditorDependencies
+
+/**
+ * A simple holder for passing EditorDependencies between activities.
+ *
+ * Since EditorDependencies contains complex nested objects that aren't easily
+ * Parcelable, we use this singleton to temporarily hold the dependencies when
+ * navigating from SitePreparationActivity to EditorActivity.
+ *
+ * Usage:
+ * 1. Set dependencies before starting EditorActivity
+ * 2. Retrieve and clear in EditorActivity.onCreate()
+ */
+object EditorDependenciesHolder {
+    private var dependencies: EditorDependencies? = null
+
+    /**
+     * Stores dependencies to be retrieved by the next activity.
+     */
+    fun set(dependencies: EditorDependencies?) {
+        this.dependencies = dependencies
+    }
+
+    /**
+     * Retrieves and clears the stored dependencies.
+     *
+     * This method clears the holder after retrieval to prevent memory leaks
+     * and ensure dependencies are only used once.
+     */
+    fun getAndClear(): EditorDependencies? {
+        val result = dependencies
+        dependencies = null
+        return result
+    }
+}

android/app/src/main/java/com/example/gutenbergkit/MainActivity.kt

@@ -5,6 +5,7 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -46,6 +47,7 @@ import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.launch
 import org.wordpress.gutenberg.BuildConfig
 import org.wordpress.gutenberg.model.EditorConfiguration
+import uniffi.wp_api.PostType
 
 class MainActivity : ComponentActivity(), AuthenticationManager.AuthenticationCallback {
     private val configurations = mutableStateListOf<ConfigurationItem>()
@@ -78,7 +80,7 @@ class MainActivity : ComponentActivity(), AuthenticationManager.AuthenticationCa
                     configurations = configurations,
                     onConfigurationClick = { config ->
                         when (config) {
-                            is ConfigurationItem.BundledEditor -> launchEditor(createBundledConfiguration())
+                            is ConfigurationItem.BundledEditor -> launchSitePreparation(config)
                             is ConfigurationItem.ConfiguredEditor -> loadConfiguredEditor(config)
                         }
                     },
@@ -105,58 +107,36 @@ class MainActivity : ComponentActivity(), AuthenticationManager.AuthenticationCa
     }
 
     private fun createBundledConfiguration(): EditorConfiguration =
-        createCommonConfigurationBuilder()
+        createCommonConfigurationBuilder(
+            siteUrl = "https://example.com",
+            siteApiRoot = "https://example.com",
+            postType = "post"
+        )
             .setPlugins(false)
-            .setSiteURL("")
-            .setSiteApiRoot("")
             .setSiteApiNamespace(arrayOf())
             .setNamespaceExcludedPaths(arrayOf())
             .setAuthHeader("")
             .setCookies(emptyMap())
+            .setEnableOfflineMode(true)
             .build()
 
     private fun loadConfiguredEditor(config: ConfigurationItem.ConfiguredEditor) {
-        isLoadingCapabilities.value = true
-
-        lifecycleScope.launch {
-            try {
-                val capabilities = siteCapabilitiesDiscovery.discoverCapabilities(
-                    siteApiRoot = config.siteApiRoot
-                )
-
-                val editorConfiguration = createCommonConfigurationBuilder()
-                    .setPlugins(capabilities.supportsPlugins)
-                    .setThemeStyles(capabilities.supportsThemeStyles)
-                    .setSiteURL(config.siteUrl)
-                    .setSiteApiRoot(config.siteApiRoot)
-                    .setNamespaceExcludedPaths(arrayOf())
-                    .setAuthHeader(config.authHeader)
-                    .build()
-
-                isLoadingCapabilities.value = false
-                launchEditor(editorConfiguration)
-            } catch (e: Exception) {
-                isLoadingCapabilities.value = false
-                // If capability discovery fails, use default configuration
-                val defaultConfiguration = createCommonConfigurationBuilder()
-                    .setPlugins(false)
-                    .setThemeStyles(false)
-                    .setSiteURL(config.siteUrl)
-                    .setSiteApiRoot(config.siteApiRoot)
-                    .setNamespaceExcludedPaths(arrayOf())
-                    .setAuthHeader(config.authHeader)
-                    .build()
+        launchSitePreparation(config)
+    }
 
-                launchEditor(defaultConfiguration)
-            }
-        }
+    private fun launchSitePreparation(config: ConfigurationItem) {
+        val intent = SitePreparationActivity.createIntent(this, config)
+        startActivity(intent)
     }
 
-    private fun createCommonConfigurationBuilder(): EditorConfiguration.Builder =
-        EditorConfiguration.builder()
+    private fun createCommonConfigurationBuilder(siteUrl: String, siteApiRoot: String, postType: String = "post"): EditorConfiguration.Builder =
+        EditorConfiguration.builder(
+            siteURL = siteUrl,
+            siteApiRoot = siteApiRoot,
+            postType = postType
+        )
             .setTitle("")
             .setContent("")
-            .setPostType("post")
             .setThemeStyles(false)
             .setHideTitle(false)
             .setCookies(emptyMap())
@@ -343,7 +323,7 @@ fun MainScreen(
     }
 }
 
-@OptIn(androidx.compose.foundation.ExperimentalFoundationApi::class)
+@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun ConfigurationCard(
     configuration: ConfigurationItem,