diff --git a/core/bom/build.gradle.kts b/core/bom/build.gradle.kts index c494b1de3..c13a6119a 100644 --- a/core/bom/build.gradle.kts +++ b/core/bom/build.gradle.kts @@ -16,7 +16,7 @@ dependencies { api(project(":core:modal")) api(project(":protocol:sign")) api(project(":protocol:notify")) - api(project(":product:web3modal")) + api(project(":product:appkit")) api(project(":product:walletkit")) } } \ No newline at end of file diff --git a/product/web3modal/.gitignore b/product/appkit/.gitignore similarity index 100% rename from product/web3modal/.gitignore rename to product/appkit/.gitignore diff --git a/product/web3modal/ReadMe.md b/product/appkit/ReadMe.md similarity index 100% rename from product/web3modal/ReadMe.md rename to product/appkit/ReadMe.md diff --git a/product/web3modal/build.gradle.kts b/product/appkit/build.gradle.kts similarity index 98% rename from product/web3modal/build.gradle.kts rename to product/appkit/build.gradle.kts index 3048423f0..fb94bb65a 100644 --- a/product/web3modal/build.gradle.kts +++ b/product/appkit/build.gradle.kts @@ -14,7 +14,7 @@ project.apply { } android { - namespace = "com.walletconnect.web3.modal" + namespace = "com.reown.appkit" compileSdk = COMPILE_SDK defaultConfig { diff --git a/product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/TestUtils.kt b/product/appkit/src/androidTest/kotlin/com/reown/appkit/ui/TestUtils.kt similarity index 86% rename from product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/TestUtils.kt rename to product/appkit/src/androidTest/kotlin/com/reown/appkit/ui/TestUtils.kt index 1cb3be060..28ebcbc60 100644 --- a/product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/TestUtils.kt +++ b/product/appkit/src/androidTest/kotlin/com/reown/appkit/ui/TestUtils.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui +package com.reown.appkit.ui import androidx.compose.runtime.Composable import androidx.compose.runtime.remember @@ -8,8 +8,8 @@ import androidx.navigation.compose.ComposeNavigator import androidx.navigation.compose.composable import androidx.navigation.createGraph import androidx.navigation.testing.TestNavHostController -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.navigation.addTitleArg +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.navigation.addTitleArg @Composable fun rememberTestNavController(): TestNavHostController { diff --git a/product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/components/internal/AppKitTopBarTest.kt b/product/appkit/src/androidTest/kotlin/com/reown/appkit/ui/components/internal/AppKitTopBarTest.kt similarity index 77% rename from product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/components/internal/AppKitTopBarTest.kt rename to product/appkit/src/androidTest/kotlin/com/reown/appkit/ui/components/internal/AppKitTopBarTest.kt index adf34fe96..8388e523d 100644 --- a/product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/components/internal/AppKitTopBarTest.kt +++ b/product/appkit/src/androidTest/kotlin/com/reown/appkit/ui/components/internal/AppKitTopBarTest.kt @@ -1,14 +1,14 @@ -package com.walletconnect.web3.modal.ui.components.internal +package com.reown.appkit.ui.components.internal import androidx.compose.ui.test.junit4.createComposeRule import androidx.compose.ui.test.onNodeWithContentDescription import androidx.compose.ui.test.onNodeWithTag import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick -import com.walletconnect.web3.modal.ui.components.internal.commons.BackArrowIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.ContentDescription -import com.walletconnect.web3.modal.ui.components.internal.commons.TestTags -import com.walletconnect.web3.modal.ui.theme.ProvideAppKitThemeComposition +import com.reown.appkit.ui.components.internal.commons.BackArrowIcon +import com.reown.appkit.ui.components.internal.commons.ContentDescription +import com.reown.appkit.ui.components.internal.commons.TestTags +import com.reown.appkit.ui.theme.ProvideAppKitThemeComposition import org.junit.Rule import org.junit.Test import org.junit.Assert.* diff --git a/product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRootStateTest.kt b/product/appkit/src/androidTest/kotlin/com/reown/appkit/ui/components/internal/root/AppKitRootStateTest.kt similarity index 95% rename from product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRootStateTest.kt rename to product/appkit/src/androidTest/kotlin/com/reown/appkit/ui/components/internal/root/AppKitRootStateTest.kt index f7eca0222..65516141b 100644 --- a/product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRootStateTest.kt +++ b/product/appkit/src/androidTest/kotlin/com/reown/appkit/ui/components/internal/root/AppKitRootStateTest.kt @@ -1,11 +1,11 @@ -package com.walletconnect.web3.modal.ui.components.internal.root +package com.reown.appkit.ui.components.internal.root import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.collectAsState import androidx.compose.runtime.remember import androidx.compose.ui.test.junit4.createComposeRule -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.rememberTestNavController +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.rememberTestNavController import kotlinx.coroutines.test.runTest import org.junit.Assert.assertEquals import org.junit.Rule diff --git a/product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRootTest.kt b/product/appkit/src/androidTest/kotlin/com/reown/appkit/ui/components/internal/root/AppKitRootTest.kt similarity index 88% rename from product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRootTest.kt rename to product/appkit/src/androidTest/kotlin/com/reown/appkit/ui/components/internal/root/AppKitRootTest.kt index 77ac9e28c..f71b472ec 100644 --- a/product/web3modal/src/androidTest/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRootTest.kt +++ b/product/appkit/src/androidTest/kotlin/com/reown/appkit/ui/components/internal/root/AppKitRootTest.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.root +package com.reown.appkit.ui.components.internal.root import androidx.compose.foundation.layout.Box import androidx.compose.runtime.LaunchedEffect @@ -6,11 +6,11 @@ import androidx.compose.ui.test.junit4.createComposeRule import androidx.compose.ui.test.onNodeWithContentDescription import androidx.compose.ui.test.onNodeWithTag import androidx.compose.ui.test.onNodeWithText -import com.walletconnect.web3.modal.ui.components.internal.commons.ContentDescription -import com.walletconnect.web3.modal.ui.components.internal.commons.TestTags -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.rememberTestNavController -import com.walletconnect.web3.modal.ui.theme.ProvideAppKitThemeComposition +import com.reown.appkit.ui.components.internal.commons.ContentDescription +import com.reown.appkit.ui.components.internal.commons.TestTags +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.rememberTestNavController +import com.reown.appkit.ui.theme.ProvideAppKitThemeComposition import org.junit.Rule import org.junit.Test diff --git a/product/web3modal/src/main/AndroidManifest.xml b/product/appkit/src/main/AndroidManifest.xml similarity index 100% rename from product/web3modal/src/main/AndroidManifest.xml rename to product/appkit/src/main/AndroidManifest.xml diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/AppKit.kt b/product/appkit/src/main/kotlin/com/reown/appkit/client/AppKit.kt similarity index 92% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/AppKit.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/client/AppKit.kt index d9e5e04e2..ee8f12fa6 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/AppKit.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/client/AppKit.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.client +package com.reown.appkit.client import androidx.activity.ComponentActivity import com.reown.android.internal.common.di.AndroidCommonDITags @@ -10,16 +10,16 @@ import com.reown.sign.client.Sign import com.reown.sign.client.SignClient import com.reown.sign.common.exceptions.SignClientAlreadyInitializedException import com.walletconnect.util.Empty -import com.walletconnect.web3.modal.client.models.Account -import com.walletconnect.web3.modal.client.models.Session -import com.walletconnect.web3.modal.client.models.AppKitClientAlreadyInitializedException -import com.walletconnect.web3.modal.client.models.request.Request -import com.walletconnect.web3.modal.client.models.request.SentRequestResult -import com.walletconnect.web3.modal.di.appKitModule -import com.walletconnect.web3.modal.domain.delegate.AppKitDelegate -import com.walletconnect.web3.modal.domain.model.Session.WalletConnect -import com.walletconnect.web3.modal.domain.model.toModalError -import com.walletconnect.web3.modal.engine.AppKitEngine +import com.reown.appkit.client.models.Account +import com.reown.appkit.client.models.Session +import com.reown.appkit.client.models.AppKitClientAlreadyInitializedException +import com.reown.appkit.client.models.request.Request +import com.reown.appkit.client.models.request.SentRequestResult +import com.reown.appkit.di.appKitModule +import com.reown.appkit.domain.delegate.AppKitDelegate +import com.reown.appkit.domain.model.Session.WalletConnect +import com.reown.appkit.domain.model.toModalError +import com.reown.appkit.engine.AppKitEngine import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach import org.jetbrains.annotations.ApiStatus.Experimental @@ -221,7 +221,7 @@ object AppKit { @Deprecated( message = "Modal.Params.Request is deprecated", - replaceWith = ReplaceWith("com.walletconnect.web3.modal.client.models.Request") + replaceWith = ReplaceWith("com.reown.appkit.client.models.Request") ) fun request( request: Modal.Params.Request, @@ -302,7 +302,7 @@ object AppKit { */ @Deprecated( message = "Getting active session is replaced with getAccount()", - replaceWith = ReplaceWith("com.walletconnect.web3.modal.client.AppKit.getAccount()"), + replaceWith = ReplaceWith("com.reown.appkit.client.AppKit.getAccount()"), level = DeprecationLevel.WARNING ) internal fun getActiveSessionByTopic(topic: String) = SignClient.getActiveSessionByTopic(topic)?.toModal() @@ -313,7 +313,7 @@ object AppKit { */ @Deprecated( message = "Getting active session is replaced with getAccount()", - replaceWith = ReplaceWith("com.walletconnect.web3.modal.client.AppKit.getAccount()"), + replaceWith = ReplaceWith("com.reown.appkit.client.AppKit.getAccount()"), level = DeprecationLevel.WARNING ) fun getActiveSession(): Modal.Model.Session? { diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/ClientMapper.kt b/product/appkit/src/main/kotlin/com/reown/appkit/client/ClientMapper.kt similarity index 96% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/ClientMapper.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/client/ClientMapper.kt index 79cf32204..5a9818a79 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/ClientMapper.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/client/ClientMapper.kt @@ -1,10 +1,10 @@ -package com.walletconnect.web3.modal.client +package com.reown.appkit.client import com.reown.android.internal.common.signing.cacao.Cacao import com.reown.sign.client.Sign -import com.walletconnect.web3.modal.client.models.Account -import com.walletconnect.web3.modal.client.models.Session -import com.walletconnect.web3.modal.client.models.request.Request +import com.reown.appkit.client.models.Account +import com.reown.appkit.client.models.Session +import com.reown.appkit.client.models.request.Request import java.text.SimpleDateFormat import java.util.Calendar diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/Modal.kt b/product/appkit/src/main/kotlin/com/reown/appkit/client/Modal.kt similarity index 97% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/Modal.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/client/Modal.kt index 51545041a..57e285117 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/Modal.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/client/Modal.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.client +package com.reown.appkit.client import androidx.annotation.DrawableRes import androidx.annotation.Keep @@ -57,7 +57,7 @@ object Modal { @Deprecated( message = "Converted to sealed class to support multiple connectors", - replaceWith = ReplaceWith("com.walletconnect.web3.modal.client.models.Request"), + replaceWith = ReplaceWith("com.reown.appkit.client.models.Request"), level = DeprecationLevel.WARNING ) data class Request( @@ -186,7 +186,7 @@ object Modal { @Deprecated( message = "Converted to sealed class to support multiple connectors", - replaceWith = ReplaceWith("com.walletconnect.web3.modal.client.models.SentRequestResult"), + replaceWith = ReplaceWith("com.reown.appkit.client.models.SentRequestResult"), level = DeprecationLevel.WARNING ) data class SentRequest( diff --git a/product/appkit/src/main/kotlin/com/reown/appkit/client/models/Account.kt b/product/appkit/src/main/kotlin/com/reown/appkit/client/models/Account.kt new file mode 100644 index 000000000..958cbee42 --- /dev/null +++ b/product/appkit/src/main/kotlin/com/reown/appkit/client/models/Account.kt @@ -0,0 +1,8 @@ +package com.reown.appkit.client.models + +import com.reown.appkit.client.Modal + +data class Account( + val address: String, + val chain: Modal.Model.Chain +) \ No newline at end of file diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/Exceptions.kt b/product/appkit/src/main/kotlin/com/reown/appkit/client/models/Exceptions.kt similarity index 84% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/Exceptions.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/client/models/Exceptions.kt index 878185a34..0d2bd34a9 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/Exceptions.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/client/models/Exceptions.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.client.models +package com.reown.appkit.client.models import com.reown.android.internal.common.exception.WalletConnectException diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/Session.kt b/product/appkit/src/main/kotlin/com/reown/appkit/client/models/Session.kt similarity index 82% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/Session.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/client/models/Session.kt index 2b7bb3a1b..707d9b88d 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/Session.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/client/models/Session.kt @@ -1,7 +1,7 @@ -package com.walletconnect.web3.modal.client.models +package com.reown.appkit.client.models import com.reown.android.Core -import com.walletconnect.web3.modal.client.Modal +import com.reown.appkit.client.Modal sealed class Session { diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/request/Request.kt b/product/appkit/src/main/kotlin/com/reown/appkit/client/models/request/Request.kt similarity index 62% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/request/Request.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/client/models/request/Request.kt index 94f9aec12..cd2943244 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/request/Request.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/client/models/request/Request.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.client.models.request +package com.reown.appkit.client.models.request data class Request( val method: String, diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/request/SentRequestResult.kt b/product/appkit/src/main/kotlin/com/reown/appkit/client/models/request/SentRequestResult.kt similarity index 85% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/request/SentRequestResult.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/client/models/request/SentRequestResult.kt index 626de4bbc..466fde7e3 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/request/SentRequestResult.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/client/models/request/SentRequestResult.kt @@ -1,7 +1,7 @@ -package com.walletconnect.web3.modal.client.models.request +package com.reown.appkit.client.models.request import com.reown.sign.client.Sign -import com.walletconnect.web3.modal.engine.coinbase.CoinbaseResult +import com.reown.appkit.engine.coinbase.CoinbaseResult sealed class SentRequestResult { abstract val method: String diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/BalanceRpcRepository.kt b/product/appkit/src/main/kotlin/com/reown/appkit/data/BalanceRpcRepository.kt similarity index 67% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/BalanceRpcRepository.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/data/BalanceRpcRepository.kt index 55851ea06..bd312faf5 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/BalanceRpcRepository.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/data/BalanceRpcRepository.kt @@ -1,11 +1,11 @@ -package com.walletconnect.web3.modal.data +package com.reown.appkit.data import com.reown.foundation.util.Logger -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.data.json_rpc.balance.BalanceRequest -import com.walletconnect.web3.modal.data.json_rpc.balance.BalanceRpcResponse -import com.walletconnect.web3.modal.data.network.BalanceService -import com.walletconnect.web3.modal.domain.model.Balance +import com.reown.appkit.client.Modal +import com.reown.appkit.data.json_rpc.balance.BalanceRequest +import com.reown.appkit.data.json_rpc.balance.BalanceRpcResponse +import com.reown.appkit.data.network.BalanceService +import com.reown.appkit.domain.model.Balance internal class BalanceRpcRepository( private val balanceService: BalanceService, diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/BlockchainRepository.kt b/product/appkit/src/main/kotlin/com/reown/appkit/data/BlockchainRepository.kt similarity index 72% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/BlockchainRepository.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/data/BlockchainRepository.kt index 37b49776e..d1e8e9127 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/BlockchainRepository.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/data/BlockchainRepository.kt @@ -1,9 +1,9 @@ -package com.walletconnect.web3.modal.data +package com.reown.appkit.data import com.reown.android.internal.common.model.ProjectId -import com.walletconnect.web3.modal.data.model.IdentityDTO -import com.walletconnect.web3.modal.data.network.BlockchainService -import com.walletconnect.web3.modal.domain.model.Identity +import com.reown.appkit.data.model.IdentityDTO +import com.reown.appkit.data.network.BlockchainService +import com.reown.appkit.domain.model.Identity internal class BlockchainRepository( private val blockchainService: BlockchainService, diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/json_rpc/JsonRpcMethod.kt b/product/appkit/src/main/kotlin/com/reown/appkit/data/json_rpc/JsonRpcMethod.kt similarity index 68% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/json_rpc/JsonRpcMethod.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/data/json_rpc/JsonRpcMethod.kt index 78aa3cbc8..44978ddce 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/json_rpc/JsonRpcMethod.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/data/json_rpc/JsonRpcMethod.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.data.json_rpc +package com.reown.appkit.data.json_rpc internal object JsonRpcMethod { @get:JvmSynthetic diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/json_rpc/balance/BalanceRpc.kt b/product/appkit/src/main/kotlin/com/reown/appkit/data/json_rpc/balance/BalanceRpc.kt similarity index 80% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/json_rpc/balance/BalanceRpc.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/data/json_rpc/balance/BalanceRpc.kt index 3c31bfa89..74fc14e1e 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/json_rpc/balance/BalanceRpc.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/data/json_rpc/balance/BalanceRpc.kt @@ -1,9 +1,9 @@ -package com.walletconnect.web3.modal.data.json_rpc.balance +package com.reown.appkit.data.json_rpc.balance import com.squareup.moshi.Json import com.squareup.moshi.JsonClass import com.walletconnect.util.generateId -import com.walletconnect.web3.modal.data.json_rpc.JsonRpcMethod +import com.reown.appkit.data.json_rpc.JsonRpcMethod @JsonClass(generateAdapter = true) internal data class BalanceRequest( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/json_rpc/balance/BalanceRpcResponse.kt b/product/appkit/src/main/kotlin/com/reown/appkit/data/json_rpc/balance/BalanceRpcResponse.kt similarity index 89% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/json_rpc/balance/BalanceRpcResponse.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/data/json_rpc/balance/BalanceRpcResponse.kt index bf5217979..627bf85c3 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/json_rpc/balance/BalanceRpcResponse.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/data/json_rpc/balance/BalanceRpcResponse.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.data.json_rpc.balance +package com.reown.appkit.data.json_rpc.balance import com.squareup.moshi.Json import com.squareup.moshi.JsonClass diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/model/IdentityDTO.kt b/product/appkit/src/main/kotlin/com/reown/appkit/data/model/IdentityDTO.kt similarity index 77% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/model/IdentityDTO.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/data/model/IdentityDTO.kt index 6b8a40805..84e41e47f 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/model/IdentityDTO.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/data/model/IdentityDTO.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.data.model +package com.reown.appkit.data.model import com.squareup.moshi.Json diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/network/BalanceService.kt b/product/appkit/src/main/kotlin/com/reown/appkit/data/network/BalanceService.kt similarity index 58% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/network/BalanceService.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/data/network/BalanceService.kt index 14a7a0eb8..856e64dda 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/network/BalanceService.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/data/network/BalanceService.kt @@ -1,7 +1,7 @@ -package com.walletconnect.web3.modal.data.network +package com.reown.appkit.data.network -import com.walletconnect.web3.modal.data.json_rpc.balance.BalanceRequest -import com.walletconnect.web3.modal.data.json_rpc.balance.BalanceRpcResponse +import com.reown.appkit.data.json_rpc.balance.BalanceRequest +import com.reown.appkit.data.json_rpc.balance.BalanceRpcResponse import retrofit2.Response import retrofit2.http.Body import retrofit2.http.POST diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/network/BlockchainService.kt b/product/appkit/src/main/kotlin/com/reown/appkit/data/network/BlockchainService.kt similarity index 77% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/network/BlockchainService.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/data/network/BlockchainService.kt index 48cca5788..6f56860b1 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/data/network/BlockchainService.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/data/network/BlockchainService.kt @@ -1,6 +1,6 @@ -package com.walletconnect.web3.modal.data.network +package com.reown.appkit.data.network -import com.walletconnect.web3.modal.data.model.IdentityDTO +import com.reown.appkit.data.model.IdentityDTO import retrofit2.Response import retrofit2.http.GET import retrofit2.http.Path diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/AppKitDITags.kt b/product/appkit/src/main/kotlin/com/reown/appkit/di/AppKitDITags.kt similarity index 75% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/AppKitDITags.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/di/AppKitDITags.kt index 56c1ce33f..2df13c1e9 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/AppKitDITags.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/di/AppKitDITags.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.di +package com.reown.appkit.di internal enum class AppKitDITags { BALANCE_RPC_RETROFIT, diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/BalanceRpcModule.kt b/product/appkit/src/main/kotlin/com/reown/appkit/di/BalanceRpcModule.kt similarity index 80% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/BalanceRpcModule.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/di/BalanceRpcModule.kt index ba42e566f..7e0d8d8c1 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/BalanceRpcModule.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/di/BalanceRpcModule.kt @@ -1,9 +1,9 @@ -package com.walletconnect.web3.modal.di +package com.reown.appkit.di import com.reown.android.internal.common.di.AndroidCommonDITags -import com.walletconnect.web3.modal.data.BalanceRpcRepository -import com.walletconnect.web3.modal.data.network.BalanceService -import com.walletconnect.web3.modal.domain.usecase.GetEthBalanceUseCase +import com.reown.appkit.data.BalanceRpcRepository +import com.reown.appkit.data.network.BalanceService +import com.reown.appkit.domain.usecase.GetEthBalanceUseCase import org.koin.core.qualifier.named import org.koin.dsl.module import retrofit2.Retrofit diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/BlockchainApiModule.kt b/product/appkit/src/main/kotlin/com/reown/appkit/di/BlockchainApiModule.kt similarity index 78% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/BlockchainApiModule.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/di/BlockchainApiModule.kt index 97343f215..9a8035f18 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/BlockchainApiModule.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/di/BlockchainApiModule.kt @@ -1,9 +1,9 @@ -package com.walletconnect.web3.modal.di +package com.reown.appkit.di import com.reown.android.internal.common.di.AndroidCommonDITags -import com.walletconnect.web3.modal.data.BlockchainRepository -import com.walletconnect.web3.modal.data.network.BlockchainService -import com.walletconnect.web3.modal.domain.usecase.GetIdentityUseCase +import com.reown.appkit.data.BlockchainRepository +import com.reown.appkit.data.network.BlockchainService +import com.reown.appkit.domain.usecase.GetIdentityUseCase import org.koin.core.qualifier.named import org.koin.dsl.module import retrofit2.Retrofit diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/EngineModule.kt b/product/appkit/src/main/kotlin/com/reown/appkit/di/EngineModule.kt similarity index 79% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/EngineModule.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/di/EngineModule.kt index b26f4560e..216a5da30 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/EngineModule.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/di/EngineModule.kt @@ -1,10 +1,10 @@ -package com.walletconnect.web3.modal.di +package com.reown.appkit.di import android.content.Context import com.reown.android.internal.common.di.AndroidCommonDITags -import com.walletconnect.web3.modal.domain.usecase.ConnectionEventRepository -import com.walletconnect.web3.modal.engine.AppKitEngine -import com.walletconnect.web3.modal.engine.coinbase.CoinbaseClient +import com.reown.appkit.domain.usecase.ConnectionEventRepository +import com.reown.appkit.engine.AppKitEngine +import com.reown.appkit.engine.coinbase.CoinbaseClient import org.koin.android.ext.koin.androidContext import org.koin.core.qualifier.named import org.koin.dsl.module diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/Web3ModalModule.kt b/product/appkit/src/main/kotlin/com/reown/appkit/di/Web3ModalModule.kt similarity index 68% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/Web3ModalModule.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/di/Web3ModalModule.kt index 24f249621..ed7f08f89 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/di/Web3ModalModule.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/di/Web3ModalModule.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.di +package com.reown.appkit.di import android.content.Context import androidx.datastore.core.DataStore @@ -7,18 +7,18 @@ import androidx.datastore.preferences.preferencesDataStore import com.squareup.moshi.Moshi import com.squareup.moshi.adapters.PolymorphicJsonAdapterFactory import com.reown.android.internal.common.di.AndroidCommonDITags -import com.walletconnect.web3.modal.domain.RecentWalletsRepository -import com.walletconnect.web3.modal.domain.SessionRepository -import com.walletconnect.web3.modal.domain.model.Session -import com.walletconnect.web3.modal.domain.usecase.DeleteSessionDataUseCase -import com.walletconnect.web3.modal.domain.usecase.GetRecentWalletUseCase -import com.walletconnect.web3.modal.domain.usecase.GetSelectedChainUseCase -import com.walletconnect.web3.modal.domain.usecase.GetSessionUseCase -import com.walletconnect.web3.modal.domain.usecase.ObserveSelectedChainUseCase -import com.walletconnect.web3.modal.domain.usecase.ObserveSessionUseCase -import com.walletconnect.web3.modal.domain.usecase.SaveChainSelectionUseCase -import com.walletconnect.web3.modal.domain.usecase.SaveRecentWalletUseCase -import com.walletconnect.web3.modal.domain.usecase.SaveSessionUseCase +import com.reown.appkit.domain.RecentWalletsRepository +import com.reown.appkit.domain.SessionRepository +import com.reown.appkit.domain.model.Session +import com.reown.appkit.domain.usecase.DeleteSessionDataUseCase +import com.reown.appkit.domain.usecase.GetRecentWalletUseCase +import com.reown.appkit.domain.usecase.GetSelectedChainUseCase +import com.reown.appkit.domain.usecase.GetSessionUseCase +import com.reown.appkit.domain.usecase.ObserveSelectedChainUseCase +import com.reown.appkit.domain.usecase.ObserveSessionUseCase +import com.reown.appkit.domain.usecase.SaveChainSelectionUseCase +import com.reown.appkit.domain.usecase.SaveRecentWalletUseCase +import com.reown.appkit.domain.usecase.SaveSessionUseCase import org.koin.android.ext.koin.androidContext import org.koin.core.qualifier.named import org.koin.dsl.module diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/RecentWalletsRepository.kt b/product/appkit/src/main/kotlin/com/reown/appkit/domain/RecentWalletsRepository.kt similarity index 89% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/RecentWalletsRepository.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/domain/RecentWalletsRepository.kt index fb6c8fbea..412dd9f93 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/RecentWalletsRepository.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/domain/RecentWalletsRepository.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.domain +package com.reown.appkit.domain import android.content.SharedPreferences diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/SessionRepository.kt b/product/appkit/src/main/kotlin/com/reown/appkit/domain/SessionRepository.kt similarity index 91% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/SessionRepository.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/domain/SessionRepository.kt index 824dbdbcb..5d7d90027 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/SessionRepository.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/domain/SessionRepository.kt @@ -1,12 +1,12 @@ -package com.walletconnect.web3.modal.domain +package com.reown.appkit.domain import androidx.datastore.core.DataStore import androidx.datastore.preferences.core.Preferences import androidx.datastore.preferences.core.edit import androidx.datastore.preferences.core.stringPreferencesKey import com.squareup.moshi.Moshi -import com.walletconnect.web3.modal.client.AppKit -import com.walletconnect.web3.modal.domain.model.Session +import com.reown.appkit.client.AppKit +import com.reown.appkit.domain.model.Session import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.map diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/delegate/AppKitDelegate.kt b/product/appkit/src/main/kotlin/com/reown/appkit/domain/delegate/AppKitDelegate.kt similarity index 90% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/delegate/AppKitDelegate.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/domain/delegate/AppKitDelegate.kt index cda5e0a80..876a15f4c 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/delegate/AppKitDelegate.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/domain/delegate/AppKitDelegate.kt @@ -1,16 +1,16 @@ -package com.walletconnect.web3.modal.domain.delegate +package com.reown.appkit.domain.delegate import com.reown.android.internal.common.wcKoinApp -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.AppKit -import com.walletconnect.web3.modal.domain.model.Session -import com.walletconnect.web3.modal.domain.usecase.DeleteSessionDataUseCase -import com.walletconnect.web3.modal.domain.usecase.SaveChainSelectionUseCase -import com.walletconnect.web3.modal.domain.usecase.SaveSessionUseCase -import com.walletconnect.web3.modal.utils.EthUtils -import com.walletconnect.web3.modal.utils.getAddress -import com.walletconnect.web3.modal.utils.getSelectedChain -import com.walletconnect.web3.modal.utils.toSession +import com.reown.appkit.client.Modal +import com.reown.appkit.client.AppKit +import com.reown.appkit.domain.model.Session +import com.reown.appkit.domain.usecase.DeleteSessionDataUseCase +import com.reown.appkit.domain.usecase.SaveChainSelectionUseCase +import com.reown.appkit.domain.usecase.SaveSessionUseCase +import com.reown.appkit.utils.EthUtils +import com.reown.appkit.utils.getAddress +import com.reown.appkit.utils.getSelectedChain +import com.reown.appkit.utils.toSession import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/model/AccountData.kt b/product/appkit/src/main/kotlin/com/reown/appkit/domain/model/AccountData.kt similarity index 58% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/model/AccountData.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/domain/model/AccountData.kt index 6de7345dc..304188a9a 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/model/AccountData.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/domain/model/AccountData.kt @@ -1,6 +1,6 @@ -package com.walletconnect.web3.modal.domain.model +package com.reown.appkit.domain.model -import com.walletconnect.web3.modal.client.Modal +import com.reown.appkit.client.Modal internal data class AccountData( val address: String, diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/model/Balance.kt b/product/appkit/src/main/kotlin/com/reown/appkit/domain/model/Balance.kt similarity index 85% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/model/Balance.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/domain/model/Balance.kt index f1d19a981..3fbc9983f 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/model/Balance.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/domain/model/Balance.kt @@ -1,6 +1,6 @@ -package com.walletconnect.web3.modal.domain.model +package com.reown.appkit.domain.model -import com.walletconnect.web3.modal.client.Modal +import com.reown.appkit.client.Modal import java.math.BigDecimal internal data class Balance( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/model/Exceptions.kt b/product/appkit/src/main/kotlin/com/reown/appkit/domain/model/Exceptions.kt similarity index 57% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/model/Exceptions.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/domain/model/Exceptions.kt index 0413eefdf..221c2a4b0 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/model/Exceptions.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/domain/model/Exceptions.kt @@ -1,6 +1,6 @@ -package com.walletconnect.web3.modal.domain.model +package com.reown.appkit.domain.model -import com.walletconnect.web3.modal.client.Modal +import com.reown.appkit.client.Modal object InvalidSessionException: Throwable("Session topic is missing") diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/model/Identity.kt b/product/appkit/src/main/kotlin/com/reown/appkit/domain/model/Identity.kt similarity index 62% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/model/Identity.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/domain/model/Identity.kt index 2bb8ebef8..04275c602 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/model/Identity.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/domain/model/Identity.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.domain.model +package com.reown.appkit.domain.model data class Identity( val name: String? = null, diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/model/Session.kt b/product/appkit/src/main/kotlin/com/reown/appkit/domain/model/Session.kt similarity index 90% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/model/Session.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/domain/model/Session.kt index f8c4fda20..b23c2a4b9 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/model/Session.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/domain/model/Session.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.domain.model +package com.reown.appkit.domain.model import com.squareup.moshi.JsonClass diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/ConnectionEventRepository.kt b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/ConnectionEventRepository.kt similarity index 94% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/ConnectionEventRepository.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/ConnectionEventRepository.kt index 7cf2b616f..39ee854f3 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/ConnectionEventRepository.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/ConnectionEventRepository.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.domain.usecase +package com.reown.appkit.domain.usecase import android.content.SharedPreferences diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/DeleteSessionDataUseCase.kt b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/DeleteSessionDataUseCase.kt similarity index 60% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/DeleteSessionDataUseCase.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/DeleteSessionDataUseCase.kt index 3919968ec..98a22c683 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/DeleteSessionDataUseCase.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/DeleteSessionDataUseCase.kt @@ -1,6 +1,6 @@ -package com.walletconnect.web3.modal.domain.usecase +package com.reown.appkit.domain.usecase -import com.walletconnect.web3.modal.domain.SessionRepository +import com.reown.appkit.domain.SessionRepository internal class DeleteSessionDataUseCase( private val repository: SessionRepository diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/GetEthBalanceUseCase.kt b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/GetEthBalanceUseCase.kt similarity index 67% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/GetEthBalanceUseCase.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/GetEthBalanceUseCase.kt index f13df64bb..deb47babc 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/GetEthBalanceUseCase.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/GetEthBalanceUseCase.kt @@ -1,7 +1,7 @@ -package com.walletconnect.web3.modal.domain.usecase +package com.reown.appkit.domain.usecase -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.data.BalanceRpcRepository +import com.reown.appkit.client.Modal +import com.reown.appkit.data.BalanceRpcRepository internal class GetEthBalanceUseCase( private val balanceRpcRepository: BalanceRpcRepository, diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/GetIdentityUseCase.kt b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/GetIdentityUseCase.kt similarity index 63% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/GetIdentityUseCase.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/GetIdentityUseCase.kt index 7d9da34e5..aeb005a62 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/GetIdentityUseCase.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/GetIdentityUseCase.kt @@ -1,7 +1,7 @@ -package com.walletconnect.web3.modal.domain.usecase +package com.reown.appkit.domain.usecase -import com.walletconnect.web3.modal.data.BlockchainRepository -import com.walletconnect.web3.modal.domain.model.Identity +import com.reown.appkit.data.BlockchainRepository +import com.reown.appkit.domain.model.Identity internal class GetIdentityUseCase( private val blockchainRepository: BlockchainRepository diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/GetRecentWalletUseCase.kt b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/GetRecentWalletUseCase.kt similarity index 55% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/GetRecentWalletUseCase.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/GetRecentWalletUseCase.kt index c197e059e..2a64af3b2 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/GetRecentWalletUseCase.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/GetRecentWalletUseCase.kt @@ -1,6 +1,6 @@ -package com.walletconnect.web3.modal.domain.usecase +package com.reown.appkit.domain.usecase -import com.walletconnect.web3.modal.domain.RecentWalletsRepository +import com.reown.appkit.domain.RecentWalletsRepository internal class GetRecentWalletUseCase(private val repository: RecentWalletsRepository) { operator fun invoke() = repository.getRecentWalletId() diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/GetSelectedChainUseCase.kt b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/GetSelectedChainUseCase.kt similarity index 68% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/GetSelectedChainUseCase.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/GetSelectedChainUseCase.kt index cdfedd650..5d080b87e 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/GetSelectedChainUseCase.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/GetSelectedChainUseCase.kt @@ -1,6 +1,6 @@ -package com.walletconnect.web3.modal.domain.usecase +package com.reown.appkit.domain.usecase -import com.walletconnect.web3.modal.domain.SessionRepository +import com.reown.appkit.domain.SessionRepository import kotlinx.coroutines.flow.first import kotlinx.coroutines.runBlocking diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/GetSessionUseCase.kt b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/GetSessionUseCase.kt similarity index 63% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/GetSessionUseCase.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/GetSessionUseCase.kt index 478a93d44..24a244e8c 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/GetSessionUseCase.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/GetSessionUseCase.kt @@ -1,6 +1,6 @@ -package com.walletconnect.web3.modal.domain.usecase +package com.reown.appkit.domain.usecase -import com.walletconnect.web3.modal.domain.SessionRepository +import com.reown.appkit.domain.SessionRepository import kotlinx.coroutines.runBlocking internal class GetSessionUseCase( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/ObserveSelectedChainUseCase.kt b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/ObserveSelectedChainUseCase.kt similarity index 63% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/ObserveSelectedChainUseCase.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/ObserveSelectedChainUseCase.kt index e9ac3fd9b..cee459df9 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/ObserveSelectedChainUseCase.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/ObserveSelectedChainUseCase.kt @@ -1,6 +1,6 @@ -package com.walletconnect.web3.modal.domain.usecase +package com.reown.appkit.domain.usecase -import com.walletconnect.web3.modal.domain.SessionRepository +import com.reown.appkit.domain.SessionRepository import kotlinx.coroutines.flow.map internal class ObserveSelectedChainUseCase( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/ObserveSessionUseCase.kt b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/ObserveSessionUseCase.kt similarity index 54% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/ObserveSessionUseCase.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/ObserveSessionUseCase.kt index 25e7f5d4c..63dbcb2ae 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/ObserveSessionUseCase.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/ObserveSessionUseCase.kt @@ -1,6 +1,6 @@ -package com.walletconnect.web3.modal.domain.usecase +package com.reown.appkit.domain.usecase -import com.walletconnect.web3.modal.domain.SessionRepository +import com.reown.appkit.domain.SessionRepository internal class ObserveSessionUseCase( private val repository: SessionRepository diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/SaveChainSelectionUseCase.kt b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/SaveChainSelectionUseCase.kt similarity index 63% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/SaveChainSelectionUseCase.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/SaveChainSelectionUseCase.kt index 50a41cdb6..870985bb7 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/SaveChainSelectionUseCase.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/SaveChainSelectionUseCase.kt @@ -1,6 +1,6 @@ -package com.walletconnect.web3.modal.domain.usecase +package com.reown.appkit.domain.usecase -import com.walletconnect.web3.modal.domain.SessionRepository +import com.reown.appkit.domain.SessionRepository internal class SaveChainSelectionUseCase( private val repository: SessionRepository diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/SaveRecentWalletUseCase.kt b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/SaveRecentWalletUseCase.kt similarity index 58% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/SaveRecentWalletUseCase.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/SaveRecentWalletUseCase.kt index e3e50ed9e..e5163c237 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/SaveRecentWalletUseCase.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/SaveRecentWalletUseCase.kt @@ -1,6 +1,6 @@ -package com.walletconnect.web3.modal.domain.usecase +package com.reown.appkit.domain.usecase -import com.walletconnect.web3.modal.domain.RecentWalletsRepository +import com.reown.appkit.domain.RecentWalletsRepository internal class SaveRecentWalletUseCase( private val repository: RecentWalletsRepository diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/SaveSessionUseCase.kt b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/SaveSessionUseCase.kt similarity index 50% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/SaveSessionUseCase.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/SaveSessionUseCase.kt index 03100bab1..43c447172 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/domain/usecase/SaveSessionUseCase.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/domain/usecase/SaveSessionUseCase.kt @@ -1,7 +1,7 @@ -package com.walletconnect.web3.modal.domain.usecase +package com.reown.appkit.domain.usecase -import com.walletconnect.web3.modal.domain.SessionRepository -import com.walletconnect.web3.modal.domain.model.Session +import com.reown.appkit.domain.SessionRepository +import com.reown.appkit.domain.model.Session internal class SaveSessionUseCase( private val repository: SessionRepository diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/AppKitEngine.kt b/product/appkit/src/main/kotlin/com/reown/appkit/engine/AppKitEngine.kt similarity index 88% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/AppKitEngine.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/engine/AppKitEngine.kt index 413350508..822bc45a6 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/AppKitEngine.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/engine/AppKitEngine.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.engine +package com.reown.appkit.engine import android.content.Context import android.content.Intent @@ -16,32 +16,32 @@ import com.reown.foundation.util.Logger import com.reown.sign.client.Sign import com.reown.sign.client.SignClient import com.walletconnect.util.Empty -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.AppKit -import com.walletconnect.web3.modal.client.models.Account -import com.walletconnect.web3.modal.client.models.CoinbaseClientAlreadyInitializedException -import com.walletconnect.web3.modal.client.models.request.Request -import com.walletconnect.web3.modal.client.models.request.SentRequestResult -import com.walletconnect.web3.modal.client.models.request.toSentRequest -import com.walletconnect.web3.modal.client.toCoinbaseSession -import com.walletconnect.web3.modal.client.toModal -import com.walletconnect.web3.modal.client.toSession -import com.walletconnect.web3.modal.client.toSign -import com.walletconnect.web3.modal.domain.delegate.AppKitDelegate -import com.walletconnect.web3.modal.domain.model.InvalidSessionException -import com.walletconnect.web3.modal.domain.model.Session -import com.walletconnect.web3.modal.domain.usecase.ConnectionEventRepository -import com.walletconnect.web3.modal.domain.usecase.DeleteSessionDataUseCase -import com.walletconnect.web3.modal.domain.usecase.GetSelectedChainUseCase -import com.walletconnect.web3.modal.domain.usecase.GetSessionUseCase -import com.walletconnect.web3.modal.domain.usecase.SaveSessionUseCase -import com.walletconnect.web3.modal.engine.coinbase.COINBASE_WALLET_ID -import com.walletconnect.web3.modal.engine.coinbase.CoinbaseClient -import com.walletconnect.web3.modal.utils.getSelectedChain -import com.walletconnect.web3.modal.utils.toAccount -import com.walletconnect.web3.modal.utils.toChain -import com.walletconnect.web3.modal.utils.toConnectorType -import com.walletconnect.web3.modal.utils.toSession +import com.reown.appkit.client.Modal +import com.reown.appkit.client.AppKit +import com.reown.appkit.client.models.Account +import com.reown.appkit.client.models.CoinbaseClientAlreadyInitializedException +import com.reown.appkit.client.models.request.Request +import com.reown.appkit.client.models.request.SentRequestResult +import com.reown.appkit.client.models.request.toSentRequest +import com.reown.appkit.client.toCoinbaseSession +import com.reown.appkit.client.toModal +import com.reown.appkit.client.toSession +import com.reown.appkit.client.toSign +import com.reown.appkit.domain.delegate.AppKitDelegate +import com.reown.appkit.domain.model.InvalidSessionException +import com.reown.appkit.domain.model.Session +import com.reown.appkit.domain.usecase.ConnectionEventRepository +import com.reown.appkit.domain.usecase.DeleteSessionDataUseCase +import com.reown.appkit.domain.usecase.GetSelectedChainUseCase +import com.reown.appkit.domain.usecase.GetSessionUseCase +import com.reown.appkit.domain.usecase.SaveSessionUseCase +import com.reown.appkit.engine.coinbase.COINBASE_WALLET_ID +import com.reown.appkit.engine.coinbase.CoinbaseClient +import com.reown.appkit.utils.getSelectedChain +import com.reown.appkit.utils.toAccount +import com.reown.appkit.utils.toChain +import com.reown.appkit.utils.toConnectorType +import com.reown.appkit.utils.toSession import kotlinx.coroutines.launch internal class AppKitEngine( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/coinbase/CoinbaseClient.kt b/product/appkit/src/main/kotlin/com/reown/appkit/engine/coinbase/CoinbaseClient.kt similarity index 93% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/coinbase/CoinbaseClient.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/engine/coinbase/CoinbaseClient.kt index ac05192f5..e7aba5dd4 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/coinbase/CoinbaseClient.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/engine/coinbase/CoinbaseClient.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.engine.coinbase +package com.reown.appkit.engine.coinbase import android.content.Context import android.content.Intent @@ -23,12 +23,12 @@ import com.reown.android.internal.common.modal.data.model.Wallet import com.reown.android.internal.common.model.AppMetaData import com.reown.android.internal.common.wcKoinApp import com.walletconnect.util.Empty -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.models.Account -import com.walletconnect.web3.modal.client.models.request.Request -import com.walletconnect.web3.modal.domain.model.Session -import com.walletconnect.web3.modal.domain.usecase.GetSelectedChainUseCase -import com.walletconnect.web3.modal.utils.toChain +import com.reown.appkit.client.Modal +import com.reown.appkit.client.models.Account +import com.reown.appkit.client.models.request.Request +import com.reown.appkit.domain.model.Session +import com.reown.appkit.domain.usecase.GetSelectedChainUseCase +import com.reown.appkit.utils.toChain internal const val COINBASE_WALLET_ID = "fd20dc426fb37566d803205b19bbc1d4096b248ac04548e3cfb6b3a38bd033aa" diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/coinbase/CoinbaseMapper.kt b/product/appkit/src/main/kotlin/com/reown/appkit/engine/coinbase/CoinbaseMapper.kt similarity index 99% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/coinbase/CoinbaseMapper.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/engine/coinbase/CoinbaseMapper.kt index 8680e1f02..8328d1679 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/coinbase/CoinbaseMapper.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/engine/coinbase/CoinbaseMapper.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.engine.coinbase +package com.reown.appkit.engine.coinbase import com.coinbase.android.nativesdk.message.request.AddChainNativeCurrency import com.coinbase.android.nativesdk.message.request.WatchAssetOptions diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/coinbase/CoinbaseResult.kt b/product/appkit/src/main/kotlin/com/reown/appkit/engine/coinbase/CoinbaseResult.kt similarity index 76% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/coinbase/CoinbaseResult.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/engine/coinbase/CoinbaseResult.kt index 8de6082d0..ba153d7e9 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/engine/coinbase/CoinbaseResult.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/engine/coinbase/CoinbaseResult.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.engine.coinbase +package com.reown.appkit.engine.coinbase sealed class CoinbaseResult { data class Result(val value: String) : CoinbaseResult() diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/presets/AppKitChainsPresets.kt b/product/appkit/src/main/kotlin/com/reown/appkit/presets/AppKitChainsPresets.kt similarity index 97% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/presets/AppKitChainsPresets.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/presets/AppKitChainsPresets.kt index 8a0f04aac..c5b137751 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/presets/AppKitChainsPresets.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/presets/AppKitChainsPresets.kt @@ -1,7 +1,7 @@ -package com.walletconnect.web3.modal.presets +package com.reown.appkit.presets -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.utils.EthUtils +import com.reown.appkit.client.Modal +import com.reown.appkit.utils.EthUtils object AppKitChainsPresets { val ethToken = Modal.Model.Token(name = "Ether", symbol = "ETH", decimal = 18) diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKit.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/AppKit.kt similarity index 91% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKit.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/AppKit.kt index f4b817daf..4313f4163 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKit.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/AppKit.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalMaterialNavigationApi::class) -package com.walletconnect.web3.modal.ui +package com.reown.appkit.ui import android.annotation.SuppressLint import android.os.Bundle @@ -13,9 +13,9 @@ import androidx.navigation.fragment.dialog import androidx.navigation.navArgument import com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi import com.google.accompanist.navigation.material.bottomSheet -import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.ui.components.internal.AppKitComponent -import com.walletconnect.web3.modal.ui.navigation.Route +import com.reown.appkit.R +import com.reown.appkit.ui.components.internal.AppKitComponent +import com.reown.appkit.ui.navigation.Route internal const val CHOOSE_NETWORK_KEY = "chooseNetwork" private const val CHOOSE_NETWORK_ARG = "{chooseNetwork}" diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitEvents.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/AppKitEvents.kt similarity index 82% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitEvents.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/AppKitEvents.kt index f6a7d277a..69b627304 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitEvents.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/AppKitEvents.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui +package com.reown.appkit.ui sealed class AppKitEvents { object SessionApproved: AppKitEvents() diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitSheet.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/AppKitSheet.kt similarity index 97% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitSheet.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/AppKitSheet.kt index 551ae2e82..4576f32dc 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitSheet.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/AppKitSheet.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalAnimationApi::class) -package com.walletconnect.web3.modal.ui +package com.reown.appkit.ui import android.app.Dialog import android.content.Context @@ -29,9 +29,9 @@ import com.google.accompanist.navigation.animation.rememberAnimatedNavController import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetDialogFragment import com.reown.modal.utils.theme.toComposeColor -import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.ui.components.internal.AppKitComponent -import com.walletconnect.web3.modal.ui.theme.ColorPalette +import com.reown.appkit.R +import com.reown.appkit.ui.components.internal.AppKitComponent +import com.reown.appkit.ui.theme.ColorPalette class AppKitSheet : BottomSheetDialogFragment() { diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitState.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/AppKitState.kt similarity index 84% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitState.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/AppKitState.kt index e33f78a7e..e30c1ee7e 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitState.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/AppKitState.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui +package com.reown.appkit.ui internal sealed class AppKitState { object Connect : AppKitState() diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitTheme.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/AppKitTheme.kt similarity index 94% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitTheme.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/AppKitTheme.kt index efc87ac86..fe90502ab 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitTheme.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/AppKitTheme.kt @@ -1,13 +1,13 @@ -package com.walletconnect.web3.modal.ui +package com.reown.appkit.ui import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.ui.graphics.Color -import com.walletconnect.web3.modal.ui.theme.ColorPalette -import com.walletconnect.web3.modal.ui.theme.CustomComposition -import com.walletconnect.web3.modal.ui.theme.LocalCustomComposition -import com.walletconnect.web3.modal.ui.theme.defaultDarkAppKitColors -import com.walletconnect.web3.modal.ui.theme.defaultLightAppKitColors +import com.reown.appkit.ui.theme.ColorPalette +import com.reown.appkit.ui.theme.CustomComposition +import com.reown.appkit.ui.theme.LocalCustomComposition +import com.reown.appkit.ui.theme.defaultDarkAppKitColors +import com.reown.appkit.ui.theme.defaultLightAppKitColors @Composable fun AppKitTheme( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitView.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/AppKitView.kt similarity index 91% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitView.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/AppKitView.kt index b3cb175a8..076dac613 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitView.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/AppKitView.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui +package com.reown.appkit.ui import android.content.Context import android.util.AttributeSet @@ -6,8 +6,8 @@ import android.view.LayoutInflater import android.widget.FrameLayout import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.platform.ViewCompositionStrategy -import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.ui.components.internal.AppKitComponent +import com.reown.appkit.R +import com.reown.appkit.ui.components.internal.AppKitComponent class AppKitView @JvmOverloads constructor( context: Context, diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitViewModel.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/AppKitViewModel.kt similarity index 90% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitViewModel.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/AppKitViewModel.kt index 08f248e14..a3912a660 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/AppKitViewModel.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/AppKitViewModel.kt @@ -1,10 +1,10 @@ -package com.walletconnect.web3.modal.ui +package com.reown.appkit.ui import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.reown.android.internal.common.wcKoinApp -import com.walletconnect.web3.modal.client.AppKit -import com.walletconnect.web3.modal.engine.AppKitEngine +import com.reown.appkit.client.AppKit +import com.reown.appkit.engine.AppKitEngine import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/ComponentDelegate.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/ComponentDelegate.kt similarity index 91% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/ComponentDelegate.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/ComponentDelegate.kt index f1cbc8e38..fe30971fa 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/ComponentDelegate.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/ComponentDelegate.kt @@ -1,6 +1,6 @@ -package com.walletconnect.web3.modal.ui.components +package com.reown.appkit.ui.components -import com.walletconnect.web3.modal.client.AppKit +import com.reown.appkit.client.AppKit import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.onEach diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/AccountButton.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/AccountButton.kt similarity index 84% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/AccountButton.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/AccountButton.kt index 285e9ed9c..2bb56a04c 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/AccountButton.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/AccountButton.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.button +package com.reown.appkit.ui.components.button import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -22,23 +22,23 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.ui.components.internal.commons.HorizontalSpacer -import com.walletconnect.web3.modal.ui.components.internal.commons.TransparentSurface -import com.walletconnect.web3.modal.ui.components.internal.commons.account.generateAvatarColors -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonSize -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonStyle -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ImageButton -import com.walletconnect.web3.modal.ui.components.internal.commons.button.TextButton -import com.walletconnect.web3.modal.ui.components.internal.commons.network.CircleNetworkImage -import com.walletconnect.web3.modal.ui.previews.ComponentPreview -import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.ProvideAppKitThemeComposition -import com.walletconnect.web3.modal.ui.theme.AppKitTheme -import com.walletconnect.web3.modal.utils.getImageData -import com.walletconnect.web3.modal.utils.toVisibleAddress +import com.reown.appkit.R +import com.reown.appkit.client.Modal +import com.reown.appkit.ui.components.internal.commons.HorizontalSpacer +import com.reown.appkit.ui.components.internal.commons.TransparentSurface +import com.reown.appkit.ui.components.internal.commons.account.generateAvatarColors +import com.reown.appkit.ui.components.internal.commons.button.ButtonSize +import com.reown.appkit.ui.components.internal.commons.button.ButtonStyle +import com.reown.appkit.ui.components.internal.commons.button.ImageButton +import com.reown.appkit.ui.components.internal.commons.button.TextButton +import com.reown.appkit.ui.components.internal.commons.network.CircleNetworkImage +import com.reown.appkit.ui.previews.ComponentPreview +import com.reown.appkit.ui.previews.MultipleComponentsPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.theme.ProvideAppKitThemeComposition +import com.reown.appkit.ui.theme.AppKitTheme +import com.reown.appkit.utils.getImageData +import com.reown.appkit.utils.toVisibleAddress enum class AccountButtonType { NORMAL, MIXED diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/AppKitState.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/AppKitState.kt similarity index 85% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/AppKitState.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/AppKitState.kt index 2ce94091e..5f63fd031 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/AppKitState.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/AppKitState.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.button +package com.reown.appkit.ui.components.button import androidx.compose.runtime.Composable import androidx.compose.runtime.remember @@ -10,20 +10,20 @@ import com.reown.android.pulse.model.EventType import com.reown.android.pulse.model.properties.Properties import com.reown.android.pulse.model.properties.Props import com.reown.foundation.util.Logger -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.AppKit -import com.walletconnect.web3.modal.domain.model.Session -import com.walletconnect.web3.modal.domain.usecase.GetEthBalanceUseCase -import com.walletconnect.web3.modal.domain.usecase.GetSessionUseCase -import com.walletconnect.web3.modal.domain.usecase.ObserveSelectedChainUseCase -import com.walletconnect.web3.modal.domain.usecase.ObserveSessionUseCase -import com.walletconnect.web3.modal.engine.AppKitEngine -import com.walletconnect.web3.modal.ui.components.ComponentDelegate -import com.walletconnect.web3.modal.ui.components.ComponentEvent -import com.walletconnect.web3.modal.ui.openAppKit -import com.walletconnect.web3.modal.utils.getChainNetworkImageUrl -import com.walletconnect.web3.modal.utils.getChains -import com.walletconnect.web3.modal.utils.getSelectedChain +import com.reown.appkit.client.Modal +import com.reown.appkit.client.AppKit +import com.reown.appkit.domain.model.Session +import com.reown.appkit.domain.usecase.GetEthBalanceUseCase +import com.reown.appkit.domain.usecase.GetSessionUseCase +import com.reown.appkit.domain.usecase.ObserveSelectedChainUseCase +import com.reown.appkit.domain.usecase.ObserveSessionUseCase +import com.reown.appkit.engine.AppKitEngine +import com.reown.appkit.ui.components.ComponentDelegate +import com.reown.appkit.ui.components.ComponentEvent +import com.reown.appkit.ui.openAppKit +import com.reown.appkit.utils.getChainNetworkImageUrl +import com.reown.appkit.utils.getChains +import com.reown.appkit.utils.getSelectedChain import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.SharingStarted diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/ConnectButton.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/ConnectButton.kt similarity index 78% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/ConnectButton.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/ConnectButton.kt index 06db57c80..5aaa063b9 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/ConnectButton.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/ConnectButton.kt @@ -1,17 +1,17 @@ -package com.walletconnect.web3.modal.ui.components.button +package com.reown.appkit.ui.components.button import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.ui.components.internal.commons.LoadingSpinner -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonSize -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonStyle -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ImageButton -import com.walletconnect.web3.modal.ui.components.internal.commons.button.TextButton -import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.ProvideAppKitThemeComposition +import com.reown.appkit.ui.components.internal.commons.LoadingSpinner +import com.reown.appkit.ui.components.internal.commons.button.ButtonSize +import com.reown.appkit.ui.components.internal.commons.button.ButtonStyle +import com.reown.appkit.ui.components.internal.commons.button.ImageButton +import com.reown.appkit.ui.components.internal.commons.button.TextButton +import com.reown.appkit.ui.previews.MultipleComponentsPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.theme.ProvideAppKitThemeComposition enum class ConnectButtonSize { NORMAL, SMALL diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/LoadingButton.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/LoadingButton.kt similarity index 55% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/LoadingButton.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/LoadingButton.kt index 763d52214..f7b0ba03b 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/LoadingButton.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/LoadingButton.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.button +package com.reown.appkit.ui.components.button import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.width @@ -6,13 +6,13 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.ui.components.internal.commons.LoadingSpinner -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonSize -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonStyle -import com.walletconnect.web3.modal.ui.components.internal.commons.button.StyledButton -import com.walletconnect.web3.modal.ui.previews.ComponentPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.ProvideAppKitThemeComposition +import com.reown.appkit.ui.components.internal.commons.LoadingSpinner +import com.reown.appkit.ui.components.internal.commons.button.ButtonSize +import com.reown.appkit.ui.components.internal.commons.button.ButtonStyle +import com.reown.appkit.ui.components.internal.commons.button.StyledButton +import com.reown.appkit.ui.previews.ComponentPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.theme.ProvideAppKitThemeComposition @Composable internal fun LoadingButton() { diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/NetworkButton.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/NetworkButton.kt similarity index 64% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/NetworkButton.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/NetworkButton.kt index 1b5ccd875..3c97eef9d 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/NetworkButton.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/NetworkButton.kt @@ -1,16 +1,16 @@ -package com.walletconnect.web3.modal.ui.components.button +package com.reown.appkit.ui.components.button import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.ui.components.internal.commons.SelectNetworkIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonSize -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonStyle -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ImageButton -import com.walletconnect.web3.modal.ui.components.internal.commons.network.CircleNetworkImage -import com.walletconnect.web3.modal.ui.theme.ProvideAppKitThemeComposition -import com.walletconnect.web3.modal.utils.getImageData +import com.reown.appkit.ui.components.internal.commons.SelectNetworkIcon +import com.reown.appkit.ui.components.internal.commons.button.ButtonSize +import com.reown.appkit.ui.components.internal.commons.button.ButtonStyle +import com.reown.appkit.ui.components.internal.commons.button.ImageButton +import com.reown.appkit.ui.components.internal.commons.network.CircleNetworkImage +import com.reown.appkit.ui.theme.ProvideAppKitThemeComposition +import com.reown.appkit.utils.getImageData @Composable fun NetworkButton( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/Web3Button.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/Web3Button.kt similarity index 93% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/Web3Button.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/Web3Button.kt index 6edcfd859..1e92a3b9f 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/Web3Button.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/Web3Button.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.button +package com.reown.appkit.ui.components.button import androidx.compose.animation.AnimatedContent import androidx.compose.runtime.Composable diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/views/AccountButton.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/views/AccountButton.kt similarity index 80% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/views/AccountButton.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/views/AccountButton.kt index 08b632a9b..73db9c3dc 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/views/AccountButton.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/views/AccountButton.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.button.views +package com.reown.appkit.ui.components.button.views import android.content.Context import android.util.AttributeSet @@ -7,10 +7,10 @@ import android.widget.FrameLayout import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.platform.ViewCompositionStrategy import androidx.navigation.findNavController -import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.ui.components.button.AccountButton -import com.walletconnect.web3.modal.ui.components.button.rememberAppKitState -import com.walletconnect.web3.modal.utils.toAccountButtonType +import com.reown.appkit.R +import com.reown.appkit.ui.components.button.AccountButton +import com.reown.appkit.ui.components.button.rememberAppKitState +import com.reown.appkit.utils.toAccountButtonType class AccountButton @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/views/ConnectButton.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/views/ConnectButton.kt similarity index 79% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/views/ConnectButton.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/views/ConnectButton.kt index 6d219bfe0..25fcbd151 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/views/ConnectButton.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/views/ConnectButton.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.button.views +package com.reown.appkit.ui.components.button.views import android.content.Context import android.util.AttributeSet @@ -7,10 +7,10 @@ import android.widget.FrameLayout import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.platform.ViewCompositionStrategy import androidx.navigation.findNavController -import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.ui.components.button.ConnectButton -import com.walletconnect.web3.modal.ui.components.button.rememberAppKitState -import com.walletconnect.web3.modal.utils.toConnectButtonSize +import com.reown.appkit.R +import com.reown.appkit.ui.components.button.ConnectButton +import com.reown.appkit.ui.components.button.rememberAppKitState +import com.reown.appkit.utils.toConnectButtonSize class ConnectButton @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/views/Web3Button.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/views/Web3Button.kt similarity index 80% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/views/Web3Button.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/views/Web3Button.kt index 8d16b4e71..89de4170e 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/button/views/Web3Button.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/button/views/Web3Button.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.button.views +package com.reown.appkit.ui.components.button.views import android.content.Context import android.util.AttributeSet @@ -7,11 +7,11 @@ import android.widget.FrameLayout import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.platform.ViewCompositionStrategy import androidx.navigation.findNavController -import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.ui.components.button.Web3Button -import com.walletconnect.web3.modal.ui.components.button.rememberAppKitState -import com.walletconnect.web3.modal.utils.toAccountButtonType -import com.walletconnect.web3.modal.utils.toConnectButtonSize +import com.reown.appkit.R +import com.reown.appkit.ui.components.button.Web3Button +import com.reown.appkit.ui.components.button.rememberAppKitState +import com.reown.appkit.utils.toAccountButtonType +import com.reown.appkit.utils.toConnectButtonSize class Web3Button @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/AppKitComponent.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/AppKitComponent.kt similarity index 84% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/AppKitComponent.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/AppKitComponent.kt index 81f69c60b..89025fcfe 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/AppKitComponent.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/AppKitComponent.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalAnimationApi::class) -package com.walletconnect.web3.modal.ui.components.internal +package com.reown.appkit.ui.components.internal import android.annotation.SuppressLint import androidx.compose.animation.AnimatedContent @@ -20,17 +20,17 @@ import androidx.compose.ui.Modifier import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.NavHostController import com.google.accompanist.navigation.animation.rememberAnimatedNavController -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.AppKit -import com.walletconnect.web3.modal.domain.delegate.AppKitDelegate -import com.walletconnect.web3.modal.ui.AppKitState -import com.walletconnect.web3.modal.ui.AppKitViewModel -import com.walletconnect.web3.modal.ui.components.internal.root.AppKitRoot -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.routes.account.AccountNavGraph -import com.walletconnect.web3.modal.ui.routes.connect.ConnectionNavGraph -import com.walletconnect.web3.modal.ui.utils.ComposableLifecycleEffect -import com.walletconnect.web3.modal.ui.utils.toComponentEvent +import com.reown.appkit.client.Modal +import com.reown.appkit.client.AppKit +import com.reown.appkit.domain.delegate.AppKitDelegate +import com.reown.appkit.ui.AppKitState +import com.reown.appkit.ui.AppKitViewModel +import com.reown.appkit.ui.components.internal.root.AppKitRoot +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.routes.account.AccountNavGraph +import com.reown.appkit.ui.routes.connect.ConnectionNavGraph +import com.reown.appkit.ui.utils.ComposableLifecycleEffect +import com.reown.appkit.ui.utils.toComponentEvent import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/AppKitStates.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/AppKitStates.kt similarity index 73% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/AppKitStates.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/AppKitStates.kt index 1694226e8..2da30ac9b 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/AppKitStates.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/AppKitStates.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal +package com.reown.appkit.ui.components.internal import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -11,11 +11,11 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import com.reown.modal.ui.components.common.VerticalSpacer -import com.walletconnect.web3.modal.ui.components.internal.commons.LoadingSpinner -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonSize -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonStyle -import com.walletconnect.web3.modal.ui.components.internal.commons.button.TryAgainButton -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.ui.components.internal.commons.LoadingSpinner +import com.reown.appkit.ui.components.internal.commons.button.ButtonSize +import com.reown.appkit.ui.components.internal.commons.button.ButtonStyle +import com.reown.appkit.ui.components.internal.commons.button.TryAgainButton +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun LoadingModalState() { diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/AppKitTopBar.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/AppKitTopBar.kt similarity index 70% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/AppKitTopBar.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/AppKitTopBar.kt index 0392e78be..6bf18e584 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/AppKitTopBar.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/AppKitTopBar.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal +package com.reown.appkit.ui.components.internal import androidx.compose.foundation.layout.* import androidx.compose.material.Text @@ -8,13 +8,13 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.testTag import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.AppKitTheme -import com.walletconnect.web3.modal.ui.components.internal.commons.BackArrowIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.CloseIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.QuestionMarkIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.TestTags -import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.theme.AppKitTheme +import com.reown.appkit.ui.components.internal.commons.BackArrowIcon +import com.reown.appkit.ui.components.internal.commons.CloseIcon +import com.reown.appkit.ui.components.internal.commons.QuestionMarkIcon +import com.reown.appkit.ui.components.internal.commons.TestTags +import com.reown.appkit.ui.previews.MultipleComponentsPreview @Composable internal fun AppKitTopBar( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/Orientation.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/Orientation.kt similarity index 94% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/Orientation.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/Orientation.kt index 5495b6f89..193af8723 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/Orientation.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/Orientation.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal +package com.reown.appkit.ui.components.internal import android.content.res.Configuration import androidx.compose.runtime.Composable diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/ContentDescription.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/ContentDescription.kt similarity index 90% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/ContentDescription.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/ContentDescription.kt index c89e9a38e..2ba17b674 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/ContentDescription.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/ContentDescription.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons +package com.reown.appkit.ui.components.internal.commons enum class ContentDescription(val description: String) { BACK_ARROW("BackArrow"), diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Dividers.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Dividers.kt similarity index 68% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Dividers.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Dividers.kt index 6b84dc2d1..8ccd0d153 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Dividers.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Dividers.kt @@ -1,9 +1,9 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons +package com.reown.appkit.ui.components.internal.commons import androidx.compose.material.Divider import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun FullWidthDivider(modifier: Modifier = Modifier) { diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Help.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Help.kt similarity index 92% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Help.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Help.kt index 0b81a32c7..bb9e6a740 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Help.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Help.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons +package com.reown.appkit.ui.components.internal.commons import androidx.compose.foundation.Image import androidx.compose.foundation.clickable @@ -19,10 +19,10 @@ import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.vectorResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.ui.previews.ComponentPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.R +import com.reown.appkit.ui.previews.ComponentPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun HelpSection( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Icons.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Icons.kt similarity index 96% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Icons.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Icons.kt index 07b28de8d..14fa77dda 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Icons.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Icons.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons +package com.reown.appkit.ui.components.internal.commons import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -15,10 +15,10 @@ import androidx.compose.ui.res.vectorResource import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import com.reown.modal.ui.components.common.roundedClickable -import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.R +import com.reown.appkit.ui.previews.MultipleComponentsPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun BackArrowIcon( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Label.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Label.kt similarity index 92% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Label.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Label.kt index a730f7a6e..9aed4fd03 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Label.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Label.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons +package com.reown.appkit.ui.components.internal.commons import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -11,9 +11,9 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.ui.previews.MultipleComponentsPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun AllLabel(isEnabled: Boolean = true) { diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/ListSelect.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/ListSelect.kt similarity index 88% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/ListSelect.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/ListSelect.kt index 4b283efec..f7ed3088b 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/ListSelect.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/ListSelect.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons +package com.reown.appkit.ui.components.internal.commons import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -15,10 +15,10 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clipToBounds import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.ui.components.internal.walletconnect.WalletConnectLogo -import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.ui.components.internal.walletconnect.WalletConnectLogo +import com.reown.appkit.ui.previews.MultipleComponentsPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun ListSelectRow( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Loading.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Loading.kt similarity index 93% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Loading.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Loading.kt index 4f8da099a..34d8ec019 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Loading.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Loading.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons +package com.reown.appkit.ui.components.internal.commons import androidx.compose.animation.core.LinearEasing import androidx.compose.animation.core.RepeatMode @@ -35,10 +35,10 @@ import androidx.compose.ui.graphics.drawscope.Stroke import androidx.compose.ui.graphics.nativeCanvas import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.ui.components.internal.commons.network.HexagonShape -import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.ui.components.internal.commons.network.HexagonShape +import com.reown.appkit.ui.previews.MultipleComponentsPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun LoadingSpinner( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Spacers.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Spacers.kt similarity index 89% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Spacers.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Spacers.kt index 5a093755a..0562b08c4 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Spacers.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Spacers.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons +package com.reown.appkit.ui.components.internal.commons import androidx.compose.foundation.layout.* import androidx.compose.runtime.Composable diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Surface.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Surface.kt similarity index 87% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Surface.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Surface.kt index b8f98cd94..96812c9a4 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Surface.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Surface.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons +package com.reown.appkit.ui.components.internal.commons import androidx.compose.material.Surface import androidx.compose.runtime.Composable diff --git a/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/TestTags.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/TestTags.kt new file mode 100644 index 000000000..0fef15179 --- /dev/null +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/TestTags.kt @@ -0,0 +1,5 @@ +package com.reown.appkit.ui.components.internal.commons + +internal object TestTags { + const val TITLE = "Title" +} diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Wallets.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Wallets.kt similarity index 93% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Wallets.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Wallets.kt index 598818904..6fa0b6312 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/Wallets.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/Wallets.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons +package com.reown.appkit.ui.components.internal.commons import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -32,13 +32,13 @@ import androidx.compose.ui.unit.dp import coil.compose.AsyncImage import coil.request.ImageRequest import com.reown.android.internal.common.modal.data.model.Wallet -import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.previews.testWallets -import com.walletconnect.web3.modal.ui.theme.AppKitTheme -import com.walletconnect.web3.modal.utils.grayColorFilter -import com.walletconnect.web3.modal.utils.imageHeaders +import com.reown.appkit.R +import com.reown.appkit.ui.previews.MultipleComponentsPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.previews.testWallets +import com.reown.appkit.ui.theme.AppKitTheme +import com.reown.appkit.utils.grayColorFilter +import com.reown.appkit.utils.imageHeaders @Composable internal fun MultipleWalletIcon(wallets: List) { diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/account/AccountImage.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/account/AccountImage.kt similarity index 91% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/account/AccountImage.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/account/AccountImage.kt index d2db57adb..1936205c4 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/account/AccountImage.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/account/AccountImage.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons.account +package com.reown.appkit.ui.components.internal.commons.account import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -14,9 +14,9 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.unit.dp import coil.compose.AsyncImage import coil.request.ImageRequest -import com.walletconnect.web3.modal.ui.previews.ComponentPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.ui.previews.ComponentPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.theme.AppKitTheme import kotlin.math.roundToInt @Composable diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/account/AccountName.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/account/AccountName.kt similarity index 71% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/account/AccountName.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/account/AccountName.kt index 55e22e975..6a07b0850 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/account/AccountName.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/account/AccountName.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons.account +package com.reown.appkit.ui.components.internal.commons.account import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.padding @@ -12,14 +12,14 @@ import androidx.compose.ui.platform.LocalClipboardManager import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.unit.dp import com.reown.modal.ui.components.common.roundedClickable -import com.walletconnect.web3.modal.domain.model.AccountData -import com.walletconnect.web3.modal.domain.model.Identity -import com.walletconnect.web3.modal.ui.components.internal.commons.CopyIcon -import com.walletconnect.web3.modal.ui.previews.ComponentPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.previews.accountDataPreview -import com.walletconnect.web3.modal.ui.theme.AppKitTheme -import com.walletconnect.web3.modal.utils.toVisibleAddress +import com.reown.appkit.domain.model.AccountData +import com.reown.appkit.domain.model.Identity +import com.reown.appkit.ui.components.internal.commons.CopyIcon +import com.reown.appkit.ui.previews.ComponentPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.previews.accountDataPreview +import com.reown.appkit.ui.theme.AppKitTheme +import com.reown.appkit.utils.toVisibleAddress @Composable internal fun AccountName(accountData: AccountData) { diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/button/Button.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/button/Button.kt similarity index 92% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/button/Button.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/button/Button.kt index 110d48a11..9e2e6cbe2 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/button/Button.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/button/Button.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons.button +package com.reown.appkit.ui.components.internal.commons.button import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -20,11 +20,11 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.tooling.preview.PreviewParameterProvider import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.ui.components.internal.commons.HorizontalSpacer -import com.walletconnect.web3.modal.ui.components.internal.commons.RetryIcon -import com.walletconnect.web3.modal.ui.previews.ComponentPreview -import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview +import com.reown.appkit.ui.components.internal.commons.HorizontalSpacer +import com.reown.appkit.ui.components.internal.commons.RetryIcon +import com.reown.appkit.ui.previews.ComponentPreview +import com.reown.appkit.ui.previews.MultipleComponentsPreview +import com.reown.appkit.ui.previews.UiModePreview @Composable internal fun TryAgainButton( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/button/ButtonStyle.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/button/ButtonStyle.kt similarity index 95% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/button/ButtonStyle.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/button/ButtonStyle.kt index ff1a45ec3..865297eeb 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/button/ButtonStyle.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/button/ButtonStyle.kt @@ -1,11 +1,11 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons.button +package com.reown.appkit.ui.components.internal.commons.button import androidx.compose.foundation.layout.PaddingValues import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.TextStyle import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.ui.theme.AppKitTheme internal data class ButtonData( val size: ButtonSize, diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/button/ChipButton.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/button/ChipButton.kt similarity index 88% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/button/ChipButton.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/button/ChipButton.kt index ae20a5cbc..30f06891b 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/button/ChipButton.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/button/ChipButton.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons.button +package com.reown.appkit.ui.components.internal.commons.button import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -20,11 +20,11 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.tooling.preview.PreviewParameterProvider import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.ui.components.internal.commons.CompassIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.ExternalIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.HorizontalSpacer -import com.walletconnect.web3.modal.ui.previews.ComponentPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview +import com.reown.appkit.ui.components.internal.commons.CompassIcon +import com.reown.appkit.ui.components.internal.commons.ExternalIcon +import com.reown.appkit.ui.components.internal.commons.HorizontalSpacer +import com.reown.appkit.ui.previews.ComponentPreview +import com.reown.appkit.ui.previews.UiModePreview @Composable internal fun ChipButton( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/button/LinkButton.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/button/LinkButton.kt similarity index 79% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/button/LinkButton.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/button/LinkButton.kt index a4e92c64f..59edbc6d0 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/button/LinkButton.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/button/LinkButton.kt @@ -1,10 +1,10 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons.button +package com.reown.appkit.ui.components.internal.commons.button import androidx.compose.material.Text import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.ui.components.internal.commons.HorizontalSpacer +import com.reown.appkit.ui.components.internal.commons.HorizontalSpacer @Composable internal fun LinkButton( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/entry/AccountEntry.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/entry/AccountEntry.kt similarity index 83% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/entry/AccountEntry.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/entry/AccountEntry.kt index d6461b549..ece50fbbe 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/entry/AccountEntry.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/entry/AccountEntry.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons.entry +package com.reown.appkit.ui.components.internal.commons.entry import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -13,14 +13,14 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.unit.dp import androidx.core.content.ContextCompat -import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.ui.components.internal.commons.ChevronRightIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.HorizontalSpacer -import com.walletconnect.web3.modal.ui.components.internal.commons.LoadingSpinner -import com.walletconnect.web3.modal.ui.components.internal.commons.network.CircleNetworkImage -import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.R +import com.reown.appkit.ui.components.internal.commons.ChevronRightIcon +import com.reown.appkit.ui.components.internal.commons.HorizontalSpacer +import com.reown.appkit.ui.components.internal.commons.LoadingSpinner +import com.reown.appkit.ui.components.internal.commons.network.CircleNetworkImage +import com.reown.appkit.ui.previews.MultipleComponentsPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.theme.AppKitTheme internal enum class AccountEntryState { LOADING, NEXT, INFO diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/entry/ActionEntry.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/entry/ActionEntry.kt similarity index 82% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/entry/ActionEntry.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/entry/ActionEntry.kt index c5245a823..b4b2088cf 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/entry/ActionEntry.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/entry/ActionEntry.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons.entry +package com.reown.appkit.ui.components.internal.commons.entry import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -17,13 +17,13 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.ui.components.internal.commons.CopyIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.HorizontalSpacer -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonSize -import com.walletconnect.web3.modal.ui.components.internal.commons.button.LinkButton -import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.ui.components.internal.commons.CopyIcon +import com.reown.appkit.ui.components.internal.commons.HorizontalSpacer +import com.reown.appkit.ui.components.internal.commons.button.ButtonSize +import com.reown.appkit.ui.components.internal.commons.button.LinkButton +import com.reown.appkit.ui.previews.MultipleComponentsPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun ActionEntry( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/entry/BaseEntry.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/entry/BaseEntry.kt similarity index 85% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/entry/BaseEntry.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/entry/BaseEntry.kt index 3a8a45f64..bedf8f14b 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/entry/BaseEntry.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/entry/BaseEntry.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons.entry +package com.reown.appkit.ui.components.internal.commons.entry import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.padding @@ -7,8 +7,8 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.ui.components.internal.commons.TransparentSurface -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.ui.components.internal.commons.TransparentSurface +import com.reown.appkit.ui.theme.AppKitTheme internal data class EntryColors( val background: Color, diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/entry/StoreEntry.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/entry/StoreEntry.kt similarity index 83% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/entry/StoreEntry.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/entry/StoreEntry.kt index 1c17b5cc0..889dbd4fb 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/entry/StoreEntry.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/entry/StoreEntry.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons.entry +package com.reown.appkit.ui.components.internal.commons.entry import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -17,13 +17,13 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.ui.components.internal.commons.ForwardIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.HorizontalSpacer -import com.walletconnect.web3.modal.ui.components.internal.commons.TransparentSurface -import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.previews.testWallets -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.ui.components.internal.commons.ForwardIcon +import com.reown.appkit.ui.components.internal.commons.HorizontalSpacer +import com.reown.appkit.ui.components.internal.commons.TransparentSurface +import com.reown.appkit.ui.previews.MultipleComponentsPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.previews.testWallets +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun StoreEntry( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/inputs/BaseTextInput.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/inputs/BaseTextInput.kt similarity index 95% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/inputs/BaseTextInput.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/inputs/BaseTextInput.kt index 9ebae7299..cf7b88ca1 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/inputs/BaseTextInput.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/inputs/BaseTextInput.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons.inputs +package com.reown.appkit.ui.components.internal.commons.inputs import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -17,7 +17,7 @@ import androidx.compose.ui.focus.onFocusChanged import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.SolidColor import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun BaseTextInput( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/inputs/InputCancel.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/inputs/InputCancel.kt similarity index 80% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/inputs/InputCancel.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/inputs/InputCancel.kt index 7656b154a..ae3656694 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/inputs/InputCancel.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/inputs/InputCancel.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons.inputs +package com.reown.appkit.ui.components.internal.commons.inputs import androidx.compose.foundation.Image import androidx.compose.foundation.clickable @@ -13,11 +13,11 @@ import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.vectorResource import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.ui.components.internal.commons.ContentDescription -import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.R +import com.reown.appkit.ui.components.internal.commons.ContentDescription +import com.reown.appkit.ui.previews.MultipleComponentsPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun InputCancel( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/inputs/InputState.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/inputs/InputState.kt similarity index 94% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/inputs/InputState.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/inputs/InputState.kt index 63bb09bce..ad1a980fd 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/inputs/InputState.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/inputs/InputState.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons.inputs +package com.reown.appkit.ui.components.internal.commons.inputs import androidx.compose.ui.focus.FocusManager import com.walletconnect.util.Empty diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/inputs/SearchInput.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/inputs/SearchInput.kt similarity index 94% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/inputs/SearchInput.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/inputs/SearchInput.kt index 1c9bc18de..a1f9e5a9a 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/inputs/SearchInput.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/inputs/SearchInput.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons.inputs +package com.reown.appkit.ui.components.internal.commons.inputs import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -33,11 +33,11 @@ import androidx.compose.ui.tooling.preview.PreviewParameterProvider import androidx.compose.ui.unit.dp import com.reown.modal.ui.components.common.HorizontalSpacer import com.walletconnect.util.Empty -import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.ui.components.internal.commons.ContentDescription -import com.walletconnect.web3.modal.ui.previews.ComponentPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.R +import com.reown.appkit.ui.components.internal.commons.ContentDescription +import com.reown.appkit.ui.previews.ComponentPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.theme.AppKitTheme import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/network/ChainNetworkIcons.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/network/ChainNetworkIcons.kt similarity index 92% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/network/ChainNetworkIcons.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/network/ChainNetworkIcons.kt index f80d9e963..c743cb4f9 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/network/ChainNetworkIcons.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/network/ChainNetworkIcons.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons.network +package com.reown.appkit.ui.components.internal.commons.network import android.graphics.drawable.Drawable import androidx.compose.foundation.border @@ -28,12 +28,12 @@ import androidx.compose.ui.unit.dp import androidx.core.content.ContextCompat import coil.compose.AsyncImage import coil.request.ImageRequest -import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.AppKitTheme -import com.walletconnect.web3.modal.utils.grayColorFilter -import com.walletconnect.web3.modal.utils.imageHeaders +import com.reown.appkit.R +import com.reown.appkit.ui.previews.MultipleComponentsPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.theme.AppKitTheme +import com.reown.appkit.utils.grayColorFilter +import com.reown.appkit.utils.imageHeaders import kotlin.math.cos import kotlin.math.sin diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/network/ChainNetworkItem.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/network/ChainNetworkItem.kt similarity index 86% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/network/ChainNetworkItem.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/network/ChainNetworkItem.kt index 0d8fb700b..caa6b23ba 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/network/ChainNetworkItem.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/network/ChainNetworkItem.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons.network +package com.reown.appkit.ui.components.internal.commons.network import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -16,13 +16,13 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.ui.components.internal.commons.TransparentSurface -import com.walletconnect.web3.modal.ui.components.internal.commons.VerticalSpacer -import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.R +import com.reown.appkit.client.Modal +import com.reown.appkit.ui.components.internal.commons.TransparentSurface +import com.reown.appkit.ui.components.internal.commons.VerticalSpacer +import com.reown.appkit.ui.previews.MultipleComponentsPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun ChainNetworkItem( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/switch/PlatformTabRow.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/switch/PlatformTabRow.kt similarity index 91% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/switch/PlatformTabRow.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/switch/PlatformTabRow.kt index 27dbfb39f..a568aa72d 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/switch/PlatformTabRow.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/switch/PlatformTabRow.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons.switch +package com.reown.appkit.ui.components.internal.commons.switch import androidx.compose.animation.core.animateDp import androidx.compose.animation.core.spring @@ -33,12 +33,12 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.zIndex -import com.walletconnect.web3.modal.ui.components.internal.commons.HorizontalSpacer -import com.walletconnect.web3.modal.ui.components.internal.commons.MobileIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.WebIcon -import com.walletconnect.web3.modal.ui.previews.ComponentPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.ui.components.internal.commons.HorizontalSpacer +import com.reown.appkit.ui.components.internal.commons.MobileIcon +import com.reown.appkit.ui.components.internal.commons.WebIcon +import com.reown.appkit.ui.previews.ComponentPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.theme.AppKitTheme internal enum class PlatformTab( val value: Int, val label: String diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/InputBox.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/email/InputBox.kt similarity index 80% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/InputBox.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/email/InputBox.kt index 971f5a1f1..854f5d1df 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/InputBox.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/email/InputBox.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.email +package com.reown.appkit.ui.components.internal.email import androidx.compose.animation.animateContentSize import androidx.compose.foundation.layout.Column @@ -11,9 +11,9 @@ import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.ui.components.internal.commons.VerticalSpacer -import com.walletconnect.web3.modal.ui.components.internal.commons.inputs.InputState -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.ui.components.internal.commons.VerticalSpacer +import com.reown.appkit.ui.components.internal.commons.inputs.InputState +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun InputValidationBox( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/code/CodeInput.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/email/code/CodeInput.kt similarity index 97% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/code/CodeInput.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/email/code/CodeInput.kt index a4c3fca20..c22d6bc52 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/code/CodeInput.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/email/code/CodeInput.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.email.code +package com.reown.appkit.ui.components.internal.email.code import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.core.RepeatMode @@ -38,7 +38,7 @@ import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.unit.dp import com.walletconnect.util.Empty -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun CodeInput(codeInputState: CodeInputState) { diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/code/CodeInputState.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/email/code/CodeInputState.kt similarity index 87% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/code/CodeInputState.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/email/code/CodeInputState.kt index e3603e858..f357947b7 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/code/CodeInputState.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/email/code/CodeInputState.kt @@ -1,11 +1,11 @@ -package com.walletconnect.web3.modal.ui.components.internal.email.code +package com.reown.appkit.ui.components.internal.email.code import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.focus.FocusManager import androidx.compose.ui.platform.LocalFocusManager -import com.walletconnect.web3.modal.ui.components.internal.commons.inputs.InputState +import com.reown.appkit.ui.components.internal.commons.inputs.InputState import kotlinx.coroutines.CoroutineScope @Composable diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/input/EmailInput.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/email/input/EmailInput.kt similarity index 87% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/input/EmailInput.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/email/input/EmailInput.kt index e64f9efad..dc8e70ee8 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/input/EmailInput.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/email/input/EmailInput.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.email.input +package com.reown.appkit.ui.components.internal.email.input import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Row @@ -18,11 +18,11 @@ import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.unit.dp import com.reown.modal.ui.components.common.HorizontalSpacer import com.reown.modal.ui.components.common.roundedClickable -import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.ui.components.internal.commons.ContentDescription -import com.walletconnect.web3.modal.ui.components.internal.commons.LoadingSpinner -import com.walletconnect.web3.modal.ui.components.internal.commons.inputs.BaseTextInput -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.R +import com.reown.appkit.ui.components.internal.commons.ContentDescription +import com.reown.appkit.ui.components.internal.commons.LoadingSpinner +import com.reown.appkit.ui.components.internal.commons.inputs.BaseTextInput +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun EmailInput( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/input/EmailInputState.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/email/input/EmailInputState.kt similarity index 88% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/input/EmailInputState.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/email/input/EmailInputState.kt index ca3347fdc..7db84e0e7 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/email/input/EmailInputState.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/email/input/EmailInputState.kt @@ -1,11 +1,11 @@ -package com.walletconnect.web3.modal.ui.components.internal.email.input +package com.reown.appkit.ui.components.internal.email.input import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.focus.FocusManager import androidx.compose.ui.platform.LocalFocusManager -import com.walletconnect.web3.modal.ui.components.internal.commons.inputs.InputState +import com.reown.appkit.ui.components.internal.commons.inputs.InputState import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.update diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRoot.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/root/AppKitRoot.kt similarity index 79% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRoot.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/root/AppKitRoot.kt index 81a2da04a..5ff15d395 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRoot.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/root/AppKitRoot.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalComposeUiApi::class) -package com.walletconnect.web3.modal.ui.components.internal.root +package com.reown.appkit.ui.components.internal.root import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -21,20 +21,20 @@ import androidx.compose.ui.unit.dp import androidx.navigation.NavHostController import androidx.navigation.compose.rememberNavController import com.reown.modal.ui.components.common.roundedClickable -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.domain.delegate.AppKitDelegate -import com.walletconnect.web3.modal.ui.components.internal.AppKitTopBar -import com.walletconnect.web3.modal.ui.components.internal.commons.BackArrowIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.FullWidthDivider -import com.walletconnect.web3.modal.ui.components.internal.commons.QuestionMarkIcon -import com.walletconnect.web3.modal.ui.components.internal.snackbar.ModalSnackBarHost -import com.walletconnect.web3.modal.ui.components.internal.snackbar.SnackBarState -import com.walletconnect.web3.modal.ui.components.internal.snackbar.rememberSnackBarState -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.ProvideAppKitThemeComposition -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.client.Modal +import com.reown.appkit.domain.delegate.AppKitDelegate +import com.reown.appkit.ui.components.internal.AppKitTopBar +import com.reown.appkit.ui.components.internal.commons.BackArrowIcon +import com.reown.appkit.ui.components.internal.commons.FullWidthDivider +import com.reown.appkit.ui.components.internal.commons.QuestionMarkIcon +import com.reown.appkit.ui.components.internal.snackbar.ModalSnackBarHost +import com.reown.appkit.ui.components.internal.snackbar.SnackBarState +import com.reown.appkit.ui.components.internal.snackbar.rememberSnackBarState +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.previews.MultipleComponentsPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.theme.ProvideAppKitThemeComposition +import com.reown.appkit.ui.theme.AppKitTheme import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.filterIsInstance import kotlinx.coroutines.flow.onEach diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRootState.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/root/AppKitRootState.kt similarity index 91% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRootState.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/root/AppKitRootState.kt index 2945c8dd7..34e02a278 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/AppKitRootState.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/root/AppKitRootState.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.root +package com.reown.appkit.ui.components.internal.root import androidx.compose.runtime.Composable import androidx.compose.runtime.remember @@ -9,8 +9,8 @@ import com.reown.android.internal.common.wcKoinApp import com.reown.android.pulse.domain.SendEventInterface import com.reown.android.pulse.model.EventType import com.reown.android.pulse.model.properties.Props -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.navigation.getTitleArg +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.navigation.getTitleArg import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/snackbar/ModalSnackBar.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/snackbar/ModalSnackBar.kt similarity index 90% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/snackbar/ModalSnackBar.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/snackbar/ModalSnackBar.kt index 279f2da5d..51c4f3b1f 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/snackbar/ModalSnackBar.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/snackbar/ModalSnackBar.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.snackbar +package com.reown.appkit.ui.components.internal.snackbar import androidx.compose.animation.animateContentSize import androidx.compose.foundation.background @@ -20,11 +20,11 @@ import androidx.compose.ui.res.vectorResource import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.tooling.preview.PreviewParameterProvider import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.ui.components.internal.commons.HorizontalSpacer -import com.walletconnect.web3.modal.ui.previews.ComponentPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.R +import com.reown.appkit.ui.components.internal.commons.HorizontalSpacer +import com.reown.appkit.ui.previews.ComponentPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun ModalSnackBar( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/snackbar/ModalSnackbarHost.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/snackbar/ModalSnackbarHost.kt similarity index 96% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/snackbar/ModalSnackbarHost.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/snackbar/ModalSnackbarHost.kt index 297017f32..1c0f2f157 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/snackbar/ModalSnackbarHost.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/snackbar/ModalSnackbarHost.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.snackbar +package com.reown.appkit.ui.components.internal.snackbar import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.fadeIn diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/snackbar/SnackBarEvent.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/snackbar/SnackBarEvent.kt similarity index 83% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/snackbar/SnackBarEvent.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/snackbar/SnackBarEvent.kt index 7df5d9d31..b564b9efc 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/snackbar/SnackBarEvent.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/snackbar/SnackBarEvent.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.snackbar +package com.reown.appkit.ui.components.internal.snackbar internal enum class SnackBarEventType { SUCCESS, INFO, ERROR diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/snackbar/SnackBarState.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/snackbar/SnackBarState.kt similarity index 97% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/snackbar/SnackBarState.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/snackbar/SnackBarState.kt index 227e7132a..625af7eea 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/snackbar/SnackBarState.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/snackbar/SnackBarState.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.snackbar +package com.reown.appkit.ui.components.internal.snackbar import androidx.compose.runtime.Composable import androidx.compose.runtime.Stable diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/walletconnect/WalletConnectListSelect.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/walletconnect/WalletConnectListSelect.kt similarity index 67% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/walletconnect/WalletConnectListSelect.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/walletconnect/WalletConnectListSelect.kt index 5fca062eb..a92adcc1b 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/walletconnect/WalletConnectListSelect.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/walletconnect/WalletConnectListSelect.kt @@ -1,14 +1,14 @@ -package com.walletconnect.web3.modal.ui.components.internal.walletconnect +package com.reown.appkit.ui.components.internal.walletconnect import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.lazy.LazyListScope import androidx.compose.runtime.Composable import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.ui.components.internal.commons.ListSelectRow -import com.walletconnect.web3.modal.ui.components.internal.commons.AllWalletsIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.TextLabel -import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview +import com.reown.appkit.ui.components.internal.commons.ListSelectRow +import com.reown.appkit.ui.components.internal.commons.AllWalletsIcon +import com.reown.appkit.ui.components.internal.commons.TextLabel +import com.reown.appkit.ui.previews.MultipleComponentsPreview +import com.reown.appkit.ui.previews.UiModePreview fun LazyListScope.allWallets(text: String, isEnabled: Boolean = true, onClick: () -> Unit) { item { WalletConnectAll(text = text, isEnabled = isEnabled, onClick = onClick) } diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/walletconnect/WalletConnectLogo.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/walletconnect/WalletConnectLogo.kt similarity index 81% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/walletconnect/WalletConnectLogo.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/walletconnect/WalletConnectLogo.kt index 03362e9c6..5af89e875 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/walletconnect/WalletConnectLogo.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/components/internal/walletconnect/WalletConnectLogo.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.components.internal.walletconnect +package com.reown.appkit.ui.components.internal.walletconnect import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -13,11 +13,11 @@ import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.vectorResource import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.ui.components.internal.commons.ContentDescription -import com.walletconnect.web3.modal.ui.previews.MultipleComponentsPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.R +import com.reown.appkit.ui.components.internal.commons.ContentDescription +import com.reown.appkit.ui.previews.MultipleComponentsPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun WalletConnectLogo( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/model/UiState.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/model/UiState.kt similarity index 85% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/model/UiState.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/model/UiState.kt index 225793f1d..3bc8d9a57 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/model/UiState.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/model/UiState.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.model +package com.reown.appkit.ui.model import androidx.compose.animation.AnimatedContent import androidx.compose.animation.fadeIn @@ -9,8 +9,8 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import com.reown.modal.ui.model.UiState -import com.walletconnect.web3.modal.ui.components.internal.ErrorModalState -import com.walletconnect.web3.modal.ui.components.internal.LoadingModalState +import com.reown.appkit.ui.components.internal.ErrorModalState +import com.reown.appkit.ui.components.internal.LoadingModalState import kotlinx.coroutines.flow.StateFlow @Composable diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/navigation/NavUtils.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/NavUtils.kt similarity index 83% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/navigation/NavUtils.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/NavUtils.kt index b5de9a164..0f72f9fb9 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/navigation/NavUtils.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/NavUtils.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.navigation +package com.reown.appkit.ui.navigation import androidx.navigation.NavBackStackEntry diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/navigation/Navigator.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/Navigator.kt similarity index 95% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/navigation/Navigator.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/Navigator.kt index 0fbee267d..0eb5051e9 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/navigation/Navigator.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/Navigator.kt @@ -1,10 +1,10 @@ -package com.walletconnect.web3.modal.ui.navigation +package com.reown.appkit.ui.navigation import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.rememberCoroutineScope import androidx.navigation.NavController -import com.walletconnect.web3.modal.ui.components.internal.snackbar.LocalSnackBarHandler +import com.reown.appkit.ui.components.internal.snackbar.LocalSnackBarHandler import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.asSharedFlow diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/navigation/Route.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/Route.kt similarity index 94% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/navigation/Route.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/Route.kt index 22cf16c96..3ece6dd53 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/navigation/Route.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/Route.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.navigation +package com.reown.appkit.ui.navigation //Todo Think about split it into own graphs routes diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/navigation/account/Navigation.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/account/Navigation.kt similarity index 70% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/navigation/account/Navigation.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/account/Navigation.kt index 827aea882..427f6ffd1 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/navigation/account/Navigation.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/account/Navigation.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalAnimationApi::class) -package com.walletconnect.web3.modal.ui.navigation.account +package com.reown.appkit.ui.navigation.account import androidx.compose.animation.ExperimentalAnimationApi import androidx.navigation.NavGraphBuilder @@ -8,12 +8,12 @@ import androidx.navigation.NavType import com.google.accompanist.navigation.animation.composable import androidx.navigation.navArgument import com.walletconnect.util.Empty -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.AppKit -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.navigation.addTitleArg -import com.walletconnect.web3.modal.ui.routes.account.AccountViewModel -import com.walletconnect.web3.modal.ui.routes.account.chain_redirect.ChainSwitchRedirectRoute +import com.reown.appkit.client.Modal +import com.reown.appkit.client.AppKit +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.navigation.addTitleArg +import com.reown.appkit.ui.routes.account.AccountViewModel +import com.reown.appkit.ui.routes.account.chain_redirect.ChainSwitchRedirectRoute private const val CHAIN_ID_KEY = "chainId" private const val CHAIN_ID_ARG = "{chainId}" diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/navigation/connection/RedirectNavigation.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/connection/RedirectNavigation.kt similarity index 77% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/navigation/connection/RedirectNavigation.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/connection/RedirectNavigation.kt index 071a96af2..602399b82 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/navigation/connection/RedirectNavigation.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/navigation/connection/RedirectNavigation.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalAnimationApi::class) -package com.walletconnect.web3.modal.ui.navigation.connection +package com.reown.appkit.ui.navigation.connection import androidx.compose.animation.ExperimentalAnimationApi import androidx.navigation.NavGraphBuilder @@ -9,10 +9,10 @@ import androidx.navigation.navArgument import com.google.accompanist.navigation.animation.composable import com.reown.android.internal.common.modal.data.model.Wallet import com.walletconnect.util.Empty -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.navigation.addTitleArg -import com.walletconnect.web3.modal.ui.routes.connect.ConnectViewModel -import com.walletconnect.web3.modal.ui.routes.connect.redirect.RedirectWalletRoute +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.navigation.addTitleArg +import com.reown.appkit.ui.routes.connect.ConnectViewModel +import com.reown.appkit.ui.routes.connect.redirect.RedirectWalletRoute import timber.log.Timber private const val WALLET_ID_KEY = "walletId" diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/previews/PreviewData.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/previews/PreviewData.kt similarity index 96% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/previews/PreviewData.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/previews/PreviewData.kt index 12a285c4d..c84e68574 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/previews/PreviewData.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/previews/PreviewData.kt @@ -1,9 +1,9 @@ -package com.walletconnect.web3.modal.ui.previews +package com.reown.appkit.ui.previews import androidx.compose.ui.tooling.preview.PreviewParameterProvider import com.reown.android.internal.common.modal.data.model.Wallet -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.domain.model.AccountData +import com.reown.appkit.client.Modal +import com.reown.appkit.domain.model.AccountData private val metaMask: Wallet get() = Wallet(id = "1", name = "MetaMask", homePage = "", order = "", imageUrl = "", mobileLink = "metamask://", webAppLink = "", playStore = "", linkMode = "").apply { isRecent = true } diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/previews/Previews.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/previews/Previews.kt similarity index 82% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/previews/Previews.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/previews/Previews.kt index 96c4205e3..7ce71c4ed 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/previews/Previews.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/previews/Previews.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.previews +package com.reown.appkit.ui.previews import android.content.res.Configuration.UI_MODE_NIGHT_NO import android.content.res.Configuration.UI_MODE_NIGHT_YES @@ -14,12 +14,12 @@ import androidx.compose.ui.unit.dp import androidx.navigation.compose.rememberNavController import com.reown.android.internal.common.model.ProjectId import com.reown.android.internal.common.wcKoinApp -import com.walletconnect.web3.modal.ui.components.internal.root.AppKitRoot -import com.walletconnect.web3.modal.ui.components.internal.commons.VerticalSpacer -import com.walletconnect.web3.modal.ui.components.internal.root.rememberAppKitRootState -import com.walletconnect.web3.modal.ui.components.internal.snackbar.rememberSnackBarState -import com.walletconnect.web3.modal.ui.theme.ProvideAppKitThemeComposition -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.ui.components.internal.root.AppKitRoot +import com.reown.appkit.ui.components.internal.commons.VerticalSpacer +import com.reown.appkit.ui.components.internal.root.rememberAppKitRootState +import com.reown.appkit.ui.components.internal.snackbar.rememberSnackBarState +import com.reown.appkit.ui.theme.ProvideAppKitThemeComposition +import com.reown.appkit.ui.theme.AppKitTheme import org.koin.dsl.module @Composable diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/AccountNavigationGraph.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/AccountNavigationGraph.kt similarity index 65% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/AccountNavigationGraph.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/AccountNavigationGraph.kt index dce5e4d11..e97fd242f 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/AccountNavigationGraph.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/AccountNavigationGraph.kt @@ -1,16 +1,16 @@ -package com.walletconnect.web3.modal.ui.routes.account +package com.reown.appkit.ui.routes.account import androidx.compose.runtime.Composable import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.NavHostController -import com.walletconnect.web3.modal.ui.navigation.ConsumeNavigationEventsEffect -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.navigation.account.chainSwitchRoute -import com.walletconnect.web3.modal.ui.routes.account.account.AccountRoute -import com.walletconnect.web3.modal.ui.routes.account.change_network.ChangeNetworkRoute -import com.walletconnect.web3.modal.ui.routes.account.what_is_network.WhatIsNetworkRoute -import com.walletconnect.web3.modal.ui.utils.AnimatedNavGraph -import com.walletconnect.web3.modal.ui.utils.animatedComposable +import com.reown.appkit.ui.navigation.ConsumeNavigationEventsEffect +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.navigation.account.chainSwitchRoute +import com.reown.appkit.ui.routes.account.account.AccountRoute +import com.reown.appkit.ui.routes.account.change_network.ChangeNetworkRoute +import com.reown.appkit.ui.routes.account.what_is_network.WhatIsNetworkRoute +import com.reown.appkit.ui.utils.AnimatedNavGraph +import com.reown.appkit.ui.utils.animatedComposable @Composable internal fun AccountNavGraph( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/AccountViewModel.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/AccountViewModel.kt similarity index 82% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/AccountViewModel.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/AccountViewModel.kt index 79255105e..f6cde9fd3 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/AccountViewModel.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/AccountViewModel.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.routes.account +package com.reown.appkit.ui.routes.account import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope @@ -9,27 +9,27 @@ import com.reown.android.pulse.model.properties.Properties import com.reown.android.pulse.model.properties.Props import com.reown.foundation.util.Logger import com.reown.modal.ui.model.UiState -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.models.request.Request -import com.walletconnect.web3.modal.client.models.request.SentRequestResult -import com.walletconnect.web3.modal.domain.model.AccountData -import com.walletconnect.web3.modal.domain.model.Session -import com.walletconnect.web3.modal.domain.usecase.GetEthBalanceUseCase -import com.walletconnect.web3.modal.domain.usecase.GetIdentityUseCase -import com.walletconnect.web3.modal.domain.usecase.ObserveSelectedChainUseCase -import com.walletconnect.web3.modal.domain.usecase.ObserveSessionUseCase -import com.walletconnect.web3.modal.domain.usecase.SaveChainSelectionUseCase -import com.walletconnect.web3.modal.domain.usecase.SaveSessionUseCase -import com.walletconnect.web3.modal.engine.AppKitEngine -import com.walletconnect.web3.modal.engine.coinbase.CoinbaseResult -import com.walletconnect.web3.modal.ui.navigation.Navigator -import com.walletconnect.web3.modal.ui.navigation.NavigatorImpl -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.navigation.account.toChainSwitchPath -import com.walletconnect.web3.modal.utils.EthUtils -import com.walletconnect.web3.modal.utils.createAddEthChainParams -import com.walletconnect.web3.modal.utils.createSwitchChainParams -import com.walletconnect.web3.modal.utils.getChains +import com.reown.appkit.client.Modal +import com.reown.appkit.client.models.request.Request +import com.reown.appkit.client.models.request.SentRequestResult +import com.reown.appkit.domain.model.AccountData +import com.reown.appkit.domain.model.Session +import com.reown.appkit.domain.usecase.GetEthBalanceUseCase +import com.reown.appkit.domain.usecase.GetIdentityUseCase +import com.reown.appkit.domain.usecase.ObserveSelectedChainUseCase +import com.reown.appkit.domain.usecase.ObserveSessionUseCase +import com.reown.appkit.domain.usecase.SaveChainSelectionUseCase +import com.reown.appkit.domain.usecase.SaveSessionUseCase +import com.reown.appkit.engine.AppKitEngine +import com.reown.appkit.engine.coinbase.CoinbaseResult +import com.reown.appkit.ui.navigation.Navigator +import com.reown.appkit.ui.navigation.NavigatorImpl +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.navigation.account.toChainSwitchPath +import com.reown.appkit.utils.EthUtils +import com.reown.appkit.utils.createAddEthChainParams +import com.reown.appkit.utils.createSwitchChainParams +import com.reown.appkit.utils.getChains import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.catch diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/account/AccountRoute.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/account/AccountRoute.kt similarity index 69% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/account/AccountRoute.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/account/AccountRoute.kt index b479f1005..cab51fd0c 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/account/AccountRoute.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/account/AccountRoute.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.routes.account.account +package com.reown.appkit.ui.routes.account.account import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -15,31 +15,31 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalUriHandler import androidx.compose.ui.unit.dp import androidx.navigation.NavController -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.domain.model.AccountData -import com.walletconnect.web3.modal.domain.model.Balance -import com.walletconnect.web3.modal.ui.components.internal.commons.CloseIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.CompassIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.DisconnectIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.ExternalIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.VerticalSpacer -import com.walletconnect.web3.modal.ui.components.internal.commons.account.AccountName -import com.walletconnect.web3.modal.ui.components.internal.commons.account.AccountImage -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonSize -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonStyle -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ChipButton -import com.walletconnect.web3.modal.ui.components.internal.commons.entry.AccountEntry -import com.walletconnect.web3.modal.ui.components.internal.commons.entry.AccountEntryState -import com.walletconnect.web3.modal.ui.components.internal.commons.network.CircleNetworkImage -import com.walletconnect.web3.modal.ui.model.UiStateBuilder -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.previews.AppKitPreview -import com.walletconnect.web3.modal.ui.previews.ethereumChain -import com.walletconnect.web3.modal.ui.routes.account.AccountViewModel -import com.walletconnect.web3.modal.ui.previews.accountDataPreview -import com.walletconnect.web3.modal.ui.theme.AppKitTheme -import com.walletconnect.web3.modal.utils.getImageData +import com.reown.appkit.client.Modal +import com.reown.appkit.domain.model.AccountData +import com.reown.appkit.domain.model.Balance +import com.reown.appkit.ui.components.internal.commons.CloseIcon +import com.reown.appkit.ui.components.internal.commons.CompassIcon +import com.reown.appkit.ui.components.internal.commons.DisconnectIcon +import com.reown.appkit.ui.components.internal.commons.ExternalIcon +import com.reown.appkit.ui.components.internal.commons.VerticalSpacer +import com.reown.appkit.ui.components.internal.commons.account.AccountName +import com.reown.appkit.ui.components.internal.commons.account.AccountImage +import com.reown.appkit.ui.components.internal.commons.button.ButtonSize +import com.reown.appkit.ui.components.internal.commons.button.ButtonStyle +import com.reown.appkit.ui.components.internal.commons.button.ChipButton +import com.reown.appkit.ui.components.internal.commons.entry.AccountEntry +import com.reown.appkit.ui.components.internal.commons.entry.AccountEntryState +import com.reown.appkit.ui.components.internal.commons.network.CircleNetworkImage +import com.reown.appkit.ui.model.UiStateBuilder +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.previews.AppKitPreview +import com.reown.appkit.ui.previews.ethereumChain +import com.reown.appkit.ui.routes.account.AccountViewModel +import com.reown.appkit.ui.previews.accountDataPreview +import com.reown.appkit.ui.theme.AppKitTheme +import com.reown.appkit.utils.getImageData @Composable internal fun AccountRoute( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/chain_redirect/ChainRedirectState.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/chain_redirect/ChainRedirectState.kt similarity index 65% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/chain_redirect/ChainRedirectState.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/chain_redirect/ChainRedirectState.kt index 1f193650d..9fd9c8df3 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/chain_redirect/ChainRedirectState.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/chain_redirect/ChainRedirectState.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.routes.account.chain_redirect +package com.reown.appkit.ui.routes.account.chain_redirect internal sealed class ChainRedirectState { object Loading : ChainRedirectState() diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/chain_redirect/ChainSwitchRedirect.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/chain_redirect/ChainSwitchRedirect.kt similarity index 84% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/chain_redirect/ChainSwitchRedirect.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/chain_redirect/ChainSwitchRedirect.kt index 7f20c0bac..e1a14d3b4 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/chain_redirect/ChainSwitchRedirect.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/chain_redirect/ChainSwitchRedirect.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.routes.account.chain_redirect +package com.reown.appkit.ui.routes.account.chain_redirect import androidx.compose.animation.AnimatedContent import androidx.compose.animation.AnimatedVisibility @@ -20,20 +20,20 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.domain.delegate.AppKitDelegate -import com.walletconnect.web3.modal.ui.components.internal.commons.DeclinedIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.LoadingHexagonBorder -import com.walletconnect.web3.modal.ui.components.internal.commons.VerticalSpacer -import com.walletconnect.web3.modal.ui.components.internal.commons.button.TryAgainButton -import com.walletconnect.web3.modal.ui.components.internal.commons.network.HexagonNetworkImage -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.previews.AppKitPreview -import com.walletconnect.web3.modal.ui.previews.testChains -import com.walletconnect.web3.modal.ui.routes.account.AccountViewModel -import com.walletconnect.web3.modal.ui.theme.AppKitTheme -import com.walletconnect.web3.modal.utils.getImageData -import com.walletconnect.web3.modal.utils.toSession +import com.reown.appkit.client.Modal +import com.reown.appkit.domain.delegate.AppKitDelegate +import com.reown.appkit.ui.components.internal.commons.DeclinedIcon +import com.reown.appkit.ui.components.internal.commons.LoadingHexagonBorder +import com.reown.appkit.ui.components.internal.commons.VerticalSpacer +import com.reown.appkit.ui.components.internal.commons.button.TryAgainButton +import com.reown.appkit.ui.components.internal.commons.network.HexagonNetworkImage +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.previews.AppKitPreview +import com.reown.appkit.ui.previews.testChains +import com.reown.appkit.ui.routes.account.AccountViewModel +import com.reown.appkit.ui.theme.AppKitTheme +import com.reown.appkit.utils.getImageData +import com.reown.appkit.utils.toSession import kotlinx.coroutines.launch @Composable diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/change_network/ChangeNetworkRoute.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/change_network/ChangeNetworkRoute.kt similarity index 76% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/change_network/ChangeNetworkRoute.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/change_network/ChangeNetworkRoute.kt index 99f1101ea..34bff4bf2 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/change_network/ChangeNetworkRoute.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/change_network/ChangeNetworkRoute.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.routes.account.change_network +package com.reown.appkit.ui.routes.account.change_network import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -13,18 +13,18 @@ import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.AppKit -import com.walletconnect.web3.modal.ui.components.internal.commons.NetworkBottomSection -import com.walletconnect.web3.modal.ui.components.internal.commons.VerticalSpacer -import com.walletconnect.web3.modal.ui.components.internal.commons.network.ChainNetworkItem -import com.walletconnect.web3.modal.ui.model.UiStateBuilder -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.previews.AppKitPreview -import com.walletconnect.web3.modal.ui.previews.ethereumChain -import com.walletconnect.web3.modal.ui.previews.testChains -import com.walletconnect.web3.modal.ui.routes.account.AccountViewModel -import com.walletconnect.web3.modal.utils.getChainNetworkImageUrl +import com.reown.appkit.client.Modal +import com.reown.appkit.client.AppKit +import com.reown.appkit.ui.components.internal.commons.NetworkBottomSection +import com.reown.appkit.ui.components.internal.commons.VerticalSpacer +import com.reown.appkit.ui.components.internal.commons.network.ChainNetworkItem +import com.reown.appkit.ui.model.UiStateBuilder +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.previews.AppKitPreview +import com.reown.appkit.ui.previews.ethereumChain +import com.reown.appkit.ui.previews.testChains +import com.reown.appkit.ui.routes.account.AccountViewModel +import com.reown.appkit.utils.getChainNetworkImageUrl @Composable internal fun ChangeNetworkRoute( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/siwe_fallback/SIWEFallbackRoute.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/siwe_fallback/SIWEFallbackRoute.kt similarity index 95% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/siwe_fallback/SIWEFallbackRoute.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/siwe_fallback/SIWEFallbackRoute.kt index b294f1e9c..ebe4be785 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/siwe_fallback/SIWEFallbackRoute.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/siwe_fallback/SIWEFallbackRoute.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.routes.account.siwe_fallback +package com.reown.appkit.ui.routes.account.siwe_fallback import androidx.compose.animation.AnimatedContent import androidx.compose.foundation.background @@ -32,10 +32,10 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.walletconnect.web3.modal.ui.components.internal.commons.VerticalSpacer -import com.walletconnect.web3.modal.ui.components.internal.commons.WalletImageWithLoader -import com.walletconnect.web3.modal.ui.routes.connect.ConnectViewModel -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.ui.components.internal.commons.VerticalSpacer +import com.reown.appkit.ui.components.internal.commons.WalletImageWithLoader +import com.reown.appkit.ui.routes.connect.ConnectViewModel +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun SIWEFallbackRoute( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/what_is_network/WhatIsNetworkRoute.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/what_is_network/WhatIsNetworkRoute.kt similarity index 74% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/what_is_network/WhatIsNetworkRoute.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/what_is_network/WhatIsNetworkRoute.kt index 6d7213d01..1081da838 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/account/what_is_network/WhatIsNetworkRoute.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/account/what_is_network/WhatIsNetworkRoute.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.routes.account.what_is_network +package com.reown.appkit.ui.routes.account.what_is_network import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues @@ -12,16 +12,16 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalUriHandler import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.ui.components.internal.commons.ExternalIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.HelpSection -import com.walletconnect.web3.modal.ui.components.internal.commons.VerticalSpacer -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonSize -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonStyle -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ImageButton -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.previews.AppKitPreview -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.R +import com.reown.appkit.ui.components.internal.commons.ExternalIcon +import com.reown.appkit.ui.components.internal.commons.HelpSection +import com.reown.appkit.ui.components.internal.commons.VerticalSpacer +import com.reown.appkit.ui.components.internal.commons.button.ButtonSize +import com.reown.appkit.ui.components.internal.commons.button.ButtonStyle +import com.reown.appkit.ui.components.internal.commons.button.ImageButton +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.previews.AppKitPreview +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun WhatIsNetworkRoute() { diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/common/WhatIsNetwork.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/common/WhatIsNetwork.kt similarity index 74% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/common/WhatIsNetwork.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/common/WhatIsNetwork.kt index 1e92cec6d..093d1f185 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/common/WhatIsNetwork.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/common/WhatIsNetwork.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.routes.common +package com.reown.appkit.ui.routes.common import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer @@ -9,15 +9,15 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalUriHandler import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.ui.components.internal.commons.ExternalIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.HelpSection -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonSize -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonStyle -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ImageButton -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.previews.AppKitPreview -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.R +import com.reown.appkit.ui.components.internal.commons.ExternalIcon +import com.reown.appkit.ui.components.internal.commons.HelpSection +import com.reown.appkit.ui.components.internal.commons.button.ButtonSize +import com.reown.appkit.ui.components.internal.commons.button.ButtonStyle +import com.reown.appkit.ui.components.internal.commons.button.ImageButton +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.previews.AppKitPreview +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun WhatIsNetworkRoute() { diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ConnectNavigationGraph.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/ConnectNavigationGraph.kt similarity index 64% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ConnectNavigationGraph.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/ConnectNavigationGraph.kt index bace95d4d..7b8dd3749 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ConnectNavigationGraph.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/ConnectNavigationGraph.kt @@ -1,21 +1,21 @@ -package com.walletconnect.web3.modal.ui.routes.connect +package com.reown.appkit.ui.routes.connect import androidx.compose.runtime.Composable import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.NavHostController -import com.walletconnect.web3.modal.ui.navigation.ConsumeNavigationEventsEffect -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.navigation.connection.redirectRoute -import com.walletconnect.web3.modal.ui.routes.account.siwe_fallback.SIWEFallbackRoute -import com.walletconnect.web3.modal.ui.routes.common.WhatIsNetworkRoute -import com.walletconnect.web3.modal.ui.routes.connect.all_wallets.AllWalletsRoute -import com.walletconnect.web3.modal.ui.routes.connect.choose_network.ChooseNetworkRoute -import com.walletconnect.web3.modal.ui.routes.connect.connect_wallet.ConnectWalletRoute -import com.walletconnect.web3.modal.ui.routes.connect.get_wallet.GetAWalletRoute -import com.walletconnect.web3.modal.ui.routes.connect.scan_code.ScanQRCodeRoute -import com.walletconnect.web3.modal.ui.routes.connect.what_is_wallet.WhatIsWallet -import com.walletconnect.web3.modal.ui.utils.AnimatedNavGraph -import com.walletconnect.web3.modal.ui.utils.animatedComposable +import com.reown.appkit.ui.navigation.ConsumeNavigationEventsEffect +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.navigation.connection.redirectRoute +import com.reown.appkit.ui.routes.account.siwe_fallback.SIWEFallbackRoute +import com.reown.appkit.ui.routes.common.WhatIsNetworkRoute +import com.reown.appkit.ui.routes.connect.all_wallets.AllWalletsRoute +import com.reown.appkit.ui.routes.connect.choose_network.ChooseNetworkRoute +import com.reown.appkit.ui.routes.connect.connect_wallet.ConnectWalletRoute +import com.reown.appkit.ui.routes.connect.get_wallet.GetAWalletRoute +import com.reown.appkit.ui.routes.connect.scan_code.ScanQRCodeRoute +import com.reown.appkit.ui.routes.connect.what_is_wallet.WhatIsWallet +import com.reown.appkit.ui.utils.AnimatedNavGraph +import com.reown.appkit.ui.utils.animatedComposable @Composable internal fun ConnectionNavGraph( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ConnectViewModel.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/ConnectViewModel.kt similarity index 91% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ConnectViewModel.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/ConnectViewModel.kt index ccc6ee4cc..2de1b93c1 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ConnectViewModel.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/ConnectViewModel.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.routes.connect +package com.reown.appkit.ui.routes.connect import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope @@ -12,20 +12,20 @@ import com.reown.android.pulse.model.properties.Props import com.reown.foundation.util.Logger import com.reown.modal.ui.model.LoadingState import com.reown.modal.ui.model.UiState -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.AppKit -import com.walletconnect.web3.modal.client.models.request.Request -import com.walletconnect.web3.modal.client.models.request.SentRequestResult -import com.walletconnect.web3.modal.domain.delegate.AppKitDelegate -import com.walletconnect.web3.modal.domain.usecase.ObserveSelectedChainUseCase -import com.walletconnect.web3.modal.domain.usecase.SaveChainSelectionUseCase -import com.walletconnect.web3.modal.domain.usecase.SaveRecentWalletUseCase -import com.walletconnect.web3.modal.engine.AppKitEngine -import com.walletconnect.web3.modal.ui.navigation.Navigator -import com.walletconnect.web3.modal.ui.navigation.NavigatorImpl -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.navigation.connection.toRedirectPath -import com.walletconnect.web3.modal.utils.getSelectedChain +import com.reown.appkit.client.Modal +import com.reown.appkit.client.AppKit +import com.reown.appkit.client.models.request.Request +import com.reown.appkit.client.models.request.SentRequestResult +import com.reown.appkit.domain.delegate.AppKitDelegate +import com.reown.appkit.domain.usecase.ObserveSelectedChainUseCase +import com.reown.appkit.domain.usecase.SaveChainSelectionUseCase +import com.reown.appkit.domain.usecase.SaveRecentWalletUseCase +import com.reown.appkit.engine.AppKitEngine +import com.reown.appkit.ui.navigation.Navigator +import com.reown.appkit.ui.navigation.NavigatorImpl +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.navigation.connection.toRedirectPath +import com.reown.appkit.utils.getSelectedChain import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ParingController.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/ParingController.kt similarity index 93% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ParingController.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/ParingController.kt index 0d3931177..d0974a761 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ParingController.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/ParingController.kt @@ -1,11 +1,11 @@ -package com.walletconnect.web3.modal.ui.routes.connect +package com.reown.appkit.ui.routes.connect import com.reown.android.Core import com.reown.android.CoreClient import com.reown.android.internal.common.wcKoinApp -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.toModel -import com.walletconnect.web3.modal.engine.AppKitEngine +import com.reown.appkit.client.Modal +import com.reown.appkit.client.toModel +import com.reown.appkit.engine.AppKitEngine internal interface ParingController { diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/WalletDataSource.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/WalletDataSource.kt similarity index 96% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/WalletDataSource.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/WalletDataSource.kt index 6ed044c4c..70cd22f41 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/WalletDataSource.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/WalletDataSource.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.routes.connect +package com.reown.appkit.ui.routes.connect import com.reown.android.internal.common.modal.data.model.Wallet import com.reown.android.internal.common.modal.domain.usecase.GetInstalledWalletsIdsUseCaseInterface @@ -6,9 +6,9 @@ import com.reown.android.internal.common.modal.domain.usecase.GetSampleWalletsUs import com.reown.android.internal.common.modal.domain.usecase.GetWalletsUseCaseInterface import com.reown.android.internal.common.wcKoinApp import com.walletconnect.util.Empty -import com.walletconnect.web3.modal.domain.usecase.GetRecentWalletUseCase -import com.walletconnect.web3.modal.engine.AppKitEngine -import com.walletconnect.web3.modal.engine.coinbase.COINBASE_WALLET_ID +import com.reown.appkit.domain.usecase.GetRecentWalletUseCase +import com.reown.appkit.engine.AppKitEngine +import com.reown.appkit.engine.coinbase.COINBASE_WALLET_ID import com.reown.modal.ui.model.LoadingState import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.combine diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/all_wallets/AllWalletsRoute.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/all_wallets/AllWalletsRoute.kt similarity index 87% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/all_wallets/AllWalletsRoute.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/all_wallets/AllWalletsRoute.kt index 5706b3f41..79446df7a 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/all_wallets/AllWalletsRoute.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/all_wallets/AllWalletsRoute.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.routes.connect.all_wallets +package com.reown.appkit.ui.routes.connect.all_wallets import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -51,26 +51,26 @@ import androidx.compose.ui.unit.sp import com.reown.android.internal.common.modal.data.model.Wallet import com.reown.modal.utils.isLandscape import com.walletconnect.util.Empty -import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.ui.components.internal.commons.ContentDescription -import com.walletconnect.web3.modal.ui.components.internal.commons.HorizontalSpacer -import com.walletconnect.web3.modal.ui.components.internal.commons.LoadingSpinner -import com.walletconnect.web3.modal.ui.components.internal.commons.ScanQRIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.TransparentSurface -import com.walletconnect.web3.modal.ui.components.internal.commons.VerticalSpacer -import com.walletconnect.web3.modal.ui.components.internal.commons.inputs.SearchInput -import com.walletconnect.web3.modal.ui.components.internal.commons.inputs.SearchState -import com.walletconnect.web3.modal.ui.components.internal.commons.inputs.SearchStatePreviewProvider -import com.walletconnect.web3.modal.ui.components.internal.commons.walletsGridItems +import com.reown.appkit.R +import com.reown.appkit.ui.components.internal.commons.ContentDescription +import com.reown.appkit.ui.components.internal.commons.HorizontalSpacer +import com.reown.appkit.ui.components.internal.commons.LoadingSpinner +import com.reown.appkit.ui.components.internal.commons.ScanQRIcon +import com.reown.appkit.ui.components.internal.commons.TransparentSurface +import com.reown.appkit.ui.components.internal.commons.VerticalSpacer +import com.reown.appkit.ui.components.internal.commons.inputs.SearchInput +import com.reown.appkit.ui.components.internal.commons.inputs.SearchState +import com.reown.appkit.ui.components.internal.commons.inputs.SearchStatePreviewProvider +import com.reown.appkit.ui.components.internal.commons.walletsGridItems import com.reown.modal.ui.model.LoadingState -import com.walletconnect.web3.modal.ui.previews.ComponentPreview -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.previews.AppKitPreview -import com.walletconnect.web3.modal.ui.previews.testWallets -import com.walletconnect.web3.modal.ui.routes.connect.ConnectViewModel -import com.walletconnect.web3.modal.ui.routes.connect.WalletsData -import com.walletconnect.web3.modal.ui.theme.AppKitTheme -import com.walletconnect.web3.modal.ui.utils.conditionalModifier +import com.reown.appkit.ui.previews.ComponentPreview +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.previews.AppKitPreview +import com.reown.appkit.ui.previews.testWallets +import com.reown.appkit.ui.routes.connect.ConnectViewModel +import com.reown.appkit.ui.routes.connect.WalletsData +import com.reown.appkit.ui.theme.AppKitTheme +import com.reown.appkit.ui.utils.conditionalModifier import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.filter import kotlinx.coroutines.launch diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/choose_network/ChooseNetworkRoute.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/choose_network/ChooseNetworkRoute.kt similarity index 83% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/choose_network/ChooseNetworkRoute.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/choose_network/ChooseNetworkRoute.kt index bc75467ef..6c017c6e2 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/choose_network/ChooseNetworkRoute.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/choose_network/ChooseNetworkRoute.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.routes.connect.choose_network +package com.reown.appkit.ui.routes.connect.choose_network import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -13,12 +13,12 @@ import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.AppKit -import com.walletconnect.web3.modal.ui.components.internal.commons.NetworkBottomSection -import com.walletconnect.web3.modal.ui.components.internal.commons.network.ChainNetworkItem -import com.walletconnect.web3.modal.ui.routes.connect.ConnectViewModel -import com.walletconnect.web3.modal.utils.getChainNetworkImageUrl +import com.reown.appkit.client.Modal +import com.reown.appkit.client.AppKit +import com.reown.appkit.ui.components.internal.commons.NetworkBottomSection +import com.reown.appkit.ui.components.internal.commons.network.ChainNetworkItem +import com.reown.appkit.ui.routes.connect.ConnectViewModel +import com.reown.appkit.utils.getChainNetworkImageUrl @Composable internal fun ChooseNetworkRoute( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/connect_wallet/ConnectWalletRoute.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/connect_wallet/ConnectWalletRoute.kt similarity index 77% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/connect_wallet/ConnectWalletRoute.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/connect_wallet/ConnectWalletRoute.kt index fb5c556f1..058aacbf3 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/connect_wallet/ConnectWalletRoute.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/connect_wallet/ConnectWalletRoute.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.routes.connect.connect_wallet +package com.reown.appkit.ui.routes.connect.connect_wallet import androidx.compose.foundation.border import androidx.compose.foundation.layout.* @@ -11,18 +11,18 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.unit.dp import com.reown.android.internal.common.modal.data.model.Wallet -import com.walletconnect.web3.modal.ui.components.internal.ErrorModalState -import com.walletconnect.web3.modal.ui.components.internal.commons.InstalledWalletIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.ListSelectRow -import com.walletconnect.web3.modal.ui.components.internal.commons.RecentLabel -import com.walletconnect.web3.modal.ui.components.internal.commons.WalletImage -import com.walletconnect.web3.modal.ui.components.internal.walletconnect.allWallets -import com.walletconnect.web3.modal.ui.model.UiStateBuilder -import com.walletconnect.web3.modal.ui.previews.ConnectYourWalletPreviewProvider -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.previews.AppKitPreview -import com.walletconnect.web3.modal.ui.routes.connect.ConnectViewModel -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.ui.components.internal.ErrorModalState +import com.reown.appkit.ui.components.internal.commons.InstalledWalletIcon +import com.reown.appkit.ui.components.internal.commons.ListSelectRow +import com.reown.appkit.ui.components.internal.commons.RecentLabel +import com.reown.appkit.ui.components.internal.commons.WalletImage +import com.reown.appkit.ui.components.internal.walletconnect.allWallets +import com.reown.appkit.ui.model.UiStateBuilder +import com.reown.appkit.ui.previews.ConnectYourWalletPreviewProvider +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.previews.AppKitPreview +import com.reown.appkit.ui.routes.connect.ConnectViewModel +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun ConnectWalletRoute( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/get_wallet/GetAWalletRoute.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/get_wallet/GetAWalletRoute.kt similarity index 79% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/get_wallet/GetAWalletRoute.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/get_wallet/GetAWalletRoute.kt index 75e5a00e6..6cecefeae 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/get_wallet/GetAWalletRoute.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/get_wallet/GetAWalletRoute.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.routes.connect.get_wallet +package com.reown.appkit.ui.routes.connect.get_wallet import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.fillMaxWidth @@ -14,13 +14,13 @@ import androidx.compose.ui.platform.LocalUriHandler import androidx.compose.ui.unit.dp import com.reown.android.internal.common.modal.data.model.Wallet import com.reown.modal.utils.openPlayStore -import com.walletconnect.web3.modal.ui.components.internal.commons.AllWalletsIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.ExternalIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.ListSelectRow -import com.walletconnect.web3.modal.ui.components.internal.commons.WalletImage -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.previews.AppKitPreview -import com.walletconnect.web3.modal.ui.previews.testWallets +import com.reown.appkit.ui.components.internal.commons.AllWalletsIcon +import com.reown.appkit.ui.components.internal.commons.ExternalIcon +import com.reown.appkit.ui.components.internal.commons.ListSelectRow +import com.reown.appkit.ui.components.internal.commons.WalletImage +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.previews.AppKitPreview +import com.reown.appkit.ui.previews.testWallets @Composable internal fun GetAWalletRoute(wallets: List) { diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/redirect/RedirectState.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/redirect/RedirectState.kt similarity index 73% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/redirect/RedirectState.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/redirect/RedirectState.kt index 5c219408f..25441cc1c 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/redirect/RedirectState.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/redirect/RedirectState.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.routes.connect.redirect +package com.reown.appkit.ui.routes.connect.redirect sealed class RedirectState { object Loading: RedirectState() diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/redirect/RedirectWalletScreen.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/redirect/RedirectWalletScreen.kt similarity index 89% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/redirect/RedirectWalletScreen.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/redirect/RedirectWalletScreen.kt index 8d15e2a4d..1cf4af83e 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/redirect/RedirectWalletScreen.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/redirect/RedirectWalletScreen.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.routes.connect.redirect +package com.reown.appkit.ui.routes.connect.redirect import androidx.compose.animation.AnimatedContent import androidx.compose.foundation.background @@ -35,31 +35,31 @@ import com.reown.modal.utils.openMobileLink import com.reown.modal.utils.openPlayStore import com.reown.modal.utils.openWebAppLink import com.walletconnect.util.Empty -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.domain.delegate.AppKitDelegate -import com.walletconnect.web3.modal.engine.coinbase.isCoinbaseWallet -import com.walletconnect.web3.modal.ui.components.internal.OrientationBox -import com.walletconnect.web3.modal.ui.components.internal.commons.DeclinedIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.ExternalIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.RoundedWalletImage -import com.walletconnect.web3.modal.ui.components.internal.commons.VerticalSpacer -import com.walletconnect.web3.modal.ui.components.internal.commons.WalletImageWithLoader -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonSize -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonStyle -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ChipButton -import com.walletconnect.web3.modal.ui.components.internal.commons.button.TryAgainButton -import com.walletconnect.web3.modal.ui.components.internal.commons.entry.CopyActionEntry -import com.walletconnect.web3.modal.ui.components.internal.commons.entry.StoreEntry -import com.walletconnect.web3.modal.ui.components.internal.commons.switch.PlatformTab -import com.walletconnect.web3.modal.ui.components.internal.commons.switch.PlatformTabRow -import com.walletconnect.web3.modal.ui.components.internal.commons.switch.rememberWalletPlatformTabs -import com.walletconnect.web3.modal.ui.components.internal.snackbar.LocalSnackBarHandler -import com.walletconnect.web3.modal.ui.previews.Landscape -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.previews.AppKitPreview -import com.walletconnect.web3.modal.ui.previews.testWallets -import com.walletconnect.web3.modal.ui.routes.connect.ConnectViewModel -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.client.Modal +import com.reown.appkit.domain.delegate.AppKitDelegate +import com.reown.appkit.engine.coinbase.isCoinbaseWallet +import com.reown.appkit.ui.components.internal.OrientationBox +import com.reown.appkit.ui.components.internal.commons.DeclinedIcon +import com.reown.appkit.ui.components.internal.commons.ExternalIcon +import com.reown.appkit.ui.components.internal.commons.RoundedWalletImage +import com.reown.appkit.ui.components.internal.commons.VerticalSpacer +import com.reown.appkit.ui.components.internal.commons.WalletImageWithLoader +import com.reown.appkit.ui.components.internal.commons.button.ButtonSize +import com.reown.appkit.ui.components.internal.commons.button.ButtonStyle +import com.reown.appkit.ui.components.internal.commons.button.ChipButton +import com.reown.appkit.ui.components.internal.commons.button.TryAgainButton +import com.reown.appkit.ui.components.internal.commons.entry.CopyActionEntry +import com.reown.appkit.ui.components.internal.commons.entry.StoreEntry +import com.reown.appkit.ui.components.internal.commons.switch.PlatformTab +import com.reown.appkit.ui.components.internal.commons.switch.PlatformTabRow +import com.reown.appkit.ui.components.internal.commons.switch.rememberWalletPlatformTabs +import com.reown.appkit.ui.components.internal.snackbar.LocalSnackBarHandler +import com.reown.appkit.ui.previews.Landscape +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.previews.AppKitPreview +import com.reown.appkit.ui.previews.testWallets +import com.reown.appkit.ui.routes.connect.ConnectViewModel +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun RedirectWalletRoute( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/scan_code/ScanCodeRoute.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/scan_code/ScanCodeRoute.kt similarity index 87% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/scan_code/ScanCodeRoute.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/scan_code/ScanCodeRoute.kt index 818f8ebba..52619680f 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/scan_code/ScanCodeRoute.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/scan_code/ScanCodeRoute.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.routes.connect.scan_code +package com.reown.appkit.ui.routes.connect.scan_code import androidx.compose.foundation.background import androidx.compose.foundation.isSystemInDarkTheme @@ -29,16 +29,16 @@ import androidx.compose.ui.unit.dp import com.reown.android.pulse.model.ConnectionMethod import com.reown.modal.ui.components.qr.QrCodeType import com.reown.modal.ui.components.qr.WalletConnectQRCode -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.domain.delegate.AppKitDelegate -import com.walletconnect.web3.modal.ui.components.internal.OrientationBox -import com.walletconnect.web3.modal.ui.components.internal.commons.entry.CopyActionEntry -import com.walletconnect.web3.modal.ui.components.internal.snackbar.LocalSnackBarHandler -import com.walletconnect.web3.modal.ui.previews.Landscape -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.previews.AppKitPreview -import com.walletconnect.web3.modal.ui.routes.connect.ConnectViewModel -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.client.Modal +import com.reown.appkit.domain.delegate.AppKitDelegate +import com.reown.appkit.ui.components.internal.OrientationBox +import com.reown.appkit.ui.components.internal.commons.entry.CopyActionEntry +import com.reown.appkit.ui.components.internal.snackbar.LocalSnackBarHandler +import com.reown.appkit.ui.previews.Landscape +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.previews.AppKitPreview +import com.reown.appkit.ui.routes.connect.ConnectViewModel +import com.reown.appkit.ui.theme.AppKitTheme import kotlinx.coroutines.flow.filter @Composable diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/what_is_wallet/WhatIsWallet.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/what_is_wallet/WhatIsWallet.kt similarity index 76% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/what_is_wallet/WhatIsWallet.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/what_is_wallet/WhatIsWallet.kt index f06cf0847..e3abea0a3 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/routes/connect/what_is_wallet/WhatIsWallet.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/routes/connect/what_is_wallet/WhatIsWallet.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.routes.connect.what_is_wallet +package com.reown.appkit.ui.routes.connect.what_is_wallet import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues @@ -14,17 +14,17 @@ import com.reown.android.internal.common.wcKoinApp import com.reown.android.pulse.domain.SendEventInterface import com.reown.android.pulse.model.EventType import com.reown.android.pulse.model.properties.Props -import com.walletconnect.web3.modal.R -import com.walletconnect.web3.modal.ui.components.internal.commons.HelpSection -import com.walletconnect.web3.modal.ui.components.internal.commons.VerticalSpacer -import com.walletconnect.web3.modal.ui.components.internal.commons.WalletIcon -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonSize -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ButtonStyle -import com.walletconnect.web3.modal.ui.components.internal.commons.button.ImageButton -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.previews.UiModePreview -import com.walletconnect.web3.modal.ui.previews.AppKitPreview -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.R +import com.reown.appkit.ui.components.internal.commons.HelpSection +import com.reown.appkit.ui.components.internal.commons.VerticalSpacer +import com.reown.appkit.ui.components.internal.commons.WalletIcon +import com.reown.appkit.ui.components.internal.commons.button.ButtonSize +import com.reown.appkit.ui.components.internal.commons.button.ButtonStyle +import com.reown.appkit.ui.components.internal.commons.button.ImageButton +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.previews.UiModePreview +import com.reown.appkit.ui.previews.AppKitPreview +import com.reown.appkit.ui.theme.AppKitTheme @Composable internal fun WhatIsWallet( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/theme/AppKitColors.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/theme/AppKitColors.kt similarity index 98% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/theme/AppKitColors.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/theme/AppKitColors.kt index 80db5894f..ceb7c6095 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/theme/AppKitColors.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/theme/AppKitColors.kt @@ -1,9 +1,9 @@ -package com.walletconnect.web3.modal.ui.theme +package com.reown.appkit.ui.theme import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color -import com.walletconnect.web3.modal.ui.AppKitTheme +import com.reown.appkit.ui.AppKitTheme internal data class AppKitColors( val accent100: Color, diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/theme/CustomComposition.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/theme/CustomComposition.kt similarity index 80% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/theme/CustomComposition.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/theme/CustomComposition.kt index c2e8d3cea..25a65e04a 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/theme/CustomComposition.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/theme/CustomComposition.kt @@ -1,7 +1,7 @@ -package com.walletconnect.web3.modal.ui.theme +package com.reown.appkit.ui.theme import androidx.compose.runtime.compositionLocalOf -import com.walletconnect.web3.modal.ui.AppKitTheme +import com.reown.appkit.ui.AppKitTheme internal data class CustomComposition( val mode: AppKitTheme.Mode = AppKitTheme.Mode.AUTO, diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/theme/Theme.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/theme/Theme.kt similarity index 95% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/theme/Theme.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/theme/Theme.kt index 4636a002d..1a4988992 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/theme/Theme.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/theme/Theme.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.theme +package com.reown.appkit.ui.theme import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/theme/Typography.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/theme/Typography.kt similarity index 98% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/theme/Typography.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/theme/Typography.kt index 865e3276e..284331191 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/theme/Typography.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/theme/Typography.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.theme +package com.reown.appkit.ui.theme import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.FontWeight diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/utils/Lifecycle.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/utils/Lifecycle.kt similarity index 91% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/utils/Lifecycle.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/utils/Lifecycle.kt index 017cb533f..eaf235438 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/utils/Lifecycle.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/utils/Lifecycle.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.utils +package com.reown.appkit.ui.utils import androidx.compose.runtime.Composable import androidx.compose.runtime.DisposableEffect @@ -6,7 +6,7 @@ import androidx.compose.ui.platform.LocalLifecycleOwner import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleEventObserver import androidx.lifecycle.LifecycleOwner -import com.walletconnect.web3.modal.ui.components.ComponentDelegate +import com.reown.appkit.ui.components.ComponentDelegate @Composable internal fun ComposableLifecycleEffect( diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/utils/Modifier.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/utils/Modifier.kt similarity index 81% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/utils/Modifier.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/utils/Modifier.kt index cfb4017b2..a0baadce4 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/utils/Modifier.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/utils/Modifier.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.ui.utils +package com.reown.appkit.ui.utils import androidx.compose.ui.Modifier diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/utils/Navigation.kt b/product/appkit/src/main/kotlin/com/reown/appkit/ui/utils/Navigation.kt similarity index 98% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/utils/Navigation.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/ui/utils/Navigation.kt index 461ad3f4d..2de98d98c 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/utils/Navigation.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/ui/utils/Navigation.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalAnimationApi::class) -package com.walletconnect.web3.modal.ui.utils +package com.reown.appkit.ui.utils import androidx.compose.animation.AnimatedVisibilityScope import androidx.compose.animation.ExperimentalAnimationApi diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/ChainPresets.kt b/product/appkit/src/main/kotlin/com/reown/appkit/utils/ChainPresets.kt similarity index 96% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/ChainPresets.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/utils/ChainPresets.kt index 8803757fb..fa37446a6 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/ChainPresets.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/utils/ChainPresets.kt @@ -1,6 +1,6 @@ -package com.walletconnect.web3.modal.utils +package com.reown.appkit.utils -import com.walletconnect.web3.modal.client.Modal +import com.reown.appkit.client.Modal internal fun Modal.Model.ChainImage.getImageData() = when(this) { is Modal.Model.ChainImage.Asset -> id diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/EthUtils.kt b/product/appkit/src/main/kotlin/com/reown/appkit/utils/EthUtils.kt similarity index 92% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/EthUtils.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/utils/EthUtils.kt index c6ef624d3..61eab756e 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/EthUtils.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/utils/EthUtils.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.utils +package com.reown.appkit.utils object EthUtils { const val walletSwitchEthChain = "wallet_switchEthereumChain" diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/Image.kt b/product/appkit/src/main/kotlin/com/reown/appkit/utils/Image.kt similarity index 93% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/Image.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/utils/Image.kt index e25b3700c..6cf544860 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/Image.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/utils/Image.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.utils +package com.reown.appkit.utils import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.graphics.ColorMatrix diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/ParamsUtils.kt b/product/appkit/src/main/kotlin/com/reown/appkit/utils/ParamsUtils.kt similarity index 93% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/ParamsUtils.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/utils/ParamsUtils.kt index 943cbd417..288994e5d 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/ParamsUtils.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/utils/ParamsUtils.kt @@ -1,6 +1,6 @@ -package com.walletconnect.web3.modal.utils +package com.reown.appkit.utils -import com.walletconnect.web3.modal.client.Modal +import com.reown.appkit.client.Modal import org.intellij.lang.annotations.Language internal fun createAddEthChainParams(chain: Modal.Model.Chain): String { diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/SessionUtils.kt b/product/appkit/src/main/kotlin/com/reown/appkit/utils/SessionUtils.kt similarity index 91% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/SessionUtils.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/utils/SessionUtils.kt index 44d2f8a33..4f1a81f84 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/SessionUtils.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/utils/SessionUtils.kt @@ -1,13 +1,13 @@ -package com.walletconnect.web3.modal.utils +package com.reown.appkit.utils import com.reown.android.internal.utils.CoreValidator import com.reown.sign.client.Sign import com.walletconnect.util.Empty -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.AppKit -import com.walletconnect.web3.modal.client.models.Account -import com.walletconnect.web3.modal.client.toModal -import com.walletconnect.web3.modal.domain.model.Session +import com.reown.appkit.client.Modal +import com.reown.appkit.client.AppKit +import com.reown.appkit.client.models.Account +import com.reown.appkit.client.toModal +import com.reown.appkit.domain.model.Session internal fun String.toVisibleAddress() = "${take(4)}...${takeLast(4)}" diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/ViewUtils.kt b/product/appkit/src/main/kotlin/com/reown/appkit/utils/ViewUtils.kt similarity index 57% rename from product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/ViewUtils.kt rename to product/appkit/src/main/kotlin/com/reown/appkit/utils/ViewUtils.kt index 0e0e1a291..bc83447b3 100644 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/utils/ViewUtils.kt +++ b/product/appkit/src/main/kotlin/com/reown/appkit/utils/ViewUtils.kt @@ -1,7 +1,7 @@ -package com.walletconnect.web3.modal.utils +package com.reown.appkit.utils -import com.walletconnect.web3.modal.ui.components.button.AccountButtonType -import com.walletconnect.web3.modal.ui.components.button.ConnectButtonSize +import com.reown.appkit.ui.components.button.AccountButtonType +import com.reown.appkit.ui.components.button.ConnectButtonSize internal fun Int.toConnectButtonSize() = when (this) { 1 -> ConnectButtonSize.SMALL diff --git a/product/web3modal/src/main/res/drawable-night/wallet_placeholder.xml b/product/appkit/src/main/res/drawable-night/wallet_placeholder.xml similarity index 100% rename from product/web3modal/src/main/res/drawable-night/wallet_placeholder.xml rename to product/appkit/src/main/res/drawable-night/wallet_placeholder.xml diff --git a/product/web3modal/src/main/res/drawable/browser.xml b/product/appkit/src/main/res/drawable/browser.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/browser.xml rename to product/appkit/src/main/res/drawable/browser.xml diff --git a/product/web3modal/src/main/res/drawable/dao.xml b/product/appkit/src/main/res/drawable/dao.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/dao.xml rename to product/appkit/src/main/res/drawable/dao.xml diff --git a/product/web3modal/src/main/res/drawable/defi.xml b/product/appkit/src/main/res/drawable/defi.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/defi.xml rename to product/appkit/src/main/res/drawable/defi.xml diff --git a/product/web3modal/src/main/res/drawable/defi_alt.xml b/product/appkit/src/main/res/drawable/defi_alt.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/defi_alt.xml rename to product/appkit/src/main/res/drawable/defi_alt.xml diff --git a/product/web3modal/src/main/res/drawable/eth.xml b/product/appkit/src/main/res/drawable/eth.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/eth.xml rename to product/appkit/src/main/res/drawable/eth.xml diff --git a/product/web3modal/src/main/res/drawable/ic_all_wallets.xml b/product/appkit/src/main/res/drawable/ic_all_wallets.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_all_wallets.xml rename to product/appkit/src/main/res/drawable/ic_all_wallets.xml diff --git a/product/web3modal/src/main/res/drawable/ic_browser.xml b/product/appkit/src/main/res/drawable/ic_browser.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_browser.xml rename to product/appkit/src/main/res/drawable/ic_browser.xml diff --git a/product/web3modal/src/main/res/drawable/ic_check.xml b/product/appkit/src/main/res/drawable/ic_check.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_check.xml rename to product/appkit/src/main/res/drawable/ic_check.xml diff --git a/product/web3modal/src/main/res/drawable/ic_chevron_left.xml b/product/appkit/src/main/res/drawable/ic_chevron_left.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_chevron_left.xml rename to product/appkit/src/main/res/drawable/ic_chevron_left.xml diff --git a/product/web3modal/src/main/res/drawable/ic_chevron_right.xml b/product/appkit/src/main/res/drawable/ic_chevron_right.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_chevron_right.xml rename to product/appkit/src/main/res/drawable/ic_chevron_right.xml diff --git a/product/web3modal/src/main/res/drawable/ic_close.xml b/product/appkit/src/main/res/drawable/ic_close.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_close.xml rename to product/appkit/src/main/res/drawable/ic_close.xml diff --git a/product/web3modal/src/main/res/drawable/ic_compass.xml b/product/appkit/src/main/res/drawable/ic_compass.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_compass.xml rename to product/appkit/src/main/res/drawable/ic_compass.xml diff --git a/product/web3modal/src/main/res/drawable/ic_copy.xml b/product/appkit/src/main/res/drawable/ic_copy.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_copy.xml rename to product/appkit/src/main/res/drawable/ic_copy.xml diff --git a/product/web3modal/src/main/res/drawable/ic_disconnect.xml b/product/appkit/src/main/res/drawable/ic_disconnect.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_disconnect.xml rename to product/appkit/src/main/res/drawable/ic_disconnect.xml diff --git a/product/web3modal/src/main/res/drawable/ic_email.xml b/product/appkit/src/main/res/drawable/ic_email.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_email.xml rename to product/appkit/src/main/res/drawable/ic_email.xml diff --git a/product/web3modal/src/main/res/drawable/ic_error.xml b/product/appkit/src/main/res/drawable/ic_error.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_error.xml rename to product/appkit/src/main/res/drawable/ic_error.xml diff --git a/product/web3modal/src/main/res/drawable/ic_external_link.xml b/product/appkit/src/main/res/drawable/ic_external_link.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_external_link.xml rename to product/appkit/src/main/res/drawable/ic_external_link.xml diff --git a/product/web3modal/src/main/res/drawable/ic_forward_chevron.xml b/product/appkit/src/main/res/drawable/ic_forward_chevron.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_forward_chevron.xml rename to product/appkit/src/main/res/drawable/ic_forward_chevron.xml diff --git a/product/web3modal/src/main/res/drawable/ic_google_playstore.xml b/product/appkit/src/main/res/drawable/ic_google_playstore.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_google_playstore.xml rename to product/appkit/src/main/res/drawable/ic_google_playstore.xml diff --git a/product/web3modal/src/main/res/drawable/ic_info.xml b/product/appkit/src/main/res/drawable/ic_info.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_info.xml rename to product/appkit/src/main/res/drawable/ic_info.xml diff --git a/product/web3modal/src/main/res/drawable/ic_mobile.xml b/product/appkit/src/main/res/drawable/ic_mobile.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_mobile.xml rename to product/appkit/src/main/res/drawable/ic_mobile.xml diff --git a/product/web3modal/src/main/res/drawable/ic_question_mark.xml b/product/appkit/src/main/res/drawable/ic_question_mark.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_question_mark.xml rename to product/appkit/src/main/res/drawable/ic_question_mark.xml diff --git a/product/web3modal/src/main/res/drawable/ic_retry.xml b/product/appkit/src/main/res/drawable/ic_retry.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_retry.xml rename to product/appkit/src/main/res/drawable/ic_retry.xml diff --git a/product/web3modal/src/main/res/drawable/ic_scan.xml b/product/appkit/src/main/res/drawable/ic_scan.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_scan.xml rename to product/appkit/src/main/res/drawable/ic_scan.xml diff --git a/product/web3modal/src/main/res/drawable/ic_scan_qr.xml b/product/appkit/src/main/res/drawable/ic_scan_qr.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_scan_qr.xml rename to product/appkit/src/main/res/drawable/ic_scan_qr.xml diff --git a/product/web3modal/src/main/res/drawable/ic_search.xml b/product/appkit/src/main/res/drawable/ic_search.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_search.xml rename to product/appkit/src/main/res/drawable/ic_search.xml diff --git a/product/web3modal/src/main/res/drawable/ic_select_network.xml b/product/appkit/src/main/res/drawable/ic_select_network.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_select_network.xml rename to product/appkit/src/main/res/drawable/ic_select_network.xml diff --git a/product/web3modal/src/main/res/drawable/ic_success.xml b/product/appkit/src/main/res/drawable/ic_success.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_success.xml rename to product/appkit/src/main/res/drawable/ic_success.xml diff --git a/product/web3modal/src/main/res/drawable/ic_swap.xml b/product/appkit/src/main/res/drawable/ic_swap.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_swap.xml rename to product/appkit/src/main/res/drawable/ic_swap.xml diff --git a/product/web3modal/src/main/res/drawable/ic_wallet.xml b/product/appkit/src/main/res/drawable/ic_wallet.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_wallet.xml rename to product/appkit/src/main/res/drawable/ic_wallet.xml diff --git a/product/web3modal/src/main/res/drawable/ic_wallet_connect_logo.xml b/product/appkit/src/main/res/drawable/ic_wallet_connect_logo.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_wallet_connect_logo.xml rename to product/appkit/src/main/res/drawable/ic_wallet_connect_logo.xml diff --git a/product/web3modal/src/main/res/drawable/ic_wallet_connect_qr_logo.xml b/product/appkit/src/main/res/drawable/ic_wallet_connect_qr_logo.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_wallet_connect_qr_logo.xml rename to product/appkit/src/main/res/drawable/ic_wallet_connect_qr_logo.xml diff --git a/product/web3modal/src/main/res/drawable/ic_web.xml b/product/appkit/src/main/res/drawable/ic_web.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/ic_web.xml rename to product/appkit/src/main/res/drawable/ic_web.xml diff --git a/product/web3modal/src/main/res/drawable/layers.xml b/product/appkit/src/main/res/drawable/layers.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/layers.xml rename to product/appkit/src/main/res/drawable/layers.xml diff --git a/product/web3modal/src/main/res/drawable/lock.xml b/product/appkit/src/main/res/drawable/lock.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/lock.xml rename to product/appkit/src/main/res/drawable/lock.xml diff --git a/product/web3modal/src/main/res/drawable/login.xml b/product/appkit/src/main/res/drawable/login.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/login.xml rename to product/appkit/src/main/res/drawable/login.xml diff --git a/product/web3modal/src/main/res/drawable/network.xml b/product/appkit/src/main/res/drawable/network.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/network.xml rename to product/appkit/src/main/res/drawable/network.xml diff --git a/product/web3modal/src/main/res/drawable/nft.xml b/product/appkit/src/main/res/drawable/nft.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/nft.xml rename to product/appkit/src/main/res/drawable/nft.xml diff --git a/product/web3modal/src/main/res/drawable/noun.xml b/product/appkit/src/main/res/drawable/noun.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/noun.xml rename to product/appkit/src/main/res/drawable/noun.xml diff --git a/product/web3modal/src/main/res/drawable/profile.xml b/product/appkit/src/main/res/drawable/profile.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/profile.xml rename to product/appkit/src/main/res/drawable/profile.xml diff --git a/product/web3modal/src/main/res/drawable/system.xml b/product/appkit/src/main/res/drawable/system.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/system.xml rename to product/appkit/src/main/res/drawable/system.xml diff --git a/product/web3modal/src/main/res/drawable/wallet_placeholder.xml b/product/appkit/src/main/res/drawable/wallet_placeholder.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/wallet_placeholder.xml rename to product/appkit/src/main/res/drawable/wallet_placeholder.xml diff --git a/product/web3modal/src/main/res/drawable/walletconnect_blue.xml b/product/appkit/src/main/res/drawable/walletconnect_blue.xml similarity index 100% rename from product/web3modal/src/main/res/drawable/walletconnect_blue.xml rename to product/appkit/src/main/res/drawable/walletconnect_blue.xml diff --git a/product/web3modal/src/main/res/layout/view_button.xml b/product/appkit/src/main/res/layout/view_button.xml similarity index 100% rename from product/web3modal/src/main/res/layout/view_button.xml rename to product/appkit/src/main/res/layout/view_button.xml diff --git a/product/web3modal/src/main/res/layout/view_web3modal.xml b/product/appkit/src/main/res/layout/view_web3modal.xml similarity index 100% rename from product/web3modal/src/main/res/layout/view_web3modal.xml rename to product/appkit/src/main/res/layout/view_web3modal.xml diff --git a/product/web3modal/src/main/res/navigation/web3modal_graph.xml b/product/appkit/src/main/res/navigation/web3modal_graph.xml similarity index 82% rename from product/web3modal/src/main/res/navigation/web3modal_graph.xml rename to product/appkit/src/main/res/navigation/web3modal_graph.xml index e1029a32d..92a84e415 100644 --- a/product/web3modal/src/main/res/navigation/web3modal_graph.xml +++ b/product/appkit/src/main/res/navigation/web3modal_graph.xml @@ -6,6 +6,6 @@ + android:name="com.reown.appkit.ui.AppKitSheet" /> diff --git a/product/web3modal/src/main/res/values/attrs.xml b/product/appkit/src/main/res/values/attrs.xml similarity index 100% rename from product/web3modal/src/main/res/values/attrs.xml rename to product/appkit/src/main/res/values/attrs.xml diff --git a/product/web3modal/src/main/res/values/theme.xml b/product/appkit/src/main/res/values/theme.xml similarity index 100% rename from product/web3modal/src/main/res/values/theme.xml rename to product/appkit/src/main/res/values/theme.xml diff --git a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/components/buttons/ButtonsTest.kt b/product/appkit/src/test/kotlin/com/reown/appkit/ui/components/buttons/ButtonsTest.kt similarity index 83% rename from product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/components/buttons/ButtonsTest.kt rename to product/appkit/src/test/kotlin/com/reown/appkit/ui/components/buttons/ButtonsTest.kt index 8004b0b71..d5f8e1b9e 100644 --- a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/components/buttons/ButtonsTest.kt +++ b/product/appkit/src/test/kotlin/com/reown/appkit/ui/components/buttons/ButtonsTest.kt @@ -1,12 +1,12 @@ -package com.walletconnect.web3.modal.ui.components.buttons +package com.reown.appkit.ui.components.buttons import com.android.resources.NightMode -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.presets.AppKitChainsPresets -import com.walletconnect.web3.modal.ui.components.button.AccountButtonState -import com.walletconnect.web3.modal.ui.components.button.ConnectButton -import com.walletconnect.web3.modal.ui.components.button.ConnectButtonSize -import com.walletconnect.web3.modal.utils.ScreenShotTest +import com.reown.appkit.client.Modal +import com.reown.appkit.presets.AppKitChainsPresets +import com.reown.appkit.ui.components.button.AccountButtonState +import com.reown.appkit.ui.components.button.ConnectButton +import com.reown.appkit.ui.components.button.ConnectButtonSize +import com.reown.appkit.utils.ScreenShotTest import org.junit.Test internal class ButtonsTest : ScreenShotTest("component/button") { diff --git a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/components/internal/ModalSnackBarTest.kt b/product/appkit/src/test/kotlin/com/reown/appkit/ui/components/internal/ModalSnackBarTest.kt similarity index 75% rename from product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/components/internal/ModalSnackBarTest.kt rename to product/appkit/src/test/kotlin/com/reown/appkit/ui/components/internal/ModalSnackBarTest.kt index f32b87ef5..b045db4af 100644 --- a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/components/internal/ModalSnackBarTest.kt +++ b/product/appkit/src/test/kotlin/com/reown/appkit/ui/components/internal/ModalSnackBarTest.kt @@ -1,11 +1,11 @@ -package com.walletconnect.web3.modal.ui.components.internal +package com.reown.appkit.ui.components.internal import com.android.resources.NightMode -import com.walletconnect.web3.modal.ui.components.internal.snackbar.ModalSnackBar -import com.walletconnect.web3.modal.ui.components.internal.snackbar.SnackBarEvent -import com.walletconnect.web3.modal.ui.components.internal.snackbar.SnackBarEventType -import com.walletconnect.web3.modal.ui.components.internal.snackbar.SnackbarDuration -import com.walletconnect.web3.modal.utils.ScreenShotTest +import com.reown.appkit.ui.components.internal.snackbar.ModalSnackBar +import com.reown.appkit.ui.components.internal.snackbar.SnackBarEvent +import com.reown.appkit.ui.components.internal.snackbar.SnackBarEventType +import com.reown.appkit.ui.components.internal.snackbar.SnackbarDuration +import com.reown.appkit.utils.ScreenShotTest import org.junit.Test internal class ModalSnackBarTest : ScreenShotTest("component/internal/snackbar") { diff --git a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/account/AccountRouteTest.kt b/product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/account/AccountRouteTest.kt similarity index 89% rename from product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/account/AccountRouteTest.kt rename to product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/account/AccountRouteTest.kt index 121f66d65..69c787e95 100644 --- a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/account/AccountRouteTest.kt +++ b/product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/account/AccountRouteTest.kt @@ -1,19 +1,19 @@ -package com.walletconnect.web3.modal.ui.routes.account +package com.reown.appkit.ui.routes.account import androidx.navigation.NavController import com.android.resources.NightMode import com.android.resources.ScreenOrientation import com.reown.android.internal.common.wcKoinApp import com.reown.modal.ui.model.UiState -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.AppKit -import com.walletconnect.web3.modal.domain.model.AccountData -import com.walletconnect.web3.modal.domain.model.Balance -import com.walletconnect.web3.modal.domain.usecase.GetSelectedChainUseCase -import com.walletconnect.web3.modal.presets.AppKitChainsPresets -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.routes.account.account.AccountRoute -import com.walletconnect.web3.modal.utils.ScreenShotTest +import com.reown.appkit.client.Modal +import com.reown.appkit.client.AppKit +import com.reown.appkit.domain.model.AccountData +import com.reown.appkit.domain.model.Balance +import com.reown.appkit.domain.usecase.GetSelectedChainUseCase +import com.reown.appkit.presets.AppKitChainsPresets +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.routes.account.account.AccountRoute +import com.reown.appkit.utils.ScreenShotTest import io.mockk.every import io.mockk.mockk import kotlinx.coroutines.flow.StateFlow diff --git a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/account/ChainSwitchRedirectTest.kt b/product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/account/ChainSwitchRedirectTest.kt similarity index 75% rename from product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/account/ChainSwitchRedirectTest.kt rename to product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/account/ChainSwitchRedirectTest.kt index ba912be89..6c6918a6e 100644 --- a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/account/ChainSwitchRedirectTest.kt +++ b/product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/account/ChainSwitchRedirectTest.kt @@ -1,11 +1,11 @@ -package com.walletconnect.web3.modal.ui.routes.account +package com.reown.appkit.ui.routes.account import com.android.resources.NightMode -import com.walletconnect.web3.modal.presets.AppKitChainsPresets -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.routes.account.chain_redirect.ChainRedirectState -import com.walletconnect.web3.modal.ui.routes.account.chain_redirect.ChainSwitchRedirectScreen -import com.walletconnect.web3.modal.utils.ScreenShotTest +import com.reown.appkit.presets.AppKitChainsPresets +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.routes.account.chain_redirect.ChainRedirectState +import com.reown.appkit.ui.routes.account.chain_redirect.ChainSwitchRedirectScreen +import com.reown.appkit.utils.ScreenShotTest import org.junit.Ignore import org.junit.Test diff --git a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/account/ChangeNetworkRouteTest.kt b/product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/account/ChangeNetworkRouteTest.kt similarity index 80% rename from product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/account/ChangeNetworkRouteTest.kt rename to product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/account/ChangeNetworkRouteTest.kt index e14f6c4c0..3f75e176b 100644 --- a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/account/ChangeNetworkRouteTest.kt +++ b/product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/account/ChangeNetworkRouteTest.kt @@ -1,17 +1,17 @@ -package com.walletconnect.web3.modal.ui.routes.account +package com.reown.appkit.ui.routes.account import com.android.resources.NightMode import com.android.resources.ScreenOrientation import com.reown.android.internal.common.wcKoinApp import com.reown.modal.ui.model.UiState -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.AppKit -import com.walletconnect.web3.modal.domain.model.AccountData -import com.walletconnect.web3.modal.domain.usecase.GetSelectedChainUseCase -import com.walletconnect.web3.modal.presets.AppKitChainsPresets -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.routes.account.change_network.ChangeNetworkRoute -import com.walletconnect.web3.modal.utils.ScreenShotTest +import com.reown.appkit.client.Modal +import com.reown.appkit.client.AppKit +import com.reown.appkit.domain.model.AccountData +import com.reown.appkit.domain.usecase.GetSelectedChainUseCase +import com.reown.appkit.presets.AppKitChainsPresets +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.routes.account.change_network.ChangeNetworkRoute +import com.reown.appkit.utils.ScreenShotTest import io.mockk.every import io.mockk.mockk import kotlinx.coroutines.flow.StateFlow diff --git a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/account/WhatIsNetworkRouteTest.kt b/product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/account/WhatIsNetworkRouteTest.kt similarity index 75% rename from product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/account/WhatIsNetworkRouteTest.kt rename to product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/account/WhatIsNetworkRouteTest.kt index 559fa6923..5dd86ce39 100644 --- a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/account/WhatIsNetworkRouteTest.kt +++ b/product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/account/WhatIsNetworkRouteTest.kt @@ -1,11 +1,11 @@ -package com.walletconnect.web3.modal.ui.routes.account +package com.reown.appkit.ui.routes.account import com.android.resources.NightMode import com.android.resources.ScreenOrientation -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.routes.account.what_is_network.WhatIsNetworkRoute -import com.walletconnect.web3.modal.utils.MainDispatcherRule -import com.walletconnect.web3.modal.utils.ScreenShotTest +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.routes.account.what_is_network.WhatIsNetworkRoute +import com.reown.appkit.utils.MainDispatcherRule +import com.reown.appkit.utils.ScreenShotTest import org.junit.Ignore import org.junit.Rule import org.junit.Test diff --git a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/connect/AllWalletsRouteTest.kt b/product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/connect/AllWalletsRouteTest.kt similarity index 94% rename from product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/connect/AllWalletsRouteTest.kt rename to product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/connect/AllWalletsRouteTest.kt index dd8d3be51..a7d2f162f 100644 --- a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/connect/AllWalletsRouteTest.kt +++ b/product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/connect/AllWalletsRouteTest.kt @@ -1,14 +1,14 @@ -package com.walletconnect.web3.modal.ui.routes.connect +package com.reown.appkit.ui.routes.connect import com.android.resources.NightMode import com.android.resources.ScreenOrientation import com.reown.modal.ui.model.LoadingState import com.walletconnect.util.Empty -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.previews.testWallets -import com.walletconnect.web3.modal.ui.routes.connect.all_wallets.AllWalletsRoute -import com.walletconnect.web3.modal.utils.MainDispatcherRule -import com.walletconnect.web3.modal.utils.ScreenShotTest +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.previews.testWallets +import com.reown.appkit.ui.routes.connect.all_wallets.AllWalletsRoute +import com.reown.appkit.utils.MainDispatcherRule +import com.reown.appkit.utils.ScreenShotTest import io.mockk.every import io.mockk.mockk import kotlinx.coroutines.flow.StateFlow diff --git a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ConnectYourWalletRouteTest.kt b/product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/connect/ConnectYourWalletRouteTest.kt similarity index 88% rename from product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ConnectYourWalletRouteTest.kt rename to product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/connect/ConnectYourWalletRouteTest.kt index 217504191..58269c1e8 100644 --- a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ConnectYourWalletRouteTest.kt +++ b/product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/connect/ConnectYourWalletRouteTest.kt @@ -1,13 +1,13 @@ -package com.walletconnect.web3.modal.ui.routes.connect +package com.reown.appkit.ui.routes.connect import com.android.resources.NightMode import com.reown.android.internal.common.modal.data.model.Wallet import com.reown.modal.ui.model.UiState -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.previews.testWallets -import com.walletconnect.web3.modal.ui.routes.connect.connect_wallet.ConnectWalletRoute -import com.walletconnect.web3.modal.utils.MainDispatcherRule -import com.walletconnect.web3.modal.utils.ScreenShotTest +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.previews.testWallets +import com.reown.appkit.ui.routes.connect.connect_wallet.ConnectWalletRoute +import com.reown.appkit.utils.MainDispatcherRule +import com.reown.appkit.utils.ScreenShotTest import io.mockk.every import io.mockk.mockk import kotlinx.coroutines.flow.StateFlow diff --git a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/connect/GetAWalletRouteTest.kt b/product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/connect/GetAWalletRouteTest.kt similarity index 72% rename from product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/connect/GetAWalletRouteTest.kt rename to product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/connect/GetAWalletRouteTest.kt index 04c746b14..a49aa8da2 100644 --- a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/connect/GetAWalletRouteTest.kt +++ b/product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/connect/GetAWalletRouteTest.kt @@ -1,12 +1,12 @@ -package com.walletconnect.web3.modal.ui.routes.connect +package com.reown.appkit.ui.routes.connect import com.android.resources.NightMode import com.android.resources.ScreenOrientation -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.previews.testWallets -import com.walletconnect.web3.modal.ui.routes.connect.get_wallet.GetAWalletRoute -import com.walletconnect.web3.modal.utils.MainDispatcherRule -import com.walletconnect.web3.modal.utils.ScreenShotTest +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.previews.testWallets +import com.reown.appkit.ui.routes.connect.get_wallet.GetAWalletRoute +import com.reown.appkit.utils.MainDispatcherRule +import com.reown.appkit.utils.ScreenShotTest import org.junit.Ignore import org.junit.Rule import org.junit.Test diff --git a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/connect/RedirectWalletRouteTest.kt b/product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/connect/RedirectWalletRouteTest.kt similarity index 86% rename from product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/connect/RedirectWalletRouteTest.kt rename to product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/connect/RedirectWalletRouteTest.kt index 5d35e136d..8c47be874 100644 --- a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/connect/RedirectWalletRouteTest.kt +++ b/product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/connect/RedirectWalletRouteTest.kt @@ -1,14 +1,14 @@ -package com.walletconnect.web3.modal.ui.routes.connect +package com.reown.appkit.ui.routes.connect import com.android.resources.NightMode import com.android.resources.ScreenOrientation -import com.walletconnect.web3.modal.ui.components.internal.commons.switch.PlatformTab -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.previews.testWallets -import com.walletconnect.web3.modal.ui.routes.connect.redirect.RedirectState -import com.walletconnect.web3.modal.ui.routes.connect.redirect.RedirectWalletScreen -import com.walletconnect.web3.modal.utils.MainDispatcherRule -import com.walletconnect.web3.modal.utils.ScreenShotTest +import com.reown.appkit.ui.components.internal.commons.switch.PlatformTab +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.previews.testWallets +import com.reown.appkit.ui.routes.connect.redirect.RedirectState +import com.reown.appkit.ui.routes.connect.redirect.RedirectWalletScreen +import com.reown.appkit.utils.MainDispatcherRule +import com.reown.appkit.utils.ScreenShotTest import org.junit.Ignore import org.junit.Rule import org.junit.Test diff --git a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ScanCodeRouteTest.kt b/product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/connect/ScanCodeRouteTest.kt similarity index 81% rename from product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ScanCodeRouteTest.kt rename to product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/connect/ScanCodeRouteTest.kt index 3f7328a74..db8c45350 100644 --- a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/connect/ScanCodeRouteTest.kt +++ b/product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/connect/ScanCodeRouteTest.kt @@ -1,11 +1,11 @@ -package com.walletconnect.web3.modal.ui.routes.connect +package com.reown.appkit.ui.routes.connect import com.android.resources.NightMode import com.android.resources.ScreenOrientation -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.routes.connect.scan_code.ScanQRCodeRoute -import com.walletconnect.web3.modal.utils.MainDispatcherRule -import com.walletconnect.web3.modal.utils.ScreenShotTest +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.routes.connect.scan_code.ScanQRCodeRoute +import com.reown.appkit.utils.MainDispatcherRule +import com.reown.appkit.utils.ScreenShotTest import io.mockk.every import io.mockk.mockk import org.junit.Before diff --git a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/connect/WhatIsWalletTest.kt b/product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/connect/WhatIsWalletTest.kt similarity index 77% rename from product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/connect/WhatIsWalletTest.kt rename to product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/connect/WhatIsWalletTest.kt index 65b240dd0..f938ec371 100644 --- a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/ui/routes/connect/WhatIsWalletTest.kt +++ b/product/appkit/src/test/kotlin/com/reown/appkit/ui/routes/connect/WhatIsWalletTest.kt @@ -1,12 +1,12 @@ -package com.walletconnect.web3.modal.ui.routes.connect +package com.reown.appkit.ui.routes.connect import androidx.navigation.NavController import com.android.resources.NightMode import com.android.resources.ScreenOrientation -import com.walletconnect.web3.modal.ui.navigation.Route -import com.walletconnect.web3.modal.ui.routes.connect.what_is_wallet.WhatIsWallet -import com.walletconnect.web3.modal.utils.MainDispatcherRule -import com.walletconnect.web3.modal.utils.ScreenShotTest +import com.reown.appkit.ui.navigation.Route +import com.reown.appkit.ui.routes.connect.what_is_wallet.WhatIsWallet +import com.reown.appkit.utils.MainDispatcherRule +import com.reown.appkit.utils.ScreenShotTest import io.mockk.mockk import org.junit.Ignore import org.junit.Rule diff --git a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/utils/Dispatchers.kt b/product/appkit/src/test/kotlin/com/reown/appkit/utils/Dispatchers.kt similarity index 94% rename from product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/utils/Dispatchers.kt rename to product/appkit/src/test/kotlin/com/reown/appkit/utils/Dispatchers.kt index 6f188e5f2..bb20d1288 100644 --- a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/utils/Dispatchers.kt +++ b/product/appkit/src/test/kotlin/com/reown/appkit/utils/Dispatchers.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalCoroutinesApi::class) -package com.walletconnect.web3.modal.utils +package com.reown.appkit.utils import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.ExperimentalCoroutinesApi diff --git a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/utils/PaparazziUtilts.kt b/product/appkit/src/test/kotlin/com/reown/appkit/utils/PaparazziUtilts.kt similarity index 91% rename from product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/utils/PaparazziUtilts.kt rename to product/appkit/src/test/kotlin/com/reown/appkit/utils/PaparazziUtilts.kt index 34f07bfb6..175d76e51 100644 --- a/product/web3modal/src/test/kotlin/com/walletconnect/web3/modal/utils/PaparazziUtilts.kt +++ b/product/appkit/src/test/kotlin/com/reown/appkit/utils/PaparazziUtilts.kt @@ -1,4 +1,4 @@ -package com.walletconnect.web3.modal.utils +package com.reown.appkit.utils import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -25,11 +25,11 @@ import com.android.resources.NightMode import com.android.resources.ScreenOrientation import com.reown.android.internal.common.model.ProjectId import com.reown.android.internal.common.wcKoinApp -import com.walletconnect.web3.modal.ui.components.internal.root.AppKitRoot -import com.walletconnect.web3.modal.ui.components.internal.root.rememberAppKitRootState -import com.walletconnect.web3.modal.ui.components.internal.snackbar.rememberSnackBarState -import com.walletconnect.web3.modal.ui.theme.ProvideAppKitThemeComposition -import com.walletconnect.web3.modal.ui.theme.AppKitTheme +import com.reown.appkit.ui.components.internal.root.AppKitRoot +import com.reown.appkit.ui.components.internal.root.rememberAppKitRootState +import com.reown.appkit.ui.components.internal.snackbar.rememberSnackBarState +import com.reown.appkit.ui.theme.ProvideAppKitThemeComposition +import com.reown.appkit.ui.theme.AppKitTheme import org.junit.Rule import org.koin.dsl.module import java.io.File diff --git a/product/web3modal/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Error UiState in DarkMode.png b/product/appkit/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Error UiState in DarkMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Error UiState in DarkMode.png rename to product/appkit/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Error UiState in DarkMode.png diff --git a/product/web3modal/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Error UiState in Landscape.png b/product/appkit/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Error UiState in Landscape.png similarity index 100% rename from product/web3modal/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Error UiState in Landscape.png rename to product/appkit/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Error UiState in Landscape.png diff --git a/product/web3modal/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Error UiState in LightMode.png b/product/appkit/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Error UiState in LightMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Error UiState in LightMode.png rename to product/appkit/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Error UiState in LightMode.png diff --git a/product/web3modal/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Loading UiState in DarkMode.png b/product/appkit/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Loading UiState in DarkMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Loading UiState in DarkMode.png rename to product/appkit/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Loading UiState in DarkMode.png diff --git a/product/web3modal/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Loading UiState in Landscape.png b/product/appkit/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Loading UiState in Landscape.png similarity index 100% rename from product/web3modal/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Loading UiState in Landscape.png rename to product/appkit/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Loading UiState in Landscape.png diff --git a/product/web3modal/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Loading UiState in LightMode.png b/product/appkit/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Loading UiState in LightMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Loading UiState in LightMode.png rename to product/appkit/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Loading UiState in LightMode.png diff --git a/product/web3modal/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Success UiState in DarkMode.png b/product/appkit/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Success UiState in DarkMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Success UiState in DarkMode.png rename to product/appkit/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Success UiState in DarkMode.png diff --git a/product/web3modal/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Success UiState in Landscape.png b/product/appkit/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Success UiState in Landscape.png similarity index 100% rename from product/web3modal/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Success UiState in Landscape.png rename to product/appkit/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Success UiState in Landscape.png diff --git a/product/web3modal/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Success UiState in LightMode.png b/product/appkit/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Success UiState in LightMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Success UiState in LightMode.png rename to product/appkit/src/test/snapshots/account/account/images/com.walletconnect.web3.modal.ui.routes.account_AccountRouteTest_test AccountRoute with Success UiState in LightMode.png diff --git a/product/web3modal/src/test/snapshots/account/chain_switch_redirect/images/com.walletconnect.web3.modal.ui.routes.account_ChainSwitchRedirectTest_test ChainSwitchRedirect with Decline in DarkMode.png b/product/appkit/src/test/snapshots/account/chain_switch_redirect/images/com.walletconnect.web3.modal.ui.routes.account_ChainSwitchRedirectTest_test ChainSwitchRedirect with Decline in DarkMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/account/chain_switch_redirect/images/com.walletconnect.web3.modal.ui.routes.account_ChainSwitchRedirectTest_test ChainSwitchRedirect with Decline in DarkMode.png rename to product/appkit/src/test/snapshots/account/chain_switch_redirect/images/com.walletconnect.web3.modal.ui.routes.account_ChainSwitchRedirectTest_test ChainSwitchRedirect with Decline in DarkMode.png diff --git a/product/web3modal/src/test/snapshots/account/chain_switch_redirect/images/com.walletconnect.web3.modal.ui.routes.account_ChainSwitchRedirectTest_test ChainSwitchRedirect with Decline in LightMode.png b/product/appkit/src/test/snapshots/account/chain_switch_redirect/images/com.walletconnect.web3.modal.ui.routes.account_ChainSwitchRedirectTest_test ChainSwitchRedirect with Decline in LightMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/account/chain_switch_redirect/images/com.walletconnect.web3.modal.ui.routes.account_ChainSwitchRedirectTest_test ChainSwitchRedirect with Decline in LightMode.png rename to product/appkit/src/test/snapshots/account/chain_switch_redirect/images/com.walletconnect.web3.modal.ui.routes.account_ChainSwitchRedirectTest_test ChainSwitchRedirect with Decline in LightMode.png diff --git a/product/web3modal/src/test/snapshots/account/chain_switch_redirect/images/com.walletconnect.web3.modal.ui.routes.account_ChainSwitchRedirectTest_test ChainSwitchRedirect with Loading in DarkMode.png b/product/appkit/src/test/snapshots/account/chain_switch_redirect/images/com.walletconnect.web3.modal.ui.routes.account_ChainSwitchRedirectTest_test ChainSwitchRedirect with Loading in DarkMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/account/chain_switch_redirect/images/com.walletconnect.web3.modal.ui.routes.account_ChainSwitchRedirectTest_test ChainSwitchRedirect with Loading in DarkMode.png rename to product/appkit/src/test/snapshots/account/chain_switch_redirect/images/com.walletconnect.web3.modal.ui.routes.account_ChainSwitchRedirectTest_test ChainSwitchRedirect with Loading in DarkMode.png diff --git a/product/web3modal/src/test/snapshots/account/chain_switch_redirect/images/com.walletconnect.web3.modal.ui.routes.account_ChainSwitchRedirectTest_test ChainSwitchRedirect with Loading in LightMode.png b/product/appkit/src/test/snapshots/account/chain_switch_redirect/images/com.walletconnect.web3.modal.ui.routes.account_ChainSwitchRedirectTest_test ChainSwitchRedirect with Loading in LightMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/account/chain_switch_redirect/images/com.walletconnect.web3.modal.ui.routes.account_ChainSwitchRedirectTest_test ChainSwitchRedirect with Loading in LightMode.png rename to product/appkit/src/test/snapshots/account/chain_switch_redirect/images/com.walletconnect.web3.modal.ui.routes.account_ChainSwitchRedirectTest_test ChainSwitchRedirect with Loading in LightMode.png diff --git a/product/web3modal/src/test/snapshots/account/change_network/images/com.walletconnect.web3.modal.ui.routes.account_ChangeNetworkRouteTest_test ChangeNetworkRoute in DarkMode.png b/product/appkit/src/test/snapshots/account/change_network/images/com.walletconnect.web3.modal.ui.routes.account_ChangeNetworkRouteTest_test ChangeNetworkRoute in DarkMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/account/change_network/images/com.walletconnect.web3.modal.ui.routes.account_ChangeNetworkRouteTest_test ChangeNetworkRoute in DarkMode.png rename to product/appkit/src/test/snapshots/account/change_network/images/com.walletconnect.web3.modal.ui.routes.account_ChangeNetworkRouteTest_test ChangeNetworkRoute in DarkMode.png diff --git a/product/web3modal/src/test/snapshots/account/change_network/images/com.walletconnect.web3.modal.ui.routes.account_ChangeNetworkRouteTest_test ChangeNetworkRoute in Landscape.png b/product/appkit/src/test/snapshots/account/change_network/images/com.walletconnect.web3.modal.ui.routes.account_ChangeNetworkRouteTest_test ChangeNetworkRoute in Landscape.png similarity index 100% rename from product/web3modal/src/test/snapshots/account/change_network/images/com.walletconnect.web3.modal.ui.routes.account_ChangeNetworkRouteTest_test ChangeNetworkRoute in Landscape.png rename to product/appkit/src/test/snapshots/account/change_network/images/com.walletconnect.web3.modal.ui.routes.account_ChangeNetworkRouteTest_test ChangeNetworkRoute in Landscape.png diff --git a/product/web3modal/src/test/snapshots/account/change_network/images/com.walletconnect.web3.modal.ui.routes.account_ChangeNetworkRouteTest_test ChangeNetworkRoute in LightMode.png b/product/appkit/src/test/snapshots/account/change_network/images/com.walletconnect.web3.modal.ui.routes.account_ChangeNetworkRouteTest_test ChangeNetworkRoute in LightMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/account/change_network/images/com.walletconnect.web3.modal.ui.routes.account_ChangeNetworkRouteTest_test ChangeNetworkRoute in LightMode.png rename to product/appkit/src/test/snapshots/account/change_network/images/com.walletconnect.web3.modal.ui.routes.account_ChangeNetworkRouteTest_test ChangeNetworkRoute in LightMode.png diff --git a/product/web3modal/src/test/snapshots/account/what_is_network/images/com.walletconnect.web3.modal.ui.routes.account_WhatIsNetworkRouteTest_test WhatIsWallet in DarkMode.png b/product/appkit/src/test/snapshots/account/what_is_network/images/com.walletconnect.web3.modal.ui.routes.account_WhatIsNetworkRouteTest_test WhatIsWallet in DarkMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/account/what_is_network/images/com.walletconnect.web3.modal.ui.routes.account_WhatIsNetworkRouteTest_test WhatIsWallet in DarkMode.png rename to product/appkit/src/test/snapshots/account/what_is_network/images/com.walletconnect.web3.modal.ui.routes.account_WhatIsNetworkRouteTest_test WhatIsWallet in DarkMode.png diff --git a/product/web3modal/src/test/snapshots/account/what_is_network/images/com.walletconnect.web3.modal.ui.routes.account_WhatIsNetworkRouteTest_test WhatIsWallet in Landscape.png b/product/appkit/src/test/snapshots/account/what_is_network/images/com.walletconnect.web3.modal.ui.routes.account_WhatIsNetworkRouteTest_test WhatIsWallet in Landscape.png similarity index 100% rename from product/web3modal/src/test/snapshots/account/what_is_network/images/com.walletconnect.web3.modal.ui.routes.account_WhatIsNetworkRouteTest_test WhatIsWallet in Landscape.png rename to product/appkit/src/test/snapshots/account/what_is_network/images/com.walletconnect.web3.modal.ui.routes.account_WhatIsNetworkRouteTest_test WhatIsWallet in Landscape.png diff --git a/product/web3modal/src/test/snapshots/account/what_is_network/images/com.walletconnect.web3.modal.ui.routes.account_WhatIsNetworkRouteTest_test WhatIsWallet in LightMode.png b/product/appkit/src/test/snapshots/account/what_is_network/images/com.walletconnect.web3.modal.ui.routes.account_WhatIsNetworkRouteTest_test WhatIsWallet in LightMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/account/what_is_network/images/com.walletconnect.web3.modal.ui.routes.account_WhatIsNetworkRouteTest_test WhatIsWallet in LightMode.png rename to product/appkit/src/test/snapshots/account/what_is_network/images/com.walletconnect.web3.modal.ui.routes.account_WhatIsNetworkRouteTest_test WhatIsWallet in LightMode.png diff --git a/product/web3modal/src/test/snapshots/component/button/images/com.walletconnect.web3.modal.ui.components.buttons_ButtonsTest_test AccountButton in DarkMode.png b/product/appkit/src/test/snapshots/component/button/images/com.walletconnect.web3.modal.ui.components.buttons_ButtonsTest_test AccountButton in DarkMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/component/button/images/com.walletconnect.web3.modal.ui.components.buttons_ButtonsTest_test AccountButton in DarkMode.png rename to product/appkit/src/test/snapshots/component/button/images/com.walletconnect.web3.modal.ui.components.buttons_ButtonsTest_test AccountButton in DarkMode.png diff --git a/product/web3modal/src/test/snapshots/component/button/images/com.walletconnect.web3.modal.ui.components.buttons_ButtonsTest_test AccountButton in LightMode.png b/product/appkit/src/test/snapshots/component/button/images/com.walletconnect.web3.modal.ui.components.buttons_ButtonsTest_test AccountButton in LightMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/component/button/images/com.walletconnect.web3.modal.ui.components.buttons_ButtonsTest_test AccountButton in LightMode.png rename to product/appkit/src/test/snapshots/component/button/images/com.walletconnect.web3.modal.ui.components.buttons_ButtonsTest_test AccountButton in LightMode.png diff --git a/product/web3modal/src/test/snapshots/component/button/images/com.walletconnect.web3.modal.ui.components.buttons_ButtonsTest_test ConnectButton in DarkMode.png b/product/appkit/src/test/snapshots/component/button/images/com.walletconnect.web3.modal.ui.components.buttons_ButtonsTest_test ConnectButton in DarkMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/component/button/images/com.walletconnect.web3.modal.ui.components.buttons_ButtonsTest_test ConnectButton in DarkMode.png rename to product/appkit/src/test/snapshots/component/button/images/com.walletconnect.web3.modal.ui.components.buttons_ButtonsTest_test ConnectButton in DarkMode.png diff --git a/product/web3modal/src/test/snapshots/component/button/images/com.walletconnect.web3.modal.ui.components.buttons_ButtonsTest_test ConnectButton in LightMode.png b/product/appkit/src/test/snapshots/component/button/images/com.walletconnect.web3.modal.ui.components.buttons_ButtonsTest_test ConnectButton in LightMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/component/button/images/com.walletconnect.web3.modal.ui.components.buttons_ButtonsTest_test ConnectButton in LightMode.png rename to product/appkit/src/test/snapshots/component/button/images/com.walletconnect.web3.modal.ui.components.buttons_ButtonsTest_test ConnectButton in LightMode.png diff --git a/product/web3modal/src/test/snapshots/component/internal/snackbar/images/com.walletconnect.web3.modal.ui.components.internal_ModalSnackBarTest_test ModalSnackBar in DarkMode.png b/product/appkit/src/test/snapshots/component/internal/snackbar/images/com.walletconnect.web3.modal.ui.components.internal_ModalSnackBarTest_test ModalSnackBar in DarkMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/component/internal/snackbar/images/com.walletconnect.web3.modal.ui.components.internal_ModalSnackBarTest_test ModalSnackBar in DarkMode.png rename to product/appkit/src/test/snapshots/component/internal/snackbar/images/com.walletconnect.web3.modal.ui.components.internal_ModalSnackBarTest_test ModalSnackBar in DarkMode.png diff --git a/product/web3modal/src/test/snapshots/component/internal/snackbar/images/com.walletconnect.web3.modal.ui.components.internal_ModalSnackBarTest_test ModalSnackBar in LightMode.png b/product/appkit/src/test/snapshots/component/internal/snackbar/images/com.walletconnect.web3.modal.ui.components.internal_ModalSnackBarTest_test ModalSnackBar in LightMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/component/internal/snackbar/images/com.walletconnect.web3.modal.ui.components.internal_ModalSnackBarTest_test ModalSnackBar in LightMode.png rename to product/appkit/src/test/snapshots/component/internal/snackbar/images/com.walletconnect.web3.modal.ui.components.internal_ModalSnackBarTest_test ModalSnackBar in LightMode.png diff --git a/product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with EmptyList in DarkMode.png b/product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with EmptyList in DarkMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with EmptyList in DarkMode.png rename to product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with EmptyList in DarkMode.png diff --git a/product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with EmptyList in Landscape.png b/product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with EmptyList in Landscape.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with EmptyList in Landscape.png rename to product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with EmptyList in Landscape.png diff --git a/product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with EmptyList in LightMode.png b/product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with EmptyList in LightMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with EmptyList in LightMode.png rename to product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with EmptyList in LightMode.png diff --git a/product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loaded Wallets in DarkMode.png b/product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loaded Wallets in DarkMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loaded Wallets in DarkMode.png rename to product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loaded Wallets in DarkMode.png diff --git a/product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loaded Wallets in Landscape.png b/product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loaded Wallets in Landscape.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loaded Wallets in Landscape.png rename to product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loaded Wallets in Landscape.png diff --git a/product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loaded Wallets in LightMode.png b/product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loaded Wallets in LightMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loaded Wallets in LightMode.png rename to product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loaded Wallets in LightMode.png diff --git a/product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loading Append in DarkMode.png b/product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loading Append in DarkMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loading Append in DarkMode.png rename to product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loading Append in DarkMode.png diff --git a/product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loading Append in Landscape.png b/product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loading Append in Landscape.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loading Append in Landscape.png rename to product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loading Append in Landscape.png diff --git a/product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loading Append in LightMode.png b/product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loading Append in LightMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loading Append in LightMode.png rename to product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Loading Append in LightMode.png diff --git a/product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with LoadingRefresh in DarkMode.png b/product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with LoadingRefresh in DarkMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with LoadingRefresh in DarkMode.png rename to product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with LoadingRefresh in DarkMode.png diff --git a/product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with LoadingRefresh in Landscape.png b/product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with LoadingRefresh in Landscape.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with LoadingRefresh in Landscape.png rename to product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with LoadingRefresh in Landscape.png diff --git a/product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with LoadingRefresh in LightMode.png b/product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with LoadingRefresh in LightMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with LoadingRefresh in LightMode.png rename to product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with LoadingRefresh in LightMode.png diff --git a/product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Search in DarkMode.png b/product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Search in DarkMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Search in DarkMode.png rename to product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Search in DarkMode.png diff --git a/product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Search in Landscape.png b/product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Search in Landscape.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Search in Landscape.png rename to product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Search in Landscape.png diff --git a/product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Search in LightMode.png b/product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Search in LightMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Search in LightMode.png rename to product/appkit/src/test/snapshots/connect/all_wallets/images/com.walletconnect.web3.modal.ui.routes.connect_AllWalletsRouteTest_test AllWalletsRoute with Search in LightMode.png diff --git a/product/web3modal/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Error UiState in DarkMode.png b/product/appkit/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Error UiState in DarkMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Error UiState in DarkMode.png rename to product/appkit/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Error UiState in DarkMode.png diff --git a/product/web3modal/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Error UiState in LightMode.png b/product/appkit/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Error UiState in LightMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Error UiState in LightMode.png rename to product/appkit/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Error UiState in LightMode.png diff --git a/product/web3modal/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Loading UiState in DarkMode.png b/product/appkit/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Loading UiState in DarkMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Loading UiState in DarkMode.png rename to product/appkit/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Loading UiState in DarkMode.png diff --git a/product/web3modal/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Loading UiState in LightMode.png b/product/appkit/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Loading UiState in LightMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Loading UiState in LightMode.png rename to product/appkit/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Loading UiState in LightMode.png diff --git a/product/web3modal/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Success UiState in DarkMode.png b/product/appkit/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Success UiState in DarkMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Success UiState in DarkMode.png rename to product/appkit/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Success UiState in DarkMode.png diff --git a/product/web3modal/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Success UiState in LightMode.png b/product/appkit/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Success UiState in LightMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Success UiState in LightMode.png rename to product/appkit/src/test/snapshots/connect/connect_your_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_ConnectYourWalletRouteTest_test ConnectYourWallet with Success UiState in LightMode.png diff --git a/product/web3modal/src/test/snapshots/connect/get_a_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_GetAWalletRouteTest_test GetAWalletRoute in DarkMode.png b/product/appkit/src/test/snapshots/connect/get_a_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_GetAWalletRouteTest_test GetAWalletRoute in DarkMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/get_a_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_GetAWalletRouteTest_test GetAWalletRoute in DarkMode.png rename to product/appkit/src/test/snapshots/connect/get_a_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_GetAWalletRouteTest_test GetAWalletRoute in DarkMode.png diff --git a/product/web3modal/src/test/snapshots/connect/get_a_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_GetAWalletRouteTest_test GetAWalletRoute in Landscape.png b/product/appkit/src/test/snapshots/connect/get_a_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_GetAWalletRouteTest_test GetAWalletRoute in Landscape.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/get_a_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_GetAWalletRouteTest_test GetAWalletRoute in Landscape.png rename to product/appkit/src/test/snapshots/connect/get_a_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_GetAWalletRouteTest_test GetAWalletRoute in Landscape.png diff --git a/product/web3modal/src/test/snapshots/connect/get_a_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_GetAWalletRouteTest_test GetAWalletRoute in LightMode.png b/product/appkit/src/test/snapshots/connect/get_a_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_GetAWalletRouteTest_test GetAWalletRoute in LightMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/get_a_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_GetAWalletRouteTest_test GetAWalletRoute in LightMode.png rename to product/appkit/src/test/snapshots/connect/get_a_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_GetAWalletRouteTest_test GetAWalletRoute in LightMode.png diff --git a/product/web3modal/src/test/snapshots/connect/qr_code/images/com.walletconnect.web3.modal.ui.routes.connect_ScanCodeRouteTest_test ScanCodeRoute in DarkMode.png b/product/appkit/src/test/snapshots/connect/qr_code/images/com.walletconnect.web3.modal.ui.routes.connect_ScanCodeRouteTest_test ScanCodeRoute in DarkMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/qr_code/images/com.walletconnect.web3.modal.ui.routes.connect_ScanCodeRouteTest_test ScanCodeRoute in DarkMode.png rename to product/appkit/src/test/snapshots/connect/qr_code/images/com.walletconnect.web3.modal.ui.routes.connect_ScanCodeRouteTest_test ScanCodeRoute in DarkMode.png diff --git a/product/web3modal/src/test/snapshots/connect/qr_code/images/com.walletconnect.web3.modal.ui.routes.connect_ScanCodeRouteTest_test ScanCodeRoute in Landscape.png b/product/appkit/src/test/snapshots/connect/qr_code/images/com.walletconnect.web3.modal.ui.routes.connect_ScanCodeRouteTest_test ScanCodeRoute in Landscape.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/qr_code/images/com.walletconnect.web3.modal.ui.routes.connect_ScanCodeRouteTest_test ScanCodeRoute in Landscape.png rename to product/appkit/src/test/snapshots/connect/qr_code/images/com.walletconnect.web3.modal.ui.routes.connect_ScanCodeRouteTest_test ScanCodeRoute in Landscape.png diff --git a/product/web3modal/src/test/snapshots/connect/qr_code/images/com.walletconnect.web3.modal.ui.routes.connect_ScanCodeRouteTest_test ScanCodeRoute in LightMode.png b/product/appkit/src/test/snapshots/connect/qr_code/images/com.walletconnect.web3.modal.ui.routes.connect_ScanCodeRouteTest_test ScanCodeRoute in LightMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/qr_code/images/com.walletconnect.web3.modal.ui.routes.connect_ScanCodeRouteTest_test ScanCodeRoute in LightMode.png rename to product/appkit/src/test/snapshots/connect/qr_code/images/com.walletconnect.web3.modal.ui.routes.connect_ScanCodeRouteTest_test ScanCodeRoute in LightMode.png diff --git a/product/web3modal/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Loading state in DarkMode .png b/product/appkit/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Loading state in DarkMode .png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Loading state in DarkMode .png rename to product/appkit/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Loading state in DarkMode .png diff --git a/product/web3modal/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Loading state in Landscape .png b/product/appkit/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Loading state in Landscape .png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Loading state in Landscape .png rename to product/appkit/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Loading state in Landscape .png diff --git a/product/web3modal/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Loading state in LightMode .png b/product/appkit/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Loading state in LightMode .png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Loading state in LightMode .png rename to product/appkit/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Loading state in LightMode .png diff --git a/product/web3modal/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with NotDetected state .png b/product/appkit/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with NotDetected state .png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with NotDetected state .png rename to product/appkit/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with NotDetected state .png diff --git a/product/web3modal/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with NotDetected state in DarkMode .png b/product/appkit/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with NotDetected state in DarkMode .png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with NotDetected state in DarkMode .png rename to product/appkit/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with NotDetected state in DarkMode .png diff --git a/product/web3modal/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with NotDetected state in Landscape .png b/product/appkit/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with NotDetected state in Landscape .png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with NotDetected state in Landscape .png rename to product/appkit/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with NotDetected state in Landscape .png diff --git a/product/web3modal/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Reject state .png b/product/appkit/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Reject state .png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Reject state .png rename to product/appkit/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Reject state .png diff --git a/product/web3modal/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Reject state in DarkMode .png b/product/appkit/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Reject state in DarkMode .png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Reject state in DarkMode .png rename to product/appkit/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Reject state in DarkMode .png diff --git a/product/web3modal/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Reject state in Landscape .png b/product/appkit/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Reject state in Landscape .png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Reject state in Landscape .png rename to product/appkit/src/test/snapshots/connect/redirect/images/com.walletconnect.web3.modal.ui.routes.connect_RedirectWalletRouteTest_test RedirectWalletRoute with Reject state in Landscape .png diff --git a/product/web3modal/src/test/snapshots/connect/what_is_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_WhatIsWalletTest_test WhatIsWallet in DarkMode.png b/product/appkit/src/test/snapshots/connect/what_is_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_WhatIsWalletTest_test WhatIsWallet in DarkMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/what_is_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_WhatIsWalletTest_test WhatIsWallet in DarkMode.png rename to product/appkit/src/test/snapshots/connect/what_is_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_WhatIsWalletTest_test WhatIsWallet in DarkMode.png diff --git a/product/web3modal/src/test/snapshots/connect/what_is_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_WhatIsWalletTest_test WhatIsWallet in Landscape.png b/product/appkit/src/test/snapshots/connect/what_is_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_WhatIsWalletTest_test WhatIsWallet in Landscape.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/what_is_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_WhatIsWalletTest_test WhatIsWallet in Landscape.png rename to product/appkit/src/test/snapshots/connect/what_is_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_WhatIsWalletTest_test WhatIsWallet in Landscape.png diff --git a/product/web3modal/src/test/snapshots/connect/what_is_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_WhatIsWalletTest_test WhatIsWallet in LightMode.png b/product/appkit/src/test/snapshots/connect/what_is_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_WhatIsWalletTest_test WhatIsWallet in LightMode.png similarity index 100% rename from product/web3modal/src/test/snapshots/connect/what_is_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_WhatIsWalletTest_test WhatIsWallet in LightMode.png rename to product/appkit/src/test/snapshots/connect/what_is_wallet/images/com.walletconnect.web3.modal.ui.routes.connect_WhatIsWalletTest_test WhatIsWallet in LightMode.png diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/Account.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/Account.kt deleted file mode 100644 index 7a45f221e..000000000 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/client/models/Account.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.walletconnect.web3.modal.client.models - -import com.walletconnect.web3.modal.client.Modal - -data class Account( - val address: String, - val chain: Modal.Model.Chain -) \ No newline at end of file diff --git a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/TestTags.kt b/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/TestTags.kt deleted file mode 100644 index 174291916..000000000 --- a/product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/commons/TestTags.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.walletconnect.web3.modal.ui.components.internal.commons - -internal object TestTags { - const val TITLE = "Title" -} diff --git a/sample/dapp/build.gradle.kts b/sample/dapp/build.gradle.kts index 24f41755b..3d39625dc 100644 --- a/sample/dapp/build.gradle.kts +++ b/sample/dapp/build.gradle.kts @@ -97,11 +97,11 @@ dependencies { implementation(libs.bundles.firebase) debugImplementation(project(":core:android")) - debugImplementation(project(":product:web3modal")) + debugImplementation(project(":product:appkit")) debugImplementation(project(":protocol:sign")) internalImplementation(project(":core:android")) - internalImplementation(project(":product:web3modal")) + internalImplementation(project(":product:appkit")) internalImplementation(project(":protocol:sign")) releaseImplementation(platform("com.walletconnect:android-bom:$BOM_VERSION")) diff --git a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/DappSampleApp.kt b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/DappSampleApp.kt index 822413c64..71c3c3032 100644 --- a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/DappSampleApp.kt +++ b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/DappSampleApp.kt @@ -9,10 +9,10 @@ import com.reown.android.CoreClient import com.walletconnect.sample.common.tag import com.walletconnect.util.bytesToHex import com.walletconnect.util.randomBytes -import com.walletconnect.web3.modal.client.AppKit -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.presets.AppKitChainsPresets -import com.walletconnect.web3.modal.utils.EthUtils +import com.reown.appkit.client.AppKit +import com.reown.appkit.client.Modal +import com.reown.appkit.presets.AppKitChainsPresets +import com.reown.appkit.utils.EthUtils import timber.log.Timber import com.walletconnect.sample.common.BuildConfig as CommonBuildConfig diff --git a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/domain/DappDelegate.kt b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/domain/DappDelegate.kt index 72ac61571..f0d63647c 100644 --- a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/domain/DappDelegate.kt +++ b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/domain/DappDelegate.kt @@ -3,8 +3,8 @@ package com.walletconnect.sample.dapp.domain import com.reown.android.Core import com.reown.android.CoreClient import com.walletconnect.sample.common.tag -import com.walletconnect.web3.modal.client.AppKit -import com.walletconnect.web3.modal.client.Modal +import com.reown.appkit.client.AppKit +import com.reown.appkit.client.Modal import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob diff --git a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/DappSampleNavGraph.kt b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/DappSampleNavGraph.kt index 53281a656..285133ba4 100644 --- a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/DappSampleNavGraph.kt +++ b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/DappSampleNavGraph.kt @@ -21,7 +21,7 @@ import com.walletconnect.sample.dapp.ui.routes.Route import com.walletconnect.sample.dapp.ui.routes.composable_routes.account.AccountRoute import com.walletconnect.sample.dapp.ui.routes.composable_routes.chain_selection.ChainSelectionRoute import com.walletconnect.sample.dapp.ui.routes.composable_routes.session.SessionRoute -import com.walletconnect.web3.modal.ui.appKitGraph +import com.reown.appkit.ui.appKitGraph @SuppressLint("RestrictedApi") @Composable diff --git a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/account/AccountViewModel.kt b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/account/AccountViewModel.kt index ace074728..c04e98461 100644 --- a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/account/AccountViewModel.kt +++ b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/account/AccountViewModel.kt @@ -13,10 +13,10 @@ import com.walletconnect.sample.common.getPersonalSignBody import com.walletconnect.sample.dapp.domain.DappDelegate import com.walletconnect.sample.dapp.ui.DappSampleEvents import com.walletconnect.sample.dapp.ui.accountArg -import com.walletconnect.web3.modal.client.AppKit -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.models.Session -import com.walletconnect.web3.modal.client.models.request.Request +import com.reown.appkit.client.AppKit +import com.reown.appkit.client.Modal +import com.reown.appkit.client.models.Session +import com.reown.appkit.client.models.request.Request import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharedFlow diff --git a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionRoute.kt b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionRoute.kt index 76bbad425..4b8053a1a 100644 --- a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionRoute.kt +++ b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionRoute.kt @@ -72,8 +72,8 @@ import com.walletconnect.sample.common.ui.toColor import com.walletconnect.sample.dapp.BuildConfig import com.walletconnect.sample.dapp.ui.DappSampleEvents import com.walletconnect.sample.dapp.ui.routes.Route -import com.walletconnect.web3.modal.ui.components.button.rememberAppKitState -import com.walletconnect.web3.modal.ui.openAppKit +import com.reown.appkit.ui.components.button.rememberAppKitState +import com.reown.appkit.ui.openAppKit import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionViewModel.kt b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionViewModel.kt index ea78487dc..827fac0b5 100644 --- a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionViewModel.kt +++ b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/composable_routes/chain_selection/ChainSelectionViewModel.kt @@ -14,8 +14,8 @@ import com.reown.sign.client.Sign import com.reown.sign.client.SignClient import com.walletconnect.util.bytesToHex import com.walletconnect.util.randomBytes -import com.walletconnect.web3.modal.client.AppKit -import com.walletconnect.web3.modal.client.Modal +import com.reown.appkit.client.AppKit +import com.reown.appkit.client.Modal import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted diff --git a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/host/DappSampleViewModel.kt b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/host/DappSampleViewModel.kt index ad577968a..c4913df82 100644 --- a/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/host/DappSampleViewModel.kt +++ b/sample/dapp/src/main/kotlin/com/walletconnect/sample/dapp/ui/routes/host/DappSampleViewModel.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.walletconnect.sample.dapp.domain.DappDelegate import com.walletconnect.sample.dapp.ui.DappSampleEvents -import com.walletconnect.web3.modal.client.Modal +import com.reown.appkit.client.Modal import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.merge diff --git a/sample/modal/build.gradle.kts b/sample/modal/build.gradle.kts index 197205a3b..fce8f916c 100644 --- a/sample/modal/build.gradle.kts +++ b/sample/modal/build.gradle.kts @@ -90,10 +90,10 @@ dependencies { api(libs.bundles.androidxNavigation) debugImplementation(project(":core:android")) - debugImplementation(project(":product:web3modal")) + debugImplementation(project(":product:appkit")) internalImplementation(project(":core:android")) - internalImplementation(project(":product:web3modal")) + internalImplementation(project(":product:appkit")) releaseImplementation(platform("com.walletconnect:android-bom:$BOM_VERSION")) releaseImplementation("com.walletconnect:android-core") diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/AppKitApp.kt b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/AppKitApp.kt index 10aae3c44..b4541e621 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/AppKitApp.kt +++ b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/AppKitApp.kt @@ -10,10 +10,10 @@ import com.reown.android.relay.ConnectionType import com.walletconnect.sample.common.tag import com.walletconnect.util.bytesToHex import com.walletconnect.util.randomBytes -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.AppKit -import com.walletconnect.web3.modal.presets.AppKitChainsPresets -import com.walletconnect.web3.modal.utils.EthUtils +import com.reown.appkit.client.Modal +import com.reown.appkit.client.AppKit +import com.reown.appkit.presets.AppKitChainsPresets +import com.reown.appkit.utils.EthUtils import timber.log.Timber import com.walletconnect.sample.common.BuildConfig as CommonBuildConfig diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/MainActivity.kt b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/MainActivity.kt index 1a17bf993..53433f34f 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/MainActivity.kt +++ b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/MainActivity.kt @@ -76,9 +76,9 @@ import com.walletconnect.sample.modal.ui.predefinedRedDarkTheme import com.walletconnect.sample.modal.ui.predefinedRedLightTheme import com.walletconnect.sample.modal.ui.theme.WalletConnectTheme import com.walletconnect.sample.modal.view.ViewActivity -import com.walletconnect.web3.modal.client.AppKit -import com.walletconnect.web3.modal.ui.AppKitTheme -import com.walletconnect.web3.modal.ui.appKitGraph +import com.reown.appkit.client.AppKit +import com.reown.appkit.ui.AppKitTheme +import com.reown.appkit.ui.appKitGraph import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay import kotlinx.coroutines.launch diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ModalSampleDelegate.kt b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ModalSampleDelegate.kt index 652e8c135..dfebece6a 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ModalSampleDelegate.kt +++ b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ModalSampleDelegate.kt @@ -1,8 +1,8 @@ package com.walletconnect.sample.modal import com.walletconnect.sample.common.tag -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.AppKit +import com.reown.appkit.client.Modal +import com.reown.appkit.client.AppKit import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/compose/ComposeActivity.kt b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/compose/ComposeActivity.kt index 718651b30..278600c9c 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/compose/ComposeActivity.kt +++ b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/compose/ComposeActivity.kt @@ -29,7 +29,7 @@ import com.google.accompanist.navigation.material.ExperimentalMaterialNavigation import com.google.accompanist.navigation.material.ModalBottomSheetLayout import com.walletconnect.sample.modal.common.Route import com.walletconnect.sample.modal.ui.theme.WalletConnectTheme -import com.walletconnect.web3.modal.ui.appKitGraph +import com.reown.appkit.ui.appKitGraph class ComposeActivity : ComponentActivity() { diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/compose/HomeScreen.kt b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/compose/HomeScreen.kt index 76f84f887..4ce033e2f 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/compose/HomeScreen.kt +++ b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/compose/HomeScreen.kt @@ -10,13 +10,13 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.navigation.NavController -import com.walletconnect.web3.modal.ui.components.button.AccountButton -import com.walletconnect.web3.modal.ui.components.button.AccountButtonType -import com.walletconnect.web3.modal.ui.components.button.ConnectButton -import com.walletconnect.web3.modal.ui.components.button.ConnectButtonSize -import com.walletconnect.web3.modal.ui.components.button.NetworkButton -import com.walletconnect.web3.modal.ui.components.button.Web3Button -import com.walletconnect.web3.modal.ui.components.button.rememberAppKitState +import com.reown.appkit.ui.components.button.AccountButton +import com.reown.appkit.ui.components.button.AccountButtonType +import com.reown.appkit.ui.components.button.ConnectButton +import com.reown.appkit.ui.components.button.ConnectButtonSize +import com.reown.appkit.ui.components.button.NetworkButton +import com.reown.appkit.ui.components.button.Web3Button +import com.reown.appkit.ui.components.button.rememberAppKitState @Composable fun HomeScreen(navController: NavController) { diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/kotlindsl/KotlinDSLActivity.kt b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/kotlindsl/KotlinDSLActivity.kt index dba6afb52..096cac793 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/kotlindsl/KotlinDSLActivity.kt +++ b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/kotlindsl/KotlinDSLActivity.kt @@ -7,7 +7,7 @@ import androidx.navigation.fragment.NavHostFragment import androidx.navigation.fragment.fragment import com.walletconnect.sample.modal.common.Route import com.walletconnect.sample.modal.R -import com.walletconnect.web3.modal.ui.appKit +import com.reown.appkit.ui.appKit class KotlinDSLActivity : AppCompatActivity(R.layout.activity_kotlin_dsl) { diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ui/LabScreen.kt b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ui/LabScreen.kt index d2574ad2e..18f526269 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ui/LabScreen.kt +++ b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ui/LabScreen.kt @@ -19,15 +19,15 @@ import com.walletconnect.sample.common.getEthSignTypedData import com.walletconnect.sample.common.getPersonalSignBody import com.walletconnect.sample.common.ui.commons.BlueButton import com.walletconnect.sample.modal.ModalSampleDelegate -import com.walletconnect.web3.modal.client.Modal -import com.walletconnect.web3.modal.client.AppKit -import com.walletconnect.web3.modal.client.models.request.Request -import com.walletconnect.web3.modal.client.models.request.SentRequestResult -import com.walletconnect.web3.modal.ui.AppKitTheme -import com.walletconnect.web3.modal.ui.components.button.AccountButtonType -import com.walletconnect.web3.modal.ui.components.button.NetworkButton -import com.walletconnect.web3.modal.ui.components.button.Web3Button -import com.walletconnect.web3.modal.ui.components.button.rememberAppKitState +import com.reown.appkit.client.Modal +import com.reown.appkit.client.AppKit +import com.reown.appkit.client.models.request.Request +import com.reown.appkit.client.models.request.SentRequestResult +import com.reown.appkit.ui.AppKitTheme +import com.reown.appkit.ui.components.button.AccountButtonType +import com.reown.appkit.ui.components.button.NetworkButton +import com.reown.appkit.ui.components.button.Web3Button +import com.reown.appkit.ui.components.button.rememberAppKitState import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ui/PredifinedThemes.kt b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ui/PredifinedThemes.kt index 164ac248a..572aa26be 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ui/PredifinedThemes.kt +++ b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/ui/PredifinedThemes.kt @@ -1,7 +1,7 @@ package com.walletconnect.sample.modal.ui import androidx.compose.ui.graphics.Color -import com.walletconnect.web3.modal.ui.AppKitTheme +import com.reown.appkit.ui.AppKitTheme val predefinedOrangeLightTheme = AppKitTheme.provideLightAppKitColors( accent100 = Color(0xFFFFA500), diff --git a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/view/ViewActivity.kt b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/view/ViewActivity.kt index 4a4ecb2ec..6f9e02783 100644 --- a/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/view/ViewActivity.kt +++ b/sample/modal/src/main/kotlin/com/walletconnect/sample/modal/view/ViewActivity.kt @@ -3,7 +3,7 @@ package com.walletconnect.sample.modal.view import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import com.walletconnect.sample.modal.R -import com.walletconnect.web3.modal.ui.AppKitView +import com.reown.appkit.ui.AppKitView class ViewActivity: AppCompatActivity(R.layout.activity_view) { diff --git a/sample/modal/src/main/res/layout/activity_view.xml b/sample/modal/src/main/res/layout/activity_view.xml index 2edde0de1..79aadb46a 100644 --- a/sample/modal/src/main/res/layout/activity_view.xml +++ b/sample/modal/src/main/res/layout/activity_view.xml @@ -4,7 +4,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - -