Skip to content

Commit 254c562

Browse files
committed
rework for common init
1 parent 47ba881 commit 254c562

File tree

6 files changed

+17
-5
lines changed

6 files changed

+17
-5
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package it.matteocrippa.sensorsmultiplatform
2+
3+
import android.app.Activity
4+
5+
actual typealias CommonActivity = Activity

shared/src/androidMain/kotlin/it/matteocrippa/sensorsmultiplatform/Sensors.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
package it.matteocrippa.sensorsmultiplatform
22

3-
import android.app.Activity
43
import android.content.Context
54
import android.hardware.Sensor
65
import android.hardware.SensorEvent
76
import android.hardware.SensorEventListener
87
import android.hardware.SensorManager
98
import kotlinx.coroutines.flow.MutableStateFlow
109

11-
actual class Sensors(activity: Activity) : SensorEventListener {
10+
actual class Sensors actual constructor(actual val activity: CommonActivity?) :
11+
SensorEventListener {
1212

1313
private var mSensorManager: SensorManager =
14-
activity.getSystemService(Context.SENSOR_SERVICE) as SensorManager
14+
activity?.getSystemService(Context.SENSOR_SERVICE) as SensorManager
1515

1616
private var sAccelerometer: Sensor = mSensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER)
1717
private var sGravity: Sensor = mSensorManager.getDefaultSensor(Sensor.TYPE_GRAVITY)
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package it.matteocrippa.sensorsmultiplatform
2+
3+
expect class CommonActivity

shared/src/commonMain/kotlin/it/matteocrippa/sensorsmultiplatform/Sensors.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ data class SensorData(
77
val gravity: AccelerometerData? = null
88
)
99

10-
expect class Sensors {
10+
expect class Sensors(activity: CommonActivity? = null) {
11+
val activity: CommonActivity?
1112
val data: CommonFlow<SensorData?>
1213
val isEnabled: Boolean
1314
fun start()
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package it.matteocrippa.sensorsmultiplatform
2+
3+
actual typealias CommonActivity = Any

shared/src/iosMain/kotlin/it/matteocrippa/sensorsmultiplatform/Sensors.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import platform.CoreMotion.CMDeviceMotion
1212
import platform.CoreMotion.CMMotionManager
1313
import platform.Foundation.NSOperationQueue
1414

15-
actual class Sensors {
15+
actual class Sensors actual constructor(actual val activity: CommonActivity?) {
1616
private var _data = Channel<SensorData?>(Channel.BUFFERED)
1717

1818
actual val data: CommonFlow<SensorData?>

0 commit comments

Comments
 (0)