[Jetcaster] Replace Material Icons with drawable resources

Jetcaster/mobile/build.gradle.kts

@@ -119,7 +119,6 @@ dependencies {
     // Compose
     implementation(libs.androidx.activity.compose)
     implementation(libs.androidx.compose.foundation)
-    implementation(libs.androidx.compose.material.iconsExtended)
     implementation(libs.androidx.compose.material3)
     implementation(libs.androidx.compose.material3.adaptive)
     implementation(libs.androidx.compose.material3.adaptive.layout)

Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/Home.kt

@@ -38,10 +38,6 @@ import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.pager.rememberPagerState
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.AccountCircle
-import androidx.compose.material.icons.filled.LibraryMusic
-import androidx.compose.material.icons.filled.Search
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonColors
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -338,13 +334,13 @@ private fun HomeAppBar(isExpanded: Boolean, modifier: Modifier = Modifier) {
                     },
                     leadingIcon = {
                         Icon(
-                            imageVector = Icons.Default.Search,
+                            painterResource(id = R.drawable.ic_search),
                             contentDescription = null,
                         )
                     },
                     trailingIcon = {
                         Icon(
-                            imageVector = Icons.Default.AccountCircle,
+                            painterResource(id = R.drawable.ic_account_circle),
                             contentDescription = stringResource(R.string.cd_account),
                         )
                     },
@@ -492,7 +488,7 @@ fun PillToolbar(selectedHomeCategory: HomeCategory, onHomeAction: (HomeAction) -
             ) {
                 Row(Modifier) {
                     Icon(
-                        Icons.Filled.LibraryMusic,
+                        painterResource(id = R.drawable.ic_library_music),
                         modifier = Modifier.padding(end = 8.dp),
                         contentDescription = stringResource(
                             R.string.library_toolbar_content_description,

Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/discover/Discover.kt

@@ -24,8 +24,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.lazy.grid.LazyGridScope
 import androidx.compose.foundation.lazy.itemsIndexed
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Check
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.FilterChip
 import androidx.compose.material3.FilterChipDefaults
@@ -35,6 +33,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.example.jetcaster.R
@@ -122,7 +121,7 @@ private fun ChoiceChipContent(text: String, selected: Boolean, onClick: () -> Un
         leadingIcon = {
             if (selected) {
                 Icon(
-                    imageVector = Icons.Default.Check,
+                    painter = painterResource(id = R.drawable.ic_check),
                     contentDescription = stringResource(id = R.string.cd_selected_category),
                     modifier = Modifier.height(18.dp),
                 )

Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/player/PlayerScreen.kt

@@ -50,16 +50,6 @@ import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material.icons.automirrored.filled.PlaylistAdd
-import androidx.compose.material.icons.filled.MoreVert
-import androidx.compose.material.icons.rounded.Forward10
-import androidx.compose.material.icons.rounded.Pause
-import androidx.compose.material.icons.rounded.PlayArrow
-import androidx.compose.material.icons.rounded.Replay10
-import androidx.compose.material.icons.rounded.SkipNext
-import androidx.compose.material.icons.rounded.SkipPrevious
 import androidx.compose.material3.ButtonGroup
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
@@ -87,6 +77,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.style.TextOverflow
@@ -586,20 +577,20 @@ private fun TopAppBar(onBackPress: () -> Unit, onAddToQueue: () -> Unit) {
     Row(Modifier.fillMaxWidth()) {
         IconButton(onClick = onBackPress) {
             Icon(
-                imageVector = Icons.AutoMirrored.Filled.ArrowBack,
+                painterResource(id = R.drawable.ic_arrow_back),
                 contentDescription = stringResource(R.string.cd_back),
             )
         }
         Spacer(Modifier.weight(1f))
         IconButton(onClick = onAddToQueue) {
             Icon(
-                imageVector = Icons.AutoMirrored.Filled.PlaylistAdd,
+                painterResource(id = R.drawable.ic_playlist_add),
                 contentDescription = stringResource(R.string.cd_add),
             )
         }
         IconButton(onClick = { /* TODO */ }) {
             Icon(
-                imageVector = Icons.Default.MoreVert,
+                painterResource(id = R.drawable.ic_more_vert),
                 contentDescription = stringResource(R.string.cd_more),
             )
         }
@@ -755,7 +746,7 @@ private fun PlayerButtons(
                 .height(136.dp),
         ) {
             Icon(
-                imageVector = if (isPlaying) Icons.Rounded.Pause else Icons.Rounded.PlayArrow,
+                painterResource(id = if (isPlaying) R.drawable.ic_pause else R.drawable.ic_play_arrow),
                 modifier = Modifier.fillMaxSize(),
                 contentDescription = null,
             )
@@ -788,7 +779,7 @@ private fun PlayerButtons(
                         enabled = isPlaying,
                     ) {
                         Icon(
-                            imageVector = Icons.Rounded.SkipPrevious,
+                            painterResource(id = R.drawable.ic_skip_previous),
                             contentDescription = null,
                         )
                     }
@@ -812,7 +803,7 @@ private fun PlayerButtons(
                         enabled = isPlaying,
                     ) {
                         Icon(
-                            imageVector = Icons.Rounded.Replay10,
+                            painterResource(id = R.drawable.ic_replay_10),
                             contentDescription = null,
                         )
                     }
@@ -836,7 +827,7 @@ private fun PlayerButtons(
                         enabled = isPlaying,
                     ) {
                         Icon(
-                            imageVector = Icons.Rounded.Forward10,
+                            painterResource(id = R.drawable.ic_forward_10),
                             contentDescription = null,
                         )
                     }
@@ -860,7 +851,7 @@ private fun PlayerButtons(
                         enabled = hasNext,
                     ) {
                         Icon(
-                            imageVector = Icons.Rounded.SkipNext,
+                            painterResource(id = R.drawable.ic_skip_next),
                             contentDescription = null,
                         )
                     }

Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/podcast/PodcastDetailsScreen.kt

@@ -35,12 +35,6 @@ import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.grid.items
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material.icons.filled.Add
-import androidx.compose.material.icons.filled.Check
-import androidx.compose.material.icons.filled.NotificationsActive
-import androidx.compose.material.icons.filled.NotificationsNone
 import androidx.compose.material3.ButtonGroup
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
@@ -64,6 +58,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.font.FontWeight
@@ -323,10 +318,7 @@ fun PodcastDetailsHeaderItemButtons(isSubscribed: Boolean, onClick: () -> Unit,
                     interactionSource = interactionSource1,
                 ) {
                     Icon(
-                        imageVector = if (isSubscribed)
-                            Icons.Default.Check
-                        else
-                            Icons.Default.Add,
+                        painterResource(id = if (isSubscribed) R.drawable.ic_check else R.drawable.ic_add),
                         contentDescription = null,
                     )
                 }
@@ -358,11 +350,7 @@ fun PodcastDetailsHeaderItemButtons(isSubscribed: Boolean, onClick: () -> Unit,
                         .animateWidth(interactionSource = interactionSource2),
                 ) {
                     Icon(
-                        imageVector = if (isNotificationOn) {
-                            Icons.Default.NotificationsActive
-                        } else {
-                            Icons.Default.NotificationsNone
-                        },
+                        painterResource(id = if (isNotificationOn) R.drawable.ic_notifications_active else R.drawable.ic_notifications),
                         contentDescription = stringResource(R.string.cd_more),
                     )
                 }
@@ -384,7 +372,7 @@ fun PodcastDetailsTopAppBar(navigateBack: () -> Unit, modifier: Modifier = Modif
         navigationIcon = {
             IconButton(onClick = navigateBack) {
                 Icon(
-                    imageVector = Icons.AutoMirrored.Filled.ArrowBack,
+                    painterResource(id = R.drawable.ic_arrow_back),
                     contentDescription = stringResource(id = R.string.cd_back),
                 )
             }

Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/shared/EpisodeListItem.kt

@@ -27,11 +27,6 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.PlaylistAdd
-import androidx.compose.material.icons.filled.Delete
-import androidx.compose.material.icons.filled.MoreVert
-import androidx.compose.material.icons.rounded.PlayCircleFilled
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
@@ -48,6 +43,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.semantics.role
@@ -91,7 +87,7 @@ fun EpisodeListItem(
                     .padding(end = 40.dp),
             ) {
                 Icon(
-                    imageVector = Icons.Default.Delete,
+                    painterResource(id = R.drawable.ic_delete),
                     contentDescription = null,
                     modifier = Modifier.align(Alignment.CenterEnd),
                 )
@@ -156,7 +152,7 @@ private fun EpisodeListItemFooter(
         modifier = modifier,
     ) {
         Image(
-            imageVector = Icons.Rounded.PlayCircleFilled,
+            painterResource(id = R.drawable.ic_play_circle),
             contentDescription = stringResource(R.string.cd_play),
             contentScale = ContentScale.Fit,
             colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.primary),
@@ -204,7 +200,7 @@ private fun EpisodeListItemFooter(
             },
         ) {
             Icon(
-                imageVector = Icons.AutoMirrored.Filled.PlaylistAdd,
+                painterResource(id = R.drawable.ic_playlist_add),
                 contentDescription = stringResource(R.string.cd_add),
                 tint = MaterialTheme.colorScheme.onSurfaceVariant,
             )
@@ -214,7 +210,7 @@ private fun EpisodeListItemFooter(
             onClick = { /* TODO */ },
         ) {
             Icon(
-                imageVector = Icons.Default.MoreVert,
+                painterResource(id = R.drawable.ic_more_vert),
                 contentDescription = stringResource(R.string.cd_more),
                 tint = MaterialTheme.colorScheme.onSurfaceVariant,
             )

Jetcaster/mobile/src/main/java/com/example/jetcaster/util/Buttons.kt

@@ -18,9 +18,6 @@ package com.example.jetcaster.util
 
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Add
-import androidx.compose.material.icons.filled.Check
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconToggleButton
@@ -29,6 +26,7 @@ import androidx.compose.material3.IconToggleButtonShapes
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.example.jetcaster.R
@@ -56,9 +54,9 @@ fun ToggleFollowPodcastIconButton(isFollowed: Boolean, onClick: () -> Unit, modi
     ) {
         Icon(
             // TODO: think about animating these icons
-            imageVector = when {
-                isFollowed -> Icons.Default.Check
-                else -> Icons.Default.Add
+            painter = when {
+                isFollowed -> painterResource(id = R.drawable.ic_check)
+                else -> painterResource(id = R.drawable.ic_add)
             },
             contentDescription = when {
                 isFollowed -> stringResource(R.string.cd_following)

Jetcaster/mobile/src/main/res/drawable/genres.xml

@@ -2,8 +2,7 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
+    android:viewportHeight="960">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M400,720Q450,720 485,685Q520,650 520,600L520,320L640,320L640,240L460,240L460,496Q446,488 431,484Q416,480 400,480Q350,480 315,515Q280,550 280,600Q280,650 315,685Q350,720 400,720ZM480,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"/>

Jetcaster/mobile/src/main/res/drawable/ic_account_circle.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      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,880Z"/>
+</vector>

Jetcaster/mobile/src/main/res/drawable/ic_add.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M440,520L200,520L200,440L440,440L440,200L520,200L520,440L760,440L760,520L520,520L520,760L440,760L440,520Z"/>
+</vector>

Jetcaster/mobile/src/main/res/drawable/ic_arrow_back.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M313,520L537,744L480,800L160,480L480,160L537,216L313,440L800,440L800,520L313,520Z"/>
+</vector>

Jetcaster/mobile/src/main/res/drawable/ic_check.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M382,720L154,492L211,435L382,606L749,239L806,296L382,720Z"/>
+</vector>

Jetcaster/mobile/src/main/res/drawable/ic_delete.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      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,840ZM360,680L440,680L440,320L360,320L360,680ZM520,680L600,680L600,320L520,320L520,680Z"/>
+</vector>

Jetcaster/mobile/src/main/res/drawable/ic_forward_10.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M360,640L360,460L300,460L300,400L420,400L420,640L360,640ZM500,640Q483,640 471.5,628.5Q460,617 460,600L460,440Q460,423 471.5,411.5Q483,400 500,400L580,400Q597,400 608.5,411.5Q620,423 620,440L620,600Q620,617 608.5,628.5Q597,640 580,640L500,640ZM520,580L560,580Q560,580 560,580Q560,580 560,580L560,460Q560,460 560,460Q560,460 560,460L520,460Q520,460 520,460Q520,460 520,460L520,580Q520,580 520,580Q520,580 520,580ZM480,880Q405,880 339.5,851.5Q274,823 225.5,774.5Q177,726 148.5,660.5Q120,595 120,520Q120,445 148.5,379.5Q177,314 225.5,265.5Q274,217 339.5,188.5Q405,160 480,160L486,160L424,98L480,40L640,200L480,360L424,302L486,240L480,240Q363,240 281.5,321.5Q200,403 200,520Q200,637 281.5,718.5Q363,800 480,800Q597,800 678.5,718.5Q760,637 760,520L840,520Q840,595 811.5,660.5Q783,726 734.5,774.5Q686,823 620.5,851.5Q555,880 480,880Z"/>
+</vector>