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 4890388d9b5c10b56c6231a37829ba4454f9a732..33da7d61bad14d925349ee28dfbcaf888d67f1b9 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 @@ -388,8 +388,8 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap } private void setupNavigationList(final String selectedItem) { - itemRecent = new NavigationAdapter.NavigationItem(ADAPTER_KEY_RECENT, getString(R.string.label_all_notes), null, R.drawable.ic_access_time_grey600_24dp); - itemFavorites = new NavigationAdapter.NavigationItem(ADAPTER_KEY_STARRED, getString(R.string.label_favorites), null, R.drawable.ic_star_yellow_24dp); + itemRecent = new NavigationAdapter.NavigationItem(ADAPTER_KEY_RECENT, getString(R.string.label_all_notes), null, lineageos.platform.R.drawable.ic_recent); + itemFavorites = new NavigationAdapter.NavigationItem(ADAPTER_KEY_STARRED, getString(R.string.label_favorites), null, lineageos.platform.R.drawable.ic_star_filled); adapterCategories = new NavigationAdapter(new NavigationAdapter.ClickListener() { @Override public void onItemClick(NavigationAdapter.NavigationItem item) { @@ -523,9 +523,9 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap } private void setupNavigationMenu() { - final NavigationAdapter.NavigationItem itemTrashbin = new NavigationAdapter.NavigationItem("trashbin", getString(R.string.action_trashbin), null, R.drawable.ic_delete_grey600_24dp); - final NavigationAdapter.NavigationItem itemSettings = new NavigationAdapter.NavigationItem("settings", getString(R.string.action_settings), null, R.drawable.ic_settings_grey600_24dp); - final NavigationAdapter.NavigationItem itemAbout = new NavigationAdapter.NavigationItem("about", getString(R.string.simple_about), null, R.drawable.ic_info_outline_grey600_24dp); + final NavigationAdapter.NavigationItem itemTrashbin = new NavigationAdapter.NavigationItem("trashbin", getString(R.string.action_trashbin), null, lineageos.platform.R.drawable.ic_bin); + final NavigationAdapter.NavigationItem itemSettings = new NavigationAdapter.NavigationItem("settings", getString(R.string.action_settings), null, lineageos.platform.R.drawable.ic_settings); + final NavigationAdapter.NavigationItem itemAbout = new NavigationAdapter.NavigationItem("about", getString(R.string.simple_about), null, lineageos.platform.R.drawable.ic_info); ArrayList itemsMenu = new ArrayList<>(); itemsMenu.add(itemTrashbin); diff --git a/app/src/main/java/foundation/e/notes/model/NavigationAdapter.java b/app/src/main/java/foundation/e/notes/model/NavigationAdapter.java index e8b24013cdc9a78753cec42eae02fdb491299787..49bf76cdc76cfc249de856c534bf0f94044b025e 100644 --- a/app/src/main/java/foundation/e/notes/model/NavigationAdapter.java +++ b/app/src/main/java/foundation/e/notes/model/NavigationAdapter.java @@ -8,7 +8,6 @@ import androidx.annotation.Nullable; import androidx.core.graphics.ColorUtils; import androidx.recyclerview.widget.RecyclerView; -import android.util.TypedValue; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -26,7 +25,7 @@ import foundation.e.notes.util.NoteUtil; public class NavigationAdapter extends RecyclerView.Adapter { @DrawableRes - public static final int ICON_FOLDER = R.drawable.ic_folder_grey600_24dp; + public static final int ICON_FOLDER = lineageos.platform.R.drawable.ic_folder; @DrawableRes public static final int ICON_NOFOLDER = R.drawable.ic_folder_open_grey600_24dp; @DrawableRes @@ -101,16 +100,22 @@ public class NavigationAdapter extends RecyclerView.Adapter diff --git a/app/src/main/res/layout/item_navigation.xml b/app/src/main/res/layout/item_navigation.xml index 7e7ebdeb1d2340811e7c2f794d23b215c8a8c8ae..7b77f104790b3f35ee1c750c755be615ce953f03 100644 --- a/app/src/main/res/layout/item_navigation.xml +++ b/app/src/main/res/layout/item_navigation.xml @@ -14,7 +14,8 @@ android:layout_height="44dp" android:focusable="false" android:padding="10dp" - android:scaleType="center" + android:scaleType="fitCenter" + android:layout_centerVertical="true" android:src="@drawable/ic_folder_grey600_24dp" /> #DFFFFFFF #000000 #ffffff + #7A7A7A #FFF @color/primary diff --git a/e-ui-sdk.jar b/e-ui-sdk.jar index 2bd03ffbd08fb297d0c96b4f67090e0f39e93a7e..7b2c401fc84e6dc90e63c9fd8402e924511e52a9 100644 Binary files a/e-ui-sdk.jar and b/e-ui-sdk.jar differ