Skip to content

Commit b42fbff

Browse files
AndyScherzingerAndyScherzinger
committed
style(icons): Migrate from filled to outline icon style
Signed-off-by: Andy Scherzinger <[email protected]>
1 parent d505cbf commit b42fbff

Some content is hidden

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

47 files changed

+304
-335
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ public LiveData<List<NavigationItem>> getNavigationCategories() {
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);
321321
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);
322+
final var itemFavorites = new NavigationItem(ADAPTER_KEY_STARRED, context.getString(R.string.label_favorites), favoritesCount, R.drawable.ic_star_border_white_24dp, FAVORITES);
323323

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public LiveData<List<NavigationItem>> getAdapterCategories(Long accountId) {
5252

5353
final var items = new ArrayList<NavigationItem>(fromDatabase.size() + 3);
5454
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));
55+
items.add(new NavigationItem(MainActivity.ADAPTER_KEY_STARRED, getApplication().getString(R.string.label_favorites), favoritesCount, R.drawable.ic_star_border_white_24dp, 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,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" />
1716
</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>

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

Lines changed: 5 additions & 6 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
-->
77
<vector xmlns:android="http://schemas.android.com/apk/res/android"
88
android:width="24dp"
99
android:height="24dp"
10-
android:autoMirrored="true"
1110
android:tint="#757575"
12-
android:viewportWidth="24"
13-
android:viewportHeight="24">
11+
android:viewportWidth="960"
12+
android:viewportHeight="960">
1413
<path
15-
android:fillColor="#FF757575"
16-
android:pathData="M18.06,22.99h1.66c0.84,0 1.53,-0.64 1.63,-1.46L23,5.05h-5L18,1h-1.97v4.05h-4.97l0.3,2.34c1.71,0.47 3.31,1.32 4.27,2.26 1.44,1.42 2.43,2.89 2.43,5.29v8.05zM1,21.99L1,21h15.03v0.99c0,0.55 -0.45,1 -1.01,1L2.01,22.99c-0.56,0 -1.01,-0.45 -1.01,-1zM16.03,14.99c0,-8 -15.03,-8 -15.03,0h15.03zM1.02,17h15v2h-15z" />
14+
android:fillColor="@android:color/white"
15+
android:pathData="M533,520Q501,475 448.5,457.5Q396,440 340,440Q284,440 231.5,457.5Q179,475 147,520L533,520ZM40,600Q40,491 131,425.5Q222,360 340,360Q458,360 549,425.5Q640,491 640,600L40,600ZM40,760L40,680L640,680L640,760L40,760ZM720,920L720,840L776,840L832,280L450,280L440,200L640,200L640,40L720,40L720,200L920,200L854,862Q851,887 832,903.5Q813,920 788,920L720,920ZM720,840L776,840L776,840L720,840L720,840Q720,840 720,840Q720,840 720,840ZM80,920Q63,920 51.5,908.5Q40,897 40,880L40,840L640,840L640,880Q640,897 628.5,908.5Q617,920 600,920L80,920ZM340,520Q340,520 340,520Q340,520 340,520Q340,520 340,520Q340,520 340,520Z" />
1716
</vector>

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

Lines changed: 5 additions & 6 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
-->
77
<vector xmlns:android="http://schemas.android.com/apk/res/android"
88
android:width="24dp"
99
android:height="24dp"
10-
android:autoMirrored="true"
1110
android:tint="#757575"
12-
android:viewportWidth="24"
13-
android:viewportHeight="24">
11+
android:viewportWidth="960"
12+
android:viewportHeight="960">
1413
<path
15-
android:fillColor="#FF757575"
16-
android:pathData="M15,7.5V2H9v5.5l3,3 3,-3zM7.5,9H2v6h5.5l3,-3 -3,-3zM9,16.5V22h6v-5.5l-3,-3 -3,3zM16.5,9l-3,3 3,3H22V9h-5.5z" />
14+
android:fillColor="@android:color/white"
15+
android:pathData="M182,760Q131,760 103,724.5Q75,689 82,638L124,338Q133,278 177.5,239Q222,200 282,200L678,200Q738,200 782.5,239Q827,278 836,338L878,638Q885,689 857,724.5Q829,760 778,760Q757,760 739,752.5Q721,745 706,730L616,640L344,640L254,730Q239,745 221,752.5Q203,760 182,760ZM198,674L312,560L648,560L762,674Q764,676 778,680Q789,680 795.5,673.5Q802,667 800,656L756,348Q752,319 730,299.5Q708,280 678,280L282,280Q252,280 230,299.5Q208,319 204,348L160,656Q158,667 164.5,673.5Q171,680 182,680Q184,680 198,674ZM680,520Q697,520 708.5,508.5Q720,497 720,480Q720,463 708.5,451.5Q697,440 680,440Q663,440 651.5,451.5Q640,463 640,480Q640,497 651.5,508.5Q663,520 680,520ZM600,400Q617,400 628.5,388.5Q640,377 640,360Q640,343 628.5,331.5Q617,320 600,320Q583,320 571.5,331.5Q560,343 560,360Q560,377 571.5,388.5Q583,400 600,400ZM310,520L370,520L370,450L440,450L440,390L370,390L370,320L310,320L310,390L240,390L240,450L310,450L310,520ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480L480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480L480,480L480,480Z" />
1716
</vector>

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
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:height="24dp"
8-
android:tint="#757575"
9-
android:viewportHeight="24"
10-
android:viewportWidth="24"
7+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
118
android:width="24dp"
12-
xmlns:android="http://schemas.android.com/apk/res/android">
9+
android:height="24dp"
10+
android:autoMirrored="true"
11+
android:tint="#757575"
12+
android:viewportWidth="960"
13+
android:viewportHeight="960">
1314
<path
14-
android:fillColor="#757575"
15-
android:pathData="M11,18h2v-2h-2v2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM12,6c-2.21,0 -4,1.79 -4,4h2c0,-1.1 0.9,-2 2,-2s2,0.9 2,2c0,2 -3,1.75 -3,5h2c0,-2.25 3,-2.5 3,-5 0,-2.21 -1.79,-4 -4,-4z" />
15+
android:fillColor="@android:color/white"
16+
android:pathData="M478,720Q499,720 513.5,705.5Q528,691 528,670Q528,649 513.5,634.5Q499,620 478,620Q457,620 442.5,634.5Q428,649 428,670Q428,691 442.5,705.5Q457,720 478,720ZM442,566L516,566Q516,533 523.5,514Q531,495 566,462Q592,436 607,412.5Q622,389 622,356Q622,300 581,270Q540,240 484,240Q427,240 391.5,270Q356,300 342,342L408,368Q413,350 430.5,329Q448,308 484,308Q516,308 532,325.5Q548,343 548,364Q548,384 536,401.5Q524,419 506,434Q462,473 452,493Q442,513 442,566ZM480,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,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z" />
1617
</vector>

0 commit comments

Comments
 (0)