diff options
Diffstat (limited to 'app/src/main/java/it/niedermann/owncloud/notes/main')
6 files changed, 24 insertions, 16 deletions
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 21c9058d..ccef4012 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 @@ -21,6 +21,7 @@ import android.os.Bundle; import android.text.TextUtils; import android.util.Log; import android.view.View; +import android.widget.Toast; import androidx.annotation.ColorInt; import androidx.annotation.NonNull; @@ -764,6 +765,12 @@ public class MainActivity extends LockedActivity implements NoteClickListener, A } @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) { updateToolbars(false); 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 19759320..ca0686c2 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 @@ -2,14 +2,10 @@ package it.niedermann.owncloud.notes.main.items; 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.ColorInt; 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; @@ -99,6 +90,13 @@ public abstract class NoteViewHolder extends RecyclerView.ViewHolder { } } + 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 @@ -117,4 +115,4 @@ public abstract class NoteViewHolder extends RecyclerView.ViewHolder { } }; } -}
\ No newline at end of file +} 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 index 84d705e5..00850dd9 100644 --- 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 class NoteViewGridHolder extends NoteViewHolder { 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; } -}
\ No newline at end of file +} 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 index e6b6df49..3c4c5a1d 100644 --- 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 class NoteViewGridHolderOnlyTitle extends NoteViewHolder { 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; } -}
\ No newline at end of file +} 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 index ba6fc1d2..b956d4f4 100644 --- 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 class NoteViewHolderWithExcerpt extends NoteViewHolder { 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; } -}
\ No newline at end of file +} 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 index 84426dba..c7e158ec 100644 --- 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 class NoteViewHolderWithoutExcerpt extends NoteViewHolder { 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; } -}
\ No newline at end of file +} |