Skip to content

Commit 9826118

Browse files
terrakokterrakok
committed
Replace material icons with custom drawable resources in the resources demo project
1 parent 9097baa commit 9826118

File tree

9 files changed

+60
-16
lines changed

9 files changed

+60
-16
lines changed

‎components/gradle.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ android.useAndroidX=true
99
#Versions
1010
kotlin.version=2.1.0
1111
agp.version=8.2.2
12-
compose.version=1.8.0+dev2188
13-
deploy.version=0.1.0-SNAPSHOT
12+
compose.version=1.8.10+dev2347
13+
deploy.version=9999.0.0-SNAPSHOT
1414

1515
#Compose
1616
org.jetbrains.compose.experimental.jscanvas.enabled=true

‎components/resources/demo/shared/src/commonMain/composeResources/drawable/add.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="960"
5+
android:viewportHeight="960">
6+
<path
7+
android:fillColor="#ff000000"
8+
android:pathData="M440,520L200,520L200,440L440,440L440,200L520,200L520,440L760,440L760,520L520,520L520,760L440,760L440,520Z"/>
9+
</vector>

‎components/resources/demo/shared/src/commonMain/composeResources/drawable/attachment.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="960"
5+
android:viewportHeight="960">
6+
<path
7+
android:fillColor="#ff000000"
8+
android:pathData="M330,720Q226,720 153,647Q80,574 80,470Q80,366 153,293Q226,220 330,220L700,220Q775,220 827.5,272.5Q880,325 880,400Q880,475 827.5,527.5Q775,580 700,580L350,580Q304,580 272,548Q240,516 240,470Q240,424 272,392Q304,360 350,360L720,360L720,440L350,440Q337,440 328.5,448.5Q320,457 320,470Q320,483 328.5,491.5Q337,500 350,500L700,500Q742,499 771,470.5Q800,442 800,400Q800,358 771,329Q742,300 700,300L330,300Q259,299 209.5,349Q160,399 160,470Q160,540 209.5,589Q259,638 330,640L720,640L720,720L330,720Z"/>
9+
</vector>

‎components/resources/demo/shared/src/commonMain/composeResources/drawable/brand_family.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="960"
5+
android:viewportHeight="960">
6+
<path
7+
android:fillColor="#ff000000"
8+
android:pathData="M186,880Q132,880 106,858Q80,836 80,792Q80,734 129,718Q178,702 245,702L266,702L266,646Q266,612 265,590.5Q264,569 259,555Q254,541 247.5,535.5Q241,530 230,530Q221,530 213.5,533Q206,536 201,541Q197,546 196,551.5Q195,557 197,563Q203,574 211,584.5Q219,595 219,609Q219,634 201.5,651.5Q184,669 159,669Q134,669 116.5,651.5Q99,634 99,609Q99,582 111,565Q123,548 143.5,538Q164,528 191,524Q218,520 249,520Q334,520 367,550.5Q400,581 400,658L400,805Q400,824 404.5,833Q409,842 420,842Q432,842 439.5,824Q447,806 449,768L460,768Q457,830 436.5,855Q416,880 368,880Q325,880 300.5,866.5Q276,853 269,826Q259,855 239.5,867.5Q220,880 186,880ZM559,880Q539,880 526.5,863.5Q514,847 522,828L624,559Q631,542 646,531Q661,520 680,520Q699,520 714,531Q729,542 736,559L838,828Q846,847 833.5,863.5Q821,880 801,880Q789,880 779,873Q769,866 764,854L744,796L616,796L596,854Q592,865 582,872.5Q572,880 559,880ZM235,851Q248,851 257,830.5Q266,810 266,781L266,714Q240,714 228,729.5Q216,745 216,780L216,791Q216,827 220,839Q224,851 235,851ZM642,726L719,726L680,612L642,726ZM605,441Q557,441 528.5,407.5Q500,374 500,317Q500,213 566,146.5Q632,80 735,80Q777,80 803,89.5Q829,99 829,114Q829,120 827,126Q825,132 820,137Q815,144 807.5,147Q800,150 792,148Q778,144 760,141Q742,138 727,138Q656,138 613,186Q570,234 570,313Q570,335 578,359Q586,383 614,383Q625,383 635.5,378Q646,373 654,364Q671,346 685.5,304Q700,262 712,202Q714,189 722.5,183.5Q731,178 746,178Q764,178 773.5,187.5Q783,197 779,211Q767,254 761.5,286Q756,318 756,344Q756,364 761.5,373Q767,382 778,382Q789,382 799.5,374Q810,366 829,344Q831,341 844,337Q852,337 856,343Q860,349 860,360Q860,388 828,414Q796,440 761,440Q735,440 716.5,426Q698,412 691,386Q676,412 654,426.5Q632,441 605,441ZM120,440L120,220Q120,162 161,121Q202,80 260,80Q318,80 359,121Q400,162 400,220L400,440L320,440L320,360L200,360L200,440L120,440ZM200,280L320,280L320,220Q320,195 302.5,177.5Q285,160 260,160Q235,160 217.5,177.5Q200,195 200,220L200,280Z"/>
9+
</vector>

‎components/resources/demo/shared/src/commonMain/composeResources/drawable/image.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="960"
5+
android:viewportHeight="960">
6+
<path
7+
android:fillColor="#ff000000"
8+
android:pathData="M200,840Q167,840 143.5,816.5Q120,793 120,760L120,200Q120,167 143.5,143.5Q167,120 200,120L760,120Q793,120 816.5,143.5Q840,167 840,200L840,760Q840,793 816.5,816.5Q793,840 760,840L200,840ZM200,760L760,760Q760,760 760,760Q760,760 760,760L760,200Q760,200 760,200Q760,200 760,200L200,200Q200,200 200,200Q200,200 200,200L200,760Q200,760 200,760Q200,760 200,760ZM240,680L720,680L570,480L450,640L360,520L240,680ZM200,760Q200,760 200,760Q200,760 200,760L200,200Q200,200 200,200Q200,200 200,200L200,200Q200,200 200,200Q200,200 200,200L200,760Q200,760 200,760Q200,760 200,760Z"/>
9+
</vector>

‎components/resources/demo/shared/src/commonMain/composeResources/drawable/text_snippet.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="960"
5+
android:viewportHeight="960"
6+
android:autoMirrored="true">
7+
<path
8+
android:fillColor="#ff000000"
9+
android:pathData="M200,760L760,760Q760,760 760,760Q760,760 760,760L760,393L567,200L200,200Q200,200 200,200Q200,200 200,200L200,760Q200,760 200,760Q200,760 200,760ZM200,840Q167,840 143.5,816.5Q120,793 120,760L120,200Q120,167 143.5,143.5Q167,120 200,120L600,120L840,360L840,760Q840,793 816.5,816.5Q793,840 760,840L200,840ZM280,680L680,680L680,600L280,600L280,680ZM280,520L680,520L680,440L280,440L280,520ZM280,360L560,360L560,280L280,280L280,360ZM200,760Q200,760 200,760Q200,760 200,760L200,200Q200,200 200,200Q200,200 200,200L200,200L200,393L200,760Q200,760 200,760Q200,760 200,760Z"/>
10+
</vector>

‎components/resources/demo/shared/src/commonMain/kotlin/org/jetbrains/compose/resources/demo/shared/StringRes.kt‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@ package org.jetbrains.compose.resources.demo.shared
22

33
import androidx.compose.foundation.layout.*
44
import androidx.compose.foundation.rememberScrollState
5-
import androidx.compose.foundation.shape.RoundedCornerShape
65
import androidx.compose.foundation.verticalScroll
7-
import androidx.compose.material.icons.Icons
8-
import androidx.compose.material.icons.filled.Add
96
import androidx.compose.material3.*
107
import androidx.compose.runtime.*
118
import androidx.compose.ui.Modifier
@@ -87,7 +84,7 @@ fun StringRes(paddingValues: PaddingValues) {
8784
leadingIcon = {
8885
Row {
8986
IconButton({ numMessages += 1 }) {
90-
Icon(Icons.Default.Add, contentDescription = "Add Message")
87+
Icon(painterResource(Res.drawable.add), contentDescription = "Add Message")
9188
}
9289
}
9390
},

‎components/resources/demo/shared/src/commonMain/kotlin/org/jetbrains/compose/resources/demo/shared/UseResources.kt‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@ package org.jetbrains.compose.resources.demo.shared
22

33
import androidx.compose.foundation.layout.PaddingValues
44
import androidx.compose.foundation.layout.fillMaxSize
5-
import androidx.compose.material.icons.Icons
6-
import androidx.compose.material.icons.filled.Edit
7-
import androidx.compose.material.icons.filled.Face
8-
import androidx.compose.material.icons.filled.Favorite
9-
import androidx.compose.material.icons.filled.Info
105
import androidx.compose.material3.Icon
116
import androidx.compose.material3.NavigationBar
127
import androidx.compose.material3.NavigationBarItem
@@ -18,6 +13,12 @@ import androidx.compose.runtime.mutableStateOf
1813
import androidx.compose.runtime.remember
1914
import androidx.compose.runtime.setValue
2015
import androidx.compose.ui.Modifier
16+
import components.resources.demo.shared.generated.resources.Res
17+
import components.resources.demo.shared.generated.resources.attachment
18+
import components.resources.demo.shared.generated.resources.brand_family
19+
import components.resources.demo.shared.generated.resources.image
20+
import components.resources.demo.shared.generated.resources.text_snippet
21+
import org.jetbrains.compose.resources.painterResource
2122

2223
enum class Screens(val content: @Composable (contentPadding: PaddingValues) -> Unit) {
2324
Images({ ImagesRes(it) }),
@@ -38,25 +39,25 @@ internal fun UseResources() {
3839
NavigationBarItem(
3940
selected = screen == Screens.Images,
4041
onClick = { screen = Screens.Images },
41-
icon = { Icon(imageVector = Icons.Default.Face, contentDescription = null) },
42+
icon = { Icon(painterResource(Res.drawable.image), null) },
4243
label = { Text("Images") }
4344
)
4445
NavigationBarItem(
4546
selected = screen == Screens.Strings,
4647
onClick = { screen = Screens.Strings },
47-
icon = { Icon(imageVector = Icons.Default.Edit, contentDescription = null) },
48+
icon = { Icon(painterResource(Res.drawable.text_snippet), null) },
4849
label = { Text("Strings") }
4950
)
5051
NavigationBarItem(
5152
selected = screen == Screens.Font,
5253
onClick = { screen = Screens.Font },
53-
icon = { Icon(imageVector = Icons.Default.Favorite, contentDescription = null) },
54+
icon = { Icon(painterResource(Res.drawable.brand_family), null) },
5455
label = { Text("Fonts") }
5556
)
5657
NavigationBarItem(
5758
selected = screen == Screens.File,
5859
onClick = { screen = Screens.File },
59-
icon = { Icon(imageVector = Icons.Default.Info, contentDescription = null) },
60+
icon = { Icon(painterResource(Res.drawable.attachment), null) },
6061
label = { Text("Files") }
6162
)
6263
}

‎gradle-plugins/gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ kotlin.code.style=official
88
dev.junit.parallel=false
99

1010
# Default version of Compose Libraries used by Gradle plugin
11-
compose.version=1.8.10+dev2320
11+
compose.version=1.8.10+dev2347
1212
# The latest version of Kotlin compatible with compose.tests.compiler.version. Used only in tests/CI.
1313
compose.tests.kotlin.version=2.2.0-Beta1
1414
# __SUPPORTED_GRADLE_VERSIONS__

0 commit comments

Comments
 (0)