Reworked resources & colors + started dark mode

app/src/main/AndroidManifest.xml

@@ -67,7 +67,7 @@
             android:label="@string/app_name"
             android:launchMode="singleTask"
             android:noHistory="true"
-            android:theme="@style/NoTitle"
+            android:theme="@style/LinphoneStyleLight"
             android:windowSoftInputMode="adjustPan|stateHidden">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -125,7 +125,7 @@
         <activity
             android:name=".LinphoneActivity"
             android:launchMode="singleTask"
-            android:theme="@style/NoTitle">
+            android:theme="@style/LinphoneStyleLight">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
@@ -134,7 +134,7 @@
             android:name=".call.CallIncomingActivity"
             android:launchMode="singleTop"
             android:noHistory="true"
-            android:theme="@style/NoTitle">
+            android:theme="@style/LinphoneStyleLight">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
@@ -143,7 +143,7 @@
             android:name=".call.CallOutgoingActivity"
             android:launchMode="singleTop"
             android:noHistory="true"
-            android:theme="@style/NoTitle">
+            android:theme="@style/LinphoneStyleLight">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
@@ -152,7 +152,7 @@
             android:name=".call.CallActivity"
             android:launchMode="singleTop"
             android:noHistory="true"
-            android:theme="@style/FullScreen">
+            android:theme="@style/LinphoneStyleLight">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
@@ -168,7 +168,7 @@
         <activity
             android:name=".assistant.AssistantActivity"
             android:screenOrientation="behind"
-            android:theme="@style/NoTitle">
+            android:theme="@style/LinphoneStyleLight">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
@@ -176,7 +176,7 @@
         <activity
             android:name=".purchase.InAppPurchaseActivity"
             android:screenOrientation="nosensor"
-            android:theme="@style/NoTitle">
+            android:theme="@style/LinphoneStyleLight">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
@@ -184,7 +184,7 @@
         <activity
             android:name=".assistant.RemoteProvisioningLoginActivity"
             android:screenOrientation="nosensor"
-            android:theme="@style/NoTitle">
+            android:theme="@style/LinphoneStyleLight">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
@@ -192,7 +192,7 @@
         <activity
             android:name=".assistant.RemoteProvisioningActivity"
             android:screenOrientation="nosensor"
-            android:theme="@style/NoTitle">
+            android:theme="@style/LinphoneStyleLight">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>

app/src/main/java/org/linphone/assistant/AssistantActivity.java

@@ -19,7 +19,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
 import android.Manifest;
-import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.AlarmManager;
 import android.app.AlertDialog;
@@ -80,8 +79,9 @@ import org.linphone.mediastream.Version;
 import org.linphone.settings.LinphonePreferences;
 import org.linphone.settings.LinphonePreferences.AccountBuilder;
 import org.linphone.utils.LinphoneUtils;
+import org.linphone.utils.ThemableActivity;
 
-public class AssistantActivity extends Activity
+public class AssistantActivity extends ThemableActivity
         implements OnClickListener,
                 ActivityCompat.OnRequestPermissionsResultCallback,
                 AccountCreatorListener {
@@ -673,7 +673,7 @@ public class AssistantActivity extends Activity
                             WindowManager.LayoutParams.MATCH_PARENT,
                             WindowManager.LayoutParams.MATCH_PARENT);
             mProgress.getWindow().setBackgroundDrawable(d);
-            mProgress.setContentView(R.layout.progress_dialog);
+            mProgress.setContentView(R.layout.wait_layout);
             mProgress.show();
         }
     }
@@ -690,7 +690,7 @@ public class AssistantActivity extends Activity
                         WindowManager.LayoutParams.MATCH_PARENT,
                         WindowManager.LayoutParams.MATCH_PARENT);
         mProgress.getWindow().setBackgroundDrawable(d);
-        mProgress.setContentView(R.layout.progress_dialog);
+        mProgress.setContentView(R.layout.wait_layout);
         mProgress.show();
     }
 

app/src/main/java/org/linphone/assistant/RemoteProvisioningActivity.java

@@ -18,7 +18,6 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
-import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -39,8 +38,9 @@ import org.linphone.core.Core;
 import org.linphone.core.CoreListenerStub;
 import org.linphone.core.tools.Log;
 import org.linphone.settings.LinphonePreferences;
+import org.linphone.utils.ThemableActivity;
 
-public class RemoteProvisioningActivity extends Activity {
+public class RemoteProvisioningActivity extends ThemableActivity {
     private final Handler mHandler = new Handler();
     private String mConfigUriParam = null;
     private ProgressBar mSpinner;

app/src/main/java/org/linphone/assistant/RemoteProvisioningLoginActivity.java

@@ -31,10 +31,11 @@ import org.linphone.core.ConfiguringState;
 import org.linphone.core.Core;
 import org.linphone.core.CoreListenerStub;
 import org.linphone.settings.LinphonePreferences;
+import org.linphone.utils.ThemableActivity;
 import org.linphone.xmlrpc.XmlRpcHelper;
 import org.linphone.xmlrpc.XmlRpcListenerBase;
 
-public class RemoteProvisioningLoginActivity extends Activity implements OnClickListener {
+public class RemoteProvisioningLoginActivity extends ThemableActivity implements OnClickListener {
     private EditText mLogin, mPassword, mDomain;
     private Button mConnect;
     private CoreListenerStub mListener;

app/src/main/java/org/linphone/call/CallActivity.java

@@ -684,8 +684,7 @@ public class CallActivity extends LinphoneGenericActivity
                 !LinphoneManager.getLc().soundResourcesLocked()
                         && currentCall != null
                         && currentCall.getCurrentParams().getRecordFile() != null);
-        mRecordCall.setImageResource(
+        mRecordCall.setSelected(mIsRecording);
-                mIsRecording ? R.drawable.options_rec_selected : R.drawable.options_rec_default);
 
         mRecording.setEnabled(mIsRecording);
         mRecording.setVisibility(mIsRecording ? View.VISIBLE : View.GONE);
@@ -823,8 +822,7 @@ public class CallActivity extends LinphoneGenericActivity
         if (enable && !mIsRecording) {
             call.startRecording();
             Log.d("start call mRecording");
-
+            mRecordCall.setSelected(true);
-            mRecordCall.setImageResource(R.drawable.options_rec_selected);
 
             mRecording.setVisibility(View.VISIBLE);
             mRecording.setEnabled(true);
@@ -833,8 +831,7 @@ public class CallActivity extends LinphoneGenericActivity
         } else if (!enable && mIsRecording) {
             call.stopRecording();
             Log.d("stop call mRecording");
-
+            mRecordCall.setSelected(false);
-            mRecordCall.setImageResource(R.drawable.options_rec_default);
 
             mRecording.setVisibility(View.GONE);
             mRecording.setEnabled(false);

app/src/main/java/org/linphone/call/CallOutgoingActivity.java

@@ -216,20 +216,12 @@ public class CallOutgoingActivity extends LinphoneGenericActivity implements OnC
 
         if (id == R.id.micro) {
             mIsMicMuted = !mIsMicMuted;
-            if (mIsMicMuted) {
+            mMicro.setSelected(mIsMicMuted);
-                mMicro.setImageResource(R.drawable.micro_selected);
-            } else {
-                mMicro.setImageResource(R.drawable.micro_default);
-            }
             LinphoneManager.getLc().enableMic(!mIsMicMuted);
         }
         if (id == R.id.speaker) {
             mIsSpeakerEnabled = !mIsSpeakerEnabled;
-            if (mIsSpeakerEnabled) {
+            mSpeaker.setSelected(mIsSpeakerEnabled);
-                mSpeaker.setImageResource(R.drawable.route_speaker_selected);
-            } else {
-                mSpeaker.setImageResource(R.drawable.route_speaker_default);
-            }
             LinphoneManager.getInstance().enableSpeaker(mIsSpeakerEnabled);
         }
         if (id == R.id.outgoing_hang_up) {

app/src/main/java/org/linphone/chat/ChatMessagesOldAdapter.java

@@ -260,8 +260,7 @@ public class ChatMessagesOldAdapter extends SelectableAdapter<ChatMessageOldView
                         holder.fileTransferAction, mContext, R.style.font15);
                 holder.fileTransferAction.setBackgroundResource(
                         R.drawable.resizable_confirm_delete_button);
-                ContactAvatar.setAvatarMask(
+                ContactAvatar.setAvatarMask(holder.avatarLayout, R.drawable.avatar_mask);
-                        holder.avatarLayout, R.drawable.avatar_chat_mask_outgoing);
             } else {
                 for (LinphoneContact c : mParticipants) {
                     if (c != null && c.hasAddress(remoteSender.asStringUriOnly())) {
@@ -287,11 +286,12 @@ public class ChatMessagesOldAdapter extends SelectableAdapter<ChatMessageOldView
                 }
 
                 holder.background.setBackgroundResource(R.drawable.resizable_chat_bubble_incoming);
-                Compatibility.setTextAppearance(holder.contactName, mContext, R.style.font9);
+                Compatibility.setTextAppearance(
+                        holder.contactName, mContext, R.style.contact_organization_font);
                 Compatibility.setTextAppearance(holder.fileTransferAction, mContext, R.style.font8);
                 holder.fileTransferAction.setBackgroundResource(
                         R.drawable.resizable_assistant_button);
-                ContactAvatar.setAvatarMask(holder.avatarLayout, R.drawable.avatar_chat_mask);
+                ContactAvatar.setAvatarMask(holder.avatarLayout, R.drawable.avatar_mask);
             }
 
             if (contact == null) {

app/src/main/java/org/linphone/chat/ImdnOldFragment.java

@@ -151,11 +151,12 @@ public class ImdnOldFragment extends Fragment {
             ContactAvatar.setAvatarMask(mBubble.avatarLayout, R.drawable.avatar_chat_mask_outgoing);
         } else {
             mBubble.background.setBackgroundResource(R.drawable.resizable_chat_bubble_incoming);
-            Compatibility.setTextAppearance(mBubble.contactName, getActivity(), R.style.font9);
+            Compatibility.setTextAppearance(
+                    mBubble.contactName, getActivity(), R.style.contact_organization_font);
             Compatibility.setTextAppearance(
                     mBubble.fileTransferAction, getActivity(), R.style.font8);
             mBubble.fileTransferAction.setBackgroundResource(R.drawable.resizable_assistant_button);
-            ContactAvatar.setAvatarMask(mBubble.avatarLayout, R.drawable.avatar_chat_mask);
+            ContactAvatar.setAvatarMask(mBubble.avatarLayout, R.drawable.avatar_mask);
         }
 
         return view;

app/src/main/java/org/linphone/fragments/AboutFragment.java

@@ -120,7 +120,7 @@ public class AboutFragment extends Fragment implements OnClickListener {
                         WindowManager.LayoutParams.MATCH_PARENT,
                         WindowManager.LayoutParams.MATCH_PARENT);
         mProgress.getWindow().setBackgroundDrawable(d);
-        mProgress.setContentView(R.layout.progress_dialog);
+        mProgress.setContentView(R.layout.wait_layout);
         mProgress.show();
     }
 

app/src/main/java/org/linphone/settings/LinphonePreferences.java

@@ -1431,6 +1431,17 @@ public class LinphonePreferences {
         getConfig().setBool("app", "android_power_saver_dialog", b);
     }
 
+    public boolean isDarkModeEnabled() {
+        return /*AppCompatDelegate.getDefaultNightMode() == AppCompatDelegate.MODE_NIGHT_YES
+               && */ getConfig().getBool("app", "dark_mode", false);
+    }
+
+    public void enableDarkMode(boolean enable) {
+        /*AppCompatDelegate.setDefaultNightMode(
+        enable ? AppCompatDelegate.MODE_NIGHT_YES : AppCompatDelegate.MODE_NIGHT_NO);*/
+        getConfig().setBool("app", "dark_mode", enable);
+    }
+
     public static class AccountBuilder {
         private final Core lc;
         private String tempUsername;

app/src/main/java/org/linphone/settings/SettingsFragment.java

@@ -1689,6 +1689,8 @@ public class SettingsFragment extends PreferencesListFragment {
     }
 
     private void initAdvancedSettings() {
+        ((CheckBoxPreference) findPreference(getString(R.string.pref_dark_mode_key)))
+                .setChecked(mPrefs.isDarkModeEnabled());
         ((CheckBoxPreference) findPreference(getString(R.string.pref_friendlist_subscribe_key)))
                 .setChecked(mPrefs.isFriendlistsubscriptionEnabled());
         ((CheckBoxPreference) findPreference(getString(R.string.pref_debug_key)))
@@ -1710,6 +1712,23 @@ public class SettingsFragment extends PreferencesListFragment {
     }
 
     private void setAdvancedPreferencesListener() {
+        findPreference(getString(R.string.pref_dark_mode_key))
+                .setOnPreferenceChangeListener(
+                        new OnPreferenceChangeListener() {
+                            @Override
+                            public boolean onPreferenceChange(
+                                    Preference preference, Object newValue) {
+                                boolean value = (Boolean) newValue;
+                                mPrefs.enableDarkMode(value);
+                                if (value) {
+                                    LinphoneActivity.instance().setTheme(R.style.LinphoneStyleDark);
+                                } else {
+                                    LinphoneActivity.instance()
+                                            .setTheme(R.style.LinphoneStyleLight);
+                                }
+                                return true;
+                            }
+                        });
 
         findPreference(getString(R.string.pref_friendlist_subscribe_key))
                 .setOnPreferenceChangeListener(

app/src/main/java/org/linphone/utils/LinphoneGenericActivity.java

@@ -19,13 +19,12 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
-import android.app.Activity;
 import android.os.Bundle;
 import org.linphone.LinphoneLauncherActivity;
 import org.linphone.LinphoneManager;
 import org.linphone.LinphoneService;
 
-public class LinphoneGenericActivity extends Activity {
+public class LinphoneGenericActivity extends ThemableActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {

app/src/main/java/org/linphone/utils/ThemableActivity.java

@@ -0,0 +1,37 @@
+package org.linphone.utils;
+
+/*
+ThemableActivity.java
+Copyright (C) 2019 Belledonne Communications, Grenoble, France
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+import android.os.Bundle;
+import androidx.appcompat.app.AppCompatActivity;
+import org.linphone.R;
+import org.linphone.settings.LinphonePreferences;
+
+public class ThemableActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        if (LinphonePreferences.instance().isDarkModeEnabled()) {
+            setTheme(R.style.LinphoneStyleDark);
+        }
+
+        super.onCreate(savedInstanceState);
+    }
+}

app/src/main/java/org/linphone/views/EraseButton.java

@@ -36,6 +36,7 @@ public class EraseButton extends ImageView
 
     public EraseButton(Context context, AttributeSet attrs) {
         super(context, attrs);
+        setEnabled(false);
         setOnClickListener(this);
         setOnLongClickListener(this);
     }
@@ -50,6 +51,7 @@ public class EraseButton extends ImageView
                 mAddress.getEditableText().delete(lBegin - 1, lBegin);
             }
         }
+        setEnabled(mAddress.getText().length() > 0);
     }
 
     public boolean onLongClick(View v) {

app/src/main/res/drawable/backspace.xml

@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true"
+    <item android:state_pressed="true">
-        android:drawable="@drawable/backspace_over" />
+        <bitmap android:src="@drawable/backspace_default"
-	<item android:state_enabled="false"
+            android:tint="?attr/drawableTintOverColor"/>
-		  android:drawable="@drawable/backspace_disabled" />
+    </item>
-    <item
+    <item android:state_enabled="false">
-         android:drawable="@drawable/backspace_default" />
+        <bitmap android:src="@drawable/backspace_default"
+            android:tint="?attr/drawableTintDisabledColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/backspace_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>
-

app/src/main/res/drawable/button_background.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:state_pressed="true"
-		  android:drawable="@color/colorE" />
+		android:drawable="@color/colorE" />
 	<item android:state_enabled="false"
-		  android:drawable="@color/colorF" />
+		android:drawable="@color/colorF" />
 	<item
 		android:drawable="@color/colorF" />
 </selector>

app/src/main/res/drawable/camera.xml

@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/camera_selected" android:state_selected="true" />
+    <item android:state_pressed="true">
-    <item android:drawable="@drawable/camera_disabled" android:state_enabled="false" />
+        <bitmap android:src="@drawable/camera_default"
-    <item android:drawable="@drawable/camera_default" />
+            android:tint="?attr/drawableTintOverColor"/>
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/camera_default"
+            android:tint="?attr/drawableTintDisabledColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/camera_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>

app/src/main/res/drawable/chat.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/colorA" android:state_pressed="true" />
-    <item android:drawable="@color/colorD" android:state_selected="true" />
-    <item android:drawable="@color/colorD" />
-</selector>

app/src/main/res/drawable/chat_group_informations.xml

@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false"
+    <item android:state_pressed="true">
-        android:drawable="@drawable/chat_group_informations_disabled" />
+        <bitmap android:src="@drawable/chat_group_informations_default"
-    <item
+            android:tint="?attr/drawableTintOverColor"/>
-         android:drawable="@drawable/chat_group_informations_default" />
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/chat_group_informations_default"
+            android:tint="?attr/drawableTintDisabledColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/chat_group_informations_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>

app/src/main/res/drawable/chat_room_creation_confirm.xml

@@ -3,6 +3,6 @@
     <item android:state_enabled="true" 
         android:drawable="@drawable/valid_default" />
     <item android:state_enabled="false"
-         android:drawable="@drawable/valid_disabled" />
+        android:drawable="@drawable/valid_disabled" />
 </selector>
 

app/src/main/res/drawable/chat_room_creation_next.xml

@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="true" 
+    <item android:state_pressed="true">
-        android:drawable="@drawable/next" />
+        <bitmap android:src="@drawable/next"
-    <item android:state_enabled="false"
+            android:tint="?attr/drawableTintOverColor"/>
-         android:drawable="@drawable/next_disabled" />
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/next"
+            android:tint="?attr/drawableTintDisabledColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/next"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>
-

app/src/main/res/drawable/chat_room_group_infos.xml

@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="true" 
+    <item android:state_pressed="true">
-        android:drawable="@drawable/chat_group_informations" />
+        <bitmap android:src="@drawable/chat_group_informations_default"
-    <item android:state_enabled="false"
+            android:tint="?attr/drawableTintOverColor"/>
-         android:drawable="@drawable/chat_group_informations_disabled" />
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/chat_group_informations_default"
+            android:tint="?attr/drawableTintDisabledColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/chat_group_informations_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>
-

app/src/main/res/drawable/chat_send_message.xml

@@ -3,6 +3,6 @@
     <item android:state_pressed="true" 
         android:drawable="@drawable/chat_send_over" />
     <item
-         android:drawable="@drawable/chat_send_default" />
+        android:drawable="@drawable/chat_send_default" />
 </selector>
 

app/src/main/res/drawable/checkbox.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
 	<item android:state_checked="false"
-		  android:drawable="@drawable/checkbox_unchecked"/>
+		android:drawable="@drawable/checkbox_unchecked"/>
 	<item android:state_checked="true"
-		  android:drawable="@drawable/checkbox_checked"/>
+		android:drawable="@drawable/checkbox_checked"/>
 </selector>

app/src/main/res/drawable/clean_field.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true"
-         android:drawable="@drawable/clean_field_over" />
+        android:drawable="@drawable/clean_field_over" />
     <item
         android:drawable="@drawable/clean_field_default" />
 </selector>

app/src/main/res/drawable/contact_add.xml

@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_enabled="false"
+    <item android:state_pressed="true">
-		  android:drawable="@drawable/contact_add_disabled" />
+        <bitmap android:src="@drawable/contact_add_default"
-	<item
+            android:tint="?attr/drawableTintOverColor"/>
-		android:drawable="@drawable/contact_add_default" />
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/contact_add_default"
+            android:tint="?attr/drawableTintDisabledColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/contact_add_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>
-

app/src/main/res/drawable/contacts_all.xml

@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false"
+    <item android:state_pressed="true">
-        android:drawable="@drawable/contacts_all_selected" />
+        <bitmap android:src="@drawable/contacts_all_default"
-    <item
+            android:tint="?attr/drawableTintOverColor"/>
-        android:drawable="@drawable/contacts_all_default" />
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/contacts_all_default"
+            android:tint="?attr/accentColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/contacts_all_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>
-

app/src/main/res/drawable/contacts_sip.xml

@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false"
+    <item android:state_pressed="true">
-        android:drawable="@drawable/contacts_sip_selected" />
+        <bitmap android:src="@drawable/contacts_sip_default"
-    <item
+            android:tint="?attr/drawableTintOverColor"/>
-        android:drawable="@drawable/contacts_sip_default" />
+    </item>
-</selector>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/contacts_sip_default"
+            android:tint="?attr/accentColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/contacts_sip_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
+</selector>

app/src/main/res/drawable/delete.xml

@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/delete_disabled" android:state_enabled="false" />
+    <item android:state_pressed="true">
-    <item android:drawable="@drawable/delete_default" />
+        <bitmap android:src="@drawable/delete_default"
+            android:tint="?attr/drawableTintOverColor"/>
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/delete_default"
+            android:tint="?attr/drawableTintDisabledColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/delete_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>

app/src/main/res/drawable/delete_field.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:state_pressed="true"
-		  android:drawable="@drawable/delete_field_over" />
+		android:drawable="@drawable/delete_field_over" />
 	<item
 		android:drawable="@drawable/delete_field_default" />
 </selector>

app/src/main/res/drawable/edit_list.xml

@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false"
+    <item android:state_pressed="true">
-        android:drawable="@drawable/edit_list_disabled" />
+        <bitmap android:src="@drawable/edit_list_default"
-    <item
+            android:tint="?attr/drawableTintOverColor"/>
-         android:drawable="@drawable/edit_list_default" />
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/edit_list_default"
+            android:tint="?attr/drawableTintDisabledColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/edit_list_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>

app/src/main/res/drawable/event_decoration_gray.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="line">
-    xmlns:android="http://schemas.android.com/apk/res/android"
+    <stroke android:width="1dp" android:color="?attr/dividerColor"/>
-    android:shape="line">
-    <stroke android:width="1dp" android:color="@color/colorE"/>
     <size android:height="1dp" android:width="50dp" />
 </shape>

app/src/main/res/drawable/footer_button.xml

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:state_pressed="true"
-		  android:drawable="@color/colorA" />
+		android:drawable="@color/colorA" />
 	<item android:state_selected="true"
-		  android:drawable="@color/colorC" />
+		android:drawable="@color/colorC" />
-
 	<item
 		android:drawable="@color/colorC" />
 </selector>

app/src/main/res/drawable/generated_avatar_bg.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
-    <solid android:color="@color/colorC"/>
+    <solid android:color="?attr/primaryTextColor"/>
     <size android:width="35dp" android:height="35dp"/>
 </shape>

app/src/main/res/drawable/history_all.xml

@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false"
+    <item android:state_pressed="true">
-        android:drawable="@drawable/history_all_selected" />
+        <bitmap android:src="@drawable/history_all_default"
-    <item
+            android:tint="?attr/drawableTintOverColor"/>
-        android:drawable="@drawable/history_all_default"/>
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/history_all_default"
+            android:tint="?attr/accentColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/history_all_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>
-

app/src/main/res/drawable/history_missed.xml

@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false"
+    <item android:state_pressed="true">
-        android:drawable="@drawable/history_missed_selected" />
+        <bitmap android:src="@drawable/history_missed_default"
-    <item
+            android:tint="?attr/drawableTintOverColor"/>
-        android:drawable="@drawable/history_missed_default" />
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/history_missed_default"
+            android:tint="?attr/accentColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/history_missed_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>

app/src/main/res/drawable/list_detail.xml

@@ -3,5 +3,5 @@
     <item android:state_pressed="true" 
         android:drawable="@drawable/list_details_over" />
     <item
-         android:drawable="@drawable/list_details_default" />
+        android:drawable="@drawable/list_details_default" />
 </selector>

app/src/main/res/drawable/list_selector.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item 
-    	android:state_pressed="true" 
-        android:drawable="@color/colorH" />
-    <item
-         android:drawable="@color/colorH" />
-</selector>

app/src/main/res/drawable/micro.xml

@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/micro_selected" android:state_selected="true" />
+    <item android:state_pressed="true">
-    <item android:drawable="@drawable/micro_default" />
+        <bitmap android:src="@drawable/micro_default"
+            android:tint="?attr/drawableTintOverColor"/>
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/micro_default"
+            android:tint="?attr/drawableTintDisabledColor"/>
+    </item>
+    <item android:state_selected="true">
+        <bitmap android:src="@drawable/micro_default"
+            android:tint="?attr/drawableTintOverColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/micro_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>

app/src/main/res/drawable/numpad_eight.xml

@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" 
+    <item android:state_pressed="true">
-        android:drawable="@drawable/numpad_8_over" />
+        <bitmap android:src="@drawable/numpad_8"
-    <item
+            android:tint="?attr/accentColor"/>
-         android:drawable="@drawable/numpad_8" />
+    </item>
+    <item>
+        <bitmap android:src="@drawable/numpad_8"
+            android:tint="?attr/drawableDarkModeTintColor"/>
+    </item>
 </selector>
 

app/src/main/res/drawable/numpad_five.xml

@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" 
+    <item android:state_pressed="true">
-        android:drawable="@drawable/numpad_5_over" />
+        <bitmap android:src="@drawable/numpad_5"
-    <item
+            android:tint="?attr/accentColor"/>
-         android:drawable="@drawable/numpad_5" />
+    </item>
+    <item>
+        <bitmap android:src="@drawable/numpad_5"
+            android:tint="?attr/drawableDarkModeTintColor"/>
+    </item>
 </selector>
-

app/src/main/res/drawable/numpad_four.xml

@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" 
+    <item android:state_pressed="true">
-        android:drawable="@drawable/numpad_4_over" />
+        <bitmap android:src="@drawable/numpad_4"
-    <item
+            android:tint="?attr/accentColor"/>
-         android:drawable="@drawable/numpad_4" />
+    </item>
+    <item>
+        <bitmap android:src="@drawable/numpad_4"
+            android:tint="?attr/drawableDarkModeTintColor"/>
+    </item>
 </selector>
-

app/src/main/res/drawable/numpad_nine.xml

@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" 
+    <item android:state_pressed="true">
-        android:drawable="@drawable/numpad_9_over" />
+        <bitmap android:src="@drawable/numpad_9"
-    <item
+            android:tint="?attr/accentColor"/>
-         android:drawable="@drawable/numpad_9" />
+    </item>
+    <item>
+        <bitmap android:src="@drawable/numpad_9"
+            android:tint="?attr/drawableDarkModeTintColor"/>
+    </item>
 </selector>
-

app/src/main/res/drawable/numpad_one.xml

@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" 
+    <item android:state_pressed="true">
-        android:drawable="@drawable/numpad_1_over" />
+        <bitmap android:src="@drawable/numpad_1"
-    <item
+            android:tint="?attr/accentColor"/>
-         android:drawable="@drawable/numpad_1" />
+    </item>
+    <item>
+        <bitmap android:src="@drawable/numpad_1"
+            android:tint="?attr/drawableDarkModeTintColor"/>
+    </item>
 </selector>
-

app/src/main/res/drawable/numpad_seven.xml

@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" 
+    <item android:state_pressed="true">
-        android:drawable="@drawable/numpad_7_over" />
+        <bitmap android:src="@drawable/numpad_7"
-    <item
+            android:tint="?attr/accentColor"/>
-         android:drawable="@drawable/numpad_7" />
+    </item>
+    <item>
+        <bitmap android:src="@drawable/numpad_7"
+            android:tint="?attr/drawableDarkModeTintColor"/>
+    </item>
 </selector>
-

app/src/main/res/drawable/numpad_sharp.xml

@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" 
+    <item android:state_pressed="true">
-        android:drawable="@drawable/numpad_hash_over" />
+        <bitmap android:src="@drawable/numpad_hash"
-    <item
+            android:tint="?attr/accentColor"/>
-         android:drawable="@drawable/numpad_hash" />
+    </item>
+    <item>
+        <bitmap android:src="@drawable/numpad_hash"
+            android:tint="?attr/drawableDarkModeTintColor"/>
+    </item>
 </selector>
-

app/src/main/res/drawable/numpad_six.xml

@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" 
+    <item android:state_pressed="true">
-        android:drawable="@drawable/numpad_6_over" />
+        <bitmap android:src="@drawable/numpad_6"
-    <item
+            android:tint="?attr/accentColor"/>
-         android:drawable="@drawable/numpad_6" />
+    </item>
+    <item>
+        <bitmap android:src="@drawable/numpad_6"
+            android:tint="?attr/drawableDarkModeTintColor"/>
+    </item>
 </selector>
-

app/src/main/res/drawable/numpad_star_digit.xml

@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" 
+    <item android:state_pressed="true">
-        android:drawable="@drawable/numpad_star_over" />
+        <bitmap android:src="@drawable/numpad_star"
-    <item
+            android:tint="?attr/accentColor"/>
-         android:drawable="@drawable/numpad_star" />
+    </item>
+    <item>
+        <bitmap android:src="@drawable/numpad_star"
+            android:tint="?attr/drawableDarkModeTintColor"/>
+    </item>
 </selector>
-

app/src/main/res/drawable/numpad_three.xml

@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" 
+    <item android:state_pressed="true">
-        android:drawable="@drawable/numpad_3_over" />
+        <bitmap android:src="@drawable/numpad_3"
-    <item
+            android:tint="?attr/accentColor"/>
-         android:drawable="@drawable/numpad_3" />
+    </item>
+    <item>
+        <bitmap android:src="@drawable/numpad_3"
+            android:tint="?attr/drawableDarkModeTintColor"/>
+    </item>
 </selector>
-

app/src/main/res/drawable/numpad_two.xml

@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" 
+    <item android:state_pressed="true">
-        android:drawable="@drawable/numpad_2_over" />
+        <bitmap android:src="@drawable/numpad_2"
-    <item
+            android:tint="?attr/accentColor"/>
-         android:drawable="@drawable/numpad_2" />
+    </item>
+    <item>
+        <bitmap android:src="@drawable/numpad_2"
+            android:tint="?attr/drawableDarkModeTintColor"/>
+    </item>
 </selector>
-

app/src/main/res/drawable/numpad_zero.xml

@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" 
+    <item android:state_pressed="true">
-        android:drawable="@drawable/numpad_0_over" />
+        <bitmap android:src="@drawable/numpad_0"
-    <item
+            android:tint="?attr/accentColor"/>
-         android:drawable="@drawable/numpad_0" />
+    </item>
+    <item>
+        <bitmap android:src="@drawable/numpad_0"
+            android:tint="?attr/drawableDarkModeTintColor"/>
+    </item>
 </selector>
-

app/src/main/res/drawable/options.xml

@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/options_selected" android:state_selected="true" />
+    <item android:state_pressed="true">
-    <item android:drawable="@drawable/options_default" />
+        <bitmap android:src="@drawable/options_default"
+            android:tint="?attr/drawableTintOverColor"/>
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/options_default"
+            android:tint="?attr/drawableTintDisabledColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/options_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>

app/src/main/res/drawable/options_add_call.xml

@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_enabled="false"
+    <item android:state_pressed="true">
-		  android:drawable="@drawable/options_add_call_disabled" />
+        <bitmap android:src="@drawable/options_add_call_default"
-	<item
+            android:tint="?attr/drawableTintOverColor"/>
-		android:drawable="@drawable/options_add_call_default" />
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/options_add_call_default"
+            android:tint="?attr/drawableTintDisabledColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/options_add_call_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>

app/src/main/res/drawable/options_rec.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <bitmap android:src="@drawable/options_rec_default"
+            android:tint="?attr/drawableTintOverColor"/>
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/options_rec_default"
+            android:tint="?attr/drawableTintDisabledColor"/>
+    </item>
+    <item android:state_selected="true">
+        <bitmap android:src="@drawable/options_rec_default"
+            android:tint="?attr/drawableTintOverColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/options_rec_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
+</selector>

app/src/main/res/drawable/options_start_conference.xml

@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_enabled="false"
+    <item android:state_pressed="true">
-		  android:drawable="@drawable/options_start_conference_disabled" />
+        <bitmap android:src="@drawable/options_start_conference_default"
-	<item
+            android:tint="?attr/drawableTintOverColor"/>
-		android:drawable="@drawable/options_start_conference_default" />
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/options_start_conference_default"
+            android:tint="?attr/drawableTintDisabledColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/options_start_conference_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>

app/src/main/res/drawable/options_transfer_call.xml

@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_enabled="false"
+    <item android:state_pressed="true">
-		  android:drawable="@drawable/options_transfer_call_disabled" />
+        <bitmap android:src="@drawable/options_transfer_call_default"
-	<item
+            android:tint="?attr/drawableTintOverColor"/>
-		android:drawable="@drawable/options_transfer_call_default" />
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/options_transfer_call_default"
+            android:tint="?attr/drawableTintDisabledColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/options_transfer_call_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>

app/src/main/res/drawable/resizable_assistant_button.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:state_enabled="false"
-		  android:drawable="@drawable/resizable_assistant_button_disabled" />
+		android:drawable="@drawable/resizable_assistant_button_disabled" />
 	<item android:state_pressed="true"
 		android:drawable="@drawable/resizable_assistant_button_over" />
 	<item

app/src/main/res/drawable/round_button_background.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:state_pressed="true"
-		  android:drawable="@drawable/round_button_background_over" />
+		android:drawable="@drawable/round_button_background_over" />
 	<item
 		android:drawable="@drawable/round_button_background_default" />
 </selector>

app/src/main/res/drawable/route_bluetooth.xml

@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_selected="true"
+	<item android:state_pressed="true">
-		  android:drawable="@drawable/route_bluetooth_selected" />
+		<bitmap android:src="@drawable/route_bluetooth_default"
-	<item
+			android:tint="?attr/drawableTintOverColor"/>
-		android:drawable="@drawable/route_bluetooth_default" />
+	</item>
+	<item android:state_enabled="false">
+		<bitmap android:src="@drawable/route_bluetooth_default"
+			android:tint="?attr/drawableTintDisabledColor"/>
+	</item>
+	<item>
+		<bitmap android:src="@drawable/route_bluetooth_default"
+			android:tint="?attr/drawableTintColor"/>
+	</item>
 </selector>

app/src/main/res/drawable/route_earpiece.xml

@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_selected="true"
+    <item android:state_pressed="true">
-		  android:drawable="@drawable/route_earpiece_selected" />
+        <bitmap android:src="@drawable/route_earpiece_default"
-	<item
+            android:tint="?attr/drawableTintOverColor"/>
-		android:drawable="@drawable/route_earpiece_default" />
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/route_earpiece_default"
+            android:tint="?attr/drawableTintDisabledColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/route_earpiece_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>

app/src/main/res/drawable/route_speaker.xml

@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_selected="true"
+    <item android:state_pressed="true">
-		  android:drawable="@drawable/route_speaker_selected" />
+        <bitmap android:src="@drawable/route_speaker_default"
-	<item
+            android:tint="?attr/drawableTintOverColor"/>
-		android:drawable="@drawable/route_speaker_default" />
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/route_speaker_default"
+            android:tint="?attr/drawableTintDisabledColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/route_speaker_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>

app/src/main/res/drawable/routes.xml

@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/routes_selected" android:state_selected="true" />
+    <item android:state_pressed="true">
-    <item android:drawable="@drawable/routes_default" />
+        <bitmap android:src="@drawable/routes_default"
+            android:tint="?attr/drawableTintOverColor"/>
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/routes_default"
+            android:tint="?attr/drawableTintDisabledColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/routes_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>

app/src/main/res/drawable/speaker.xml

@@ -1,7 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/route_speaker_selected"
+    <item android:state_pressed="true">
-        android:state_selected="true" />
+        <bitmap android:src="@drawable/route_speaker_default"
-    <item
+            android:tint="?attr/drawableTintOverColor"/>
-         android:drawable="@drawable/route_speaker_default" />
+    </item>
+    <item android:state_enabled="false">
+        <bitmap android:src="@drawable/route_speaker_default"
+            android:tint="?attr/drawableTintDisabledColor"/>
+    </item>
+    <item android:state_selected="true">
+        <bitmap android:src="@drawable/route_speaker_default"
+            android:tint="?attr/drawableTintOverColor"/>
+    </item>
+    <item>
+        <bitmap android:src="@drawable/route_speaker_default"
+            android:tint="?attr/drawableTintColor"/>
+    </item>
 </selector>