Merge pull request #7 from reown-com/update_navigation_dependency

Update nav component
reown-com · Sep 16, 2024 · a00f683 · a00f683
2 parents ff3ff80 + 43bf105
commit a00f683
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 29 deletions.
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -5,7 +5,6 @@ const val KEY_PUBLISH_ARTIFACT_ID = "PUBLISH_ARTIFACT_ID"
 const val KEY_SDK_NAME = "SDK_NAME"
 
 //Latest versions
-//TODO: should reset all versions? or only wallet and app kits
 const val BOM_VERSION = "1.0.0"
 const val FOUNDATION_VERSION = "1.0.0"
 const val CORE_VERSION = "1.0.0"

diff --git a/buildSrc/src/main/kotlin/publish-module-android.gradle.kts b/buildSrc/src/main/kotlin/publish-module-android.gradle.kts
@@ -59,7 +59,7 @@ afterEvaluate {
                         developer {
                             id.set("KotlinSDKTeam")
                             name.set("Reown Kotlin")
-                            email.set("Kotlin@WalletConnect.com")
+                            email.set("mobile@reown.com ")
                         }
                     }
 

diff --git a/buildSrc/src/main/kotlin/publish-module-java.gradle.kts b/buildSrc/src/main/kotlin/publish-module-java.gradle.kts
@@ -56,7 +56,7 @@ afterEvaluate {
                         developer {
                             id.set("KotlinSDKTeam")
                             name.set("Reown Kotlin")
-                            email.set("Kotlin@WalletConnect.com")
+                            email.set("mobile@reown.com ")
                         }
                     }
 

diff --git a/core/modal/src/main/kotlin/com/reown/modal/ui/components/common/Modifiers.kt b/core/modal/src/main/kotlin/com/reown/modal/ui/components/common/Modifiers.kt
@@ -17,7 +17,5 @@ fun Modifier.roundedClickable(
     onClick: () -> Unit
 ) = composed { clickable(
     enabled = enabled,
-    indication = rememberRipple(bounded = bounded, radius = radius),
-    interactionSource = remember { MutableInteractionSource() },
     onClick = onClick
 ) }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -20,7 +20,7 @@ coroutines = "1.8.1"
 sqlDelight = "2.0.2"
 dokka = "1.9.20"
 moshi = "1.15.1"
-googleService = "4.4.1"
+googleService = "4.4.2"
 scarlet = "1.0.2"
 koin = "3.5.6"
 retrofit = "2.11.0"
@@ -38,18 +38,18 @@ customQrGenerator = "1.6.2"
 beagle = "2.9.0"
 coinbase = "1.0.4"
 
-firebaseBOM = "33.0.0"
+firebaseBOM = "33.3.0"
 firebaseAppDistribution = "5.0.0"
 
 androidxCore = "1.13.1"
-androidxAppCompat = "1.6.1"
+androidxAppCompat = "1.7.0"
 andoridxMaterial = "1.12.0"
-androidxLifecycle = "2.8.0"
-androidxTest = "1.5.0"
-androidxTestOrchestration = "1.4.2"
+androidxLifecycle = "2.8.5"
+androidxTest = "1.6.1"
+androidxTestOrchestration = "1.5.0"
 androidxSecurity = "1.1.0-alpha06"
 androidxDatastore = "1.1.1"
-androidxNavigation = "2.7.7"
+androidxNavigation = "2.8.0"
 
 jUnit = "4.13.2"
 robolectric = "4.12.2"
@@ -78,22 +78,22 @@ androidx-datastore = { module = "androidx.datastore:datastore-preferences", vers
 androidx-core = { module = "androidx.core:core-ktx", version.ref = "androidxCore" }
 androidx-appCompat = { module = "androidx.appcompat:appcompat", version.ref = "androidxAppCompat" }
 androidx-material = { module = "com.google.android.material:material", version.ref = "andoridxMaterial" }
-androidx-testJunit = { module = "androidx.test.ext:junit-ktx", version = "1.1.5" }
+androidx-testJunit = { module = "androidx.test.ext:junit-ktx", version = "1.2.1" }
 androidx-testCore = { module = "androidx.test:core-ktx", version.ref = "androidxTest" }
 androidx-testOrchestrator = { module = "androidx.test:orchestrator", version.ref = "androidxTestOrchestration" }
-androidx-testRunner = { module = "androidx.test:runner", version = "1.5.2" }
+androidx-testRunner = { module = "androidx.test:runner", version = "1.6.2" }
 androidx-testRules = { module = "androidx.test:rules", version.ref = "androidxTest" }
 #-------------------------- Compose --------------------------
 androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "composeBOM" }
 androidx-compose-ui = { module = "androidx.compose.ui:ui" }
 androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
 androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
 androidx-compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest" }
-androidx-compose-ui-test-junit = { module = "androidx.compose.ui:ui-test-junit4", version = "1.6.7" }
+androidx-compose-ui-test-junit = { module = "androidx.compose.ui:ui-test-junit4", version = "1.7.1" }
 androidx-compose-navigation = { module = "androidx.navigation:navigation-compose", version.ref = "androidxNavigation" }
 androidx-compose-navigation-testing = { module = "androidx.navigation:navigation-testing", version.ref = "androidxNavigation" }
 androidx-compose-lifecycle = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "composeViewModel" }
-androidx-compose-material = { module = "androidx.compose.material:material", version = "1.6.7" }
+androidx-compose-material = { module = "androidx.compose.material:material", version = "1.7.1" }
 
 coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
 coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
@@ -122,7 +122,7 @@ koin-android = { module = "io.insert-koin:koin-android", version.ref = "koin" }
 koin-test = { module = "io.insert-koin:koin-test", version.ref = "koin" }
 
 jUnit = { module = "junit:junit", version.ref = "jUnit" }
-jUnit-engine = { module = "org.junit.vintage:junit-vintage-engine", version = "5.10.0" }
+jUnit-engine = { module = "org.junit.vintage:junit-vintage-engine", version = "5.11.0" }
 
 kethereum-bip39 = { module = "com.github.komputing.kethereum:bip39", version.ref = "kethereum" }
 kethereum-bip39-wordlist = { module = "com.github.komputing.kethereum:bip39_wordlist_en", version.ref = "kethereum" }
@@ -195,7 +195,7 @@ kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
 kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
 
-firebase-crashlytics = { id = "com.google.firebase.crashlytics", version = "3.0.1" }
+firebase-crashlytics = { id = "com.google.firebase.crashlytics", version = "3.0.2" }
 firebase-distribution = { id = "com.google.firebase.appdistribution", version.ref = "firebaseAppDistribution" }
 
 google-services = { id = "com.google.gms.google-services", version.ref = "googleService" }

diff --git a/...pkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/entry/ActionEntry.kt b/...pkit/src/main/kotlin/com/reown/appkit/ui/components/internal/commons/entry/ActionEntry.kt
@@ -9,14 +9,15 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.Text
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Done
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.unit.dp
+import com.reown.appkit.R
 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
@@ -74,8 +75,8 @@ private fun ActionEntryPreview() {
     MultipleComponentsPreview(
         { ActionEntry(text = "Action without icon") {} },
         { ActionEntry(text = "Action without icon", isEnabled = false) {} },
-        { ActionEntry(icon = { Image(imageVector = Icons.Default.Done, contentDescription = null, colorFilter = ColorFilter.tint(it)) }, text = "Action with icon") {} },
-        { ActionEntry(isEnabled = false, icon = { Image(imageVector = Icons.Default.Done, contentDescription = null, colorFilter = ColorFilter.tint(it)) }, text = "Action with icon") {} },
+        { ActionEntry(icon = { Image(imageVector = ImageVector.vectorResource(R.drawable.ic_check), contentDescription = null, colorFilter = ColorFilter.tint(it)) }, text = "Action with icon") {} },
+        { ActionEntry(isEnabled = false, icon = { Image(imageVector = ImageVector.vectorResource(R.drawable.ic_check), contentDescription = null, colorFilter = ColorFilter.tint(it)) }, text = "Action with icon") {} },
     )
 }
 

diff --git a/sample/common/src/main/kotlin/com/reown/sample/common/ui/WCTopAppBar.kt b/sample/common/src/main/kotlin/com/reown/sample/common/ui/WCTopAppBar.kt
@@ -45,7 +45,7 @@ fun WCTopAppBar(
             Image(
                 modifier = Modifier
                     .size(24.dp)
-                    .clickable(indication = rememberRipple(bounded = false, radius = 24.dp), interactionSource = remember { MutableInteractionSource() }, onClick = actionImage.onClick),
+                    .clickable(onClick = actionImage.onClick),
                 painter = painterResource(id = actionImage.resource),
                 contentDescription = null,
             )

diff --git a/sample/dapp/build.gradle.kts b/sample/dapp/build.gradle.kts
@@ -78,6 +78,7 @@ dependencies {
 
     implementation("io.insert-koin:koin-androidx-compose:3.4.3")
     implementation("io.coil-kt:coil-compose:2.3.0")
+    implementation("androidx.compose.material:material-icons-core:1.7.1")
 
     implementation(libs.qrCodeGenerator)
     implementation(platform(libs.androidx.compose.bom))

diff --git a/sample/modal/build.gradle.kts b/sample/modal/build.gradle.kts
@@ -69,6 +69,7 @@ android {
 
 dependencies {
     implementation(project(":sample:common"))
+    implementation("androidx.compose.material:material-icons-core:1.7.1")
 
     implementation(platform(libs.firebase.bom))
     implementation(libs.bundles.firebase)

diff --git a/sample/modal/src/main/kotlin/com/reown/sample/modal/MainActivity.kt b/sample/modal/src/main/kotlin/com/reown/sample/modal/MainActivity.kt
@@ -257,10 +257,7 @@ private fun ThemeModeIcon(
         modifier = Modifier
             .padding(12.dp)
             .size(20.dp)
-            .clickable(
-                indication = rememberRipple(bounded = false),
-                interactionSource = remember { MutableInteractionSource() },
-            ) { onClick(!isDarkTheme) }
+            .clickable { onClick(!isDarkTheme) }
     )
 }
 

diff --git a/.../com/reown/sample/wallet/ui/routes/composable_routes/notifications/NotificationsHeader.kt b/.../com/reown/sample/wallet/ui/routes/composable_routes/notifications/NotificationsHeader.kt
@@ -64,7 +64,7 @@ fun NotificationsHeader(
                 modifier = Modifier
                     .width(20.dp)
                     .height(28.dp)
-                    .clickable(indication = rememberRipple(bounded = false, radius = 20.dp), interactionSource = remember { MutableInteractionSource() }, onClick = onBackIconClick)
+                    .clickable(onClick = onBackIconClick)
                     .padding(vertical = 8.dp),
                 imageVector = ImageVector.vectorResource(id = R.drawable.ic_chevron_left),
                 contentDescription = "Back arrow",

diff --git a/...reown/sample/wallet/ui/routes/composable_routes/notifications/NotificationsOptionsMenu.kt b/...reown/sample/wallet/ui/routes/composable_routes/notifications/NotificationsOptionsMenu.kt
@@ -54,7 +54,7 @@ fun NotificationsOptionsMenu(
         Icon(
             modifier = Modifier
                 .size(20.dp)
-                .clickable(indication = rememberRipple(bounded = false, radius = 20.dp), interactionSource = remember { MutableInteractionSource() }, onClick = onMoreIconClick),
+                .clickable(onClick = onMoreIconClick),
             painter = painterResource(id = R.drawable.ic_more),
             contentDescription = "More",
         )