Swipe to delete

app/build.gradle.kts

@@ -54,7 +54,6 @@ dependencies {
     implementation(project(":feature:application-keys"))
     implementation(project(":feature:scenes"))
     implementation(project(":feature:provisioners"))
-    implementation(project(":feature:ranges"))
     implementation(project(":feature:export"))
     implementation(project(":mesh:core"))
     implementation(project(":mesh:provisioning"))

app/proguard-rules.pro

@@ -19,4 +19,6 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
--keep class no.nordicsemi.android.nrfmesh.core.navigation.ClickableSetting { *; }
+-keep class no.nordicsemi.android.nrfmesh.core.navigation.ClickableSetting { *; }
+-keep class no.nordicsemi.kotlin.mesh.** { *; }
+-dontwarn no.nordicsemi.kotlin.mesh.**

app/src/main/java/no/nordicsemi/android/nrfmesh/ui/network/NetworkRoute.kt

@@ -280,7 +280,7 @@ fun NetworkRoute(
                         keyboardOptions = KeyboardOptions(
                             capitalization = KeyboardCapitalization.Characters
                         ),
-                        regex = Regex("[0-9A-Fa-f]{0,4}"),
+                        regex = Regex("^[0-9A-Fa-f]{0,4}$"),
                         isError = isError,
                     )
                     Row(

core/common/src/main/java/no/nordicsemi/android/nrfmesh/core/common/Utils.kt

@@ -45,6 +45,9 @@ import no.nordicsemi.kotlin.mesh.core.exception.SceneInUse
 import no.nordicsemi.kotlin.mesh.core.exception.SecurityException
 import no.nordicsemi.kotlin.mesh.core.layers.access.AccessError
 import no.nordicsemi.kotlin.mesh.logger.LogLevel
+import kotlin.concurrent.atomics.AtomicLong
+import kotlin.concurrent.atomics.ExperimentalAtomicApi
+import kotlin.concurrent.atomics.incrementAndFetch
 
 /**
  * Helper object containing utility methods.
@@ -127,3 +130,15 @@ fun copyToClipboard(
         clipboard.setClipEntry(clipEntry = ClipEntry(clipData = clip))
     }
 }
+
+object KeyIdGenerator {
+    @OptIn(ExperimentalAtomicApi::class)
+    private val counter = AtomicLong(0)
+
+    /**
+     * Generates the next unique ID. This is a helper method used to generate unique IDs for keys in
+     * a LazyColumn
+     */
+    @OptIn(ExperimentalAtomicApi::class)
+    fun nextId() = counter.incrementAndFetch()
+}

core/data/src/main/java/no/nordicsemi/android/nrfmesh/core/data/CoreDataRepository.kt

@@ -229,7 +229,7 @@ class CoreDataRepository @Inject constructor(
      * @param boundNetworkKey Bound Network Key
      */
     fun addApplicationKey(
-        name: String = "Application Key ${meshNetwork.applicationKeys.size}",
+        name: String = "Application Key ${meshNetwork.applicationKeys.size + 1}",
         boundNetworkKey: NetworkKey,
     ): ApplicationKey = meshNetwork.add(
         name = name,

core/data/src/main/java/no/nordicsemi/android/nrfmesh/core/data/bearer/AndroidGattBearer.kt

@@ -22,8 +22,7 @@ class AndroidGattBearer(
     peripheral = peripheral
 ) {
     @OptIn(ExperimentalUuidApi::class)
-    override suspend fun open() {
-        super.open()
+    override suspend fun configurePeripheral(peripheral: Peripheral) {
         // Request highest connection parameters after connect in the super.open()
         peripheral.requestHighestValueLength()
     }

core/data/src/main/java/no/nordicsemi/android/nrfmesh/core/data/bearer/AndroidPbGattBearer.kt

@@ -22,9 +22,9 @@ class AndroidPbGattBearer(
     peripheral = peripheral
 ) {
     @OptIn(ExperimentalUuidApi::class)
-    override suspend fun open() {
-        super.open()
+    override suspend fun configurePeripheral(peripheral: Peripheral) {
         // Request highest connection parameters after connect in the super.open()
         peripheral.requestHighestValueLength()
+
     }
 }

core/data/src/main/java/no/nordicsemi/android/nrfmesh/core/data/models/ApplicationKeyData.kt

@@ -2,42 +2,44 @@
 
 package no.nordicsemi.android.nrfmesh.core.data.models
 
+import no.nordicsemi.android.nrfmesh.core.common.KeyIdGenerator
 import no.nordicsemi.kotlin.mesh.core.model.ApplicationKey
 import no.nordicsemi.kotlin.mesh.core.model.KeyIndex
-import no.nordicsemi.kotlin.mesh.core.model.NetworkKey
+import kotlin.uuid.ExperimentalUuidApi
 
 /**
  * Application Keys are used to secure communications at the upper transport layer.
  * The application key (AppKey) shall be generated using a random number generator
  * compatible with the requirements in Volume 2, Part H, Section 2 of the Core Specification [1].
  *
- * @property index              The index property contains an integer from 0 to 4095 that
- *                              represents the NetKey index for this network key.
  * @property name               Human-readable name for the application functionality associated
  *                              with this application key.
- * @property boundNetKeyIndex   The boundNetKey property contains a corresponding Network Key index
- *                              of the network key in the mesh network.
+ * @property index              The index property contains an integer from 0 to 4095 that
+ *                              represents the NetKey index for this network key.
  * @property key                128-bit application key.
  * @property oldKey             OldKey property contains the previous application key.
- * @property boundNetworkKey             Network key to which this application key is bound to.
- * @param    key               128-bit application key.
+ * @property boundNetKeyIndex   The boundNetKey property contains a corresponding Network Key index
+ *                              of the network key in the mesh network.
+ * @property isInUse            True if the application key is currently in use in the mesh network.
  */
+@OptIn(ExperimentalUuidApi::class)
 data class ApplicationKeyData(
     val name: String,
     val index: KeyIndex,
     val key: ByteArray,
     val oldKey: ByteArray? = null,
     val boundNetKeyIndex: KeyIndex,
-    val boundNetworkKey: NetworkKey?,
-    val isInUse: Boolean
+    val boundNetworkKeyName: String,
+    val isInUse: Boolean,
+    val id: Long = KeyIdGenerator.nextId()
 ) {
     constructor(key: ApplicationKey) : this(
         name = key.name,
         index = key.index,
         key = key.key,
         oldKey = key.oldKey,
-        boundNetKeyIndex = key.boundNetKeyIndex,
-        boundNetworkKey = key.boundNetworkKey,
+        boundNetKeyIndex = key.boundNetworkKey.index,
+        boundNetworkKeyName = key.boundNetworkKey.name,
         isInUse = key.isInUse
     )
 
@@ -55,7 +57,6 @@ data class ApplicationKeyData(
             if (!oldKey.contentEquals(other.oldKey)) return false
         } else if (other.oldKey != null) return false
         if (boundNetKeyIndex != other.boundNetKeyIndex) return false
-        if (boundNetworkKey != other.boundNetworkKey) return false
         if (isInUse != other.isInUse) return false
 
         return true
@@ -67,7 +68,6 @@ data class ApplicationKeyData(
         result = 31 * result + key.contentHashCode()
         result = 31 * result + (oldKey?.contentHashCode() ?: 0)
         result = 31 * result + boundNetKeyIndex.hashCode()
-        result = 31 * result + (boundNetworkKey?.hashCode() ?: 0)
         result = 31 * result + isInUse.hashCode()
         return result
     }

core/data/src/main/java/no/nordicsemi/android/nrfmesh/core/data/models/NetworkKeyData.kt

@@ -2,6 +2,7 @@
 
 package no.nordicsemi.android.nrfmesh.core.data.models
 
+import no.nordicsemi.android.nrfmesh.core.common.KeyIdGenerator
 import kotlin.time.Instant
 import no.nordicsemi.kotlin.mesh.core.model.KeyIndex
 import no.nordicsemi.kotlin.mesh.core.model.KeyRefreshPhase
@@ -56,7 +57,8 @@ data class NetworkKeyData internal constructor(
     val oldNetworkId: ByteArray?,
     val timestamp: Instant,
     val isPrimary: Boolean,
-    val isInUse: Boolean
+    val isInUse: Boolean,
+    val id: Long = KeyIdGenerator.nextId(),
 ) {
     /**
      * Convenience constructor for creating a new network key

core/data/src/main/java/no/nordicsemi/android/nrfmesh/core/data/models/NodeData.kt

@@ -140,7 +140,7 @@ data class NodeData internal constructor(
         excluded = node.excluded,
         heartbeatPublication = node.heartbeatPublication,
         heartbeatSubscription = node.heartbeatSubscription,
-        primaryElementData = node.primaryElement?.let { ElementData(it) },
+        primaryElementData = ElementData(node.primaryElement),
         elementsCount = node.elementsCount,
         addresses = node.addresses,
         unicastRange = node.unicastRange,

core/data/src/main/java/no/nordicsemi/android/nrfmesh/core/data/models/ProvisionerData.kt

@@ -1,5 +1,6 @@
 package no.nordicsemi.android.nrfmesh.core.data.models
 
+import no.nordicsemi.android.nrfmesh.core.common.KeyIdGenerator
 import no.nordicsemi.kotlin.mesh.core.model.GroupRange
 import no.nordicsemi.kotlin.mesh.core.model.Provisioner
 import no.nordicsemi.kotlin.mesh.core.model.SceneRange
@@ -10,6 +11,18 @@ import kotlin.uuid.Uuid
 
 /**
  * ProvisionerData is a data class that represents a Provisioner in the Mesh network.
+ *
+ * @param name                         Name of the provisioner.
+ * @param uuid                         UUID of the provisioner.
+ * @param address                      Unicast address of the provisioner.
+ * @param ttl                          Default TTL value for the provisioner.
+ * @param deviceKey                    Device key of the provisioner in hexadecimal string format.
+ * @param unicastRanges                List of unicast address ranges allocated to the provisioner.
+ * @param groupRanges                  List of group address ranges allocated to the provisioner.
+ * @param sceneRanges                  List of scene ranges allocated to the provisioner.
+ * @param hasConfigurationCapabilities Indicates if the provisioner has configuration capabilities.
+ * @param id                           A unique identifier for the ProvisionerData instance.
+ *
  */
 @OptIn(ExperimentalUuidApi::class)
 data class ProvisionerData(
@@ -21,7 +34,8 @@ data class ProvisionerData(
     val unicastRanges: List<UnicastRange> = emptyList(),
     val groupRanges: List<GroupRange> = emptyList(),
     val sceneRanges: List<SceneRange> = emptyList(),
-    val hasConfigurationCapabilities: Boolean = false
+    val hasConfigurationCapabilities: Boolean = false,
+    val id: Long = KeyIdGenerator.nextId()
 ) {
     @OptIn(ExperimentalStdlibApi::class)
     constructor(provisioner: Provisioner) : this(

core/data/src/main/java/no/nordicsemi/android/nrfmesh/core/data/models/SceneData.kt

@@ -2,6 +2,7 @@
 
 package no.nordicsemi.android.nrfmesh.core.data.models
 
+import no.nordicsemi.android.nrfmesh.core.common.KeyIdGenerator
 import no.nordicsemi.kotlin.mesh.core.model.Scene
 import no.nordicsemi.kotlin.mesh.core.model.UnicastAddress
 
@@ -14,12 +15,14 @@ typealias SceneNumber = UShort
  * @property number        Scene number.
  * @property addresses     Addresses containing the scene.
  * @property isInUse       Defines whether the scene is in use by a node.
+ * @property id            Unique ID for the scene data.
  */
 data class SceneData(
     val name: String,
     val number: SceneNumber,
     val addresses: List<UnicastAddress>,
-    val isInUse: Boolean
+    val isInUse: Boolean,
+    val id: Long = KeyIdGenerator.nextId(),
 ) {
     constructor(scene: Scene) : this(
         name = scene.name,

core/ui/build.gradle.kts

@@ -27,7 +27,7 @@ dependencies {
     androidTestImplementation(libs.androidx.test.rules)
 
     implementation("androidx.compose.material3:material3:1.4.0")
-    implementation("androidx.compose.material3:material3-adaptive-navigation-suite-android:1.4.0")
+    implementation("androidx.compose.material3:material3-adaptive-navigation-suite:1.4.0")
     implementation("androidx.compose.material3.adaptive:adaptive:1.2.0")
     implementation("androidx.compose.material3.adaptive:adaptive-layout-android:1.2.0")
     implementation("androidx.compose.material3.adaptive:adaptive-navigation-android:1.2.0")

core/ui/src/main/java/no/nordicsemi/android/nrfmesh/core/ui/ElevatedCardItem.kt

@@ -110,7 +110,7 @@ private fun NonClickableElevatedCardItem(
             },
             title = title,
             subtitle = subtitle,
-            subtitleMaxLines =  subtitleMaxLines,
+            subtitleMaxLines = subtitleMaxLines,
             trailingComposable = titleAction
         )
         if (supportingText != null)
@@ -177,7 +177,7 @@ private fun ClickableElevatedCardItem(
             },
             title = title,
             subtitle = subtitle,
-            subtitleMaxLines =  subtitleMaxLines,
+            subtitleMaxLines = subtitleMaxLines,
             trailingComposable = titleAction
         )
         if (supportingText != null)
@@ -306,7 +306,8 @@ fun ElevatedCardItemTextField(
                                 content = {
                                     Icon(
                                         imageVector = Icons.Outlined.DeleteSweep,
-                                        contentDescription = null
+                                        contentDescription = null,
+                                        tint = MaterialTheme.colorScheme.primary
                                     )
                                 }
                             )
@@ -333,7 +334,7 @@ fun ElevatedCardItemTextField(
                                     Icon(
                                         imageVector = Icons.Outlined.Close,
                                         contentDescription = null,
-                                        tint = LocalContentColor.current.copy(alpha = 0.6f)
+                                        tint = MaterialTheme.colorScheme.primary
                                     )
                                 }
                             )
@@ -353,7 +354,7 @@ fun ElevatedCardItemTextField(
                                     Icon(
                                         imageVector = Icons.Outlined.Check,
                                         contentDescription = null,
-                                        tint = LocalContentColor.current.copy(alpha = 0.6f)
+                                        tint = MaterialTheme.colorScheme.primary
                                     )
                                 }
                             )
@@ -440,7 +441,8 @@ fun ElevatedCardItemHexTextField(
                                 content = {
                                     Icon(
                                         imageVector = Icons.Outlined.DeleteSweep,
-                                        contentDescription = null
+                                        contentDescription = null,
+                                        tint = MaterialTheme.colorScheme.primary
                                     )
                                 }
                             )
@@ -467,7 +469,7 @@ fun ElevatedCardItemHexTextField(
                                     Icon(
                                         imageVector = Icons.Outlined.Close,
                                         contentDescription = null,
-                                        tint = LocalContentColor.current.copy(alpha = 0.6f)
+                                        tint = MaterialTheme.colorScheme.primary
                                     )
                                 }
                             )
@@ -487,7 +489,7 @@ fun ElevatedCardItemHexTextField(
                                     Icon(
                                         imageVector = Icons.Outlined.Check,
                                         contentDescription = null,
-                                        tint = LocalContentColor.current.copy(alpha = 0.6f)
+                                        tint = MaterialTheme.colorScheme.primary
                                     )
                                 }
                             )

core/ui/src/main/java/no/nordicsemi/android/nrfmesh/core/ui/MeshOutlinedButton.kt

@@ -33,7 +33,7 @@ import androidx.compose.ui.unit.dp
 fun MeshOutlinedButton(
     modifier: Modifier = Modifier,
     isOnClickActionInProgress: Boolean = false,
-    buttonIcon: ImageVector? = null,
+    buttonIcon: ImageVector,
     buttonIconTint: Color? = null,
     text: String,
     textColor: Color = Color.Unspecified,
@@ -54,7 +54,7 @@ fun MeshOutlinedButton(
                     color = buttonIconTint ?: ProgressIndicatorDefaults.circularColor
                 )
             } else {
-                buttonIcon?.let {
+                buttonIcon.let {
                     Icon(
                         imageVector = it,
                         contentDescription = null,

core/ui/src/main/java/no/nordicsemi/android/nrfmesh/core/ui/MeshOutlinedTextFields.kt

@@ -53,7 +53,15 @@ fun MeshOutlinedTextField(
             enabled = enabled,
             prefix = prefix,
             value = value,
-            onValueChange = onValueChanged,
+            onValueChange = { value ->
+                regex?.let {
+                    if(it.matches(value.text)) {
+                        onValueChanged(value)
+                    }
+                } ?: run {
+                    onValueChanged(value)
+                }
+            },
             label = label,
             placeholder = placeholder,
             trailingIcon = internalTrailingIcon,