From d60e035641c8819ac5b71e3066ee18d901891441 Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Sat, 12 May 2018 15:17:41 +0300
Subject: [PATCH] added speaker icon to action bar

---
 .../kotlin/com/tutpro/baresip/MainActivity.kt |  24 +++++++++++++-----
 app/src/main/res/drawable/speaker.png         | Bin 0 -> 1650 bytes
 app/src/main/res/menu/speaker_icon.xml        |   0
 3 files changed, 18 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/res/drawable/speaker.png
 create mode 100644 app/src/main/res/menu/speaker_icon.xml

diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
index cec9256a..11a1fc9f 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
@@ -25,7 +25,7 @@ import java.util.*
 import java.io.*
 import android.widget.RelativeLayout
 import android.media.AudioManager
-import android.media.AudioManager.STREAM_VOICE_CALL
+import android.support.v7.view.menu.ActionMenuItemView
 import android.text.Editable
 import android.text.TextWatcher
 import android.view.inputmethod.InputMethodManager
@@ -296,12 +296,23 @@ class MainActivity : AppCompatActivity() {
         super.onCreateOptionsMenu(menu)
         val inflater = menuInflater
         inflater.inflate(R.menu.main_menu, menu)
+        inflater.inflate(R.menu.speaker_icon, menu)
         return true
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         val i: Intent
         when (item.itemId) {
+            R.id.speakerIcon -> {
+                am.isSpeakerphoneOn = !am.isSpeakerphoneOn
+                val speakerIcon = findViewById(R.id.speakerIcon) as ActionMenuItemView
+                if (am.isSpeakerphoneOn)
+                    speakerIcon.setBackgroundColor(Color.RED)
+                    // speakerIcon.setIcon(ContextCompat.getDrawable(this, R.drawable.speaker_on))
+                else
+                    speakerIcon.setBackgroundColor(resources.getColor(R.color.colorPrimary))
+                return true
+            }
             R.id.accounts -> {
                 i = Intent(this, EditAccountsActivity::class.java)
                 startActivityForResult(i, EDIT_ACCOUNTS_CODE)
@@ -666,9 +677,9 @@ class MainActivity : AppCompatActivity() {
                         }
                         am.mode = AudioManager.MODE_IN_COMMUNICATION
                         am.isSpeakerphoneOn = false
-                        am.setStreamVolume(AudioManager.STREAM_VOICE_CALL,
-                                (am.getStreamMaxVolume(STREAM_VOICE_CALL) / 2) + 1,
-                                AudioManager.STREAM_VOICE_CALL)
+                        // am.setStreamVolume(AudioManager.STREAM_VOICE_CALL,
+                        //        (am.getStreamMaxVolume(STREAM_VOICE_CALL) / 2) + 1,
+                        //        AudioManager.STREAM_VOICE_CALL)
                         if (HistoryActivity.aorHistory(aor) > HISTORY_SIZE)
                             HistoryActivity.aorRemoveHistory(aor)
                     }
@@ -684,7 +695,7 @@ class MainActivity : AppCompatActivity() {
                             }
                         }
                         am.mode = AudioManager.MODE_RINGTONE
-                        am.isSpeakerphoneOn = true
+                        // am.isSpeakerphoneOn = true
                     }
                     "call verify" -> {
                         this@MainActivity.runOnUiThread {
@@ -844,7 +855,8 @@ class MainActivity : AppCompatActivity() {
                                         " closed")
                             }
                         }
-                        am.mode = AudioManager.MODE_NORMAL
+                        if ((callsIn.size == 0) && (callsOut.size == 0))
+                            am.mode = AudioManager.MODE_NORMAL
                     }
                     else -> Log.d("Baresip", "Unknown event '${ev[0]}'")
                 }
diff --git a/app/src/main/res/drawable/speaker.png b/app/src/main/res/drawable/speaker.png
new file mode 100644
index 0000000000000000000000000000000000000000..54fa9b74d94fdbf62693c25591813331c1a5e249
GIT binary patch
literal 1650
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/menu/speaker_icon.xml b/app/src/main/res/menu/speaker_icon.xml
new file mode 100644
index 00000000..e69de29b