From ee6bcc864f30d70dc5b7914e4fc5ba1e9839995e Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Wed, 7 Jun 2023 16:24:02 +0530 Subject: [PATCH] feat: update iconography for consistency --- .../kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt | 8 ++++---- .../claw/android/ui/datatransfer/DataTransferScreen.kt | 8 ++++---- .../dev/msfjarvis/claw/android/ui/lists/DatabasePosts.kt | 4 ++-- .../dev/msfjarvis/claw/common/posts/LobstersCard.kt | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt index 71b640c9..2db43202 100644 --- a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt +++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt @@ -14,12 +14,12 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.ArrowBack import androidx.compose.material.icons.filled.Favorite +import androidx.compose.material.icons.filled.ImportExport import androidx.compose.material.icons.filled.NewReleases import androidx.compose.material.icons.filled.Whatshot import androidx.compose.material.icons.outlined.FavoriteBorder -import androidx.compose.material.icons.outlined.ImportExport -import androidx.compose.material.icons.outlined.NavigateBefore import androidx.compose.material.icons.outlined.NewReleases import androidx.compose.material.icons.outlined.Whatshot import androidx.compose.material3.Icon @@ -146,7 +146,7 @@ fun LobstersApp( onClick = { if (!navController.popBackStack()) context.getActivity()?.finish() } ) { Icon( - imageVector = Icons.Outlined.NavigateBefore, + imageVector = Icons.Filled.ArrowBack, contentDescription = "Go back to previous screen", ) } @@ -161,7 +161,7 @@ fun LobstersApp( if (navItems.any { it.route == currentDestination }) { IconButton(onClick = { navController.navigate(Destinations.DataTransfer.route) }) { Icon( - imageVector = Icons.Outlined.ImportExport, + imageVector = Icons.Filled.ImportExport, contentDescription = "Data transfer options" ) } diff --git a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/datatransfer/DataTransferScreen.kt b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/datatransfer/DataTransferScreen.kt index 56320f58..50af2d3e 100644 --- a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/datatransfer/DataTransferScreen.kt +++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/datatransfer/DataTransferScreen.kt @@ -14,8 +14,8 @@ import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.height import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.NorthEast -import androidx.compose.material.icons.outlined.SouthWest +import androidx.compose.material.icons.filled.Download +import androidx.compose.material.icons.filled.Upload import androidx.compose.material3.Icon import androidx.compose.material3.ListItem import androidx.compose.material3.SnackbarHostState @@ -68,7 +68,7 @@ private fun ImportOption( SettingsActionItem( title = "Import saved posts", description = "Import saved posts from a previously generated export", - icon = Icons.Outlined.SouthWest, + icon = Icons.Filled.Download, ) { importAction.launch(MIME_TYPE) } @@ -97,7 +97,7 @@ private fun ExportOption( SettingsActionItem( title = "Export posts to file", description = "Write all saved posts into a JSON file that can be imported at a later date", - icon = Icons.Outlined.NorthEast, + icon = Icons.Filled.Upload, ) { exportAction.launch("claw-export.json") } diff --git a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/lists/DatabasePosts.kt b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/lists/DatabasePosts.kt index d9eec7b7..818fc3bc 100644 --- a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/lists/DatabasePosts.kt +++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/lists/DatabasePosts.kt @@ -16,7 +16,7 @@ import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyListState import androidx.compose.foundation.lazy.items import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.Inbox +import androidx.compose.material.icons.filled.Inbox import androidx.compose.material3.Divider import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme @@ -44,7 +44,7 @@ fun DatabasePosts( if (items.isEmpty()) { Column(modifier = Modifier.align(Alignment.Center)) { Icon( - imageVector = Icons.Outlined.Inbox, + imageVector = Icons.Filled.Inbox, contentDescription = "Empty inbox icon", modifier = Modifier.align(Alignment.CenterHorizontally).size(36.dp), ) diff --git a/common/src/main/kotlin/dev/msfjarvis/claw/common/posts/LobstersCard.kt b/common/src/main/kotlin/dev/msfjarvis/claw/common/posts/LobstersCard.kt index f09f7a32..93ae4542 100644 --- a/common/src/main/kotlin/dev/msfjarvis/claw/common/posts/LobstersCard.kt +++ b/common/src/main/kotlin/dev/msfjarvis/claw/common/posts/LobstersCard.kt @@ -28,9 +28,9 @@ import androidx.compose.foundation.layout.wrapContentHeight import androidx.compose.foundation.shape.CircleShape import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.AccountCircle +import androidx.compose.material.icons.filled.Comment import androidx.compose.material.icons.filled.Favorite -import androidx.compose.material.icons.outlined.Comment -import androidx.compose.material.icons.outlined.FavoriteBorder +import androidx.compose.material.icons.filled.FavoriteBorder import androidx.compose.material3.Badge import androidx.compose.material3.BadgedBox import androidx.compose.material3.Divider @@ -171,7 +171,7 @@ private fun SaveButton( Crossfade(targetState = isSaved, label = "save-button") { saved -> Box(modifier = modifier.padding(12.dp)) { Icon( - imageVector = if (saved) Icons.Filled.Favorite else Icons.Outlined.FavoriteBorder, + imageVector = if (saved) Icons.Filled.Favorite else Icons.Filled.FavoriteBorder, tint = MaterialTheme.colorScheme.secondary, contentDescription = if (saved) "Remove from saved posts" else "Add to saved posts", modifier = Modifier.align(Alignment.Center).testTag("save_button"), @@ -204,7 +204,7 @@ private fun CommentsButton( }, ) { Icon( - imageVector = Icons.Outlined.Comment, + imageVector = Icons.Filled.Comment, tint = MaterialTheme.colorScheme.secondary, contentDescription = "Open comments", modifier = Modifier.align(Alignment.Center),