Try to fix Android

korlibs-archive · Mar 3, 2022 · b54da9c · b54da9c
1 parent b402305
commit b54da9c
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 79 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -52,7 +52,7 @@ enableKotlinMobileWatchos=false
 org.gradle.jvmargs=-Xmx2g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 #org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 org.gradle.daemon=true
-org.gradle.configureondemand=true
+#org.gradle.configureondemand=true
 
 # -Dorg.gradle.debug=true --no-daemon
 # export GRADLE_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005 -Dorg.gradle.daemon=false -Dkotlin.compiler.execution.strategy=in-process"

diff --git a/kmem/src/androidMain/kotlin/com/soywiz/kmem/Fast32BufferAndroid.kt b/kmem/src/androidMain/kotlin/com/soywiz/kmem/Fast32BufferAndroid.kt
diff --git a/kmem/src/androidMain/kotlin/com/soywiz/kmem/KmemGCAndroid.kt b/kmem/src/androidMain/kotlin/com/soywiz/kmem/KmemGCAndroid.kt
diff --git a/...mMain/kotlin/com/soywiz/kmem/KmemGCJvm.kt → ...dMain/kotlin/com/soywiz/kmem/KmemGCJvm.kt b/...mMain/kotlin/com/soywiz/kmem/KmemGCJvm.kt → ...dMain/kotlin/com/soywiz/kmem/KmemGCJvm.kt
diff --git a/korge/src/androidMain/kotlin/com/soywiz/korge/service/vibration/NativeVibration.kt b/korge/src/androidMain/kotlin/com/soywiz/korge/service/vibration/NativeVibration.kt
@@ -1,23 +1,23 @@
 package com.soywiz.korge.service.vibration
 
-import android.annotation.SuppressLint
-import android.os.VibrationEffect
-import android.os.Vibrator
-import androidx.core.content.ContextCompat.getSystemService
-import com.soywiz.klock.TimeSpan
-import com.soywiz.korge.android.androidActivity
-import com.soywiz.korge.internal.*
-import com.soywiz.korge.view.Views
-import kotlin.math.abs
-import kotlin.math.min
+import android.annotation.*
+import android.os.*
+import com.soywiz.klock.*
+import com.soywiz.korge.android.*
+import com.soywiz.korge.view.*
+import kotlin.math.*
 
 actual class NativeVibration actual constructor(views: Views) {
 
     companion object {
         private const val NO_REPEAT = -1
     }
 
-    private val vibrator = getSystemService(views.androidActivity, Vibrator::class.java)
+    private val vibrator: Vibrator? = if (Build.VERSION.SDK_INT >= 23) {
+        views.androidActivity.getSystemService(Vibrator::class.java)
+    } else {
+        null
+    }
 
     /**
      * @param timings list of alternating ON-OFF durations in milliseconds. Staring with ON.
@@ -27,12 +27,14 @@ actual class NativeVibration actual constructor(views: Views) {
     @SuppressLint("MissingPermission")
     actual fun vibratePattern(timings: Array<TimeSpan>, amplitudes: Array<Double>) {
         val onOffTimings = (listOf(TimeSpan.NIL) + timings).map { it.millisecondsLong }.toLongArray()
-        if (amplitudes.size != onOffTimings.size) {
-            vibrator?.vibrate(VibrationEffect.createWaveform(onOffTimings, NO_REPEAT))
-        } else {
-            vibrator?.vibrate(
-                VibrationEffect.createWaveform(onOffTimings, amplitudes.map {it.toAndroidAmplitude()}.toIntArray(), NO_REPEAT)
-            )
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            if (amplitudes.size != onOffTimings.size) {
+                vibrator?.vibrate(VibrationEffect.createWaveform(onOffTimings, NO_REPEAT))
+            } else {
+                vibrator?.vibrate(
+                    VibrationEffect.createWaveform(onOffTimings, amplitudes.map {it.toAndroidAmplitude()}.toIntArray(), NO_REPEAT)
+                )
+            }
         }
     }
 
@@ -43,7 +45,9 @@ actual class NativeVibration actual constructor(views: Views) {
     @ExperimentalUnsignedTypes
     @SuppressLint("MissingPermission")
     actual fun vibrate(time: TimeSpan, amplitude: Double) {
-        vibrator?.vibrate(VibrationEffect.createOneShot(time.millisecondsLong, amplitude.toAndroidAmplitude()))
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            vibrator?.vibrate(VibrationEffect.createOneShot(time.millisecondsLong, amplitude.toAndroidAmplitude()))
+        }
     }
 
     /**
@@ -53,5 +57,4 @@ actual class NativeVibration actual constructor(views: Views) {
         val amplitude = 255 * abs(this)
         return min(amplitude, 255.0).toInt()
     }
-
 }
diff --git a/korgw/build.gradle.kts b/korgw/build.gradle.kts
@@ -21,7 +21,6 @@ dependencies {
     add("commonMainApi", project(":korim"))
     add("jvmMainApi", "net.java.dev.jna:jna:$jnaVersion")
     add("jvmMainApi", "net.java.dev.jna:jna-platform:$jnaVersion")
-    //if (hasAndroid) add("androidMainApi", "androidx.appcompat:appcompat:1.3.0")
 }
 
 afterEvaluate {