From 5e4963a48d6ff4add20ed46988639e118a76343e Mon Sep 17 00:00:00 2001 From: Abhimanyu14 Date: Sat, 16 Jul 2022 22:34:21 +0530 Subject: [PATCH] Icons alignment to use NiaIcons --- .../nowinandroid/core/designsystem/component/TopAppBar.kt | 8 +++----- .../apps/nowinandroid/feature/author/AuthorScreen.kt | 5 ++--- .../apps/nowinandroid/feature/topic/TopicScreen.kt | 8 +++++--- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/TopAppBar.kt b/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/TopAppBar.kt index c3290035a..2175a1684 100644 --- a/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/TopAppBar.kt +++ b/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/TopAppBar.kt @@ -17,9 +17,6 @@ package com.google.samples.apps.nowinandroid.core.designsystem.component import androidx.annotation.StringRes -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.MoreVert -import androidx.compose.material.icons.filled.Search import androidx.compose.material3.CenterAlignedTopAppBar import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon @@ -33,6 +30,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview +import com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons @OptIn(ExperimentalMaterial3Api::class) @Composable @@ -107,9 +105,9 @@ fun NiaTopAppBar( fun NiaTopAppBarPreview() { NiaTopAppBar( titleRes = android.R.string.untitled, - navigationIcon = Icons.Default.Search, + navigationIcon = NiaIcons.Search, navigationIconContentDescription = "Navigation icon", - actionIcon = Icons.Default.MoreVert, + actionIcon = NiaIcons.MoreVert, actionIconContentDescription = "Action icon" ) } diff --git a/feature/author/src/main/java/com/google/samples/apps/nowinandroid/feature/author/AuthorScreen.kt b/feature/author/src/main/java/com/google/samples/apps/nowinandroid/feature/author/AuthorScreen.kt index 114b4c438..8f92a07d4 100644 --- a/feature/author/src/main/java/com/google/samples/apps/nowinandroid/feature/author/AuthorScreen.kt +++ b/feature/author/src/main/java/com/google/samples/apps/nowinandroid/feature/author/AuthorScreen.kt @@ -32,8 +32,6 @@ import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyListScope import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.foundation.shape.CircleShape -import androidx.compose.material.icons.Icons.Filled -import androidx.compose.material.icons.filled.ArrowBack import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme @@ -53,6 +51,7 @@ import coil.compose.AsyncImage import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaBackground import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaFilterChip import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaLoadingWheel +import com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme import com.google.samples.apps.nowinandroid.core.domain.model.FollowableAuthor import com.google.samples.apps.nowinandroid.core.domain.model.SaveableNewsResource @@ -213,7 +212,7 @@ private fun AuthorToolbar( ) { IconButton(onClick = { onBackClick() }) { Icon( - imageVector = Filled.ArrowBack, + imageVector = NiaIcons.ArrowBack, contentDescription = stringResource( id = com.google.samples.apps.nowinandroid.core.ui.R.string.back ) diff --git a/feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt b/feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt index 58c572ade..45f3bf0b1 100644 --- a/feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt +++ b/feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt @@ -31,8 +31,6 @@ import androidx.compose.foundation.layout.windowInsetsTopHeight import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyListScope import androidx.compose.foundation.lazy.rememberLazyListState -import androidx.compose.material.icons.Icons.Filled -import androidx.compose.material.icons.filled.ArrowBack import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme @@ -51,6 +49,7 @@ import coil.compose.AsyncImage import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaBackground import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaFilterChip import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaLoadingWheel +import com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme import com.google.samples.apps.nowinandroid.core.domain.model.FollowableTopic import com.google.samples.apps.nowinandroid.core.domain.model.SaveableNewsResource @@ -109,6 +108,7 @@ internal fun TopicScreen( contentDesc = stringResource(id = string.topic_loading), ) } + TopicUiState.Error -> TODO() is TopicUiState.Success -> { item { @@ -186,9 +186,11 @@ private fun LazyListScope.TopicCards( itemModifier = Modifier.padding(24.dp) ) } + is NewsUiState.Loading -> item { NiaLoadingWheel(contentDesc = "Loading news") // TODO } + else -> item { Text("Error") // TODO } @@ -224,7 +226,7 @@ private fun TopicToolbar( ) { IconButton(onClick = { onBackClick() }) { Icon( - imageVector = Filled.ArrowBack, + imageVector = NiaIcons.ArrowBack, contentDescription = stringResource( id = com.google.samples.apps.nowinandroid.core.ui.R.string.back )