diff --git a/android/app/src/main/kotlin/com/gemwallet/android/features/main/views/MainScreen.kt b/android/app/src/main/kotlin/com/gemwallet/android/features/main/views/MainScreen.kt
index 0ced1ef2ea..394c175135 100644
--- a/android/app/src/main/kotlin/com/gemwallet/android/features/main/views/MainScreen.kt
+++ b/android/app/src/main/kotlin/com/gemwallet/android/features/main/views/MainScreen.kt
@@ -10,11 +10,6 @@ import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.grid.rememberLazyGridState
import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.foundation.rememberScrollState
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ElectricBolt
-import androidx.compose.material.icons.filled.EmojiEvents
-import androidx.compose.material.icons.filled.Settings
-import androidx.compose.material.icons.filled.Wallet
import androidx.compose.material3.Badge
import androidx.compose.material3.BadgedBox
import androidx.compose.material3.HorizontalDivider
@@ -49,6 +44,7 @@ import com.gemwallet.android.features.nft.presents.NftListNavScreen
import com.gemwallet.android.features.settings.settings.presents.views.SettingsScene
import com.gemwallet.android.ui.R
import com.gemwallet.android.ui.components.animation.NavigationAnimation
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.navigation.WalletNavigator
import com.gemwallet.android.ui.navigation.WalletRootRoute
import com.gemwallet.android.ui.navigation.routes.assetsRoute
@@ -90,53 +86,39 @@ fun MainScreen(
}
}
- val walletLabel = stringResource(R.string.common_wallet)
- val collectionsLabel = stringResource(R.string.nft_collections)
- val activitiesLabel = stringResource(R.string.activity_title)
- val settingsLabel = stringResource(R.string.settings_title)
-
LaunchedEffect(collectionsAvailable, currentTab.value) {
if (!collectionsAvailable && currentTab.value == nftRoute) {
currentTab.value = assetsRoute
}
}
- val navItems = remember(
- pendingCount,
- collectionsAvailable,
- walletLabel,
- collectionsLabel,
- activitiesLabel,
- settingsLabel,
- ) {
- listOfNotNull(
- BottomNavItem(
- label = walletLabel,
- icon = Icons.Default.Wallet,
- route = assetsRoute,
- testTag = "mainTab",
- ),
- if (collectionsAvailable) BottomNavItem(
- label = collectionsLabel,
- icon = Icons.Default.EmojiEvents,
- route = nftRoute,
- testTag = "nftTab",
- ) else null,
- BottomNavItem(
- label = activitiesLabel,
- icon = Icons.Default.ElectricBolt,
- route = transactionsRoute,
- badge = pendingCount,
- testTag = "activitiesTab",
- ),
- BottomNavItem(
- label = settingsLabel,
- icon = Icons.Default.Settings,
- route = settingsRoute,
- testTag = "settingsTab",
- ),
- )
- }
+ val navItems = listOfNotNull(
+ BottomNavItem(
+ label = stringResource(R.string.common_wallet),
+ icon = AppIcons.Wallet,
+ route = assetsRoute,
+ testTag = "mainTab",
+ ),
+ if (collectionsAvailable) BottomNavItem(
+ label = stringResource(R.string.nft_collections),
+ icon = AppIcons.EmojiEvents,
+ route = nftRoute,
+ testTag = "nftTab",
+ ) else null,
+ BottomNavItem(
+ label = stringResource(R.string.activity_title),
+ icon = AppIcons.ElectricBolt,
+ route = transactionsRoute,
+ badge = pendingCount,
+ testTag = "activitiesTab",
+ ),
+ BottomNavItem(
+ label = stringResource(R.string.settings_title),
+ icon = AppIcons.Settings,
+ route = settingsRoute,
+ testTag = "settingsTab",
+ ),
+ )
Scaffold(
containerColor = MaterialTheme.colorScheme.surface,
bottomBar = {
diff --git a/android/app/src/main/kotlin/com/gemwallet/android/features/onboarding/AcceptTermsScreen.kt b/android/app/src/main/kotlin/com/gemwallet/android/features/onboarding/AcceptTermsScreen.kt
index c1c0b90e07..fe8f453f07 100644
--- a/android/app/src/main/kotlin/com/gemwallet/android/features/onboarding/AcceptTermsScreen.kt
+++ b/android/app/src/main/kotlin/com/gemwallet/android/features/onboarding/AcceptTermsScreen.kt
@@ -11,8 +11,6 @@ import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.LazyListScope
import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Info
import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults
import androidx.compose.material3.Icon
@@ -38,6 +36,7 @@ import com.gemwallet.android.ui.R
import com.gemwallet.android.ui.components.buttons.MainActionButton
import com.gemwallet.android.ui.components.list_item.SelectionIndicator
import com.gemwallet.android.ui.components.screen.Scene
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.models.actions.CancelAction
import com.gemwallet.android.ui.open
import com.gemwallet.android.ui.theme.Spacer16
@@ -74,7 +73,7 @@ fun AcceptTermsScreen(
uriHandler.open(context, AppUrl.page(PublicUrl.TERMS_OF_SERVICE))
}
) {
- Icon(Icons.Outlined.Info, "")
+ Icon(AppIcons.InfoOutlined, "")
}
},
) {
diff --git a/android/app/src/main/kotlin/com/gemwallet/android/features/setup_wallet/views/SetupWalletScreen.kt b/android/app/src/main/kotlin/com/gemwallet/android/features/setup_wallet/views/SetupWalletScreen.kt
index ba1b52e18a..5e5e2f10e8 100644
--- a/android/app/src/main/kotlin/com/gemwallet/android/features/setup_wallet/views/SetupWalletScreen.kt
+++ b/android/app/src/main/kotlin/com/gemwallet/android/features/setup_wallet/views/SetupWalletScreen.kt
@@ -6,8 +6,6 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Check
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.runtime.Composable
@@ -24,6 +22,7 @@ import com.gemwallet.android.ui.components.image.IconWithBadge
import com.gemwallet.android.ui.components.list_item.supportIcon
import com.gemwallet.android.ui.components.list_item.walletItemIconModel
import com.gemwallet.android.ui.components.screen.Scene
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.theme.extraLargeIconSize
import com.gemwallet.android.ui.theme.paddingDefault
import com.gemwallet.android.ui.theme.paddingLarge
@@ -48,7 +47,7 @@ fun SetupWalletScreen(
backHandle = true,
actions = {
IconButton(onClick = handleDone) {
- Icon(imageVector = Icons.Default.Check, contentDescription = "")
+ Icon(imageVector = AppIcons.Check, contentDescription = "")
}
},
mainAction = {
diff --git a/android/features/activities/presents/src/main/kotlin/com/gemwallet/android/features/activities/presents/details/TransactionDetailsScene.kt b/android/features/activities/presents/src/main/kotlin/com/gemwallet/android/features/activities/presents/details/TransactionDetailsScene.kt
index 7c948fd5dd..53dd8c9fa5 100644
--- a/android/features/activities/presents/src/main/kotlin/com/gemwallet/android/features/activities/presents/details/TransactionDetailsScene.kt
+++ b/android/features/activities/presents/src/main/kotlin/com/gemwallet/android/features/activities/presents/details/TransactionDetailsScene.kt
@@ -3,8 +3,6 @@ package com.gemwallet.android.features.activities.presents.details
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Share
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.runtime.Composable
@@ -30,6 +28,7 @@ import com.gemwallet.android.ui.components.list_item.color
import com.gemwallet.android.ui.components.list_item.property.itemsPositioned
import com.gemwallet.android.ui.components.list_item.transaction.getTitle
import com.gemwallet.android.ui.components.screen.Scene
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.theme.padding16
import com.gemwallet.android.ui.theme.paddingSmall
import com.wallet.core.primitives.Asset
@@ -45,7 +44,7 @@ internal fun TransactionDetailsScene(
title = data.getTitle(),
actions = {
IconButton(onClick = { onAction(TransactionDetailsAction.Share) }) {
- Icon(Icons.Default.Share, "")
+ Icon(AppIcons.Share, "")
}
},
onClose = { onAction(TransactionDetailsAction.Close) },
diff --git a/android/features/activities/presents/src/main/kotlin/com/gemwallet/android/features/activities/presents/details/components/SwapProgressItem.kt b/android/features/activities/presents/src/main/kotlin/com/gemwallet/android/features/activities/presents/details/components/SwapProgressItem.kt
index aae1eb6541..63af897643 100644
--- a/android/features/activities/presents/src/main/kotlin/com/gemwallet/android/features/activities/presents/details/components/SwapProgressItem.kt
+++ b/android/features/activities/presents/src/main/kotlin/com/gemwallet/android/features/activities/presents/details/components/SwapProgressItem.kt
@@ -14,9 +14,6 @@ import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Check
-import androidx.compose.material.icons.filled.Close
import androidx.compose.material3.DividerDefaults
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
@@ -37,6 +34,7 @@ import com.gemwallet.android.ui.R
import com.gemwallet.android.ui.components.list_item.ListItemDefaults
import com.gemwallet.android.ui.components.list_item.listItem
import com.gemwallet.android.ui.components.progress.CircularProgressIndicator16
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.models.ListPosition
import com.gemwallet.android.ui.theme.alpha10
import com.gemwallet.android.ui.theme.compactIconSize
@@ -182,7 +180,7 @@ private fun ProgressMarker(status: SwapProgressStatus) {
when (status) {
SwapProgressStatus.Completed -> Icon(
modifier = Modifier.size(compactIconSize),
- imageVector = Icons.Default.Check,
+ imageVector = AppIcons.Check,
contentDescription = null,
tint = color,
)
@@ -203,7 +201,7 @@ private fun ProgressMarker(status: SwapProgressStatus) {
SwapProgressStatus.Reverted,
SwapProgressStatus.Refunded -> Icon(
modifier = Modifier.size(compactIconSize),
- imageVector = Icons.Default.Close,
+ imageVector = AppIcons.Close,
contentDescription = null,
tint = color,
)
diff --git a/android/features/activities/presents/src/main/kotlin/com/gemwallet/android/features/activities/presents/details/components/TransactionRateProperty.kt b/android/features/activities/presents/src/main/kotlin/com/gemwallet/android/features/activities/presents/details/components/TransactionRateProperty.kt
index 62e3fc462c..c071aee707 100644
--- a/android/features/activities/presents/src/main/kotlin/com/gemwallet/android/features/activities/presents/details/components/TransactionRateProperty.kt
+++ b/android/features/activities/presents/src/main/kotlin/com/gemwallet/android/features/activities/presents/details/components/TransactionRateProperty.kt
@@ -1,8 +1,6 @@
package com.gemwallet.android.features.activities.presents.details.components
import androidx.compose.foundation.clickable
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.SwapVert
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
@@ -17,6 +15,7 @@ import com.gemwallet.android.ui.R
import com.gemwallet.android.ui.components.list_item.property.PropertyDataText
import com.gemwallet.android.ui.components.list_item.property.PropertyItem
import com.gemwallet.android.ui.components.list_item.property.PropertyTitleText
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.models.ListPosition
import com.gemwallet.android.ui.theme.Spacer4
@@ -38,7 +37,7 @@ internal fun TransactionRateProperty(
Spacer4()
Icon(
modifier = Modifier.clip(MaterialTheme.shapes.small),
- imageVector = Icons.Default.SwapVert,
+ imageVector = AppIcons.SwapVert,
contentDescription = null,
tint = MaterialTheme.colorScheme.secondary,
)
diff --git a/android/features/activities/presents/src/main/kotlin/com/gemwallet/android/features/activities/presents/list/TransactionsScene.kt b/android/features/activities/presents/src/main/kotlin/com/gemwallet/android/features/activities/presents/list/TransactionsScene.kt
index 5c71a1d0b5..1b138d014b 100644
--- a/android/features/activities/presents/src/main/kotlin/com/gemwallet/android/features/activities/presents/list/TransactionsScene.kt
+++ b/android/features/activities/presents/src/main/kotlin/com/gemwallet/android/features/activities/presents/list/TransactionsScene.kt
@@ -5,8 +5,6 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.LazyListState
import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.FilterAlt
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
@@ -31,6 +29,7 @@ import com.gemwallet.android.ui.components.empty.EmptyContentView
import com.gemwallet.android.ui.components.filters.TransactionsFilter
import com.gemwallet.android.ui.components.list_item.transaction.transactionsList
import com.gemwallet.android.ui.components.screen.Scene
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.models.TransactionTypeFilter
import com.wallet.core.primitives.Chain
@@ -55,7 +54,7 @@ internal fun TransactionsScene(
actions = {
IconButton(onClick = { showFilters = !showFilters }) {
Icon(
- imageVector = Icons.Default.FilterAlt,
+ imageVector = AppIcons.FilterAlt,
tint = if (chainsFilter.isEmpty() && typeFilter.isEmpty())
LocalContentColor.current
else
diff --git a/android/features/add_asset/presents/src/main/kotlin/com/gemwallet/android/features/add_asset/views/AddAssetScene.kt b/android/features/add_asset/presents/src/main/kotlin/com/gemwallet/android/features/add_asset/views/AddAssetScene.kt
index 83c58e2a8d..1dc6a7b13d 100644
--- a/android/features/add_asset/presents/src/main/kotlin/com/gemwallet/android/features/add_asset/views/AddAssetScene.kt
+++ b/android/features/add_asset/presents/src/main/kotlin/com/gemwallet/android/features/add_asset/views/AddAssetScene.kt
@@ -9,8 +9,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Info
import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults
import androidx.compose.material3.Icon
@@ -30,6 +28,7 @@ import androidx.compose.ui.unit.sp
import com.gemwallet.android.AppUrl
import com.gemwallet.android.domains.asset.chain
import com.gemwallet.android.ui.R
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.open
import com.gemwallet.android.ui.components.buttons.MainActionButton
import com.gemwallet.android.ui.components.list_item.ChainItem
@@ -73,7 +72,7 @@ fun AddAssetScene(
title = stringResource(id = R.string.wallet_add_token_title),
actions = {
IconButton(onClick = { uriHandler.open(context, AppUrl.docs(DocsUrl.AddCustomToken)) }) {
- Icon(Icons.Outlined.Info, "")
+ Icon(AppIcons.InfoOutlined, "")
}
},
mainAction = {
@@ -167,7 +166,7 @@ fun AddAssetScene(
)
Spacer4()
Icon(
- Icons.Outlined.Info, "",
+ AppIcons.InfoOutlined, "",
modifier = Modifier.size(compactIconSize),
tint = MaterialTheme.colorScheme.secondary,
)
diff --git a/android/features/asset/presents/src/main/kotlin/com/gemwallet/android/features/asset/presents/details/components/AssetDetailsMenu.kt b/android/features/asset/presents/src/main/kotlin/com/gemwallet/android/features/asset/presents/details/components/AssetDetailsMenu.kt
index 0c0c89b4e8..086f9f40e6 100644
--- a/android/features/asset/presents/src/main/kotlin/com/gemwallet/android/features/asset/presents/details/components/AssetDetailsMenu.kt
+++ b/android/features/asset/presents/src/main/kotlin/com/gemwallet/android/features/asset/presents/details/components/AssetDetailsMenu.kt
@@ -2,10 +2,6 @@ package com.gemwallet.android.features.asset.presents.details.components
import android.content.Intent
import androidx.compose.foundation.layout.RowScope
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.MoreVert
-import androidx.compose.material.icons.filled.Notifications
-import androidx.compose.material.icons.filled.NotificationsNone
import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.Icon
@@ -23,6 +19,7 @@ import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalUriHandler
import androidx.compose.ui.res.stringResource
import com.gemwallet.android.ui.R
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.open
import com.gemwallet.android.features.asset.viewmodels.details.models.AssetInfoUIModel
import com.gemwallet.android.ext.toIdentifier
@@ -68,14 +65,14 @@ fun RowScope.AssetDetailsMenu(
}
) {
if (priceAlertEnabled) {
- Icon(Icons.Default.Notifications, "")
+ Icon(AppIcons.Notifications, "")
} else {
- Icon(Icons.Default.NotificationsNone, "")
+ Icon(AppIcons.NotificationsOutlined, "")
}
}
IconButton(onClick = { menuExpanded = !menuExpanded }) {
Icon(
- imageVector = Icons.Filled.MoreVert,
+ imageVector = AppIcons.MoreVert,
contentDescription = "More",
)
}
diff --git a/android/features/asset/presents/src/main/kotlin/com/gemwallet/android/features/asset/presents/details/components/ManageAssetItem.kt b/android/features/asset/presents/src/main/kotlin/com/gemwallet/android/features/asset/presents/details/components/ManageAssetItem.kt
index c387179f74..dd18e06491 100644
--- a/android/features/asset/presents/src/main/kotlin/com/gemwallet/android/features/asset/presents/details/components/ManageAssetItem.kt
+++ b/android/features/asset/presents/src/main/kotlin/com/gemwallet/android/features/asset/presents/details/components/ManageAssetItem.kt
@@ -2,9 +2,6 @@ package com.gemwallet.android.features.asset.presents.details.components
import androidx.compose.foundation.clickable
import androidx.compose.foundation.lazy.LazyListScope
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.AddCircleOutline
-import androidx.compose.material.icons.filled.PushPin
import androidx.compose.material3.Icon
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
@@ -14,6 +11,7 @@ import com.gemwallet.android.ui.components.list_item.property.DataBadgeChevron
import com.gemwallet.android.ui.components.list_item.property.PropertyDataText
import com.gemwallet.android.ui.components.list_item.property.PropertyItem
import com.gemwallet.android.ui.components.list_item.property.PropertyTitleText
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.models.ListPosition
fun LazyListScope.manageAssetItem(
@@ -31,7 +29,7 @@ fun LazyListScope.manageAssetItem(
title = {
PropertyTitleText(
R.string.common_pin,
- trailing = { Icon(Icons.Default.PushPin, stringResource(R.string.common_pin)) }
+ trailing = { Icon(AppIcons.PushPin, stringResource(R.string.common_pin)) }
)
},
data = {
@@ -50,7 +48,7 @@ fun LazyListScope.manageAssetItem(
PropertyTitleText(
R.string.asset_add_to_wallet,
trailing = {
- Icon(Icons.Default.AddCircleOutline, stringResource(R.string.asset_add_to_wallet))
+ Icon(AppIcons.AddCircleOutlined, stringResource(R.string.asset_add_to_wallet))
}
)
},
diff --git a/android/features/asset_select/presents/src/main/kotlin/com/gemwallet/android/features/asset_select/presents/views/AssetSelectScene.kt b/android/features/asset_select/presents/src/main/kotlin/com/gemwallet/android/features/asset_select/presents/views/AssetSelectScene.kt
index 9158aab017..ff5d708faa 100644
--- a/android/features/asset_select/presents/src/main/kotlin/com/gemwallet/android/features/asset_select/presents/views/AssetSelectScene.kt
+++ b/android/features/asset_select/presents/src/main/kotlin/com/gemwallet/android/features/asset_select/presents/views/AssetSelectScene.kt
@@ -17,8 +17,6 @@ import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.text.input.TextFieldState
import androidx.compose.foundation.text.input.rememberTextFieldState
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.FilterAlt
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.LocalContentColor
@@ -59,6 +57,7 @@ import com.gemwallet.android.ui.components.empty.EmptyContentType
import com.gemwallet.android.ui.components.empty.EmptyContentView
import com.gemwallet.android.ui.components.progress.CircularProgressIndicator16
import com.gemwallet.android.ui.components.screen.Scene
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.models.AssetsGroupType
import com.gemwallet.android.ui.models.ListPosition
import com.gemwallet.android.ui.theme.defaultPadding
@@ -203,7 +202,7 @@ fun AssetSelectScene(
if (availableChains.isNotEmpty()) {
IconButton(onClick = { showSelectNetworks = !showSelectNetworks }) {
Icon(
- imageVector = Icons.Default.FilterAlt,
+ imageVector = AppIcons.FilterAlt,
tint = if (chainsFilter.isEmpty() && !balanceFilter)
LocalContentColor.current
else
diff --git a/android/features/asset_select/presents/src/main/kotlin/com/gemwallet/android/features/asset_select/presents/views/AssetsManageScreen.kt b/android/features/asset_select/presents/src/main/kotlin/com/gemwallet/android/features/asset_select/presents/views/AssetsManageScreen.kt
index 512e32a370..8a49976712 100644
--- a/android/features/asset_select/presents/src/main/kotlin/com/gemwallet/android/features/asset_select/presents/views/AssetsManageScreen.kt
+++ b/android/features/asset_select/presents/src/main/kotlin/com/gemwallet/android/features/asset_select/presents/views/AssetsManageScreen.kt
@@ -1,7 +1,5 @@
package com.gemwallet.android.features.asset_select.presents.views
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Add
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.Switch
@@ -18,6 +16,7 @@ import com.gemwallet.android.ui.R
import com.gemwallet.android.ui.components.list_item.AssetContextActions
import com.gemwallet.android.ui.components.list_item.AssetItemUIModel
import com.gemwallet.android.ui.components.list_item.ListItemSupportText
+import com.gemwallet.android.ui.icons.AppIcons
import com.wallet.core.primitives.Asset
import com.gemwallet.android.features.asset_select.viewmodels.AssetSelectViewModel
import com.wallet.core.primitives.AssetId
@@ -77,7 +76,7 @@ fun AssetsManageScreen(
actions = {
if (isAddAssetAvailable) {
IconButton(onClick = onAddAsset) {
- Icon(imageVector = Icons.Default.Add, contentDescription = "")
+ Icon(imageVector = AppIcons.Add, contentDescription = "")
}
}
},
diff --git a/android/features/asset_select/presents/src/main/kotlin/com/gemwallet/android/features/asset_select/presents/views/RecentsBottomSheet.kt b/android/features/asset_select/presents/src/main/kotlin/com/gemwallet/android/features/asset_select/presents/views/RecentsBottomSheet.kt
index d40156398a..1610783505 100644
--- a/android/features/asset_select/presents/src/main/kotlin/com/gemwallet/android/features/asset_select/presents/views/RecentsBottomSheet.kt
+++ b/android/features/asset_select/presents/src/main/kotlin/com/gemwallet/android/features/asset_select/presents/views/RecentsBottomSheet.kt
@@ -9,8 +9,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.text.input.TextFieldState
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Close
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
@@ -30,6 +28,7 @@ import com.gemwallet.android.ui.components.SearchBar
import com.gemwallet.android.ui.components.list_item.AssetListItem
import com.gemwallet.android.ui.components.list_item.dateGroupedList
import com.gemwallet.android.ui.components.screen.ModalBottomSheet
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.theme.paddingDefault
import com.wallet.core.primitives.AssetId
@@ -63,7 +62,7 @@ fun RecentsBottomSheet(
modifier = Modifier.align(Alignment.CenterStart),
) {
Icon(
- imageVector = Icons.Default.Close,
+ imageVector = AppIcons.Close,
contentDescription = null,
)
}
diff --git a/android/features/asset_select/presents/src/main/kotlin/com/gemwallet/android/features/asset_select/presents/views/SelectReceiveScreen.kt b/android/features/asset_select/presents/src/main/kotlin/com/gemwallet/android/features/asset_select/presents/views/SelectReceiveScreen.kt
index ca1e972543..93f89428a2 100644
--- a/android/features/asset_select/presents/src/main/kotlin/com/gemwallet/android/features/asset_select/presents/views/SelectReceiveScreen.kt
+++ b/android/features/asset_select/presents/src/main/kotlin/com/gemwallet/android/features/asset_select/presents/views/SelectReceiveScreen.kt
@@ -1,7 +1,5 @@
package com.gemwallet.android.features.asset_select.presents.views
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ContentCopy
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.runtime.Composable
@@ -13,6 +11,7 @@ import com.gemwallet.android.model.RecentType
import com.gemwallet.android.ui.R
import com.gemwallet.android.ui.components.clipboard.setPlainText
import com.gemwallet.android.features.asset_select.viewmodels.AssetSelectViewModel
+import com.gemwallet.android.ui.icons.AppIcons
import com.wallet.core.primitives.AssetId
@Composable
@@ -35,7 +34,7 @@ fun SelectReceiveScreen(
clipboardManager.setPlainText(context, viewModel.getAccount(it.asset.id)?.address ?: "")
}
) {
- Icon(imageVector = Icons.Default.ContentCopy, contentDescription = "")
+ Icon(imageVector = AppIcons.ContentCopy, contentDescription = "")
}
},
onCancel = onCancel,
diff --git a/android/features/assets/presents/src/main/kotlin/com/gemwallet/android/features/assets/views/AssetsTopBar.kt b/android/features/assets/presents/src/main/kotlin/com/gemwallet/android/features/assets/views/AssetsTopBar.kt
index b59c6dde8e..bf5b191efe 100644
--- a/android/features/assets/presents/src/main/kotlin/com/gemwallet/android/features/assets/views/AssetsTopBar.kt
+++ b/android/features/assets/presents/src/main/kotlin/com/gemwallet/android/features/assets/views/AssetsTopBar.kt
@@ -3,9 +3,6 @@ package com.gemwallet.android.features.assets.views
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.size
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ExpandMore
-import androidx.compose.material.icons.filled.Search
import androidx.compose.material3.CenterAlignedTopAppBar
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
@@ -21,6 +18,7 @@ import androidx.compose.ui.text.style.TextOverflow
import com.gemwallet.android.domains.wallet.aggregates.WalletSummaryAggregate
import com.gemwallet.android.ui.R
import com.gemwallet.android.ui.components.image.AsyncImage
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.theme.paddingSmall
import com.gemwallet.android.ui.theme.smallIconSize
import com.wallet.core.primitives.WalletType
@@ -57,7 +55,7 @@ internal fun AssetsTopBar(
style = MaterialTheme.typography.titleLarge,
)
Icon(
- imageVector = Icons.Default.ExpandMore,
+ imageVector = AppIcons.ExpandMore,
tint = MaterialTheme.colorScheme.onSurface,
contentDescription = "select_wallet",
)
@@ -70,7 +68,7 @@ internal fun AssetsTopBar(
Modifier.testTag("assetsManageAction")
) {
Icon(
- imageVector = Icons.Default.Search,
+ imageVector = AppIcons.Search,
tint = MaterialTheme.colorScheme.onSurface,
contentDescription = "asset_select",
)
diff --git a/android/features/assets/presents/src/main/kotlin/com/gemwallet/android/features/assets/views/components/AssetsListFooter.kt b/android/features/assets/presents/src/main/kotlin/com/gemwallet/android/features/assets/views/components/AssetsListFooter.kt
index b77107efeb..f2dcf78f9e 100644
--- a/android/features/assets/presents/src/main/kotlin/com/gemwallet/android/features/assets/views/components/AssetsListFooter.kt
+++ b/android/features/assets/presents/src/main/kotlin/com/gemwallet/android/features/assets/views/components/AssetsListFooter.kt
@@ -7,8 +7,6 @@ import androidx.compose.foundation.layout.Spacer
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.filled.Tune
import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
@@ -19,6 +17,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import com.gemwallet.android.ui.R
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.theme.paddingDefault
import com.gemwallet.android.ui.theme.paddingSmall
@@ -39,7 +38,7 @@ internal fun AssetsListFooter(
.padding(16.dp)
) {
Icon(
- imageVector = Icons.Default.Tune,
+ imageVector = AppIcons.Tune,
tint = MaterialTheme.colorScheme.onSurface,
contentDescription = "asset_manager",
)
diff --git a/android/features/banner/presents/src/main/kotlin/com/gemwallet/android/features/banner/views/BannerItemUIModel.kt b/android/features/banner/presents/src/main/kotlin/com/gemwallet/android/features/banner/views/BannerItemUIModel.kt
index c485d8c749..ee04dbc513 100644
--- a/android/features/banner/presents/src/main/kotlin/com/gemwallet/android/features/banner/views/BannerItemUIModel.kt
+++ b/android/features/banner/presents/src/main/kotlin/com/gemwallet/android/features/banner/views/BannerItemUIModel.kt
@@ -1,7 +1,5 @@
package com.gemwallet.android.features.banner.views
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Warning
import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.res.stringResource
@@ -9,6 +7,7 @@ import com.gemwallet.android.domains.asset.chain
import com.gemwallet.android.domains.asset.getIconUrl
import com.gemwallet.android.ext.asset
import com.gemwallet.android.ui.R
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.theme.Emoji
import com.wallet.core.primitives.Asset
import com.wallet.core.primitives.Banner
@@ -70,7 +69,7 @@ internal fun bannerItemUIModel(
}
val icon: BannerIcon = when (banner.event) {
BannerEvent.Stake -> BannerIcon.Emoji(Emoji.moneyBag)
- BannerEvent.AccountBlockedMultiSignature -> BannerIcon.Vector(Icons.Outlined.Warning)
+ BannerEvent.AccountBlockedMultiSignature -> BannerIcon.Vector(AppIcons.Warning)
else -> BannerIcon.Url(
asset?.getIconUrl()
?: "android.resource://com.gemwallet.android/${R.drawable.brandmark}",
diff --git a/android/features/banner/presents/src/main/kotlin/com/gemwallet/android/features/banner/views/BannersScene.kt b/android/features/banner/presents/src/main/kotlin/com/gemwallet/android/features/banner/views/BannersScene.kt
index 0c24d31ad3..22793a55a9 100644
--- a/android/features/banner/presents/src/main/kotlin/com/gemwallet/android/features/banner/views/BannersScene.kt
+++ b/android/features/banner/presents/src/main/kotlin/com/gemwallet/android/features/banner/views/BannersScene.kt
@@ -12,8 +12,6 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.pager.HorizontalPager
import androidx.compose.foundation.pager.rememberPagerState
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Close
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
@@ -32,6 +30,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.gemwallet.android.ext.toIdentifier
import com.gemwallet.android.ui.components.image.IconWithBadge
import com.gemwallet.android.ui.components.list_item.listItem
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.models.ListPosition
import com.gemwallet.android.ui.theme.Spacer16
import com.gemwallet.android.ui.theme.listItemIconSize
@@ -125,7 +124,7 @@ private fun BannerText(
onClick = onCancel,
) {
Icon(
- imageVector = Icons.Default.Close,
+ imageVector = AppIcons.Close,
contentDescription = "cancel_banner",
tint = MaterialTheme.colorScheme.secondary,
)
diff --git a/android/features/banner/presents/src/main/kotlin/com/gemwallet/android/features/banner/views/WelcomeBanner.kt b/android/features/banner/presents/src/main/kotlin/com/gemwallet/android/features/banner/views/WelcomeBanner.kt
index fd7c548d79..5d5d3f177d 100644
--- a/android/features/banner/presents/src/main/kotlin/com/gemwallet/android/features/banner/views/WelcomeBanner.kt
+++ b/android/features/banner/presents/src/main/kotlin/com/gemwallet/android/features/banner/views/WelcomeBanner.kt
@@ -7,9 +7,6 @@ import androidx.compose.foundation.layout.Row
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.filled.Close
-import androidx.compose.material.icons.filled.CurrencyBitcoin
import androidx.compose.material3.Button
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
@@ -23,6 +20,7 @@ import androidx.compose.ui.text.style.TextAlign
import com.gemwallet.android.ui.R
import com.gemwallet.android.ui.components.buttons.secondaryActionButtonColors
import com.gemwallet.android.ui.components.list_item.listItem
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.theme.listItemIconSize
import com.gemwallet.android.ui.theme.paddingDefault
import com.gemwallet.android.ui.theme.paddingSmall
@@ -45,7 +43,7 @@ fun WelcomeBanner(
) {
Icon(
modifier = Modifier.size(listItemIconSize),
- imageVector = Icons.Default.CurrencyBitcoin,
+ imageVector = AppIcons.CurrencyBitcoin,
contentDescription = "",
tint = MaterialTheme.colorScheme.onSurface
)
@@ -85,7 +83,7 @@ fun WelcomeBanner(
onClick = onClose,
) {
Icon(
- imageVector = Icons.Default.Close,
+ imageVector = AppIcons.Close,
contentDescription = null,
)
}
diff --git a/android/features/bridge/presents/src/main/kotlin/com/gemwallet/android/features/bridge/views/ConnectionsScene.kt b/android/features/bridge/presents/src/main/kotlin/com/gemwallet/android/features/bridge/views/ConnectionsScene.kt
index bbd430075c..329454d50f 100644
--- a/android/features/bridge/presents/src/main/kotlin/com/gemwallet/android/features/bridge/views/ConnectionsScene.kt
+++ b/android/features/bridge/presents/src/main/kotlin/com/gemwallet/android/features/bridge/views/ConnectionsScene.kt
@@ -3,10 +3,6 @@ package com.gemwallet.android.features.bridge.views
import androidx.compose.foundation.clickable
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.itemsIndexed
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ContentPaste
-import androidx.compose.material.icons.filled.QrCodeScanner
-import androidx.compose.material.icons.outlined.Info
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Button
import androidx.compose.material3.Icon
@@ -39,6 +35,7 @@ import com.gemwallet.android.ui.components.list_item.ListItem
import com.gemwallet.android.ui.components.list_item.ListItemSupportText
import com.gemwallet.android.ui.components.list_item.ListItemTitleText
import com.gemwallet.android.ui.components.screen.Scene
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.models.ListPosition
import com.gemwallet.android.ui.open
import com.gemwallet.android.features.bridge.viewmodels.ConnectionsViewModel
@@ -71,7 +68,7 @@ fun ConnectionsScene(
snackbar = snackbar,
actions = {
IconButton(onClick = { uriHandler.open(context, AppUrl.docs(DocsUrl.WalletConnect)) }) {
- Icon(imageVector = Icons.Outlined.Info, contentDescription = "WC_INFO")
+ Icon(imageVector = AppIcons.InfoOutlined, contentDescription = "WC_INFO")
}
},
onClose = onCancel,
@@ -88,7 +85,7 @@ fun ConnectionsScene(
},
leading = {
Icon(
- imageVector = Icons.Default.ContentPaste,
+ imageVector = AppIcons.ContentPaste,
contentDescription = "paste_uri",
tint = MaterialTheme.colorScheme.onSurface,
)
@@ -102,7 +99,7 @@ fun ConnectionsScene(
modifier = Modifier.clickable { scannerShowed = true },
leading = {
Icon(
- imageVector = Icons.Default.QrCodeScanner,
+ imageVector = AppIcons.QrCodeScanner,
contentDescription = "scan_qr",
tint = MaterialTheme.colorScheme.onSurface,
)
diff --git a/android/features/bridge/presents/src/main/kotlin/com/gemwallet/android/features/bridge/views/ProposalScene.kt b/android/features/bridge/presents/src/main/kotlin/com/gemwallet/android/features/bridge/views/ProposalScene.kt
index 3efb885615..c814f95e89 100644
--- a/android/features/bridge/presents/src/main/kotlin/com/gemwallet/android/features/bridge/views/ProposalScene.kt
+++ b/android/features/bridge/presents/src/main/kotlin/com/gemwallet/android/features/bridge/views/ProposalScene.kt
@@ -7,10 +7,6 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.LazyListScope
import androidx.compose.foundation.lazy.itemsIndexed
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Check
-import androidx.compose.material.icons.outlined.Verified
-import androidx.compose.material.icons.outlined.Warning
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
@@ -43,6 +39,7 @@ import com.gemwallet.android.ui.components.list_item.property.PropertyTitleText
import com.gemwallet.android.ui.components.screen.FatalStateScene
import com.gemwallet.android.ui.components.screen.LoadingScene
import com.gemwallet.android.ui.components.screen.Scene
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.models.ListPosition
import com.gemwallet.android.ui.components.color
import com.gemwallet.android.ui.components.icon
@@ -201,7 +198,7 @@ private fun LazyListScope.permissionsContent() {
minHeight = ListItemDefaults.plainMinHeight,
leading = {
Icon(
- imageVector = Icons.Default.Check,
+ imageVector = AppIcons.Check,
contentDescription = "",
tint = MaterialTheme.colorScheme.onSurface,
)
diff --git a/android/features/buy/presents/src/main/kotlin/com/gemwallet/android/features/buy/views/FiatScene.kt b/android/features/buy/presents/src/main/kotlin/com/gemwallet/android/features/buy/views/FiatScene.kt
index 18068d7433..ec62dbb006 100644
--- a/android/features/buy/presents/src/main/kotlin/com/gemwallet/android/features/buy/views/FiatScene.kt
+++ b/android/features/buy/presents/src/main/kotlin/com/gemwallet/android/features/buy/views/FiatScene.kt
@@ -7,8 +7,6 @@ import androidx.compose.foundation.layout.Row
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.filled.History
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
@@ -41,6 +39,7 @@ import com.gemwallet.android.ui.components.list_item.property.PropertyDataText
import com.gemwallet.android.ui.components.list_item.property.PropertyItem
import com.gemwallet.android.ui.components.list_item.property.PropertyTitleText
import com.gemwallet.android.ui.components.screen.Scene
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.models.ListPosition
import com.gemwallet.android.ui.models.actions.CancelAction
import com.gemwallet.android.ui.theme.Spacer16
@@ -86,7 +85,7 @@ fun BuyScene(
actions = {
IconButton(onClick = onFiatTransactions) {
Icon(
- imageVector = Icons.Default.History,
+ imageVector = AppIcons.History,
contentDescription = stringResource(R.string.activity_title),
)
}
diff --git a/android/features/create_wallet/presents/src/main/kotlin/com/gemwallet/android/features/create_wallet/views/PhraseAlert.kt b/android/features/create_wallet/presents/src/main/kotlin/com/gemwallet/android/features/create_wallet/views/PhraseAlert.kt
index 04e240578c..1972138794 100644
--- a/android/features/create_wallet/presents/src/main/kotlin/com/gemwallet/android/features/create_wallet/views/PhraseAlert.kt
+++ b/android/features/create_wallet/presents/src/main/kotlin/com/gemwallet/android/features/create_wallet/views/PhraseAlert.kt
@@ -10,8 +10,6 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Info
import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults
import androidx.compose.material3.Icon
@@ -30,6 +28,7 @@ import com.gemwallet.android.ui.R
import com.gemwallet.android.ui.components.CenteredDescriptionText
import com.gemwallet.android.ui.components.buttons.MainActionButton
import com.gemwallet.android.ui.components.screen.Scene
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.models.actions.CancelAction
import com.gemwallet.android.ui.open
import com.gemwallet.android.ui.theme.Emoji
@@ -64,7 +63,7 @@ fun PhraseAlertDialog(
IconButton(
{ uriHandler.open(context, AppUrl.docs(DocsUrl.WhatIsSecretPhrase)) }
) {
- Icon(Icons.Outlined.Info, "")
+ Icon(AppIcons.InfoOutlined, "")
}
},
onClose = { onCancel() }
diff --git a/android/features/earn/stake/presents/src/main/kotlin/com/gemwallet/android/features/stake/presents/StakeScene.kt b/android/features/earn/stake/presents/src/main/kotlin/com/gemwallet/android/features/stake/presents/StakeScene.kt
index d7370c63f1..fedfa82dab 100644
--- a/android/features/earn/stake/presents/src/main/kotlin/com/gemwallet/android/features/stake/presents/StakeScene.kt
+++ b/android/features/earn/stake/presents/src/main/kotlin/com/gemwallet/android/features/stake/presents/StakeScene.kt
@@ -8,8 +8,6 @@ import androidx.compose.foundation.layout.height
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.LazyListScope
import androidx.compose.foundation.lazy.itemsIndexed
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Info
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
@@ -31,6 +29,7 @@ import com.gemwallet.android.domains.percentage.formatAsPercentage
import com.gemwallet.android.ext.asset
import com.gemwallet.android.model.AssetInfo
import com.gemwallet.android.model.ValueFormatter
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.models.subtitleSymbol
import com.gemwallet.android.ui.open
import com.gemwallet.android.ui.R
@@ -79,7 +78,7 @@ fun StakeScene(
actions = {
stakeInfoUrl?.let { url ->
IconButton(onClick = { uriHandler.open(context, url) }) {
- Icon(imageVector = Icons.Outlined.Info, contentDescription = null)
+ Icon(imageVector = AppIcons.InfoOutlined, contentDescription = null)
}
}
},
diff --git a/android/features/import_wallet/presents/src/main/kotlin/com/gemwallet/android/features/import_wallet/components/ImportInput.kt b/android/features/import_wallet/presents/src/main/kotlin/com/gemwallet/android/features/import_wallet/components/ImportInput.kt
index 698c2fe577..1d3440854d 100644
--- a/android/features/import_wallet/presents/src/main/kotlin/com/gemwallet/android/features/import_wallet/components/ImportInput.kt
+++ b/android/features/import_wallet/presents/src/main/kotlin/com/gemwallet/android/features/import_wallet/components/ImportInput.kt
@@ -10,9 +10,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.text.BasicTextField
import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ContentPaste
-import androidx.compose.material.icons.filled.Error
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
@@ -47,6 +44,7 @@ import com.gemwallet.android.ui.components.buttons.FieldBottomAction
import com.gemwallet.android.ui.components.clipboard.getPlainText
import com.gemwallet.android.ui.components.list_item.SelectionCheckmark
import com.gemwallet.android.ui.components.progress.CircularProgressIndicator16
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.theme.Spacer16
import com.gemwallet.android.features.recipient.viewmodel.AddressChainViewModel
import com.wallet.core.primitives.NameRecord
@@ -151,7 +149,7 @@ internal fun ImportInput(
if (uiState.isFail) {
Icon(
modifier = Modifier.size(24.dp),
- imageVector = Icons.Default.Error,
+ imageVector = AppIcons.Error,
contentDescription = "Name is resolved",
tint = MaterialTheme.colorScheme.error,
)
@@ -167,7 +165,7 @@ internal fun ImportInput(
modifier = Modifier
.align(Alignment.Center)
.testTag("paste"),
- imageVector = Icons.Default.ContentPaste,
+ imageVector = AppIcons.ContentPaste,
text = stringResource(id = R.string.common_paste),
) {
val newValue = clipboardManager.getPlainText() ?: ""
diff --git a/android/features/nft/presents/src/main/kotlin/com/gemwallet/android/features/nft/presents/NftDetailsScene.kt b/android/features/nft/presents/src/main/kotlin/com/gemwallet/android/features/nft/presents/NftDetailsScene.kt
index 7d50e8ab87..295c192042 100644
--- a/android/features/nft/presents/src/main/kotlin/com/gemwallet/android/features/nft/presents/NftDetailsScene.kt
+++ b/android/features/nft/presents/src/main/kotlin/com/gemwallet/android/features/nft/presents/NftDetailsScene.kt
@@ -9,10 +9,6 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.LazyListScope
import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowUpward
-import androidx.compose.material.icons.filled.MoreVert
-import androidx.compose.material.icons.filled.Refresh
import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.Icon
@@ -43,6 +39,7 @@ import com.gemwallet.android.ui.components.list_item.property.PropertyItem
import com.gemwallet.android.ui.components.list_item.property.PropertyNetworkItem
import com.gemwallet.android.ui.components.list_item.property.itemsPositioned
import com.gemwallet.android.ui.components.screen.Scene
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.models.ListPosition
import com.gemwallet.android.ui.models.actions.CancelAction
import com.gemwallet.android.ui.theme.compactIconSize
@@ -90,11 +87,11 @@ fun NFTDetailsScene(
actions = {
if (model.asset.chain.toChainType() in enabledChainTypes) {
IconButton(onClick = { onRecipient(AssetId(model.asset.chain), model.asset.id) }) {
- Icon(Icons.Default.ArrowUpward, contentDescription = "Send nft")
+ Icon(AppIcons.ArrowUpward, contentDescription = "Send nft")
}
}
IconButton(onClick = { isMenuExpanded = true }) {
- Icon(Icons.Default.MoreVert, contentDescription = stringResource(R.string.wallet_more))
+ Icon(AppIcons.MoreVert, contentDescription = stringResource(R.string.wallet_more))
}
DropdownMenu(
expanded = isMenuExpanded,
@@ -102,7 +99,7 @@ fun NFTDetailsScene(
) {
DropdownMenuItem(
text = { Text(stringResource(R.string.common_refresh)) },
- leadingIcon = { Icon(Icons.Default.Refresh, contentDescription = null) },
+ leadingIcon = { Icon(AppIcons.Refresh, contentDescription = null) },
onClick = {
isMenuExpanded = false
scope.launch {
diff --git a/android/features/nft/presents/src/main/kotlin/com/gemwallet/android/features/nft/presents/NftListScene.kt b/android/features/nft/presents/src/main/kotlin/com/gemwallet/android/features/nft/presents/NftListScene.kt
index 67a8918ad4..4a20003c93 100644
--- a/android/features/nft/presents/src/main/kotlin/com/gemwallet/android/features/nft/presents/NftListScene.kt
+++ b/android/features/nft/presents/src/main/kotlin/com/gemwallet/android/features/nft/presents/NftListScene.kt
@@ -11,8 +11,6 @@ import androidx.compose.foundation.lazy.grid.LazyGridState
import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
import androidx.compose.foundation.lazy.grid.items
import androidx.compose.foundation.lazy.grid.rememberLazyGridState
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Add
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
@@ -42,6 +40,7 @@ import com.gemwallet.android.ui.components.list_item.LinkItem
import com.gemwallet.android.ui.components.list_item.property.DataBadgeChevron
import com.gemwallet.android.ui.components.list_item.property.PropertyDataText
import com.gemwallet.android.ui.components.screen.Scene
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.models.ListPosition
import com.gemwallet.android.ui.models.NftItemUIModel
import com.gemwallet.android.ui.models.actions.CancelAction
@@ -118,7 +117,7 @@ internal fun NftListScene(
if (showReceiveAction) {
IconButton(onClick = { onAction(NftListAction.Receive) }) {
Icon(
- imageVector = Icons.Default.Add,
+ imageVector = AppIcons.Add,
contentDescription = stringResource(R.string.wallet_receive),
)
}
diff --git a/android/features/nft/presents/src/main/kotlin/com/gemwallet/android/features/nft/presents/components/NftTitle.kt b/android/features/nft/presents/src/main/kotlin/com/gemwallet/android/features/nft/presents/components/NftTitle.kt
index 900b3bdbfb..b29ce8a73d 100644
--- a/android/features/nft/presents/src/main/kotlin/com/gemwallet/android/features/nft/presents/components/NftTitle.kt
+++ b/android/features/nft/presents/src/main/kotlin/com/gemwallet/android/features/nft/presents/components/NftTitle.kt
@@ -3,8 +3,6 @@ package com.gemwallet.android.features.nft.presents.components
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.size
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Verified
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
@@ -13,6 +11,7 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.Dp
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.theme.space4
import com.gemwallet.android.ui.theme.tinyIconSize
import com.wallet.core.primitives.VerificationStatus
@@ -37,7 +36,7 @@ fun NftTitle(
)
if (status == VerificationStatus.Verified) {
Icon(
- imageVector = Icons.Outlined.Verified,
+ imageVector = AppIcons.Verified,
contentDescription = null,
tint = MaterialTheme.colorScheme.primary,
modifier = Modifier.size(iconSize),
diff --git a/android/features/perpetual/presents/src/main/kotlin/com/gemwallet/android/features/perpetual/views/components/MarketHeadActions.kt b/android/features/perpetual/presents/src/main/kotlin/com/gemwallet/android/features/perpetual/views/components/MarketHeadActions.kt
index c82579e9bc..3004ac2bd6 100644
--- a/android/features/perpetual/presents/src/main/kotlin/com/gemwallet/android/features/perpetual/views/components/MarketHeadActions.kt
+++ b/android/features/perpetual/presents/src/main/kotlin/com/gemwallet/android/features/perpetual/views/components/MarketHeadActions.kt
@@ -2,9 +2,6 @@ package com.gemwallet.android.features.perpetual.views.components
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Row
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Add
-import androidx.compose.material.icons.filled.ArrowUpward
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
@@ -17,6 +14,7 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.sp
import com.gemwallet.android.ui.R
import com.gemwallet.android.ui.components.list_head.AmountHeadAction
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.theme.WalletTheme
import com.gemwallet.android.ui.theme.paddingDefault
@@ -33,7 +31,7 @@ fun MarketHeadActions(
AmountHeadAction(
modifier = Modifier.weight(1f),
title = stringResource(id = R.string.wallet_withdraw),
- imageVector = Icons.Default.ArrowUpward,
+ imageVector = AppIcons.Withdraw,
contentDescription = "withdraw",
fontSize = actionFontSize,
onNextFontSize = {
@@ -44,7 +42,7 @@ fun MarketHeadActions(
AmountHeadAction(
modifier = Modifier.weight(1f),
title = stringResource(id = R.string.wallet_deposit),
- imageVector = Icons.Default.Add,
+ imageVector = AppIcons.Deposit,
contentDescription = "deposit",
fontSize = actionFontSize,
onNextFontSize = {
diff --git a/android/features/perpetual/presents/src/main/kotlin/com/gemwallet/android/features/perpetual/views/components/PerpetualItem.kt b/android/features/perpetual/presents/src/main/kotlin/com/gemwallet/android/features/perpetual/views/components/PerpetualItem.kt
index f78c5168bd..c3c45f213e 100644
--- a/android/features/perpetual/presents/src/main/kotlin/com/gemwallet/android/features/perpetual/views/components/PerpetualItem.kt
+++ b/android/features/perpetual/presents/src/main/kotlin/com/gemwallet/android/features/perpetual/views/components/PerpetualItem.kt
@@ -2,8 +2,6 @@ package com.gemwallet.android.features.perpetual.views.components
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.defaultMinSize
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.PushPin
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
@@ -23,6 +21,7 @@ import com.gemwallet.android.ui.components.list_item.AssetListItem
import com.gemwallet.android.ui.components.list_item.DropDownContextItem
import com.gemwallet.android.ui.components.list_item.ListItemTitleText
import com.gemwallet.android.ui.components.list_item.PriceInfo
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.models.ListPosition
import com.gemwallet.android.ui.theme.WalletTheme
import com.wallet.core.primitives.Asset
@@ -58,7 +57,7 @@ fun PerpetualItem(
text = { Text(text = stringResource(id = if (item.isPinned) R.string.common_unpin else R.string.common_pin)) },
trailingIcon = {
if (item.isPinned) Icon(painterResource(R.drawable.keep_off), "unpin")
- else Icon(Icons.Default.PushPin, "pin")
+ else Icon(AppIcons.PushPin, "pin")
},
onClick = {
diff --git a/android/features/perpetual/presents/src/main/kotlin/com/gemwallet/android/features/perpetual/views/market/PerpetualMarketScene.kt b/android/features/perpetual/presents/src/main/kotlin/com/gemwallet/android/features/perpetual/views/market/PerpetualMarketScene.kt
index a47af54210..58d9429edc 100644
--- a/android/features/perpetual/presents/src/main/kotlin/com/gemwallet/android/features/perpetual/views/market/PerpetualMarketScene.kt
+++ b/android/features/perpetual/presents/src/main/kotlin/com/gemwallet/android/features/perpetual/views/market/PerpetualMarketScene.kt
@@ -4,8 +4,6 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.text.input.TextFieldState
import androidx.compose.foundation.text.input.clearText
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Search
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
@@ -37,6 +35,7 @@ import com.gemwallet.android.ui.components.list_item.PinnedAssetsHeaderItem
import com.gemwallet.android.ui.components.list_item.SubheaderItem
import com.gemwallet.android.ui.components.list_item.property.itemsPositioned
import com.gemwallet.android.ui.components.screen.Scene
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.models.AssetsGroupType
import com.gemwallet.android.ui.theme.Spacer16
import com.gemwallet.android.ui.theme.WalletTheme
@@ -89,7 +88,7 @@ internal fun PerpetualMarketScene(
actions = {
if (!isSearching) {
IconButton(onClick = { isSearching = true }) {
- Icon(imageVector = Icons.Default.Search, contentDescription = "search")
+ Icon(imageVector = AppIcons.Search, contentDescription = "search")
}
}
},
diff --git a/android/features/receive/presents/src/main/kotlin/com/gemwallet/android/features/receive/presents/ReceiveNftChainsScreen.kt b/android/features/receive/presents/src/main/kotlin/com/gemwallet/android/features/receive/presents/ReceiveNftChainsScreen.kt
index cb1dffc39e..321e92aeef 100644
--- a/android/features/receive/presents/src/main/kotlin/com/gemwallet/android/features/receive/presents/ReceiveNftChainsScreen.kt
+++ b/android/features/receive/presents/src/main/kotlin/com/gemwallet/android/features/receive/presents/ReceiveNftChainsScreen.kt
@@ -1,8 +1,6 @@
package com.gemwallet.android.features.receive.presents
import androidx.compose.foundation.layout.Row
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ContentCopy
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.runtime.Composable
@@ -18,6 +16,7 @@ import com.gemwallet.android.ui.R
import com.gemwallet.android.ui.components.clipboard.setPlainText
import com.gemwallet.android.ui.components.list_item.property.DataBadgeChevron
import com.gemwallet.android.ui.components.screen.SelectChain
+import com.gemwallet.android.ui.icons.AppIcons
import com.wallet.core.primitives.Chain
@Composable
@@ -38,7 +37,7 @@ fun ReceiveNftChainsScreen(
IconButton(
onClick = { clipboardManager.setPlainText(context, viewModel.addressFor(chain)) },
) {
- Icon(imageVector = Icons.Default.ContentCopy, contentDescription = null)
+ Icon(imageVector = AppIcons.ContentCopy, contentDescription = null)
}
DataBadgeChevron()
}
diff --git a/android/features/receive/presents/src/main/kotlin/com/gemwallet/android/features/receive/presents/ReceiveScreen.kt b/android/features/receive/presents/src/main/kotlin/com/gemwallet/android/features/receive/presents/ReceiveScreen.kt
index fadf807df3..568f7c0311 100644
--- a/android/features/receive/presents/src/main/kotlin/com/gemwallet/android/features/receive/presents/ReceiveScreen.kt
+++ b/android/features/receive/presents/src/main/kotlin/com/gemwallet/android/features/receive/presents/ReceiveScreen.kt
@@ -12,9 +12,6 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.widthIn
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ContentCopy
-import androidx.compose.material.icons.filled.Share
import androidx.compose.material3.CardDefaults
import androidx.compose.material3.ElevatedCard
import androidx.compose.material3.Icon
@@ -40,6 +37,7 @@ import com.gemwallet.android.domains.asset.networkFullName
import com.gemwallet.android.ext.boldMarkdown
import com.gemwallet.android.ext.isMemoSupport
import com.gemwallet.android.model.AssetInfo
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.models.subtitleSymbol
import com.wallet.core.primitives.Asset
import com.wallet.core.primitives.Chain
@@ -112,7 +110,7 @@ private fun ReceiveScene(
onClose = onCancel,
actions = {
IconButton(onShare) {
- Icon(Icons.Default.Share, "")
+ Icon(AppIcons.Share, "")
}
},
mainAction = {
@@ -121,7 +119,7 @@ private fun ReceiveScene(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(paddingHalfSmall)
) {
- Icon(Icons.Default.ContentCopy, "copy")
+ Icon(AppIcons.ContentCopy, "copy")
Text(stringResource(R.string.common_copy))
}
}
diff --git a/android/features/recipient/presents/src/main/kotlin/com/gemwallet/android/features/recipient/presents/components/AddressChainField.kt b/android/features/recipient/presents/src/main/kotlin/com/gemwallet/android/features/recipient/presents/components/AddressChainField.kt
index 938b1b56fb..a1060e0ad2 100644
--- a/android/features/recipient/presents/src/main/kotlin/com/gemwallet/android/features/recipient/presents/components/AddressChainField.kt
+++ b/android/features/recipient/presents/src/main/kotlin/com/gemwallet/android/features/recipient/presents/components/AddressChainField.kt
@@ -7,9 +7,6 @@ import androidx.compose.foundation.layout.Row
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.filled.CheckCircle
-import androidx.compose.material.icons.filled.Error
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
@@ -29,6 +26,7 @@ import com.gemwallet.android.ui.components.GemTextField
import com.gemwallet.android.ui.components.clipboard.getPlainText
import com.gemwallet.android.ui.components.fields.TransferTextFieldActions
import com.gemwallet.android.ui.components.progress.CircularProgressIndicator16
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.theme.paddingHalfSmall
import com.gemwallet.android.ui.theme.paddingSmall
import com.gemwallet.android.ui.theme.sceneContentPadding
@@ -91,7 +89,7 @@ fun ColumnScope.AddressChainField(
if (uiState.isResolve) {
Icon(
modifier = Modifier.size(24.dp),
- imageVector = Icons.Default.CheckCircle,
+ imageVector = AppIcons.CheckCircle,
contentDescription = "Name is resolved",
tint = MaterialTheme.colorScheme.tertiary,
)
@@ -99,7 +97,7 @@ fun ColumnScope.AddressChainField(
if (uiState.isFail) {
Icon(
modifier = Modifier.size(24.dp),
- imageVector = Icons.Default.Error,
+ imageVector = AppIcons.Error,
contentDescription = "Name is fail",
tint = MaterialTheme.colorScheme.error,
)
diff --git a/android/features/referral/presents/src/main/kotlin/com/gemwallet/android/features/referral/views/ReferralScene.kt b/android/features/referral/presents/src/main/kotlin/com/gemwallet/android/features/referral/views/ReferralScene.kt
index 4fd1a796e9..ab9fd3bf3b 100644
--- a/android/features/referral/presents/src/main/kotlin/com/gemwallet/android/features/referral/views/ReferralScene.kt
+++ b/android/features/referral/presents/src/main/kotlin/com/gemwallet/android/features/referral/views/ReferralScene.kt
@@ -11,8 +11,6 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.widthIn
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.KeyboardArrowDown
import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.Icon
@@ -40,6 +38,7 @@ import com.gemwallet.android.ui.R
import com.gemwallet.android.ui.components.buttons.MainActionButton
import com.gemwallet.android.ui.components.clickable
import com.gemwallet.android.ui.components.screen.Scene
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.theme.Spacer8
import com.gemwallet.android.ui.theme.WalletTheme
import com.gemwallet.android.ui.theme.paddingDefault
@@ -125,7 +124,7 @@ fun ReferralScene(
color = MaterialTheme.colorScheme.onPrimary,
)
Icon(
- imageVector = Icons.Default.KeyboardArrowDown,
+ imageVector = AppIcons.KeyboardArrowDown,
contentDescription = "select wallet",
tint = MaterialTheme.colorScheme.onPrimary,
)
diff --git a/android/features/referral/presents/src/main/kotlin/com/gemwallet/android/features/referral/views/components/ReferralConfirm.kt b/android/features/referral/presents/src/main/kotlin/com/gemwallet/android/features/referral/views/components/ReferralConfirm.kt
index b0986100c1..fa56214d26 100644
--- a/android/features/referral/presents/src/main/kotlin/com/gemwallet/android/features/referral/views/components/ReferralConfirm.kt
+++ b/android/features/referral/presents/src/main/kotlin/com/gemwallet/android/features/referral/views/components/ReferralConfirm.kt
@@ -7,8 +7,6 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.LazyListScope
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Info
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Icon
import androidx.compose.runtime.Composable
@@ -22,6 +20,7 @@ import com.gemwallet.android.ui.components.buttons.MainActionButton
import com.gemwallet.android.ui.components.list_item.ListItemSupportText
import com.gemwallet.android.ui.components.list_item.listItem
import com.gemwallet.android.ui.components.list_item.property.PropertyTitleText
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.models.ListPosition
import com.gemwallet.android.ui.theme.WalletTheme
import com.gemwallet.android.ui.theme.paddingDefault
@@ -48,7 +47,7 @@ internal fun LazyListScope.referralConfirmCode(rewards: Rewards, uiState: Reward
trailing = {
Icon(
modifier = Modifier.size(tinyIconSize),
- imageVector = Icons.Default.Info,
+ imageVector = AppIcons.Info,
tint = pendingColor,
contentDescription = "",
)
diff --git a/android/features/referral/presents/src/main/kotlin/com/gemwallet/android/features/referral/views/components/ReferralError.kt b/android/features/referral/presents/src/main/kotlin/com/gemwallet/android/features/referral/views/components/ReferralError.kt
index 8bf0224c0a..f88b22aa41 100644
--- a/android/features/referral/presents/src/main/kotlin/com/gemwallet/android/features/referral/views/components/ReferralError.kt
+++ b/android/features/referral/presents/src/main/kotlin/com/gemwallet/android/features/referral/views/components/ReferralError.kt
@@ -7,8 +7,6 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.LazyListScope
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.WarningAmber
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
@@ -18,6 +16,7 @@ import com.gemwallet.android.ui.R
import com.gemwallet.android.ui.components.list_item.ListItemSupportText
import com.gemwallet.android.ui.components.list_item.listItem
import com.gemwallet.android.ui.components.list_item.property.PropertyTitleText
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.models.ListPosition
import com.gemwallet.android.ui.theme.WalletTheme
import com.gemwallet.android.ui.theme.paddingDefault
@@ -40,7 +39,7 @@ internal fun LazyListScope.referralError(rewards: Rewards) {
trailing = {
Icon(
modifier = Modifier.size(tinyIconSize),
- imageVector = Icons.Default.WarningAmber,
+ imageVector = AppIcons.Warning,
tint = MaterialTheme.colorScheme.error,
contentDescription = "",
)
diff --git a/android/features/referral/presents/src/main/kotlin/com/gemwallet/android/features/referral/views/components/ReferralHead.kt b/android/features/referral/presents/src/main/kotlin/com/gemwallet/android/features/referral/views/components/ReferralHead.kt
index f4b46fd1a3..72a641b120 100644
--- a/android/features/referral/presents/src/main/kotlin/com/gemwallet/android/features/referral/views/components/ReferralHead.kt
+++ b/android/features/referral/presents/src/main/kotlin/com/gemwallet/android/features/referral/views/components/ReferralHead.kt
@@ -6,8 +6,6 @@ import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyListScope
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Share
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
@@ -21,6 +19,7 @@ import com.gemwallet.android.ui.R
import com.gemwallet.android.ui.components.buttons.MainActionButton
import com.gemwallet.android.ui.components.list_item.listItem
import com.gemwallet.android.ui.components.parseMarkdownToAnnotatedString
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.models.ListPosition
import com.gemwallet.android.ui.theme.Spacer16
import com.gemwallet.android.ui.theme.Spacer8
@@ -125,7 +124,7 @@ internal fun LazyListScope.referralHead(
canInvite -> MainActionButton(
onClick = onShare
) {
- Icon(Icons.Default.Share, contentDescription = "share")
+ Icon(AppIcons.Share, contentDescription = "share")
Spacer8()
Text(stringResource(R.string.rewards_invite_friends_title))
}
diff --git a/android/features/referral/presents/src/main/kotlin/com/gemwallet/android/features/referral/views/components/ReferralUnverified.kt b/android/features/referral/presents/src/main/kotlin/com/gemwallet/android/features/referral/views/components/ReferralUnverified.kt
index 763e5a6a76..28e956e06a 100644
--- a/android/features/referral/presents/src/main/kotlin/com/gemwallet/android/features/referral/views/components/ReferralUnverified.kt
+++ b/android/features/referral/presents/src/main/kotlin/com/gemwallet/android/features/referral/views/components/ReferralUnverified.kt
@@ -6,8 +6,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.LazyListScope
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Info
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
@@ -17,6 +15,7 @@ import com.gemwallet.android.features.referral.viewmodels.RewardsUIState
import com.gemwallet.android.ui.R
import com.gemwallet.android.ui.components.list_item.listItem
import com.gemwallet.android.ui.components.list_item.property.PropertyTitleText
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.models.ListPosition
import com.gemwallet.android.ui.theme.paddingDefault
import com.gemwallet.android.ui.theme.paddingHalfSmall
@@ -37,7 +36,7 @@ internal fun LazyListScope.referralUnverified(uiState: RewardsUIState) {
trailing = {
Icon(
modifier = Modifier.size(tinyIconSize),
- imageVector = Icons.Default.Info,
+ imageVector = AppIcons.Info,
tint = pendingColor,
contentDescription = "",
)
diff --git a/android/features/settings/networks/presents/src/main/kotlin/com/gemwallet/android/features/settings/networks/presents/AddNodeScene.kt b/android/features/settings/networks/presents/src/main/kotlin/com/gemwallet/android/features/settings/networks/presents/AddNodeScene.kt
index 0755818ce2..287c01b1eb 100644
--- a/android/features/settings/networks/presents/src/main/kotlin/com/gemwallet/android/features/settings/networks/presents/AddNodeScene.kt
+++ b/android/features/settings/networks/presents/src/main/kotlin/com/gemwallet/android/features/settings/networks/presents/AddNodeScene.kt
@@ -3,9 +3,6 @@ package com.gemwallet.android.features.settings.networks.presents
import androidx.activity.compose.BackHandler
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Cancel
-import androidx.compose.material.icons.filled.CheckCircleOutline
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
@@ -39,6 +36,7 @@ import com.gemwallet.android.ui.components.list_item.property.PropertyDataText
import com.gemwallet.android.ui.components.list_item.property.PropertyItem
import com.gemwallet.android.ui.components.list_item.property.PropertyTitleText
import com.gemwallet.android.ui.components.screen.Scene
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.models.ListPosition
import com.gemwallet.android.ui.theme.Spacer16
import com.wallet.core.primitives.Chain
@@ -103,13 +101,13 @@ fun AddNodeScene(chain: Chain, onCancel: () -> Unit) {
badge = {
if (status.inSync) {
Icon(
- imageVector = Icons.Default.CheckCircleOutline,
+ imageVector = AppIcons.CheckCircleOutlined,
tint = MaterialTheme.colorScheme.tertiary,
contentDescription = ""
)
} else {
Icon(
- imageVector = Icons.Default.Cancel,
+ imageVector = AppIcons.Cancel,
tint = MaterialTheme.colorScheme.error,
contentDescription = ""
)
diff --git a/android/features/settings/networks/presents/src/main/kotlin/com/gemwallet/android/features/settings/networks/presents/NetworkScene.kt b/android/features/settings/networks/presents/src/main/kotlin/com/gemwallet/android/features/settings/networks/presents/NetworkScene.kt
index 67622117d3..f946001f4a 100644
--- a/android/features/settings/networks/presents/src/main/kotlin/com/gemwallet/android/features/settings/networks/presents/NetworkScene.kt
+++ b/android/features/settings/networks/presents/src/main/kotlin/com/gemwallet/android/features/settings/networks/presents/NetworkScene.kt
@@ -9,8 +9,6 @@ import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.itemsIndexed
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Add
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.ExperimentalMaterial3Api
@@ -41,6 +39,7 @@ import com.gemwallet.android.ui.components.list_item.property.PropertyItem
import com.gemwallet.android.ui.components.list_item.property.PropertyTitleText
import com.gemwallet.android.ui.components.list_item.property.itemsPositioned
import com.gemwallet.android.ui.components.screen.Scene
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.models.ListPosition
import com.gemwallet.android.ui.theme.paddingSmall
import com.wallet.core.primitives.Node
@@ -64,7 +63,7 @@ fun NetworkScene(
actions = {
if (state.availableAddNode) {
IconButton(onClick = { isShowAddSource = true }) {
- Icon(imageVector = Icons.Default.Add, contentDescription = "")
+ Icon(imageVector = AppIcons.Add, contentDescription = "")
}
}
},
diff --git a/android/features/settings/networks/presents/src/main/kotlin/com/gemwallet/android/features/settings/networks/presents/NodeItem.kt b/android/features/settings/networks/presents/src/main/kotlin/com/gemwallet/android/features/settings/networks/presents/NodeItem.kt
index 482c625eda..c2878a52a6 100644
--- a/android/features/settings/networks/presents/src/main/kotlin/com/gemwallet/android/features/settings/networks/presents/NodeItem.kt
+++ b/android/features/settings/networks/presents/src/main/kotlin/com/gemwallet/android/features/settings/networks/presents/NodeItem.kt
@@ -3,8 +3,6 @@ package com.gemwallet.android.features.settings.networks.presents
import android.icu.text.DecimalFormat
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.padding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Delete
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
@@ -19,6 +17,7 @@ import com.gemwallet.android.ui.components.list_item.ListItemSupportText
import com.gemwallet.android.ui.components.list_item.ListItemTitleText
import com.gemwallet.android.ui.components.list_item.SelectionCheckmark
import com.gemwallet.android.ui.components.list_item.SwipeableItemWithActions
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.models.ListPosition
import com.gemwallet.android.ui.theme.WalletTheme
import com.gemwallet.android.ui.theme.paddingSmall
@@ -75,7 +74,7 @@ internal fun NodeItem(
ActionIcon(
onClick = onDelete,
backgroundColor = MaterialTheme.colorScheme.error,
- icon = Icons.Default.Delete,
+ icon = AppIcons.Delete,
contentDescription = stringResource(R.string.common_delete),
)
},
diff --git a/android/features/settings/price_alerts/presents/src/main/kotlin/com/gemwallet/android/features/settings/price_alerts/presents/PriceAlertScene.kt b/android/features/settings/price_alerts/presents/src/main/kotlin/com/gemwallet/android/features/settings/price_alerts/presents/PriceAlertScene.kt
index 5a6cdd0622..f60f79a705 100644
--- a/android/features/settings/price_alerts/presents/src/main/kotlin/com/gemwallet/android/features/settings/price_alerts/presents/PriceAlertScene.kt
+++ b/android/features/settings/price_alerts/presents/src/main/kotlin/com/gemwallet/android/features/settings/price_alerts/presents/PriceAlertScene.kt
@@ -16,10 +16,6 @@ import androidx.compose.foundation.layout.widthIn
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.LazyListScope
import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Add
-import androidx.compose.material.icons.filled.Delete
-import androidx.compose.material.icons.filled.Notifications
import androidx.compose.material3.ExperimentalMaterial3Api
import com.gemwallet.android.ui.components.empty.EmptyContentType
import com.gemwallet.android.ui.components.empty.EmptyContentView
@@ -53,6 +49,7 @@ import com.gemwallet.android.ui.components.list_item.SwipeableItemWithActions
import com.gemwallet.android.ui.components.list_item.SwitchProperty
import com.gemwallet.android.ui.components.list_item.property.itemsPositioned
import com.gemwallet.android.ui.components.screen.Scene
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.theme.headerIconSize
import com.gemwallet.android.ui.theme.paddingHalfSmall
import com.gemwallet.android.ui.theme.paddingLarge
@@ -86,7 +83,7 @@ fun PriceAlertScene(
IconButton(onClick = if (assetId == null) onAdd else {
{ onAddTarget(assetId) }
}) {
- Icon(imageVector = Icons.Default.Add, contentDescription = "")
+ Icon(imageVector = AppIcons.Add, contentDescription = "")
}
},
snackbar = snackbar,
@@ -218,7 +215,7 @@ private fun LazyListScope.assets(
.heightIn(minActionWidth),
onClick = { onExclude(item.id) },
backgroundColor = MaterialTheme.colorScheme.error,
- icon = Icons.Default.Delete,
+ icon = AppIcons.Delete,
)
},
onExpanded = { reveable.value = item.id },
diff --git a/android/features/settings/price_alerts/presents/src/main/kotlin/com/gemwallet/android/features/settings/price_alerts/presents/PriceAlertTargetScene.kt b/android/features/settings/price_alerts/presents/src/main/kotlin/com/gemwallet/android/features/settings/price_alerts/presents/PriceAlertTargetScene.kt
index 77be8be87e..4b640e2cf8 100644
--- a/android/features/settings/price_alerts/presents/src/main/kotlin/com/gemwallet/android/features/settings/price_alerts/presents/PriceAlertTargetScene.kt
+++ b/android/features/settings/price_alerts/presents/src/main/kotlin/com/gemwallet/android/features/settings/price_alerts/presents/PriceAlertTargetScene.kt
@@ -16,9 +16,6 @@ import androidx.compose.foundation.text.input.TextFieldLineLimits
import androidx.compose.foundation.text.input.TextFieldState
import androidx.compose.foundation.text.input.clearText
import androidx.compose.foundation.text.input.rememberTextFieldState
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowCircleDown
-import androidx.compose.material.icons.filled.ArrowCircleUp
import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
@@ -48,6 +45,7 @@ import com.gemwallet.android.ui.components.list_item.ListItemTitleText
import com.gemwallet.android.ui.components.list_item.PriceInfo
import com.gemwallet.android.ui.components.parseMarkdownToAnnotatedString
import com.gemwallet.android.ui.components.screen.Scene
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.models.ListPosition
import com.gemwallet.android.ui.theme.WalletTheme
import com.gemwallet.android.ui.theme.paddingHalfSmall
@@ -198,8 +196,8 @@ fun PriceAlertTargetScene(
onDirection(direction)
},
imageVector = when (direction) {
- PriceAlertDirection.Up -> Icons.Default.ArrowCircleUp
- PriceAlertDirection.Down -> Icons.Default.ArrowCircleDown
+ PriceAlertDirection.Up -> AppIcons.ArrowCircleUp
+ PriceAlertDirection.Down -> AppIcons.ArrowCircleDown
},
contentDescription = "",
tint = when (direction) {
diff --git a/android/features/settings/security/presents/src/main/kotlin/com/gemwallet/android/features/settings/security/presents/SecurityScene.kt b/android/features/settings/security/presents/src/main/kotlin/com/gemwallet/android/features/settings/security/presents/SecurityScene.kt
index 3497901ebc..76cb26f9ea 100644
--- a/android/features/settings/security/presents/src/main/kotlin/com/gemwallet/android/features/settings/security/presents/SecurityScene.kt
+++ b/android/features/settings/security/presents/src/main/kotlin/com/gemwallet/android/features/settings/security/presents/SecurityScene.kt
@@ -6,8 +6,6 @@ import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.LazyListScope
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Check
import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.Icon
@@ -32,6 +30,7 @@ import com.gemwallet.android.ui.components.list_item.property.PropertyDataText
import com.gemwallet.android.ui.components.list_item.property.PropertyItem
import com.gemwallet.android.ui.components.list_item.property.PropertyTitleText
import com.gemwallet.android.ui.components.screen.Scene
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.models.ListPosition
import com.gemwallet.android.ui.requestAuth
import com.gemwallet.android.ui.theme.Spacer4
@@ -115,7 +114,7 @@ private fun LazyListScope.requiredAuthDelay(
text = {
Row(verticalAlignment = Alignment.CenterVertically) {
interval.takeIf { it == currentInterval }?.let {
- Icon(Icons.Default.Check, null, modifier = Modifier.size(compactIconSize))
+ Icon(AppIcons.Check, null, modifier = Modifier.size(compactIconSize))
} ?: Spacer(modifier = Modifier.size(compactIconSize))
Spacer4()
Text(stringResource(locks[interval]!!))
diff --git a/android/features/settings/settings/presents/src/main/kotlin/com/gemwallet/android/features/settings/settings/presents/views/PreferencesScene.kt b/android/features/settings/settings/presents/src/main/kotlin/com/gemwallet/android/features/settings/settings/presents/views/PreferencesScene.kt
index 1886d29268..7648fd3bc2 100644
--- a/android/features/settings/settings/presents/src/main/kotlin/com/gemwallet/android/features/settings/settings/presents/views/PreferencesScene.kt
+++ b/android/features/settings/settings/presents/src/main/kotlin/com/gemwallet/android/features/settings/settings/presents/views/PreferencesScene.kt
@@ -8,8 +8,6 @@ import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Check
import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.Icon
@@ -35,6 +33,7 @@ import com.gemwallet.android.ui.components.list_item.LinkItem
import com.gemwallet.android.ui.components.list_item.property.DataBadgeChevron
import com.gemwallet.android.ui.components.list_item.property.PropertyDataText
import com.gemwallet.android.ui.components.screen.Scene
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.models.ListPosition
import com.gemwallet.android.ui.theme.Spacer4
import com.gemwallet.android.ui.theme.compactIconSize
@@ -149,7 +148,7 @@ fun PreferencesScene(
text = {
Row(verticalAlignment = Alignment.CenterVertically) {
if (value == perpetualLeverage) {
- Icon(Icons.Default.Check, null, modifier = Modifier.size(compactIconSize))
+ Icon(AppIcons.Check, null, modifier = Modifier.size(compactIconSize))
} else {
Spacer(modifier = Modifier.size(compactIconSize))
}
diff --git a/android/features/swap/presents/src/main/kotlin/com/gemwallet/android/features/swap/views/SwapScene.kt b/android/features/swap/presents/src/main/kotlin/com/gemwallet/android/features/swap/views/SwapScene.kt
index 3516dc8172..3ba432c46f 100644
--- a/android/features/swap/presents/src/main/kotlin/com/gemwallet/android/features/swap/views/SwapScene.kt
+++ b/android/features/swap/presents/src/main/kotlin/com/gemwallet/android/features/swap/views/SwapScene.kt
@@ -6,8 +6,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.text.input.TextFieldState
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.SwapVert
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
@@ -28,6 +26,7 @@ import com.gemwallet.android.features.swap.viewmodels.models.SwapUiState
import com.gemwallet.android.features.swap.views.components.SwapAction
import com.gemwallet.android.features.swap.views.components.SwapError
import com.gemwallet.android.features.swap.views.components.SwapItem
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.models.swap.SwapDetailsUIModel
import com.gemwallet.android.ui.theme.iconSize
import com.gemwallet.android.ui.theme.space0
@@ -95,7 +94,7 @@ internal fun SwapScene(
contentAlignment = Alignment.Center,
) {
Icon(
- imageVector = Icons.Default.SwapVert,
+ imageVector = AppIcons.SwapVert,
contentDescription = stringResource(R.string.wallet_swap),
)
}
diff --git a/android/features/swap/presents/src/main/kotlin/com/gemwallet/android/features/swap/views/components/SwapError.kt b/android/features/swap/presents/src/main/kotlin/com/gemwallet/android/features/swap/views/components/SwapError.kt
index 4b56572e0f..5517358bd0 100644
--- a/android/features/swap/presents/src/main/kotlin/com/gemwallet/android/features/swap/views/components/SwapError.kt
+++ b/android/features/swap/presents/src/main/kotlin/com/gemwallet/android/features/swap/views/components/SwapError.kt
@@ -5,8 +5,6 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.size
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Warning
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
@@ -17,6 +15,7 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import com.gemwallet.android.model.AssetInfo
import com.gemwallet.android.ui.R
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.theme.Spacer2
import com.gemwallet.android.ui.theme.Spacer8
import com.gemwallet.android.ui.theme.defaultPadding
@@ -58,7 +57,7 @@ internal fun SwapError(state: SwapUiState, pay: AssetInfo?) {
) {
Icon(
modifier = Modifier.size(smallIconSize),
- imageVector = Icons.Outlined.Warning,
+ imageVector = AppIcons.Warning,
tint = MaterialTheme.colorScheme.error,
contentDescription = null,
)
diff --git a/android/features/swap/presents/src/main/kotlin/com/gemwallet/android/features/swap/views/components/SwapItem.kt b/android/features/swap/presents/src/main/kotlin/com/gemwallet/android/features/swap/views/components/SwapItem.kt
index edeb124d00..28de434c2a 100644
--- a/android/features/swap/presents/src/main/kotlin/com/gemwallet/android/features/swap/views/components/SwapItem.kt
+++ b/android/features/swap/presents/src/main/kotlin/com/gemwallet/android/features/swap/views/components/SwapItem.kt
@@ -15,8 +15,6 @@ import androidx.compose.foundation.text.input.TextFieldState
import androidx.compose.foundation.text.input.clearText
import androidx.compose.foundation.text.input.rememberTextFieldState
import androidx.compose.foundation.text.input.setTextAndPlaceCursorAtEnd
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.KeyboardArrowDown
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
@@ -41,6 +39,7 @@ import com.gemwallet.android.ui.components.clickable
import com.gemwallet.android.ui.components.image.AssetIcon
import com.gemwallet.android.ui.components.list_item.listItem
import com.gemwallet.android.ui.components.progress.CircularProgressIndicator16
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.models.ListPosition
import com.gemwallet.android.ui.theme.listItemIconSize
import com.gemwallet.android.ui.theme.paddingDefault
@@ -153,7 +152,7 @@ private fun AssetInfo(
@Composable
private fun AssetPickerChevron() {
Icon(
- imageVector = Icons.Default.KeyboardArrowDown,
+ imageVector = AppIcons.KeyboardArrowDown,
contentDescription = null,
)
}
diff --git a/android/features/transfer_amount/presents/src/main/kotlin/com/gemwallet/android/features/transfer_amount/presents/AmountScene.kt b/android/features/transfer_amount/presents/src/main/kotlin/com/gemwallet/android/features/transfer_amount/presents/AmountScene.kt
index 18737006a4..91a5d217d2 100644
--- a/android/features/transfer_amount/presents/src/main/kotlin/com/gemwallet/android/features/transfer_amount/presents/AmountScene.kt
+++ b/android/features/transfer_amount/presents/src/main/kotlin/com/gemwallet/android/features/transfer_amount/presents/AmountScene.kt
@@ -7,8 +7,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Info
import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
@@ -40,6 +38,7 @@ import com.gemwallet.android.ui.components.keyboardAsState
import com.gemwallet.android.ui.components.list_item.listItem
import com.gemwallet.android.ui.components.list_item.property.PropertyAssetInfoItem
import com.gemwallet.android.ui.components.screen.Scene
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.models.AmountInputType
import com.gemwallet.android.ui.theme.Spacer16
import com.gemwallet.android.ui.theme.alpha50
@@ -148,7 +147,7 @@ private fun ReserveForFeeItem(asset: Asset, reserveForFee: String) {
) {
Icon(
modifier = Modifier.size(smallIconSize),
- imageVector = Icons.Outlined.Info,
+ imageVector = AppIcons.InfoOutlined,
contentDescription = null,
tint = MaterialTheme.colorScheme.secondary.copy(alpha = alpha50),
)
diff --git a/android/features/update_app/presents/src/main/kotlin/com/gemwallet/android/features/update_app/presents/InAppUpdateBanner.kt b/android/features/update_app/presents/src/main/kotlin/com/gemwallet/android/features/update_app/presents/InAppUpdateBanner.kt
index 8f00bb59cf..c36c21649f 100644
--- a/android/features/update_app/presents/src/main/kotlin/com/gemwallet/android/features/update_app/presents/InAppUpdateBanner.kt
+++ b/android/features/update_app/presents/src/main/kotlin/com/gemwallet/android/features/update_app/presents/InAppUpdateBanner.kt
@@ -10,8 +10,6 @@ import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.size
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowCircleDown
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Button
import androidx.compose.material3.CircularProgressIndicator
@@ -39,6 +37,7 @@ import com.gemwallet.android.model.AppUpdateInfo
import com.gemwallet.android.ui.R
import com.gemwallet.android.ui.components.list_item.DropDownContextItem
import com.gemwallet.android.ui.components.list_item.listItem
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.models.ListPosition
import com.gemwallet.android.ui.theme.Spacer4
import com.gemwallet.android.ui.theme.defaultPadding
@@ -181,7 +180,7 @@ private fun UpdateInfo(
Row(verticalAlignment = Alignment.CenterVertically) {
Text(stringResource(R.string.update_app_action))
Spacer4()
- Icon(Icons.Default.ArrowCircleDown, "Update application", tint = MaterialTheme.colorScheme.primary)
+ Icon(AppIcons.ArrowCircleDown, "Update application", tint = MaterialTheme.colorScheme.primary)
}
}
DownloadState.Preparing -> CircularProgressIndicator(
diff --git a/android/features/wallets/presents/src/main/kotlin/com/gemwallet/android/features/wallets/presents/views/components/PinnedHeader.kt b/android/features/wallets/presents/src/main/kotlin/com/gemwallet/android/features/wallets/presents/views/components/PinnedHeader.kt
index a8eaa44ba9..4ccafa407d 100644
--- a/android/features/wallets/presents/src/main/kotlin/com/gemwallet/android/features/wallets/presents/views/components/PinnedHeader.kt
+++ b/android/features/wallets/presents/src/main/kotlin/com/gemwallet/android/features/wallets/presents/views/components/PinnedHeader.kt
@@ -5,8 +5,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.LazyListScope
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.PushPin
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
@@ -16,6 +14,7 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import com.gemwallet.android.ui.R
import com.gemwallet.android.ui.components.list_item.sectionHeaderHorizontalPadding
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.theme.Spacer4
import com.gemwallet.android.ui.theme.paddingSmall
import com.gemwallet.android.ui.theme.tinyIconSize
@@ -33,7 +32,7 @@ internal fun LazyListScope.pinnedHeader() {
) {
Icon(
modifier = Modifier.size(tinyIconSize),
- imageVector = Icons.Default.PushPin,
+ imageVector = AppIcons.PushPin,
tint = MaterialTheme.colorScheme.secondary,
contentDescription = "pinned_section",
)
diff --git a/android/features/wallets/presents/src/main/kotlin/com/gemwallet/android/features/wallets/presents/views/components/WalletItemsList.kt b/android/features/wallets/presents/src/main/kotlin/com/gemwallet/android/features/wallets/presents/views/components/WalletItemsList.kt
index 9e00e6ebf1..b4bc381eb6 100644
--- a/android/features/wallets/presents/src/main/kotlin/com/gemwallet/android/features/wallets/presents/views/components/WalletItemsList.kt
+++ b/android/features/wallets/presents/src/main/kotlin/com/gemwallet/android/features/wallets/presents/views/components/WalletItemsList.kt
@@ -3,10 +3,6 @@ package com.gemwallet.android.features.wallets.presents.views.components
import androidx.annotation.StringRes
import androidx.compose.foundation.lazy.LazyListScope
import androidx.compose.foundation.lazy.itemsIndexed
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Delete
-import androidx.compose.material.icons.filled.PushPin
-import androidx.compose.material.icons.filled.Settings
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
@@ -21,6 +17,7 @@ import com.gemwallet.android.domains.wallet.aggregates.WalletDataAggregate
import com.gemwallet.android.ui.R
import com.gemwallet.android.ui.components.list_item.DropDownContextItem
import com.gemwallet.android.ui.components.list_item.WalletItem
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.models.ListPosition
import com.wallet.core.primitives.WalletId
@@ -58,16 +55,16 @@ internal fun LazyListScope.wallets(
menuItems = {
WalletDropDownItem(
if (item.isPinned) R.string.common_unpin else R.string.common_pin,
- if (item.isPinned) R.drawable.keep_off else Icons.Default.PushPin,
+ if (item.isPinned) R.drawable.keep_off else AppIcons.PushPin,
) {
onTogglePin(walletId)
longPressedWallet.value = ""
}
- WalletDropDownItem(R.string.common_wallet, Icons.Default.Settings) {
+ WalletDropDownItem(R.string.common_wallet, AppIcons.Settings) {
onEdit(walletId)
longPressedWallet.value = ""
}
- WalletDropDownItem(R.string.common_delete, Icons.Default.Delete, MaterialTheme.colorScheme.error) {
+ WalletDropDownItem(R.string.common_delete, AppIcons.Delete, MaterialTheme.colorScheme.error) {
onDeleteWallet(walletId)
longPressedWallet.value = ""
}
diff --git a/android/features/wallets/presents/src/main/kotlin/com/gemwallet/android/features/wallets/presents/views/components/WalletsActions.kt b/android/features/wallets/presents/src/main/kotlin/com/gemwallet/android/features/wallets/presents/views/components/WalletsActions.kt
index 02304bea2f..2d93f00699 100644
--- a/android/features/wallets/presents/src/main/kotlin/com/gemwallet/android/features/wallets/presents/views/components/WalletsActions.kt
+++ b/android/features/wallets/presents/src/main/kotlin/com/gemwallet/android/features/wallets/presents/views/components/WalletsActions.kt
@@ -5,9 +5,6 @@ import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Add
-import androidx.compose.material.icons.filled.ArrowDownward
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
@@ -19,6 +16,7 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import com.gemwallet.android.ui.R
import com.gemwallet.android.ui.components.list_item.listItem
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.models.ListPosition
import com.gemwallet.android.ui.theme.Spacer8
import com.gemwallet.android.ui.theme.defaultPadding
@@ -32,13 +30,13 @@ internal fun WalletsActions(
Column {
WalletsAction(
text = R.string.wallet_create_new_wallet,
- Icons.Default.Add,
+ AppIcons.Add,
listPosition = ListPosition.First,
onClick = onCreate,
)
WalletsAction(
text = R.string.wallet_import_existing_wallet,
- Icons.Default.ArrowDownward,
+ AppIcons.ArrowDownward,
listPosition = ListPosition.Last,
onClick = onImport,
)
diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml
index 48231a0af1..7e0a11dc75 100644
--- a/android/gradle/libs.versions.toml
+++ b/android/gradle/libs.versions.toml
@@ -1,7 +1,6 @@
[versions]
activityCompose = "1.13.0"
compose = "1.11.1"
-materialIcons = "1.7.8"
material3 = "1.5.0-alpha19"
navigation3 = "1.1.1"
accompanistPermissions = "0.37.3"
@@ -76,8 +75,6 @@ compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" }
navigation3-runtime = { module = "androidx.navigation3:navigation3-runtime", version.ref = "navigation3" }
navigation3-ui = { module = "androidx.navigation3:navigation3-ui", version.ref = "navigation3" }
compose-runtime-android = { module = "androidx.compose.runtime:runtime-android", version.ref = "compose" }
-compose-material-icons-core = { module = "androidx.compose.material:material-icons-core", version.ref = "materialIcons" }
-compose-material-icons-extended = { module = "androidx.compose.material:material-icons-extended", version.ref = "materialIcons" }
compose-material3 = { module = "androidx.compose.material3:material3", version.ref = "material3" }
compose-material3-window-size = { module = "androidx.compose.material3:material3-window-size-class", version.ref = "material3" }
browser = { module = "androidx.browser:browser", version.ref = "browser"}
diff --git a/android/ui/build.gradle.kts b/android/ui/build.gradle.kts
index 29c3efadb9..ce7f566230 100644
--- a/android/ui/build.gradle.kts
+++ b/android/ui/build.gradle.kts
@@ -57,8 +57,6 @@ dependencies {
// Compose
api(libs.androidx.material3.adaptive.android)
api(libs.compose.ui)
- api(libs.compose.material.icons.core)
- api(libs.compose.material.icons.extended)
api(libs.compose.material3)
api(libs.compose.material3.window.size)
api(libs.kotlinx.collections.immutable)
diff --git a/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/InfoButton.kt b/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/InfoButton.kt
index d60897baec..5f2e336e66 100644
--- a/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/InfoButton.kt
+++ b/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/InfoButton.kt
@@ -3,8 +3,6 @@ package com.gemwallet.android.ui.components
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Info
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
@@ -13,6 +11,7 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.theme.alpha50
import androidx.compose.ui.draw.clip
import com.gemwallet.android.ui.theme.smallIconSize
@@ -25,7 +24,7 @@ fun InfoButton(entity: InfoSheetEntity) {
.clip(RoundedCornerShape(percent = 50))
.size(smallIconSize)
.clickable(onClick = { showBottomSheet = true }),
- imageVector = Icons.Outlined.Info,
+ imageVector = AppIcons.InfoOutlined,
contentDescription = "",
tint = MaterialTheme.colorScheme.secondary.copy(alpha = alpha50),
)
diff --git a/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/QRScanner.kt b/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/QRScanner.kt
index 45fe8f9e41..5be3b5c529 100644
--- a/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/QRScanner.kt
+++ b/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/QRScanner.kt
@@ -15,10 +15,6 @@ import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Camera
-import androidx.compose.material.icons.filled.Close
-import androidx.compose.material.icons.filled.Image
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.Button
import androidx.compose.material3.Icon
@@ -55,6 +51,7 @@ import coil3.request.CachePolicy
import coil3.request.ImageRequest
import com.gemwallet.android.ui.R
import com.gemwallet.android.ui.components.screen.Scene
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.theme.alpha70
import com.gemwallet.android.ui.theme.defaultPadding
import com.google.accompanist.permissions.ExperimentalPermissionsApi
@@ -177,15 +174,15 @@ fun QRScannerScene(
actions = {
if (!isCameraGranted) {
IconButton(onClick = onGrantPermission) {
- Icon(imageVector = Icons.Default.Camera, contentDescription = "from_camera")
+ Icon(imageVector = AppIcons.Camera, contentDescription = "from_camera")
}
}
IconButton(onClick = { galleryLauncher.launch("image/*") }) {
- Icon(imageVector = Icons.Default.Image, contentDescription = "from_image")
+ Icon(imageVector = AppIcons.Image, contentDescription = "from_image")
}
if (imageUri != null) {
IconButton(onClick = cancel) {
- Icon(imageVector = Icons.Default.Close, contentDescription = "close_image")
+ Icon(imageVector = AppIcons.Close, contentDescription = "close_image")
}
}
},
diff --git a/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/SearchBar.kt b/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/SearchBar.kt
index 5671b5c4eb..658f677227 100644
--- a/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/SearchBar.kt
+++ b/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/SearchBar.kt
@@ -10,9 +10,6 @@ import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.foundation.text.input.TextFieldLineLimits
import androidx.compose.foundation.text.input.TextFieldState
import androidx.compose.foundation.text.input.clearText
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Close
-import androidx.compose.material.icons.filled.Search
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
@@ -30,6 +27,7 @@ import androidx.compose.ui.text.input.KeyboardCapitalization
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.gemwallet.android.ui.components.list_item.listItem
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.models.ListPosition
@Composable
@@ -68,7 +66,7 @@ fun SearchBar(
)
}
IconButton(onClick = focusRequester::requestFocus) {
- Icon(imageVector = Icons.Default.Search, contentDescription = "search")
+ Icon(imageVector = AppIcons.Search, contentDescription = "search")
}
if (query.text.isNotEmpty()) {
IconButton(
@@ -77,7 +75,7 @@ fun SearchBar(
query.clearText()
}
) {
- Icon(imageVector = Icons.Default.Close, contentDescription = "Clear")
+ Icon(imageVector = AppIcons.Close, contentDescription = "Clear")
}
}
}
diff --git a/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/VerificationStatusExt.kt b/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/VerificationStatusExt.kt
index 2296e9de39..c0b0dbe5d4 100644
--- a/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/VerificationStatusExt.kt
+++ b/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/VerificationStatusExt.kt
@@ -1,14 +1,12 @@
package com.gemwallet.android.ui.components
import androidx.annotation.StringRes
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Verified
-import androidx.compose.material.icons.outlined.Warning
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.vector.ImageVector
import com.gemwallet.android.ui.R
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.theme.pendingColor
import uniffi.gemstone.WalletConnectionVerificationStatus
@@ -20,9 +18,10 @@ fun WalletConnectionVerificationStatus.titleRes(): Int = when (this) {
WalletConnectionVerificationStatus.MALICIOUS -> R.string.asset_verification_suspicious
}
+@Composable
fun WalletConnectionVerificationStatus.icon(): ImageVector = when (this) {
- WalletConnectionVerificationStatus.VERIFIED -> Icons.Outlined.Verified
- else -> Icons.Outlined.Warning
+ WalletConnectionVerificationStatus.VERIFIED -> AppIcons.Verified
+ else -> AppIcons.Warning
}
@Composable
diff --git a/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/buttons/CopyButton.kt b/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/buttons/CopyButton.kt
index 10eaff0a02..289bb4582c 100644
--- a/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/buttons/CopyButton.kt
+++ b/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/buttons/CopyButton.kt
@@ -2,8 +2,6 @@ package com.gemwallet.android.ui.components.buttons
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.size
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.ContentCopy
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
@@ -13,6 +11,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import com.gemwallet.android.ui.R
+import com.gemwallet.android.ui.icons.AppIcons
private val iconSize = 18.dp
private val iconTextSpacing = 6.dp
@@ -24,7 +23,7 @@ fun CopyButton(
) {
TextButton(onClick = onClick, modifier = modifier) {
Icon(
- imageVector = Icons.Outlined.ContentCopy,
+ imageVector = AppIcons.ContentCopyOutlined,
contentDescription = null,
modifier = Modifier.size(iconSize),
tint = MaterialTheme.colorScheme.onSurface,
diff --git a/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/chart/ChartStateView.kt b/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/chart/ChartStateView.kt
index 0186cb7b2b..045162393b 100644
--- a/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/chart/ChartStateView.kt
+++ b/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/chart/ChartStateView.kt
@@ -7,8 +7,6 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Warning
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
@@ -19,6 +17,7 @@ import com.gemwallet.android.ui.R
import com.gemwallet.android.ui.components.PeriodsPanel
import com.gemwallet.android.ui.components.empty.EmptyStateView
import com.gemwallet.android.ui.components.progress.CircularProgressIndicator20
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.models.chart.ChartHeaderUIModel
import com.gemwallet.android.ui.models.chart.ChartViewState
import com.gemwallet.android.ui.theme.chartFrameHeight
@@ -62,7 +61,7 @@ fun ChartStateView(
ChartViewState.Error -> EmptyStateView(
modifier = Modifier.fillMaxSize(),
title = stringResource(R.string.errors_no_data_available),
- iconVector = Icons.Outlined.Warning,
+ iconVector = AppIcons.Warning,
)
ChartViewState.Ready -> chartBody()
}
diff --git a/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/dialog/DialogBar.kt b/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/dialog/DialogBar.kt
index 4e29038245..aab10574ae 100644
--- a/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/dialog/DialogBar.kt
+++ b/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/dialog/DialogBar.kt
@@ -4,8 +4,6 @@ import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Close
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.IconButtonDefaults
@@ -15,6 +13,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.theme.alpha10
import com.gemwallet.android.ui.theme.paddingHalfSmall
import com.gemwallet.android.ui.theme.paddingSmall
@@ -45,7 +44,7 @@ fun DialogBar(
containerColor = MaterialTheme.colorScheme.secondary.copy(alpha = alpha10),
),
) {
- Icon(imageVector = Icons.Default.Close, contentDescription = null)
+ Icon(imageVector = AppIcons.Close, contentDescription = null)
}
}
if (title != null) {
diff --git a/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/empty/EmptyContentView.kt b/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/empty/EmptyContentView.kt
index bea46d19b9..102934eebe 100644
--- a/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/empty/EmptyContentView.kt
+++ b/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/empty/EmptyContentView.kt
@@ -1,13 +1,12 @@
package com.gemwallet.android.ui.components.empty
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Search
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import com.gemwallet.android.ui.R
+import com.gemwallet.android.ui.icons.AppIcons
@Composable
fun EmptyContentView(
@@ -76,9 +75,10 @@ private fun EmptyContentType.icon() = when (this) {
is EmptyContentType.Recents -> painterResource(R.drawable.empty_activity)
}
+@Composable
private fun EmptyContentType.iconVector(): ImageVector? = when (this) {
is EmptyContentType.SearchAssets, is EmptyContentType.SearchActivity,
- is EmptyContentType.SearchNetworks -> Icons.Default.Search
+ is EmptyContentType.SearchNetworks -> AppIcons.Search
else -> null
}
diff --git a/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/fields/TransferTextFieldActions.kt b/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/fields/TransferTextFieldActions.kt
index c04570db25..a294ce45cc 100644
--- a/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/fields/TransferTextFieldActions.kt
+++ b/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/fields/TransferTextFieldActions.kt
@@ -2,16 +2,13 @@ package com.gemwallet.android.ui.components.fields
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.size
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Clear
-import androidx.compose.material.icons.filled.ContentPaste
-import androidx.compose.material.icons.filled.QrCodeScanner
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
+import com.gemwallet.android.ui.icons.AppIcons
private val IconButtonSize = 36.dp
@@ -25,7 +22,7 @@ fun TransferTextFieldActions(
if (value.isNotEmpty()) {
IconButton(modifier = Modifier.size(IconButtonSize), onClick = onClean) {
Icon(
- imageVector = Icons.Default.Clear,
+ imageVector = AppIcons.Close,
contentDescription = "clear",
tint = MaterialTheme.colorScheme.onSurface,
)
@@ -36,7 +33,7 @@ fun TransferTextFieldActions(
if (paste != null) {
IconButton(modifier = Modifier.size(IconButtonSize), onClick = paste) {
Icon(
- imageVector = Icons.Default.ContentPaste,
+ imageVector = AppIcons.ContentPaste,
contentDescription = "paste",
tint = MaterialTheme.colorScheme.onSurface,
)
@@ -45,7 +42,7 @@ fun TransferTextFieldActions(
if (qrScanner != null) {
IconButton(modifier = Modifier.size(IconButtonSize), onClick = qrScanner) {
Icon(
- imageVector = Icons.Default.QrCodeScanner,
+ imageVector = AppIcons.QrCodeScanner,
contentDescription = "scan_address",
tint = MaterialTheme.colorScheme.onSurface,
)
diff --git a/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/filters/ActivitiesFilter.kt b/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/filters/ActivitiesFilter.kt
index 2fcf59d737..8f446e6781 100644
--- a/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/filters/ActivitiesFilter.kt
+++ b/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/filters/ActivitiesFilter.kt
@@ -7,8 +7,6 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.text.input.rememberTextFieldState
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.Article
import androidx.compose.material3.Icon
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
@@ -29,6 +27,7 @@ import com.gemwallet.android.ui.components.image.IconWithBadge
import com.gemwallet.android.ui.components.list_item.property.PropertyDataText
import com.gemwallet.android.ui.components.list_item.property.PropertyItem
import com.gemwallet.android.ui.components.list_item.property.PropertyTitleText
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.models.ListPosition
import com.gemwallet.android.ui.models.TransactionTypeFilter
import com.gemwallet.android.ui.theme.iconSize
@@ -93,7 +92,7 @@ fun TransactionsFilter(
trailing = {
Icon(
modifier = Modifier.size(iconSize),
- imageVector = Icons.AutoMirrored.Default.Article,
+ imageVector = AppIcons.Article,
contentDescription = null,
)
}
diff --git a/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/image/NftImagePlaceholder.kt b/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/image/NftImagePlaceholder.kt
index 04f0e7b4cf..311348a100 100644
--- a/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/image/NftImagePlaceholder.kt
+++ b/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/image/NftImagePlaceholder.kt
@@ -8,8 +8,6 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Image
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
@@ -21,6 +19,7 @@ import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import com.gemwallet.android.ui.components.progress.CircularProgressIndicator20
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.theme.paddingDefault
import com.gemwallet.android.ui.theme.paddingLarge
@@ -51,7 +50,7 @@ fun NftImagePlaceholder(
contentAlignment = Alignment.Center,
) {
Icon(
- imageVector = Icons.Outlined.Image,
+ imageVector = AppIcons.ImageOutlined,
contentDescription = null,
tint = MaterialTheme.colorScheme.outline,
modifier = Modifier.size(iconSize),
diff --git a/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/list_head/AmountListHead.kt b/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/list_head/AmountListHead.kt
index 000a33ff05..316caac9ed 100644
--- a/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/list_head/AmountListHead.kt
+++ b/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/list_head/AmountListHead.kt
@@ -20,13 +20,6 @@ import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.text.TextAutoSize
import androidx.compose.foundation.text.modifiers.TextAutoSizeLayoutScope
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.Send
-import androidx.compose.material.icons.filled.AttachMoney
-import androidx.compose.material.icons.filled.Autorenew
-import androidx.compose.material.icons.filled.QrCode2
-import androidx.compose.material.icons.filled.Visibility
-import androidx.compose.material.icons.outlined.Info
import androidx.compose.material3.Button
import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.Icon
@@ -68,10 +61,12 @@ import com.gemwallet.android.ui.components.mask
import com.gemwallet.android.ui.components.image.AssetIcon
import com.gemwallet.android.ui.components.image.IconWithBadge
import com.gemwallet.android.ui.components.list_item.color
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.theme.SceneSizing
import com.gemwallet.android.ui.theme.Spacer16
import com.gemwallet.android.ui.theme.Spacer8
import com.gemwallet.android.ui.theme.WalletTheme
+import com.gemwallet.android.ui.theme.actionIconGlyphSize
import com.gemwallet.android.ui.theme.actionIconSize
import com.gemwallet.android.ui.theme.alpha50
import com.gemwallet.android.ui.theme.headerIconSize
@@ -217,7 +212,7 @@ fun AssetHeadActions(
AmountHeadAction(
modifier = Modifier.weight(1f),
title = stringResource(id = R.string.wallet_send),
- imageVector = Icons.AutoMirrored.Default.Send,
+ imageVector = AppIcons.Send,
enabled = transferEnabled && operationsEnabled,
contentDescription = stringResource(id = R.string.wallet_send),
fontSize = actionFontSize,
@@ -231,7 +226,7 @@ fun AssetHeadActions(
AmountHeadAction(
modifier = Modifier.weight(1f),
title = stringResource(id = R.string.wallet_receive),
- imageVector = Icons.Default.QrCode2,
+ imageVector = AppIcons.Receive,
enabled = operationsEnabled,
contentDescription = stringResource(id = R.string.wallet_receive),
fontSize = actionFontSize,
@@ -246,7 +241,7 @@ fun AssetHeadActions(
modifier = Modifier.weight(1f)
.testTag("assetBuy"),
title = stringResource(id = R.string.wallet_buy),
- imageVector = Icons.Default.AttachMoney,
+ imageVector = AppIcons.Buy,
enabled = operationsEnabled,
contentDescription = stringResource(id = R.string.wallet_buy),
fontSize = actionFontSize,
@@ -260,7 +255,7 @@ fun AssetHeadActions(
AmountHeadAction(
modifier = Modifier.weight(1f),
title = stringResource(id = R.string.wallet_swap),
- imageVector = Icons.Default.Autorenew,
+ imageVector = AppIcons.Swap,
enabled = operationsEnabled,
contentDescription = stringResource(id = R.string.wallet_swap),
fontSize = actionFontSize,
@@ -297,7 +292,7 @@ private fun AssetWatchOnly() {
verticalAlignment = Alignment.CenterVertically,
) {
Icon(
- imageVector = Icons.Default.Visibility,
+ imageVector = AppIcons.Visibility,
contentDescription = null,
)
Spacer8()
@@ -316,7 +311,7 @@ private fun AssetWatchOnly() {
onClick = openWatchWalletInfo,
) {
Icon(
- imageVector = Icons.Outlined.Info,
+ imageVector = AppIcons.InfoOutlined,
contentDescription = stringResource(R.string.common_learn_more),
)
}
@@ -346,23 +341,26 @@ fun AmountHeadAction(
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.spacedBy(paddingSmall / (fontSize.value * 0.5f))
) {
- Icon(
+ Box(
modifier = Modifier
.requiredSize(actionIconSize)
.background(
color = MaterialTheme.colorScheme.primary.copy(
alpha = if (enabled) 1f else alpha50,
),
- shape = CircleShape
- )
- .padding(paddingDefault)
- ,
- imageVector = imageVector,
- tint = MaterialTheme.colorScheme.onPrimary.copy(
- alpha = if (enabled) 1f else alpha50,
- ),
- contentDescription = contentDescription,
- )
+ shape = CircleShape,
+ ),
+ contentAlignment = Alignment.Center,
+ ) {
+ Icon(
+ modifier = Modifier.size(actionIconGlyphSize),
+ imageVector = imageVector,
+ tint = MaterialTheme.colorScheme.onPrimary.copy(
+ alpha = if (enabled) 1f else alpha50,
+ ),
+ contentDescription = contentDescription,
+ )
+ }
Text(
text = title,
color = MaterialTheme.colorScheme.secondary,
diff --git a/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/list_head/SwapListHead.kt b/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/list_head/SwapListHead.kt
index 15b6f110ad..9eef41d5bf 100644
--- a/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/list_head/SwapListHead.kt
+++ b/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/list_head/SwapListHead.kt
@@ -7,8 +7,6 @@ import androidx.compose.foundation.layout.Row
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.filled.ArrowDownward
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
@@ -24,6 +22,7 @@ import com.gemwallet.android.model.ValueFormatter
import com.gemwallet.android.model.CurrencyFormatter
import com.gemwallet.android.ui.components.list_item.ListItemDefaults
import com.gemwallet.android.ui.components.list_item.listItem
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.models.ListPosition
import com.gemwallet.android.ui.theme.Spacer16
import com.gemwallet.android.ui.theme.compactIconSize
@@ -65,7 +64,7 @@ fun SwapListHead(
modifier = Modifier
.align(Alignment.Center)
.size(compactIconSize),
- imageVector = Icons.Default.ArrowDownward,
+ imageVector = AppIcons.ArrowDownward,
contentDescription = null
)
}
diff --git a/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/list_item/AssetContextMenu.kt b/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/list_item/AssetContextMenu.kt
index b7dde473da..b732beed21 100644
--- a/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/list_item/AssetContextMenu.kt
+++ b/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/list_item/AssetContextMenu.kt
@@ -3,11 +3,6 @@ package com.gemwallet.android.ui.components.list_item
import androidx.annotation.StringRes
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.ColumnScope
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.AddCircleOutline
-import androidx.compose.material.icons.filled.ContentCopy
-import androidx.compose.material.icons.filled.PushPin
-import androidx.compose.material.icons.filled.VisibilityOff
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.Icon
import androidx.compose.material3.Text
@@ -22,6 +17,7 @@ import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import com.gemwallet.android.ui.R
import com.gemwallet.android.ui.components.clipboard.setPlainText
+import com.gemwallet.android.ui.icons.AppIcons
import com.wallet.core.primitives.AssetId
@Immutable
@@ -63,7 +59,7 @@ fun rememberAssetContextMenuItems(
titleRes = if (isPinned) R.string.common_unpin else R.string.common_pin,
icon = {
if (isPinned) Icon(painterResource(R.drawable.keep_off), null)
- else Icon(Icons.Default.PushPin, null)
+ else Icon(AppIcons.PushPin, null)
},
onClick = { cb(assetId) },
)
@@ -71,21 +67,21 @@ fun rememberAssetContextMenuItems(
actions.onHide?.let { cb ->
AssetContextMenuItem(
titleRes = R.string.common_hide,
- icon = { Icon(Icons.Default.VisibilityOff, null) },
+ icon = { Icon(AppIcons.VisibilityOff, null) },
onClick = { cb(assetId) },
)
},
actions.onAddToWallet?.takeUnless { isBalanceEnabled }?.let { cb ->
AssetContextMenuItem(
titleRes = R.string.asset_add_to_wallet,
- icon = { Icon(Icons.Default.AddCircleOutline, null) },
+ icon = { Icon(AppIcons.AddCircleOutlined, null) },
onClick = { cb(assetId) },
)
},
address?.takeUnless(String::isEmpty)?.let { addr ->
AssetContextMenuItem(
titleRes = R.string.wallet_copy_address,
- icon = { Icon(Icons.Default.ContentCopy, null) },
+ icon = { Icon(AppIcons.ContentCopy, null) },
onClick = { clipboard.setPlainText(context, addr) },
)
},
diff --git a/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/list_item/PinnedAssetsHeaderItem.kt b/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/list_item/PinnedAssetsHeaderItem.kt
index f2789eb9ec..e742d17c0d 100644
--- a/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/list_item/PinnedAssetsHeaderItem.kt
+++ b/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/list_item/PinnedAssetsHeaderItem.kt
@@ -4,9 +4,6 @@ import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.size
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.PushPin
-import androidx.compose.material.icons.filled.StarOutline
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
@@ -15,6 +12,7 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import com.gemwallet.android.ui.R
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.models.AssetsGroupType
import com.gemwallet.android.ui.theme.paddingDefault
import com.gemwallet.android.ui.theme.paddingHalfSmall
@@ -33,8 +31,8 @@ fun PinnedAssetsHeaderItem(type: AssetsGroupType) {
Icon(
modifier = Modifier.size(paddingDefault),
imageVector = when (type) {
- AssetsGroupType.Popular -> Icons.Default.StarOutline
- AssetsGroupType.Pined -> Icons.Default.PushPin
+ AssetsGroupType.Popular -> AppIcons.StarOutlined
+ AssetsGroupType.Pined -> AppIcons.PushPin
AssetsGroupType.None -> return
},
tint = MaterialTheme.colorScheme.secondary,
diff --git a/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/list_item/SubheaderItem.kt b/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/list_item/SubheaderItem.kt
index 7fb1821ec4..80c3b4a2bd 100644
--- a/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/list_item/SubheaderItem.kt
+++ b/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/list_item/SubheaderItem.kt
@@ -10,8 +10,6 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.requiredSize
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
@@ -23,6 +21,7 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.theme.compactIconSize
import com.gemwallet.android.ui.theme.paddingHalfSmall
@@ -88,7 +87,7 @@ fun ChevronIcon(
contentAlignment = Alignment.Center,
) {
Icon(
- imageVector = Icons.AutoMirrored.Filled.KeyboardArrowRight,
+ imageVector = AppIcons.KeyboardArrowRight,
contentDescription = null,
modifier = Modifier
.offset(x = ChevronIconDefaults.horizontalNudge)
diff --git a/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/list_item/WalletItem.kt b/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/list_item/WalletItem.kt
index 03ecb08981..5197fdcf9a 100644
--- a/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/list_item/WalletItem.kt
+++ b/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/list_item/WalletItem.kt
@@ -1,8 +1,6 @@
package com.gemwallet.android.ui.components.list_item
import androidx.compose.foundation.layout.Row
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Settings
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
@@ -15,6 +13,7 @@ import com.gemwallet.android.domains.asset.getIconUrl
import com.gemwallet.android.ext.AddressFormatter
import com.gemwallet.android.ui.R
import com.gemwallet.android.ui.components.image.IconWithBadge
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.models.ListPosition
import com.gemwallet.android.ui.theme.Spacer16
import com.gemwallet.android.ui.theme.Spacer8
@@ -104,7 +103,7 @@ private fun WalletEditButton(
) {
IconButton(onClick = onClick) {
Icon(
- imageVector = Icons.Outlined.Settings,
+ imageVector = AppIcons.SettingsOutlined,
contentDescription = "edit",
tint = MaterialTheme.colorScheme.secondary,
)
diff --git a/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/list_item/WarningItem.kt b/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/list_item/WarningItem.kt
index a2855b863b..8c347964cc 100644
--- a/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/list_item/WarningItem.kt
+++ b/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/list_item/WarningItem.kt
@@ -5,8 +5,6 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.size
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Warning
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
@@ -15,6 +13,7 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.style.TextOverflow
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.models.ListPosition
import com.gemwallet.android.ui.theme.Spacer4
import com.gemwallet.android.ui.theme.Spacer8
@@ -42,7 +41,7 @@ fun WarningItem(
Row(verticalAlignment = Alignment.CenterVertically) {
Icon(
modifier = Modifier.size(smallIconSize),
- imageVector = Icons.Outlined.Warning,
+ imageVector = AppIcons.Warning,
contentDescription = null,
tint = color,
)
diff --git a/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/list_item/property/AddressPropertyItem.kt b/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/list_item/property/AddressPropertyItem.kt
index b80493678f..e011f2cc47 100644
--- a/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/list_item/property/AddressPropertyItem.kt
+++ b/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/list_item/property/AddressPropertyItem.kt
@@ -1,8 +1,6 @@
package com.gemwallet.android.ui.components.list_item.property
import androidx.annotation.StringRes
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ContentCopy
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.Icon
import androidx.compose.material3.Text
@@ -18,6 +16,7 @@ import androidx.compose.ui.res.stringResource
import com.gemwallet.android.ui.R
import com.gemwallet.android.ui.components.clipboard.setPlainText
import com.gemwallet.android.ui.components.list_item.DropDownContextItem
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.models.ListPosition
import com.gemwallet.android.ui.open
import com.wallet.core.primitives.BlockExplorerLink
@@ -56,7 +55,7 @@ fun AddressPropertyItem(
menuItems = {
DropdownMenuItem(
text = { Text(text = stringResource(id = R.string.wallet_copy_address)) },
- trailingIcon = { Icon(Icons.Default.ContentCopy, contentDescription = null) },
+ trailingIcon = { Icon(AppIcons.ContentCopy, contentDescription = null) },
onClick = {
isExpanded = false
clipboardManager.setPlainText(context, copyValue)
diff --git a/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/list_item/transaction/TransactionItem.kt b/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/list_item/transaction/TransactionItem.kt
index fa0e18126f..98f488d611 100644
--- a/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/list_item/transaction/TransactionItem.kt
+++ b/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/list_item/transaction/TransactionItem.kt
@@ -7,9 +7,6 @@ import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowDownward
-import androidx.compose.material.icons.filled.ArrowUpward
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
@@ -31,6 +28,7 @@ import com.gemwallet.android.ui.components.list_item.ListItemDefaults
import com.gemwallet.android.ui.components.list_item.ListItemSupportText
import com.gemwallet.android.ui.components.list_item.ListItemTitleText
import com.gemwallet.android.ui.components.progress.CircularProgressIndicator10
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.models.ListPosition
import com.gemwallet.android.ui.theme.Spacer8
import com.gemwallet.android.ui.theme.alpha10
@@ -93,8 +91,8 @@ private const val BADGE_ICON_SCALE = 0.65f
private fun DirectionBadgedIcon(data: TransactionDataAggregate) {
val size = listItemIconSize
val icon = when (data.direction) {
- TransactionDirection.Incoming -> Icons.Default.ArrowDownward
- else -> Icons.Default.ArrowUpward
+ TransactionDirection.Incoming -> AppIcons.ArrowDownward
+ else -> AppIcons.ArrowUpward
}
val color = when (data.direction) {
TransactionDirection.Incoming -> MaterialTheme.colorScheme.tertiary
diff --git a/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/screen/Scene.kt b/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/screen/Scene.kt
index dd8a3b9a88..759a790174 100644
--- a/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/screen/Scene.kt
+++ b/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/screen/Scene.kt
@@ -13,9 +13,6 @@ import androidx.compose.foundation.layout.imePadding
import androidx.compose.foundation.layout.widthIn
import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.layout.padding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material.icons.filled.Close
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.Color
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.theme.SceneSizing
import com.gemwallet.android.ui.theme.Spacer16
import com.gemwallet.android.ui.theme.WindowDimension
@@ -117,7 +115,7 @@ fun Scene(
if (onClose != null) {
IconButton(onClick = onClose) {
Icon(
- imageVector = if (closeIcon) Icons.Default.Close else Icons.AutoMirrored.Filled.ArrowBack,
+ imageVector = if (closeIcon) AppIcons.Close else AppIcons.ArrowBack,
contentDescription = null,
)
}
diff --git a/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/swap/SwapDetailsComponents.kt b/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/swap/SwapDetailsComponents.kt
index d25959cddd..18961cd69a 100644
--- a/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/swap/SwapDetailsComponents.kt
+++ b/android/ui/src/main/kotlin/com/gemwallet/android/ui/components/swap/SwapDetailsComponents.kt
@@ -8,8 +8,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.itemsIndexed
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.SwapVert
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
@@ -40,6 +38,7 @@ import com.gemwallet.android.ui.components.list_item.property.PropertyItem
import com.gemwallet.android.ui.components.list_item.property.PropertyTitleText
import com.gemwallet.android.ui.components.progress.CircularProgressIndicator20
import com.gemwallet.android.ui.components.screen.ModalBottomSheet
+import com.gemwallet.android.ui.icons.AppIcons
import com.gemwallet.android.ui.models.ListPosition
import com.gemwallet.android.ui.models.swap.SwapDetailsUIModel
import com.gemwallet.android.ui.models.swap.SwapPriceImpactUIModel
@@ -240,7 +239,7 @@ private fun SwapRatePropertyItem(rate: SwapRateUIModel, listPosition: ListPositi
Spacer4()
Icon(
modifier = Modifier.clip(MaterialTheme.shapes.small),
- imageVector = Icons.Default.SwapVert,
+ imageVector = AppIcons.SwapVert,
contentDescription = null,
tint = MaterialTheme.colorScheme.secondary,
)
diff --git a/android/ui/src/main/kotlin/com/gemwallet/android/ui/icons/AppIcons.kt b/android/ui/src/main/kotlin/com/gemwallet/android/ui/icons/AppIcons.kt
new file mode 100644
index 0000000000..f462fdc916
--- /dev/null
+++ b/android/ui/src/main/kotlin/com/gemwallet/android/ui/icons/AppIcons.kt
@@ -0,0 +1,65 @@
+package com.gemwallet.android.ui.icons
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.vectorResource
+import com.gemwallet.android.ui.R
+
+object AppIcons {
+ val Send: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_action_send)
+ val Receive: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_action_receive)
+ val Buy: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_action_buy)
+ val Swap: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_action_swap)
+ val Deposit: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_action_deposit)
+ val Withdraw: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_action_withdraw)
+
+ val Add: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_add)
+ val AddCircleOutlined: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_add_circle_outlined)
+ val ArrowBack: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_arrow_back)
+ val ArrowCircleDown: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_arrow_circle_down)
+ val ArrowCircleUp: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_arrow_circle_up)
+ val ArrowDownward: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_arrow_downward)
+ val ArrowUpward: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_arrow_upward)
+ val Article: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_article)
+ val Camera: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_camera)
+ val Cancel: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_cancel)
+ val Check: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_check)
+ val CheckCircle: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_check_circle)
+ val CheckCircleOutlined: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_check_circle_outlined)
+ val Close: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_close)
+ val ContentCopy: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_content_copy)
+ val ContentCopyOutlined: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_content_copy_outlined)
+ val ContentPaste: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_content_paste)
+ val CurrencyBitcoin: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_currency_bitcoin)
+ val Delete: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_delete)
+ val ElectricBolt: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_electric_bolt)
+ val EmojiEvents: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_emoji_events)
+ val Error: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_error)
+ val ExpandMore: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_expand_more)
+ val FilterAlt: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_filter_alt)
+ val History: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_history)
+ val Image: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_image)
+ val ImageOutlined: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_image_outlined)
+ val Info: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_info)
+ val InfoOutlined: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_info_outlined)
+ val KeyboardArrowDown: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_keyboard_arrow_down)
+ val KeyboardArrowRight: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_keyboard_arrow_right)
+ val MoreVert: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_more_vert)
+ val Notifications: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_notifications)
+ val NotificationsOutlined: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_notifications_outlined)
+ val PushPin: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_push_pin)
+ val QrCodeScanner: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_qr_code_scanner)
+ val Refresh: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_refresh)
+ val Search: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_search)
+ val Settings: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_settings)
+ val SettingsOutlined: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_settings_outlined)
+ val Share: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_share)
+ val StarOutlined: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_star_outlined)
+ val SwapVert: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_swap_vert)
+ val Tune: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_tune)
+ val Verified: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_verified)
+ val Visibility: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_visibility)
+ val VisibilityOff: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_visibility_off)
+ val Wallet: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_wallet)
+ val Warning: ImageVector @Composable get() = ImageVector.vectorResource(R.drawable.ic_warning)
+}
diff --git a/android/ui/src/main/kotlin/com/gemwallet/android/ui/theme/paddings.kt b/android/ui/src/main/kotlin/com/gemwallet/android/ui/theme/paddings.kt
index cd5c417b72..d32d5937fb 100644
--- a/android/ui/src/main/kotlin/com/gemwallet/android/ui/theme/paddings.kt
+++ b/android/ui/src/main/kotlin/com/gemwallet/android/ui/theme/paddings.kt
@@ -19,7 +19,8 @@ val tinyIconSize = 16.dp
val listItemIconSize = 44.dp
val headerLargeImageSize = 88.dp
val iconSize = 32.dp
-val actionIconSize = 54.dp
+val actionIconSize = 48.dp
+val actionIconGlyphSize = 28.dp
val space0 = 0.dp
val space1 = 1.dp
diff --git a/android/ui/src/main/res/drawable/ic_action_buy.xml b/android/ui/src/main/res/drawable/ic_action_buy.xml
new file mode 100644
index 0000000000..3bd4e25536
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_action_buy.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_action_deposit.xml b/android/ui/src/main/res/drawable/ic_action_deposit.xml
new file mode 100644
index 0000000000..fe955f0ab4
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_action_deposit.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_action_receive.xml b/android/ui/src/main/res/drawable/ic_action_receive.xml
new file mode 100644
index 0000000000..3c63e678ec
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_action_receive.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_action_send.xml b/android/ui/src/main/res/drawable/ic_action_send.xml
new file mode 100644
index 0000000000..27f802e4a9
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_action_send.xml
@@ -0,0 +1,11 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_action_swap.xml b/android/ui/src/main/res/drawable/ic_action_swap.xml
new file mode 100644
index 0000000000..4ac69c08f8
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_action_swap.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_action_withdraw.xml b/android/ui/src/main/res/drawable/ic_action_withdraw.xml
new file mode 100644
index 0000000000..cd46879a50
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_action_withdraw.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_add.xml b/android/ui/src/main/res/drawable/ic_add.xml
new file mode 100644
index 0000000000..fe955f0ab4
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_add.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_add_circle_outlined.xml b/android/ui/src/main/res/drawable/ic_add_circle_outlined.xml
new file mode 100644
index 0000000000..c35f6770ea
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_add_circle_outlined.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_arrow_back.xml b/android/ui/src/main/res/drawable/ic_arrow_back.xml
new file mode 100644
index 0000000000..9a80bddf23
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_arrow_back.xml
@@ -0,0 +1,11 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_arrow_circle_down.xml b/android/ui/src/main/res/drawable/ic_arrow_circle_down.xml
new file mode 100644
index 0000000000..d402305389
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_arrow_circle_down.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_arrow_circle_up.xml b/android/ui/src/main/res/drawable/ic_arrow_circle_up.xml
new file mode 100644
index 0000000000..b9808110b3
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_arrow_circle_up.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_arrow_downward.xml b/android/ui/src/main/res/drawable/ic_arrow_downward.xml
new file mode 100644
index 0000000000..84e252456c
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_arrow_downward.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_arrow_upward.xml b/android/ui/src/main/res/drawable/ic_arrow_upward.xml
new file mode 100644
index 0000000000..cd46879a50
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_arrow_upward.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_article.xml b/android/ui/src/main/res/drawable/ic_article.xml
new file mode 100644
index 0000000000..4afe0fa6f9
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_article.xml
@@ -0,0 +1,11 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_camera.xml b/android/ui/src/main/res/drawable/ic_camera.xml
new file mode 100644
index 0000000000..73c94ecb32
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_camera.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_cancel.xml b/android/ui/src/main/res/drawable/ic_cancel.xml
new file mode 100644
index 0000000000..4b377e445a
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_cancel.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_check.xml b/android/ui/src/main/res/drawable/ic_check.xml
new file mode 100644
index 0000000000..c29f360eee
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_check.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_check_circle.xml b/android/ui/src/main/res/drawable/ic_check_circle.xml
new file mode 100644
index 0000000000..27aa04320f
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_check_circle.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_check_circle_outlined.xml b/android/ui/src/main/res/drawable/ic_check_circle_outlined.xml
new file mode 100644
index 0000000000..8a03582d0f
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_check_circle_outlined.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_close.xml b/android/ui/src/main/res/drawable/ic_close.xml
new file mode 100644
index 0000000000..77be1d01e2
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_close.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_content_copy.xml b/android/ui/src/main/res/drawable/ic_content_copy.xml
new file mode 100644
index 0000000000..e193024ea3
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_content_copy.xml
@@ -0,0 +1,11 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_content_copy_outlined.xml b/android/ui/src/main/res/drawable/ic_content_copy_outlined.xml
new file mode 100644
index 0000000000..a507477e22
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_content_copy_outlined.xml
@@ -0,0 +1,11 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_content_paste.xml b/android/ui/src/main/res/drawable/ic_content_paste.xml
new file mode 100644
index 0000000000..4f13358290
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_content_paste.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_currency_bitcoin.xml b/android/ui/src/main/res/drawable/ic_currency_bitcoin.xml
new file mode 100644
index 0000000000..e118bc8c4f
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_currency_bitcoin.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_delete.xml b/android/ui/src/main/res/drawable/ic_delete.xml
new file mode 100644
index 0000000000..c14cfe1d4d
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_delete.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_electric_bolt.xml b/android/ui/src/main/res/drawable/ic_electric_bolt.xml
new file mode 100644
index 0000000000..3c3f62b494
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_electric_bolt.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_emoji_events.xml b/android/ui/src/main/res/drawable/ic_emoji_events.xml
new file mode 100644
index 0000000000..5cf5c46e08
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_emoji_events.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_error.xml b/android/ui/src/main/res/drawable/ic_error.xml
new file mode 100644
index 0000000000..a9b2d6b70f
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_error.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_expand_more.xml b/android/ui/src/main/res/drawable/ic_expand_more.xml
new file mode 100644
index 0000000000..7b61d4835b
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_expand_more.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_filter_alt.xml b/android/ui/src/main/res/drawable/ic_filter_alt.xml
new file mode 100644
index 0000000000..098db38fdb
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_filter_alt.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_history.xml b/android/ui/src/main/res/drawable/ic_history.xml
new file mode 100644
index 0000000000..60aed78315
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_history.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_image.xml b/android/ui/src/main/res/drawable/ic_image.xml
new file mode 100644
index 0000000000..a82e69e3d0
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_image.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_image_outlined.xml b/android/ui/src/main/res/drawable/ic_image_outlined.xml
new file mode 100644
index 0000000000..e5093e8d9a
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_image_outlined.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_info.xml b/android/ui/src/main/res/drawable/ic_info.xml
new file mode 100644
index 0000000000..38417d29c3
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_info.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_info_outlined.xml b/android/ui/src/main/res/drawable/ic_info_outlined.xml
new file mode 100644
index 0000000000..1578e982c2
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_info_outlined.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_keyboard_arrow_down.xml b/android/ui/src/main/res/drawable/ic_keyboard_arrow_down.xml
new file mode 100644
index 0000000000..0f2341b659
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_keyboard_arrow_down.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_keyboard_arrow_right.xml b/android/ui/src/main/res/drawable/ic_keyboard_arrow_right.xml
new file mode 100644
index 0000000000..da6478ac8b
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_keyboard_arrow_right.xml
@@ -0,0 +1,11 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_more_vert.xml b/android/ui/src/main/res/drawable/ic_more_vert.xml
new file mode 100644
index 0000000000..e4aa85d59a
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_more_vert.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_notifications.xml b/android/ui/src/main/res/drawable/ic_notifications.xml
new file mode 100644
index 0000000000..fe5f6ed3ba
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_notifications.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_notifications_outlined.xml b/android/ui/src/main/res/drawable/ic_notifications_outlined.xml
new file mode 100644
index 0000000000..9f9b7238fa
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_notifications_outlined.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_push_pin.xml b/android/ui/src/main/res/drawable/ic_push_pin.xml
new file mode 100644
index 0000000000..072eb7ca7d
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_push_pin.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_qr_code_scanner.xml b/android/ui/src/main/res/drawable/ic_qr_code_scanner.xml
new file mode 100644
index 0000000000..9a95f47c43
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_qr_code_scanner.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_refresh.xml b/android/ui/src/main/res/drawable/ic_refresh.xml
new file mode 100644
index 0000000000..7ea1c2c2c4
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_refresh.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_search.xml b/android/ui/src/main/res/drawable/ic_search.xml
new file mode 100644
index 0000000000..29b92ebfa3
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_search.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_settings.xml b/android/ui/src/main/res/drawable/ic_settings.xml
new file mode 100644
index 0000000000..b29b12f902
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_settings.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_settings_outlined.xml b/android/ui/src/main/res/drawable/ic_settings_outlined.xml
new file mode 100644
index 0000000000..d65a101304
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_settings_outlined.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_share.xml b/android/ui/src/main/res/drawable/ic_share.xml
new file mode 100644
index 0000000000..0832f8dca0
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_share.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_star_outlined.xml b/android/ui/src/main/res/drawable/ic_star_outlined.xml
new file mode 100644
index 0000000000..2f441bc3ba
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_star_outlined.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_swap_vert.xml b/android/ui/src/main/res/drawable/ic_swap_vert.xml
new file mode 100644
index 0000000000..6abfd0d71c
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_swap_vert.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_tune.xml b/android/ui/src/main/res/drawable/ic_tune.xml
new file mode 100644
index 0000000000..cc1f7ebb0b
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_tune.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_verified.xml b/android/ui/src/main/res/drawable/ic_verified.xml
new file mode 100644
index 0000000000..a0cbef1318
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_verified.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_visibility.xml b/android/ui/src/main/res/drawable/ic_visibility.xml
new file mode 100644
index 0000000000..603a5743e4
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_visibility.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_visibility_off.xml b/android/ui/src/main/res/drawable/ic_visibility_off.xml
new file mode 100644
index 0000000000..6e8c54d90d
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_visibility_off.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_wallet.xml b/android/ui/src/main/res/drawable/ic_wallet.xml
new file mode 100644
index 0000000000..ada1566016
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_wallet.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/android/ui/src/main/res/drawable/ic_warning.xml b/android/ui/src/main/res/drawable/ic_warning.xml
new file mode 100644
index 0000000000..41daef89f4
--- /dev/null
+++ b/android/ui/src/main/res/drawable/ic_warning.xml
@@ -0,0 +1,10 @@
+
+
+