Skip to content

Commit 81110dd

Browse files
AndyScherzingerAndyScherzinger
committed
style(icons): Migrate to outlined icon style
... except for mime-type and app icons Signed-off-by: Andy Scherzinger <[email protected]>
1 parent ba2641a commit 81110dd

File tree

106 files changed

+656
-533
lines changed

Some content is hidden

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

106 files changed

+656
-533
lines changed

‎app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,6 @@ private void setDrawerHeaderLogo(Drawable drawable, String serverName) {
507507
* @param navigationView the drawers navigation view
508508
*/
509509
private void setupDrawerMenu(NavigationView navigationView) {
510-
navigationView.setItemIconTintList(null);
511510

512511
// setup actions for drawer menu items
513512
navigationView.setNavigationItemSelectedListener(
@@ -518,7 +517,6 @@ private void setupDrawerMenu(NavigationView navigationView) {
518517
return true;
519518
});
520519

521-
522520
User account = accountManager.getUser();
523521
filterDrawerMenu(navigationView.getMenu(), account);
524522
}

‎app/src/main/res/drawable-night/ic_battery_alert.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<!--
22
~ Nextcloud - 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"
11-
android:viewportHeight="24">
10+
android:viewportWidth="960"
11+
android:viewportHeight="960">
1212
<path
1313
android:fillColor="#FFF"
14-
android:pathData="M15.67,4L14,4L14,2h-4v2L8.33,4C7.6,4 7,4.6 7,5.33v15.33C7,21.4 7.6,22 8.33,22h7.33c0.74,0 1.34,-0.6 1.34,-1.33L17,5.33C17,4.6 16.4,4 15.67,4zM13,18h-2v-2h2v2zM13,14h-2L11,9h2v5z" />
14+
android:pathData="M440,560L520,560L520,320L440,320L440,560ZM480,720Q497,720 508.5,708.5Q520,697 520,680Q520,663 508.5,651.5Q497,640 480,640Q463,640 451.5,651.5Q440,663 440,680Q440,697 451.5,708.5Q463,720 480,720ZM320,880Q303,880 291.5,868.5Q280,857 280,840L280,200Q280,183 291.5,171.5Q303,160 320,160L400,160L400,80L560,80L560,160L640,160Q657,160 668.5,171.5Q680,183 680,200L680,840Q680,857 668.5,868.5Q657,880 640,880L320,880ZM360,800L600,800L600,240L360,240L360,800ZM360,800L360,800L600,800L600,800L360,800Z" />
1515
</vector>

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

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
<!--
22
~ Nextcloud - 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" android:tint="#FFFFFF"
8-
android:viewportHeight="24.0" android:viewportWidth="24.0"
9-
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
10-
<path android:fillColor="#FF000000" 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"/>
7+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
8+
android:height="24dp"
9+
android:tint="#FFFFFF"
10+
android:viewportHeight="960"
11+
android:viewportWidth="960"
12+
android:width="24dp">
13+
<path
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" />
1116
</vector>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!--
22
~ Nextcloud - 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"
@@ -13,5 +13,5 @@
1313
android:viewportHeight="960">
1414
<path
1515
android:fillColor="@android:color/white"
16-
android:pathData="M320,920Q287,920 263.5,896.5Q240,873 240,840L240,680L320,680L320,720L720,720L720,240L320,240L320,280L240,280L240,120Q240,87 263.5,63.5Q287,40 320,40L720,40Q753,40 776.5,63.5Q800,87 800,120L800,840Q800,873 776.5,896.5Q753,920 720,920L320,920ZM176,680L120,624L344,400L200,400L200,320L480,320L480,600L400,600L400,456L176,680Z" />
16+
android:pathData="M280,920Q247,920 223.5,896.5Q200,873 200,840L200,120Q200,87 223.5,63.5Q247,40 280,40L680,40Q713,40 736.5,63.5Q760,87 760,120L760,244Q778,251 789,266Q800,281 800,300L800,380Q800,399 789,414Q778,429 760,436L760,840Q760,873 736.5,896.5Q713,920 680,920L280,920ZM280,840L680,840Q680,840 680,840Q680,840 680,840L680,120Q680,120 680,120Q680,120 680,120L280,120Q280,120 280,120Q280,120 280,120L280,840Q280,840 280,840Q280,840 280,840ZM280,840Q280,840 280,840Q280,840 280,840L280,120Q280,120 280,120Q280,120 280,120L280,120Q280,120 280,120Q280,120 280,120L280,840Q280,840 280,840Q280,840 280,840ZM396,620L520,496L520,600L600,600L600,360L360,360L360,440L464,440L340,564L396,620Z" />
1717
</vector>

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
<!--
22
~ Nextcloud - 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"
1010
android:tint="#757575"
11-
android:viewportWidth="24.0"
12-
android:viewportHeight="24.0">
13-
14-
<path android:fillColor="#FF000000" android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z"/>
11+
android:viewportWidth="960"
12+
android:viewportHeight="960">
13+
<path
14+
android:fillColor="@android:color/white"
15+
android:pathData="M160,800Q127,800 103.5,776.5Q80,753 80,720L80,240Q80,207 103.5,183.5Q127,160 160,160L400,160L480,240L800,240Q833,240 856.5,263.5Q880,287 880,320L880,720Q880,753 856.5,776.5Q833,800 800,800L160,800ZM160,720L800,720Q800,720 800,720Q800,720 800,720L800,320Q800,320 800,320Q800,320 800,320L447,320L367,240L160,240Q160,240 160,240Q160,240 160,240L160,720Q160,720 160,720Q160,720 160,720ZM160,720Q160,720 160,720Q160,720 160,720L160,240Q160,240 160,240Q160,240 160,240L160,240L160,320L160,320Q160,320 160,320Q160,320 160,320L160,720Q160,720 160,720Q160,720 160,720Z" />
1516
</vector>

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

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
<!--
22
~ Nextcloud - 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" android:tint="#FFFFFF"
8-
android:viewportHeight="24.0" android:viewportWidth="24.0"
9-
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
10-
<path android:fillColor="#FF000000" android:pathData="M12,4l-1.41,1.41L16.17,11H4v2h12.17l-5.58,5.59L12,20l8,-8z"/>
7+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
8+
android:width="24dp"
9+
android:height="24dp"
10+
android:autoMirrored="true"
11+
android:tint="#FFFFFF"
12+
android:viewportWidth="960"
13+
android:viewportHeight="960">
14+
<path
15+
android:fillColor="@android:color/white"
16+
android:pathData="M647,520L160,520L160,440L647,440L423,216L480,160L800,480L480,800L423,744L647,520Z" />
1117
</vector>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<!--
22
~ Nextcloud - 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"
1010
android:tint="#666666"
11-
android:viewportWidth="24.0"
12-
android:viewportHeight="24.0">
11+
android:viewportWidth="960"
12+
android:viewportHeight="960">
1313
<path
14-
android:fillColor="#FF000000"
15-
android:pathData="M15,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM6,10L6,7L4,7v3L1,10v2h3v3h2v-3h3v-2L6,10zM15,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z" />
14+
android:fillColor="@android:color/white"
15+
android:pathData="M720,560L720,440L600,440L600,360L720,360L720,240L800,240L800,360L920,360L920,440L800,440L800,560L720,560ZM360,480Q294,480 247,433Q200,386 200,320Q200,254 247,207Q294,160 360,160Q426,160 473,207Q520,254 520,320Q520,386 473,433Q426,480 360,480ZM40,800L40,688Q40,654 57.5,625.5Q75,597 104,582Q166,551 230,535.5Q294,520 360,520Q426,520 490,535.5Q554,551 616,582Q645,597 662.5,625.5Q680,654 680,688L680,800L40,800ZM120,720L600,720L600,688Q600,677 594.5,668Q589,659 580,654Q526,627 471,613.5Q416,600 360,600Q304,600 249,613.5Q194,627 140,654Q131,659 125.5,668Q120,677 120,688L120,720ZM360,400Q393,400 416.5,376.5Q440,353 440,320Q440,287 416.5,263.5Q393,240 360,240Q327,240 303.5,263.5Q280,287 280,320Q280,353 303.5,376.5Q327,400 360,400ZM360,320Q360,320 360,320Q360,320 360,320Q360,320 360,320Q360,320 360,320Q360,320 360,320Q360,320 360,320Q360,320 360,320Q360,320 360,320ZM360,720L360,720Q360,720 360,720Q360,720 360,720Q360,720 360,720Q360,720 360,720Q360,720 360,720Q360,720 360,720Q360,720 360,720Q360,720 360,720L360,720Z" />
1616
</vector>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!--
22
~ Nextcloud - 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"
@@ -12,5 +12,5 @@
1212
android:viewportHeight="960">
1313
<path
1414
android:fillColor="@android:color/white"
15-
android:pathData="M336,680L480,536L624,680L680,624L536,480L680,336L624,280L480,424L336,280L280,336L424,480L280,624L336,680ZM480,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" />
16-
</vector>
15+
android:pathData="M336,680L480,536L624,680L680,624L536,480L680,336L624,280L480,424L336,280L280,336L424,480L280,624L336,680ZM480,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" />
16+
</vector>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!--
22
~ Nextcloud - 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"
@@ -12,5 +12,5 @@
1212
android:viewportHeight="960">
1313
<path
1414
android:fillColor="@android:color/white"
15-
android:pathData="M560,640L640,640L640,560L720,560L720,480L640,480L640,400L560,400L560,480L480,480L480,560L560,560L560,640ZM160,800Q127,800 103.5,776.5Q80,753 80,720L80,240Q80,207 103.5,183.5Q127,160 160,160L400,160L480,240L800,240Q833,240 856.5,263.5Q880,287 880,320L880,720Q880,753 856.5,776.5Q833,800 800,800L160,800Z" />
15+
android:pathData="M560,640L640,640L640,560L720,560L720,480L640,480L640,400L560,400L560,480L480,480L480,560L560,560L560,640ZM160,800Q127,800 103.5,776.5Q80,753 80,720L80,240Q80,207 103.5,183.5Q127,160 160,160L400,160L480,240L800,240Q833,240 856.5,263.5Q880,287 880,320L880,720Q880,753 856.5,776.5Q833,800 800,800L160,800ZM160,720L800,720Q800,720 800,720Q800,720 800,720L800,320Q800,320 800,320Q800,320 800,320L447,320L367,240L160,240Q160,240 160,240Q160,240 160,240L160,720Q160,720 160,720Q160,720 160,720ZM160,720Q160,720 160,720Q160,720 160,720L160,240Q160,240 160,240Q160,240 160,240L160,240L160,320L160,320Q160,320 160,320Q160,320 160,320L160,720Q160,720 160,720Q160,720 160,720Z" />
1616
</vector>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
<!--
33
~ Nextcloud - Android Client
44
~
5-
~ SPDX-FileCopyrightText: 2018-2024 Google LLC
5+
~ SPDX-FileCopyrightText: 2018-2025 Google LLC
66
~ SPDX-License-Identifier: Apache-2.0
77
-->
88
<vector xmlns:android="http://schemas.android.com/apk/res/android"
99
android:width="24dp"
1010
android:height="24dp"
1111
android:tint="#757575"
12-
android:viewportWidth="24.0"
13-
android:viewportHeight="24.0">
12+
android:viewportWidth="960"
13+
android:viewportHeight="960">
1414
<path
15-
android:fillColor="#FF000000"
16-
android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z" />
17-
</vector>
15+
android:fillColor="@android:color/white"
16+
android:pathData="M280,840Q247,840 223.5,816.5Q200,793 200,760L200,240L160,240L160,160L360,160L360,120L600,120L600,160L800,160L800,240L760,240L760,760Q760,793 736.5,816.5Q713,840 680,840L280,840ZM680,240L280,240L280,760Q280,760 280,760Q280,760 280,760L680,760Q680,760 680,760Q680,760 680,760L680,240ZM360,680L440,680L440,320L360,320L360,680ZM520,680L600,680L600,320L520,320L520,680ZM280,240L280,240L280,760Q280,760 280,760Q280,760 280,760L280,760Q280,760 280,760Q280,760 280,760L280,240Z" />
17+
</vector>

0 commit comments

Comments
 (0)