From 63746216f1f7ab4c7eb71d8a9f4a8de38087eb0d Mon Sep 17 00:00:00 2001 From: Juha Heinanen Date: Tue, 12 Mar 2019 22:49:41 +0200 Subject: [PATCH] - replace speaker icon with vector asset --- .../kotlin/com/tutpro/baresip/MainActivity.kt | 14 +++++--------- .../main/res/drawable-hdpi/ic_action_speaker.png | Bin 1087 -> 0 bytes .../main/res/drawable-mdpi/ic_action_speaker.png | Bin 752 -> 0 bytes .../res/drawable-xhdpi/ic_action_speaker.png | Bin 1332 -> 0 bytes .../res/drawable-xxhdpi/ic_action_speaker.png | Bin 2144 -> 0 bytes app/src/main/res/drawable/send.xml | 2 +- app/src/main/res/drawable/speaker_off.xml | 5 +++++ app/src/main/res/drawable/speaker_on.xml | 5 +++++ app/src/main/res/menu/speaker_icon.xml | 2 +- app/src/main/res/values/colors.xml | 4 +++- 10 files changed, 20 insertions(+), 12 deletions(-) delete mode 100644 app/src/main/res/drawable-hdpi/ic_action_speaker.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_action_speaker.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_action_speaker.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_action_speaker.png create mode 100644 app/src/main/res/drawable/speaker_off.xml create mode 100644 app/src/main/res/drawable/speaker_on.xml 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 d6a602db751317718073c5f313e94a696e96ff29..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1087 zcmV-F1i<@=P)8Y0z+)IDJ$6A^h89^O4mgQVhCA2g+5Zke&onE$PJKji^?UmP{ z@A!7v{l1y+&3kVEdg!5t9u5+EH-DDT=k-V=@>V<^U$50_>xWJNBASs% zS66RVDwUUAv(T$-(+b66v0AU!uTn}El)QK&7K^>twH#1w(+SGu@(TdC3jmACqj5sW zsh|bmF34|tk8@t9l->h?nv&RO^7*_TSPtxjyf+7u$z&uNjh@pq?fYV}_(Xj-olYk- zP5Vsw-ZzL?*!LaSgKZLpLg8{cold9^=I7^^0N^(zJke^QjaNO8Qr-)&NFUR6{bSp< zuc$lGXf%GIlx7)YntQAcWipx9OQq6ZU2i4YRN$kI<9wj5Zn<233;@gCTo6Je52P2` zfrtblWLVvN0C=Fp-VCJx7g;sXY&IV%g>4|T0uXWA>gu}w%-b(XDNlq}0AuX98mrgq z>xkI&h&&Qz3+)L9E`U<{OpTeQc~nZNdo1*_<2ukSNGX?nlK6P3RPuJT|Ag5>b3RFY zQpuBACmi={JrlM5<<)Xz>GSe?*NOrT<(exqT<(113*qm@}JdR z+RvF7+l`WbL%km%%d(C!#y$st0nZWpcxr0utLf=!C(xn3m7UsI(Isy(#x4NBu!p?U zY&LJWGeWS1Y!7yVR4Vlv0G#)dcaP3r+mYYbV^j$7W2Yi)+a5Aa^D<*>MA?zb=;-ME zLwT`9DSZS0w>al(2ht0*veU%GgdwH;1QEaFoacOQsMkhZCsuD{f#0(*%-RUC{afNgK10wzrx^~*NlV1zn0Dwiq zFuvxTU)wGDuJ=MCBO}dfwfdc57!MHfIrPv&4?P@u{0r;6nhOrRDfs{Z002ovPDHLk FV1kYP@lyZ* 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 599196f020046dffd0265e22846f4bfa83728217..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 752 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 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