Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 758b27fe authored by Andy Scherzinger's avatar Andy Scherzinger Committed by GitHub
Browse files

Merge pull request #2711 from nextcloud/style/noid/favOutlineIcon 

Use star outline variant for non-favorite state representation
parents 7b8b1332 a40c85d7

app/src/main/java/it/niedermann/owncloud/notes/edit/BaseNoteFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ public abstract class BaseNoteFragment extends BrandedFragment implements Catego 
                if (ShortcutManagerCompat.isRequestPinShortcutSupported(context)) {

                    final var pinShortcutInfo = new ShortcutInfoCompat.Builder(context, String.valueOf(note.getId()))

                            .setShortLabel(note.getTitle())

                            .setIcon(IconCompat.createWithResource(context.getApplicationContext(), TRUE.equals(note.getFavorite()) ? R.drawable.ic_star_yellow_24dp : R.drawable.ic_star_grey_ccc_24dp))

                            .setIcon(IconCompat.createWithResource(context.getApplicationContext(), TRUE.equals(note.getFavorite()) ? R.drawable.ic_star_yellow_24dp : R.drawable.ic_star_border_grey_ccc_24dp))

                            .setIntent(new Intent(getActivity(), EditNoteActivity.class).putExtra(EditNoteActivity.PARAM_NOTE_ID, note.getId()).setAction(ACTION_SHORTCUT))

                            .build();

app/src/main/java/it/niedermann/owncloud/notes/main/items/NoteViewHolder.java

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ public abstract class NoteViewHolder extends RecyclerView.ViewHolder { 
    }



    protected void bindFavorite(@NonNull ImageView noteFavorite, boolean isFavorite) {

        noteFavorite.setImageResource(isFavorite ? R.drawable.ic_star_yellow_24dp : R.drawable.ic_star_grey_ccc_24dp);

        noteFavorite.setImageResource(isFavorite ? R.drawable.ic_star_yellow_24dp : R.drawable.ic_star_border_grey_ccc_24dp);

        noteFavorite.setOnClickListener(view -> noteClickListener.onNoteFavoriteClick(getLayoutPosition(), view));

    }

app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java

+1 −1
Original line number Diff line number Diff line
@@ -672,7 +672,7 @@ public class NotesRepository { 


                                newShortcuts.add(new ShortcutInfo.Builder(this.context, note.getId() + "")

                                        .setShortLabel(note.getTitle() + "")

                                        .setIcon(Icon.createWithResource(this.context, note.getFavorite() ? R.drawable.ic_star_yellow_24dp : R.drawable.ic_star_grey_ccc_24dp))

                                        .setIcon(Icon.createWithResource(this.context, note.getFavorite() ? R.drawable.ic_star_yellow_24dp : R.drawable.ic_star_border_grey_ccc_24dp))

                                        .setIntent(intent)

                                        .build());

                            } else {

app/src/main/res/drawable/ic_star_border_grey_ccc_24dp.xml

0 → 100644
+15 −0
Original line number Diff line number Diff line 
<!--

  ~ 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:viewportWidth="960"

    android:viewportHeight="960">

    <path

        android:fillColor="#CCCCCC"

        android:pathData="M354,673L480,597L606,674L573,530L684,434L538,421L480,285L422,420L276,433L387,530L354,673ZM233,840L298,559L80,370L368,345L480,80L592,345L880,370L662,559L727,840L480,691L233,840ZM480,490L480,490L480,490L480,490L480,490L480,490L480,490L480,490L480,490L480,490Z" />

</vector>