Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -74,7 +73,7 @@ fun AcceptTermsScreen(
uriHandler.open(context, AppUrl.page(PublicUrl.TERMS_OF_SERVICE))
}
) {
Icon(Icons.Outlined.Info, "")
Icon(AppIcons.InfoOutlined, "")
}
},
) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -48,7 +47,7 @@ fun SetupWalletScreen(
backHandle = true,
actions = {
IconButton(onClick = handleDone) {
Icon(imageVector = Icons.Default.Check, contentDescription = "")
Icon(imageVector = AppIcons.Check, contentDescription = "")
}
},
mainAction = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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) },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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,
)
Expand All @@ -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,
)
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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

Expand All @@ -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,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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 = {
Expand Down Expand Up @@ -167,7 +166,7 @@ fun AddAssetScene(
)
Spacer4()
Icon(
Icons.Outlined.Info, "",
AppIcons.InfoOutlined, "",
modifier = Modifier.size(compactIconSize),
tint = MaterialTheme.colorScheme.secondary,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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",
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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(
Expand All @@ -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 = {
Expand All @@ -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))
}
)
},
Expand Down
Loading
Loading