diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt index af0bb6b5..d3e6b237 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt @@ -12,10 +12,8 @@ import android.util.Log import android.view.Menu import android.view.MenuItem import android.content.pm.PackageManager -import android.graphics.Color import android.os.CountDownTimer import android.support.v4.content.LocalBroadcastManager -import android.support.v7.view.menu.ActionMenuItemView import android.view.inputmethod.InputMethodManager import android.text.InputType import android.text.TextWatcher @@ -51,6 +49,7 @@ class MainActivity : AppCompatActivity() { internal lateinit var serviceEventReceiver: BroadcastReceiver internal lateinit var quitTimer: CountDownTimer internal lateinit var stopState: String + internal lateinit var speakerIcon: MenuItem override fun onCreate(savedInstanceState: Bundle?) { @@ -631,9 +630,7 @@ class MainActivity : AppCompatActivity() { if (ua.account.missedCalls) callsButton.setImageResource(R.drawable.calls_missed) } - val speakerIcon = findViewById(R.id.speakerIcon) as ActionMenuItemView - speakerIcon.setBackgroundColor(ContextCompat.getColor(applicationContext, - R.color.colorPrimary)) + speakerIcon.setIcon(R.drawable.speaker_off) if (BaresipService.speakerPhone) { baresipService.setAction("ToggleSpeaker") startService(baresipService) @@ -838,6 +835,7 @@ class MainActivity : AppCompatActivity() { override fun onCreateOptionsMenu(menu: Menu): Boolean { menuInflater.inflate(R.menu.main_menu, menu) menuInflater.inflate(R.menu.speaker_icon, menu) + speakerIcon = menu.findItem(R.id.speakerIcon) return true } @@ -845,12 +843,10 @@ class MainActivity : AppCompatActivity() { val i: Intent when (item.itemId) { R.id.speakerIcon -> { - val speakerIcon = findViewById(R.id.speakerIcon) as ActionMenuItemView if (BaresipService.speakerPhone) - speakerIcon.setBackgroundColor(ContextCompat.getColor(applicationContext, - R.color.colorPrimary)) + item.setIcon(R.drawable.speaker_off) else - speakerIcon.setBackgroundColor(Color.rgb(0x04, 0xb4, 0x04)) + item.setIcon(R.drawable.speaker_on) baresipService.setAction("ToggleSpeaker") startService(baresipService) return true diff --git a/app/src/main/res/drawable-hdpi/ic_action_speaker.png b/app/src/main/res/drawable-hdpi/ic_action_speaker.png deleted file mode 100644 index d6a602db..00000000 Binary files a/app/src/main/res/drawable-hdpi/ic_action_speaker.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_action_speaker.png b/app/src/main/res/drawable-mdpi/ic_action_speaker.png deleted file mode 100644 index 599196f0..00000000 Binary files a/app/src/main/res/drawable-mdpi/ic_action_speaker.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_action_speaker.png b/app/src/main/res/drawable-xhdpi/ic_action_speaker.png deleted file mode 100644 index 4a70e2d0..00000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_action_speaker.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_speaker.png b/app/src/main/res/drawable-xxhdpi/ic_action_speaker.png deleted file mode 100644 index 262d6e12..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_speaker.png and /dev/null differ diff --git a/app/src/main/res/drawable/send.xml b/app/src/main/res/drawable/send.xml index 6290c75d..61ea51c2 100644 --- a/app/src/main/res/drawable/send.xml +++ b/app/src/main/res/drawable/send.xml @@ -1,4 +1,4 @@ - diff --git a/app/src/main/res/drawable/speaker_off.xml b/app/src/main/res/drawable/speaker_off.xml new file mode 100644 index 00000000..6bdb9f76 --- /dev/null +++ b/app/src/main/res/drawable/speaker_off.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/speaker_on.xml b/app/src/main/res/drawable/speaker_on.xml new file mode 100644 index 00000000..0e955a2f --- /dev/null +++ b/app/src/main/res/drawable/speaker_on.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/menu/speaker_icon.xml b/app/src/main/res/menu/speaker_icon.xml index 7c2ebb86..2f23e9cb 100644 --- a/app/src/main/res/menu/speaker_icon.xml +++ b/app/src/main/res/menu/speaker_icon.xml @@ -6,7 +6,7 @@ android:id="@+id/speakerIcon" android:title="" app:showAsAction="always" - android:icon="@drawable/ic_action_speaker" + android:icon="@drawable/speaker_off" /> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index ef94e4ee..cfeae863 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -6,5 +6,7 @@ #26a69a #1c9588 #93d3cd - #B00020 + #9e9e9e + #eeeeee + #b00020