From a8d4a66c9e9147326f0593d8ef247ca3ad792075 Mon Sep 17 00:00:00 2001 From: nostrbuddha Date: Sun, 10 Nov 2024 23:19:51 +0530 Subject: [PATCH] All images converted to PNG, tested in both iOS, Android and removed coil3 lib dependency --- bisqapps/shared/presentation/build.gradle.kts | 3 -- .../drawable/icon_chat_outlined.png | Bin 0 -> 3146 bytes .../drawable/icon_star_outlined.png | Bin 0 -> 3226 bytes .../drawable/icon_tag_outlined.png | Bin 0 -> 3234 bytes .../ui/components/CurrencyProfileCard.kt | 2 +- .../ui/components/MaterialTextField.kt | 5 +--- .../ui/components/atoms/Button.kt | 5 +--- .../ui/components/atoms/ProgressBar.kt | 2 ++ .../presentation/ui/components/atoms/Text.kt | 2 +- .../ui/components/molecules/TopBar.kt | 11 ++------ .../ui/navigation/BottomNavigation.kt | 2 +- .../ui/screens/CreateProfileScreen.kt | 4 +-- .../presentation/ui/screens/ExchangeScreen.kt | 5 +--- .../ui/screens/GettingStartedScreen.kt | 26 ++++++++++-------- .../presentation/ui/screens/MyTrades.kt | 2 +- .../ui/screens/OnBoardingScreen.kt | 4 +-- .../presentation/ui/screens/SettingsScreen.kt | 5 +--- .../presentation/ui/screens/SplashScreen.kt | 15 ++-------- .../presentation/ui/screens/URLScreen.kt | 4 +-- 19 files changed, 34 insertions(+), 63 deletions(-) create mode 100644 bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_chat_outlined.png create mode 100644 bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_star_outlined.png create mode 100644 bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_tag_outlined.png diff --git a/bisqapps/shared/presentation/build.gradle.kts b/bisqapps/shared/presentation/build.gradle.kts index 32907f37..ec5a99b6 100644 --- a/bisqapps/shared/presentation/build.gradle.kts +++ b/bisqapps/shared/presentation/build.gradle.kts @@ -88,11 +88,8 @@ kotlin { implementation(libs.androidx.lifecycle.runtime.compose) implementation(libs.logging.kermit) implementation(libs.kotlinx.coroutines) - implementation("io.coil-kt.coil3:coil-compose:3.0.0-rc02") - implementation("io.coil-kt.coil3:coil-svg:3.0.0-rc02") implementation("org.jetbrains.androidx.navigation:navigation-compose:2.7.0-alpha07") - implementation("cafe.adriel.lyricist:lyricist:1.7.0") } diff --git a/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_chat_outlined.png b/bisqapps/shared/presentation/src/commonMain/composeResources/drawable/icon_chat_outlined.png new file mode 100644 index 0000000000000000000000000000000000000000..e6097f7f898b770475f30d22246ac4ede5905e2f GIT binary patch literal 3146 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 UhHiGlP5=M^07*qoM6N<$g3v(<8UO$Q literal 0 HcmV?d00001 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 d892d340..3bfdcca4 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 @@ -16,7 +16,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp -import network.bisq.mobile.presentation.ui.components.foundation.BisqText +import network.bisq.mobile.presentation.ui.components.atoms.BisqText import network.bisq.mobile.presentation.ui.theme.BisqTheme import org.jetbrains.compose.resources.DrawableResource import org.jetbrains.compose.resources.ExperimentalResourceApi diff --git a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/components/MaterialTextField.kt b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/components/MaterialTextField.kt index 8ee962d0..c14406c0 100644 --- a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/components/MaterialTextField.kt +++ b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/components/MaterialTextField.kt @@ -21,13 +21,10 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.focus.onFocusChanged import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.TextStyle -import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import bisqapps.shared.presentation.generated.resources.Res -import network.bisq.mobile.presentation.ui.components.foundation.BisqText +import network.bisq.mobile.presentation.ui.components.atoms.BisqText import network.bisq.mobile.presentation.ui.theme.* -import org.jetbrains.compose.resources.Font @Composable fun MaterialTextField(text: String,onValueChanged: (String) -> Unit) { diff --git a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/components/atoms/Button.kt b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/components/atoms/Button.kt index 2f0b6da8..4aa6527e 100644 --- a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/components/atoms/Button.kt +++ b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/components/atoms/Button.kt @@ -1,15 +1,12 @@ -package network.bisq.mobile.presentation.ui.components.foundation +package network.bisq.mobile.presentation.ui.components.atoms import androidx.compose.foundation.layout.* -import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.Button import androidx.compose.material3.ButtonColors import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp -import coil3.Image import network.bisq.mobile.presentation.ui.theme.BisqTheme // TODO: diff --git a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/components/atoms/ProgressBar.kt b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/components/atoms/ProgressBar.kt index 050ec883..fff981cc 100644 --- a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/components/atoms/ProgressBar.kt +++ b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/components/atoms/ProgressBar.kt @@ -1,3 +1,5 @@ +package network.bisq.mobile.presentation.ui.components.atoms + import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding diff --git a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/components/atoms/Text.kt b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/components/atoms/Text.kt index 0f0519c2..2d77c639 100644 --- a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/components/atoms/Text.kt +++ b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/components/atoms/Text.kt @@ -1,4 +1,4 @@ -package network.bisq.mobile.presentation.ui.components.foundation +package network.bisq.mobile.presentation.ui.components.atoms import androidx.compose.runtime.Composable import androidx.compose.material3.Text 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 53aa1943..9f0b2d01 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 @@ -1,4 +1,4 @@ -package network.bisq.mobile.presentation.ui.components +package network.bisq.mobile.presentation.ui.components.molecules import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer @@ -7,22 +7,16 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.material3.ExperimentalMaterial3Api -import androidx.compose.material3.Icon -import androidx.compose.material3.IconButton -import androidx.compose.material3.Text import androidx.compose.material3.TopAppBar import androidx.compose.material3.TopAppBarDefaults import androidx.compose.runtime.Composable 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.atoms.icons.BellIcon import network.bisq.mobile.presentation.ui.components.atoms.icons.BisqLogoSmall import network.bisq.mobile.presentation.ui.components.atoms.icons.UserIcon -import network.bisq.mobile.presentation.ui.components.foundation.BisqText +import network.bisq.mobile.presentation.ui.components.atoms.BisqText import network.bisq.mobile.presentation.ui.theme.BisqTheme import org.jetbrains.compose.resources.ExperimentalResourceApi @@ -50,7 +44,6 @@ fun TopBar(title: String = "",isHome:Boolean = false) { Spacer(modifier = Modifier.width(12.dp)) UserIcon(modifier = Modifier.size(30.dp)) } - }, ) } \ No newline at end of file diff --git a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/navigation/BottomNavigation.kt b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/navigation/BottomNavigation.kt index 80edfd46..ad95c5bf 100644 --- a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/navigation/BottomNavigation.kt +++ b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/navigation/BottomNavigation.kt @@ -12,7 +12,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.unit.dp -import network.bisq.mobile.presentation.ui.components.foundation.BisqText +import network.bisq.mobile.presentation.ui.components.atoms.BisqText import network.bisq.mobile.presentation.ui.model.BottomNavigationItem import network.bisq.mobile.presentation.ui.theme.BisqTheme import org.jetbrains.compose.resources.ExperimentalResourceApi diff --git a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/CreateProfileScreen.kt b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/CreateProfileScreen.kt index 9cc4ab5b..2d281532 100644 --- a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/CreateProfileScreen.kt +++ b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/CreateProfileScreen.kt @@ -14,8 +14,8 @@ import bisqapps.shared.presentation.generated.resources.Res import bisqapps.shared.presentation.generated.resources.img_bot_image 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 -import network.bisq.mobile.presentation.ui.components.foundation.BisqText +import network.bisq.mobile.presentation.ui.components.atoms.BisqButton +import network.bisq.mobile.presentation.ui.components.atoms.BisqText import network.bisq.mobile.presentation.ui.components.layout.BisqScrollLayout import network.bisq.mobile.presentation.ui.navigation.Routes import network.bisq.mobile.presentation.ui.theme.* 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 d806f420..78c77a7f 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,17 +20,14 @@ 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.molecules.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) diff --git a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/GettingStartedScreen.kt b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/GettingStartedScreen.kt index 549b4fca..0f615042 100644 --- a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/GettingStartedScreen.kt +++ b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/GettingStartedScreen.kt @@ -27,13 +27,14 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.style.TextAlign 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.icon_tag_outlined import bisqapps.shared.presentation.generated.resources.img_fiat_btc import bisqapps.shared.presentation.generated.resources.img_learn_and_discover -import coil3.compose.AsyncImage import kotlinx.coroutines.flow.StateFlow -import network.bisq.mobile.presentation.ui.components.TopBar -import network.bisq.mobile.presentation.ui.components.foundation.BisqText +import network.bisq.mobile.presentation.ui.components.molecules.TopBar +import network.bisq.mobile.presentation.ui.components.atoms.BisqText import network.bisq.mobile.presentation.ui.theme.* import org.jetbrains.compose.resources.DrawableResource import org.jetbrains.compose.resources.ExperimentalResourceApi @@ -133,15 +134,15 @@ fun WelcomeCard(title: String, buttonText: String) { ) Column(verticalArrangement = Arrangement.spacedBy(12.dp)) { FeatureCard( - imagePath = "drawable/rounded_browser.svg", + image = Res.drawable.icon_tag_outlined, title = "Start trading or browser open offers in the offerbook" ) FeatureCard( - imagePath = "drawable/rounded_chat.svg", + image = Res.drawable.icon_chat_outlined, title = "Chat based and guided user interface for trading" ) FeatureCard( - imagePath = "drawable/rounded_star.svg", + image = Res.drawable.icon_star_outlined, title = "Security is based on seller’s reputation" ) } @@ -187,13 +188,14 @@ fun PriceProfileCard(price: String, priceText: String) { @OptIn(ExperimentalResourceApi::class) @Composable -fun FeatureCard(imagePath: String, title: String) { +fun FeatureCard(image: DrawableResource, title: String) { Row(verticalAlignment = Alignment.CenterVertically) { - AsyncImage( - model = Res.getUri(imagePath), - contentDescription = null, - modifier = Modifier.size(20.dp) - ) +// AsyncImage( +// model = Res.getUri(imagePath), +// contentDescription = null, +// modifier = Modifier.size(20.dp) +// ) + Image(painterResource(image), null, Modifier.size(20.dp)) Spacer(modifier = Modifier.width(9.dp)) BisqText.smallRegular( text = title, diff --git a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/MyTrades.kt b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/MyTrades.kt index c6230eb8..935509ca 100644 --- a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/MyTrades.kt +++ b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/MyTrades.kt @@ -12,7 +12,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.sp import androidx.navigation.NavController -import network.bisq.mobile.presentation.ui.components.foundation.BisqText +import network.bisq.mobile.presentation.ui.components.atoms.BisqText import network.bisq.mobile.presentation.ui.theme.BisqTheme import org.jetbrains.compose.resources.ExperimentalResourceApi diff --git a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/OnBoardingScreen.kt b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/OnBoardingScreen.kt index f3d63128..1eb2c024 100644 --- a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/OnBoardingScreen.kt +++ b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/OnBoardingScreen.kt @@ -36,8 +36,8 @@ import bisqapps.shared.presentation.generated.resources.img_learn_and_discover import kotlinx.coroutines.launch import network.bisq.mobile.presentation.ui.components.atoms.icons.BisqLogo -import network.bisq.mobile.presentation.ui.components.foundation.BisqButton -import network.bisq.mobile.presentation.ui.components.foundation.BisqText +import network.bisq.mobile.presentation.ui.components.atoms.BisqButton +import network.bisq.mobile.presentation.ui.components.atoms.BisqText import network.bisq.mobile.presentation.ui.components.layout.BisqScrollLayout import network.bisq.mobile.presentation.ui.model.OnBoardingPage import network.bisq.mobile.presentation.ui.navigation.Routes diff --git a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/SettingsScreen.kt b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/SettingsScreen.kt index cb570319..72ee31b4 100644 --- a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/SettingsScreen.kt +++ b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/SettingsScreen.kt @@ -5,14 +5,11 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding -import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.unit.sp import androidx.navigation.NavController -import network.bisq.mobile.presentation.ui.components.foundation.BisqText +import network.bisq.mobile.presentation.ui.components.atoms.BisqText import network.bisq.mobile.presentation.ui.theme.BisqTheme import org.jetbrains.compose.resources.ExperimentalResourceApi diff --git a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/SplashScreen.kt b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/SplashScreen.kt index e0ba1c7e..0d2a22c1 100644 --- a/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/SplashScreen.kt +++ b/bisqapps/shared/presentation/src/commonMain/kotlin/network/bisq/mobile/presentation/ui/screens/SplashScreen.kt @@ -1,36 +1,25 @@ package network.bisq.mobile.presentation.ui.screens -import BisqProgressBar -import androidx.compose.foundation.Image import androidx.compose.foundation.layout.* import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableFloatStateOf import androidx.compose.runtime.remember -import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextAlign import androidx.navigation.NavController -import org.jetbrains.compose.resources.painterResource import org.jetbrains.compose.resources.ExperimentalResourceApi -import kotlinx.coroutines.delay -import kotlinx.coroutines.launch - -import network.bisq.mobile.presentation.ui.navigation.Routes -import bisqapps.shared.presentation.generated.resources.Res -import bisqapps.shared.presentation.generated.resources.bisq_logo import cafe.adriel.lyricist.LocalStrings -import cafe.adriel.lyricist.rememberStrings +import network.bisq.mobile.presentation.ui.components.atoms.BisqProgressBar import network.bisq.mobile.presentation.ui.components.atoms.icons.BisqLogo -import network.bisq.mobile.presentation.ui.components.foundation.BisqText +import network.bisq.mobile.presentation.ui.components.atoms.BisqText import network.bisq.mobile.presentation.ui.components.layout.BisqStaticLayout import network.bisq.mobile.presentation.ui.theme.* // TODO: Remove innerPadding once StaticLayout, ScrollLayout are fully done. -@OptIn(ExperimentalResourceApi::class) @Composable fun SplashScreen( rootNavController: NavController, 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 ed68b82e..52ea8e77 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 @@ -23,8 +23,8 @@ import bisqapps.shared.presentation.generated.resources.Res import bisqapps.shared.presentation.generated.resources.icon_question_mark 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 -import network.bisq.mobile.presentation.ui.components.foundation.BisqText +import network.bisq.mobile.presentation.ui.components.atoms.BisqButton +import network.bisq.mobile.presentation.ui.components.atoms.BisqText import network.bisq.mobile.presentation.ui.components.layout.BisqScrollLayout import network.bisq.mobile.presentation.ui.navigation.Routes import network.bisq.mobile.presentation.ui.theme.*