Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 245be5d7 authored Jan 21, 2021 by Mohit Mali Committed by Fahim Salam Chowdhury Jan 19, 2023

Icon changes and jar modification

parent e2e95376

app/src/main/java/it/niedermann/owncloud/notes/main/MainViewModel.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -318,8 +318,8 @@ public class MainViewModel extends AndroidViewModel {

	private static List<NavigationItem> fromCategoriesWithNotesCount(@NonNull Context context, @Nullable String expandedCategory, @NonNull List<CategoryWithNotesCount> fromDatabase, int count, int favoritesCount) {		private static List<NavigationItem> fromCategoriesWithNotesCount(@NonNull Context context, @Nullable String expandedCategory, @NonNull List<CategoryWithNotesCount> fromDatabase, int count, int favoritesCount) {
	final var categories = convertToCategoryNavigationItem(context, fromDatabase);		final var categories = convertToCategoryNavigationItem(context, fromDatabase);
	final var itemRecent = new NavigationItem(ADAPTER_KEY_RECENT, context.getString(R.string.label_all_notes), count, R.drawable.ic_access_time_grey600_24dp, RECENT);		final var itemRecent = new NavigationItem(ADAPTER_KEY_RECENT, context.getString(R.string.label_all_notes), count, lineageos.platform.R.drawable.ic_recent, RECENT);
	final var itemFavorites = new NavigationItem(ADAPTER_KEY_STARRED, context.getString(R.string.label_favorites), favoritesCount, R.drawable.ic_star_yellow_24dp, FAVORITES);		final var itemFavorites = new NavigationItem(ADAPTER_KEY_STARRED, context.getString(R.string.label_favorites), favoritesCount, lineageos.platform.R.drawable.ic_star_filled, FAVORITES);

	final var items = new ArrayList<NavigationItem>(fromDatabase.size() + 3);		final var items = new ArrayList<NavigationItem>(fromDatabase.size() + 3);
	items.add(itemRecent);		items.add(itemRecent);

app/src/main/java/it/niedermann/owncloud/notes/main/menu/MenuAdapter.java

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -31,9 +31,9 @@ public class MenuAdapter extends RecyclerView.Adapter<MenuViewHolder> {
	public MenuAdapter(@NonNull Context context, @NonNull Account account, int settingsRequestCode, @NonNull Consumer<MenuItem> onClick) {		public MenuAdapter(@NonNull Context context, @NonNull Account account, int settingsRequestCode, @NonNull Consumer<MenuItem> onClick) {
	this.menuItems = new MenuItem[]{		this.menuItems = new MenuItem[]{
	new MenuItem(new Intent(context, FormattingHelpActivity.class), R.string.action_formatting_help, R.drawable.ic_baseline_help_outline_24),		new MenuItem(new Intent(context, FormattingHelpActivity.class), R.string.action_formatting_help, R.drawable.ic_baseline_help_outline_24),
	new MenuItem(generateTrashbinIntent(context, account), R.string.action_trashbin, R.drawable.ic_delete_grey600_24dp),		new MenuItem(generateTrashbinIntent(context, account), R.string.action_trashbin, lineageos.platform.R.drawable.ic_bin),
	new MenuItem(new Intent(context, PreferencesActivity.class), settingsRequestCode, R.string.action_settings, R.drawable.ic_settings_grey600_24dp),		new MenuItem(new Intent(context, PreferencesActivity.class), settingsRequestCode, R.string.action_settings, lineageos.platform.R.drawable.ic_settings),
	new MenuItem(new Intent(context, AboutActivity.class), R.string.simple_about, R.drawable.ic_info_outline_grey600_24dp)		new MenuItem(new Intent(context, AboutActivity.class), R.string.simple_about, lineageos.platform.R.drawable.ic_info)
	};		};
	this.onClick = onClick;		this.onClick = onClick;
	setHasStableIds(true);		setHasStableIds(true);

app/src/main/java/it/niedermann/owncloud/notes/main/navigation/NavigationAdapter.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -28,7 +28,7 @@ public class NavigationAdapter extends RecyclerView.Adapter<NavigationViewHolder
	@ColorInt		@ColorInt
	private int mainColor;		private int mainColor;
	@DrawableRes		@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		@DrawableRes
	public static final int ICON_NOFOLDER = R.drawable.ic_folder_open_grey600_24dp;		public static final int ICON_NOFOLDER = R.drawable.ic_folder_open_grey600_24dp;
	@DrawableRes		@DrawableRes

app/src/main/java/it/niedermann/owncloud/notes/main/navigation/NavigationViewHolder.java

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -53,11 +53,12 @@ class NavigationViewHolder extends RecyclerView.ViewHolder {
	} else {		} else {
	icon.setVisibility(View.GONE);		icon.setVisibility(View.GONE);
	}		}
	final int textColor = isSelected ? mainColor : view.getResources().getColor(R.color.fg_default);		final int textColor = isSelected ? mainColor : ContextCompat.getColor(view.getContext(), R.color.fg_default);
			int unSelectedIconColor = ContextCompat.getColor(view.getContext(), isSelected ? R.color.accent_color : R.color.drawer_menu_icon_color);

	name.setTextColor(textColor);		name.setTextColor(textColor);
	count.setTextColor(textColor);		count.setTextColor(textColor);
	icon.setColorFilter(isSelected ? textColor : 0);		icon.setColorFilter(isSelected ? textColor : unSelectedIconColor);

	view.setSelected(isSelected);		view.setSelected(isSelected);

app/src/main/res/layout/activity_notes_list_view.xml

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -15,7 +15,6 @@
	android:id="@+id/appBar"		android:id="@+id/appBar"
	android:layout_width="match_parent"		android:layout_width="match_parent"
	android:layout_height="?attr/actionBarSize"		android:layout_height="?attr/actionBarSize"
	android:theme="@style/AppTheme"
	app:elevation="0dp">		app:elevation="0dp">

	<FrameLayout		<FrameLayout