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

Commit 484fdd5c authored by Stefan Niedermann's avatar Stefan Niedermann
Browse files

Use one excerpt for Grid and List layout

parent 2b71e1b2

app/src/androidTest/java/it/niedermann/owncloud/notes/persistence/NotesDatabaseTest.java

+2 −2
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ public class NotesDatabaseTest { 
            String newContent = getCurDate() + " This is a even greater day my friend.";

            DBNote dbNote = new DBNote(newNoteID, 1, Calendar.getInstance(), "A Greater Day",

                    newContent, true, "Best Friend's Record", null, DBStatus.VOID,

                    accountID, NoteUtil.generateNoteExcerpt(newContent, false), 0);

                    accountID, NoteUtil.generateNoteExcerpt(newContent), 0);



            // Add a new note

            long noteID = db.addNote(accountID, dbNote);
@@ -161,7 +161,7 @@ public class NotesDatabaseTest { 
            newContent = getCurDate() + " This is a even greater day my friend.";

            dbNote = new DBNote(0, 1, Calendar.getInstance(), "An Even Greater Day",

                    newContent, true, "Sincere Friend's Record", null, DBStatus.VOID,

                    accountID, NoteUtil.generateNoteExcerpt(newContent, false), 0);

                    accountID, NoteUtil.generateNoteExcerpt(newContent), 0);

            // Add a new note

            noteID = db.addNote(accountID, dbNote);

            // Check if this note is added successfully

app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java

+4 −3
Original line number Diff line number Diff line
@@ -69,12 +69,12 @@ import it.niedermann.owncloud.notes.model.GridItemDecoration; 
import it.niedermann.owncloud.notes.model.ISyncCallback;

import it.niedermann.owncloud.notes.model.Item;

import it.niedermann.owncloud.notes.model.ItemAdapter;

import it.niedermann.owncloud.notes.model.SectionItemDecoration;

import it.niedermann.owncloud.notes.model.LocalAccount;

import it.niedermann.owncloud.notes.model.NavigationAdapter;

import it.niedermann.owncloud.notes.model.NavigationAdapter.CategoryNavigationItem;

import it.niedermann.owncloud.notes.model.NavigationAdapter.NavigationItem;

import it.niedermann.owncloud.notes.model.NoteClickListener;

import it.niedermann.owncloud.notes.model.SectionItemDecoration;

import it.niedermann.owncloud.notes.persistence.CapabilitiesClient;

import it.niedermann.owncloud.notes.persistence.CapabilitiesWorker;

import it.niedermann.owncloud.notes.persistence.LoadNotesListTask;
@@ -88,6 +88,7 @@ import static android.view.View.GONE; 
import static android.view.View.VISIBLE;

import static it.niedermann.owncloud.notes.branding.BrandingUtil.getSecondaryForegroundColorDependingOnTheme;

import static it.niedermann.owncloud.notes.util.ColorUtil.contrastRatioIsSufficient;

import static it.niedermann.owncloud.notes.util.Notes.isDarkThemeActive;

import static it.niedermann.owncloud.notes.util.Notes.isGridViewEnabled;

import static it.niedermann.owncloud.notes.util.SSOUtil.askForNewAccount;

import static java.util.Arrays.asList;
@@ -185,8 +186,8 @@ public class NotesListViewActivity extends LockedActivity implements NoteClickLi 


        db = NotesDatabase.getInstance(this);



        gridView = isGridViewEnabled(this);

        if (!gridView) {

        gridView = isGridViewEnabled();

        if (!gridView || isDarkThemeActive(this)) {

            activityBinding.activityNotesListView.setBackgroundColor(ContextCompat.getColor(this, R.color.primary));

        }

app/src/main/java/it/niedermann/owncloud/notes/android/fragment/PreferencesFragment.java

+0 −1
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ public class PreferencesFragment extends PreferenceFragmentCompat implements Bra 
                final Boolean gridView = (Boolean) newValue;

                Log.v(TAG, "gridView: " + gridView);

                requireActivity().setResult(Activity.RESULT_OK);

                new Thread(() -> NotesDatabase.getInstance(requireContext()).regenerateExcerpts(gridView)).start();

                Notes.updateGridViewEnabled(gridView);

                return true;

            });

app/src/main/java/it/niedermann/owncloud/notes/model/NoteViewGridHolder.java

+8 −3
Original line number Diff line number Diff line 
package it.niedermann.owncloud.notes.model;



import android.content.Context;

import android.util.Log;

import android.text.TextUtils;

import android.view.View;



import androidx.annotation.NonNull;
@@ -9,6 +9,10 @@ import androidx.annotation.Nullable; 


import it.niedermann.owncloud.notes.databinding.ItemNotesListNoteItemGridBinding;



import static android.view.View.GONE;

import static android.view.View.INVISIBLE;

import static android.view.View.VISIBLE;



public class NoteViewGridHolder extends NoteViewHolder {

    @NonNull

    private final ItemNotesListNoteItemGridBinding binding;
@@ -26,10 +30,11 @@ public class NoteViewGridHolder extends NoteViewHolder { 
        super.bind(note, showCategory, mainColor, textColor, searchQuery);

        @NonNull final Context context = itemView.getContext();

        bindCategory(context, binding.noteCategory, showCategory, note.getCategory(), mainColor);

        binding.noteStatus.setVisibility(DBStatus.VOID.equals(note.getStatus()) ? View.INVISIBLE : View.VISIBLE);

        binding.noteStatus.setVisibility(DBStatus.VOID.equals(note.getStatus()) ? INVISIBLE : VISIBLE);

        bindFavorite(binding.noteFavorite, note.isFavorite());

        bindSearchableContent(context, binding.noteTitle, searchQuery, note.getTitle(), mainColor);

        bindSearchableContent(context, binding.noteContent, searchQuery, note.getExcerpt(), mainColor);

        bindSearchableContent(context, binding.noteExcerpt, searchQuery, note.getExcerpt().replace("   ", "\n"), mainColor);

        binding.noteExcerpt.setVisibility(TextUtils.isEmpty(note.getExcerpt()) ? GONE : VISIBLE);

    }



    public View getNoteSwipeable() {

app/src/main/java/it/niedermann/owncloud/notes/model/NoteViewHolderWithExcerpt.java

+1 −0
Original line number Diff line number Diff line 
package it.niedermann.owncloud.notes.model;



import android.content.Context;

import android.text.TextUtils;

import android.view.View;



import androidx.annotation.NonNull;