diff options
| author | Stefan Niedermann <info@niedermann.it> | 2020-06-13 14:02:46 +0300 |
|---|---|---|
| committer | Stefan Niedermann <info@niedermann.it> | 2020-06-13 14:02:46 +0300 |
| commit | be0260950bdfc3e95267ddacf154aa6923e3e7a2 (patch) | |
| tree | 780c04b1bd41fdf9f2ecf4b6d6461b715c546151 /app/src | |
| parent | c3630231d4d9d27d65414d11e3fd4b08572b4f9d (diff) | |
Merge current master
Diffstat (limited to 'app/src')
3 files changed, 13 insertions, 1 deletions
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java index 51630d59..7b955de2 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java @@ -15,6 +15,8 @@ import android.os.Bundle; import android.os.Handler; import android.text.TextUtils; import android.util.Log; +import android.view.Menu; +import android.view.MenuItem; import android.view.View; import android.view.ViewTreeObserver; import android.widget.LinearLayout; diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/LoadNotesListTask.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/LoadNotesListTask.java index bb60fd63..2886cc6a 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/LoadNotesListTask.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/LoadNotesListTask.java @@ -101,7 +101,7 @@ public class LoadNotesListTask extends AsyncTask<Void, Void, List<Item>> { if (!initials.equals(lastInitials)) { itemList.add(new SectionItem(initials)); } - itemList.add(colorTheNote(currentNote)); + itemList.add(currentNote); lastInitials = initials; } diff --git a/app/src/main/res/menu/menu_list_view.xml b/app/src/main/res/menu/menu_list_view.xml index e69de29b..e5d8f8dc 100644 --- a/app/src/main/res/menu/menu_list_view.xml +++ b/app/src/main/res/menu/menu_list_view.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + + <item + android:id="@+id/sorting_method" + android:icon="@drawable/alphabetical_asc" + android:title="@string/action_sorting_method" + app:showAsAction="collapseActionView|always" /> +</menu>
\ No newline at end of file |