chore: update bitkit-core to "0.1.33"

ovitrif · ovitrif · commit 6192d82bba57 · 2025-12-12T02:21:17.000+01:00
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -2,7 +2,6 @@ import com.android.build.gradle.internal.api.BaseVariantOutputImpl
 import io.gitlab.arturbosch.detekt.Detekt
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
-import org.jetbrains.kotlin.compose.compiler.gradle.ComposeFeatureFlag
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import java.io.FileInputStream
 import java.util.Properties
@@ -176,7 +175,6 @@ android {
 
 composeCompiler {
     featureFlags = setOf(
-        ComposeFeatureFlag.OptimizeNonSkippingGroups,
     )
     reportsDestination = layout.buildDirectory.dir("compose_compiler")
 }
diff --git a/app/src/main/java/to/bitkit/repositories/ActivityRepo.kt b/app/src/main/java/to/bitkit/repositories/ActivityRepo.kt
@@ -529,6 +529,7 @@ class ActivityRepo @Inject constructor(
                         preimage = null,
                         createdAt = now,
                         updatedAt = null,
+                        seenAt = null, // TODO implement synonymdev/bitkit-ios#270 changes
                     )
                 )
             )
diff --git a/app/src/main/java/to/bitkit/services/CoreService.kt b/app/src/main/java/to/bitkit/services/CoreService.kt
@@ -485,6 +485,7 @@ class ActivityService(
                 preimage = kind.preimage,
                 createdAt = payment.latestUpdateTimestamp,
                 updatedAt = payment.latestUpdateTimestamp,
+                seenAt = null, // TODO implement synonymdev/bitkit-ios#270 changes
             )
         }
 
@@ -616,6 +617,7 @@ class ActivityService(
             transferTxId = null,
             createdAt = confirmationData.timestamp,
             updatedAt = confirmationData.timestamp,
+            seenAt = null, // TODO implement synonymdev/bitkit-ios#270 changes
         )
     }
 
@@ -737,7 +739,8 @@ class ActivityService(
                             timestamp = txTimestamp,
                             preimage = if (Random.nextBoolean()) "preimage$i" else null,
                             createdAt = txTimestamp,
-                            updatedAt = txTimestamp
+                            updatedAt = txTimestamp,
+                            seenAt = null, // TODO implement synonymdev/bitkit-ios#270 changes
                         )
                     )
                 } else {
@@ -762,6 +765,7 @@ class ActivityService(
                             transferTxId = null,
                             createdAt = txTimestamp,
                             updatedAt = txTimestamp,
+                            seenAt = null, // TODO implement synonymdev/bitkit-ios#270 changes
                         )
                     )
                 }
diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/activity/ActivityDetailScreen.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/activity/ActivityDetailScreen.kt
@@ -780,6 +780,7 @@ private fun PreviewLightningSent() {
                     preimage = null,
                     createdAt = null,
                     updatedAt = null,
+                    seenAt = null,
                 )
             ),
             tags = listOf("Lunch", "Drinks"),
@@ -818,6 +819,7 @@ private fun PreviewOnchain() {
                     transferTxId = null,
                     createdAt = null,
                     updatedAt = null,
+                    seenAt = null,
                 )
             ),
             tags = emptyList(),
@@ -852,6 +854,7 @@ private fun PreviewSheetSmallScreen() {
                         preimage = null,
                         createdAt = null,
                         updatedAt = null,
+                        seenAt = null,
                     )
                 ),
                 tags = listOf("Lunch", "Drinks"),
diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/activity/ActivityExploreScreen.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/activity/ActivityExploreScreen.kt
@@ -340,6 +340,7 @@ private fun PreviewLightning() {
                     preimage = "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef",
                     createdAt = null,
                     updatedAt = null,
+                    seenAt = null,
                 ),
             ),
         )
@@ -371,6 +372,7 @@ private fun PreviewOnchain() {
                     transferTxId = null,
                     createdAt = null,
                     updatedAt = null,
+                    seenAt = null,
                 ),
             ),
         )
diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/activity/components/ActivityIcon.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/activity/components/ActivityIcon.kt
@@ -131,8 +131,8 @@ fun CircularIcon(
     icon: Painter,
     iconColor: Color,
     backgroundColor: Color,
-    size: Dp = 32.dp,
     modifier: Modifier = Modifier,
+    size: Dp = 32.dp,
 ) {
     Box(
         contentAlignment = Alignment.Center,
@@ -172,6 +172,7 @@ private fun Preview() {
                         preimage = null,
                         createdAt = null,
                         updatedAt = null,
+                        seenAt = null,
                     )
                 )
             )
@@ -191,6 +192,7 @@ private fun Preview() {
                         preimage = null,
                         createdAt = null,
                         updatedAt = null,
+                        seenAt = null,
                     )
                 )
             )
@@ -210,6 +212,7 @@ private fun Preview() {
                         preimage = null,
                         createdAt = null,
                         updatedAt = null,
+                        seenAt = null,
                     )
                 )
             )
@@ -236,6 +239,7 @@ private fun Preview() {
                         transferTxId = null,
                         createdAt = null,
                         updatedAt = null,
+                        seenAt = null,
                     )
                 )
             )
@@ -262,6 +266,7 @@ private fun Preview() {
                         transferTxId = null,
                         createdAt = null,
                         updatedAt = null,
+                        seenAt = null,
                     )
                 )
             )
@@ -288,6 +293,7 @@ private fun Preview() {
                         transferTxId = null,
                         createdAt = null,
                         updatedAt = null,
+                        seenAt = null,
                     )
                 )
             )
@@ -314,6 +320,7 @@ private fun Preview() {
                         transferTxId = "transferTxId",
                         createdAt = null,
                         updatedAt = null,
+                        seenAt = null,
                     )
                 )
             )
@@ -340,6 +347,7 @@ private fun Preview() {
                         transferTxId = "transferTxId",
                         createdAt = null,
                         updatedAt = null,
+                        seenAt = null,
                     )
                 )
             )
diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/activity/utils/PreviewItems.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/activity/utils/PreviewItems.kt
@@ -38,6 +38,7 @@ val previewActivityItems = buildList {
                 transferTxId = "transferTxId",
                 createdAt = today.epochSecond() - 30_000u,
                 updatedAt = today.epochSecond(),
+                seenAt = null,
             )
         )
     )
@@ -57,6 +58,7 @@ val previewActivityItems = buildList {
                 preimage = "preimage1",
                 createdAt = yesterday.epochSecond(),
                 updatedAt = yesterday.epochSecond(),
+                seenAt = null,
             )
         )
     )
@@ -76,6 +78,7 @@ val previewActivityItems = buildList {
                 preimage = "preimage2",
                 createdAt = thisWeek.epochSecond(),
                 updatedAt = thisWeek.epochSecond(),
+                seenAt = null,
             )
         )
     )
@@ -102,6 +105,7 @@ val previewActivityItems = buildList {
                 transferTxId = "transferTxId",
                 createdAt = thisMonth.epochSecond(),
                 updatedAt = thisMonth.epochSecond(),
+                seenAt = null,
             )
         )
     )
@@ -121,6 +125,7 @@ val previewActivityItems = buildList {
                 preimage = null,
                 createdAt = lastYear.epochSecond(),
                 updatedAt = lastYear.epochSecond(),
+                seenAt = null,
             )
         )
     )
diff --git a/app/src/main/java/to/bitkit/ui/sheets/GiftViewModel.kt b/app/src/main/java/to/bitkit/ui/sheets/GiftViewModel.kt
@@ -110,6 +110,7 @@ class GiftViewModel @Inject constructor(
             preimage = null,
             createdAt = nowTimestamp,
             updatedAt = null,
+            seenAt = null,
         )
 
         activityRepo.insertActivity(Activity.Lightning(lightningActivity)).getOrThrow()
diff --git a/app/src/test/java/to/bitkit/repositories/ActivityRepoTest.kt b/app/src/test/java/to/bitkit/repositories/ActivityRepoTest.kt
@@ -76,7 +76,8 @@ class ActivityRepoTest : BaseUnitTest() {
         channelId = null,
         transferTxId = null,
         createdAt = null,
-        updatedAt = null
+        updatedAt = null,
+        seenAt = null,
     )
 
     @Suppress("LongParameterList")
diff --git a/app/src/test/java/to/bitkit/ui/sheets/BoostTransactionViewModelTest.kt b/app/src/test/java/to/bitkit/ui/sheets/BoostTransactionViewModelTest.kt
@@ -58,7 +58,8 @@ class BoostTransactionViewModelTest : BaseUnitTest() {
         channelId = null,
         transferTxId = null,
         createdAt = null,
-        updatedAt = null
+        updatedAt = null,
+        seenAt = null,
     )
 
     private val mockActivitySent = Activity.Onchain(v1 = mockOnchainActivity)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -19,7 +19,7 @@ activity-compose = { module = "androidx.activity:activity-compose", version = "1
 appcompat = { module = "androidx.appcompat:appcompat", version = "1.7.1" }
 barcode-scanning = { module = "com.google.mlkit:barcode-scanning", version = "17.3.0" }
 biometric = { module = "androidx.biometric:biometric", version = "1.4.0-alpha04" }
-bitkit-core = { module = "com.synonym:bitkit-core-android", version = "0.1.31" }
+bitkit-core = { module = "com.synonym:bitkit-core-android", version = "0.1.33" }
 bouncycastle-provider-jdk = { module = "org.bouncycastle:bcprov-jdk18on", version = "1.83" }
 camera-camera2 = { module = "androidx.camera:camera-camera2", version.ref = "camera" }
 camera-lifecycle = { module = "androidx.camera:camera-lifecycle", version.ref = "camera" }
@@ -57,9 +57,7 @@ ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
 ktor-client-logging = { module = "io.ktor:ktor-client-logging", version.ref = "ktor" }
 ktor-client-okhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktor" }
 ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" }
-#ldk-node-android = { module = "org.lightningdevkit:ldk-node-android", version = "0.7.0" } # upstream
-#ldk-node-android = { module = "org.lightningdevkit:ldk-node-android", version = "0.7.0-rc.1" } # local
-ldk-node-android = { module = "com.github.synonymdev:ldk-node", version = "v0.7.0-rc.1" } # fork
+ldk-node-android = { module = "com.github.synonymdev:ldk-node", version = "v0.7.0-rc.1" } # fork | local: remove `v`
 lifecycle-process = { group = "androidx.lifecycle", name = "lifecycle-process", version.ref = "lifecycle" }
 lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "lifecycle" }
 lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle" }

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@ import com.android.build.gradle.internal.api.BaseVariantOutputImpl`
`2`	`2`	`import io.gitlab.arturbosch.detekt.Detekt`
`3`	`3`	`import org.gradle.api.tasks.testing.logging.TestExceptionFormat`
`4`	`4`	`import org.gradle.api.tasks.testing.logging.TestLogEvent`
`5`		`-import org.jetbrains.kotlin.compose.compiler.gradle.ComposeFeatureFlag`
`6`	`5`	`import org.jetbrains.kotlin.gradle.dsl.JvmTarget`
`7`	`6`	`import java.io.FileInputStream`
`8`	`7`	`import java.util.Properties`
`@@ -176,7 +175,6 @@ android {`
`176`	`175`
`177`	`176`	`composeCompiler {`
`178`	`177`	`featureFlags = setOf(`
`179`		`- ComposeFeatureFlag.OptimizeNonSkippingGroups,`
`180`	`178`	`)`
`181`	`179`	`reportsDestination = layout.buildDirectory.dir("compose_compiler")`
`182`	`180`	`}`
Original file line number	Diff line number	Diff line change
`@@ -529,6 +529,7 @@ class ActivityRepo @Inject constructor(`
`529`	`529`	`preimage = null,`
`530`	`530`	`createdAt = now,`
`531`	`531`	`updatedAt = null,`
	`532`	`+ seenAt = null, // TODO implement synonymdev/bitkit-ios#270 changes`
`532`	`533`	`)`
`533`	`534`	`)`
`534`	`535`	`)`
Original file line number	Diff line number	Diff line change
`@@ -485,6 +485,7 @@ class ActivityService(`
`485`	`485`	`preimage = kind.preimage,`
`486`	`486`	`createdAt = payment.latestUpdateTimestamp,`
`487`	`487`	`updatedAt = payment.latestUpdateTimestamp,`
	`488`	`+ seenAt = null, // TODO implement synonymdev/bitkit-ios#270 changes`
`488`	`489`	`)`
`489`	`490`	`}`
`490`	`491`
`@@ -616,6 +617,7 @@ class ActivityService(`
`616`	`617`	`transferTxId = null,`
`617`	`618`	`createdAt = confirmationData.timestamp,`
`618`	`619`	`updatedAt = confirmationData.timestamp,`
	`620`	`+ seenAt = null, // TODO implement synonymdev/bitkit-ios#270 changes`
`619`	`621`	`)`
`620`	`622`	`}`
`621`	`623`
`@@ -737,7 +739,8 @@ class ActivityService(`
`737`	`739`	`timestamp = txTimestamp,`
`738`	`740`	`preimage = if (Random.nextBoolean()) "preimage$i" else null,`
`739`	`741`	`createdAt = txTimestamp,`
`740`		`- updatedAt = txTimestamp`
	`742`	`+ updatedAt = txTimestamp,`
	`743`	`+ seenAt = null, // TODO implement synonymdev/bitkit-ios#270 changes`
`741`	`744`	`)`
`742`	`745`	`)`
`743`	`746`	`} else {`
`@@ -762,6 +765,7 @@ class ActivityService(`
`762`	`765`	`transferTxId = null,`
`763`	`766`	`createdAt = txTimestamp,`
`764`	`767`	`updatedAt = txTimestamp,`
	`768`	`+ seenAt = null, // TODO implement synonymdev/bitkit-ios#270 changes`
`765`	`769`	`)`
`766`	`770`	`)`
`767`	`771`	`}`
Original file line number	Diff line number	Diff line change
`@@ -131,8 +131,8 @@ fun CircularIcon(`
`131`	`131`	`icon: Painter,`
`132`	`132`	`iconColor: Color,`
`133`	`133`	`backgroundColor: Color,`
`134`		`- size: Dp = 32.dp,`
`135`	`134`	`modifier: Modifier = Modifier,`
	`135`	`+ size: Dp = 32.dp,`
`136`	`136`	`) {`
`137`	`137`	`Box(`
`138`	`138`	`contentAlignment = Alignment.Center,`
`@@ -172,6 +172,7 @@ private fun Preview() {`
`172`	`172`	`preimage = null,`
`173`	`173`	`createdAt = null,`
`174`	`174`	`updatedAt = null,`
	`175`	`+ seenAt = null,`
`175`	`176`	`)`
`176`	`177`	`)`
`177`	`178`	`)`
`@@ -191,6 +192,7 @@ private fun Preview() {`
`191`	`192`	`preimage = null,`
`192`	`193`	`createdAt = null,`
`193`	`194`	`updatedAt = null,`
	`195`	`+ seenAt = null,`
`194`	`196`	`)`
`195`	`197`	`)`
`196`	`198`	`)`
`@@ -210,6 +212,7 @@ private fun Preview() {`
`210`	`212`	`preimage = null,`
`211`	`213`	`createdAt = null,`
`212`	`214`	`updatedAt = null,`
	`215`	`+ seenAt = null,`
`213`	`216`	`)`
`214`	`217`	`)`
`215`	`218`	`)`
`@@ -236,6 +239,7 @@ private fun Preview() {`
`236`	`239`	`transferTxId = null,`
`237`	`240`	`createdAt = null,`
`238`	`241`	`updatedAt = null,`
	`242`	`+ seenAt = null,`
`239`	`243`	`)`
`240`	`244`	`)`
`241`	`245`	`)`
`@@ -262,6 +266,7 @@ private fun Preview() {`
`262`	`266`	`transferTxId = null,`
`263`	`267`	`createdAt = null,`
`264`	`268`	`updatedAt = null,`
	`269`	`+ seenAt = null,`
`265`	`270`	`)`
`266`	`271`	`)`
`267`	`272`	`)`
`@@ -288,6 +293,7 @@ private fun Preview() {`
`288`	`293`	`transferTxId = null,`
`289`	`294`	`createdAt = null,`
`290`	`295`	`updatedAt = null,`
	`296`	`+ seenAt = null,`
`291`	`297`	`)`
`292`	`298`	`)`
`293`	`299`	`)`
`@@ -314,6 +320,7 @@ private fun Preview() {`
`314`	`320`	`transferTxId = "transferTxId",`
`315`	`321`	`createdAt = null,`
`316`	`322`	`updatedAt = null,`
	`323`	`+ seenAt = null,`
`317`	`324`	`)`
`318`	`325`	`)`
`319`	`326`	`)`
`@@ -340,6 +347,7 @@ private fun Preview() {`
`340`	`347`	`transferTxId = "transferTxId",`
`341`	`348`	`createdAt = null,`
`342`	`349`	`updatedAt = null,`
	`350`	`+ seenAt = null,`
`343`	`351`	`)`
`344`	`352`	`)`
`345`	`353`	`)`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ val previewActivityItems = buildList {`
`38`	`38`	`transferTxId = "transferTxId",`
`39`	`39`	`createdAt = today.epochSecond() - 30_000u,`
`40`	`40`	`updatedAt = today.epochSecond(),`
	`41`	`+ seenAt = null,`
`41`	`42`	`)`
`42`	`43`	`)`
`43`	`44`	`)`
`@@ -57,6 +58,7 @@ val previewActivityItems = buildList {`
`57`	`58`	`preimage = "preimage1",`
`58`	`59`	`createdAt = yesterday.epochSecond(),`
`59`	`60`	`updatedAt = yesterday.epochSecond(),`
	`61`	`+ seenAt = null,`
`60`	`62`	`)`
`61`	`63`	`)`
`62`	`64`	`)`
`@@ -76,6 +78,7 @@ val previewActivityItems = buildList {`
`76`	`78`	`preimage = "preimage2",`
`77`	`79`	`createdAt = thisWeek.epochSecond(),`
`78`	`80`	`updatedAt = thisWeek.epochSecond(),`
	`81`	`+ seenAt = null,`
`79`	`82`	`)`
`80`	`83`	`)`
`81`	`84`	`)`
`@@ -102,6 +105,7 @@ val previewActivityItems = buildList {`
`102`	`105`	`transferTxId = "transferTxId",`
`103`	`106`	`createdAt = thisMonth.epochSecond(),`
`104`	`107`	`updatedAt = thisMonth.epochSecond(),`
	`108`	`+ seenAt = null,`
`105`	`109`	`)`
`106`	`110`	`)`
`107`	`111`	`)`
`@@ -121,6 +125,7 @@ val previewActivityItems = buildList {`
`121`	`125`	`preimage = null,`
`122`	`126`	`createdAt = lastYear.epochSecond(),`
`123`	`127`	`updatedAt = lastYear.epochSecond(),`
	`128`	`+ seenAt = null,`
`124`	`129`	`)`
`125`	`130`	`)`
`126`	`131`	`)`
Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,7 @@ class GiftViewModel @Inject constructor(`
`110`	`110`	`preimage = null,`
`111`	`111`	`createdAt = nowTimestamp,`
`112`	`112`	`updatedAt = null,`
	`113`	`+ seenAt = null,`
`113`	`114`	`)`
`114`	`115`
`115`	`116`	`activityRepo.insertActivity(Activity.Lightning(lightningActivity)).getOrThrow()`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,8 @@ class ActivityRepoTest : BaseUnitTest() {`
`76`	`76`	`channelId = null,`
`77`	`77`	`transferTxId = null,`
`78`	`78`	`createdAt = null,`
`79`		`- updatedAt = null`
	`79`	`+ updatedAt = null,`
	`80`	`+ seenAt = null,`
`80`	`81`	`)`
`81`	`82`
`82`	`83`	`@Suppress("LongParameterList")`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,8 @@ class BoostTransactionViewModelTest : BaseUnitTest() {`
`58`	`58`	`channelId = null,`
`59`	`59`	`transferTxId = null,`
`60`	`60`	`createdAt = null,`
`61`		`- updatedAt = null`
	`61`	`+ updatedAt = null,`
	`62`	`+ seenAt = null,`
`62`	`63`	`)`
`63`	`64`
`64`	`65`	`private val mockActivitySent = Activity.Onchain(v1 = mockOnchainActivity)`