A fully functional Android app built entirely with Kotlin and Jetpack Compose
Refactor icons
Miłosz Moczkowski479a2f00b097
diff --git a/app-nia-catalog/src/main/java/com/google/samples/apps/niacatalog/ui/Catalog.kt b/app-nia-catalog/src/main/java/com/google/samples/apps/niacatalog/ui/Catalog.ktindex 54e4264fa..2624262ad 100644--- a/app-nia-catalog/src/main/java/com/google/samples/apps/niacatalog/ui/Catalog.kt+++ b/app-nia-catalog/src/main/java/com/google/samples/apps/niacatalog/ui/Catalog.kt@@ -36,7 +36,6 @@ import androidx.compose.runtime.mutableStateOfimport androidx.compose.runtime.rememberimport androidx.compose.runtime.setValueimport androidx.compose.ui.Modifier-import androidx.compose.ui.res.painterResourceimport androidx.compose.ui.unit.dpimport com.google.samples.apps.nowinandroid.core.designsystem.component.NiaButtonimport com.google.samples.apps.nowinandroid.core.designsystem.component.NiaFilterChip@@ -206,13 +205,13 @@ fun NiaCatalog() {onCheckedChange = { checked -> firstChecked = checked },icon = {Icon(- painter = painterResource(id = NiaIcons.BookmarkBorder),+ imageVector = NiaIcons.BookmarkBorder,contentDescription = null,)},checkedIcon = {Icon(- painter = painterResource(id = NiaIcons.Bookmark),+ imageVector = NiaIcons.Bookmark,contentDescription = null,)},@@ -223,13 +222,13 @@ fun NiaCatalog() {onCheckedChange = { checked -> secondChecked = checked },icon = {Icon(- painter = painterResource(id = NiaIcons.BookmarkBorder),+ imageVector = NiaIcons.BookmarkBorder,contentDescription = null,)},checkedIcon = {Icon(- painter = painterResource(id = NiaIcons.Bookmark),+ imageVector = NiaIcons.Bookmark,contentDescription = null,)},@@ -239,13 +238,13 @@ fun NiaCatalog() {onCheckedChange = {},icon = {Icon(- painter = painterResource(id = NiaIcons.BookmarkBorder),+ imageVector = NiaIcons.BookmarkBorder,contentDescription = null,)},checkedIcon = {Icon(- painter = painterResource(id = NiaIcons.Bookmark),+ imageVector = NiaIcons.Bookmark,contentDescription = null,)},@@ -256,13 +255,13 @@ fun NiaCatalog() {onCheckedChange = {},icon = {Icon(- painter = painterResource(id = NiaIcons.BookmarkBorder),+ imageVector = NiaIcons.BookmarkBorder,contentDescription = null,)},checkedIcon = {Icon(- painter = painterResource(id = NiaIcons.Bookmark),+ imageVector = NiaIcons.Bookmark,contentDescription = null,)},@@ -334,40 +333,31 @@ fun NiaCatalog() {item { Text("Navigation", Modifier.padding(top = 16.dp)) }item {var selectedItem by remember { mutableStateOf(0) }- val items = listOf("For you", "Episodes", "Saved", "Interests")+ val items = listOf("For you", "Saved", "Interests")val icons = listOf(NiaIcons.UpcomingBorder,- NiaIcons.MenuBookBorder,NiaIcons.BookmarksBorder,+ NiaIcons.Grid3x3,)val selectedIcons = listOf(NiaIcons.Upcoming,- NiaIcons.MenuBook,NiaIcons.Bookmarks,+ NiaIcons.Grid3x3,)- val tagIcon = NiaIcons.TagNiaNavigationBar {items.forEachIndexed { index, item ->NiaNavigationBarItem(icon = {- if (index == 3) {- Icon(imageVector = tagIcon, contentDescription = null)- } else {- Icon(- painter = painterResource(id = icons[index]),- contentDescription = item,- )- }+ Icon(+ imageVector = icons[index],+ contentDescription = item,+ )},selectedIcon = {- if (index == 3) {- Icon(imageVector = tagIcon, contentDescription = null)- } else {- Icon(- painter = painterResource(id = selectedIcons[index]),- contentDescription = item,- )- }+ Icon(+ imageVector = selectedIcons[index],+ contentDescription = item,+ )},label = { Text(item) },selected = selectedItem == index,diff --git a/app/src/main/java/com/google/samples/apps/nowinandroid/navigation/TopLevelDestination.kt b/app/src/main/java/com/google/samples/apps/nowinandroid/navigation/TopLevelDestination.ktindex 396ab8b7b..8dbd0fcb6 100644--- a/app/src/main/java/com/google/samples/apps/nowinandroid/navigation/TopLevelDestination.kt+++ b/app/src/main/java/com/google/samples/apps/nowinandroid/navigation/TopLevelDestination.kt@@ -16,10 +16,8 @@package com.google.samples.apps.nowinandroid.navigation+import androidx.compose.ui.graphics.vector.ImageVectorimport com.google.samples.apps.nowinandroid.R-import com.google.samples.apps.nowinandroid.core.designsystem.icon.Icon-import com.google.samples.apps.nowinandroid.core.designsystem.icon.Icon.DrawableResourceIcon-import com.google.samples.apps.nowinandroid.core.designsystem.icon.Icon.ImageVectorIconimport com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIconsimport com.google.samples.apps.nowinandroid.feature.bookmarks.R as bookmarksRimport com.google.samples.apps.nowinandroid.feature.foryou.R as forYouR@@ -31,26 +29,26 @@ import com.google.samples.apps.nowinandroid.feature.interests.R as interestsR* next within a single destination will be handled directly in composables.*/enum class TopLevelDestination(- val selectedIcon: Icon,- val unselectedIcon: Icon,+ val selectedIcon: ImageVector,+ val unselectedIcon: ImageVector,val iconTextId: Int,val titleTextId: Int,) {FOR_YOU(- selectedIcon = DrawableResourceIcon(NiaIcons.Upcoming),- unselectedIcon = DrawableResourceIcon(NiaIcons.UpcomingBorder),+ selectedIcon = NiaIcons.Upcoming,+ unselectedIcon = NiaIcons.UpcomingBorder,iconTextId = forYouR.string.for_you,titleTextId = R.string.app_name,),BOOKMARKS(- selectedIcon = DrawableResourceIcon(NiaIcons.Bookmarks),- unselectedIcon = DrawableResourceIcon(NiaIcons.BookmarksBorder),+ selectedIcon = NiaIcons.Bookmarks,+ unselectedIcon = NiaIcons.BookmarksBorder,iconTextId = bookmarksR.string.saved,titleTextId = bookmarksR.string.saved,),INTERESTS(- selectedIcon = ImageVectorIcon(NiaIcons.Grid3x3),- unselectedIcon = ImageVectorIcon(NiaIcons.Grid3x3),+ selectedIcon = NiaIcons.Grid3x3,+ unselectedIcon = NiaIcons.Grid3x3,iconTextId = interestsR.string.interests,titleTextId = interestsR.string.interests,),diff --git a/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaApp.kt b/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaApp.ktindex de321db52..01726c909 100644--- a/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaApp.kt+++ b/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaApp.kt@@ -52,7 +52,6 @@ import androidx.compose.ui.draw.drawWithContentimport androidx.compose.ui.geometry.Offsetimport androidx.compose.ui.graphics.Colorimport androidx.compose.ui.platform.testTag-import androidx.compose.ui.res.painterResourceimport androidx.compose.ui.res.stringResourceimport androidx.compose.ui.semantics.semanticsimport androidx.compose.ui.semantics.testTagsAsResourceId@@ -70,8 +69,6 @@ import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaNavigimport com.google.samples.apps.nowinandroid.core.designsystem.component.NiaNavigationRailimport com.google.samples.apps.nowinandroid.core.designsystem.component.NiaNavigationRailItemimport com.google.samples.apps.nowinandroid.core.designsystem.component.NiaTopAppBar-import com.google.samples.apps.nowinandroid.core.designsystem.icon.Icon.DrawableResourceIcon-import com.google.samples.apps.nowinandroid.core.designsystem.icon.Icon.ImageVectorIconimport com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIconsimport com.google.samples.apps.nowinandroid.core.designsystem.theme.GradientColorsimport com.google.samples.apps.nowinandroid.core.designsystem.theme.LocalGradientColors@@ -225,22 +222,16 @@ private fun NiaNavRail(selected = selected,onClick = { onNavigateToDestination(destination) },icon = {- val icon = if (selected) {- destination.selectedIcon- } else {- destination.unselectedIcon- }- when (icon) {- is ImageVectorIcon -> Icon(- imageVector = icon.imageVector,- contentDescription = null,- )-- is DrawableResourceIcon -> Icon(- painter = painterResource(id = icon.id),- contentDescription = null,- )- }+ Icon(+ imageVector = destination.unselectedIcon,+ contentDescription = null,+ )+ },+ selectedIcon = {+ Icon(+ imageVector = destination.selectedIcon,+ contentDescription = null,+ )},label = { Text(stringResource(destination.iconTextId)) },modifier = if (hasUnread) Modifier.notificationDot() else Modifier,@@ -267,22 +258,16 @@ private fun NiaBottomBar(selected = selected,onClick = { onNavigateToDestination(destination) },icon = {- val icon = if (selected) {- destination.selectedIcon- } else {- destination.unselectedIcon- }- when (icon) {- is ImageVectorIcon -> Icon(- imageVector = icon.imageVector,- contentDescription = null,- )-- is DrawableResourceIcon -> Icon(- painter = painterResource(id = icon.id),- contentDescription = null,- )- }+ Icon(+ imageVector = destination.unselectedIcon,+ contentDescription = null,+ )+ },+ selectedIcon = {+ Icon(+ imageVector = destination.selectedIcon,+ contentDescription = null,+ )},label = { Text(stringResource(destination.iconTextId)) },modifier = if (hasUnread) Modifier.notificationDot() else Modifier,diff --git a/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/icon/NiaIcons.kt b/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/icon/NiaIcons.ktindex ac31fbcdb..8db20689f 100644--- a/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/icon/NiaIcons.kt+++ b/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/icon/NiaIcons.kt@@ -16,11 +16,15 @@package com.google.samples.apps.nowinandroid.core.designsystem.icon-import androidx.annotation.DrawableResimport androidx.compose.material.icons.Iconsimport androidx.compose.material.icons.filled.MoreVert+import androidx.compose.material.icons.outlined.Bookmarks+import androidx.compose.material.icons.outlined.Upcomingimport androidx.compose.material.icons.rounded.Addimport androidx.compose.material.icons.rounded.ArrowBack+import androidx.compose.material.icons.rounded.Bookmark+import androidx.compose.material.icons.rounded.BookmarkBorder+import androidx.compose.material.icons.rounded.Bookmarksimport androidx.compose.material.icons.rounded.Checkimport androidx.compose.material.icons.rounded.Closeimport androidx.compose.material.icons.rounded.Grid3x3@@ -28,12 +32,9 @@ import androidx.compose.material.icons.rounded.Personimport androidx.compose.material.icons.rounded.Searchimport androidx.compose.material.icons.rounded.Settingsimport androidx.compose.material.icons.rounded.ShortText-import androidx.compose.material.icons.rounded.Tag+import androidx.compose.material.icons.rounded.Upcomingimport androidx.compose.material.icons.rounded.ViewDay-import androidx.compose.material.icons.rounded.VolumeOff-import androidx.compose.material.icons.rounded.VolumeUpimport androidx.compose.ui.graphics.vector.ImageVector-import com.google.samples.apps.nowinandroid.core.designsystem.R/*** Now in Android icons. Material icons are [ImageVector]s, custom icons are drawable resource IDs.@@ -41,32 +42,19 @@ import com.google.samples.apps.nowinandroid.core.designsystem.Robject NiaIcons {val Add = Icons.Rounded.Addval ArrowBack = Icons.Rounded.ArrowBack- val Bookmark = R.drawable.ic_bookmark- val BookmarkBorder = R.drawable.ic_bookmark_border- val Bookmarks = R.drawable.ic_bookmarks- val BookmarksBorder = R.drawable.ic_bookmarks_border+ val Bookmark = Icons.Rounded.Bookmark+ val BookmarkBorder = Icons.Rounded.BookmarkBorder+ val Bookmarks = Icons.Rounded.Bookmarks+ val BookmarksBorder = Icons.Outlined.Bookmarksval Check = Icons.Rounded.Checkval Close = Icons.Rounded.Closeval Grid3x3 = Icons.Rounded.Grid3x3- val MenuBook = R.drawable.ic_menu_book- val MenuBookBorder = R.drawable.ic_menu_book_borderval MoreVert = Icons.Default.MoreVertval Person = Icons.Rounded.Personval Search = Icons.Rounded.Searchval Settings = Icons.Rounded.Settingsval ShortText = Icons.Rounded.ShortText- val Tag = Icons.Rounded.Tag- val Upcoming = R.drawable.ic_upcoming- val UpcomingBorder = R.drawable.ic_upcoming_border+ val Upcoming = Icons.Rounded.Upcoming+ val UpcomingBorder = Icons.Outlined.Upcomingval ViewDay = Icons.Rounded.ViewDay- val VolumeOff = Icons.Rounded.VolumeOff- val VolumeUp = Icons.Rounded.VolumeUp-}--/**- * A sealed class to make dealing with [ImageVector] and [DrawableRes] icons easier.- */-sealed class Icon {- data class ImageVectorIcon(val imageVector: ImageVector) : Icon()- data class DrawableResourceIcon(@DrawableRes val id: Int) : Icon()}diff --git a/core/designsystem/src/main/res/drawable/ic_bookmark.xml b/core/designsystem/src/main/res/drawable/ic_bookmark.xmldeleted file mode 100644index 29b7e40a7..000000000--- a/core/designsystem/src/main/res/drawable/ic_bookmark.xml+++ /dev/null@@ -1,25 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<!--- Copyright 2022 The Android Open Source Project-- Licensed under the Apache License, Version 2.0 (the "License");- you may not use this file except in compliance with the License.- You may obtain a copy of the License at-- http://www.apache.org/licenses/LICENSE-2.0-- Unless required by applicable law or agreed to in writing, software- distributed under the License is distributed on an "AS IS" BASIS,- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- See the License for the specific language governing permissions and- limitations under the License.--->-<vector xmlns:android="http://schemas.android.com/apk/res/android"- android:width="24dp"- android:height="24dp"- android:viewportWidth="24"- android:viewportHeight="24">- <path- android:pathData="M17,3H7C5.9,3 5,3.9 5,5V19.483C5,20.201 5.734,20.685 6.394,20.403L12,18L17.606,20.403C18.266,20.685 19,20.201 19,19.483V5C19,3.9 18.1,3 17,3Z"- android:fillColor="#201A1B"/>-</vector>diff --git a/core/designsystem/src/main/res/drawable/ic_bookmark_border.xml b/core/designsystem/src/main/res/drawable/ic_bookmark_border.xmldeleted file mode 100644index 1d4b4aca9..000000000--- a/core/designsystem/src/main/res/drawable/ic_bookmark_border.xml+++ /dev/null@@ -1,25 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<!--- Copyright 2022 The Android Open Source Project-- Licensed under the Apache License, Version 2.0 (the "License");- you may not use this file except in compliance with the License.- You may obtain a copy of the License at-- http://www.apache.org/licenses/LICENSE-2.0-- Unless required by applicable law or agreed to in writing, software- distributed under the License is distributed on an "AS IS" BASIS,- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- See the License for the specific language governing permissions and- limitations under the License.--->-<vector xmlns:android="http://schemas.android.com/apk/res/android"- android:width="24dp"- android:height="24dp"- android:viewportWidth="24"- android:viewportHeight="24">- <path- android:pathData="M17,3H7C5.9,3 5,3.9 5,5V19.483C5,20.201 5.734,20.685 6.394,20.403L12,18L17.606,20.403C18.266,20.685 19,20.201 19,19.483V5C19,3.9 18.1,3 17,3ZM17,18L12.4,15.994C12.145,15.883 11.855,15.883 11.6,15.994L7,18V5H17V18Z"- android:fillColor="#201A1B"/>-</vector>diff --git a/core/designsystem/src/main/res/drawable/ic_bookmarks.xml b/core/designsystem/src/main/res/drawable/ic_bookmarks.xmldeleted file mode 100644index ed6e84f81..000000000--- a/core/designsystem/src/main/res/drawable/ic_bookmarks.xml+++ /dev/null@@ -1,28 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<!--- Copyright 2022 The Android Open Source Project-- Licensed under the Apache License, Version 2.0 (the "License");- you may not use this file except in compliance with the License.- You may obtain a copy of the License at-- http://www.apache.org/licenses/LICENSE-2.0-- Unless required by applicable law or agreed to in writing, software- distributed under the License is distributed on an "AS IS" BASIS,- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- See the License for the specific language governing permissions and- limitations under the License.--->-<vector xmlns:android="http://schemas.android.com/apk/res/android"- android:width="24dp"- android:height="24dp"- android:viewportWidth="24"- android:viewportHeight="24">- <path- android:pathData="M19,19C19,19.552 19.448,20 20,20C20.552,20 21,19.552 21,19V3C21,1.9 20.1,1 19,1H7C6.448,1 6,1.448 6,2C6,2.552 6.448,3 7,3H19V19Z"- android:fillColor="#201A1B"/>- <path- android:pathData="M15,5H5C3.9,5 3,5.9 3,7V21.483C3,22.201 3.734,22.685 4.394,22.403L10,20L15.606,22.403C16.266,22.685 17,22.201 17,21.483V7C17,5.9 16.1,5 15,5Z"- android:fillColor="#201A1B"/>-</vector>diff --git a/core/designsystem/src/main/res/drawable/ic_bookmarks_border.xml b/core/designsystem/src/main/res/drawable/ic_bookmarks_border.xmldeleted file mode 100644index 64f0b5159..000000000--- a/core/designsystem/src/main/res/drawable/ic_bookmarks_border.xml+++ /dev/null@@ -1,29 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<!--- Copyright 2022 The Android Open Source Project-- Licensed under the Apache License, Version 2.0 (the "License");- you may not use this file except in compliance with the License.- You may obtain a copy of the License at-- http://www.apache.org/licenses/LICENSE-2.0-- Unless required by applicable law or agreed to in writing, software- distributed under the License is distributed on an "AS IS" BASIS,- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- See the License for the specific language governing permissions and- limitations under the License.--->-<vector xmlns:android="http://schemas.android.com/apk/res/android"- android:width="24dp"- android:height="24dp"- android:viewportWidth="24"- android:viewportHeight="24">- <path- android:pathData="M19,19C19,19.552 19.448,20 20,20C20.552,20 21,19.552 21,19V3C21,1.9 20.1,1 19,1H7C6.448,1 6,1.448 6,2C6,2.552 6.448,3 7,3H19V19Z"- android:fillColor="#201A1B"/>- <path- android:pathData="M5,5H15C16.1,5 17,5.9 17,7V21.483C17,22.201 16.266,22.685 15.606,22.403L10,20L4.394,22.403C3.734,22.685 3,22.201 3,21.483V7C3,5.9 3.9,5 5,5ZM15,19.97V7H5V19.97C6.535,19.31 8.07,18.65 9.605,17.99C9.857,17.882 10.143,17.882 10.395,17.99L15,19.97Z"- android:fillColor="#201A1B"- android:fillType="evenOdd"/>-</vector>diff --git a/core/designsystem/src/main/res/drawable/ic_menu_book.xml b/core/designsystem/src/main/res/drawable/ic_menu_book.xmldeleted file mode 100644index e81276888..000000000--- a/core/designsystem/src/main/res/drawable/ic_menu_book.xml+++ /dev/null@@ -1,35 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<!--- Copyright 2022 The Android Open Source Project-- Licensed under the Apache License, Version 2.0 (the "License");- you may not use this file except in compliance with the License.- You may obtain a copy of the License at-- http://www.apache.org/licenses/LICENSE-2.0-- Unless required by applicable law or agreed to in writing, software- distributed under the License is distributed on an "AS IS" BASIS,- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- See the License for the specific language governing permissions and- limitations under the License.--->-<vector xmlns:android="http://schemas.android.com/apk/res/android"- android:width="24dp"- android:height="24dp"- android:viewportWidth="24"- android:viewportHeight="24">- <path- android:pathData="M12.005,5.178C13.455,4.078 15.555,3.678 17.505,3.678C18.955,3.678 20.495,3.898 21.775,4.468C22.505,4.798 22.995,5.508 22.995,6.318V17.598C22.995,18.908 21.775,19.868 20.515,19.538C19.535,19.288 18.495,19.178 17.495,19.178C15.935,19.178 14.275,19.428 12.935,20.098C12.345,20.398 11.665,20.398 11.065,20.098C9.725,19.438 8.065,19.178 6.505,19.178C5.505,19.178 4.465,19.288 3.485,19.538C2.225,19.858 1.005,18.898 1.005,17.598V6.318C1.005,5.508 1.495,4.798 2.225,4.468C3.515,3.898 5.055,3.678 6.505,3.678C8.455,3.678 10.555,4.078 12.005,5.178ZM21,17.5C19.9,17.15 18.7,17 17.5,17C16.16,17 14.37,17.41 13,17.99V6.49C14.37,5.9 16.16,5.5 17.5,5.5C18.7,5.5 19.9,5.65 21,6V17.5Z"- android:fillColor="#201A1B"- android:fillType="evenOdd"/>- <path- android:pathData="M17.5,9.5C18.38,9.5 19.23,9.59 20,9.76V8.24C19.21,8.09 18.36,8 17.5,8C16.22,8 15.04,8.16 14,8.47V10.04C14.99,9.69 16.18,9.5 17.5,9.5Z"- android:fillColor="#201A1B"/>- <path- android:pathData="M17.5,12.16C18.38,12.16 19.23,12.25 20,12.42V10.9C19.21,10.75 18.36,10.66 17.5,10.66C16.22,10.66 15.04,10.82 14,11.13V12.7C14.99,12.36 16.18,12.16 17.5,12.16Z"- android:fillColor="#201A1B"/>- <path- android:pathData="M17.5,14.83C18.38,14.83 19.23,14.92 20,15.09V13.57C19.21,13.42 18.36,13.33 17.5,13.33C16.22,13.33 15.04,13.49 14,13.8V15.37C14.99,15.02 16.18,14.83 17.5,14.83Z"- android:fillColor="#201A1B"/>-</vector>diff --git a/core/designsystem/src/main/res/drawable/ic_menu_book_border.xml b/core/designsystem/src/main/res/drawable/ic_menu_book_border.xmldeleted file mode 100644index 04ec651f6..000000000--- a/core/designsystem/src/main/res/drawable/ic_menu_book_border.xml+++ /dev/null@@ -1,35 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<!--- Copyright 2022 The Android Open Source Project-- Licensed under the Apache License, Version 2.0 (the "License");- you may not use this file except in compliance with the License.- You may obtain a copy of the License at-- http://www.apache.org/licenses/LICENSE-2.0-- Unless required by applicable law or agreed to in writing, software- distributed under the License is distributed on an "AS IS" BASIS,- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- See the License for the specific language governing permissions and- limitations under the License.--->-<vector xmlns:android="http://schemas.android.com/apk/res/android"- android:width="24dp"- android:height="24dp"- android:viewportWidth="24"- android:viewportHeight="24">- <path- android:pathData="M12.005,5.178C13.455,4.078 15.555,3.678 17.505,3.678C18.955,3.678 20.495,3.898 21.775,4.468C22.505,4.798 22.995,5.508 22.995,6.318V17.598C22.995,18.908 21.775,19.868 20.515,19.538C19.535,19.288 18.495,19.178 17.495,19.178C15.935,19.178 14.275,19.428 12.935,20.098C12.345,20.398 11.665,20.398 11.065,20.098C9.725,19.438 8.065,19.178 6.505,19.178C5.505,19.178 4.465,19.288 3.485,19.538C2.225,19.858 1.005,18.898 1.005,17.598V6.318C1.005,5.508 1.495,4.798 2.225,4.468C3.515,3.898 5.055,3.678 6.505,3.678C8.455,3.678 10.555,4.078 12.005,5.178ZM6.5,5.5C7.84,5.5 9.63,5.91 11,6.49V17.99C9.63,17.41 7.84,17 6.5,17C5.3,17 4.1,17.15 3,17.5V6C4.1,5.65 5.3,5.5 6.5,5.5ZM21,17.5C19.9,17.15 18.7,17 17.5,17C16.16,17 14.37,17.41 13,17.99V6.49C14.37,5.9 16.16,5.5 17.5,5.5C18.7,5.5 19.9,5.65 21,6V17.5Z"- android:fillColor="#201A1B"- android:fillType="evenOdd"/>- <path- android:pathData="M17.5,9.5C18.38,9.5 19.23,9.59 20,9.76V8.24C19.21,8.09 18.36,8 17.5,8C16.22,8 15.04,8.16 14,8.47V10.04C14.99,9.69 16.18,9.5 17.5,9.5Z"- android:fillColor="#201A1B"/>- <path- android:pathData="M17.5,12.16C18.38,12.16 19.23,12.25 20,12.42V10.9C19.21,10.75 18.36,10.66 17.5,10.66C16.22,10.66 15.04,10.82 14,11.13V12.7C14.99,12.36 16.18,12.16 17.5,12.16Z"- android:fillColor="#201A1B"/>- <path- android:pathData="M17.5,14.83C18.38,14.83 19.23,14.92 20,15.09V13.57C19.21,13.42 18.36,13.33 17.5,13.33C16.22,13.33 15.04,13.49 14,13.8V15.37C14.99,15.02 16.18,14.83 17.5,14.83Z"- android:fillColor="#201A1B"/>-</vector>diff --git a/core/designsystem/src/main/res/drawable/ic_upcoming.xml b/core/designsystem/src/main/res/drawable/ic_upcoming.xmldeleted file mode 100644index a05017e74..000000000--- a/core/designsystem/src/main/res/drawable/ic_upcoming.xml+++ /dev/null@@ -1,34 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<!--- Copyright 2022 The Android Open Source Project-- Licensed under the Apache License, Version 2.0 (the "License");- you may not use this file except in compliance with the License.- You may obtain a copy of the License at-- http://www.apache.org/licenses/LICENSE-2.0-- Unless required by applicable law or agreed to in writing, software- distributed under the License is distributed on an "AS IS" BASIS,- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- See the License for the specific language governing permissions and- limitations under the License.--->-<vector xmlns:android="http://schemas.android.com/apk/res/android"- android:width="24dp"- android:height="24dp"- android:viewportWidth="24"- android:viewportHeight="24">- <path- android:pathData="M20.45,6.55C20.07,6.17 19.44,6.17 19.06,6.55L16.89,8.7C16.5,9.08 16.5,9.71 16.89,10.09L16.9,10.1C17.29,10.49 17.91,10.49 18.3,10.1C18.92,9.47 19.82,8.56 20.45,7.93C20.83,7.55 20.83,6.93 20.45,6.55Z"- android:fillColor="#201A1B"/>- <path- android:pathData="M12.02,3H11.99C11.44,3 11,3.44 11,3.98V7.01C11,7.56 11.44,8 11.98,8H12.01C12.56,8 13,7.56 13,7.02V3.98C13,3.44 12.56,3 12.02,3Z"- android:fillColor="#201A1B"/>- <path- android:pathData="M7.1,10.11L7.11,10.1C7.49,9.72 7.49,9.09 7.11,8.71L4.96,6.54C4.58,6.15 3.95,6.15 3.57,6.54L3.55,6.55C3.16,6.94 3.16,7.56 3.55,7.94C4.18,8.56 5.08,9.48 5.7,10.11C6.09,10.49 6.72,10.49 7.1,10.11Z"- android:fillColor="#201A1B"/>- <path- android:pathData="M12,15C10.76,15 9.69,14.25 9.24,13.17C8.92,12.43 8.14,12 7.34,12H4C2.9,12 2,12.9 2,14V19C2,20.1 2.9,21 4,21H20C21.1,21 22,20.1 22,19V14C22,12.9 21.1,12 20,12H16.66C15.86,12 15.08,12.43 14.76,13.17C14.31,14.25 13.24,15 12,15Z"- android:fillColor="#201A1B"/>-</vector>diff --git a/core/designsystem/src/main/res/drawable/ic_upcoming_border.xml b/core/designsystem/src/main/res/drawable/ic_upcoming_border.xmldeleted file mode 100644index 5f3151232..000000000--- a/core/designsystem/src/main/res/drawable/ic_upcoming_border.xml+++ /dev/null@@ -1,35 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<!--- Copyright 2022 The Android Open Source Project-- Licensed under the Apache License, Version 2.0 (the "License");- you may not use this file except in compliance with the License.- You may obtain a copy of the License at-- http://www.apache.org/licenses/LICENSE-2.0-- Unless required by applicable law or agreed to in writing, software- distributed under the License is distributed on an "AS IS" BASIS,- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- See the License for the specific language governing permissions and- limitations under the License.--->-<vector xmlns:android="http://schemas.android.com/apk/res/android"- android:width="24dp"- android:height="24dp"- android:viewportWidth="24"- android:viewportHeight="24">- <path- android:pathData="M20.45,6.55C20.07,6.17 19.44,6.17 19.06,6.55L16.89,8.7C16.5,9.08 16.5,9.71 16.89,10.09L16.9,10.1C17.29,10.49 17.91,10.49 18.3,10.1C18.92,9.47 19.82,8.56 20.45,7.93C20.83,7.55 20.83,6.93 20.45,6.55Z"- android:fillColor="#201A1B"/>- <path- android:pathData="M12.02,3H11.99C11.44,3 11,3.44 11,3.98V7.01C11,7.56 11.44,8 11.98,8H12.01C12.56,8 13,7.56 13,7.02V3.98C13,3.44 12.56,3 12.02,3Z"- android:fillColor="#201A1B"/>- <path- android:pathData="M7.1,10.11L7.11,10.1C7.49,9.72 7.49,9.09 7.11,8.71L4.96,6.54C4.58,6.15 3.95,6.15 3.57,6.54L3.55,6.55C3.16,6.94 3.16,7.56 3.55,7.94C4.18,8.56 5.08,9.48 5.7,10.11C6.09,10.49 6.72,10.49 7.1,10.11Z"- android:fillColor="#201A1B"/>- <path- android:pathData="M9.24,13.17C9.69,14.25 10.76,15 12,15C13.24,15 14.31,14.25 14.76,13.17C15.08,12.43 15.86,12 16.66,12H20C21.1,12 22,12.9 22,14V19C22,20.1 21.1,21 20,21H4C2.9,21 2,20.1 2,19V14C2,12.9 2.9,12 4,12H7.34C8.14,12 8.92,12.43 9.24,13.17ZM20,14H16.58C15.81,15.76 14.04,17 12,17C9.96,17 8.19,15.76 7.42,14H4V19H20V14Z"- android:fillColor="#201A1B"- android:fillType="evenOdd"/>-</vector>diff --git a/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.ktindex 46521a320..009fb1249 100644--- a/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt+++ b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt@@ -183,13 +183,13 @@ fun BookmarkButton(modifier = modifier,icon = {Icon(- painter = painterResource(NiaIcons.BookmarkBorder),+ imageVector = NiaIcons.BookmarkBorder,contentDescription = stringResource(R.string.bookmark),)},checkedIcon = {Icon(- painter = painterResource(NiaIcons.Bookmark),+ imageVector = NiaIcons.Bookmark,contentDescription = stringResource(R.string.unbookmark),)},