Merge pull request #492 from splendo/release/0.3.0

Release/0.3.0

.gitignore

@@ -18,6 +18,7 @@ build/
 DerivedData/
 .gradle/
 /kotlin-js-store/
+**/kotlin-js-store/
 
 ## Various settings
 *.pbxuser

README.md

@@ -142,7 +142,7 @@ Kaluga also uses some multiplatform libraries itself, so our thanks to:
 
 Project | Usage
 --- | ---
-[kydra](https://github.com/PocketByte/kotlin-kydra-log) | powers the logging module
+[Napier](https://github.com/AAkira/Napier) | powers the logging module
 [stately](https://github.com/touchlab/Stately) | concurrency
 [Koin](https://insert-koin.io/) | dependency injection
 

architecture/build.gradle.kts

@@ -36,14 +36,6 @@ kotlin {
         val ext = (gradle as ExtensionAware).extra
         val serialization_version: String by ext
 
-        // For IDE
-        val ios_primary_arch: String by ext
-        getByName("${ios_primary_arch}Main") {
-            dependencies {
-                api(project(":base", ""))
-            }
-        }
-
         getByName("commonMain") {
             dependencies {
                 implementation(project(":base", ""))

architecture/src/iosArm64Main/kotlin/SetMessageWorkAround.kt

@@ -0,0 +1,22 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.architecture.navigation
+
+import platform.MessageUI.MFMessageComposeViewController
+
+actual fun MFMessageComposeViewController.setMessageWorkAround(message: platform.Messages.MSMessage?) = this.setMessage(message)

architecture/src/iosMain/kotlin/navigation/Navigator.kt

@@ -260,7 +260,7 @@ class ViewControllerNavigator<A : NavigationAction<*>>(
             }
         }
         settings.body?.let { composeVC.setBody(it) }
-        settings.message?.let { composeVC.setMessage(it) }
+        settings.message?.let { composeVC.setMessageWorkAround(it) }
 
         if (MFMessageComposeViewController.canSendAttachments()) {
             settings.attachments.forEach {
@@ -352,3 +352,6 @@ class ViewControllerNavigator<A : NavigationAction<*>>(
 
     private fun assertParent() = parent.get().also { assert(it != null) }
 }
+
+// Seems to be a bug on commonizer using new targets sourcesets which is preventing to infer the correct type
+expect fun MFMessageComposeViewController.setMessageWorkAround(message: platform.Messages.MSMessage?)

architecture/src/iosSimulatorArm64Main/kotlin/SetMessageWorkAround.kt

@@ -0,0 +1,22 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.architecture.navigation
+
+import platform.MessageUI.MFMessageComposeViewController
+
+actual fun MFMessageComposeViewController.setMessageWorkAround(message: platform.Messages.MSMessage?) = this.setMessage(message)

architecture/src/iosX64Main/kotlin/SetMessageWorkAround.kt

@@ -0,0 +1,22 @@
+/*
+ Copyright 2022 Splendo Consulting B.V. The Netherlands
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+ */
+
+package com.splendo.kaluga.architecture.navigation
+
+import platform.MessageUI.MFMessageComposeViewController
+
+actual fun MFMessageComposeViewController.setMessageWorkAround(message: platform.Messages.MSMessage?) = this.setMessage(message)

base-permissions/src/commonMain/kotlin/PermissionState.kt

@@ -91,12 +91,12 @@ abstract class PermissionStateRepo<P : Permission>(
     initChangeStateWithRepo = { state, repo ->
         val pm = (repo as PermissionStateRepo<P>).permissionManager
         pm.startMonitoring(monitoringInterval)
-        if (state == null || state is PermissionState.Unknown<P>)
+        if (state is PermissionState.Unknown<P>)
             suspend { pm.initializeState() }
         else
             suspend { state }
     },
-    deinitChangeStateWithRepo = { state, repo ->
+    deinitChangeStateWithRepo = { _, repo ->
         (repo as PermissionStateRepo<P>).permissionManager.stopMonitoring() // TODO: could also be replaced by a state
         null
     },

base/src/commonMain/kotlin/state/State.kt

@@ -414,9 +414,9 @@ abstract class BaseColdStateRepo<S : State, F : MutableSharedFlow<S>>(
  */
 open class ColdStateFlowRepo<S : State>(
     coroutineContext: CoroutineContext = Dispatchers.Main.immediate,
-    val initChangeStateWithRepo: suspend (S?, ColdStateFlowRepo<S>) -> (suspend () -> S),
+    val initChangeStateWithRepo: suspend (S, ColdStateFlowRepo<S>) -> (suspend () -> S),
     val deinitChangeStateWithRepo: suspend (S, ColdStateFlowRepo<S>) -> (suspend () -> S)?,
-    val firstState: (suspend() -> S)? = null
+    val firstState: () -> S
 ) : StateFlowRepo<S>,
     BaseColdStateRepo<S, MutableStateFlow<S>>(
         context = coroutineContext,
@@ -425,12 +425,12 @@ open class ColdStateFlowRepo<S : State>(
     constructor(
         coroutineContext: CoroutineContext = Dispatchers.Main.immediate,
         // order is different than below because here firstState is mandatory, and to avoid JVM signature clashes
-        firstState: suspend() -> S,
+        firstState: () -> S,
         initChangeState: suspend (S) -> (suspend () -> S),
         deinitChangeState: suspend (S) -> (suspend () -> S)
     ) : this(
         coroutineContext,
-        initChangeStateWithRepo = { state, _ -> state?.let { initChangeState(state) } ?: firstState },
+        initChangeStateWithRepo = { state, _ -> initChangeState(state) },
         deinitChangeStateWithRepo = { state, _ -> deinitChangeState(state) },
         firstState = firstState
     )
@@ -439,7 +439,7 @@ open class ColdStateFlowRepo<S : State>(
         coroutineContext: CoroutineContext = Dispatchers.Main.immediate,
         init: suspend (ColdStateFlowRepo<S>) -> S,
         deinit: suspend (ColdStateFlowRepo<S>) -> S?,
-        firstState: (suspend() -> S)? = null
+        firstState: () -> S
     ) : this(
         coroutineContext,
         initChangeStateWithRepo = { _, repo -> { init(repo) } },
@@ -459,11 +459,9 @@ open class ColdStateFlowRepo<S : State>(
 
     override val lazyMutableFlow: Lazy<MutableStateFlow<S>> =
         lazy {
-            runBlocking {
-                MutableStateFlow(
-                    firstState?.invoke() ?: initChangeStateWithRepo(null, this@ColdStateFlowRepo)()
-                )
-            }
+            MutableStateFlow(
+                firstState()
+            )
         }
 
     override suspend fun firstCollection() {

base/src/iosMain/kotlin/text/DateFormatter.kt

@@ -76,11 +76,21 @@ actual class DateFormatter private constructor(private val format: NSDateFormatt
             }
         )
 
-        private fun defaultDate(timeZone: TimeZone) = Date.now(timeZone = timeZone).apply {
+        // Due to a problem related to the commonizer we need to supply all the
+        // default arguments expected from the method signature
+        private fun defaultDate(timeZone: TimeZone) = Date.now(
+            offsetInMilliseconds = 0L,
+            timeZone = timeZone,
+            locale = Locale.defaultLocale
+        ).apply {
             // Cannot use .utc since it may not be available when this method is called
             // This is likely caused by https://youtrack.jetbrains.com/issue/KT-38181
             // TODO When moving Date and Date formatter to separate modules, this should be updated to use .utc
-            val epoch = Date.epoch(timeZone = TimeZone.get("UTC")!!)
+            val epoch = Date.epoch(
+                offsetInMilliseconds = 0L,
+                timeZone = TimeZone.get("UTC")!!,
+                locale = Locale.defaultLocale
+            )
             this.era = epoch.era
             this.year = epoch.year
             this.month = epoch.month

beacons/src/commonMain/kotlin/Beacons.kt

@@ -95,7 +95,7 @@ class Beacons(
             }
             cache[beacon.beaconID] = beacon to coroutineScope.launch {
                 debug(TAG, "[Added] $beacon")
-                delay(timeoutMs)
+                delay(beacon.lastSeen.millisecondSinceEpoch + timeoutMs - Date.now().millisecondSinceEpoch)
                 debug(TAG, "[Lost] $beacon")
                 cache.remove(beacon.beaconID)
                 updateList()

bluetooth/src/androidLibMain/kotlin/Characteristic.kt

@@ -28,7 +28,7 @@ actual interface CharacteristicWrapper {
     val service: ServiceWrapper
     actual val descriptors: List<DescriptorWrapper>
     val permissions: Int
-    val properties: Int
+    actual val properties: Int
     var writeType: Int
 
     fun setValue(newValue: String): Boolean
@@ -40,12 +40,6 @@ actual interface CharacteristicWrapper {
     fun intValue(formatType: Int, offset: Int): Int
 }
 
-fun CharacteristicWrapper.containsAnyOf(vararg property: Int) =
-    if (property.count() > 0)
-        properties and property.reduce { acc, i -> acc.or(i) } != 0
-    else
-        false
-
 class DefaultCharacteristicWrapper(private val gattCharacteristic: BluetoothGattCharacteristic) : CharacteristicWrapper {
 
     override val uuid: java.util.UUID

bluetooth/src/androidLibMain/kotlin/device/BluetoothGattWrapper.kt

@@ -29,6 +29,8 @@ interface BluetoothGattWrapper {
     fun disconnect()
     fun close()
     fun readRemoteRssi(): Boolean
+    /** Request MTU, returns `true` if the new MTU value has been requested successfully */
+    fun requestMtu(mtu: Int): Boolean
 
     fun readCharacteristic(wrapper: CharacteristicWrapper): Boolean
     fun readDescriptor(wrapper: DescriptorWrapper): Boolean
@@ -59,6 +61,10 @@ class DefaultBluetoothGattWrapper(private val gatt: BluetoothGatt) : BluetoothGa
         return gatt.readRemoteRssi()
     }
 
+    override fun requestMtu(mtu: Int): Boolean {
+        return gatt.requestMtu(mtu)
+    }
+
     override fun readCharacteristic(wrapper: CharacteristicWrapper): Boolean {
         val characteristic = getCharacteristic(wrapper) ?: return false
         return gatt.readCharacteristic(characteristic)

bluetooth/src/androidLibMain/kotlin/device/DeviceConnectionManager.kt

@@ -35,6 +35,7 @@ import com.splendo.kaluga.bluetooth.Service
 import com.splendo.kaluga.bluetooth.UUID
 import com.splendo.kaluga.bluetooth.containsAnyOf
 import com.splendo.kaluga.bluetooth.uuidString
+import com.splendo.kaluga.logging.debug
 import com.splendo.kaluga.logging.warn
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
@@ -78,6 +79,13 @@ internal actual class DeviceConnectionManager(
             }
         }
 
+        override fun onMtuChanged(gatt: BluetoothGatt?, mtu: Int, status: Int) {
+            debug(TAG) { "onMtuChanged($gatt, $mtu, $status)" }
+            if (status == GATT_SUCCESS) {
+                handleNewMtu(mtu)
+            }
+        }
+
         override fun onCharacteristicRead(gatt: BluetoothGatt?, characteristic: BluetoothGattCharacteristic?, status: Int) {
             characteristic ?: return
             updateCharacteristic(characteristic, status)
@@ -178,6 +186,10 @@ internal actual class DeviceConnectionManager(
         gatt.await().readRemoteRssi()
     }
 
+    override suspend fun requestMtu(mtu: Int): Boolean {
+        return gatt.await().requestMtu(mtu)
+    }
+
     override suspend fun performAction(action: DeviceAction) {
         currentAction = action
         val succeeded = when (action) {