Declarative UI

app/src/main/java/com/nextcloud/client/database/NextcloudDatabase.kt

@@ -91,7 +91,8 @@ import com.owncloud.android.db.ProviderMeta
         AutoMigration(from = 92, to = 93, spec = DatabaseMigrationUtil.ResetCapabilitiesPostMigration::class),
         AutoMigration(from = 93, to = 94, spec = DatabaseMigrationUtil.ResetCapabilitiesPostMigration::class),
         AutoMigration(from = 94, to = 95, spec = DatabaseMigrationUtil.ResetCapabilitiesPostMigration::class),
-        AutoMigration(from = 95, to = 96)
+        AutoMigration(from = 95, to = 96),
+        AutoMigration(from = 96, to = 97, spec = DatabaseMigrationUtil.ResetCapabilitiesPostMigration::class)
     ],
     exportSchema = true
 )

app/src/main/java/com/nextcloud/client/database/entity/CapabilityEntity.kt

@@ -146,5 +146,7 @@ data class CapabilityEntity(
     @ColumnInfo(name = ProviderTableMeta.CAPABILITIES_WINDOWS_COMPATIBLE_FILENAMES)
     val isWCFEnabled: Int?,
     @ColumnInfo(name = ProviderTableMeta.CAPABILITIES_HAS_VALID_SUBSCRIPTION)
-    val hasValidSubscription: Int?
+    val hasValidSubscription: Int?,
+    @ColumnInfo(name = ProviderTableMeta.CAPABILITIES_CLIENT_INTEGRATION_JSON)
+    val clientIntegrationJson: String?
 )

app/src/main/java/com/nextcloud/ui/ClientIntegrationScreen.kt

@@ -0,0 +1,170 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2025 Alper Ozturk <alper.ozturk@nextcloud.com>
+ * SPDX-FileCopyrightText: 2025 Tobias Kaminsky <tobias.kaminsky@nextcloud.com>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package com.nextcloud.ui
+
+import android.app.Activity
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Close
+import androidx.compose.material3.Button
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.tooling.preview.Preview
+import com.nextcloud.android.lib.resources.clientintegration.ClientIntegrationUI
+import com.nextcloud.android.lib.resources.clientintegration.Element
+import com.nextcloud.android.lib.resources.clientintegration.Layout
+import com.nextcloud.android.lib.resources.clientintegration.LayoutButton
+import com.nextcloud.android.lib.resources.clientintegration.LayoutOrientation
+import com.nextcloud.android.lib.resources.clientintegration.LayoutRow
+import com.nextcloud.android.lib.resources.clientintegration.LayoutText
+import com.nextcloud.android.lib.resources.clientintegration.LayoutURL
+import com.nextcloud.utils.extensions.getActivity
+import com.owncloud.android.lib.resources.status.OCCapability
+import com.owncloud.android.utils.DisplayUtils
+
+@Composable
+fun ClientIntegrationScreen(clientIntegrationUI: ClientIntegrationUI, baseUrl: String) {
+    val activity = LocalContext.current.getActivity()
+    val layoutRows = clientIntegrationUI.root?.rows ?: listOf()
+
+    Scaffold(topBar = {
+        Row(Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.End) {
+            IconButton(onClick = { activity?.finish() }) {
+                Icon(
+                    imageVector = Icons.Filled.Close,
+                    contentDescription = "Close"
+                )
+            }
+        }
+    }, modifier = Modifier.fillMaxSize()) {
+        when (clientIntegrationUI.root?.orientation) {
+            LayoutOrientation.VERTICAL -> {
+                LazyColumn(modifier = Modifier.padding(it)) {
+                    items(layoutRows) { row ->
+                        LazyRow {
+                            items(row.children) { element ->
+                                DisplayElement(element, baseUrl, activity)
+                            }
+                        }
+                    }
+                }
+            }
+            else -> {
+                LazyRow(modifier = Modifier.padding(it)) {
+                    items(layoutRows) { row ->
+                        LazyColumn {
+                            items(row.children) { element ->
+                                DisplayElement(element, baseUrl, activity)
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun DisplayElement(element: Element, baseUrl: String, activity: Activity?) {
+    when (element) {
+        is LayoutButton -> Button(onClick = { }) {
+            Text(element.label)
+        }
+
+        is LayoutURL -> TextButton({
+            openLink(activity, baseUrl, element.url)
+        }) { Text(element.text) }
+
+        is LayoutText -> Text(element.text)
+    }
+}
+
+private fun openLink(activity: Activity?, baseUrl: String, relativeUrl: String) {
+    activity?.let {
+        DisplayUtils.startLinkIntent(activity, baseUrl + relativeUrl)
+    }
+}
+
+@Composable
+@Preview
+private fun ClientIntegrationScreenPreviewVertical() {
+    val clientIntegrationUI = ClientIntegrationUI(
+        OCCapability.CLIENT_INTEGRATION_VERSION,
+        Layout(
+            LayoutOrientation.VERTICAL,
+            mutableListOf(
+                LayoutRow(
+                    listOf(LayoutButton("Click", "Primary"), LayoutText("123"))
+                ),
+                LayoutRow(
+                    listOf(LayoutButton("Click2", "Primary"))
+                ),
+                LayoutRow(
+                    listOf(LayoutURL("Analytics report created", "https://nextcloud.com"))
+                )
+            )
+        )
+    )
+
+    ClientIntegrationScreen(
+        clientIntegrationUI,
+        "http://nextcloud.local"
+    )
+}
+
+@Composable
+@Preview
+private fun ClientIntegrationScreenPreviewHorizontal() {
+    val clientIntegrationUI = ClientIntegrationUI(
+        OCCapability.CLIENT_INTEGRATION_VERSION,
+        Layout(
+            LayoutOrientation.HORIZONTAL,
+            mutableListOf(
+                LayoutRow(
+                    listOf(LayoutButton("Click", "Primary"), LayoutText("123"))
+                ),
+                LayoutRow(
+                    listOf(LayoutButton("Click2", "Primary"))
+                ),
+                LayoutRow(
+                    listOf(LayoutURL("Analytics report created", "https://nextcloud.com"))
+                )
+            )
+        )
+    )
+
+    ClientIntegrationScreen(clientIntegrationUI, "http://nextcloud.local")
+}
+
+@Composable
+@Preview
+private fun ClientIntegrationScreenPreviewEmpty() {
+    val clientIntegrationUI = ClientIntegrationUI(
+        OCCapability.CLIENT_INTEGRATION_VERSION,
+        Layout(
+            LayoutOrientation.HORIZONTAL,
+            emptyList()
+        )
+    )
+
+    ClientIntegrationScreen(clientIntegrationUI, "http://nextcloud.local")
+}

app/src/main/java/com/nextcloud/ui/composeActivity/ComposeActivity.kt

@@ -9,6 +9,7 @@ package com.nextcloud.ui.composeActivity
 
 import android.os.Bundle
 import android.view.MenuItem
+import android.view.View
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -25,6 +26,8 @@ import com.nextcloud.client.assistant.repository.local.AssistantLocalRepositoryI
 import com.nextcloud.client.assistant.repository.remote.AssistantRemoteRepositoryImpl
 import com.nextcloud.client.database.NextcloudDatabase
 import com.nextcloud.common.NextcloudClient
+import com.nextcloud.ui.ClientIntegrationScreen
+import com.nextcloud.utils.extensions.getParcelableArgument
 import com.owncloud.android.R
 import com.owncloud.android.databinding.ActivityComposeBinding
 import com.owncloud.android.ui.activity.DrawerActivity
@@ -35,33 +38,44 @@ class ComposeActivity : DrawerActivity() {
 
     companion object {
         const val DESTINATION = "DESTINATION"
-        const val TITLE = "TITLE"
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityComposeBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        val destinationId = intent.getIntExtra(DESTINATION, -1)
-        val titleId = intent.getIntExtra(TITLE, R.string.empty)
-
-        setupDrawer()
+        val destination =
+            intent.getParcelableArgument(DESTINATION, ComposeDestination::class.java) ?: throw IllegalArgumentException(
+                "destination is not exists"
+            )
 
-        setupToolbarShowOnlyMenuButtonAndTitle(getString(titleId)) {
-            openDrawer()
-        }
+        setupActivityUIFor(destination)
 
         binding.composeView.setContent {
             MaterialTheme(
                 colorScheme = viewThemeUtils.getColorScheme(this),
                 content = {
-                    Content(ComposeDestination.fromId(destinationId))
+                    Content(destination)
                 }
             )
         }
     }
 
+    private fun setupActivityUIFor(destination: ComposeDestination) {
+        if (destination is ComposeDestination.AssistantScreen) {
+            setupDrawer()
+            setupToolbarShowOnlyMenuButtonAndTitle(destination.title) {
+                openDrawer()
+            }
+        } else {
+            setSupportActionBar(null)
+            findViewById<View?>(R.id.appbar)?.let {
+                it.visibility = View.GONE
+            }
+        }
+    }
+
     override fun onOptionsItemSelected(item: MenuItem): Boolean = when (item.itemId) {
         android.R.id.home -> {
             toggleDrawer()
@@ -104,6 +118,13 @@ class ComposeActivity : DrawerActivity() {
                     capability = capabilities
                 )
             }
+
+            is ComposeDestination.ClientIntegrationScreen -> {
+                binding.bottomNavigation.visibility = View.GONE
+                val integrationScreen = (currentScreen as ComposeDestination.ClientIntegrationScreen)
+                ClientIntegrationScreen(integrationScreen.data, nextcloudClient?.baseUri.toString())
+            }
+
             else -> Unit
         }
     }

app/src/main/java/com/nextcloud/ui/composeActivity/ComposeDestination.kt

@@ -7,13 +7,25 @@
  */
 package com.nextcloud.ui.composeActivity
 
-sealed class ComposeDestination(val id: Int) {
-    data class AssistantScreen(val sessionId: Long?) : ComposeDestination(0)
+import android.content.Context
+import android.os.Parcelable
+import com.nextcloud.android.lib.resources.clientintegration.ClientIntegrationUI
+import com.owncloud.android.R
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+sealed class ComposeDestination(val id: Int) : Parcelable {
+    @Parcelize
+    data class AssistantScreen(val title: String, val sessionId: Long?) : ComposeDestination(0)
+
+    @Parcelize
+    data class ClientIntegrationScreen(val title: String, val data: ClientIntegrationUI) : ComposeDestination(1)
 
     companion object {
-        fun fromId(id: Int): ComposeDestination = when (id) {
-            0 -> AssistantScreen(null)
-            else -> throw IllegalArgumentException("Unknown destination: $id")
-        }
+        /**
+         * Creates a assistant screen without selected chat
+         */
+        fun getAssistantScreen(context: Context): AssistantScreen =
+            AssistantScreen(context.getString(R.string.assistant_screen_top_bar_title), null)
     }
 }