Merge pull request #2704 from nextcloud/style/noid/outlineIcons (3c25839e) · Commits · e / os / Notes

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

+2 −2

Original line number	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) {
		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 itemFavorites = new NavigationItem(ADAPTER_KEY_STARRED, context.getString(R.string.label_favorites), favoritesCount, R.drawable.ic_star_yellow_24dp, FAVORITES);
		final var itemRecent = new NavigationItem(ADAPTER_KEY_RECENT, context.getString(R.string.label_all_notes), count, R.drawable.selector_all_notes, RECENT);
		final var itemFavorites = new NavigationItem(ADAPTER_KEY_STARRED, context.getString(R.string.label_favorites), favoritesCount, R.drawable.selector_favorites, FAVORITES);

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

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

+6 −6

Original line number	Diff line number	Diff line
		@@ -32,17 +32,17 @@ public class NavigationAdapter extends RecyclerView.Adapter<NavigationViewHolder
		@ColorInt
		private int color;
		@DrawableRes
		public static final int ICON_FOLDER = R.drawable.ic_folder_grey600_24dp;
		public static final int ICON_FOLDER = R.drawable.selector_folder;
		@DrawableRes
		public static final int ICON_NOFOLDER = R.drawable.ic_folder_open_grey600_24dp;
		public static final int ICON_NOFOLDER = R.drawable.selector_folder_open;
		@DrawableRes
		public static final int ICON_SUB_FOLDER = R.drawable.ic_folder_grey600_18dp;
		public static final int ICON_SUB_FOLDER = R.drawable.selector_folder_18;
		@DrawableRes
		public static final int ICON_MULTIPLE = R.drawable.ic_create_new_folder_grey600_24dp;
		public static final int ICON_MULTIPLE = R.drawable.selector_new_folder;
		@DrawableRes
		public static final int ICON_MULTIPLE_OPEN = R.drawable.ic_folder_grey600_24dp;
		public static final int ICON_MULTIPLE_OPEN = R.drawable.selector_folder;
		@DrawableRes
		public static final int ICON_SUB_MULTIPLE = R.drawable.ic_create_new_folder_grey600_18dp;
		public static final int ICON_SUB_MULTIPLE = R.drawable.selector_new_folder_18;

		@NonNull
		private List<NavigationItem> items = new ArrayList<>();

app/src/main/java/it/niedermann/owncloud/notes/shared/util/DisplayUtils.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -44,13 +44,13 @@ import it.niedermann.owncloud.notes.persistence.entity.CategoryWithNotesCount;
		public class DisplayUtils {

		private static final Map<Integer, Collection<Integer>> SPECIAL_CATEGORY_REPLACEMENTS = Map.of(
		R.drawable.ic_library_music_grey600_24dp, singletonList(R.string.category_music),
		R.drawable.ic_local_movies_grey600_24dp, asList(R.string.category_movies, R.string.category_movie),
		R.drawable.ic_work_grey600_24dp, singletonList(R.string.category_work),
		R.drawable.selector_music, singletonList(R.string.category_music),
		R.drawable.selector_movies, asList(R.string.category_movies, R.string.category_movie),
		R.drawable.selector_work, singletonList(R.string.category_work),
		R.drawable.ic_baseline_checklist_24, asList(R.string.category_todo, R.string.category_todos, R.string.category_tasks, R.string.category_checklists),
		R.drawable.ic_baseline_fastfood_24, asList(R.string.category_recipe, R.string.category_recipes, R.string.category_restaurant, R.string.category_restaurants, R.string.category_food, R.string.category_bake),
		R.drawable.ic_baseline_vpn_key_24, asList(R.string.category_key, R.string.category_keys, R.string.category_password, R.string.category_passwords, R.string.category_credentials),
		R.drawable.ic_baseline_games_24, asList(R.string.category_game, R.string.category_games, R.string.category_play),
		R.drawable.selector_food, asList(R.string.category_recipe, R.string.category_recipes, R.string.category_restaurant, R.string.category_restaurants, R.string.category_food, R.string.category_bake),
		R.drawable.selector_credentials, asList(R.string.category_key, R.string.category_keys, R.string.category_password, R.string.category_passwords, R.string.category_credentials),
		R.drawable.selector_games, asList(R.string.category_game, R.string.category_games, R.string.category_play),
		R.drawable.ic_baseline_card_giftcard_24, asList(R.string.category_gift, R.string.category_gifts, R.string.category_present, R.string.category_presents)
		);

app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListViewModel.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -51,8 +51,8 @@ public class NoteListViewModel extends AndroidViewModel {
		final var categories = convertToCategoryNavigationItem(getApplication(), fromDatabase);

		final var items = new ArrayList<NavigationItem>(fromDatabase.size() + 3);
		items.add(new NavigationItem(MainActivity.ADAPTER_KEY_RECENT, getApplication().getString(R.string.label_all_notes), count, R.drawable.ic_access_time_grey600_24dp, RECENT));
		items.add(new NavigationItem(MainActivity.ADAPTER_KEY_STARRED, getApplication().getString(R.string.label_favorites), favoritesCount, R.drawable.ic_star_yellow_24dp, FAVORITES));
		items.add(new NavigationItem(MainActivity.ADAPTER_KEY_RECENT, getApplication().getString(R.string.label_all_notes), count, R.drawable.selector_all_notes, RECENT));
		items.add(new NavigationItem(MainActivity.ADAPTER_KEY_STARRED, getApplication().getString(R.string.label_favorites), favoritesCount, R.drawable.selector_favorites, FAVORITES));

		if (categories.size() > 2 && categories.get(2).label.isEmpty()) {
		items.add(new NavigationItem(MainActivity.ADAPTER_KEY_UNCATEGORIZED, "", null, NavigationAdapter.ICON_NOFOLDER));

app/src/main/res/drawable/ic_access_time_grey600_24dp.xml

+7 −8

Original line number	Diff line number	Diff line
		<!--
		~ Nextcloud Notes - Android Client
		~
		~ SPDX-FileCopyrightText: 2018-2024 Google LLC
		~ SPDX-FileCopyrightText: 2018-2025 Google LLC
		~ SPDX-License-Identifier: Apache-2.0
		-->
		<vector android:autoMirrored="true"
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="24dp"
		android:height="24dp"
		android:tint="#757575"
		android:viewportHeight="24.0"
		android:viewportWidth="24.0"
		android:width="24dp"
		xmlns:android="http://schemas.android.com/apk/res/android">
		android:viewportWidth="960"
		android:viewportHeight="960">
		<path
		android:fillColor="#FF757575"
		android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z" />
		android:fillColor="@android:color/white"
		android:pathData="M612,668L668,612L520,464L520,280L440,280L440,496L612,668ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880Z" />
		</vector>