style(share-item): Optimize share item layouts in height and text/icon alignment and add label for mail links

Signed-off-by: Andy Scherzinger <[email protected]>

Author: AndyScherzinger

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

@@ -11,9 +11,11 @@
 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;
 
@@ -28,6 +30,8 @@ public class LinkShareViewHolder extends BrandedViewHolder {
     private ItemShareLinkShareBinding binding;
     private Context context;
 
+    private BrandingUtil brandingUtil;
+
     public LinkShareViewHolder(@NonNull View itemView) {
         super(itemView);
         bindBranding();
@@ -46,8 +50,17 @@ public void bind(OCShare publicShare, ShareeListAdapterListener listener) {
             binding.icon.setImageDrawable(ResourcesCompat.getDrawable(context.getResources(),
                     R.drawable.ic_email,
                     null));
+            if (publicShare.getLabel() != null && !publicShare.getLabel().isEmpty()) {
+                brandingUtil.platform.colorTextView(binding.name, ColorRole.ON_SURFACE_VARIANT);
+                binding.label.setText(publicShare.getLabel());
+                binding.label.setVisibility(View.VISIBLE);
+            } else {
+                brandingUtil.platform.colorTextView(binding.name, ColorRole.ON_SURFACE);
+                binding.label.setVisibility(View.GONE);
+            }
             binding.copyLink.setVisibility(View.GONE);
         } else {
+            brandingUtil.platform.colorTextView(binding.name, ColorRole.ON_SURFACE);
             if (!TextUtils.isEmpty(publicShare.getLabel())) {
                 String text = String.format(context.getString(R.string.share_link_with_label), publicShare.getLabel());
                 binding.name.setText(text);
@@ -84,10 +97,11 @@ private void setPermissionName(OCShare publicShare, String permissionName) {
 
     @Override
     public void applyBrand(int color) {
-        final var util = BrandingUtil.of(color, context);
+        brandingUtil = BrandingUtil.of(color, context);
         if (binding != null) {
-            util.androidx.colorPrimaryTextViewElement(binding.permissionName);
-            util.platform.colorImageViewBackgroundAndIcon(binding.icon);
+            brandingUtil.androidx.colorPrimaryTextViewElement(binding.permissionName);
+            brandingUtil.platform.colorTextView(binding.label, ColorRole.ON_SURFACE);
+            brandingUtil.platform.colorImageViewBackgroundAndIcon(binding.icon);
         }
     }
 }

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

@@ -11,15 +11,15 @@
     android:id="@+id/share_by_link_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:minHeight="@dimen/sharee_list_item_size"
+    android:layout_marginVertical="@dimen/spacer_1x"
     android:orientation="horizontal">
 
     <ImageView
         android:id="@+id/icon"
         android:layout_width="@dimen/default_icon_size"
         android:layout_height="@dimen/default_icon_size"
-        android:layout_gravity="center_vertical"
         android:layout_marginStart="@dimen/spacer_2x"
+        android:layout_marginTop="@dimen/spacer_1hx"
         android:layout_marginEnd="@dimen/spacer_2x"
         android:background="@drawable/round_bgnd"
         android:contentDescription="@string/note_share_activity_share_icon_content_description"
@@ -34,6 +34,19 @@
         android:layout_weight="1"
         android:orientation="vertical">
 
+        <TextView
+            android:id="@+id/label"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ellipsize="middle"
+            android:gravity="center_vertical"
+            android:singleLine="true"
+            android:textColor="@color/widget_foreground"
+            android:textSize="@dimen/note_font_size_small"
+            android:visibility="gone"
+            tools:visibility="visible"
+            tools:text="Share label"/>
+
         <TextView
             android:id="@+id/name"
             android:layout_width="match_parent"