- Updated gradle files

android/build.gradle

@@ -1,32 +1,11 @@
-group 'com.eopeter.flutter_dtmf'
-version '1.0-SNAPSHOT'
-
-buildscript {
-    ext.kotlin_version = '1.8.20'
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
+plugins {
+    id("com.android.library")
+    id("org.jetbrains.kotlin.android")
 }
 
-rootProject.allprojects {
-    repositories {
-        google()
-        mavenCentral()
-    }
-}
-
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-
 android {
     namespace 'com.eopeter.flutter_dtmf'
-    compileSdkVersion 33
+    compileSdkVersion 34
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'

android/settings.gradle

@@ -1 +1,17 @@
+
+pluginManagement {
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+plugins {
+    id("com.android.application") version "8.3.0" apply false
+    id("com.android.library") version "8.3.0" apply false
+    id("org.jetbrains.kotlin.android") version "1.9.24" apply false
+}
+
 rootProject.name = 'flutter_dtmf'
+include(":app")

android/src/main/kotlin/com/eopeter/flutter_dtmf/DtmfPlugin.kt

@@ -1,64 +1,61 @@
 package com.eopeter.flutter_dtmf
+
 import android.content.Context
 import android.media.ToneGenerator
 import android.media.AudioManager
 import android.provider.Settings
 import android.util.Log
-import androidx.core.content.ContextCompat.getSystemService
 import io.flutter.embedding.engine.plugins.FlutterPlugin
-import io.flutter.plugin.common.BinaryMessenger
 import io.flutter.plugin.common.MethodCall
 import io.flutter.plugin.common.MethodChannel
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler
 import io.flutter.plugin.common.MethodChannel.Result
-import io.flutter.plugin.common.PluginRegistry.Registrar
 
 class DtmfPlugin : FlutterPlugin, MethodCallHandler {
 
+    // Instance properties for channel, context, and audio manager
+    private lateinit var channel: MethodChannel
+    private lateinit var applicationContext: Context
+    private lateinit var audioManager: AudioManager
+
     override fun onAttachedToEngine(binding: FlutterPlugin.FlutterPluginBinding) {
-        setUpChannels(binding.binaryMessenger)
+        // Initialize the MethodChannel using the new v2 binding
+        channel = MethodChannel(binding.binaryMessenger, "flutter_dtmf")
+        channel.setMethodCallHandler(this)
         applicationContext = binding.applicationContext
         audioManager = applicationContext.getSystemService(Context.AUDIO_SERVICE) as AudioManager
     }
 
-    companion object {
-        var channel: MethodChannel? = null
-        private lateinit var applicationContext: Context
-        private lateinit var audioManager: AudioManager
-        @JvmStatic
-        fun registerWith(registrar: Registrar) {
-            setUpChannels(registrar.messenger())
-        }
-        fun setUpChannels(messenger: BinaryMessenger) {
-            channel = MethodChannel(messenger, "flutter_dtmf")
-            channel?.setMethodCallHandler(DtmfPlugin())
-        }
+    override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) {
+        channel.setMethodCallHandler(null)
     }
 
     override fun onMethodCall(call: MethodCall, result: Result) {
         val arguments = call.arguments as? Map<*, *>
-
-        if (call.method == "getPlatformVersion") {
-            result.success("Android ${android.os.Build.VERSION.RELEASE}")
-        } else if (call.method == "playTone") {
-            val digits = arguments?.get("digits") as? String
-            val samplingRate = arguments?.get("samplingRate") as? Float
-            val durationMs = arguments?.get("durationMs") as? Int
-            val volume = arguments?.get("volume") as Double
-            val ignoreDtmfSystemSettings = arguments?.get("ignoreDtmfSystemSettings") as Boolean
-            val forceMaxVolume = arguments?.get("forceMaxVolume") as Boolean
-            if (digits != null) {
-                playTone(
-                    digits.trim(),
-                    durationMs as Int,
-                    volume,
-                    ignoreDtmfSystemSettings,
-                    forceMaxVolume
-                )
-                result.success(true)
+        when (call.method) {
+            "getPlatformVersion" -> {
+                result.success("Android ${android.os.Build.VERSION.RELEASE}")
+            }
+            "playTone" -> {
+                val digits = arguments?.get("digits") as? String
+                val durationMs = arguments?.get("durationMs") as? Int
+                val volume = arguments?.get("volume") as? Double ?: 0.5
+                val ignoreDtmfSystemSettings = arguments?.get("ignoreDtmfSystemSettings") as? Boolean ?: false
+                val forceMaxVolume = arguments?.get("forceMaxVolume") as? Boolean ?: false
+                if (digits != null && durationMs != null) {
+                    playTone(
+                        digits.trim(),
+                        durationMs,
+                        volume,
+                        ignoreDtmfSystemSettings,
+                        forceMaxVolume
+                    )
+                    result.success(true)
+                } else {
+                    result.error("INVALID_ARGUMENTS", "Missing required arguments for playTone", null)
+                }
             }
-        } else {
-            result.notImplemented()
+            else -> result.notImplemented()
         }
     }
 
@@ -69,79 +66,63 @@ class DtmfPlugin : FlutterPlugin, MethodCallHandler {
         ignoreDtmfSystemSettings: Boolean,
         forceMaxVolume: Boolean
     ) {
-
         if (!ignoreDtmfSystemSettings) {
             var isDtmfToneDisabled = false
-
             try {
                 isDtmfToneDisabled = Settings.System.getInt(
                     applicationContext.contentResolver,
                     Settings.System.DTMF_TONE_WHEN_DIALING, 1
-                ) == 0;
+                ) == 0
             } catch (e: Settings.SettingNotFoundException) {
                 Log.e("DTMFPlugin", e.toString())
             }
             if (isDtmfToneDisabled) {
-                Log.i(
-                    "DTMFPlugin",
-                    "No sound is played : Dtmf Tone is disabled on device and not ignored."
-                )
-                return;
+                Log.i("DTMFPlugin", "No sound is played: DTMF Tone is disabled on device and not ignored.")
+                return
             }
         }
 
         val streamType = AudioManager.STREAM_DTMF
-
         var maxVolume = audioManager.getStreamMaxVolume(streamType)
         if (forceMaxVolume) {
             maxVolume = 100
         }
-        // Set the volume level as a percentage
-        var targetVolume = volume * maxVolume
-        audioManager.setStreamVolume(streamType, targetVolume.toInt(), 0)
-        // Adjust volume using AudioManager
-        var toneGenerator = ToneGenerator(streamType, targetVolume.toInt())
-
-
-        Thread(object : Runnable {
-            override fun run() {
-                for (i in digits.indices) {
-                    val toneType = getToneType(digits[i].toString())
-                    if (toneType != -1)
-                        toneGenerator?.startTone(toneType, durationMs)
-                    Thread.sleep((durationMs + 80).toLong())
+        // Set the volume level as a percentage of the maximum
+        val targetVolume = (volume * maxVolume).toInt()
+        audioManager.setStreamVolume(streamType, targetVolume, 0)
+        val toneGenerator = ToneGenerator(streamType, targetVolume)
+
+        Thread {
+            for (digit in digits) {
+                val toneType = getToneType(digit.toString())
+                if (toneType != -1) {
+                    toneGenerator.startTone(toneType, durationMs)
                 }
-                toneGenerator.release(); //Is needed to be able to play at high frequency !
+                Thread.sleep((durationMs + 80).toLong())
             }
-        }).start()
+            toneGenerator.release() // Release to allow high-frequency playback
+        }.start()
     }
 
     private fun getToneType(digit: String): Int {
-        when (digit) {
-            "0" -> return ToneGenerator.TONE_DTMF_0
-            "1" -> return ToneGenerator.TONE_DTMF_1
-            "2" -> return ToneGenerator.TONE_DTMF_2
-            "3" -> return ToneGenerator.TONE_DTMF_3
-            "4" -> return ToneGenerator.TONE_DTMF_4
-            "5" -> return ToneGenerator.TONE_DTMF_5
-            "6" -> return ToneGenerator.TONE_DTMF_6
-            "7" -> return ToneGenerator.TONE_DTMF_7
-            "8" -> return ToneGenerator.TONE_DTMF_8
-            "9" -> return ToneGenerator.TONE_DTMF_9
-            "*" -> return ToneGenerator.TONE_DTMF_S
-            "#" -> return ToneGenerator.TONE_DTMF_P
-            "A" -> return ToneGenerator.TONE_DTMF_A
-            "B" -> return ToneGenerator.TONE_DTMF_B
-            "C" -> return ToneGenerator.TONE_DTMF_C
-            "D" -> return ToneGenerator.TONE_DTMF_D
+        return when (digit) {
+            "0" -> ToneGenerator.TONE_DTMF_0
+            "1" -> ToneGenerator.TONE_DTMF_1
+            "2" -> ToneGenerator.TONE_DTMF_2
+            "3" -> ToneGenerator.TONE_DTMF_3
+            "4" -> ToneGenerator.TONE_DTMF_4
+            "5" -> ToneGenerator.TONE_DTMF_5
+            "6" -> ToneGenerator.TONE_DTMF_6
+            "7" -> ToneGenerator.TONE_DTMF_7
+            "8" -> ToneGenerator.TONE_DTMF_8
+            "9" -> ToneGenerator.TONE_DTMF_9
+            "*" -> ToneGenerator.TONE_DTMF_S
+            "#" -> ToneGenerator.TONE_DTMF_P
+            "A" -> ToneGenerator.TONE_DTMF_A
+            "B" -> ToneGenerator.TONE_DTMF_B
+            "C" -> ToneGenerator.TONE_DTMF_C
+            "D" -> ToneGenerator.TONE_DTMF_D
+            else -> -1
         }
-
-        return -1
     }
-    override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) {
-        channel?.setMethodCallHandler(null)
-        channel = null
-    }
-
-
 }

example/android/app/build.gradle

@@ -1,3 +1,10 @@
+plugins {
+    id("com.android.application")
+    id("kotlin-android")
+    // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
+    id("dev.flutter.flutter-gradle-plugin")
+}
+
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@@ -21,13 +28,9 @@ if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
 android {
     namespace 'com.eopeter.dtmf_example'
-    compileSdkVersion 33
+    compileSdkVersion 34
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -41,7 +44,7 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.eopeter.flutter_dtmf_example"
         minSdkVersion flutter.minSdkVersion
-        targetSdkVersion 31
+        targetSdkVersion 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -69,7 +72,7 @@ flutter {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    //implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'

example/android/build.gradle

@@ -1,16 +1,3 @@
-buildscript {
-    ext.kotlin_version = '1.8.20'
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
         google()
@@ -28,4 +15,4 @@ subprojects {
 
 tasks.register("clean", Delete) {
     delete rootProject.buildDir
-}
+}

example/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Sun Sep 27 11:23:18 EDT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip

example/android/settings.gradle

@@ -1,15 +1,25 @@
-include ':app'
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }()
 
-def flutterProjectRoot = rootProject.projectDir.parentFile.toPath()
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
 
-def plugins = new Properties()
-def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins')
-if (pluginsFile.exists()) {
-    pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) }
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
 }
 
-plugins.each { name, path ->
-    def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile()
-    include ":$name"
-    project(":$name").projectDir = pluginDirectory
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version "8.3.0" apply false
+    id "org.jetbrains.kotlin.android" version "1.9.24" apply false
 }
+
+include ":app"