Merge pull request #3050 from nextcloud/backport/3046/stable-4.6

alperozturk96 · web-flow · commit 54024e82c6f6 · 2026-02-12T10:54:27.000+01:00
[stable-4.6] feat(note-list): add share icon
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
@@ -113,6 +113,7 @@
 import it.niedermann.owncloud.notes.persistence.CapabilitiesWorker;
 import it.niedermann.owncloud.notes.persistence.entity.Account;
 import it.niedermann.owncloud.notes.persistence.entity.Note;
+import it.niedermann.owncloud.notes.share.NoteShareActivity;
 import it.niedermann.owncloud.notes.shared.model.CategorySortingMethod;
 import it.niedermann.owncloud.notes.shared.model.IResponseCallback;
 import it.niedermann.owncloud.notes.shared.model.NavigationCategory;
@@ -913,6 +914,16 @@ public void onNoteFavoriteClick(int position, View view) {
         }});
     }
 
+    @Override
+    public void openShare(int position) {
+        if (adapter.getItem(position) instanceof Note note) {
+            mainViewModel.getCurrentAccount().observe(this, (account) -> {
+                final Intent intent = NoteShareActivity.getActivityStartIntent(note, account, this);
+                startActivity(intent);
+            });
+        }
+    }
+
     private void updateToolbars(boolean enableSearch) {
         activityBinding.searchBar.searchBarWrapper.setVisibility(enableSearch ? GONE : VISIBLE);
         activityBinding.searchToolbar.setVisibility(enableSearch ? VISIBLE : GONE);
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/MultiSelectedActionModeCallback.java b/app/src/main/java/it/niedermann/owncloud/notes/main/MultiSelectedActionModeCallback.java
@@ -166,11 +166,7 @@ public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
                     currentAccount$.removeObservers(lifecycleOwner);
                     executor.submit(() -> {{
                         final var note = mainViewModel.getFullNote(selection.get(0));
-                        Bundle bundle = new Bundle();
-                        bundle.putSerializable(NoteShareActivity.ARG_NOTE, note);
-                        bundle.putSerializable(NoteShareActivity.ARG_ACCOUNT, account);
-                        Intent intent = new Intent(mainActivity, NoteShareActivity.class);
-                        intent.putExtras(bundle);
+                        final Intent intent = NoteShareActivity.getActivityStartIntent(note, account, mainActivity);
                         mainActivity.startActivity(intent);
                     }});
                 });
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
@@ -6,6 +6,7 @@
  */
 package it.niedermann.owncloud.notes.main.items;
 
+import static android.view.View.GONE;
 import static android.view.View.INVISIBLE;
 import static android.view.View.VISIBLE;
 import static com.nextcloud.android.common.ui.util.PlatformThemeUtil.isDarkMode;
@@ -23,6 +24,7 @@
 import androidx.recyclerview.selection.ItemDetailsLookup;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.google.android.material.button.MaterialButton;
 import com.google.android.material.chip.Chip;
 import com.google.android.material.progressindicator.CircularProgressIndicator;
 import com.nextcloud.android.common.core.utils.DateFormatter;
@@ -76,7 +78,7 @@ protected void bindStatus(CircularProgressIndicator noteSyncStatus, DBStatus sta
 
     protected void bindCategory(@NonNull Context context, @NonNull TextView noteCategory, boolean showCategory, @NonNull String category, int color) {
         if (!showCategory || category.isEmpty()) {
-            noteCategory.setVisibility(View.GONE);
+            noteCategory.setVisibility(GONE);
         } else {
             noteCategory.setText(category);
 
@@ -112,6 +114,18 @@ protected void bindSearchableContent(@NonNull Context context, @NonNull TextView
         }
     }
 
+    protected void bindNoteSharedIcon(@NonNull Context context, boolean shared, @NonNull MaterialButton noteShareIcon, int color) {
+        if (shared) {
+            noteShareIcon.setVisibility(VISIBLE);
+            noteShareIcon.setOnClickListener(view -> noteClickListener.openShare(getLayoutPosition()));
+        } else {
+            noteShareIcon.setVisibility(GONE);
+        }
+
+        final var util = BrandingUtil.of(color, context);
+        util.material.colorMaterialButtonContent(noteShareIcon, ColorRole.PRIMARY);
+    }
+
     public abstract void showSwipe(float dX);
 
     @Nullable
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/items/grid/NoteViewGridHolder.java b/app/src/main/java/it/niedermann/owncloud/notes/main/items/grid/NoteViewGridHolder.java
@@ -55,6 +55,7 @@ public void bind(boolean isSelected, @NonNull Note note, boolean showCategory, @
         bindModified(binding.noteModified, note.getModified());
         bindSearchableContent(context, binding.noteTitle, searchQuery, note.getTitle(), color);
         bindSearchableContent(context, binding.noteExcerpt, searchQuery, note.getExcerpt().replace(EXCERPT_LINE_SEPARATOR, "\n"), color);
+        bindNoteSharedIcon(context, note.isShared(), binding.noteShared, color);
         binding.noteExcerpt.setVisibility(TextUtils.isEmpty(note.getExcerpt()) ? GONE : VISIBLE);
     }
 
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/items/grid/NoteViewGridHolderOnlyTitle.java b/app/src/main/java/it/niedermann/owncloud/notes/main/items/grid/NoteViewGridHolderOnlyTitle.java
@@ -46,6 +46,7 @@ public void bind(boolean isSelected, @NonNull Note note, boolean showCategory, i
         bindFavorite(binding.noteFavorite, note.getFavorite());
         bindModified(binding.noteModified, note.getModified());
         bindSearchableContent(context, binding.noteTitle, searchQuery, note.getTitle(), color);
+        bindNoteSharedIcon(context, note.isShared(), binding.noteShared, color);
     }
 
     @Nullable
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/items/list/NoteViewListHolder.java b/app/src/main/java/it/niedermann/owncloud/notes/main/items/list/NoteViewListHolder.java
@@ -73,6 +73,8 @@ public void bind(boolean isSelected, @NonNull Note note, boolean showCategory, @
         } else {
             bindSearchableContent(context, binding.noteExcerpt, searchQuery, note.getExcerpt(), color);
         }
+
+        bindNoteSharedIcon(context, note.isShared(), binding.noteShared, color);
     }
 
     @NonNull
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
@@ -106,6 +106,16 @@ public class NoteShareActivity extends BrandedActivity implements ShareeListAdap
     private ActivityResultLauncher<Intent> resultLauncher;
     private final List<OCShare> shares = Collections.synchronizedList(new ArrayList<>());
 
+    public static Intent getActivityStartIntent(@NonNull Note note, @NonNull Account account, @NonNull Activity activity) {
+        Bundle bundle = new Bundle();
+        bundle.putSerializable(NoteShareActivity.ARG_NOTE, note);
+        bundle.putSerializable(NoteShareActivity.ARG_ACCOUNT, account);
+
+        Intent intent = new Intent(activity, NoteShareActivity.class);
+        intent.putExtras(bundle);
+        return intent;
+    }
+
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/model/NoteClickListener.java b/app/src/main/java/it/niedermann/owncloud/notes/shared/model/NoteClickListener.java
@@ -12,4 +12,6 @@ public interface NoteClickListener {
     void onNoteClick(int position, View v);
 
     void onNoteFavoriteClick(int position, View v);
+
+    void openShare(int position);
 }
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
@@ -125,6 +125,22 @@
                     android:layout_marginEnd="@dimen/spacer_2x"
                     tools:text="27.11." />
 
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/noteShared"
+                    style="@style/Widget.Material3.Button.IconButton"
+                    android:layout_width="@dimen/note_shared_icon_size"
+                    android:layout_height="@dimen/note_shared_icon_size"
+                    android:layout_marginEnd="@dimen/spacer_2x"
+                    android:contentDescription="@string/menu_shared_note"
+                    android:visibility="gone"
+                    android:layout_gravity="end"
+                    app:backgroundTint="@android:color/transparent"
+                    app:icon="@drawable/ic_share_white_24dp"
+                    app:iconGravity="textStart"
+                    app:iconSize="@dimen/note_shared_icon_size"
+                    app:iconTint="@color/defaultBrand"
+                    tools:visibility="visible" />
+
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
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
@@ -114,6 +114,22 @@
                     android:layout_marginEnd="@dimen/spacer_2x"
                     tools:text="27.11." />
 
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/noteShared"
+                    style="@style/Widget.Material3.Button.IconButton"
+                    android:layout_width="@dimen/note_shared_icon_size"
+                    android:layout_height="@dimen/note_shared_icon_size"
+                    android:layout_marginEnd="@dimen/spacer_2x"
+                    android:contentDescription="@string/menu_shared_note"
+                    android:visibility="gone"
+                    android:layout_gravity="end"
+                    app:backgroundTint="@android:color/transparent"
+                    app:icon="@drawable/ic_share_white_24dp"
+                    app:iconGravity="textStart"
+                    app:iconSize="@dimen/note_shared_icon_size"
+                    app:iconTint="@color/defaultBrand"
+                    tools:visibility="visible" />
+
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
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
@@ -111,6 +111,7 @@
 
                 <LinearLayout
                     android:layout_width="match_parent"
+                    android:gravity="center"
                     android:layout_height="wrap_content">
 
                     <TextView
@@ -135,8 +136,10 @@
 
                 </LinearLayout>
 
+
                 <LinearLayout
                     android:layout_width="match_parent"
+                    android:gravity="center"
                     android:layout_height="wrap_content">
 
                     <TextView
@@ -164,6 +167,22 @@
                         android:textSize="@dimen/secondary_font_size"
                         tools:maxLength="15"
                         tools:text="@tools:sample/lorem/random" />
+
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/noteShared"
+                        style="@style/Widget.Material3.Button.IconButton"
+                        android:layout_width="@dimen/note_shared_icon_size"
+                        android:layout_height="@dimen/note_shared_icon_size"
+                        android:layout_marginStart="@dimen/spacer_1x"
+                        android:contentDescription="@string/menu_shared_note"
+                        android:visibility="gone"
+                        app:backgroundTint="@android:color/transparent"
+                        app:icon="@drawable/ic_share_white_24dp"
+                        app:iconGravity="textStart"
+                        app:iconSize="@dimen/note_shared_icon_size"
+                        app:iconTint="@color/defaultBrand"
+                        tools:visibility="visible" />
+
                 </LinearLayout>
             </LinearLayout>
 
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -26,6 +26,8 @@
     <dimen name="button_extra_width">180dp</dimen>
     <dimen name="bottom_navigation_view_margin">100dp</dimen>
 
+    <dimen name="note_shared_icon_size">18dp</dimen>
+
     <dimen name="avatar_size">40dp</dimen>
     <dimen name="user_status_icon_size">16dp</dimen>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -32,6 +32,7 @@
     <string name="menu_favorite">Favorite</string>
     <string name="menu_preview">Preview</string>
     <string name="menu_share">Share</string>
+    <string name="menu_shared_note">Shared note</string>
     <string name="common_loading">Loading…</string>
 
 

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,7 @@ public void bind(boolean isSelected, @NonNull Note note, boolean showCategory, @`
`55`	`55`	`bindModified(binding.noteModified, note.getModified());`
`56`	`56`	`bindSearchableContent(context, binding.noteTitle, searchQuery, note.getTitle(), color);`
`57`	`57`	`bindSearchableContent(context, binding.noteExcerpt, searchQuery, note.getExcerpt().replace(EXCERPT_LINE_SEPARATOR, "\n"), color);`
	`58`	`+ bindNoteSharedIcon(context, note.isShared(), binding.noteShared, color);`
`58`	`59`	`binding.noteExcerpt.setVisibility(TextUtils.isEmpty(note.getExcerpt()) ? GONE : VISIBLE);`
`59`	`60`	`}`
`60`	`61`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ public void bind(boolean isSelected, @NonNull Note note, boolean showCategory, i`
`46`	`46`	`bindFavorite(binding.noteFavorite, note.getFavorite());`
`47`	`47`	`bindModified(binding.noteModified, note.getModified());`
`48`	`48`	`bindSearchableContent(context, binding.noteTitle, searchQuery, note.getTitle(), color);`
	`49`	`+ bindNoteSharedIcon(context, note.isShared(), binding.noteShared, color);`
`49`	`50`	`}`
`50`	`51`
`51`	`52`	`@Nullable`
Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,8 @@ public void bind(boolean isSelected, @NonNull Note note, boolean showCategory, @`
`73`	`73`	`} else {`
`74`	`74`	`bindSearchableContent(context, binding.noteExcerpt, searchQuery, note.getExcerpt(), color);`
`75`	`75`	`}`
	`76`	`+`
	`77`	`+ bindNoteSharedIcon(context, note.isShared(), binding.noteShared, color);`
`76`	`78`	`}`
`77`	`79`
`78`	`80`	`@NonNull`
Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,6 @@ public interface NoteClickListener {`
`12`	`12`	`void onNoteClick(int position, View v);`
`13`	`13`
`14`	`14`	`void onNoteFavoriteClick(int position, View v);`
	`15`	`+`
	`16`	`+ void openShare(int position);`
`15`	`17`	`}`