diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/bell.svg b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/bell.svg deleted file mode 100644 index e86007f0..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/bell.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/compose-multiplatform.xml b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/compose-multiplatform.xml deleted file mode 100644 index c0bcfb28..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/compose-multiplatform.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/copy.svg b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/copy.svg deleted file mode 100644 index b63853df..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/copy.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/currency_euro.png b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/currency_euro.png new file mode 100644 index 00000000..31d48fe0 Binary files /dev/null and b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/currency_euro.png differ diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/currency_gpb.png b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/currency_gpb.png new file mode 100644 index 00000000..643fb3b6 Binary files /dev/null and b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/currency_gpb.png differ diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/currency_usd.png b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/currency_usd.png new file mode 100644 index 00000000..f272f94e Binary files /dev/null and b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/currency_usd.png differ diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/euro.svg b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/euro.svg deleted file mode 100644 index c3edfee1..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/euro.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/fiat_btc.svg b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/fiat_btc.svg deleted file mode 100644 index 64451f40..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/fiat_btc.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/filter.xml b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/filter.xml deleted file mode 100644 index 2972f723..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/filter.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/flag_of_india.xml b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/flag_of_india.xml deleted file mode 100644 index fd210361..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/flag_of_india.xml +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/gpb.svg b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/gpb.svg deleted file mode 100644 index 067ea620..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/gpb.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/home.svg b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/home.svg deleted file mode 100644 index 085646c4..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/home.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/ic_star_empty.xml b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/ic_star_empty.xml deleted file mode 100644 index be22f749..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/ic_star_empty.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - \ No newline at end of file diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/ic_start_filled.xml b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/ic_start_filled.xml deleted file mode 100644 index 7d7dc714..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/ic_start_filled.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - \ No newline at end of file diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_bell.png b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_bell.png new file mode 100644 index 00000000..eda31a64 Binary files /dev/null and b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_bell.png differ diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_copy.png b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_copy.png new file mode 100644 index 00000000..97c75138 Binary files /dev/null and b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_copy.png differ diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_copy.svg b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_copy.svg deleted file mode 100644 index 8824cb83..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_copy.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_home.png b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_home.png new file mode 100644 index 00000000..8e63f66d Binary files /dev/null and b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_home.png differ diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_market.png b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_market.png new file mode 100644 index 00000000..ef981d6c Binary files /dev/null and b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_market.png differ diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_qr.png b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_qr.png new file mode 100644 index 00000000..f8a9042a Binary files /dev/null and b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_qr.png differ diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_qr.svg b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_qr.svg deleted file mode 100644 index d2d0bca8..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_qr.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_question_mark.png b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_question_mark.png new file mode 100644 index 00000000..98ede35a Binary files /dev/null and b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_question_mark.png differ diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_question_mark.svg b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_question_mark.svg deleted file mode 100644 index e68697a1..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_question_mark.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_settings.png b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_settings.png new file mode 100644 index 00000000..5f87423e Binary files /dev/null and b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_settings.png differ diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_sort.png b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_sort.png new file mode 100644 index 00000000..180d48ae Binary files /dev/null and b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_sort.png differ diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_trades.png b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_trades.png new file mode 100644 index 00000000..be216578 Binary files /dev/null and b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_trades.png differ diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/learn_and_discover.svg b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/learn_and_discover.svg deleted file mode 100644 index c8ba4bc7..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/learn_and_discover.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/logo.svg b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/logo.svg deleted file mode 100644 index ca281a8f..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/logo.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/logo_with_slogan.svg b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/logo_with_slogan.svg deleted file mode 100644 index 239aa1bb..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/logo_with_slogan.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/logo_with_slogan_xml.xml b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/logo_with_slogan_xml.xml deleted file mode 100644 index ac2a8116..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/logo_with_slogan_xml.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/market.svg b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/market.svg deleted file mode 100644 index 036bda12..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/market.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/qr.svg b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/qr.svg deleted file mode 100644 index 68ee9ad9..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/qr.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/question_mark.svg b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/question_mark.svg deleted file mode 100644 index aa6deb35..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/question_mark.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/right_arrow.svg b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/right_arrow.svg deleted file mode 100644 index 3d7c66ce..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/right_arrow.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/rounded_browser.svg b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/rounded_browser.svg deleted file mode 100644 index d96a3994..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/rounded_browser.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/rounded_chat.svg b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/rounded_chat.svg deleted file mode 100644 index 9b00c9d3..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/rounded_chat.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/rounded_star.svg b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/rounded_star.svg deleted file mode 100644 index ac06d522..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/rounded_star.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/settings.svg b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/settings.svg deleted file mode 100644 index 3aea4047..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/settings.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/sort.svg b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/sort.svg deleted file mode 100644 index fe6c3cc0..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/sort.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/trades.svg b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/trades.svg deleted file mode 100644 index 915bf9e4..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/trades.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/usd.svg b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/usd.svg deleted file mode 100644 index f59ccaec..00000000 --- a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/usd.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/components/CurrencyProfileCard.kt b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/components/CurrencyProfileCard.kt index 3c49480e..d892d340 100644 --- a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/components/CurrencyProfileCard.kt +++ b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/components/CurrencyProfileCard.kt @@ -1,5 +1,6 @@ package network.bisq.mobile.presentation.ui.components +import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row @@ -15,15 +16,15 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp -import bisqapps.shared.presentation.generated.resources.Res -import coil3.compose.AsyncImage import network.bisq.mobile.presentation.ui.components.foundation.BisqText import network.bisq.mobile.presentation.ui.theme.BisqTheme +import org.jetbrains.compose.resources.DrawableResource import org.jetbrains.compose.resources.ExperimentalResourceApi +import org.jetbrains.compose.resources.painterResource @OptIn(ExperimentalResourceApi::class) @Composable -fun CurrencyProfileCard(currencyName: String, currencyShort: String, imagePath: String) { +fun CurrencyProfileCard(currencyName: String, currencyShort: String, image: DrawableResource) { Row( modifier = Modifier.fillMaxWidth().padding(horizontal = 14.dp, vertical = 16.dp), verticalAlignment = Alignment.CenterVertically, @@ -32,11 +33,7 @@ fun CurrencyProfileCard(currencyName: String, currencyShort: String, imagePath: Row( verticalAlignment = Alignment.CenterVertically, ) { - AsyncImage( - model = Res.getUri(imagePath), - contentDescription = null, - modifier = Modifier.size(36.dp), - ) + Image(painterResource(image), null, modifier = Modifier.size(36.dp)) Spacer(modifier = Modifier.width(8.dp)) Column { BisqText.baseRegular( diff --git a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/components/atoms/icons/Icons.kt b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/components/atoms/icons/Icons.kt index 2f1ee88b..4b0551ef 100644 --- a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/components/atoms/icons/Icons.kt +++ b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/components/atoms/icons/Icons.kt @@ -4,16 +4,21 @@ import androidx.compose.foundation.Image import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import bisqapps.shared.presentation.generated.resources.Res -import bisqapps.shared.presentation.generated.resources.bell -import bisqapps.shared.presentation.generated.resources.img_bot_image +import bisqapps.shared.presentation.generated.resources.* import org.jetbrains.compose.resources.painterResource @Composable fun BellIcon(modifier: Modifier = Modifier) { - Image(painterResource(Res.drawable.bell), "Bell icon", modifier = modifier) + Image(painterResource(Res.drawable.icon_bell), "Bell icon", modifier = modifier) } @Composable fun UserIcon(modifier: Modifier = Modifier) { Image(painterResource(Res.drawable.img_bot_image), "User icon", modifier = modifier) +} + + +@Composable +fun SortIcon(modifier: Modifier = Modifier) { + Image(painterResource(Res.drawable.icon_sort), "Sort icon", modifier = modifier) } \ No newline at end of file diff --git a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/components/molecules/TopBar.kt b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/components/molecules/TopBar.kt index 6508fab7..53aa1943 100644 --- a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/components/molecules/TopBar.kt +++ b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/components/molecules/TopBar.kt @@ -46,23 +46,9 @@ fun TopBar(title: String = "",isHome:Boolean = false) { }, actions = { Row(verticalAlignment = Alignment.CenterVertically) { - -// AsyncImage( -// model = Res.getUri("drawable/bell.svg"), -// contentDescription = null, -// modifier = Modifier.size(30.dp), -// ) BellIcon(modifier = Modifier.size(30.dp)) - Spacer(modifier = Modifier.width(12.dp)) - -// AsyncImage( -// model = Res.getUri("drawable/bot_image.svg"), -// contentDescription = null, -// modifier = Modifier.size(40.dp), -// ) UserIcon(modifier = Modifier.size(30.dp)) - } }, diff --git a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/ExchangeScreen.kt b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/ExchangeScreen.kt index 8128712a..d806f420 100644 --- a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/ExchangeScreen.kt +++ b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/ExchangeScreen.kt @@ -20,11 +20,17 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalLayoutDirection import androidx.compose.ui.unit.dp import androidx.navigation.NavController +import bisqapps.shared.presentation.generated.resources.* import bisqapps.shared.presentation.generated.resources.Res +import bisqapps.shared.presentation.generated.resources.currency_euro +import bisqapps.shared.presentation.generated.resources.currency_gpb +import bisqapps.shared.presentation.generated.resources.currency_usd import coil3.compose.AsyncImage import network.bisq.mobile.presentation.ui.components.CurrencyProfileCard import network.bisq.mobile.components.MaterialTextField import network.bisq.mobile.presentation.ui.components.TopBar +import network.bisq.mobile.presentation.ui.components.atoms.icons.SortIcon +import network.bisq.mobile.presentation.ui.components.atoms.icons.UserIcon import org.jetbrains.compose.resources.ExperimentalResourceApi @OptIn(ExperimentalResourceApi::class) @@ -51,17 +57,13 @@ fun ExchangeScreen( Box(modifier = Modifier.width(250.dp)) { MaterialTextField(text = "Search", onValueChanged = {}) } - AsyncImage( - model = Res.getUri("drawable/sort.svg"), - contentDescription = null, - modifier = Modifier.size(24.dp), - ) + SortIcon(modifier = Modifier.size(24.dp)) } Spacer(modifier = Modifier.height(12.dp)) Column(verticalArrangement = Arrangement.spacedBy(12.dp)) { - CurrencyProfileCard("US Dollars", "USD", "drawable/usd.svg") - CurrencyProfileCard("Euro", "EUR", "drawable/euro.svg") - CurrencyProfileCard("British Pounds", "GPB", "drawable/gpb.svg") + CurrencyProfileCard("US Dollars", "USD", Res.drawable.currency_usd) + CurrencyProfileCard("Euro", "EUR", Res.drawable.currency_euro) + CurrencyProfileCard("British Pounds", "GPB", Res.drawable.currency_gpb) } } } diff --git a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/TabContainerScreen.kt b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/TabContainerScreen.kt index 967f0b38..a624a254 100644 --- a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/TabContainerScreen.kt +++ b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/TabContainerScreen.kt @@ -10,9 +10,6 @@ import androidx.navigation.compose.currentBackStackEntryAsState import androidx.navigation.compose.rememberNavController import bisqapps.shared.presentation.generated.resources.* import bisqapps.shared.presentation.generated.resources.Res -import bisqapps.shared.presentation.generated.resources.home -import bisqapps.shared.presentation.generated.resources.icon_question_mark -import bisqapps.shared.presentation.generated.resources.trades import network.bisq.mobile.presentation.ui.model.BottomNavigationItem import network.bisq.mobile.presentation.ui.navigation.BottomNavigation import network.bisq.mobile.presentation.ui.navigation.Graph @@ -21,10 +18,10 @@ import network.bisq.mobile.presentation.ui.navigation.graph.RootNavGraph import network.bisq.mobile.presentation.ui.theme.BisqTheme val navigationListItem = listOf( - BottomNavigationItem("Home", Routes.TabHome.name, Res.drawable.home), - BottomNavigationItem("Buy/Sell", Routes.TabExchange.name, Res.drawable.market), - BottomNavigationItem("My Trades", Routes.TabMyTrades.name, Res.drawable.trades), - BottomNavigationItem("Settings", Routes.TabSettings.name, Res.drawable.settings), + BottomNavigationItem("Home", Routes.TabHome.name, Res.drawable.icon_home), + BottomNavigationItem("Buy/Sell", Routes.TabExchange.name, Res.drawable.icon_market), + BottomNavigationItem("My Trades", Routes.TabMyTrades.name, Res.drawable.icon_trades), + BottomNavigationItem("Settings", Routes.TabSettings.name, Res.drawable.icon_settings), ) diff --git a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/URLScreen.kt b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/URLScreen.kt index 53484551..ed68b82e 100644 --- a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/URLScreen.kt +++ b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/URLScreen.kt @@ -6,12 +6,8 @@ import androidx.compose.animation.fadeIn import androidx.compose.animation.slideInHorizontally import androidx.compose.foundation.Image import androidx.compose.foundation.background -import androidx.compose.foundation.clickable -import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.* import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material3.Scaffold -import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.MutableState import androidx.compose.runtime.getValue @@ -21,16 +17,10 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.text.font.FontFamily -import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import androidx.compose.ui.unit.sp import androidx.navigation.NavController import bisqapps.shared.presentation.generated.resources.Res -import bisqapps.shared.presentation.generated.resources.icon_copy import bisqapps.shared.presentation.generated.resources.icon_question_mark -import coil3.compose.AsyncImage import network.bisq.mobile.components.MaterialTextField import network.bisq.mobile.presentation.ui.components.atoms.icons.BisqLogo import network.bisq.mobile.presentation.ui.components.foundation.BisqButton