From 21c6c3c83511a439310841e8874c7cd8a31b08ab Mon Sep 17 00:00:00 2001 From: Naveen Date: Mon, 29 Aug 2022 00:57:48 +0530 Subject: [PATCH] Convert property to function --- .../dialer/helpers/ToneGeneratorHelper.kt | 35 +++++++++---------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/ToneGeneratorHelper.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/ToneGeneratorHelper.kt index 6e1453e6..271381cd 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/ToneGeneratorHelper.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/ToneGeneratorHelper.kt @@ -9,13 +9,14 @@ class ToneGeneratorHelper(context: Context) { private val audioManager = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager private val toneGenerator = ToneGenerator(DIAL_TONE_STREAM_TYPE, TONE_RELATIVE_VOLUME) - private val isSilent: Boolean - get() = audioManager.ringerMode in arrayOf(AudioManager.RINGER_MODE_SILENT, AudioManager.RINGER_MODE_VIBRATE) + private fun isSilent(): Boolean { + return audioManager.ringerMode in arrayOf(AudioManager.RINGER_MODE_SILENT, AudioManager.RINGER_MODE_VIBRATE) + } fun playTone(char: Char) = playTone(charToTone[char] ?: -1) fun playTone(tone: Int, durationMs: Int = DIALPAD_TONE_LENGTH_MS.toInt()) { - if (tone != -1 && !isSilent) { + if (tone != -1 && !isSilent()) { toneGenerator.stopTone() toneGenerator.startTone(tone, durationMs) } @@ -25,21 +26,19 @@ class ToneGeneratorHelper(context: Context) { const val TONE_RELATIVE_VOLUME = 80 // The DTMF tone volume relative to other sounds in the stream const val DIAL_TONE_STREAM_TYPE = STREAM_DTMF - private val charToTone by lazy { - HashMap().apply { - put('0', ToneGenerator.TONE_DTMF_0) - put('1', ToneGenerator.TONE_DTMF_1) - put('2', ToneGenerator.TONE_DTMF_2) - put('3', ToneGenerator.TONE_DTMF_3) - put('4', ToneGenerator.TONE_DTMF_4) - put('5', ToneGenerator.TONE_DTMF_5) - put('6', ToneGenerator.TONE_DTMF_6) - put('7', ToneGenerator.TONE_DTMF_7) - put('8', ToneGenerator.TONE_DTMF_8) - put('9', ToneGenerator.TONE_DTMF_9) - put('#', ToneGenerator.TONE_DTMF_P) - put('*', ToneGenerator.TONE_DTMF_S) - } + private val charToTone = HashMap().apply { + put('0', ToneGenerator.TONE_DTMF_0) + put('1', ToneGenerator.TONE_DTMF_1) + put('2', ToneGenerator.TONE_DTMF_2) + put('3', ToneGenerator.TONE_DTMF_3) + put('4', ToneGenerator.TONE_DTMF_4) + put('5', ToneGenerator.TONE_DTMF_5) + put('6', ToneGenerator.TONE_DTMF_6) + put('7', ToneGenerator.TONE_DTMF_7) + put('8', ToneGenerator.TONE_DTMF_8) + put('9', ToneGenerator.TONE_DTMF_9) + put('#', ToneGenerator.TONE_DTMF_P) + put('*', ToneGenerator.TONE_DTMF_S) } } }