Fixed expect/actuals

alerts/src/androidLibMain/kotlin/AlertPresenter.kt

@@ -42,7 +42,7 @@ import kotlinx.coroutines.launch
  * @param coroutineScope The [CoroutineScope] managing changes to the alert presentation.
  */
 actual class AlertPresenter(
-    private val alert: Alert,
+    alert: Alert,
     private val lifecycleManagerObserver: LifecycleManagerObserver = LifecycleManagerObserver(),
     coroutineScope: CoroutineScope,
     logger: Logger,
@@ -109,11 +109,11 @@ actual class AlertPresenter(
         }
     }
 
-    override fun dismissAlert(animated: Boolean) {
+    actual override fun dismissAlert(animated: Boolean) {
         presentation.value = DialogPresentation.Hidden
     }
 
-    override fun showAlert(animated: Boolean, afterHandler: (Alert.Action?) -> Unit, completion: () -> Unit) {
+    actual override fun showAlert(animated: Boolean, afterHandler: (Alert.Action?) -> Unit, completion: () -> Unit) {
         presentation.value = DialogPresentation.Showing(animated, afterHandler, completion)
     }
 

alerts/src/commonMain/kotlin/Alerts.kt

@@ -294,7 +294,7 @@ interface AlertActions {
  * @param alert The [Alert] to present (and dismiss if needed)
  * @param logger The [Logger] to log alert actions to
  */
-abstract class BaseAlertPresenter(private val alert: Alert, private val logger: Logger) : AlertActions {
+abstract class BaseAlertPresenter(protected val alert: Alert, private val logger: Logger) : AlertActions {
 
     companion object {
         const val TAG = "AlertDialog"
@@ -378,6 +378,9 @@ expect class AlertPresenter : BaseAlertPresenter {
          */
         override fun create(alert: Alert, logger: Logger, coroutineScope: CoroutineScope): AlertPresenter
     }
+
+    override fun showAlert(animated: Boolean, afterHandler: (Alert.Action?) -> Unit, completion: () -> Unit)
+    override fun dismissAlert(animated: Boolean)
 }
 
 /**

alerts/src/iosMain/kotlin/AlertPresenter.kt

@@ -50,7 +50,7 @@ import platform.objc.sel_registerName
  * This allows for presentation of [Alert.Style.ACTION_LIST] on iPad.
  */
 actual class AlertPresenter(
-    private val alert: Alert,
+    alert: Alert,
     private val parent: UIViewController,
     logger: Logger,
     private val delegateBuilder: (Alert) -> UIPopoverPresentationControllerDelegateProtocol,
@@ -133,11 +133,11 @@ actual class AlertPresenter(
         }
     }
 
-    override fun dismissAlert(animated: Boolean) {
+    actual override fun dismissAlert(animated: Boolean) {
         parent.dismissModalViewControllerAnimated(animated)
     }
 
-    override fun showAlert(animated: Boolean, afterHandler: (Alert.Action?) -> Unit, completion: () -> Unit) {
+    actual override fun showAlert(animated: Boolean, afterHandler: (Alert.Action?) -> Unit, completion: () -> Unit) {
         UIAlertController.alertControllerWithTitle(
             alert.title,
             alert.message,

alerts/src/jsMain/kotlin/AlertPresenter.kt

@@ -63,11 +63,11 @@ actual class AlertPresenter(
         TODO("not implemented")
     }
 
-    override fun dismissAlert(animated: Boolean) {
+    actual override fun dismissAlert(animated: Boolean) {
         TODO("not implemented")
     }
 
-    override fun showAlert(animated: Boolean, afterHandler: (Alert.Action?) -> Unit, completion: () -> Unit) {
+    actual override fun showAlert(animated: Boolean, afterHandler: (Alert.Action?) -> Unit, completion: () -> Unit) {
         TODO("not implemented")
     }
 }

alerts/src/jvmMain/kotlin/AlertPresenter.kt

@@ -63,11 +63,11 @@ actual class AlertPresenter(
         TODO("not implemented")
     }
 
-    override fun dismissAlert(animated: Boolean) {
+    actual override fun dismissAlert(animated: Boolean) {
         TODO("not implemented")
     }
 
-    override fun showAlert(animated: Boolean, afterHandler: (Alert.Action?) -> Unit, completion: () -> Unit) {
+    actual override fun showAlert(animated: Boolean, afterHandler: (Alert.Action?) -> Unit, completion: () -> Unit) {
         TODO("not implemented")
     }
 }

bluetooth-permissions/src/androidLibMain/kotlin/BluetoothPermissionManager.kt

@@ -69,23 +69,23 @@ actual class DefaultBluetoothPermissionManager(
 
     private val supported: Boolean = bluetoothAdapter != null
 
-    override fun requestPermissionDidStart() {
+    actual override fun requestPermissionDidStart() {
         if (supported) {
             permissionsManager.requestPermissions()
         } else {
             logger.error(logTag) { "Bluetooth Not Supported" }
         }
     }
 
-    override fun monitoringDidStart(interval: Duration) {
+    actual override fun monitoringDidStart(interval: Duration) {
         if (supported) {
             permissionsManager.startMonitoring(interval)
         } else {
             permissionHandler.status(AndroidPermissionState.DENIED_DO_NOT_ASK)
         }
     }
 
-    override fun monitoringDidStop() {
+    actual override fun monitoringDidStop() {
         if (supported) {
             permissionsManager.stopMonitoring()
         }
@@ -108,7 +108,7 @@ actual class BluetoothPermissionManagerBuilder(
      */
     actual constructor(context: PermissionContext) : this(context, (context.context.getSystemService(Context.BLUETOOTH_SERVICE) as? BluetoothManager)?.adapter)
 
-    override fun create(settings: Settings, coroutineScope: CoroutineScope): BluetoothPermissionManager {
+    actual override fun create(settings: Settings, coroutineScope: CoroutineScope): BluetoothPermissionManager {
         return DefaultBluetoothPermissionManager(context.context, bluetoothAdapter, settings, coroutineScope)
     }
 }

bluetooth-permissions/src/commonMain/kotlin/BluetoothPermission.kt

@@ -36,7 +36,11 @@ typealias BluetoothPermissionManager = PermissionManager<BluetoothPermission>
 /**
  * The [BasePermissionManager] to use as a default for [BluetoothPermission]
  */
-expect class DefaultBluetoothPermissionManager : BasePermissionManager<BluetoothPermission>
+expect class DefaultBluetoothPermissionManager : BasePermissionManager<BluetoothPermission> {
+    override fun requestPermissionDidStart()
+    override fun monitoringDidStart(interval: Duration)
+    override fun monitoringDidStop()
+}
 
 /**
  * A [BasePermissionsBuilder] for [BluetoothPermission]
@@ -56,7 +60,9 @@ interface BaseBluetoothPermissionManagerBuilder : BasePermissionsBuilder<Bluetoo
  * A [BaseBluetoothPermissionManagerBuilder]
  * @param context the [PermissionContext] this permissions manager builder runs on
  */
-expect class BluetoothPermissionManagerBuilder(context: PermissionContext = defaultPermissionContext) : BaseBluetoothPermissionManagerBuilder
+expect class BluetoothPermissionManagerBuilder(context: PermissionContext = defaultPermissionContext) : BaseBluetoothPermissionManagerBuilder {
+    override fun create(settings: BasePermissionManager.Settings, coroutineScope: CoroutineScope): BluetoothPermissionManager
+}
 
 /**
  * A [PermissionStateRepo] for [BluetoothPermission]

bluetooth-permissions/src/iosMain/kotlin/BluetoothPermissionManager.kt

@@ -91,7 +91,7 @@ actual class DefaultBluetoothPermissionManager(
         timerHelper = PermissionRefreshScheduler(provider, permissionHandler, coroutineScope)
     }
 
-    override fun requestPermissionDidStart() {
+    actual override fun requestPermissionDidStart() {
         if (IOSPermissionsHelper.missingDeclarationsInPList(
                 bundle,
                 NS_BLUETOOTH_ALWAYS_USAGE_DESCRIPTION,
@@ -105,13 +105,13 @@ actual class DefaultBluetoothPermissionManager(
         }
     }
 
-    override fun monitoringDidStart(interval: Duration) {
+    actual override fun monitoringDidStart(interval: Duration) {
         val permissionHandler = permissionHandler
         permissionHandler.status(checkAuthorization())
         timerHelper.startMonitoring(interval)
     }
 
-    override fun monitoringDidStop() {
+    actual override fun monitoringDidStop() {
         timerHelper.stopMonitoring()
     }
 }
@@ -124,7 +124,7 @@ actual class BluetoothPermissionManagerBuilder actual constructor(
     private val context: PermissionContext,
 ) : BaseBluetoothPermissionManagerBuilder {
 
-    override fun create(settings: Settings, coroutineScope: CoroutineScope): BluetoothPermissionManager {
+    actual override fun create(settings: Settings, coroutineScope: CoroutineScope): BluetoothPermissionManager {
         return DefaultBluetoothPermissionManager(context, settings, coroutineScope)
     }
 }

bluetooth-permissions/src/jsMain/kotlin/BluetoothPermissionManager.kt

@@ -34,15 +34,15 @@ actual class DefaultBluetoothPermissionManager(
     coroutineScope: CoroutineScope,
 ) : BasePermissionManager<BluetoothPermission>(BluetoothPermission, settings, coroutineScope) {
 
-    override fun requestPermissionDidStart() {
+    actual override fun requestPermissionDidStart() {
         TODO("Not yet implemented")
     }
 
-    override fun monitoringDidStart(interval: Duration) {
+    actual override fun monitoringDidStart(interval: Duration) {
         TODO("Not yet implemented")
     }
 
-    override fun monitoringDidStop() {
+    actual override fun monitoringDidStop() {
         TODO("Not yet implemented")
     }
 }
@@ -53,7 +53,7 @@ actual class DefaultBluetoothPermissionManager(
  */
 actual class BluetoothPermissionManagerBuilder actual constructor(context: PermissionContext) : BaseBluetoothPermissionManagerBuilder {
 
-    override fun create(settings: Settings, coroutineScope: CoroutineScope): PermissionManager<BluetoothPermission> {
+    actual override fun create(settings: Settings, coroutineScope: CoroutineScope): PermissionManager<BluetoothPermission> {
         return DefaultBluetoothPermissionManager(settings, coroutineScope)
     }
 }

bluetooth-permissions/src/jvmMain/kotlin/BluetoothPermissionManager.kt

@@ -34,15 +34,15 @@ actual class DefaultBluetoothPermissionManager(
     coroutineScope: CoroutineScope,
 ) : BasePermissionManager<BluetoothPermission>(BluetoothPermission, settings, coroutineScope) {
 
-    override fun requestPermissionDidStart() {
+    actual override fun requestPermissionDidStart() {
         TODO("Not yet implemented")
     }
 
-    override fun monitoringDidStart(interval: Duration) {
+    actual override fun monitoringDidStart(interval: Duration) {
         TODO("Not yet implemented")
     }
 
-    override fun monitoringDidStop() {
+    actual override fun monitoringDidStop() {
         TODO("Not yet implemented")
     }
 }
@@ -53,7 +53,7 @@ actual class DefaultBluetoothPermissionManager(
  */
 actual class BluetoothPermissionManagerBuilder actual constructor(context: PermissionContext) : BaseBluetoothPermissionManagerBuilder {
 
-    override fun create(settings: Settings, coroutineScope: CoroutineScope): PermissionManager<BluetoothPermission> {
+    actual override fun create(settings: Settings, coroutineScope: CoroutineScope): PermissionManager<BluetoothPermission> {
         return DefaultBluetoothPermissionManager(settings, coroutineScope)
     }
 }

bluetooth/src/androidLibMain/kotlin/BluetoothBuilder.kt

@@ -32,7 +32,7 @@ actual class BluetoothBuilder(
     private val scannerBuilder: BaseScanner.Builder = DefaultScanner.Builder(applicationContext = applicationContext),
 ) : BaseBluetoothBuilder {
 
-    override fun create(scannerSettingsBuilder: (Permissions) -> BaseScanner.Settings, coroutineContext: CoroutineContext): Bluetooth = Bluetooth(
+    actual override fun create(scannerSettingsBuilder: (Permissions) -> BaseScanner.Settings, coroutineContext: CoroutineContext): Bluetooth = Bluetooth(
         { scannerContext ->
             scannerSettingsBuilder(permissionsBuilder(scannerContext))
         },

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

@@ -31,23 +31,23 @@ actual class AdvertisementData(private val scanResult: ScanResult?) : BaseAdvert
 
     private val scanRecord = scanResult?.scanRecord
 
-    override val name: String?
+    actual override val name: String?
         get() = scanRecord?.deviceName
-    override val manufacturerId: Int?
+    actual override val manufacturerId: Int?
         get() = scanRecord?.manufacturerSpecificData?.let { if (it.size() > 0) it.keyAt(0) else null }
-    override val manufacturerData: ByteArray?
+    actual override val manufacturerData: ByteArray?
         get() = scanRecord?.manufacturerSpecificData?.let { manufacturerSpecificData ->
             manufacturerId?.let { key ->
                 val keyBytes = ByteBuffer.allocate(2).order(ByteOrder.LITTLE_ENDIAN).putShort(key.toShort()).array()
                 byteArrayOf(*keyBytes, *manufacturerSpecificData[key])
             }
         }
-    override val serviceUUIDs: List<UUID>
+    actual override val serviceUUIDs: List<UUID>
         get() = scanRecord?.serviceUuids?.map { it.uuid } ?: emptyList()
-    override val serviceData: Map<UUID, ByteArray?>
+    actual override val serviceData: Map<UUID, ByteArray?>
         get() = scanRecord?.serviceData?.mapKeys { it.key.uuid } ?: emptyMap()
-    override val txPowerLevel: TxPower
+    actual override val txPowerLevel: TxPower
         get() = scanRecord?.txPowerLevel ?: Int.MIN_VALUE
-    override val isConnectable: Boolean
+    actual override val isConnectable: Boolean
         get() = scanResult?.isConnectable == true
 }

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

@@ -143,7 +143,7 @@ internal actual class DefaultDeviceConnectionManager(
     }
     private var lastKnownState = BluetoothProfile.STATE_DISCONNECTED
 
-    override fun getCurrentState(): DeviceConnectionManager.State = when (lastKnownState) {
+    actual override fun getCurrentState(): DeviceConnectionManager.State = when (lastKnownState) {
         BluetoothProfile.STATE_CONNECTED -> DeviceConnectionManager.State.CONNECTED
         BluetoothProfile.STATE_CONNECTING -> DeviceConnectionManager.State.CONNECTING
         BluetoothProfile.STATE_DISCONNECTED -> DeviceConnectionManager.State.DISCONNECTED
@@ -152,7 +152,7 @@ internal actual class DefaultDeviceConnectionManager(
     }
 
     @SuppressLint("MissingPermission")
-    override fun connect() {
+    actual override fun connect() {
         when {
             !gatt.isCompleted -> gatt.complete(deviceWrapper.connectGatt(context, false, callback))
             lastKnownState == BluetoothProfile.STATE_CONNECTED -> handleConnect()
@@ -161,11 +161,11 @@ internal actual class DefaultDeviceConnectionManager(
         }
     }
 
-    override suspend fun discoverServices() {
+    actual override suspend fun discoverServices() {
         gatt.await().discoverServices()
     }
 
-    override fun disconnect() {
+    actual override fun disconnect() {
         val gatt = gatt.getCompletedOrNull()
         if (gatt != null && lastKnownState != BluetoothProfile.STATE_DISCONNECTED) {
             gatt.disconnect()
@@ -185,11 +185,11 @@ internal actual class DefaultDeviceConnectionManager(
         gatt.await().readRemoteRssi()
     }
 
-    override suspend fun requestMtu(mtu: MTU): Boolean {
+    actual override suspend fun requestMtu(mtu: MTU): Boolean {
         return gatt.await().requestMtu(mtu)
     }
 
-    override suspend fun didStartPerformingAction(action: DeviceAction) {
+    actual override suspend fun didStartPerformingAction(action: DeviceAction) {
         currentAction = action
         val succeeded = when (action) {
             is DeviceAction.Read.Characteristic -> gatt.await().readCharacteristic(action.characteristic.wrapper)
@@ -207,14 +207,14 @@ internal actual class DefaultDeviceConnectionManager(
     }
 
     @SuppressLint("MissingPermission")
-    override suspend fun requestStartPairing() {
+    actual override suspend fun requestStartPairing() {
         if (deviceWrapper.bondState == DeviceWrapper.BondState.NONE) {
             deviceWrapper.createBond()
         }
     }
 
     @SuppressLint("MissingPermission")
-    override suspend fun requestStartUnpairing() {
+    actual override suspend fun requestStartUnpairing() {
         if (deviceWrapper.bondState != DeviceWrapper.BondState.NONE) {
             deviceWrapper.removeBond()
         }

bluetooth/src/androidLibMain/kotlin/scanner/Scanner.kt

@@ -148,9 +148,9 @@ actual class DefaultScanner internal constructor(
 
     private val locationPermissionRepo get() = permissions[locationPermission]
 
-    override val isSupported: Boolean = bluetoothAdapter != null
+    actual override val isSupported: Boolean = bluetoothAdapter != null
     private val deviceConnectionManagerBuilder = DefaultDeviceConnectionManager.Builder(applicationContext)
-    override val bluetoothEnabledMonitor: BluetoothMonitor? = bluetoothAdapter?.let { BluetoothMonitor.Builder(applicationContext, it).create() }
+    actual override val bluetoothEnabledMonitor: BluetoothMonitor? = bluetoothAdapter?.let { BluetoothMonitor.Builder(applicationContext, it).create() }
     private val locationEnabledMonitor = LocationMonitor.Builder(applicationContext).create()
 
     override val permissionsFlow: Flow<List<PermissionState<*>>> get() = combine(
@@ -166,7 +166,7 @@ actual class DefaultScanner internal constructor(
         listOf(bluetoothEnabled, locationEnabled)
     }
 
-    override suspend fun didStartScanning(filter: Filter) {
+    actual override suspend fun didStartScanning(filter: Filter) {
         bluetoothScanner.startScan(
             filter.map {
                 ScanFilter.Builder().setServiceUuid(ParcelUuid(it)).build()
@@ -176,7 +176,7 @@ actual class DefaultScanner internal constructor(
         )
     }
 
-    override suspend fun didStopScanning() {
+    actual override suspend fun didStopScanning() {
         bluetoothScanner.stopScan(callback)
     }
 
@@ -193,7 +193,7 @@ actual class DefaultScanner internal constructor(
     override suspend fun isHardwareEnabled(): Boolean = super.isHardwareEnabled() && locationEnabledMonitor.isServiceEnabled
 
     @SuppressLint("MissingPermission") // Lint complains even with permissions
-    override fun generateEnableSensorsActions(): List<EnableSensorAction> {
+    actual override fun generateEnableSensorsActions(): List<EnableSensorAction> {
         if (!isSupported) return emptyList()
         return listOfNotNull(
             if (bluetoothAdapter?.isEnabled != true) {
@@ -226,7 +226,7 @@ actual class DefaultScanner internal constructor(
     }
 
     @SuppressLint("MissingPermission") // Lint complains even with permissions
-    override suspend fun retrievePairedDeviceDiscoveredEvents(
+    actual override suspend fun retrievePairedDeviceDiscoveredEvents(
         withServices: Filter,
         connectionSettings: ConnectionSettings?,
     ): List<Scanner.DeviceDiscovered> {