Commit 4c0a9d8c authored by Romain Hunault's avatar Romain Hunault
Browse files

Icon fixes

parent 98d8d7f3
......@@ -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() {
......
......@@ -105,7 +105,7 @@ public class ItemAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
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) {
......
......@@ -41,8 +41,9 @@
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab_create"
style="@style/fab"
android:src="@drawable/ic_add_white_24dp"
android:src="@lineageos.platform:drawable/ic_add"
android:title="@string/action_create"
app:backgroundTint="@color/accent_color"
app:rippleColor="@color/primary_dark" />
app:backgroundTint="@color/primary"
app:rippleColor="@color/primary_dark"
app:tint="@color/accent_color"/>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
......@@ -36,6 +36,7 @@
android:layout_height="wrap_content"
android:visibility="gone"
android:background="?attr/colorAccent"
android:visibility="gone"
android:theme="@style/AppTheme">
<androidx.appcompat.widget.AppCompatImageView
......@@ -100,7 +101,7 @@
android:id="@+id/navigationList"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:paddingTop="24dp"
android:paddingBottom="8dp"
app:layoutManager="LinearLayoutManager" />
......@@ -123,4 +124,4 @@
</com.google.android.material.navigation.NavigationView>
</androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file
</androidx.drawerlayout.widget.DrawerLayout>
......@@ -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"/>
<ImageView
......
......@@ -5,9 +5,10 @@
tools:context="com.example.owncloudnotes.NotesListViewActivity">
<item
android:id="@+id/search"
android:icon="@drawable/ic_search_white_24dp"
android:icon="@lineageos.platform:drawable/ic_search"
android:title="@string/action_search"
app:actionViewClass="androidx.appcompat.widget.SearchView"
app:iconTint="@color/accent_color"
android:searchIcon="@lineageos.platform:drawable/ic_search"
app:showAsAction="collapseActionView|always" />
</menu>
\ No newline at end of file
......@@ -4,7 +4,7 @@
<item
android:id="@+id/search"
android:icon="@drawable/ic_search_white_24dp"
android:icon="@lineageos.platform:drawable/ic_search"
android:orderInCategory="50"
android:title="@string/action_search"
app:actionViewClass="androidx.appcompat.widget.SearchView"
......
No preview for this file type
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment