wip: Copy note actions to overflow menu on each note action

AlvaroBrey · AlvaroBrey · commit 987dee414275 · 2023-03-08T13:14:16.000+01:00
Signed-off-by: Álvaro Brey &lt;alvaro.brey@nextcloud.com&gt;
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/AppendToNoteActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/AppendToNoteActivity.java
@@ -58,4 +58,10 @@ public void onNoteClick(int position, View v) {
         }
         finish();
     }
+
+    @Override
+    public void onNoteActionsClick(int position, View v) {
+        // TODO
+        Toast.makeText(v.getContext(), "Not implemented yet", Toast.LENGTH_SHORT).show();
+    }
 }
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
@@ -21,6 +21,7 @@
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
+import android.widget.Toast;
 
 import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
@@ -771,6 +772,12 @@ public void onNoteFavoriteClick(int position, View view) {
         toggleLiveData.observe(this, (next) -> toggleLiveData.removeObservers(this));
     }
 
+    @Override
+    public void onNoteActionsClick(int position, View v) {
+        // TODO
+        Toast.makeText(v.getContext(), "Not implemented yet", Toast.LENGTH_SHORT).show();
+    }
+
     @Override
     public void onBackPressed() {
         if (activityBinding.searchToolbar.getVisibility() == VISIBLE) {
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
@@ -2,14 +2,10 @@
 
 import static android.view.View.INVISIBLE;
 import static android.view.View.VISIBLE;
-
 import static com.nextcloud.android.common.ui.util.PlatformThemeUtil.isDarkMode;
 
 import android.content.Context;
-import android.text.SpannableString;
 import android.text.TextUtils;
-import android.text.style.BackgroundColorSpan;
-import android.text.style.ForegroundColorSpan;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -19,17 +15,12 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatImageView;
-import androidx.core.content.ContextCompat;
-import androidx.core.graphics.drawable.DrawableCompat;
 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.nextcloud.android.common.ui.theme.utils.ColorRole;
-import com.nextcloud.android.common.ui.util.PlatformThemeUtil;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import it.niedermann.owncloud.notes.R;
 import it.niedermann.owncloud.notes.branding.BrandingUtil;
@@ -98,6 +89,13 @@ protected void bindSearchableContent(@NonNull Context context, @NonNull TextView
         }
     }
 
+    protected void bindActions(@NonNull MaterialButton actionsButton, int color) {
+        final BrandingUtil util = BrandingUtil.of(color, actionsButton.getContext());
+        util.material.colorMaterialButtonText(actionsButton);
+        util.material.colorMaterialTextButton(actionsButton);
+        actionsButton.setOnClickListener(view -> noteClickListener.onNoteActionsClick(getLayoutPosition(), view));
+    }
+
     public abstract void showSwipe(boolean left);
 
     @Nullable
@@ -116,4 +114,4 @@ public Long getSelectionKey() {
             }
         };
     }
-}
+}
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
@@ -49,10 +49,11 @@ public void bind(boolean isSelected, @NonNull Note note, boolean showCategory, @
         bindSearchableContent(context, binding.noteTitle, searchQuery, note.getTitle(), color);
         bindSearchableContent(context, binding.noteExcerpt, searchQuery, note.getExcerpt().replace(EXCERPT_LINE_SEPARATOR, "\n"), color);
         binding.noteExcerpt.setVisibility(TextUtils.isEmpty(note.getExcerpt()) ? GONE : VISIBLE);
+        bindActions(binding.noteActions, color);
     }
 
     @Nullable
     public View getNoteSwipeable() {
         return null;
     }
-}
+}
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
@@ -38,10 +38,11 @@ public void bind(boolean isSelected, @NonNull Note note, boolean showCategory, i
         bindStatus(binding.noteStatus, note.getStatus(), color);
         bindFavorite(binding.noteFavorite, note.getFavorite());
         bindSearchableContent(context, binding.noteTitle, searchQuery, note.getTitle(), color);
+        bindActions(binding.noteActions, color);
     }
 
     @Nullable
     public View getNoteSwipeable() {
         return null;
     }
-}
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/items/list/NoteViewHolderWithExcerpt.java b/app/src/main/java/it/niedermann/owncloud/notes/main/items/list/NoteViewHolderWithExcerpt.java
@@ -1,6 +1,5 @@
 package it.niedermann.owncloud.notes.main.items.list;
 
-import android.content.Context;
 import android.view.View;
 
 import androidx.annotation.ColorInt;
@@ -39,10 +38,11 @@ public void bind(boolean isSelected, @NonNull Note note, boolean showCategory, @
 
         bindSearchableContent(context, binding.noteTitle, searchQuery, note.getTitle(), color);
         bindSearchableContent(context, binding.noteExcerpt, searchQuery, note.getExcerpt(), color);
+        bindActions(binding.noteActions, color);
     }
 
     @NonNull
     public View getNoteSwipeable() {
         return binding.noteSwipeable;
     }
-}
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/items/list/NoteViewHolderWithoutExcerpt.java b/app/src/main/java/it/niedermann/owncloud/notes/main/items/list/NoteViewHolderWithoutExcerpt.java
@@ -36,10 +36,11 @@ public void bind(boolean isSelected, @NonNull Note note, boolean showCategory, i
         bindStatus(binding.noteStatus, note.getStatus(), color);
         bindFavorite(binding.noteFavorite, note.getFavorite());
         bindSearchableContent(context, binding.noteTitle, searchQuery, note.getTitle(), color);
+        bindActions(binding.noteActions, color);
     }
 
     @NonNull
     public View getNoteSwipeable() {
         return binding.noteSwipeable;
     }
-}
+}
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
@@ -6,4 +6,6 @@ public interface NoteClickListener {
     void onNoteClick(int position, View v);
 
     void onNoteFavoriteClick(int position, View v);
-}
+
+    void onNoteActionsClick(int position, View v);
+}
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidgetConfigurationActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidgetConfigurationActivity.java
@@ -9,9 +9,6 @@
 import android.view.View;
 import android.widget.Toast;
 
-import androidx.appcompat.widget.Toolbar;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-
 import it.niedermann.owncloud.notes.NotesApplication;
 import it.niedermann.owncloud.notes.R;
 import it.niedermann.owncloud.notes.exception.ExceptionHandler;
@@ -73,4 +70,10 @@ public void onNoteClick(int position, View v) {
             }
         });
     }
+
+    @Override
+    public void onNoteActionsClick(int position, View v) {
+        // TODO
+        Toast.makeText(v.getContext(), "Not implemented yet", Toast.LENGTH_SHORT).show();
+    }
 }
diff --git a/app/src/main/res/drawable/ic_dots_vertical.xml b/app/src/main/res/drawable/ic_dots_vertical.xml
@@ -0,0 +1 @@
+<!-- drawable/dots_vertical.xml --><vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24"><path android:fillColor="#000000" android:pathData="M12,16A2,2 0 0,1 14,18A2,2 0 0,1 12,20A2,2 0 0,1 10,18A2,2 0 0,1 12,16M12,10A2,2 0 0,1 14,12A2,2 0 0,1 12,14A2,2 0 0,1 10,12A2,2 0 0,1 12,10M12,4A2,2 0 0,1 14,6A2,2 0 0,1 12,8A2,2 0 0,1 10,6A2,2 0 0,1 12,4Z" /></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
@@ -102,5 +102,16 @@
                     tools:text="@tools:sample/lorem/random" />
             </FrameLayout>
         </LinearLayout>
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/noteActions"
+            style="@style/Widget.Material3.Button.IconButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|end"
+            android:contentDescription="@string/note_actions"
+            app:icon="@drawable/ic_dots_vertical"
+            app:iconTint="?android:textColorPrimary"
+            app:rippleColor="@color/fg_secondary" />
     </LinearLayout>
-</com.google.android.material.card.MaterialCardView>
+</com.google.android.material.card.MaterialCardView>
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
@@ -56,5 +56,16 @@
             android:textColor="@color/fg_default"
             tools:maxLength="50"
             tools:text="@tools:sample/lorem/random" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/noteActions"
+            style="@style/Widget.Material3.Button.IconButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|end"
+            android:contentDescription="@string/note_actions"
+            app:icon="@drawable/ic_dots_vertical"
+            app:iconTint="?android:textColorPrimary"
+            app:rippleColor="@color/fg_secondary" />
     </LinearLayout>
-</com.google.android.material.card.MaterialCardView>
+</com.google.android.material.card.MaterialCardView>
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
@@ -116,6 +116,18 @@
                     tools:text="@tools:sample/lorem/random" />
             </LinearLayout>
         </LinearLayout>
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/noteActions"
+            style="@style/Widget.Material3.Button.IconButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:contentDescription="@string/note_actions"
+            app:icon="@drawable/ic_dots_vertical"
+            app:iconTint="?android:textColorPrimary"
+            app:rippleColor="@color/fg_secondary" />
+
     </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
@@ -88,6 +88,18 @@
             android:textSize="@dimen/secondary_font_size"
             tools:maxLength="15"
             tools:text="@tools:sample/lorem/random" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/noteActions"
+            style="@style/Widget.Material3.Button.IconButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:contentDescription="@string/note_actions"
+            app:icon="@drawable/ic_dots_vertical"
+            app:iconTint="?android:textColorPrimary"
+            app:rippleColor="@color/fg_secondary" />
+
     </LinearLayout>
 
 </FrameLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -370,4 +370,5 @@
     <string name="switch_to_plain_editing">Switch to plain editing</string>
     <string name="action_back">Back</string>
     <string name="user_agent" translatable="false">Mozilla/5.0 (Android) %1$s-android/%2$s</string>
+    <string name="note_actions">Note actions</string>
 </resources>

Original file line number	Diff line number	Diff line change
`@@ -58,4 +58,10 @@ public void onNoteClick(int position, View v) {`
`58`	`58`	`}`
`59`	`59`	`finish();`
`60`	`60`	`}`
	`61`	`+`
	`62`	`+ @Override`
	`63`	`+ public void onNoteActionsClick(int position, View v) {`
	`64`	`+ // TODO`
	`65`	`+ Toast.makeText(v.getContext(), "Not implemented yet", Toast.LENGTH_SHORT).show();`
	`66`	`+ }`
`61`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,10 +49,11 @@ public void bind(boolean isSelected, @NonNull Note note, boolean showCategory, @`
`49`	`49`	`bindSearchableContent(context, binding.noteTitle, searchQuery, note.getTitle(), color);`
`50`	`50`	`bindSearchableContent(context, binding.noteExcerpt, searchQuery, note.getExcerpt().replace(EXCERPT_LINE_SEPARATOR, "\n"), color);`
`51`	`51`	`binding.noteExcerpt.setVisibility(TextUtils.isEmpty(note.getExcerpt()) ? GONE : VISIBLE);`
	`52`	`+ bindActions(binding.noteActions, color);`
`52`	`53`	`}`
`53`	`54`
`54`	`55`	`@Nullable`
`55`	`56`	`public View getNoteSwipeable() {`
`56`	`57`	`return null;`
`57`	`58`	`}`
`58`		`-}`
	`59`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -38,10 +38,11 @@ public void bind(boolean isSelected, @NonNull Note note, boolean showCategory, i`
`38`	`38`	`bindStatus(binding.noteStatus, note.getStatus(), color);`
`39`	`39`	`bindFavorite(binding.noteFavorite, note.getFavorite());`
`40`	`40`	`bindSearchableContent(context, binding.noteTitle, searchQuery, note.getTitle(), color);`
	`41`	`+ bindActions(binding.noteActions, color);`
`41`	`42`	`}`
`42`	`43`
`43`	`44`	`@Nullable`
`44`	`45`	`public View getNoteSwipeable() {`
`45`	`46`	`return null;`
`46`	`47`	`}`
`47`		`-}`
	`48`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -36,10 +36,11 @@ public void bind(boolean isSelected, @NonNull Note note, boolean showCategory, i`
`36`	`36`	`bindStatus(binding.noteStatus, note.getStatus(), color);`
`37`	`37`	`bindFavorite(binding.noteFavorite, note.getFavorite());`
`38`	`38`	`bindSearchableContent(context, binding.noteTitle, searchQuery, note.getTitle(), color);`
	`39`	`+ bindActions(binding.noteActions, color);`
`39`	`40`	`}`
`40`	`41`
`41`	`42`	`@NonNull`
`42`	`43`	`public View getNoteSwipeable() {`
`43`	`44`	`return binding.noteSwipeable;`
`44`	`45`	`}`
`45`		`-}`
	`46`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,6 @@`
`9`	`9`	`import android.view.View;`
`10`	`10`	`import android.widget.Toast;`
`11`	`11`
`12`		`-import androidx.appcompat.widget.Toolbar;`
`13`		`-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;`
`14`		`-`
`15`	`12`	`import it.niedermann.owncloud.notes.NotesApplication;`
`16`	`13`	`import it.niedermann.owncloud.notes.R;`
`17`	`14`	`import it.niedermann.owncloud.notes.exception.ExceptionHandler;`
`@@ -73,4 +70,10 @@ public void onNoteClick(int position, View v) {`
`73`	`70`	`}`
`74`	`71`	`});`
`75`	`72`	`}`
	`73`	`+`
	`74`	`+ @Override`
	`75`	`+ public void onNoteActionsClick(int position, View v) {`
	`76`	`+ // TODO`
	`77`	`+ Toast.makeText(v.getContext(), "Not implemented yet", Toast.LENGTH_SHORT).show();`
	`78`	`+ }`
`76`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+<!-- drawable/dots_vertical.xml --><vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:width="24dp" android:viewportWidth="24" android:viewportHeight="24"><path android:fillColor="#000000" android:pathData="M12,16A2,2 0 0,1 14,18A2,2 0 0,1 12,20A2,2 0 0,1 10,18A2,2 0 0,1 12,16M12,10A2,2 0 0,1 14,12A2,2 0 0,1 12,14A2,2 0 0,1 10,12A2,2 0 0,1 12,10M12,4A2,2 0 0,1 14,6A2,2 0 0,1 12,8A2,2 0 0,1 10,6A2,2 0 0,1 12,4Z" /></vector>`