react-native-simple-note-pitch-detector 0.1.4 → 0.1.6

package/android/src/main/java/expo/modules/simplenotepitchdetector/PitchAnalyzer.kt

@@ -14,10 +14,10 @@ import kotlin.math.round
 
 class PitchAnalyzer {
 
-    var callback: (String) -> Unit
+    var onChangePitch: (String, Double) -> Unit
 
-    constructor(callback: (String) -> Unit) {
-        this.callback = callback
+    constructor(callback: (String, Double) -> Unit) {
+        this.onChangePitch = callback
     }
 
     private val tones = arrayOf("C","C#","D","D#","E","F","F#","G","G#","A","A#","B")
@@ -44,12 +44,9 @@ class PitchAnalyzer {
 
         if (!index.isNaN() && pitchInHz > 0) {
             val tone = tones[index.toInt()]
+            val frequency = pitchInHz.toDouble()
 
-            this.callback(tone)
-//            val data: WritableMap = WritableNativeMap()
-//
-//            data.putDouble("frequency", pitchInHz.toDouble())
-//            data.putString("tone", tone)
+            this.onChangePitch(tone, frequency)
         }
     }
 

package/android/src/main/java/expo/modules/simplenotepitchdetector/ReactNativeSimpleNotePitchDetectorModule.kt

@@ -1,5 +1,8 @@
 package expo.modules.simplenotepitchdetector
 
+import android.Manifest
+import android.content.pm.PackageManager
+import androidx.core.app.ActivityCompat
 import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.modules.ModuleDefinition
 import expo.modules.simplepitchdetector.PitchAnalyzer
@@ -7,20 +10,36 @@ import androidx.core.os.bundleOf
 
 class ReactNativeSimpleNotePitchDetectorModule : Module() {
 
-
   override fun definition() = ModuleDefinition {
     Name("ReactNativeSimpleNotePitchDetector")
 
-    Events("onChange")
+    Events("onChangePitch")
+
+    Function("start") {
 
-    Function("hello") {
-      val pitchAnalyzer = PitchAnalyzer {
+      val pitchAnalyzer = PitchAnalyzer { tone: String, frequency: Double ->
         this@ReactNativeSimpleNotePitchDetectorModule.sendEvent(
-          "onChange",
-          bundleOf("tone" to it)
+          "onChangePitch",
+          bundleOf("tone" to tone, "frequency" to frequency)
         )
       }
+
       pitchAnalyzer.start()
+
+//      val context = appContext.reactContext!!
+//      var activity = appContext.currentActivity!!
+//      var permissionsGranted = ActivityCompat.checkSelfPermission(context, permissions[0]) == PackageManager.PERMISSION_GRANTED
+//      if (!permissionsGranted) {
+//        ActivityCompat.requestPermissions(activity, permissions, 200)
+//      } else {
+//        val pitchAnalyzer = PitchAnalyzer {
+//          this@ReactNativeSimpleNotePitchDetectorModule.sendEvent(
+//            "onChange",
+//            bundleOf("tone" to it)
+//          )
+//        }
+//        pitchAnalyzer.start()
+//      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-simple-note-pitch-detector",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "asdf",
   "main": "build/index.js",
   "types": "build/index.d.ts",