Merge current master

This commit is contained in:
Stefan Niedermann 2020-06-13 13:02:46 +02:00
parent c3630231d4
commit be0260950b
3 changed files with 13 additions and 1 deletions

View file

@ -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;

View file

@ -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;
}

View file

@ -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>