Skip to content

Commit c62673d

Browse files
authored
Merge pull request #179 from Abhimanyu14/niaicons
Icons alignment to use NiaIcons
2 parents 3ca68d4 + d69a37a commit c62673d

File tree

3 files changed

+10
-11
lines changed
  • core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component
  • feature
    • author/src/main/java/com/google/samples/apps/nowinandroid/feature/author
    • topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic

3 files changed

+10
-11
lines changed

core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/TopAppBar.kt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
package com.google.samples.apps.nowinandroid.core.designsystem.component
1818

1919
import androidx.annotation.StringRes
20-
import androidx.compose.material.icons.Icons
21-
import androidx.compose.material.icons.filled.MoreVert
22-
import androidx.compose.material.icons.filled.Search
2320
import androidx.compose.material3.CenterAlignedTopAppBar
2421
import androidx.compose.material3.ExperimentalMaterial3Api
2522
import androidx.compose.material3.Icon
@@ -33,6 +30,7 @@ import androidx.compose.ui.Modifier
3330
import androidx.compose.ui.graphics.vector.ImageVector
3431
import androidx.compose.ui.res.stringResource
3532
import androidx.compose.ui.tooling.preview.Preview
33+
import com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons
3634

3735
@OptIn(ExperimentalMaterial3Api::class)
3836
@Composable
@@ -107,9 +105,9 @@ fun NiaTopAppBar(
107105
fun NiaTopAppBarPreview() {
108106
NiaTopAppBar(
109107
titleRes = android.R.string.untitled,
110-
navigationIcon = Icons.Default.Search,
108+
navigationIcon = NiaIcons.Search,
111109
navigationIconContentDescription = "Navigation icon",
112-
actionIcon = Icons.Default.MoreVert,
110+
actionIcon = NiaIcons.MoreVert,
113111
actionIconContentDescription = "Action icon"
114112
)
115113
}

feature/author/src/main/java/com/google/samples/apps/nowinandroid/feature/author/AuthorScreen.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ import androidx.compose.foundation.lazy.LazyColumn
3232
import androidx.compose.foundation.lazy.LazyListScope
3333
import androidx.compose.foundation.lazy.rememberLazyListState
3434
import androidx.compose.foundation.shape.CircleShape
35-
import androidx.compose.material.icons.Icons.Filled
36-
import androidx.compose.material.icons.filled.ArrowBack
3735
import androidx.compose.material3.Icon
3836
import androidx.compose.material3.IconButton
3937
import androidx.compose.material3.MaterialTheme
@@ -53,6 +51,7 @@ import coil.compose.AsyncImage
5351
import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaBackground
5452
import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaFilterChip
5553
import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaLoadingWheel
54+
import com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons
5655
import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme
5756
import com.google.samples.apps.nowinandroid.core.domain.model.FollowableAuthor
5857
import com.google.samples.apps.nowinandroid.core.domain.model.SaveableNewsResource
@@ -213,7 +212,7 @@ private fun AuthorToolbar(
213212
) {
214213
IconButton(onClick = { onBackClick() }) {
215214
Icon(
216-
imageVector = Filled.ArrowBack,
215+
imageVector = NiaIcons.ArrowBack,
217216
contentDescription = stringResource(
218217
id = com.google.samples.apps.nowinandroid.core.ui.R.string.back
219218
)

feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ import androidx.compose.foundation.layout.windowInsetsTopHeight
3131
import androidx.compose.foundation.lazy.LazyColumn
3232
import androidx.compose.foundation.lazy.LazyListScope
3333
import androidx.compose.foundation.lazy.rememberLazyListState
34-
import androidx.compose.material.icons.Icons.Filled
35-
import androidx.compose.material.icons.filled.ArrowBack
3634
import androidx.compose.material3.Icon
3735
import androidx.compose.material3.IconButton
3836
import androidx.compose.material3.MaterialTheme
@@ -51,6 +49,7 @@ import coil.compose.AsyncImage
5149
import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaBackground
5250
import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaFilterChip
5351
import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaLoadingWheel
52+
import com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons
5453
import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme
5554
import com.google.samples.apps.nowinandroid.core.domain.model.FollowableTopic
5655
import com.google.samples.apps.nowinandroid.core.domain.model.SaveableNewsResource
@@ -109,6 +108,7 @@ internal fun TopicScreen(
109108
contentDesc = stringResource(id = string.topic_loading),
110109
)
111110
}
111+
112112
TopicUiState.Error -> TODO()
113113
is TopicUiState.Success -> {
114114
item {
@@ -186,9 +186,11 @@ private fun LazyListScope.TopicCards(
186186
itemModifier = Modifier.padding(24.dp)
187187
)
188188
}
189+
189190
is NewsUiState.Loading -> item {
190191
NiaLoadingWheel(contentDesc = "Loading news") // TODO
191192
}
193+
192194
else -> item {
193195
Text("Error") // TODO
194196
}
@@ -224,7 +226,7 @@ private fun TopicToolbar(
224226
) {
225227
IconButton(onClick = { onBackClick() }) {
226228
Icon(
227-
imageVector = Filled.ArrowBack,
229+
imageVector = NiaIcons.ArrowBack,
228230
contentDescription = stringResource(
229231
id = com.google.samples.apps.nowinandroid.core.ui.R.string.back
230232
)

0 commit comments

Comments
 (0)