style(permissions): M3 style for sharing permission bottom sheet

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

Author: AndyScherzinger

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

@@ -9,18 +9,30 @@ package it.niedermann.owncloud.notes.share.adapter
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.annotation.ColorInt
 import androidx.recyclerview.widget.RecyclerView
+import com.nextcloud.android.common.ui.theme.utils.ColorRole
+import it.niedermann.owncloud.notes.branding.Branded
+import it.niedermann.owncloud.notes.branding.BrandingUtil
 import it.niedermann.owncloud.notes.databinding.ItemQuickSharePermissionsBinding
 import it.niedermann.owncloud.notes.share.model.QuickPermissionModel
 
 class QuickSharingPermissionsAdapter(
     private val quickPermissionList: MutableList<QuickPermissionModel>,
     private val onPermissionChangeListener: QuickSharingPermissionViewHolder.OnPermissionChangeListener,
+    private var color: Int = 0
 ) :
-    RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+    RecyclerView.Adapter<RecyclerView.ViewHolder>(), Branded {
+
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         val binding = ItemQuickSharePermissionsBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-        return QuickSharingPermissionViewHolder(binding, binding.root, onPermissionChangeListener)
+        BrandingUtil.of(color, parent.context).platform.colorImageView(binding.tvQuickShareCheckIcon, ColorRole.PRIMARY)
+        return QuickSharingPermissionViewHolder(
+            binding,
+            binding.root,
+            onPermissionChangeListener,
+            BrandingUtil.of(color, binding.root.context)
+        )
     }
 
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
@@ -33,18 +45,23 @@ class QuickSharingPermissionsAdapter(
         return quickPermissionList.size
     }
 
+    override fun applyBrand(color: Int) {
+        this.color = color
+        notifyDataSetChanged()
+    }
+
     class QuickSharingPermissionViewHolder(
         val binding: ItemQuickSharePermissionsBinding,
         itemView: View,
         val onPermissionChangeListener: OnPermissionChangeListener,
+        val util: BrandingUtil,
     ) :
         RecyclerView
         .ViewHolder(itemView) {
 
         fun bindData(quickPermissionModel: QuickPermissionModel) {
             binding.tvQuickShareName.text = quickPermissionModel.permissionName
             if (quickPermissionModel.isSelected) {
-                // viewThemeUtils.platform.colorImageView(binding.tvQuickShareCheckIcon)
                 binding.tvQuickShareCheckIcon.visibility = View.VISIBLE
             } else {
                 binding.tvQuickShareCheckIcon.visibility = View.INVISIBLE

app/src/main/java/it/niedermann/owncloud/notes/share/dialog/QuickSharingPermissionsBottomSheetDialog.java

@@ -19,13 +19,14 @@
 import androidx.recyclerview.widget.LinearLayoutManager;
 
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
-import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.owncloud.android.lib.resources.shares.OCShare;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import it.niedermann.owncloud.notes.R;
+import it.niedermann.owncloud.notes.branding.BrandedBottomSheetDialog;
+import it.niedermann.owncloud.notes.branding.BrandingUtil;
 import it.niedermann.owncloud.notes.databinding.QuickSharingPermissionsBottomSheetFragmentBinding;
 import it.niedermann.owncloud.notes.share.adapter.QuickSharingPermissionsAdapter;
 import it.niedermann.owncloud.notes.share.helper.SharingMenuHelper;
@@ -34,12 +35,16 @@
 /**
  * File Details Quick Sharing permissions options {@link android.app.Dialog} styled as a bottom sheet for main actions.
  */
-public class QuickSharingPermissionsBottomSheetDialog extends BottomSheetDialog {
+public class QuickSharingPermissionsBottomSheetDialog extends BrandedBottomSheetDialog {
     private QuickSharingPermissionsBottomSheetFragmentBinding binding;
     private final QuickPermissionSharingBottomSheetActions actions;
     private final Activity activity;
     private final OCShare ocShare;
 
+    private QuickSharingPermissionsAdapter adapter;
+
+    private int color = 0;
+
     public QuickSharingPermissionsBottomSheetDialog(Activity activity,
                                                     QuickPermissionSharingBottomSheetActions actions,
                                                     OCShare ocShare) {
@@ -59,8 +64,6 @@ protected void onCreate(Bundle savedInstanceState) {
             getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
         }
 
-        // viewThemeUtils.platform.themeDialog(binding.getRoot());
-
         setUpRecyclerView();
         setOnShowListener(d ->
                 BottomSheetBehavior.from((View) binding.getRoot().getParent())
@@ -70,7 +73,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
     private void setUpRecyclerView() {
         List<QuickPermissionModel> quickPermissionModelList = getQuickPermissionList();
-        QuickSharingPermissionsAdapter adapter = new QuickSharingPermissionsAdapter(
+        adapter = new QuickSharingPermissionsAdapter(
                 quickPermissionModelList,
                 new QuickSharingPermissionsAdapter.QuickSharingPermissionViewHolder.OnPermissionChangeListener() {
                     @Override
@@ -82,9 +85,11 @@ public void onPermissionChanged(int position) {
                     public void onDismissSheet() {
                         dismiss();
                     }
-                }
+                },
+                color
         );
         LinearLayoutManager linearLayoutManager = new LinearLayoutManager(activity);
+        adapter.applyBrand(color);
         binding.rvQuickSharePermissions.setLayoutManager(linearLayoutManager);
         binding.rvQuickSharePermissions.setAdapter(adapter);
     }
@@ -145,6 +150,16 @@ protected void onStop() {
         binding = null;
     }
 
+    @Override
+    public void applyBrand(int color) {
+        this.color = color;
+        final var util = BrandingUtil.of(color, getContext());
+        if (adapter != null) {
+            adapter.applyBrand(color);
+        }
+        util.platform.themeDialog(binding.getRoot());
+    }
+
     public interface QuickPermissionSharingBottomSheetActions {
         void onQuickPermissionChanged(OCShare share, int permission);
     }

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

@@ -13,9 +13,12 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingTop="@dimen/dialog_padding"
     android:background="@color/bg_default">
 
+    <com.google.android.material.bottomsheet.BottomSheetDragHandleView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
     <LinearLayout
         android:id="@+id/menu_share_advanced_permissions"
         android:layout_width="match_parent"

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

@@ -9,14 +9,17 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingTop="@dimen/spacer_2x"
-    android:paddingBottom="@dimen/spacer_2x"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:paddingBottom="@dimen/spacer_2x">
+
+    <com.google.android.material.bottomsheet.BottomSheetDragHandleView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_quick_share_permissions"
         android:layout_width="match_parent"
-        tools:listitem="@layout/item_quick_share_permissions"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content"
+        tools:listitem="@layout/item_quick_share_permissions" />
 
 </LinearLayout>