feat(sharing): Show expiration date state in share list

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

Author: AndyScherzinger

app/schemas/it.niedermann.owncloud.notes.persistence.NotesDatabase/27.json

@@ -19,6 +19,7 @@
 import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.annotation.ColorInt;
@@ -28,7 +29,6 @@
 import androidx.appcompat.widget.SearchView;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
-import androidx.core.content.res.ResourcesCompat;
 import androidx.core.graphics.drawable.DrawableCompat;
 
 import com.google.android.material.appbar.AppBarLayout;
@@ -220,6 +220,28 @@ public void themeToolbarSearchView(@NonNull SearchView searchView) {
         });
     }
 
+    /**
+     * @deprecated Should be replaced with {@link com.google.android.material.search.SearchView}
+     */
+    @Deprecated
+    public void themeContentSearchView(@NonNull SearchView searchView) {
+        withScheme(searchView, scheme -> {
+            // hacky as no default way is provided
+            final var editText = (AppCompatAutoCompleteTextView) searchView
+            .findViewById(androidx.appcompat.R.id.search_src_text);
+            final var searchPlate = (LinearLayout) searchView.findViewById(androidx.appcompat.R.id.search_plate);
+            final var closeButton = (ImageView) searchView.findViewById(androidx.appcompat.R.id.search_close_btn);
+            final var searchButton = (ImageView) searchView.findViewById(androidx.appcompat.R.id.search_button);
+            editText.setHintTextColor(dynamicColor.onSurfaceVariant().getArgb(scheme));
+            editText.setHighlightColor(dynamicColor.inverseOnSurface().getArgb(scheme));
+            editText.setTextColor(dynamicColor.onSurface().getArgb(scheme));
+            closeButton.setColorFilter(dynamicColor.onSurface().getArgb(scheme));
+            searchButton.setColorFilter(dynamicColor.onSurface().getArgb(scheme));
+            searchPlate.setBackgroundColor(dynamicColor.surfaceContainerHigh().getArgb(scheme));
+            return searchView;
+        });
+    }
+
     public void themeInternalLinkIcon(ImageView view) {
         withScheme(view, scheme -> {
             view

app/schemas/it.niedermann.owncloud.notes.persistence.NotesDatabase/28.json

@@ -58,10 +58,11 @@
                 NotesListWidgetData.class,
                 ShareEntity.class,
                 Capabilities.class
-        }, version = 27,
+        }, version = 28,
         autoMigrations = {
                 @AutoMigration(from = 25, to = 26),
                 @AutoMigration(from = 26, to = 27),
+                @AutoMigration(from = 27, to = 28),
         }
 )
 @TypeConverters({Converters.class})

app/src/main/java/it/niedermann/owncloud/notes/branding/NotesViewThemeUtils.java

@@ -24,5 +24,6 @@ data class ShareEntity(
     val displayname_file_owner: String? = null,
     val uid_owner: String? = null,
     val displayname_owner: String? = null,
-    val url: String? = null
+    val url: String? = null,
+    val expiration_date: Long? = null
 )

app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesDatabase.java

@@ -807,12 +807,17 @@ public void applyBrand(int color) {
         final var util = BrandingUtil.of(color, this);
         util.platform.themeStatusBar(this);
         util.material.themeToolbar(binding.toolbar);
-        util.androidx.themeToolbarSearchView(binding.searchView);
+        util.notes.themeContentSearchView(binding.searchView);
+        util.platform.colorImageView(binding.searchViewIcon, ColorRole.ON_SURFACE_VARIANT);
+        util.platform.colorImageView(binding.pickContactEmailBtn, ColorRole.ON_SURFACE_VARIANT);
         util.platform.colorCircularProgressBar(binding.loadingLayoutIndicator, ColorRole.PRIMARY);
         util.platform.themeHorizontalProgressBar(binding.progressBar);
         util.platform.colorViewBackground(getWindow().getDecorView());
         util.platform.colorViewBackground(binding.getRoot());
         util.material.colorMaterialButtonPrimaryOutlined(binding.btnShareButton);
+        util.platform.colorTextView(binding.title, ColorRole.ON_SURFACE);
+        util.platform.colorTextView(binding.fileName, ColorRole.ON_SURFACE_VARIANT);
+        util.notes.themeSearchCardView(binding.searchCardWrapper);
     }
 
     @Override

app/src/main/java/it/niedermann/owncloud/notes/persistence/entity/ShareEntity.kt

@@ -19,21 +19,35 @@ import androidx.core.database.getIntOrNull
 import androidx.core.database.getStringOrNull
 import androidx.cursoradapter.widget.CursorAdapter
 import it.niedermann.owncloud.notes.R
+import it.niedermann.owncloud.notes.branding.BrandingUtil
+import it.niedermann.owncloud.notes.databinding.ItemSuggestionAdapterBinding
 import it.niedermann.owncloud.notes.persistence.entity.Account
 import it.niedermann.owncloud.notes.share.helper.AvatarLoader
 
-class SuggestionAdapter(context: Context, cursor: Cursor?, private val account: Account) : CursorAdapter(context, cursor, false) {
+/**
+ * [CursorAdapter] used to display search suggestions for sharees for sharing notes.
+ *
+ * This adapter handles the layout and binding of suggestion data, including the
+ * display of user avatars or system icons based on the provided search cursor.
+ *
+ * @param context The [Context] in which the adapter is running.
+ * @param cursor The [Cursor] from which to get the data.
+ * @param account The [Account] used for loading authenticated avatars.
+ */
+class SuggestionAdapter(context: Context, cursor: Cursor?, private val account: Account) :
+    CursorAdapter(context, cursor, false) {
     override fun newView(context: Context, cursor: Cursor, parent: ViewGroup): View {
-        val inflater = LayoutInflater.from(context)
-        return inflater.inflate(R.layout.item_suggestion_adapter, parent, false)
+        val binding = ItemSuggestionAdapterBinding.inflate(LayoutInflater.from(context), parent, false)
+        val brandingUtil = BrandingUtil.of(BrandingUtil.readBrandMainColor(parent.context), parent.context)
+        binding.root.setBackgroundColor(brandingUtil.getScheme(parent.context).surfaceContainerHigh)
+        return binding.root
     }
 
     override fun bindView(view: View, context: Context, cursor: Cursor) {
         val suggestion =
             cursor.getString(cursor.getColumnIndexOrThrow(SearchManager.SUGGEST_COLUMN_TEXT_1))
         view.findViewById<TextView>(R.id.suggestion_text).text = suggestion
 
-
         val icon = view.findViewById<ImageView>(R.id.suggestion_icon)
         val iconColumn = cursor.getColumnIndex(SearchManager.SUGGEST_COLUMN_ICON_1)
 

app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java

@@ -7,18 +7,19 @@
 package it.niedermann.owncloud.notes.share.adapter.holder;
 
 import android.content.Context;
-import android.graphics.PorterDuff;
 import android.text.TextUtils;
 import android.view.View;
 
-import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.core.content.res.ResourcesCompat;
 
 import com.nextcloud.android.common.ui.theme.utils.ColorRole;
 import com.owncloud.android.lib.resources.shares.OCShare;
 import com.owncloud.android.lib.resources.shares.ShareType;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 import it.niedermann.owncloud.notes.R;
 import it.niedermann.owncloud.notes.branding.BrandedViewHolder;
 import it.niedermann.owncloud.notes.branding.BrandingUtil;
@@ -83,6 +84,19 @@ public void bind(OCShare publicShare, ShareeListAdapterListener listener) {
             binding.shareByLinkContainer.setOnClickListener(v -> listener.showPermissionsDialog(publicShare));
         }
 
+        if (publicShare.getExpirationDate() > 0) {
+            binding.expirationStatus.setContentDescription(
+                context.getString(
+                    R.string.share_expires,
+                    SimpleDateFormat.getDateInstance().format(new Date(publicShare.getExpirationDate()))
+                )
+            );
+            binding.expirationStatus.setVisibility(View.VISIBLE);
+        } else {
+            binding.expirationStatus.setContentDescription(null);
+            binding.expirationStatus.setVisibility(View.GONE);
+        }
+
         binding.copyLink.setOnClickListener(v -> listener.copyLink(publicShare));
     }
 
@@ -102,6 +116,7 @@ public void applyBrand(int color) {
             brandingUtil.androidx.colorPrimaryTextViewElement(binding.permissionName);
             brandingUtil.platform.colorTextView(binding.label, ColorRole.ON_SURFACE);
             brandingUtil.platform.colorImageViewBackgroundAndIcon(binding.icon);
+            brandingUtil.platform.colorImageView(binding.expirationStatus, ColorRole.ON_PRIMARY_CONTAINER);
         }
     }
 }

app/src/main/java/it/niedermann/owncloud/notes/share/adapter/SuggestionAdapter.kt

@@ -139,5 +139,9 @@ data class CreateShareResponse(
 
     @Expose
     @SerializedName("password")
-    val password: String?
+    val password: String?,
+
+    @Expose
+    @SerializedName("expiration")
+    val expirationDate: String?
 )

app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/LinkShareViewHolder.java

@@ -8,12 +8,18 @@ package it.niedermann.owncloud.notes.share.model
 
 import com.owncloud.android.lib.resources.shares.OCShare
 import com.owncloud.android.lib.resources.shares.ShareType
+import it.niedermann.owncloud.notes.shared.util.extensions.toExpirationDateLong
 
-fun List<CreateShareResponse>.toOCShareList(): List<OCShare> {
-    return map { response ->
-        response.toOCShare()
-    }.filter { it.id != -1L }
-}
+/**
+ * Maps a list of [CreateShareResponse] to a list of [OCShare] objects.
+ *
+ * Filters out any responses that could not be parsed correctly (where the ID is -1).
+ *
+ * @return A list of valid [OCShare] instances.
+ */
+fun List<CreateShareResponse>.toOCShareList(): List<OCShare> = map { response ->
+    response.toOCShare()
+}.filter { it.id != -1L }
 
 fun CreateShareResponse.toOCShare(): OCShare {
     val response = this
@@ -31,13 +37,14 @@ fun CreateShareResponse.toOCShare(): OCShare {
         sharedWithDisplayName = response.shareWithDisplayname
         isFolder = response.itemType == "folder"
         userId = response.uidOwner
-        shareLink =  response.url
+        shareLink = response.url
         isPasswordProtected = !response.password.isNullOrEmpty()
         note = response.note
         isHideFileDownload = (response.hideDownload == 1L)
         label = response.label
         isHasPreview = response.hasPreview
         mimetype = response.mimetype
         ownerDisplayName = response.displaynameOwner
+        expirationDate = response.expirationDate?.toExpirationDateLong() ?: 0L
     }
 }