From dcad8b2aae4ef3bf0e9dc422619dbbd14d051823 Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Sat, 19 Jul 2025 00:09:45 +0200
Subject: [PATCH 1/8] style(multiselect): implement M3 multiselect visuals

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
---
 .../notes/branding/NotesViewThemeUtils.java   | 32 ++++++++++
 .../owncloud/notes/main/MainActivity.java     |  4 ++
 .../notes/main/items/ItemAdapter.java         | 61 ++++++++++++++++---
 .../notes/main/items/NoteViewHolder.java      |  1 +
 .../drawable/ic_checkbox_blank_outline.xml    | 16 +++++
 .../main/res/drawable/ic_checkbox_marked.xml  | 16 +++++
 .../res/drawable/ic_delete_white_24dp.xml     | 16 +++++
 .../layout/item_notes_list_note_item_grid.xml | 16 ++++-
 ...m_notes_list_note_item_grid_only_title.xml | 16 ++++-
 ...item_notes_list_note_item_with_excerpt.xml | 24 ++++++--
 ...m_notes_list_note_item_without_excerpt.xml | 22 +++++--
 .../layout/item_notes_list_section_item.xml   |  1 +
 app/src/main/res/values/dimens.xml            |  2 +
 13 files changed, 201 insertions(+), 26 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_checkbox_blank_outline.xml
 create mode 100644 app/src/main/res/drawable/ic_checkbox_marked.xml
 create mode 100644 app/src/main/res/drawable/ic_delete_white_24dp.xml

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/branding/NotesViewThemeUtils.java b/app/src/main/java/it/niedermann/owncloud/notes/branding/NotesViewThemeUtils.java
index 59c1fde7b..adcf48e41 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/branding/NotesViewThemeUtils.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/branding/NotesViewThemeUtils.java
@@ -9,11 +9,14 @@
 import static com.nextcloud.android.common.ui.util.ColorStateListUtilsKt.buildColorStateList;
 import static com.nextcloud.android.common.ui.util.PlatformThemeUtil.isDarkMode;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.LayerDrawable;
+import android.graphics.drawable.StateListDrawable;
 import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
@@ -209,4 +212,33 @@ public void themeToolbarSearchView(@NonNull SearchView searchView) {
             return searchView;
         });
     }
+
+    public void themeBackgroundView(View view, Activity activity) {
+        withScheme(view, scheme -> {
+            activity.getWindow().getDecorView().setBackgroundColor(dynamicColor.surface().getArgb(scheme));
+            view.setBackgroundColor(dynamicColor.surface().getArgb(scheme));
+            return view;
+        });
+    }
+
+    public void themeBackgroundItemView(View view) {
+        withScheme(view, scheme -> {
+            StateListDrawable res = new StateListDrawable();
+            res.addState(new int[]{android.R.attr.state_activated}, new ColorDrawable(dynamicColor.secondaryContainer().getArgb(scheme)));
+            res.addState(new int[]{}, new ColorDrawable(dynamicColor.surface().getArgb(scheme)));
+            view.setBackground(res);
+            return view;
+        });
+    }
+
+    public void themeCard(@NonNull MaterialCardView view) {
+        withScheme(view, scheme -> {
+            view.setBackgroundTintList(buildColorStateList(
+                    new Pair<>(android.R.attr.state_activated, dynamicColor.secondaryContainer().getArgb(scheme)),
+                    new Pair<>(-android.R.attr.state_activated, dynamicColor.surface().getArgb(scheme)))
+            );
+            view.setStrokeColor(dynamicColor.outlineVariant().getArgb(scheme));
+            return view;
+        });
+    }
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java
index c0b927e7e..a358af2e1 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java
@@ -27,6 +27,7 @@
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
+import android.view.Menu;
 import android.view.View;
 
 import androidx.annotation.ColorInt;
@@ -519,6 +520,7 @@ public void onSelectionChanged() {
                                     super.onSelectionChanged();
                                     if (tracker.hasSelection() && mActionMode == null) {
                                         mActionMode = startSupportActionMode(new MultiSelectedActionModeCallback(MainActivity.this,MainActivity.this, coordinatorLayout, binding.activityNotesListView.fabCreate, mainViewModel, MainActivity.this, canMoveNoteToAnotherAccounts, tracker, getSupportFragmentManager()));
+                                        adapter.setMultiSelect(true);
                                     }
                                     if (mActionMode != null) {
                                         if (tracker.hasSelection()) {
@@ -527,6 +529,7 @@ public void onSelectionChanged() {
                                         } else {
                                             mActionMode.finish();
                                             mActionMode = null;
+                                            adapter.setMultiSelect(false);
                                         }
                                     }
                                 }
@@ -604,6 +607,7 @@ public void applyBrand(int color) {
         util.platform.colorNavigationView(binding.navigationView);
         util.material.themeFAB(activityBinding.fabCreate);
         util.notes.themeSearchCardView(binding.activityNotesListView.searchBarWrapper);
+        util.notes.themeBackgroundView(binding.activityNotesListView.getRoot(), this);
         util.platform.colorTextView(binding.activityNotesListView.searchText, ColorRole.ON_SURFACE_VARIANT);
         util.notes.themeSearchToolbar(binding.activityNotesListView.searchToolbar);
         util.notes.themeToolbarSearchView(binding.activityNotesListView.searchView);
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/items/ItemAdapter.java b/app/src/main/java/it/niedermann/owncloud/notes/main/items/ItemAdapter.java
index 40d94174f..b71f1b32a 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/main/items/ItemAdapter.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/main/items/ItemAdapter.java
@@ -8,10 +8,13 @@
 
 import static it.niedermann.owncloud.notes.shared.util.NoteUtil.getFontSizeFromPreferences;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
+import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
 
 import androidx.annotation.ColorInt;
 import androidx.annotation.IntRange;
@@ -23,11 +26,14 @@
 import androidx.recyclerview.selection.SelectionTracker;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.nextcloud.android.common.ui.theme.utils.ColorRole;
+
 import java.util.ArrayList;
 import java.util.List;
 
 import it.niedermann.owncloud.notes.R;
 import it.niedermann.owncloud.notes.branding.Branded;
+import it.niedermann.owncloud.notes.branding.BrandingUtil;
 import it.niedermann.owncloud.notes.databinding.ItemNotesListNoteItemGridBinding;
 import it.niedermann.owncloud.notes.databinding.ItemNotesListNoteItemGridOnlyTitleBinding;
 import it.niedermann.owncloud.notes.databinding.ItemNotesListNoteItemWithExcerptBinding;
@@ -66,6 +72,8 @@ public class ItemAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> i
     @Nullable
     private Integer swipedPosition;
 
+    private boolean isMultiSelect = false;
+
     public <T extends Context & NoteClickListener> ItemAdapter(@NonNull T context, boolean gridView) {
         this.noteClickListener = context;
         this.gridView = gridView;
@@ -104,13 +112,19 @@ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int
         if (gridView) {
             switch (viewType) {
                 case TYPE_SECTION -> {
-                    return new SectionViewHolder(ItemNotesListSectionItemBinding.inflate(inflater));
+                    ItemNotesListSectionItemBinding binding = ItemNotesListSectionItemBinding.inflate(inflater);
+                    BrandingUtil.of(color, parent.getContext()).platform.colorTextView(binding.sectionTitle);
+                    return new SectionViewHolder(binding);
                 }
                 case TYPE_NOTE_ONLY_TITLE -> {
-                    return new NoteViewGridHolderOnlyTitle(ItemNotesListNoteItemGridOnlyTitleBinding.inflate(inflater, parent, false), noteClickListener, monospace, fontSize);
+                    ItemNotesListNoteItemGridOnlyTitleBinding binding = ItemNotesListNoteItemGridOnlyTitleBinding.inflate(inflater, parent, false);
+                    BrandingUtil.of(color, parent.getContext()).notes.themeCard(binding.card);
+                    return new NoteViewGridHolderOnlyTitle(binding, noteClickListener, monospace, fontSize);
                 }
                 case TYPE_NOTE_WITH_EXCERPT, TYPE_NOTE_WITHOUT_EXCERPT -> {
-                    return new NoteViewGridHolder(ItemNotesListNoteItemGridBinding.inflate(inflater, parent, false), noteClickListener, monospace, fontSize);
+                    ItemNotesListNoteItemGridBinding binding = ItemNotesListNoteItemGridBinding.inflate(inflater, parent, false);
+                    BrandingUtil.of(color, parent.getContext()).notes.themeCard(binding.card);
+                    return new NoteViewGridHolder(binding, noteClickListener, monospace, fontSize);
                 }
                 default -> {
                     throw new IllegalArgumentException("Not supported viewType: " + viewType);
@@ -119,13 +133,19 @@ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int
         } else {
             switch (viewType) {
                 case TYPE_SECTION -> {
-                    return new SectionViewHolder(ItemNotesListSectionItemBinding.inflate(inflater));
+                    ItemNotesListSectionItemBinding binding = ItemNotesListSectionItemBinding.inflate(inflater);
+                    BrandingUtil.of(color, parent.getContext()).platform.colorTextView(binding.sectionTitle);
+                    return new SectionViewHolder(binding);
                 }
                 case TYPE_NOTE_WITH_EXCERPT -> {
-                    return new NoteViewHolderWithExcerpt(ItemNotesListNoteItemWithExcerptBinding.inflate(inflater, parent, false), noteClickListener);
+                    ItemNotesListNoteItemWithExcerptBinding binding = ItemNotesListNoteItemWithExcerptBinding.inflate(inflater, parent, false);
+                    BrandingUtil.of(color, parent.getContext()).notes.themeBackgroundItemView(binding.noteSwipeable);
+                    return new NoteViewHolderWithExcerpt(binding, noteClickListener);
                 }
                 case TYPE_NOTE_ONLY_TITLE, TYPE_NOTE_WITHOUT_EXCERPT -> {
-                    return new NoteViewHolderWithoutExcerpt(ItemNotesListNoteItemWithoutExcerptBinding.inflate(inflater, parent, false), noteClickListener);
+                    ItemNotesListNoteItemWithoutExcerptBinding binding = ItemNotesListNoteItemWithoutExcerptBinding.inflate(inflater, parent, false);
+                    BrandingUtil.of(color, parent.getContext()).notes.themeBackgroundItemView(binding.noteSwipeable);
+                    return new NoteViewHolderWithoutExcerpt(binding, noteClickListener);
                 }
                 default -> {
                     throw new IllegalArgumentException("Not supported viewType: " + viewType);
@@ -149,10 +169,18 @@ public void onBindViewHolder(@NonNull final RecyclerView.ViewHolder holder, int
         switch (getItemViewType(position)) {
             case TYPE_SECTION ->
                     ((SectionViewHolder) holder).bind((SectionItem) itemList.get(position));
-            case TYPE_NOTE_WITH_EXCERPT,
-                    TYPE_NOTE_WITHOUT_EXCERPT,
-                    TYPE_NOTE_ONLY_TITLE ->
-                    ((NoteViewHolder) holder).bind(isSelected, (Note) itemList.get(position), showCategory, color, searchQuery);
+            case TYPE_NOTE_WITH_EXCERPT, TYPE_NOTE_WITHOUT_EXCERPT, TYPE_NOTE_ONLY_TITLE -> {
+                holder.itemView.findViewById(R.id.custom_checkbox).setVisibility(tracker != null && tracker.hasSelection() ? View.VISIBLE : View.GONE);
+                if (isSelected) {
+                    holder.itemView.setBackgroundColor(ContextCompat.getColor(holder.itemView.getContext(), R.color.bg_highlighted));
+                    ((ImageView) holder.itemView.findViewById(R.id.custom_checkbox)).setImageDrawable(BrandingUtil.getInstance(holder.itemView.getContext()).platform.tintDrawable(holder.itemView.getContext(), R.drawable.ic_checkbox_marked, ColorRole.PRIMARY));
+                } else {
+                    holder.itemView.setBackgroundColor(holder.itemView.getContext().getColor(com.nextcloud.android.common.ui.R.color.bg_default));
+                    ((ImageView) holder.itemView.findViewById(R.id.custom_checkbox)).setImageResource(R.drawable.ic_checkbox_blank_outline);
+                }
+                holder.itemView.findViewById(R.id.custom_checkbox).setVisibility(isMultiSelect ? View.VISIBLE : View.GONE);
+                ((NoteViewHolder) holder).bind(isSelected, (Note) itemList.get(position), showCategory, color, searchQuery);
+            }
         }
     }
 
@@ -160,6 +188,19 @@ public void setTracker(SelectionTracker<Long> tracker) {
         this.tracker = tracker;
     }
 
+    @SuppressLint("NotifyDataSetChanged")
+    public void setMultiSelect(boolean bool) {
+        if (isMultiSelect != bool) {
+            isMultiSelect = bool;
+            // endless loop incoming...
+            //notifyDataSetChanged();
+        }
+    }
+
+    public boolean isMultiSelect() {
+        return this.isMultiSelect;
+    }
+
     public Item getItem(int notePosition) {
         return itemList.get(notePosition);
     }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/items/NoteViewHolder.java b/app/src/main/java/it/niedermann/owncloud/notes/main/items/NoteViewHolder.java
index e33d7a5ff..ec2ae21a6 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/main/items/NoteViewHolder.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/main/items/NoteViewHolder.java
@@ -45,6 +45,7 @@ public NoteViewHolder(@NonNull View v, @NonNull NoteClickListener noteClickListe
 
     @CallSuper
     public void bind(boolean isSelected, @NonNull Note note, boolean showCategory, @ColorInt int color, @Nullable CharSequence searchQuery) {
+        itemView.setActivated(isSelected);
         itemView.setSelected(isSelected);
         itemView.setOnClickListener((view) -> noteClickListener.onNoteClick(getLayoutPosition(), view));
     }
diff --git a/app/src/main/res/drawable/ic_checkbox_blank_outline.xml b/app/src/main/res/drawable/ic_checkbox_blank_outline.xml
new file mode 100644
index 000000000..3cf041aea
--- /dev/null
+++ b/app/src/main/res/drawable/ic_checkbox_blank_outline.xml
@@ -0,0 +1,16 @@
+<!--
+  ~ Nextcloud Notes - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2025 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#767676"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_checkbox_marked.xml b/app/src/main/res/drawable/ic_checkbox_marked.xml
new file mode 100644
index 000000000..457547b74
--- /dev/null
+++ b/app/src/main/res/drawable/ic_checkbox_marked.xml
@@ -0,0 +1,16 @@
+<!--
+  ~ Nextcloud Notes - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2025 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#0082c9"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M424,664L706,382L650,326L424,552L310,438L254,494L424,664ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_delete_white_24dp.xml b/app/src/main/res/drawable/ic_delete_white_24dp.xml
new file mode 100644
index 000000000..366df08c2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_delete_white_24dp.xml
@@ -0,0 +1,16 @@
+<!--
+  ~ Nextcloud - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2018-2025 Google LLC
+  ~ SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M280,840Q247,840 223.5,816.5Q200,793 200,760L200,240L160,240L160,160L360,160L360,120L600,120L600,160L800,160L800,240L760,240L760,760Q760,793 736.5,816.5Q713,840 680,840L280,840ZM680,240L280,240L280,760Q280,760 280,760Q280,760 280,760L680,760Q680,760 680,760Q680,760 680,760L680,240ZM360,680L440,680L440,320L360,320L360,680ZM520,680L600,680L600,320L520,320L520,680ZM280,240L280,240L280,760Q280,760 280,760Q280,760 280,760L280,760Q280,760 280,760Q280,760 280,760L280,240Z" />
+</vector>
diff --git a/app/src/main/res/layout/item_notes_list_note_item_grid.xml b/app/src/main/res/layout/item_notes_list_note_item_grid.xml
index 77c1ef076..46c953d6b 100644
--- a/app/src/main/res/layout/item_notes_list_note_item_grid.xml
+++ b/app/src/main/res/layout/item_notes_list_note_item_grid.xml
@@ -12,14 +12,12 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:focusable="true"
-    app:cardBackgroundColor="@color/appbar"
-    app:cardCornerRadius="@dimen/spacer_1x">
+    app:cardCornerRadius="@dimen/card_radius">
 
     <LinearLayout
         android:id="@+id/wrapper"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@drawable/grid_item_background_selector"
         android:orientation="vertical"
         android:paddingBottom="@dimen/spacer_1x">
 
@@ -107,6 +105,18 @@
                     tools:maxLength="50"
                     tools:text="@tools:sample/lorem/random" />
             </FrameLayout>
+
+            <ImageView
+                android:id="@+id/custom_checkbox"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_gravity="top"
+                android:clickable="false"
+                android:contentDescription="@null"
+                android:focusable="false"
+                android:paddingStart="@dimen/spacer_1x"
+                android:paddingEnd="@dimen/spacer_1x"
+                android:src="@drawable/ic_checkbox_blank_outline" />
         </LinearLayout>
     </LinearLayout>
 </com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_notes_list_note_item_grid_only_title.xml b/app/src/main/res/layout/item_notes_list_note_item_grid_only_title.xml
index f5be7f268..0385484c8 100644
--- a/app/src/main/res/layout/item_notes_list_note_item_grid_only_title.xml
+++ b/app/src/main/res/layout/item_notes_list_note_item_grid_only_title.xml
@@ -12,14 +12,12 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:focusable="true"
-    app:cardBackgroundColor="@color/appbar"
-    app:cardCornerRadius="@dimen/spacer_1x">
+    app:cardCornerRadius="@dimen/card_radius">
 
     <LinearLayout
         android:id="@+id/wrapper"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@drawable/grid_item_background_selector"
         android:orientation="horizontal"
         android:paddingBottom="@dimen/spacer_1x">
 
@@ -62,5 +60,17 @@
             android:textColor="@color/fg_default"
             tools:maxLength="50"
             tools:text="@tools:sample/lorem/random" />
+
+        <ImageView
+            android:id="@+id/custom_checkbox"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="top"
+            android:clickable="false"
+            android:contentDescription="@null"
+            android:focusable="false"
+            android:paddingStart="@dimen/spacer_1x"
+            android:paddingEnd="@dimen/spacer_1x"
+            android:src="@drawable/ic_checkbox_blank_outline" />
     </LinearLayout>
 </com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_notes_list_note_item_with_excerpt.xml b/app/src/main/res/layout/item_notes_list_note_item_with_excerpt.xml
index 8b23252df..1d1d17b7f 100644
--- a/app/src/main/res/layout/item_notes_list_note_item_with_excerpt.xml
+++ b/app/src/main/res/layout/item_notes_list_note_item_with_excerpt.xml
@@ -9,14 +9,16 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/noteSwipeFrame"
+    android:clickable="true"
+    android:focusable="true"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@color/bg_attention">
 
     <ImageView
         android:id="@+id/noteFavoriteLeft"
-        android:layout_width="32dp"
-        android:layout_height="32dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_marginStart="@dimen/button_padding"
         android:contentDescription="@string/menu_favorite"
@@ -24,12 +26,12 @@
 
     <ImageView
         android:id="@+id/noteDeleteRight"
-        android:layout_width="32dp"
-        android:layout_height="32dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_gravity="end|center_vertical"
         android:layout_marginEnd="@dimen/button_padding"
         android:contentDescription="@string/menu_delete"
-        app:srcCompat="@drawable/ic_delete_white_32dp" />
+        app:srcCompat="@drawable/ic_delete_white_24dp" />
 
     <LinearLayout
         android:id="@+id/noteSwipeable"
@@ -122,6 +124,18 @@
                     tools:text="@tools:sample/lorem/random" />
             </LinearLayout>
         </LinearLayout>
+
+        <ImageView
+            android:id="@+id/custom_checkbox"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="top"
+            android:clickable="false"
+            android:contentDescription="@null"
+            android:focusable="false"
+            android:paddingStart="@dimen/spacer_1x"
+            android:paddingEnd="@dimen/spacer_1x"
+            android:src="@drawable/ic_checkbox_blank_outline" />
     </LinearLayout>
 
 </FrameLayout>
diff --git a/app/src/main/res/layout/item_notes_list_note_item_without_excerpt.xml b/app/src/main/res/layout/item_notes_list_note_item_without_excerpt.xml
index 7848d554d..2eed4a816 100644
--- a/app/src/main/res/layout/item_notes_list_note_item_without_excerpt.xml
+++ b/app/src/main/res/layout/item_notes_list_note_item_without_excerpt.xml
@@ -15,8 +15,8 @@
 
     <ImageView
         android:id="@+id/noteFavoriteLeft"
-        android:layout_width="32dp"
-        android:layout_height="32dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_marginStart="@dimen/button_padding"
         android:contentDescription="@string/menu_favorite"
@@ -24,12 +24,12 @@
 
     <ImageView
         android:id="@+id/noteDeleteRight"
-        android:layout_width="32dp"
-        android:layout_height="32dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_gravity="end|center_vertical"
         android:layout_marginEnd="@dimen/button_padding"
         android:contentDescription="@string/menu_delete"
-        app:srcCompat="@drawable/ic_delete_white_32dp" />
+        app:srcCompat="@drawable/ic_delete_white_24dp" />
 
     <LinearLayout
         android:id="@+id/noteSwipeable"
@@ -94,6 +94,18 @@
             android:textSize="@dimen/secondary_font_size"
             tools:maxLength="15"
             tools:text="@tools:sample/lorem/random" />
+
+        <ImageView
+            android:id="@+id/custom_checkbox"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="top"
+            android:clickable="false"
+            android:contentDescription="@null"
+            android:focusable="false"
+            android:paddingStart="@dimen/spacer_1x"
+            android:paddingEnd="@dimen/spacer_1x"
+            android:src="@drawable/ic_checkbox_blank_outline" />
     </LinearLayout>
 
 </FrameLayout>
diff --git a/app/src/main/res/layout/item_notes_list_section_item.xml b/app/src/main/res/layout/item_notes_list_section_item.xml
index 0598428bf..c2a434886 100644
--- a/app/src/main/res/layout/item_notes_list_section_item.xml
+++ b/app/src/main/res/layout/item_notes_list_section_item.xml
@@ -18,4 +18,5 @@
     android:hint="@string/listview_updated_yesterday"
     android:padding="@dimen/spacer_1x"
     android:textColor="@color/fg_default_selection"
+    android:textStyle="bold"
     android:textSize="@dimen/secondary_font_size" />
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index c2c7d4080..92a573397 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -36,6 +36,8 @@
 
     <dimen name="spacer_activity_sides">0dp</dimen>
 
+    <dimen name="card_radius">12dp</dimen>
+
     <dimen name="default_icon_size">40dp</dimen>
 
     <!-- Drawer header -->

From f31bf528d302a7f7fbb6a58199bbef5b2a657102 Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Tue, 22 Jul 2025 16:56:24 +0200
Subject: [PATCH 2/8] styles.xml(m3): Add general background coloring

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
---
 .../it/niedermann/owncloud/notes/FormattingHelpActivity.java    | 1 +
 .../java/it/niedermann/owncloud/notes/about/AboutActivity.java  | 1 +
 .../it/niedermann/owncloud/notes/edit/EditNoteActivity.java     | 1 +
 .../owncloud/notes/manageaccounts/ManageAccountsActivity.java   | 1 +
 .../owncloud/notes/preferences/PreferencesActivity.java         | 1 +
 .../it/niedermann/owncloud/notes/share/NoteShareActivity.java   | 2 ++
 .../niedermann/owncloud/notes/share/NoteShareDetailActivity.kt  | 1 +
 app/src/main/res/values-night/colors.xml                        | 2 ++
 app/src/main/res/values/colors.xml                              | 2 ++
 app/src/main/res/values/styles.xml                              | 2 +-
 10 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/FormattingHelpActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/FormattingHelpActivity.java
index 1199fb768..86863976b 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/FormattingHelpActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/FormattingHelpActivity.java
@@ -232,5 +232,6 @@ public void applyBrand(int color) {
         final var util = BrandingUtil.of(color, this);
         util.platform.themeStatusBar(this);
         util.material.themeToolbar(binding.toolbar);
+        util.notes.themeBackgroundView(binding.getRoot(), this);
     }
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/about/AboutActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/about/AboutActivity.java
index 5f5c64f94..83e413f5e 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/about/AboutActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/about/AboutActivity.java
@@ -58,6 +58,7 @@ public void applyBrand(int color) {
         util.platform.themeStatusBar(this);
         util.material.themeToolbar(binding.toolbar);
         util.material.themeTabLayoutOnSurface(binding.tabs);
+        util.notes.themeBackgroundView(binding.getRoot(), this);
     }
 
     private static class TabsStateAdapter extends FragmentStateAdapter {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/edit/EditNoteActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/edit/EditNoteActivity.java
index 2c69fa1ba..2bf240a56 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/edit/EditNoteActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/edit/EditNoteActivity.java
@@ -448,5 +448,6 @@ public void applyBrand(int color) {
         final var util = BrandingUtil.of(color, this);
         util.platform.themeStatusBar(this);
         util.material.themeToolbar(binding.toolbar);
+        util.notes.themeBackgroundView(binding.getRoot(), this);
     }
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountsActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountsActivity.java
index 58384a8ce..dcbc9ba04 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountsActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountsActivity.java
@@ -228,5 +228,6 @@ public void applyBrand(int color) {
         final var util = BrandingUtil.of(color, this);
         util.platform.themeStatusBar(this);
         util.material.themeToolbar(binding.toolbar);
+        util.notes.themeBackgroundView(binding.getRoot(), this);
     }
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/preferences/PreferencesActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/preferences/PreferencesActivity.java
index 6c7d3c90a..8aa72cd39 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/preferences/PreferencesActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/preferences/PreferencesActivity.java
@@ -41,5 +41,6 @@ public void applyBrand(int color) {
         final var util = BrandingUtil.of(color, this);
         util.platform.themeStatusBar(this);
         util.material.themeToolbar(binding.toolbar);
+        util.notes.themeBackgroundView(binding.getRoot(), this);
     }
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index 14206421c..b43b9f0a1 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -789,6 +789,8 @@ public void applyBrand(int color) {
         util.platform.themeStatusBar(this);
         util.androidx.themeToolbarSearchView(binding.searchView);
         util.platform.themeHorizontalProgressBar(binding.progressBar);
+        util.notes.themeBackgroundView(binding.getRoot(), this);
+        util.platform.colorTextButtons(binding.btnShareButton);
     }
 
     @Override
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
index 6613acc09..0c3d2f396 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
@@ -154,6 +154,7 @@ class NoteShareDetailActivity : BrandedActivity(),
                 colorMaterialButtonPrimaryOutlined(shareProcessBtnCancel)
             }
         }
+        util.notes.themeBackgroundView(binding.getRoot(), this)
     }
 
     override fun onConfigurationChanged(newConfig: Configuration) {
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 707ba348e..34d35a722 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -38,4 +38,6 @@
 
     <color name="nc_grey">#222222</color>
     <color name="icon_on_nc_grey">#ffffff</color>
+
+    <color name="action_mode_background">#1E1E1E</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 1a688fe65..c0c740047 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -47,4 +47,6 @@
 
     <color name="widget_background">#ddffffff</color>
     <color name="widget_foreground">#222222</color>
+
+    <color name="action_mode_background">#ededed</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 6720f1725..b84323cdc 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -13,7 +13,6 @@
         <item name="colorPrimary">@color/primary</item>
         <item name="colorPrimaryDark">?android:colorPrimary</item>
         <item name="colorAccent">@color/accent</item>
-
         <item name="android:statusBarColor">@color/bg_default</item>
         <item name="android:windowLightStatusBar">@bool/isDayMode</item>
         <item name="android:colorControlNormal">?attr/colorAccent</item>
@@ -72,6 +71,7 @@
     <style name="actionModeStyle" parent="@style/Widget.Material3.ActionMode">
         <item name="android:paddingStart">@dimen/spacer_activity_sides</item>
         <item name="android:paddingEnd">@dimen/spacer_activity_sides</item>
+        <item name="background">@color/action_mode_background</item>
     </style>
 
     <style name="searchToolbarStyle" parent="@style/Widget.Material3.Toolbar">

From ebb5a5010fe3acd32ee1df07d6897b747cc5a65e Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Tue, 22 Jul 2025 17:06:54 +0200
Subject: [PATCH 3/8] style(sharing): Align sharing screen files files app
 design

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
---
 .../notes/branding/NotesViewThemeUtils.java   | 20 ++++++++++++++++
 .../share/adapter/ShareeListAdapter.java      | 22 ++++++++++-------
 .../holder/InternalShareViewHolder.java       | 14 -----------
 .../main/res/layout/activity_note_share.xml   |  2 +-
 .../main/res/layout/item_add_public_share.xml |  1 +
 .../res/layout/item_internal_share_link.xml   | 24 +++++++++----------
 6 files changed, 48 insertions(+), 35 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/branding/NotesViewThemeUtils.java b/app/src/main/java/it/niedermann/owncloud/notes/branding/NotesViewThemeUtils.java
index adcf48e41..cbc838b02 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/branding/NotesViewThemeUtils.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/branding/NotesViewThemeUtils.java
@@ -29,6 +29,7 @@
 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;
@@ -213,6 +214,25 @@ public void themeToolbarSearchView(@NonNull SearchView searchView) {
         });
     }
 
+    public void themeInternalLinkIcon(ImageView view) {
+        withScheme(view, scheme -> {
+            view
+                    .getBackground()
+                    .setColorFilter(ResourcesCompat.getColor(view.getContext().getResources(),
+                                    R.color.nc_grey,
+                                    null),
+                            PorterDuff.Mode.SRC_IN);
+            view
+                    .getDrawable()
+                    .mutate()
+                    .setColorFilter(ResourcesCompat.getColor(view.getContext().getResources(),
+                                    R.color.icon_on_nc_grey,
+                                    null),
+                            PorterDuff.Mode.SRC_IN);
+            return view;
+        });
+    }
+
     public void themeBackgroundView(View view, Activity activity) {
         withScheme(view, scheme -> {
             activity.getWindow().getDecorView().setBackgroundColor(dynamicColor.surface().getArgb(scheme));
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
index cb86e1041..a22bce23c 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java
@@ -11,7 +11,9 @@
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 
+import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.owncloud.android.lib.resources.shares.OCShare;
@@ -22,6 +24,8 @@
 import java.util.List;
 import java.util.Set;
 
+import it.niedermann.owncloud.notes.R;
+import it.niedermann.owncloud.notes.branding.BrandingUtil;
 import it.niedermann.owncloud.notes.databinding.ItemAddPublicShareBinding;
 import it.niedermann.owncloud.notes.databinding.ItemInternalShareLinkBinding;
 import it.niedermann.owncloud.notes.databinding.ItemShareLinkShareBinding;
@@ -43,6 +47,9 @@ public class ShareeListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
     private final Activity activity;
     private List<OCShare> shares;
 
+    @ColorInt
+    private int color;
+
     public ShareeListAdapter(Activity activity,
                              List<OCShare> shares,
                              ShareeListAdapterListener listener,
@@ -51,6 +58,7 @@ public ShareeListAdapter(Activity activity,
         this.shares = shares;
         this.listener = listener;
         this.account = account;
+        this.color = ContextCompat.getColor(activity, R.color.defaultBrand);
 
         sortShares();
         setHasStableIds(true);
@@ -91,16 +99,14 @@ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int
                         activity);
             }
              case NEW_PUBLIC_LINK -> {
-                return new NewLinkShareViewHolder(
-                        ItemAddPublicShareBinding.inflate(LayoutInflater.from(activity),
-                                parent,
-                                false)
-                );
+                 ItemAddPublicShareBinding binding = ItemAddPublicShareBinding.inflate(LayoutInflater.from(activity), parent, false);
+                 BrandingUtil.of(color, parent.getContext()).notes.themeInternalLinkIcon(binding.addNewPublicShareLinkIcon);
+                return new NewLinkShareViewHolder(binding);
             }
             case INTERNAL -> {
-                return new InternalShareViewHolder(
-                        ItemInternalShareLinkBinding.inflate(LayoutInflater.from(activity), parent, false),
-                        activity);
+                ItemInternalShareLinkBinding binding = ItemInternalShareLinkBinding.inflate(LayoutInflater.from(activity), parent, false);
+                BrandingUtil.of(color, parent.getContext()).notes.themeInternalLinkIcon(binding.copyInternalLinkIcon);
+                return new InternalShareViewHolder(binding, activity);
             }
             default -> {
                 return new ShareViewHolder(ItemShareShareBinding.inflate(LayoutInflater.from(activity),
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/InternalShareViewHolder.java b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/InternalShareViewHolder.java
index 7f622bad3..f81984d4c 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/InternalShareViewHolder.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/InternalShareViewHolder.java
@@ -35,20 +35,6 @@ public InternalShareViewHolder(ItemInternalShareLinkBinding binding, Context con
     }
 
     public void bind(OCShare share, ShareeListAdapterListener listener) {
-        binding.copyInternalLinkIcon
-                .getBackground()
-                .setColorFilter(ResourcesCompat.getColor(context.getResources(),
-                                R.color.widget_foreground,
-                                null),
-                        PorterDuff.Mode.SRC_IN);
-        binding.copyInternalLinkIcon
-                .getDrawable()
-                .mutate()
-                .setColorFilter(ResourcesCompat.getColor(context.getResources(),
-                                R.color.fg_contrast,
-                                null),
-                        PorterDuff.Mode.SRC_IN);
-
         if (share.isFolder()) {
             binding.shareInternalLinkText.setText(context.getString(R.string.share_internal_link_to_folder_text));
         } else {
diff --git a/app/src/main/res/layout/activity_note_share.xml b/app/src/main/res/layout/activity_note_share.xml
index 7dfba89fe..3327e438f 100644
--- a/app/src/main/res/layout/activity_note_share.xml
+++ b/app/src/main/res/layout/activity_note_share.xml
@@ -93,7 +93,7 @@
         android:id="@+id/btnShareButton"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        style="@style/Widget.MaterialComponents.Button.Icon"
+        style="@style/Widget.Material3.Button.TextButton"
         android:paddingStart="@dimen/spacer_3x"
         android:paddingEnd="@dimen/zero"
         android:text="@string/note_share_activity_share_note"
diff --git a/app/src/main/res/layout/item_add_public_share.xml b/app/src/main/res/layout/item_add_public_share.xml
index 41924a139..13434b0b3 100644
--- a/app/src/main/res/layout/item_add_public_share.xml
+++ b/app/src/main/res/layout/item_add_public_share.xml
@@ -12,6 +12,7 @@
     android:orientation="horizontal">
 
     <ImageView
+        android:id="@+id/add_new_public_share_link_icon"
         android:layout_width="@dimen/default_icon_size"
         android:layout_height="@dimen/default_icon_size"
         android:layout_gravity="center_vertical"
diff --git a/app/src/main/res/layout/item_internal_share_link.xml b/app/src/main/res/layout/item_internal_share_link.xml
index 576e50f2e..e1431c634 100644
--- a/app/src/main/res/layout/item_internal_share_link.xml
+++ b/app/src/main/res/layout/item_internal_share_link.xml
@@ -5,27 +5,27 @@
  ~ SPDX-FileCopyrightText: 2015-2025 Nextcloud GmbH and Nextcloud contributors
  ~ SPDX-License-Identifier: GPL-3.0-or-later
 -->
-<LinearLayout android:id="@+id/copy_internal_container"
-    android:layout_height="wrap_content"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/copy_internal_container"
     android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_weight="1"
     android:orientation="horizontal"
-    android:paddingBottom="@dimen/spacer_1x"
-    android:paddingEnd="@dimen/spacer_2x"
     android:paddingStart="@dimen/zero"
     android:paddingTop="@dimen/spacer_1x"
-    android:layout_weight="1"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+    android:paddingEnd="@dimen/spacer_2x"
+    android:paddingBottom="@dimen/spacer_1x">
 
     <ImageView
-        android:background="@drawable/round_bgnd"
-        android:contentDescription="@string/note_share_activity_external_icon_content_description"
         android:id="@+id/copy_internal_link_icon"
-        android:layout_gravity="top"
+        android:layout_width="@dimen/default_icon_size"
         android:layout_height="@dimen/default_icon_size"
-        android:layout_marginEnd="@dimen/spacer_2x"
+        android:layout_gravity="top"
         android:layout_marginStart="@dimen/spacer_2x"
-        android:layout_width="@dimen/default_icon_size"
+        android:layout_marginEnd="@dimen/spacer_2x"
+        android:background="@drawable/round_bgnd"
+        android:contentDescription="@string/note_share_activity_external_icon_content_description"
         android:padding="@dimen/spacer_1x"
         android:src="@drawable/ic_external" />
 

From 17dc7cc9f46dad0ea2543a5ec1cd95f144387895 Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Tue, 22 Jul 2025 18:02:27 +0200
Subject: [PATCH 4/8] style(permissions): M3 style for sharing permission
 bottom sheet

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
---
 .../adapter/QuickSharingPermissionsAdapter.kt | 23 +++++++++++++---
 ...ckSharingPermissionsBottomSheetDialog.java | 27 ++++++++++++++-----
 .../res/layout/item_note_share_action.xml     |  5 +++-
 ...ring_permissions_bottom_sheet_fragment.xml | 13 +++++----
 4 files changed, 53 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/QuickSharingPermissionsAdapter.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/QuickSharingPermissionsAdapter.kt
index 6494e510c..062ff37f4 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/adapter/QuickSharingPermissionsAdapter.kt
+++ b/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,10 +45,16 @@ 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) {
@@ -44,7 +62,6 @@ class QuickSharingPermissionsAdapter(
         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
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/QuickSharingPermissionsBottomSheetDialog.java b/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/QuickSharingPermissionsBottomSheetDialog.java
index 45ac60eb4..b39c95401 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/dialog/QuickSharingPermissionsBottomSheetDialog.java
+++ b/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);
     }
diff --git a/app/src/main/res/layout/item_note_share_action.xml b/app/src/main/res/layout/item_note_share_action.xml
index 0de68eecd..b222c2653 100644
--- a/app/src/main/res/layout/item_note_share_action.xml
+++ b/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"
diff --git a/app/src/main/res/layout/quick_sharing_permissions_bottom_sheet_fragment.xml b/app/src/main/res/layout/quick_sharing_permissions_bottom_sheet_fragment.xml
index 0c1d00aa6..c6aac8ba8 100644
--- a/app/src/main/res/layout/quick_sharing_permissions_bottom_sheet_fragment.xml
+++ b/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>

From 9eb413f01a1daf867898de6a32bf4a24733522f6 Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Tue, 22 Jul 2025 18:12:03 +0200
Subject: [PATCH 5/8] fix(selection): always hide selection checkmark and only
 use selector coloring

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
---
 .../it/niedermann/owncloud/notes/main/items/ItemAdapter.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/items/ItemAdapter.java b/app/src/main/java/it/niedermann/owncloud/notes/main/items/ItemAdapter.java
index b71f1b32a..1264e114c 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/main/items/ItemAdapter.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/main/items/ItemAdapter.java
@@ -178,7 +178,8 @@ public void onBindViewHolder(@NonNull final RecyclerView.ViewHolder holder, int
                     holder.itemView.setBackgroundColor(holder.itemView.getContext().getColor(com.nextcloud.android.common.ui.R.color.bg_default));
                     ((ImageView) holder.itemView.findViewById(R.id.custom_checkbox)).setImageResource(R.drawable.ic_checkbox_blank_outline);
                 }
-                holder.itemView.findViewById(R.id.custom_checkbox).setVisibility(isMultiSelect ? View.VISIBLE : View.GONE);
+                //holder.itemView.findViewById(R.id.custom_checkbox).setVisibility(isMultiSelect ? View.VISIBLE : View.GONE);
+                holder.itemView.findViewById(R.id.custom_checkbox).setVisibility(View.GONE);
                 ((NoteViewHolder) holder).bind(isSelected, (Note) itemList.get(position), showCategory, color, searchQuery);
             }
         }

From 8c1162b636da41e907f6e871e94060ac8bda7e09 Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Wed, 23 Jul 2025 19:11:21 +0200
Subject: [PATCH 6/8] style(bgnd): Use common lib implementation for
 background-theming

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
---
 .../owncloud/notes/FormattingHelpActivity.java           | 3 ++-
 .../niedermann/owncloud/notes/about/AboutActivity.java   | 4 ++--
 .../owncloud/notes/branding/NotesViewThemeUtils.java     | 9 ---------
 .../niedermann/owncloud/notes/edit/EditNoteActivity.java | 3 ++-
 .../it/niedermann/owncloud/notes/main/MainActivity.java  | 4 ++--
 .../notes/manageaccounts/ManageAccountsActivity.java     | 3 ++-
 .../owncloud/notes/preferences/PreferencesActivity.java  | 3 ++-
 .../owncloud/notes/share/NoteShareActivity.java          | 3 ++-
 .../owncloud/notes/share/NoteShareDetailActivity.kt      | 3 ++-
 9 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/FormattingHelpActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/FormattingHelpActivity.java
index 86863976b..15051c302 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/FormattingHelpActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/FormattingHelpActivity.java
@@ -232,6 +232,7 @@ public void applyBrand(int color) {
         final var util = BrandingUtil.of(color, this);
         util.platform.themeStatusBar(this);
         util.material.themeToolbar(binding.toolbar);
-        util.notes.themeBackgroundView(binding.getRoot(), this);
+        util.platform.colorViewBackground(getWindow().getDecorView());
+        util.platform.colorViewBackground(binding.getRoot());
     }
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/about/AboutActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/about/AboutActivity.java
index 83e413f5e..735acd4d9 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/about/AboutActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/about/AboutActivity.java
@@ -10,7 +10,6 @@
 
 import android.os.Bundle;
 
-import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
@@ -58,7 +57,8 @@ public void applyBrand(int color) {
         util.platform.themeStatusBar(this);
         util.material.themeToolbar(binding.toolbar);
         util.material.themeTabLayoutOnSurface(binding.tabs);
-        util.notes.themeBackgroundView(binding.getRoot(), this);
+        util.platform.colorViewBackground(getWindow().getDecorView());
+        util.platform.colorViewBackground(binding.getRoot());
     }
 
     private static class TabsStateAdapter extends FragmentStateAdapter {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/branding/NotesViewThemeUtils.java b/app/src/main/java/it/niedermann/owncloud/notes/branding/NotesViewThemeUtils.java
index cbc838b02..6192101fc 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/branding/NotesViewThemeUtils.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/branding/NotesViewThemeUtils.java
@@ -9,7 +9,6 @@
 import static com.nextcloud.android.common.ui.util.ColorStateListUtilsKt.buildColorStateList;
 import static com.nextcloud.android.common.ui.util.PlatformThemeUtil.isDarkMode;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.graphics.Color;
@@ -233,14 +232,6 @@ public void themeInternalLinkIcon(ImageView view) {
         });
     }
 
-    public void themeBackgroundView(View view, Activity activity) {
-        withScheme(view, scheme -> {
-            activity.getWindow().getDecorView().setBackgroundColor(dynamicColor.surface().getArgb(scheme));
-            view.setBackgroundColor(dynamicColor.surface().getArgb(scheme));
-            return view;
-        });
-    }
-
     public void themeBackgroundItemView(View view) {
         withScheme(view, scheme -> {
             StateListDrawable res = new StateListDrawable();
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/edit/EditNoteActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/edit/EditNoteActivity.java
index 2bf240a56..728054e2f 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/edit/EditNoteActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/edit/EditNoteActivity.java
@@ -448,6 +448,7 @@ public void applyBrand(int color) {
         final var util = BrandingUtil.of(color, this);
         util.platform.themeStatusBar(this);
         util.material.themeToolbar(binding.toolbar);
-        util.notes.themeBackgroundView(binding.getRoot(), this);
+        util.platform.colorViewBackground(getWindow().getDecorView());
+        util.platform.colorViewBackground(binding.getRoot());
     }
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java
index a358af2e1..fead999af 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java
@@ -27,7 +27,6 @@
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
-import android.view.Menu;
 import android.view.View;
 
 import androidx.annotation.ColorInt;
@@ -607,7 +606,8 @@ public void applyBrand(int color) {
         util.platform.colorNavigationView(binding.navigationView);
         util.material.themeFAB(activityBinding.fabCreate);
         util.notes.themeSearchCardView(binding.activityNotesListView.searchBarWrapper);
-        util.notes.themeBackgroundView(binding.activityNotesListView.getRoot(), this);
+        util.platform.colorViewBackground(getWindow().getDecorView());
+        util.platform.colorViewBackground(binding.getRoot());
         util.platform.colorTextView(binding.activityNotesListView.searchText, ColorRole.ON_SURFACE_VARIANT);
         util.notes.themeSearchToolbar(binding.activityNotesListView.searchToolbar);
         util.notes.themeToolbarSearchView(binding.activityNotesListView.searchView);
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountsActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountsActivity.java
index dcbc9ba04..bca385faf 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountsActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountsActivity.java
@@ -228,6 +228,7 @@ public void applyBrand(int color) {
         final var util = BrandingUtil.of(color, this);
         util.platform.themeStatusBar(this);
         util.material.themeToolbar(binding.toolbar);
-        util.notes.themeBackgroundView(binding.getRoot(), this);
+        util.platform.colorViewBackground(getWindow().getDecorView());
+        util.platform.colorViewBackground(binding.getRoot());
     }
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/preferences/PreferencesActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/preferences/PreferencesActivity.java
index 8aa72cd39..a338f280f 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/preferences/PreferencesActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/preferences/PreferencesActivity.java
@@ -41,6 +41,7 @@ public void applyBrand(int color) {
         final var util = BrandingUtil.of(color, this);
         util.platform.themeStatusBar(this);
         util.material.themeToolbar(binding.toolbar);
-        util.notes.themeBackgroundView(binding.getRoot(), this);
+        util.platform.colorViewBackground(getWindow().getDecorView());
+        util.platform.colorViewBackground(binding.getRoot());
     }
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
index b43b9f0a1..3b8d38394 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -789,7 +789,8 @@ public void applyBrand(int color) {
         util.platform.themeStatusBar(this);
         util.androidx.themeToolbarSearchView(binding.searchView);
         util.platform.themeHorizontalProgressBar(binding.progressBar);
-        util.notes.themeBackgroundView(binding.getRoot(), this);
+        util.platform.colorViewBackground(getWindow().getDecorView());
+        util.platform.colorViewBackground(binding.getRoot());
         util.platform.colorTextButtons(binding.btnShareButton);
     }
 
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
index 0c3d2f396..1cf9ec2e9 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
+++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
@@ -154,7 +154,8 @@ class NoteShareDetailActivity : BrandedActivity(),
                 colorMaterialButtonPrimaryOutlined(shareProcessBtnCancel)
             }
         }
-        util.notes.themeBackgroundView(binding.getRoot(), this)
+        util.platform.colorViewBackground(window.decorView)
+        util.platform.colorViewBackground(binding.getRoot())
     }
 
     override fun onConfigurationChanged(newConfig: Configuration) {

From 3aa1c002606e7cd3ff601f3304c9000e9c31a43e Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Fri, 25 Jul 2025 16:01:22 +0200
Subject: [PATCH 7/8] fix(bgnd): Fix background coloring on main view

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
---
 .../java/it/niedermann/owncloud/notes/main/MainActivity.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java
index fead999af..83e7201c1 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java
@@ -608,6 +608,7 @@ public void applyBrand(int color) {
         util.notes.themeSearchCardView(binding.activityNotesListView.searchBarWrapper);
         util.platform.colorViewBackground(getWindow().getDecorView());
         util.platform.colorViewBackground(binding.getRoot());
+        util.platform.colorViewBackground(binding.activityNotesListView.activityNotesListView);
         util.platform.colorTextView(binding.activityNotesListView.searchText, ColorRole.ON_SURFACE_VARIANT);
         util.notes.themeSearchToolbar(binding.activityNotesListView.searchToolbar);
         util.notes.themeToolbarSearchView(binding.activityNotesListView.searchView);

From 32744d071ca6638370da55e7547921f4d83d9a00 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Fri, 25 Jul 2025 16:25:08 +0200
Subject: [PATCH 8/8] fix multi-select and show custom_checkbox

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 .../niedermann/owncloud/notes/main/items/ItemAdapter.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/items/ItemAdapter.java b/app/src/main/java/it/niedermann/owncloud/notes/main/items/ItemAdapter.java
index 1264e114c..c7466c312 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/main/items/ItemAdapter.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/main/items/ItemAdapter.java
@@ -10,6 +10,8 @@
 
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.os.Handler;
+import android.os.Looper;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -178,8 +180,7 @@ public void onBindViewHolder(@NonNull final RecyclerView.ViewHolder holder, int
                     holder.itemView.setBackgroundColor(holder.itemView.getContext().getColor(com.nextcloud.android.common.ui.R.color.bg_default));
                     ((ImageView) holder.itemView.findViewById(R.id.custom_checkbox)).setImageResource(R.drawable.ic_checkbox_blank_outline);
                 }
-                //holder.itemView.findViewById(R.id.custom_checkbox).setVisibility(isMultiSelect ? View.VISIBLE : View.GONE);
-                holder.itemView.findViewById(R.id.custom_checkbox).setVisibility(View.GONE);
+                holder.itemView.findViewById(R.id.custom_checkbox).setVisibility(isMultiSelect ? View.VISIBLE : View.GONE);
                 ((NoteViewHolder) holder).bind(isSelected, (Note) itemList.get(position), showCategory, color, searchQuery);
             }
         }
@@ -193,8 +194,7 @@ public void setTracker(SelectionTracker<Long> tracker) {
     public void setMultiSelect(boolean bool) {
         if (isMultiSelect != bool) {
             isMultiSelect = bool;
-            // endless loop incoming...
-            //notifyDataSetChanged();
+            new Handler(Looper.getMainLooper()).post(this::notifyDataSetChanged);
         }
     }