feat(unified-share): ui

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

@@ -99,7 +99,8 @@ import com.owncloud.android.db.ProviderMeta
         // manual migration used for 97 to 98
         AutoMigration(from = 98, to = 99),
         // manual migration used for 99 to 100
-        AutoMigration(from = 100, to = 101, spec = DatabaseMigrationUtil.ResetCapabilitiesPostMigration::class)
+        AutoMigration(from = 100, to = 101, spec = DatabaseMigrationUtil.ResetCapabilitiesPostMigration::class),
+        AutoMigration(from = 101, to = 102, spec = DatabaseMigrationUtil.ResetCapabilitiesPostMigration::class)
     ],
     exportSchema = true
 )

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

@@ -153,7 +153,9 @@ data class CapabilityEntity(
     @ColumnInfo(name = ProviderTableMeta.CAPABILITIES_CLIENT_INTEGRATION_JSON)
     val clientIntegrationJson: String?,
     @ColumnInfo(name = ProviderTableMeta.CAPABILITIES_MOD_REWRITE_WORKING)
-    val modRewriteWorking: Int?
+    val modRewriteWorking: Int?,
+    @ColumnInfo(name = ProviderTableMeta.CAPABILITIES_SHARING_JSON)
+    val sharingJson: String?
 )
 
 @Suppress("LongMethod", "ReturnCount")
@@ -235,6 +237,7 @@ fun CapabilityEntity?.toOCCapability(): OCCapability {
     capability.hasValidSubscription = intToBoolean(this.hasValidSubscription)
     capability.clientIntegrationJson = this.clientIntegrationJson
     capability.modRewriteWorking = intToBoolean(this.modRewriteWorking)
+    capability.sharingJson = this.sharingJson
 
     return capability
 }

app/src/main/java/com/nextcloud/utils/extensions/OwnCloudClientExtensions.kt

@@ -9,6 +9,7 @@
 package com.nextcloud.utils.extensions
 
 import android.content.Context
+import com.nextcloud.android.common.ui.network.auth.ServerCredentials
 import com.nextcloud.common.NextcloudClient
 import com.owncloud.android.lib.common.OwnCloudClient
 import com.owncloud.android.lib.common.OwnCloudClientFactory
@@ -27,3 +28,9 @@ fun OwnCloudClient.getPreviewEndpoint(localFileId: Long, x: Int, y: Int): String
     localFileId +
     "&x=" + (x / 2) + "&y=" + (y / 2) +
     "&a=1&mode=cover&forceIcon=0"
+
+/**
+ * Used in Android Common
+ */
+fun OwnCloudClient.toServerCredentials(baseURL: String): ServerCredentials =
+    ServerCredentials(baseURL, userIdPlain, credentials.authToken)

app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java

@@ -2417,6 +2417,8 @@ private ContentValues createContentValues(String accountName, OCCapability capab
 
         contentValues.put(ProviderTableMeta.CAPABILITIES_MOD_REWRITE_WORKING, capability.getModRewriteWorking().getValue());
 
+        contentValues.put(ProviderTableMeta.CAPABILITIES_SHARING_JSON, capability.getSharingJson());
+
         return contentValues;
     }
 
@@ -2615,6 +2617,8 @@ private OCCapability createCapabilityInstance(Cursor cursor) {
 
             capability.setClientIntegrationJson(getString(cursor, ProviderTableMeta.CAPABILITIES_CLIENT_INTEGRATION_JSON));
 
+            capability.setSharingJson(getString(cursor, ProviderTableMeta.CAPABILITIES_SHARING_JSON));
+
             capability.setModRewriteWorking(getBoolean(cursor, ProviderTableMeta.CAPABILITIES_MOD_REWRITE_WORKING));
         }
 

app/src/main/java/com/owncloud/android/db/ProviderMeta.java

@@ -23,7 +23,7 @@
  */
 public class ProviderMeta {
     public static final String DB_NAME = "filelist";
-    public static final int DB_VERSION = 101;
+    public static final int DB_VERSION = 102;
 
     private ProviderMeta() {
         // No instance
@@ -294,6 +294,7 @@ static public class ProviderTableMeta implements BaseColumns {
         public static final String CAPABILITIES_HAS_VALID_SUBSCRIPTION = "has_valid_subscription";
         public static final String CAPABILITIES_CLIENT_INTEGRATION_JSON = "client_integration_json";
         public static final String CAPABILITIES_MOD_REWRITE_WORKING = "mod_rewrite_working";
+        public static final String CAPABILITIES_SHARING_JSON = "sharing_json";
 
         //Columns of Uploads table
         public static final String UPLOADS_LOCAL_PATH = "local_path";

app/src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.kt

@@ -31,15 +31,18 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.button.MaterialButton
+import com.nextcloud.android.common.ui.share.initShareScreen
 import com.nextcloud.android.common.ui.theme.utils.ColorRole
 import com.nextcloud.client.account.User
 import com.nextcloud.client.account.UserAccountManager
 import com.nextcloud.client.di.Injectable
 import com.nextcloud.client.network.ClientFactory
 import com.nextcloud.client.utils.IntentUtil
 import com.nextcloud.utils.extensions.getParcelableArgument
+import com.nextcloud.utils.extensions.getTypedActivity
 import com.nextcloud.utils.extensions.mergeDistinctByToken
 import com.nextcloud.utils.extensions.setVisibleIf
+import com.nextcloud.utils.extensions.toServerCredentials
 import com.nextcloud.utils.mdm.MDMConfig.shareViaUser
 import com.owncloud.android.R
 import com.owncloud.android.databinding.FileDetailsSharingFragmentBinding
@@ -140,11 +143,17 @@ class FileDetailSharingFragment :
 
         binding?.pickContactEmailBtn?.setOnClickListener { checkContactPermission() }
 
-        fetchSharees()
+        // TODO: REPLACE FAKE CONDITION
+        if (user?.server?.version?.isNewerOrEqual(NextcloudVersion.nextcloud_34) == true || 2 < 4) {
+            showUnifiedShare()
+        } else {
+            fetchSharees()
+        }
+
         setupView()
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         binding = FileDetailsSharingFragmentBinding.inflate(inflater, container, false)
         return binding!!.getRoot()
     }
@@ -177,6 +186,39 @@ class FileDetailSharingFragment :
     // endregion
 
     // region private methods
+    private fun showUnifiedShare() {
+        val binding = binding ?: return
+
+        binding.shareContainer.visibility = View.GONE
+        binding.unifiedShare.visibility = View.VISIBLE
+
+        val shimmerLayout = binding.shimmerLayout.root
+        shimmerLayout.clearAnimation()
+        shimmerLayout.visibility = View.GONE
+
+        val fileActivity = getTypedActivity(FileActivity::class.java)
+
+        lifecycleScope.launch(Dispatchers.IO) {
+            val user = user ?: return@launch
+            val file = file ?: return@launch
+            val client = fileActivity?.clientRepository?.getOwncloudClient() ?: return@launch
+            val sourceId = file.remoteId ?: return@launch
+
+            val baseURL = user.server.uri.toString()
+            val serverCredentials = client.toServerCredentials(baseURL)
+            val internalLink = createInternalLink(user, file, capabilities)
+
+            withContext(Dispatchers.Main) {
+                binding.unifiedShare.initShareScreen(
+                    sourceId,
+                    internalLink,
+                    serverCredentials,
+                    viewThemeUtils.files.getColorScheme(fileActivity)
+                )
+            }
+        }
+    }
+
     private fun initArguments(savedInstanceState: Bundle?) {
         val args = (savedInstanceState ?: arguments) ?: return
         file = args.getParcelableArgument(ARG_FILE, OCFile::class.java)

app/src/main/res/layout/file_details_sharing_fragment.xml

@@ -5,25 +5,25 @@
   ~ SPDX-FileCopyrightText: 2018 Andy Scherzinger <info@andy-scherzinger.de>
   ~ SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
 -->
-<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingTop="@dimen/standard_eight_padding">
+    android:layout_below="@id/appbar">
 
-    <FrameLayout
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_below="@id/appbar">
+        android:paddingTop="@dimen/standard_eight_padding">
 
         <LinearLayout
             android:id="@+id/shareContainer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:orientation="vertical"
             android:visibility="gone"
-            tools:visibility="visible"
-            android:orientation="vertical">
+            tools:visibility="visible">
 
             <LinearLayout
                 android:id="@+id/shared_with_you_container"
@@ -139,33 +139,33 @@
                 android:layout_marginHorizontal="@dimen/standard_margin"
                 android:layout_marginTop="@dimen/standard_half_padding"
                 android:layout_marginBottom="@dimen/standard_half_padding"
+                android:text="@string/send_copy_to"
                 app:icon="@drawable/file_link"
-                app:iconGravity="textStart"
-                android:text="@string/send_copy_to" />
+                app:iconGravity="textStart" />
 
             <TextView
                 android:id="@+id/internal_share_headline"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:paddingStart="@dimen/standard_padding"
-                android:paddingEnd="@dimen/zero"
                 android:paddingTop="@dimen/standard_half_padding"
+                android:paddingEnd="@dimen/zero"
                 android:paddingBottom="@dimen/standard_half_padding"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
                 android:text="@string/internal_shares"
                 android:textAppearance="?android:attr/textAppearanceMedium" />
 
             <TextView
                 android:id="@+id/internal_share_description"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:paddingStart="@dimen/standard_padding"
-                android:visibility="gone"
-                tools:visibility="visible"
-                android:paddingEnd="@dimen/zero"
                 android:paddingTop="@dimen/standard_half_padding"
+                android:paddingEnd="@dimen/zero"
                 android:paddingBottom="@dimen/standard_half_padding"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
                 android:text="@string/internal_share_description_end_to_end_encrypted"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:visibility="gone"
+                tools:visibility="visible" />
 
 
             <androidx.recyclerview.widget.RecyclerView
@@ -193,12 +193,12 @@
 
             <TextView
                 android:id="@+id/external_shares_headline"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
                 android:paddingStart="@dimen/standard_padding"
-                android:paddingEnd="@dimen/zero"
                 android:paddingTop="@dimen/standard_half_padding"
+                android:paddingEnd="@dimen/zero"
                 android:paddingBottom="@dimen/standard_half_padding"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
                 android:text="@string/external_shares"
                 android:textAppearance="?android:attr/textAppearanceMedium" />
 
@@ -209,9 +209,9 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/standard_margin"
                 android:layout_marginEnd="@dimen/standard_margin"
+                android:text="@string/create_link"
                 app:icon="@drawable/file_link"
-                app:iconGravity="textStart"
-                android:text="@string/create_link" />
+                app:iconGravity="textStart" />
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/sharesList_external"
@@ -231,10 +231,16 @@
                 android:text="@string/show_all" />
         </LinearLayout>
 
-        <include
-            layout="@layout/file_details_sharing_shimmer"
-            android:id="@+id/shimmer_layout"/>
+    </androidx.core.widget.NestedScrollView>
+
+    <androidx.compose.ui.platform.ComposeView
+        android:id="@+id/unifiedShare"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone" />
 
-    </FrameLayout>
+    <include
+        android:id="@+id/shimmer_layout"
+        layout="@layout/file_details_sharing_shimmer" />
 
-</androidx.core.widget.NestedScrollView>
+</FrameLayout>

gradle.properties

@@ -23,5 +23,5 @@ org.gradle.configuration-cache=true
 org.gradle.workers.max=4
 
 # Needed for local libs
-# org.gradle.dependency.verification=off
-# systemProp.org.gradle.internal.publish.checksums.insecure=true
+org.gradle.dependency.verification=off
+systemProp.org.gradle.internal.publish.checksums.insecure=true

gradle/libs.versions.toml

@@ -5,7 +5,7 @@
 androidCommonLibraryVersion = "0.33.2"
 androidGifDrawableVersion = "1.2.32"
 androidImageCropperVersion = "4.7.0"
-androidLibraryVersion ="72a95a990f57135ef2b658d49a99dd193dcd6671"
+androidLibraryVersion ="b407f6262a"
 androidOpensslVersion = "3.5.6"
 androidPluginVersion = "9.2.1"
 androidsvgVersion = "1.4"
@@ -115,7 +115,7 @@ photoview = { module = "com.github.Baseflow:PhotoView", version.ref = "photoview
 material = { module = "com.google.android.material:material", version.ref = "materialVersion" }
 android-gif-drawable = { module = "pl.droidsonroids.gif:android-gif-drawable", version.ref = "androidGifDrawableVersion" }
 android-image-cropper = { module = "com.vanniktech:android-image-cropper", version.ref = "androidImageCropperVersion" }
-androidsvg = { module = "com.caverock:androidsvg", version.ref = "androidsvgVersion" }
+androidsvg = { module = "com.caverock:androidsvg-aar", version.ref = "androidsvgVersion" }
 coil = { module = "io.coil-kt:coil", version.ref = "coilVersion" }
 constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayoutVersion" }
 emoji-google = { module = "com.vanniktech:emoji-google", version.ref = "emojiGoogleVersion" }