Merge branch 'master' into mainnet

evansmj · Jul 10, 2024 · 51ab0d2 · 51ab0d2
2 parents e924048 + ebf5681
commit 51ab0d2
Show file tree

Hide file tree

Showing 55 changed files with 1,073 additions and 463 deletions.
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -1,5 +1,5 @@
 object Versions {
-    const val lightningKmp = "1.7.0"
+    const val lightningKmp = "1.7.1"
     const val secp256k1 = "0.14.0"
     const val torMobile = "0.2.0"
 

diff --git a/phoenix-android/build.gradle.kts b/phoenix-android/build.gradle.kts
@@ -25,8 +25,8 @@ android {
         applicationId = "fr.acinq.phoenix.mainnet"
         minSdk = 26
         targetSdk = 34
-        versionCode = 82
-        versionName = "2.3.1"
+        versionCode = 83
+        versionName = gitCommitHash()
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         resourceConfigurations.addAll(listOf("en", "fr", "de", "es", "b+es+419", "cs", "pt-rBR", "sk", "vi"))
     }

diff --git a/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/AppView.kt b/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/AppView.kt
@@ -478,6 +478,9 @@ fun AppView(
                 composable(Screen.Contacts.route) {
                     SettingsContactsView(onBackClick = { navController.popBackStack() })
                 }
+                composable(Screen.Experimental.route) {
+                    ExperimentalView(onBackClick = { navController.popBackStack() })
+                }
             }
         }
     }

diff --git a/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/Navigation.kt b/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/Navigation.kt
@@ -67,6 +67,7 @@ sealed class Screen(val route: String) {
     data object Notifications: Screen("notifications")
     data object Contacts: Screen("settings/contacts")
     data object ResetWallet: Screen("settings/resetwallet")
+    data object Experimental: Screen("settings/experimental")
 }
 
 fun NavController.navigate(screen: Screen, arg: List<Any> = emptyList(), builder: NavOptionsBuilder.() -> Unit = {}) {

diff --git a/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/components/Settings.kt b/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/components/Settings.kt
diff --git a/...android/src/main/kotlin/fr/acinq/phoenix/android/components/contact/ContactCompactView.kt b/...android/src/main/kotlin/fr/acinq/phoenix/android/components/contact/ContactCompactView.kt
@@ -58,7 +58,7 @@ fun ContactCompactView(
 
     SplashClickableContent(onClick = { showSheet = true }) {
         Row(verticalAlignment = Alignment.CenterVertically) {
-            ContactPhotoView(photoUri = contact.photoUri, name = contact.name, onChange = null, imageSize = 28.dp, borderSize = 2.dp)
+            ContactPhotoView(photoUri = contact.photoUri, name = contact.name, onChange = null, imageSize = 28.dp)
             Spacer(modifier = Modifier.width(8.dp))
             Text(text = contact.name, maxLines = 1, overflow = TextOverflow.Ellipsis)
         }

diff --git a/...android/src/main/kotlin/fr/acinq/phoenix/android/components/contact/ContactDetailsView.kt b/...android/src/main/kotlin/fr/acinq/phoenix/android/components/contact/ContactDetailsView.kt
@@ -105,9 +105,9 @@ fun ContactDetailsView(
                 horizontalAlignment = Alignment.CenterHorizontally,
             ) {
                 if (onContactChange != null) {
-                    ContactPhotoView(photoUri = photoUri, name = contact.name, onChange = { photoUri = it })
+                    ContactPhotoView(photoUri = photoUri, name = contact.name, onChange = { photoUri = it }, borderSize = 4.dp)
                 } else {
-                    ContactPhotoView(photoUri = photoUri, name = contact.name, onChange = null)
+                    ContactPhotoView(photoUri = photoUri, name = contact.name, onChange = null, borderSize = 4.dp)
                 }
                 Spacer(modifier = Modifier.height(24.dp))
                 TextInput(