diff --git a/app/src/main/java/foundation/e/notes/android/activity/NotesListViewActivity.java b/app/src/main/java/foundation/e/notes/android/activity/NotesListViewActivity.java index 4a52a32c4fb72bb9dadcf6b4c95259f7c23aecb4..4890388d9b5c10b56c6231a37829ba4454f9a732 100644 --- a/app/src/main/java/foundation/e/notes/android/activity/NotesListViewActivity.java +++ b/app/src/main/java/foundation/e/notes/android/activity/NotesListViewActivity.java @@ -44,6 +44,7 @@ import androidx.appcompat.view.ActionMode; import androidx.appcompat.widget.AppCompatImageView; import androidx.appcompat.widget.SearchView; import androidx.appcompat.widget.Toolbar; +import androidx.core.view.GravityCompat; import androidx.drawerlayout.widget.DrawerLayout; import androidx.recyclerview.widget.ItemTouchHelper; import androidx.recyclerview.widget.ItemTouchHelper.SimpleCallback; @@ -335,8 +336,19 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap private void setupActionBar() { setSupportActionBar(toolbar); drawerToggle = new ActionBarDrawerToggle(this, drawerLayout, toolbar, R.string.action_drawer_open, R.string.action_drawer_close); - drawerToggle.setDrawerIndicatorEnabled(true); + drawerToggle.setDrawerIndicatorEnabled(false); drawerLayout.addDrawerListener(drawerToggle); + drawerToggle.setHomeAsUpIndicator(lineageos.platform.R.drawable.ic_hamburger); + + if (toolbar.getNavigationIcon() != null) + toolbar.getNavigationIcon().setTint(getResources().getColor(lineageos.platform.R.color.color_default_accent)); + + drawerToggle.setToolbarNavigationClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + drawerLayout.openDrawer(GravityCompat.START); + } + }); } private void setupNotesList() { diff --git a/app/src/main/java/foundation/e/notes/model/ItemAdapter.java b/app/src/main/java/foundation/e/notes/model/ItemAdapter.java index 654dc9102bff417535f28a262353b68a389f59b8..9bc79e12c26160fc4e1cce3b6f6391298883d1c7 100644 --- a/app/src/main/java/foundation/e/notes/model/ItemAdapter.java +++ b/app/src/main/java/foundation/e/notes/model/ItemAdapter.java @@ -105,7 +105,7 @@ public class ItemAdapter extends RecyclerView.Adapter { nvHolder.noteCategory.setText(Html.fromHtml(note.getCategory())); nvHolder.noteExcerpt.setText(Html.fromHtml(note.getExcerpt())); nvHolder.noteStatus.setVisibility(DBStatus.VOID.equals(note.getStatus()) ? View.INVISIBLE : View.VISIBLE); - nvHolder.noteFavorite.setImageResource(note.isFavorite() ? R.drawable.ic_star_yellow_24dp : R.drawable.ic_star_border_white_24dp); + nvHolder.noteFavorite.setImageResource(note.isFavorite() ? lineageos.platform.R.drawable.ic_star_filled : lineageos.platform.R.drawable.ic_star); nvHolder.noteFavorite.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { diff --git a/app/src/main/res/layout/activity_notes_list_view.xml b/app/src/main/res/layout/activity_notes_list_view.xml index ddc23297641999483e19653731f859625638cfed..c5cdd585bda86ede39814715b437c524811426ba 100644 --- a/app/src/main/res/layout/activity_notes_list_view.xml +++ b/app/src/main/res/layout/activity_notes_list_view.xml @@ -41,8 +41,9 @@ + app:backgroundTint="@color/primary" + app:rippleColor="@color/primary_dark" + app:tint="@color/accent_color"/> \ No newline at end of file diff --git a/app/src/main/res/layout/drawer_layout.xml b/app/src/main/res/layout/drawer_layout.xml index d93d32a4ff29fcbac93e8c98a0f59b983f5ec35c..dffa862ef0fb0787a0954915d0c269d7fb84bea1 100644 --- a/app/src/main/res/layout/drawer_layout.xml +++ b/app/src/main/res/layout/drawer_layout.xml @@ -35,6 +35,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?attr/colorAccent" + android:visibility="gone" android:theme="@style/AppTheme"> @@ -122,4 +123,4 @@ - \ No newline at end of file + diff --git a/app/src/main/res/layout/fragment_notes_list_note_item.xml b/app/src/main/res/layout/fragment_notes_list_note_item.xml index a1cc0a56ebe7359b6a7bb1cc926c24a193e39748..23d4ae580c51de07813827c514c273f7e53d848b 100644 --- a/app/src/main/res/layout/fragment_notes_list_note_item.xml +++ b/app/src/main/res/layout/fragment_notes_list_note_item.xml @@ -42,7 +42,8 @@ android:contentDescription="@string/menu_favorite" android:padding="16dp" android:layout_width="wrap_content" - android:layout_height="match_parent" /> + android:layout_height="match_parent" + android:tint="@color/accent_color"/> \ No newline at end of file diff --git a/app/src/main/res/menu/menu_note_fragment.xml b/app/src/main/res/menu/menu_note_fragment.xml index c3324d92ca42bf936ec1f60be9b73d4b64d92c5f..bc72c016529fb663513fc7397dd78aa69849ac61 100644 --- a/app/src/main/res/menu/menu_note_fragment.xml +++ b/app/src/main/res/menu/menu_note_fragment.xml @@ -4,7 +4,7 @@