Skip to content

Commit 3c25839

Browse files
alperozturk96alperozturk96
authored
Merge pull request #2704 from nextcloud/style/noid/outlineIcons
Migrate to outline icon style
2 parents 8be3c06 + 8b48dc0 commit 3c25839

File tree

77 files changed

+650
-358
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+650
-358
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,8 +318,8 @@ public LiveData<List<NavigationItem>> getNavigationCategories() {
318318

319319
private static List<NavigationItem> fromCategoriesWithNotesCount(@NonNull Context context, @Nullable String expandedCategory, @NonNull List<CategoryWithNotesCount> fromDatabase, int count, int favoritesCount) {
320320
final var categories = convertToCategoryNavigationItem(context, fromDatabase);
321-
final var itemRecent = new NavigationItem(ADAPTER_KEY_RECENT, context.getString(R.string.label_all_notes), count, R.drawable.ic_access_time_grey600_24dp, RECENT);
322-
final var itemFavorites = new NavigationItem(ADAPTER_KEY_STARRED, context.getString(R.string.label_favorites), favoritesCount, R.drawable.ic_star_yellow_24dp, FAVORITES);
321+
final var itemRecent = new NavigationItem(ADAPTER_KEY_RECENT, context.getString(R.string.label_all_notes), count, R.drawable.selector_all_notes, RECENT);
322+
final var itemFavorites = new NavigationItem(ADAPTER_KEY_STARRED, context.getString(R.string.label_favorites), favoritesCount, R.drawable.selector_favorites, FAVORITES);
323323

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

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,17 @@ public class NavigationAdapter extends RecyclerView.Adapter<NavigationViewHolder
3232
@ColorInt
3333
private int color;
3434
@DrawableRes
35-
public static final int ICON_FOLDER = R.drawable.ic_folder_grey600_24dp;
35+
public static final int ICON_FOLDER = R.drawable.selector_folder;
3636
@DrawableRes
37-
public static final int ICON_NOFOLDER = R.drawable.ic_folder_open_grey600_24dp;
37+
public static final int ICON_NOFOLDER = R.drawable.selector_folder_open;
3838
@DrawableRes
39-
public static final int ICON_SUB_FOLDER = R.drawable.ic_folder_grey600_18dp;
39+
public static final int ICON_SUB_FOLDER = R.drawable.selector_folder_18;
4040
@DrawableRes
41-
public static final int ICON_MULTIPLE = R.drawable.ic_create_new_folder_grey600_24dp;
41+
public static final int ICON_MULTIPLE = R.drawable.selector_new_folder;
4242
@DrawableRes
43-
public static final int ICON_MULTIPLE_OPEN = R.drawable.ic_folder_grey600_24dp;
43+
public static final int ICON_MULTIPLE_OPEN = R.drawable.selector_folder;
4444
@DrawableRes
45-
public static final int ICON_SUB_MULTIPLE = R.drawable.ic_create_new_folder_grey600_18dp;
45+
public static final int ICON_SUB_MULTIPLE = R.drawable.selector_new_folder_18;
4646

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

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@
4444
public class DisplayUtils {
4545

4646
private static final Map<Integer, Collection<Integer>> SPECIAL_CATEGORY_REPLACEMENTS = Map.of(
47-
R.drawable.ic_library_music_grey600_24dp, singletonList(R.string.category_music),
48-
R.drawable.ic_local_movies_grey600_24dp, asList(R.string.category_movies, R.string.category_movie),
49-
R.drawable.ic_work_grey600_24dp, singletonList(R.string.category_work),
47+
R.drawable.selector_music, singletonList(R.string.category_music),
48+
R.drawable.selector_movies, asList(R.string.category_movies, R.string.category_movie),
49+
R.drawable.selector_work, singletonList(R.string.category_work),
5050
R.drawable.ic_baseline_checklist_24, asList(R.string.category_todo, R.string.category_todos, R.string.category_tasks, R.string.category_checklists),
51-
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),
52-
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),
53-
R.drawable.ic_baseline_games_24, asList(R.string.category_game, R.string.category_games, R.string.category_play),
51+
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),
52+
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),
53+
R.drawable.selector_games, asList(R.string.category_game, R.string.category_games, R.string.category_play),
5454
R.drawable.ic_baseline_card_giftcard_24, asList(R.string.category_gift, R.string.category_gifts, R.string.category_present, R.string.category_presents)
5555
);
5656

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ public LiveData<List<NavigationItem>> getAdapterCategories(Long accountId) {
5151
final var categories = convertToCategoryNavigationItem(getApplication(), fromDatabase);
5252

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

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

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
<!--
22
~ Nextcloud Notes - Android Client
33
~
4-
~ SPDX-FileCopyrightText: 2018-2024 Google LLC
4+
~ SPDX-FileCopyrightText: 2018-2025 Google LLC
55
~ SPDX-License-Identifier: Apache-2.0
66
-->
7-
<vector android:autoMirrored="true"
7+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
8+
android:width="24dp"
89
android:height="24dp"
910
android:tint="#757575"
10-
android:viewportHeight="24.0"
11-
android:viewportWidth="24.0"
12-
android:width="24dp"
13-
xmlns:android="http://schemas.android.com/apk/res/android">
11+
android:viewportWidth="960"
12+
android:viewportHeight="960">
1413
<path
15-
android:fillColor="#FF757575"
16-
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" />
14+
android:fillColor="@android:color/white"
15+
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" />
1716
</vector>

‎app/src/main/res/drawable/ic_access_time_grey600_outline_24dp.xml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<!--
2+
~ Nextcloud Notes - Android Client
3+
~
4+
~ SPDX-FileCopyrightText: 2018-2025 Google LLC
5+
~ SPDX-License-Identifier: Apache-2.0
6+
-->
7+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
8+
android:width="24dp"
9+
android:height="24dp"
10+
android:tint="#757575"
11+
android:viewportWidth="960"
12+
android:viewportHeight="960">
13+
<path
14+
android:fillColor="@android:color/white"
15+
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,880ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480ZM480,800Q613,800 706.5,706.5Q800,613 800,480Q800,347 706.5,253.5Q613,160 480,160Q347,160 253.5,253.5Q160,347 160,480Q160,613 253.5,706.5Q347,800 480,800Z" />
16+
</vector>

‎app/src/main/res/drawable/ic_account_circle_grey_24dp.xml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
<!--
22
~ Nextcloud Notes - Android Client
33
~
4-
~ SPDX-FileCopyrightText: 2018-2024 Google LLC
4+
~ SPDX-FileCopyrightText: 2018-2025 Google LLC
55
~ SPDX-License-Identifier: Apache-2.0
66
-->
77
<vector xmlns:android="http://schemas.android.com/apk/res/android"
88
android:width="24dp"
99
android:height="24dp"
10-
android:viewportWidth="24.0"
11-
android:viewportHeight="24.0">
10+
android:tint="#757575"
11+
android:viewportWidth="960"
12+
android:viewportHeight="960">
1213
<path
13-
android:fillColor="#FF757575"
14-
android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,5c1.66,0 3,1.34 3,3s-1.34,3 -3,3 -3,-1.34 -3,-3 1.34,-3 3,-3zM12,19.2c-2.5,0 -4.71,-1.28 -6,-3.22 0.03,-1.99 4,-3.08 6,-3.08 1.99,0 5.97,1.09 6,3.08 -1.29,1.94 -3.5,3.22 -6,3.22z" />
14+
android:fillColor="@android:color/white"
15+
android:pathData="M234,684Q285,645 348,622.5Q411,600 480,600Q549,600 612,622.5Q675,645 726,684Q761,643 780.5,591Q800,539 800,480Q800,347 706.5,253.5Q613,160 480,160Q347,160 253.5,253.5Q160,347 160,480Q160,539 179.5,591Q199,643 234,684ZM480,520Q421,520 380.5,479.5Q340,439 340,380Q340,321 380.5,280.5Q421,240 480,240Q539,240 579.5,280.5Q620,321 620,380Q620,439 579.5,479.5Q539,520 480,520ZM480,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,880ZM480,800Q533,800 580,784.5Q627,769 666,740Q627,711 580,695.5Q533,680 480,680Q427,680 380,695.5Q333,711 294,740Q333,769 380,784.5Q427,800 480,800ZM480,440Q506,440 523,423Q540,406 540,380Q540,354 523,337Q506,320 480,320Q454,320 437,337Q420,354 420,380Q420,406 437,423Q454,440 480,440ZM480,380Q480,380 480,380Q480,380 480,380Q480,380 480,380Q480,380 480,380Q480,380 480,380Q480,380 480,380Q480,380 480,380Q480,380 480,380ZM480,740Q480,740 480,740Q480,740 480,740Q480,740 480,740Q480,740 480,740Q480,740 480,740Q480,740 480,740Q480,740 480,740Q480,740 480,740Z" />
1516
</vector>

‎app/src/main/res/drawable/ic_add_blue_24dp.xml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
<!--
22
~ Nextcloud Notes - Android Client
33
~
4-
~ SPDX-FileCopyrightText: 2018-2024 Google LLC
4+
~ SPDX-FileCopyrightText: 2018-2025 Google LLC
55
~ SPDX-License-Identifier: Apache-2.0
66
-->
7-
<vector android:autoMirrored="true"
7+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
8+
android:width="24dp"
89
android:height="24dp"
910
android:tint="#0082C9"
10-
android:viewportHeight="24.0"
11-
android:viewportWidth="24.0"
12-
android:width="24dp"
13-
xmlns:android="http://schemas.android.com/apk/res/android">
11+
android:viewportWidth="960"
12+
android:viewportHeight="960">
1413
<path
15-
android:fillColor="#FF0082C9"
16-
android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
14+
android:fillColor="@android:color/white"
15+
android:pathData="M440,520L200,520L200,440L440,440L440,200L520,200L520,440L760,440L760,520L520,520L520,760L440,760L440,520Z" />
1716
</vector>

‎app/src/main/res/drawable/ic_add_white_24dp.xml‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
<!--
22
~ Nextcloud Notes - Android Client
33
~
4-
~ SPDX-FileCopyrightText: 2018-2024 Google LLC
4+
~ SPDX-FileCopyrightText: 2018-2025 Google LLC
55
~ SPDX-License-Identifier: Apache-2.0
66
-->
7-
<vector android:autoMirrored="true"
8-
android:height="24dp"
9-
android:tint="#FFFFFF"
10-
android:viewportHeight="24.0"
11-
android:viewportWidth="24.0"
7+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
128
android:width="24dp"
13-
xmlns:android="http://schemas.android.com/apk/res/android">
9+
android:height="24dp"
10+
android:viewportWidth="960"
11+
android:viewportHeight="960">
1412
<path
15-
android:fillColor="#FFFFFFFF"
16-
android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
13+
android:fillColor="@android:color/white"
14+
android:pathData="M440,520L200,520L200,440L440,440L440,200L520,200L520,440L760,440L760,520L520,520L520,760L440,760L440,520Z" />
1715
</vector>

‎app/src/main/res/drawable/ic_baseline_dashboard_24.xml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
<!--
22
~ Nextcloud Notes - Android Client
33
~
4-
~ SPDX-FileCopyrightText: 2018-2024 Google LLC
4+
~ SPDX-FileCopyrightText: 2018-2025 Google LLC
55
~ SPDX-License-Identifier: Apache-2.0
66
-->
7-
<vector android:autoMirrored="true"
7+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
8+
android:width="24dp"
89
android:height="24dp"
910
android:tint="#757575"
10-
android:viewportHeight="24"
11-
android:viewportWidth="24"
12-
android:width="24dp"
13-
xmlns:android="http://schemas.android.com/apk/res/android">
11+
android:viewportWidth="960"
12+
android:viewportHeight="960">
1413
<path
1514
android:fillColor="@android:color/white"
16-
android:pathData="M3,13h8L11,3L3,3v10zM3,21h8v-6L3,15v6zM13,21h8L21,11h-8v10zM13,3v6h8L21,3h-8z" />
15+
android:pathData="M340,420L200,420Q167,420 143.5,396.5Q120,373 120,340L120,200Q120,167 143.5,143.5Q167,120 200,120L340,120Q373,120 396.5,143.5Q420,167 420,200L420,340Q420,373 396.5,396.5Q373,420 340,420ZM200,340L340,340Q340,340 340,340Q340,340 340,340L340,200Q340,200 340,200Q340,200 340,200L200,200Q200,200 200,200Q200,200 200,200L200,340Q200,340 200,340Q200,340 200,340ZM340,840L200,840Q167,840 143.5,816.5Q120,793 120,760L120,620Q120,587 143.5,563.5Q167,540 200,540L340,540Q373,540 396.5,563.5Q420,587 420,620L420,760Q420,793 396.5,816.5Q373,840 340,840ZM200,760L340,760Q340,760 340,760Q340,760 340,760L340,620Q340,620 340,620Q340,620 340,620L200,620Q200,620 200,620Q200,620 200,620L200,760Q200,760 200,760Q200,760 200,760ZM760,420L620,420Q587,420 563.5,396.5Q540,373 540,340L540,200Q540,167 563.5,143.5Q587,120 620,120L760,120Q793,120 816.5,143.5Q840,167 840,200L840,340Q840,373 816.5,396.5Q793,420 760,420ZM620,340L760,340Q760,340 760,340Q760,340 760,340L760,200Q760,200 760,200Q760,200 760,200L620,200Q620,200 620,200Q620,200 620,200L620,340Q620,340 620,340Q620,340 620,340ZM760,840L620,840Q587,840 563.5,816.5Q540,793 540,760L540,620Q540,587 563.5,563.5Q587,540 620,540L760,540Q793,540 816.5,563.5Q840,587 840,620L840,760Q840,793 816.5,816.5Q793,840 760,840ZM620,760L760,760Q760,760 760,760Q760,760 760,760L760,620Q760,620 760,620Q760,620 760,620L620,620Q620,620 620,620Q620,620 620,620L620,760Q620,760 620,760Q620,760 620,760ZM340,340Q340,340 340,340Q340,340 340,340L340,340Q340,340 340,340Q340,340 340,340L340,340Q340,340 340,340Q340,340 340,340L340,340Q340,340 340,340Q340,340 340,340ZM340,620Q340,620 340,620Q340,620 340,620L340,620Q340,620 340,620Q340,620 340,620L340,620Q340,620 340,620Q340,620 340,620L340,620Q340,620 340,620Q340,620 340,620ZM620,340Q620,340 620,340Q620,340 620,340L620,340Q620,340 620,340Q620,340 620,340L620,340Q620,340 620,340Q620,340 620,340L620,340Q620,340 620,340Q620,340 620,340ZM620,620Q620,620 620,620Q620,620 620,620L620,620Q620,620 620,620Q620,620 620,620L620,620Q620,620 620,620Q620,620 620,620L620,620Q620,620 620,620Q620,620 620,620Z" />
1716
</vector>

0 commit comments

Comments
 (0)