diff --git a/art/ic_notifications_none_white80.svg b/art/ic_notifications_none_white80.svg
new file mode 100644
index 0000000000000000000000000000000000000000..d333130ff387ffc07dc58adc246b25c37af8a57c
--- /dev/null
+++ b/art/ic_notifications_none_white80.svg
@@ -0,0 +1,54 @@
+
+
diff --git a/art/ic_notifications_off_white80.svg b/art/ic_notifications_off_white80.svg
new file mode 100644
index 0000000000000000000000000000000000000000..f0af47b618385fff7962b31d89c7f2fe161c2139
--- /dev/null
+++ b/art/ic_notifications_off_white80.svg
@@ -0,0 +1,54 @@
+
+
diff --git a/art/ic_notifications_paused_white80.svg b/art/ic_notifications_paused_white80.svg
new file mode 100644
index 0000000000000000000000000000000000000000..4f92e8475f9bd033c468b90d69abddfdfbf68332
--- /dev/null
+++ b/art/ic_notifications_paused_white80.svg
@@ -0,0 +1,54 @@
+
+
diff --git a/art/ic_notifications_white80.svg b/art/ic_notifications_white80.svg
new file mode 100644
index 0000000000000000000000000000000000000000..398e51385e2cb499b3c5d52249e285e5b0ff3091
--- /dev/null
+++ b/art/ic_notifications_white80.svg
@@ -0,0 +1,54 @@
+
+
diff --git a/art/ic_send_cancel_offline_white.svg b/art/ic_send_cancel_offline_white.svg
new file mode 100644
index 0000000000000000000000000000000000000000..f84f62f571006e4ba134d474acf956cecd13b8da
--- /dev/null
+++ b/art/ic_send_cancel_offline_white.svg
@@ -0,0 +1,54 @@
+
+
diff --git a/art/ic_send_location_offline_white.svg b/art/ic_send_location_offline_white.svg
new file mode 100644
index 0000000000000000000000000000000000000000..f7f60a8f4db1a4709a662fed5893a00cf32a63fa
--- /dev/null
+++ b/art/ic_send_location_offline_white.svg
@@ -0,0 +1,54 @@
+
+
diff --git a/art/ic_send_photo_offline_white.svg b/art/ic_send_photo_offline_white.svg
new file mode 100644
index 0000000000000000000000000000000000000000..45875731c803b29fd50cb4bce6169b4d8f22b81b
--- /dev/null
+++ b/art/ic_send_photo_offline_white.svg
@@ -0,0 +1,60 @@
+
+
diff --git a/art/ic_send_picture_offline_white.svg b/art/ic_send_picture_offline_white.svg
new file mode 100644
index 0000000000000000000000000000000000000000..16131740f9c21841c47a7982a1b618501962dc01
--- /dev/null
+++ b/art/ic_send_picture_offline_white.svg
@@ -0,0 +1,55 @@
+
+
diff --git a/art/ic_send_text_offline_white.svg b/art/ic_send_text_offline_white.svg
new file mode 100644
index 0000000000000000000000000000000000000000..4434d33db9e1a8383d7d1f530895921c35cbf4b9
--- /dev/null
+++ b/art/ic_send_text_offline_white.svg
@@ -0,0 +1,70 @@
+
+
+
+
diff --git a/art/ic_send_voice_offline_white.svg b/art/ic_send_voice_offline_white.svg
new file mode 100644
index 0000000000000000000000000000000000000000..25ffe3223a1c2b48cffc44bae3cff8a27d9b5883
--- /dev/null
+++ b/art/ic_send_voice_offline_white.svg
@@ -0,0 +1,54 @@
+
+
diff --git a/art/message_bubble_received_grey.svg b/art/message_bubble_received_grey.svg
new file mode 100644
index 0000000000000000000000000000000000000000..e1d8347fc74460a4a3422021004ea49f9b4247ae
--- /dev/null
+++ b/art/message_bubble_received_grey.svg
@@ -0,0 +1,167 @@
+
+
+
+
diff --git a/art/message_bubble_sent_grey.svg b/art/message_bubble_sent_grey.svg
new file mode 100644
index 0000000000000000000000000000000000000000..23e13d665f699b166b0850c0fed3a7aa818abddf
--- /dev/null
+++ b/art/message_bubble_sent_grey.svg
@@ -0,0 +1,167 @@
+
+
+
+
diff --git a/art/render.rb b/art/render.rb
index 06100c5a2b220db9fbde50f5f97bdabfce21b92d..9f3096491113f198fe7e12b458a8e3f140ef2b85 100755
--- a/art/render.rb
+++ b/art/render.rb
@@ -12,42 +12,54 @@ resolutions = {
images = {
'conversations_baloon.svg' => ['ic_launcher', 48],
- 'conversations_baloon.svg' => ['main_logo', 200],
+ 'conversations_baloon.svg' => ['main_logo', 200],
'conversations_mono.svg' => ['ic_notification', 24],
'ic_received_indicator.svg' => ['ic_received_indicator', 12],
'ic_send_text_offline.svg' => ['ic_send_text_offline', 36],
+ 'ic_send_text_offline_white.svg' => ['ic_send_text_offline_white', 36],
'ic_send_text_online.svg' => ['ic_send_text_online', 36],
'ic_send_text_away.svg' => ['ic_send_text_away', 36],
'ic_send_text_dnd.svg' => ['ic_send_text_dnd', 36],
'ic_send_photo_online.svg' => ['ic_send_photo_online', 36],
'ic_send_photo_offline.svg' => ['ic_send_photo_offline', 36],
+ 'ic_send_photo_offline_white.svg' => ['ic_send_photo_offline_white', 36],
'ic_send_photo_away.svg' => ['ic_send_photo_away', 36],
'ic_send_photo_dnd.svg' => ['ic_send_photo_dnd', 36],
'ic_send_location_online.svg' => ['ic_send_location_online', 36],
'ic_send_location_offline.svg' => ['ic_send_location_offline', 36],
+ 'ic_send_location_offline_white.svg' => ['ic_send_location_offline_white', 36],
'ic_send_location_away.svg' => ['ic_send_location_away', 36],
'ic_send_location_dnd.svg' => ['ic_send_location_dnd', 36],
'ic_send_voice_online.svg' => ['ic_send_voice_online', 36],
'ic_send_voice_offline.svg' => ['ic_send_voice_offline', 36],
+ 'ic_send_voice_offline_white.svg' => ['ic_send_voice_offline_white', 36],
'ic_send_voice_away.svg' => ['ic_send_voice_away', 36],
'ic_send_voice_dnd.svg' => ['ic_send_voice_dnd', 36],
'ic_send_cancel_online.svg' => ['ic_send_cancel_online', 36],
'ic_send_cancel_offline.svg' => ['ic_send_cancel_offline', 36],
+ 'ic_send_cancel_offline_white.svg' => ['ic_send_cancel_offline_white', 36],
'ic_send_cancel_away.svg' => ['ic_send_cancel_away', 36],
'ic_send_cancel_dnd.svg' => ['ic_send_cancel_dnd', 36],
'ic_send_picture_online.svg' => ['ic_send_picture_online', 36],
'ic_send_picture_offline.svg' => ['ic_send_picture_offline', 36],
+ 'ic_send_picture_offline_white.svg' => ['ic_send_picture_offline_white', 36],
'ic_send_picture_away.svg' => ['ic_send_picture_away', 36],
'ic_send_picture_dnd.svg' => ['ic_send_picture_dnd', 36],
+ 'ic_notifications_none_white80.svg' => ['ic_notifications_none_white80', 24],
+ 'ic_notifications_off_white80.svg' => ['ic_notifications_off_white80', 24],
+ 'ic_notifications_paused_white80.svg' => ['ic_notifications_paused_white80', 24],
+ 'ic_notifications_white80.svg' => ['ic_notifications_white80', 24],
'md_switch_thumb_disable.svg' => ['switch_thumb_disable', 48],
'md_switch_thumb_off_normal.svg' => ['switch_thumb_off_normal', 48],
'md_switch_thumb_off_pressed.svg' => ['switch_thumb_off_pressed', 48],
'md_switch_thumb_on_normal.svg' => ['switch_thumb_on_normal', 48],
'md_switch_thumb_on_pressed.svg' => ['switch_thumb_on_pressed', 48],
'message_bubble_received.svg' => ['message_bubble_received.9', 0],
+ 'message_bubble_received_grey.svg' => ['message_bubble_received_grey.9', 0],
'message_bubble_received_warning.svg' => ['message_bubble_received_warning.9', 0],
'message_bubble_received_white.svg' => ['message_bubble_received_white.9', 0],
'message_bubble_sent.svg' => ['message_bubble_sent.9', 0],
+ 'message_bubble_sent_grey.svg' => ['message_bubble_sent_grey.9', 0],
}
# Executable paths for Mac OSX
diff --git a/src/main/java/eu/siacs/conversations/ui/AboutActivity.java b/src/main/java/eu/siacs/conversations/ui/AboutActivity.java
index a61b872aee3a17dc90e1896d4843b1ee4f1c3c81..5d51e8b964d6fc2796f9480779e0a92d3f276a78 100644
--- a/src/main/java/eu/siacs/conversations/ui/AboutActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/AboutActivity.java
@@ -1,7 +1,9 @@
package eu.siacs.conversations.ui;
import android.app.Activity;
+import android.content.res.Resources;
import android.os.Bundle;
+import android.preference.PreferenceManager;
import eu.siacs.conversations.R;
@@ -10,6 +12,12 @@ public class AboutActivity extends Activity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+
+ Boolean dark = PreferenceManager.getDefaultSharedPreferences(getApplicationContext())
+ .getString("theme", "light").equals("dark");
+ int mTheme = dark ? R.style.ConversationsTheme_Dark : R.style.ConversationsTheme;
+ setTheme(mTheme);
+
setContentView(R.layout.activity_about);
}
}
diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
index a82f82458a4c020ff36d0a3a1ad97477c2b0e3e8..a39f735ef0caf219cf19457fcc2ce5c17da2681c 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
@@ -559,18 +559,23 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
}
}
+ int ic_notifications = getThemeResource(R.attr.icon_notifications, R.drawable.ic_notifications_black54_24dp);
+ int ic_notifications_off = getThemeResource(R.attr.icon_notifications_off, R.drawable.ic_notifications_off_black54_24dp);
+ int ic_notifications_paused = getThemeResource(R.attr.icon_notifications_paused, R.drawable.ic_notifications_paused_black54_24dp);
+ int ic_notifications_none = getThemeResource(R.attr.icon_notifications_none, R.drawable.ic_notifications_none_black54_24dp);
+
long mutedTill = mConversation.getLongAttribute(Conversation.ATTRIBUTE_MUTED_TILL,0);
if (mutedTill == Long.MAX_VALUE) {
mNotifyStatusText.setText(R.string.notify_never);
- mNotifyStatusButton.setImageResource(R.drawable.ic_notifications_off_grey600_24dp);
+ mNotifyStatusButton.setImageResource(ic_notifications_off);
} else if (System.currentTimeMillis() < mutedTill) {
mNotifyStatusText.setText(R.string.notify_paused);
- mNotifyStatusButton.setImageResource(R.drawable.ic_notifications_paused_grey600_24dp);
+ mNotifyStatusButton.setImageResource(ic_notifications_paused);
} else if (mConversation.alwaysNotify()) {
- mNotifyStatusButton.setImageResource(R.drawable.ic_notifications_grey600_24dp);
+ mNotifyStatusButton.setImageResource(ic_notifications);
mNotifyStatusText.setText(R.string.notify_on_all_messages);
} else {
- mNotifyStatusButton.setImageResource(R.drawable.ic_notifications_none_grey600_24dp);
+ mNotifyStatusButton.setImageResource(ic_notifications_none);
mNotifyStatusText.setText(R.string.notify_only_when_highlighted);
}
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index 2717aa3d8d7fcf4c969fd56528221e8c950e774d..b097471355928383e5d4ccf578fa4d02a101a445 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -1569,8 +1569,8 @@ public class ConversationActivity extends XmppActivity
return getPreferences().getBoolean("indicate_received", false);
}
- public boolean useWhiteBackground() {
- return getPreferences().getBoolean("use_white_background",false);
+ public boolean useGreenBackground() {
+ return getPreferences().getBoolean("use_green_background",true);
}
protected boolean trustKeysIfNeeded(int requestCode) {
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 8e0b30a88380679e613f9915b4b406ea7dde9c07..53a365257da840736b8bfc94ed321978b5ecf018 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -9,6 +9,7 @@ import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.IntentSender.SendIntentException;
+import android.content.res.TypedArray;
import android.os.Bundle;
import android.os.Handler;
import android.support.annotation.Nullable;
@@ -998,7 +999,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
case DND:
return R.drawable.ic_send_text_dnd;
default:
- return R.drawable.ic_send_text_offline;
+ return activity.getThemeResource(R.attr.ic_send_text_offline, R.drawable.ic_send_text_offline);
}
case TAKE_PHOTO:
switch (status) {
@@ -1011,7 +1012,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
case DND:
return R.drawable.ic_send_photo_dnd;
default:
- return R.drawable.ic_send_photo_offline;
+ return activity.getThemeResource(R.attr.ic_send_photo_offline, R.drawable.ic_send_photo_offline);
}
case RECORD_VOICE:
switch (status) {
@@ -1024,7 +1025,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
case DND:
return R.drawable.ic_send_voice_dnd;
default:
- return R.drawable.ic_send_voice_offline;
+ return activity.getThemeResource(R.attr.ic_send_voice_offline, R.drawable.ic_send_voice_offline);
}
case SEND_LOCATION:
switch (status) {
@@ -1037,7 +1038,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
case DND:
return R.drawable.ic_send_location_dnd;
default:
- return R.drawable.ic_send_location_offline;
+ return activity.getThemeResource(R.attr.ic_send_location_offline, R.drawable.ic_send_location_offline);
}
case CANCEL:
switch (status) {
@@ -1050,7 +1051,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
case DND:
return R.drawable.ic_send_cancel_dnd;
default:
- return R.drawable.ic_send_cancel_offline;
+ return activity.getThemeResource(R.attr.ic_send_cancel_offline, R.drawable.ic_send_cancel_offline);
}
case CHOOSE_PICTURE:
switch (status) {
@@ -1063,10 +1064,10 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
case DND:
return R.drawable.ic_send_picture_dnd;
default:
- return R.drawable.ic_send_picture_offline;
+ return activity.getThemeResource(R.attr.ic_send_picture_offline, R.drawable.ic_send_picture_offline);
}
}
- return R.drawable.ic_send_text_offline;
+ return activity.getThemeResource(R.attr.ic_send_text_offline, R.drawable.ic_send_text_offline);
}
public void updateSendButton() {
diff --git a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
index 22e1263335534009b23bca3d1fa6e9bcbdaf83a4..17ade70248e90e7594a3fe68cddce8ec74bf53f5 100644
--- a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
@@ -14,7 +14,6 @@ import android.preference.Preference;
import android.preference.PreferenceCategory;
import android.preference.PreferenceManager;
import android.preference.PreferenceScreen;
-import android.util.Log;
import android.widget.Toast;
import java.security.KeyStoreException;
@@ -46,6 +45,13 @@ public class SettingsActivity extends XmppActivity implements
mSettingsFragment = new SettingsFragment();
fm.beginTransaction().replace(android.R.id.content, mSettingsFragment).commit();
}
+
+ this.mTheme = findTheme();
+ setTheme(this.mTheme);
+
+ int bgcolor = getPrimaryBackgroundColor();
+ getWindow().getDecorView().setBackgroundColor(bgcolor);
+
}
@Override
diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
index c63016434928ac21f9d05e13b83f0589d878867f..2d908ff85cff49298b974cd8c749186bde17fb68 100644
--- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
@@ -21,6 +21,7 @@ import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.content.res.Resources;
+import android.content.res.TypedArray;
import android.graphics.Bitmap;
import android.graphics.Color;
import android.graphics.Point;
@@ -379,6 +380,7 @@ public abstract class XmppActivity extends Activity {
super.onCreate(savedInstanceState);
metrics = getResources().getDisplayMetrics();
ExceptionHelper.init(getApplicationContext());
+
mPrimaryTextColor = getResources().getColor(R.color.black87);
mSecondaryTextColor = getResources().getColor(R.color.black54);
mTertiaryTextColor = getResources().getColor(R.color.black12);
@@ -388,8 +390,18 @@ public abstract class XmppActivity extends Activity {
mPrimaryColor = getResources().getColor(R.color.primary);
mPrimaryBackgroundColor = getResources().getColor(R.color.grey50);
mSecondaryBackgroundColor = getResources().getColor(R.color.grey200);
+
+ if(isDarkTheme()) {
+ mPrimaryTextColor = getResources().getColor(R.color.white);
+ mSecondaryTextColor = getResources().getColor(R.color.white70);
+ mTertiaryTextColor = getResources().getColor(R.color.white12);
+ mPrimaryBackgroundColor = getResources().getColor(R.color.grey800);
+ mSecondaryBackgroundColor = getResources().getColor(R.color.grey900);
+ }
+
this.mTheme = findTheme();
setTheme(this.mTheme);
+
this.mUsingEnterKey = usingEnterKey();
mUseSubject = getPreferences().getBoolean("use_subject", true);
final ActionBar ab = getActionBar();
@@ -398,6 +410,20 @@ public abstract class XmppActivity extends Activity {
}
}
+ public boolean isDarkTheme() {
+ return getPreferences().getString("theme", "light").equals("dark");
+ }
+
+ public int getThemeResource(int r_attr_name, int r_drawable_def) {
+ int[] attrs = { r_attr_name };
+ TypedArray ta = this.getTheme().obtainStyledAttributes(attrs);
+
+ int res = ta.getResourceId(0, r_drawable_def);
+ ta.recycle();
+
+ return res;
+ }
+
protected boolean isOptimizingBattery() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
PowerManager pm = (PowerManager) getSystemService(POWER_SERVICE);
@@ -1077,10 +1103,19 @@ public abstract class XmppActivity extends Activity {
}
protected int findTheme() {
- if (getPreferences().getBoolean("use_larger_font", false)) {
- return R.style.ConversationsTheme_LargerText;
+ Boolean dark = getPreferences().getString("theme", "light").equals("dark");
+ Boolean larger = getPreferences().getBoolean("use_larger_font", false);
+
+ if(dark) {
+ if(larger)
+ return R.style.ConversationsTheme_Dark_LargerText;
+ else
+ return R.style.ConversationsTheme_Dark;
} else {
- return R.style.ConversationsTheme;
+ if (larger)
+ return R.style.ConversationsTheme_LargerText;
+ else
+ return R.style.ConversationsTheme;
}
}
@@ -1098,6 +1133,7 @@ public abstract class XmppActivity extends Activity {
final int width = (size.x < size.y ? size.x : size.y);
Bitmap bitmap = createQrCodeBitmap(uri, width);
ImageView view = new ImageView(this);
+ view.setBackgroundColor(Color.WHITE);
view.setImageBitmap(bitmap);
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setView(view);
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
index 34c9d7b322f0230a6639e3a45f437430dc0e13a1..4576dea3c103b8a3f594574917fdec9700d23850 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
@@ -98,15 +98,18 @@ public class ConversationAdapter extends ArrayAdapter {
long muted_till = conversation.getLongAttribute(Conversation.ATTRIBUTE_MUTED_TILL,0);
if (muted_till == Long.MAX_VALUE) {
notificationStatus.setVisibility(View.VISIBLE);
- notificationStatus.setImageResource(R.drawable.ic_notifications_off_grey600_24dp);
+ int ic_notifications_off = activity.getThemeResource(R.attr.icon_notifications_off, R.drawable.ic_notifications_off_black54_24dp);
+ notificationStatus.setImageResource(ic_notifications_off);
} else if (muted_till >= System.currentTimeMillis()) {
notificationStatus.setVisibility(View.VISIBLE);
- notificationStatus.setImageResource(R.drawable.ic_notifications_paused_grey600_24dp);
+ int ic_notifications_paused = activity.getThemeResource(R.attr.icon_notifications_paused, R.drawable.ic_notifications_paused_black54_24dp);
+ notificationStatus.setImageResource(ic_notifications_paused);
} else if (conversation.alwaysNotify()) {
notificationStatus.setVisibility(View.GONE);
} else {
notificationStatus.setVisibility(View.VISIBLE);
- notificationStatus.setImageResource(R.drawable.ic_notifications_none_grey600_24dp);
+ int ic_notifications_none = activity.getThemeResource(R.attr.icon_notifications_none, R.drawable.ic_notifications_none_black54_24dp);
+ notificationStatus.setImageResource(ic_notifications_none);
}
mTimestamp.setText(UIHelper.readableTimeDifference(activity,conversation.getLatestMessage().getTimeSent()));
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index 5ba29802de54d697ca57f9e125b7682194f7eea0..1ea2c223c308be892b4b52b78bec478dfa455860 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -80,7 +80,7 @@ public class MessageAdapter extends ArrayAdapter {
}
};
private boolean mIndicateReceived = false;
- private boolean mUseWhiteBackground = false;
+ private boolean mUseGreenBackground = false;
public MessageAdapter(ConversationActivity activity, List messages) {
super(activity, 0, messages);
@@ -294,7 +294,7 @@ public class MessageAdapter extends ArrayAdapter {
viewHolder.messageBody.setText(span);
}
- private void displayTextMessage(final ViewHolder viewHolder, final Message message, boolean darkBackground) {
+ private void displayTextMessage(final ViewHolder viewHolder, final Message message, boolean darkBackground, int type) {
if (viewHolder.download_button != null) {
viewHolder.download_button.setVisibility(View.GONE);
}
@@ -388,7 +388,7 @@ public class MessageAdapter extends ArrayAdapter {
}
viewHolder.messageBody.setTextColor(this.getMessageTextColor(darkBackground, true));
viewHolder.messageBody.setLinkTextColor(this.getMessageTextColor(darkBackground, true));
- viewHolder.messageBody.setHighlightColor(activity.getResources().getColor(darkBackground ? R.color.grey800 : R.color.grey500));
+ viewHolder.messageBody.setHighlightColor(activity.getResources().getColor(darkBackground ? (type == SENT || !mUseGreenBackground ? R.color.black26 : R.color.grey800) : R.color.grey500));
viewHolder.messageBody.setTypeface(null, Typeface.NORMAL);
viewHolder.messageBody.setOnLongClickListener(openContextMenu);
}
@@ -556,7 +556,7 @@ public class MessageAdapter extends ArrayAdapter {
}
}
- boolean darkBackground = (type == RECEIVED && (!isInValidSession || !mUseWhiteBackground));
+ boolean darkBackground = type == RECEIVED && (!isInValidSession || mUseGreenBackground) || activity.isDarkTheme();
if (type == STATUS) {
if ("LOAD_MORE".equals(message.getBody())) {
@@ -672,14 +672,15 @@ public class MessageAdapter extends ArrayAdapter {
UIHelper.getFileDescriptionString(activity, message)));
}
} else {
- displayTextMessage(viewHolder, message, darkBackground);
+ displayTextMessage(viewHolder, message, darkBackground, type);
}
}
if (type == RECEIVED) {
if(isInValidSession) {
- if (mUseWhiteBackground) {
- viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_received_white);
+ if (!mUseGreenBackground) {
+ int bubble = activity.getThemeResource(R.attr.message_bubble_received_monochrome, R.drawable.message_bubble_received_white);
+ viewHolder.message_box.setBackgroundResource(bubble);
} else {
viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_received);
}
@@ -734,7 +735,7 @@ public class MessageAdapter extends ArrayAdapter {
public void updatePreferences() {
this.mIndicateReceived = activity.indicateReceived();
- this.mUseWhiteBackground = activity.useWhiteBackground();
+ this.mUseGreenBackground = activity.useGreenBackground();
}
public interface OnContactPictureClicked {
diff --git a/src/main/res/drawable-hdpi/ic_action_chat.png b/src/main/res/drawable-hdpi/ic_action_chat.png
deleted file mode 100644
index 0847ac4662f30520cd7efee2c29cea0cc33c3ea2..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-hdpi/ic_action_chat.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_action_copy_white.png b/src/main/res/drawable-hdpi/ic_action_copy_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..f97df1d51e42e97e1c289984f0c20f76da0f9cfc
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_action_copy_white.png differ
diff --git a/src/main/res/drawable-hdpi/ic_action_refresh_white.png b/src/main/res/drawable-hdpi/ic_action_refresh_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..dae27903e9ba3415808d48e6ac20afd6de64907b
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_action_refresh_white.png differ
diff --git a/src/main/res/drawable-hdpi/ic_action_remove_white.png b/src/main/res/drawable-hdpi/ic_action_remove_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..e206f296c2535b11a2243ae93a31b2957f42ab7d
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_action_remove_white.png differ
diff --git a/src/main/res/drawable-hdpi/ic_action_settings_white.png b/src/main/res/drawable-hdpi/ic_action_settings_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..54eecded35495a5d6e6bf2ea5f68003aec682bd0
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_action_settings_white.png differ
diff --git a/src/main/res/drawable-hdpi/ic_content_copy_black_24dp.png b/src/main/res/drawable-hdpi/ic_content_copy_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a9e5706fe8da95eef4231d4f1abe1d210c2eb81
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_content_copy_black_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_content_copy_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_content_copy_grey600_24dp.png
deleted file mode 100644
index 5592d5c80153adffbf0aa6918fdf98e18f0596b0..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-hdpi/ic_content_copy_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_content_copy_white_24dp.png b/src/main/res/drawable-hdpi/ic_content_copy_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..70eb0737882e53ec326b7a37cf335fea48f7b605
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_content_copy_white_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_delete_black_24dp.png b/src/main/res/drawable-hdpi/ic_delete_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..dbbb602a0bb2447f808240ec4add294016f777a5
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_delete_black_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_delete_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_delete_grey600_24dp.png
deleted file mode 100644
index b72a9f3c69795abc5529255c017ccd2797f319c3..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-hdpi/ic_delete_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_edit_black_24dp.png b/src/main/res/drawable-hdpi/ic_edit_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..b900af02c43dd0a7606b090cfa9a6b4b73998779
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_edit_black_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_edit_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_edit_grey600_24dp.png
deleted file mode 100644
index b5f88c80aca8694f31a1c9273ad9057090090d5c..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-hdpi/ic_edit_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_black54_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_black54_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..d0e987e89e9b93ec06554d6ea058612050a3fbff
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_notifications_black54_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_black_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..12969c50f9609fa866b9f787101345451ee40497
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_notifications_black_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_grey600_24dp.png
deleted file mode 100644
index 96b329c4ab41dc9d334d24a07584b430fddee214..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-hdpi/ic_notifications_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_none_black54_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_none_black54_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ea331d130902037ea61b54fa7a6b443ef035c3c
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_notifications_none_black54_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_none_black_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_none_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..32470b8beae660fd8e8e98789137efda1f5e6e32
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_notifications_none_black_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_none_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_none_grey600_24dp.png
deleted file mode 100644
index 6cd4dfc90b1582732829bfcdcc03fc3f0d0ae90b..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-hdpi/ic_notifications_none_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_none_white80.png b/src/main/res/drawable-hdpi/ic_notifications_none_white80.png
new file mode 100644
index 0000000000000000000000000000000000000000..258dad413d81ddb6085811980dd5d1e4bebdc4de
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_notifications_none_white80.png differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_none_white_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_none_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..b998c8c4936add7edb6dfe5440b2801262015ba5
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_notifications_none_white_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_off_black54_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_off_black54_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..98c28297844c63557a2861c13149b57e7013bde1
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_notifications_off_black54_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_off_black_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_off_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..06cfa7501af9e27b321cf9f363cb76b486ad3f75
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_notifications_off_black_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_off_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_off_grey600_24dp.png
deleted file mode 100644
index 09ebc5d25347333125525a611993664e45141000..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-hdpi/ic_notifications_off_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_off_white80.png b/src/main/res/drawable-hdpi/ic_notifications_off_white80.png
new file mode 100644
index 0000000000000000000000000000000000000000..62bd41c6787bf5b04e2ffdc72c96284c6f6820bd
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_notifications_off_white80.png differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_off_white_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_off_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2b23cf74ac46c7b61871a95fa04ee538f83ffc9
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_notifications_off_white_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_paused_black54_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_paused_black54_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..3366fc69367614f5c676ddcb3f5a8ec82e9e060c
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_notifications_paused_black54_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_paused_black_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_paused_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..a6cf0b15e72563d9fbb9c95847ce73b40be07b6e
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_notifications_paused_black_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_paused_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_paused_grey600_24dp.png
deleted file mode 100644
index e92d43acf22dbd4c9184b0e5fd2285ac10701a61..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-hdpi/ic_notifications_paused_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_paused_white80.png b/src/main/res/drawable-hdpi/ic_notifications_paused_white80.png
new file mode 100644
index 0000000000000000000000000000000000000000..396a9247caf2c14856fae682a0b0970db6d39f99
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_notifications_paused_white80.png differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_paused_white_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_paused_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..9210e39abf60e2ba48c7dfff55bde8235a062df1
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_notifications_paused_white_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_white80.png b/src/main/res/drawable-hdpi/ic_notifications_white80.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e262175ac28cc5aa53e2862bd3ca3cf618f209d
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_notifications_white80.png differ
diff --git a/src/main/res/drawable-hdpi/ic_notifications_white_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..d792f835a4c388229ebfce2473d4e80f8ea6a1eb
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_notifications_white_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_refresh_black_24dp.png b/src/main/res/drawable-hdpi/ic_refresh_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d94c39c84a55c5b7bcc9de206cc0099d173fece
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_refresh_black_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_refresh_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_refresh_grey600_24dp.png
deleted file mode 100644
index 51cc4dbd1568c1f132dafa2b73d46c5e66f85bd0..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-hdpi/ic_refresh_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png b/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..ffa7be9337df524557807b421e8f0c5a5f53ed08
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_cancel_offline_dark.png b/src/main/res/drawable-hdpi/ic_send_cancel_offline_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..7eedbb6fdc48c22eb92c1eca5797a305f8867251
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_cancel_offline_dark.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_cancel_offline_white.png b/src/main/res/drawable-hdpi/ic_send_cancel_offline_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..d5af1d004b6079ec5660040b9f482fd768c8551f
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_cancel_offline_white.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_location_offline_dark.png b/src/main/res/drawable-hdpi/ic_send_location_offline_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..301aac16a8b6d700eb5a83849033a7a2c7ce721b
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_location_offline_dark.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_location_offline_white.png b/src/main/res/drawable-hdpi/ic_send_location_offline_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6f60c2f769544d98abf0bd84e94352faef3e3de
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_location_offline_white.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_photo_offline_dark.png b/src/main/res/drawable-hdpi/ic_send_photo_offline_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..e90564f1d775c79b78bd64c5f33a90bbe01efc12
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_photo_offline_dark.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_photo_offline_white.png b/src/main/res/drawable-hdpi/ic_send_photo_offline_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ef8d36aa97ac046d7f1b15a83e37becf090b73c
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_photo_offline_white.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_picture_offline_dark.png b/src/main/res/drawable-hdpi/ic_send_picture_offline_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d6a0538d5d4c2712a7c5b09f378cec995f7703a
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_picture_offline_dark.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_picture_offline_white.png b/src/main/res/drawable-hdpi/ic_send_picture_offline_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..611785bc36a4f35455e353b9a80fa00ce1398755
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_picture_offline_white.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_text_offline_dark.png b/src/main/res/drawable-hdpi/ic_send_text_offline_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..dcb74bcde42bfdc66c7d516f7062aa8fae385343
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_text_offline_dark.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_text_offline_white.png b/src/main/res/drawable-hdpi/ic_send_text_offline_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d600e355f916e8bb6ec09c0fdd1cb0c47ff8f19
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_text_offline_white.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_voice_offline_dark.png b/src/main/res/drawable-hdpi/ic_send_voice_offline_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..87111a6273ebe63534773f5f60d107cf7245a344
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_voice_offline_dark.png differ
diff --git a/src/main/res/drawable-hdpi/ic_send_voice_offline_white.png b/src/main/res/drawable-hdpi/ic_send_voice_offline_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..73e3bb9792c7e0ae0bb812ae24e1c1c4c98f35b2
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_send_voice_offline_white.png differ
diff --git a/src/main/res/drawable-hdpi/ic_settings_black_24dp.png b/src/main/res/drawable-hdpi/ic_settings_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..acf1ddf85b3388b4fb02a683664d7599d96ebfe3
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_settings_black_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_settings_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_settings_grey600_24dp.png
deleted file mode 100644
index 20d2b66e05272ae1caa3575316ed6d8d5360610e..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-hdpi/ic_settings_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/ic_settings_white_24dp.png b/src/main/res/drawable-hdpi/ic_settings_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..97ded33b5558a0efbd7812296a52325b4170076e
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_settings_white_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/message_bubble_received.9.png b/src/main/res/drawable-hdpi/message_bubble_received.9.png
index dfd857cb2e805ce5c6492294732bf34fc9928438..9e6c9551e1d4665c699fb52144889601d180814b 100644
Binary files a/src/main/res/drawable-hdpi/message_bubble_received.9.png and b/src/main/res/drawable-hdpi/message_bubble_received.9.png differ
diff --git a/src/main/res/drawable-hdpi/message_bubble_received_grey.9.png b/src/main/res/drawable-hdpi/message_bubble_received_grey.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..eaa1fd246401b101e86312359b47027675fce102
Binary files /dev/null and b/src/main/res/drawable-hdpi/message_bubble_received_grey.9.png differ
diff --git a/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png
index fd07bc20ce6312b4c7425685f1614291ac96efe4..29cf4844ef50ed0d1b7a94eb3ed9cfcdae3c65b6 100644
Binary files a/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png and b/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png differ
diff --git a/src/main/res/drawable-hdpi/message_bubble_received_white.9.png b/src/main/res/drawable-hdpi/message_bubble_received_white.9.png
index bec207983cd4b66ecbd9a5f545489cfeae76eb2d..45678001bacf271474103b7b2809b59155a2d59f 100644
Binary files a/src/main/res/drawable-hdpi/message_bubble_received_white.9.png and b/src/main/res/drawable-hdpi/message_bubble_received_white.9.png differ
diff --git a/src/main/res/drawable-hdpi/message_bubble_sent.9.png b/src/main/res/drawable-hdpi/message_bubble_sent.9.png
index 10dc2e299ccb09b9b0b52925512920a740ecc8a1..627e3a784842b51e859c2ba9c73f9da34a9b0ecb 100644
Binary files a/src/main/res/drawable-hdpi/message_bubble_sent.9.png and b/src/main/res/drawable-hdpi/message_bubble_sent.9.png differ
diff --git a/src/main/res/drawable-hdpi/message_bubble_sent_grey.9.png b/src/main/res/drawable-hdpi/message_bubble_sent_grey.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..a59c123649ff1998f02887225818117bd4395380
Binary files /dev/null and b/src/main/res/drawable-hdpi/message_bubble_sent_grey.9.png differ
diff --git a/src/main/res/drawable-mdpi/ic_action_chat.png b/src/main/res/drawable-mdpi/ic_action_chat.png
deleted file mode 100644
index 8fdb5d752e3ba76b1747a62097c4073cf4e62478..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-mdpi/ic_action_chat.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_action_copy_white.png b/src/main/res/drawable-mdpi/ic_action_copy_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..d846e72c612f6d3b9b0e3a77ed010bce6e159efd
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_action_copy_white.png differ
diff --git a/src/main/res/drawable-mdpi/ic_action_refresh_white.png b/src/main/res/drawable-mdpi/ic_action_refresh_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..94ab6f4c5dd8f3a082b2a84d6e08f2564a589d94
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_action_refresh_white.png differ
diff --git a/src/main/res/drawable-mdpi/ic_action_remove_white.png b/src/main/res/drawable-mdpi/ic_action_remove_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..70e6d2d2a0e95eb311fe958b897f3a99391ab00f
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_action_remove_white.png differ
diff --git a/src/main/res/drawable-mdpi/ic_action_settings_white.png b/src/main/res/drawable-mdpi/ic_action_settings_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..25c36db42c6128d7038fc7c684b299be7c66dee2
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_action_settings_white.png differ
diff --git a/src/main/res/drawable-mdpi/ic_content_copy_black_24dp.png b/src/main/res/drawable-mdpi/ic_content_copy_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..c94cc28f136e98ffc0119a71ba0d59e49881a06b
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_content_copy_black_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_content_copy_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_content_copy_grey600_24dp.png
deleted file mode 100644
index bab9b4d669edd03f93365a4d2f23daec6edc1a84..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-mdpi/ic_content_copy_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_content_copy_white_24dp.png b/src/main/res/drawable-mdpi/ic_content_copy_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..80c069557c2a2beb8097b66c237571807d1fd973
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_content_copy_white_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_delete_black_24dp.png b/src/main/res/drawable-mdpi/ic_delete_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..999aa4ccc3f87967d30bed76cd980653d9ad2e95
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_delete_black_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_delete_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_delete_grey600_24dp.png
deleted file mode 100644
index e757fdb07dbd51e84e7d121d5939bb50b2894099..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-mdpi/ic_delete_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_edit_black_24dp.png b/src/main/res/drawable-mdpi/ic_edit_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..9efbaae2884ce2b15d160cbc1b1d3aa806545068
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_edit_black_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_edit_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_edit_grey600_24dp.png
deleted file mode 100644
index bae3480cb123b0dfafaea1bea608b82994d06519..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-mdpi/ic_edit_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_black54_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_black54_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..91cd0b8497f95932dc15b0692f336abb90d8210b
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_notifications_black54_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_black_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..32562b0f3a9a0889cf2dc2337271e83bb168d6c3
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_notifications_black_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_grey600_24dp.png
deleted file mode 100644
index d6c20c203e092cb9db79188a3ee25ac2f509d591..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-mdpi/ic_notifications_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_none_black54_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_none_black54_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c41a4452e97ea8fe969049e18286c2568f8ab1b
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_notifications_none_black54_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_none_black_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_none_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..883efb08b34694e67cb8afa40110963f51a70e27
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_notifications_none_black_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_none_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_none_grey600_24dp.png
deleted file mode 100644
index 3e8b0805c273ad36b22e67bf29400bc438c714eb..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-mdpi/ic_notifications_none_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_none_white80.png b/src/main/res/drawable-mdpi/ic_notifications_none_white80.png
new file mode 100644
index 0000000000000000000000000000000000000000..4851fcb126828c690fa97103853d1e160895862b
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_notifications_none_white80.png differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_none_white_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_none_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..45f4704e1445a5b82bcf9da24879d8e1b7321718
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_notifications_none_white_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_off_black54_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_off_black54_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2ee2de297d23a37e43662fe04615962dcfc34aa
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_notifications_off_black54_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_off_black_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_off_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..8838da991a0f33775f3d8d9c9b345e254e998785
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_notifications_off_black_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_off_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_off_grey600_24dp.png
deleted file mode 100644
index af3b6321574523ec8782d4635b92abb2278aadd7..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-mdpi/ic_notifications_off_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_off_white80.png b/src/main/res/drawable-mdpi/ic_notifications_off_white80.png
new file mode 100644
index 0000000000000000000000000000000000000000..f15f78737fa88d1f415268c687d0ddb9353cdfbe
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_notifications_off_white80.png differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_off_white_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_off_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..3fec9c71ea34043b37e3e23c965e408cf6702cca
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_notifications_off_white_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_paused_black54_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_paused_black54_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c4fc2eff7a35449b927a5b0a3d4fd427470002d
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_notifications_paused_black54_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_paused_black_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_paused_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c238fd5fc31f7b0f596070dadbf0a42c68e9ca5
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_notifications_paused_black_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_paused_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_paused_grey600_24dp.png
deleted file mode 100644
index 9d6308d2c13bb82f4a06cbdf98b3d4c0bb1c75c0..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-mdpi/ic_notifications_paused_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_paused_white80.png b/src/main/res/drawable-mdpi/ic_notifications_paused_white80.png
new file mode 100644
index 0000000000000000000000000000000000000000..83091bbfab397d76fa59970a5930a506c7ad30e8
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_notifications_paused_white80.png differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_paused_white_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_paused_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a48f2f72df1dbed9251f15774b5ddc2591a1574
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_notifications_paused_white_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_white80.png b/src/main/res/drawable-mdpi/ic_notifications_white80.png
new file mode 100644
index 0000000000000000000000000000000000000000..983aa4549f8a7b4875d45d80eec9428426d96607
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_notifications_white80.png differ
diff --git a/src/main/res/drawable-mdpi/ic_notifications_white_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a5c93c73fa521f06a59bf5ee33ac072f20b8268
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_notifications_white_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_refresh_black_24dp.png b/src/main/res/drawable-mdpi/ic_refresh_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..c82efd5f5fdcbe7c85b26007a4543c35608495d8
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_refresh_black_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_refresh_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_refresh_grey600_24dp.png
deleted file mode 100644
index c136c59fca31bd455695d7dc6ddbc4536a54a7ac..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-mdpi/ic_refresh_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png b/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..97e42b5251a984f151a3fc469c583c360763aa17
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_cancel_offline_dark.png b/src/main/res/drawable-mdpi/ic_send_cancel_offline_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..fac99623bdc1522c64b7b83b265c91e0e84abf8a
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_cancel_offline_dark.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_cancel_offline_white.png b/src/main/res/drawable-mdpi/ic_send_cancel_offline_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..64cdb9918c971193e70a87d9a25f5e1cb96ccc8f
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_cancel_offline_white.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_location_offline_dark.png b/src/main/res/drawable-mdpi/ic_send_location_offline_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..17185ec24c66bfd1be8003249d269b38356f1ce3
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_location_offline_dark.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_location_offline_white.png b/src/main/res/drawable-mdpi/ic_send_location_offline_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a70df284b9b83a54efe8814cd8bd7f5d2fb9fcc
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_location_offline_white.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_photo_offline_dark.png b/src/main/res/drawable-mdpi/ic_send_photo_offline_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..268182ff21f78ec8cc75f2a571af64f95eddc9ac
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_photo_offline_dark.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_photo_offline_white.png b/src/main/res/drawable-mdpi/ic_send_photo_offline_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..69a05186274f02332574136ead0ba2ca10f15194
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_photo_offline_white.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_picture_offline_dark.png b/src/main/res/drawable-mdpi/ic_send_picture_offline_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..f153be99ebc69168f37a341af42b0582bb7641d7
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_picture_offline_dark.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_picture_offline_white.png b/src/main/res/drawable-mdpi/ic_send_picture_offline_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..98428b7947821e52afa6e4994202d4247f3ffaba
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_picture_offline_white.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_text_offline_dark.png b/src/main/res/drawable-mdpi/ic_send_text_offline_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..5cf508afc7eeebcdd37ebda123eb44b6a0deb1c6
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_text_offline_dark.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_text_offline_white.png b/src/main/res/drawable-mdpi/ic_send_text_offline_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8220cf9634022dbca3b36f70b3fca2698804b57
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_text_offline_white.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_voice_offline_dark.png b/src/main/res/drawable-mdpi/ic_send_voice_offline_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ae192c41790f9116361e60f4d4008570d9201a5
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_voice_offline_dark.png differ
diff --git a/src/main/res/drawable-mdpi/ic_send_voice_offline_white.png b/src/main/res/drawable-mdpi/ic_send_voice_offline_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d18b812e4b889544ffca5ef6e49f138b4f82cb8
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_send_voice_offline_white.png differ
diff --git a/src/main/res/drawable-mdpi/ic_settings_black_24dp.png b/src/main/res/drawable-mdpi/ic_settings_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..c59419c02b6273e09063a0529d2239784818207f
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_settings_black_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_settings_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_settings_grey600_24dp.png
deleted file mode 100644
index 5a1b41f037163a02862327f74fb73cbf235682e2..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-mdpi/ic_settings_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/ic_settings_white_24dp.png b/src/main/res/drawable-mdpi/ic_settings_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..8909c3553600d7e8148df21f8ef8a8ca655ade7b
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_settings_white_24dp.png differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_received.9.png b/src/main/res/drawable-mdpi/message_bubble_received.9.png
index 9835a7361b4365a7b9aa81598ce3dd75d4c13834..d5efb93102ad4f1c7c038258c9adaec0134cc6be 100644
Binary files a/src/main/res/drawable-mdpi/message_bubble_received.9.png and b/src/main/res/drawable-mdpi/message_bubble_received.9.png differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_received_grey.9.png b/src/main/res/drawable-mdpi/message_bubble_received_grey.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..3cc08a8e919293494e4125d10be6d151be2c4b7d
Binary files /dev/null and b/src/main/res/drawable-mdpi/message_bubble_received_grey.9.png differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png
index ff8f80b697facd980266761de963e630a4adcb00..97b4927588e04a1a81baadb9716518f6ba3964ad 100644
Binary files a/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png and b/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_received_white.9.png b/src/main/res/drawable-mdpi/message_bubble_received_white.9.png
index d7a3bb5dddc0fccc70450721d96f7bee9fc42471..73a99dd7c21114fb9740d69ffa68e2057d5fd7b1 100644
Binary files a/src/main/res/drawable-mdpi/message_bubble_received_white.9.png and b/src/main/res/drawable-mdpi/message_bubble_received_white.9.png differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_sent.9.png b/src/main/res/drawable-mdpi/message_bubble_sent.9.png
index 596699bbe5009a374b71c9988e8f0a6cc4917bdb..5776b564503401fcf9a02f9b463ecdedc040a1aa 100644
Binary files a/src/main/res/drawable-mdpi/message_bubble_sent.9.png and b/src/main/res/drawable-mdpi/message_bubble_sent.9.png differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_sent_grey.9.png b/src/main/res/drawable-mdpi/message_bubble_sent_grey.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..72a11f5e1c6c34aebeb4d5908aa4d1e330ff60d9
Binary files /dev/null and b/src/main/res/drawable-mdpi/message_bubble_sent_grey.9.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_chat.png b/src/main/res/drawable-xhdpi/ic_action_chat.png
deleted file mode 100644
index 8a9a431411f0b633baabdfc9d7375e98a0dd6628..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xhdpi/ic_action_chat.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_copy_white.png b/src/main/res/drawable-xhdpi/ic_action_copy_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..a6e1aa290b94f5516dc596ec2d0186450ea99a5c
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_action_copy_white.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_refresh_white.png b/src/main/res/drawable-xhdpi/ic_action_refresh_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab4ab9da697b8c68c0c7ba498dc3bb3dc3da9c2b
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_action_refresh_white.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_remove_white.png b/src/main/res/drawable-xhdpi/ic_action_remove_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1634205dfec57c9ce660a6bd6e9338c4a4a7b86
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_action_remove_white.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_settings_white.png b/src/main/res/drawable-xhdpi/ic_action_settings_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..425a8bc8dce5daa8c5f4f78b0b7052805a66e950
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_action_settings_white.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_content_copy_black_24dp.png b/src/main/res/drawable-xhdpi/ic_content_copy_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..1cf76a960302404d6bb4cbd0c3e96aea8245a68f
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_content_copy_black_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_content_copy_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_content_copy_grey600_24dp.png
deleted file mode 100644
index 68ccece61d349fda144356ca660bbc4d154bf749..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xhdpi/ic_content_copy_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_content_copy_white_24dp.png b/src/main/res/drawable-xhdpi/ic_content_copy_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..537fd4e8b4444ac18d9d339f0f57badcf960454d
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_content_copy_white_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_delete_black_24dp.png b/src/main/res/drawable-xhdpi/ic_delete_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..796ccd22559a9b362e6cbb0c804a443bf1b3c113
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_delete_black_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_delete_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_delete_grey600_24dp.png
deleted file mode 100644
index c6bb43e8bd3e3e8155083c05eeef03d9bd054c6c..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xhdpi/ic_delete_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_edit_black_24dp.png b/src/main/res/drawable-xhdpi/ic_edit_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..87f8de1ca302d83b746b391b83594f3cb0f39a4a
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_edit_black_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_edit_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_edit_grey600_24dp.png
deleted file mode 100644
index 4c95bd5770afb117fc5363e259ee6232d445b2af..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xhdpi/ic_edit_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_black54_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_black54_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..9bc2a6a6cc1c4c727814fe121127e6683f104d7d
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_notifications_black54_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_black_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..98cbec6ed70a7417b5b52622f398b303581a815e
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_notifications_black_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_grey600_24dp.png
deleted file mode 100644
index d441dc7c950b8bcb5b976a0cb4bad4e0de4c1e21..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xhdpi/ic_notifications_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_none_black54_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_none_black54_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..d5586382912b96f8eb2f4fd591d864dce080f257
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_notifications_none_black54_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_none_black_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_none_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac14eba941024d19b7dffbb24f06057de9f70289
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_notifications_none_black_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_none_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_none_grey600_24dp.png
deleted file mode 100644
index 1123cea4305cfe36c31f6d29706620bf60570568..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xhdpi/ic_notifications_none_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_none_white80.png b/src/main/res/drawable-xhdpi/ic_notifications_none_white80.png
new file mode 100644
index 0000000000000000000000000000000000000000..5585a2ea77500e6fc14141069852406c2ce0a30c
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_notifications_none_white80.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_none_white_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_none_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..19eba2084796f264a6224d59d546c3e5df9dcbe2
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_notifications_none_white_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_off_black54_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_off_black54_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..92dbcf147ce43021f0f564ec37f38f6e7652d0a8
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_notifications_off_black54_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_off_black_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_off_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d6643bcc2abc57997fc60fedafc775c901ea5b5
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_notifications_off_black_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_off_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_off_grey600_24dp.png
deleted file mode 100644
index aef303a0ddd26534363223b1b808fec9609ce5a7..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xhdpi/ic_notifications_off_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_off_white80.png b/src/main/res/drawable-xhdpi/ic_notifications_off_white80.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff5246b7468ba4a5921d7cca30a77683489d33f5
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_notifications_off_white80.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_off_white_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_off_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e96f6deb5661fec3f515ef1d54aab551cf05ae1
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_notifications_off_white_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_paused_black54_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_paused_black54_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd0ddaa036a20c26b828ab184266807f82017e0f
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_notifications_paused_black54_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_paused_black_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_paused_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..bea6a8235250dfb420647f8795edc3d5bea9e58f
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_notifications_paused_black_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_paused_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_paused_grey600_24dp.png
deleted file mode 100644
index c68bedd383837e956c04d6691ff2aceb2442f5ab..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xhdpi/ic_notifications_paused_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_paused_white80.png b/src/main/res/drawable-xhdpi/ic_notifications_paused_white80.png
new file mode 100644
index 0000000000000000000000000000000000000000..644e0652bdb2f4643c30d66fccca2cb21e9d4331
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_notifications_paused_white80.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_paused_white_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_paused_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf566ec2a78781ee74b66d7cdcc0895a3593a647
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_notifications_paused_white_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_white80.png b/src/main/res/drawable-xhdpi/ic_notifications_white80.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3405e98d08a1429a5b9b395dd342d49625f7829
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_notifications_white80.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_notifications_white_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..9718ccf0096a0531a5fd88b8282f651a38bfa841
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_notifications_white_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_refresh_black_24dp.png b/src/main/res/drawable-xhdpi/ic_refresh_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b731280fd9e3ab6a4f337f0fdcaf9402539ea5d
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_refresh_black_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_refresh_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_refresh_grey600_24dp.png
deleted file mode 100644
index 7891efffa64deb1140c0c039b32bf4a0493bf96c..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xhdpi/ic_refresh_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png b/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..1989184b14751617cf6e19e833810f91563f7522
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_cancel_offline_dark.png b/src/main/res/drawable-xhdpi/ic_send_cancel_offline_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..f55c282d860d7a85cd0ea2ad805109243fb4324e
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_cancel_offline_dark.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_cancel_offline_white.png b/src/main/res/drawable-xhdpi/ic_send_cancel_offline_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb8df87938413b7cf5d3ffb5fd119f052c3e4de7
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_cancel_offline_white.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_location_offline_dark.png b/src/main/res/drawable-xhdpi/ic_send_location_offline_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..54788f08e994ed3bb799c460296277f419601b05
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_location_offline_dark.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_location_offline_white.png b/src/main/res/drawable-xhdpi/ic_send_location_offline_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..951bfdee65c84dc934ae57c1e62d34eee75e3dbc
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_location_offline_white.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_photo_offline_dark.png b/src/main/res/drawable-xhdpi/ic_send_photo_offline_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec86ad5e039aa1733428c22d5d8e25e799659ec6
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_photo_offline_dark.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_photo_offline_white.png b/src/main/res/drawable-xhdpi/ic_send_photo_offline_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..91a6b719c38cb14eb3b0ecf89bd684417eb126f9
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_photo_offline_white.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_picture_offline_dark.png b/src/main/res/drawable-xhdpi/ic_send_picture_offline_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e687799d0f62b51725c513fad91db53e684d33c
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_picture_offline_dark.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_picture_offline_white.png b/src/main/res/drawable-xhdpi/ic_send_picture_offline_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..b5b3d84cc8ee5805df2356f543927223b770fee8
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_picture_offline_white.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_text_offline_dark.png b/src/main/res/drawable-xhdpi/ic_send_text_offline_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3c91e8ae206b165a5bf8e34ce90a4ce499e055f
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_text_offline_dark.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_text_offline_white.png b/src/main/res/drawable-xhdpi/ic_send_text_offline_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..bbd5d4449c83c86d4869fe952ea59a572988b54f
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_text_offline_white.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_voice_offline_dark.png b/src/main/res/drawable-xhdpi/ic_send_voice_offline_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..f7a454df45a53daf42a3571ee310802db8bbbd15
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_voice_offline_dark.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_send_voice_offline_white.png b/src/main/res/drawable-xhdpi/ic_send_voice_offline_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..6df97e9b64a3002fc77d831fad303deafd411c57
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_send_voice_offline_white.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png b/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..e84e188a1de15564930f961aefb5e591b2fa34ec
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_settings_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_settings_grey600_24dp.png
deleted file mode 100644
index 2251d2bbbd44c6ce43a6e244b7278a4cfc2d96d0..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xhdpi/ic_settings_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png b/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..5caedc8e57497ba9d32c3a1798f7394bd8ca7cff
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_received.9.png b/src/main/res/drawable-xhdpi/message_bubble_received.9.png
index c0eb47ebbd2e0488c946356a25d52ff38ddf9aed..732ec2f79013ac8e31a7b5a2f9234693493298ef 100644
Binary files a/src/main/res/drawable-xhdpi/message_bubble_received.9.png and b/src/main/res/drawable-xhdpi/message_bubble_received.9.png differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_grey.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_grey.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..66f471cac26e85c9438a2a6c48e79291e4712e32
Binary files /dev/null and b/src/main/res/drawable-xhdpi/message_bubble_received_grey.9.png differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png
index fe0324ceebd2cfab73aae18cb6fcb881772f3af8..b957f614666c3c6c8792a416e1344b800ab52955 100644
Binary files a/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png and b/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_white.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_white.9.png
index fdb6be0d1a6e21f6bbe30518274aec26e240002f..68b56dbfc372a4adccd5425a414c5a4187abcc9e 100644
Binary files a/src/main/res/drawable-xhdpi/message_bubble_received_white.9.png and b/src/main/res/drawable-xhdpi/message_bubble_received_white.9.png differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_sent.9.png b/src/main/res/drawable-xhdpi/message_bubble_sent.9.png
index cb5654b71246b9a5957bc5e2b4ad41b9bef20b54..018f642cedb088e74cf37a472b1ef363327fb4e0 100644
Binary files a/src/main/res/drawable-xhdpi/message_bubble_sent.9.png and b/src/main/res/drawable-xhdpi/message_bubble_sent.9.png differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_sent_grey.9.png b/src/main/res/drawable-xhdpi/message_bubble_sent_grey.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5d0eba05403b03ece46b0d8ac9fca24fb0a4379
Binary files /dev/null and b/src/main/res/drawable-xhdpi/message_bubble_sent_grey.9.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_chat.png b/src/main/res/drawable-xxhdpi/ic_action_chat.png
deleted file mode 100644
index 04000fd0fc25e29fa811e62ce6e0b964ba22e721..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_action_chat.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_copy_white.png b/src/main/res/drawable-xxhdpi/ic_action_copy_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..a381cdc3fd657126d2e0424d08ed32d628d1a6a6
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_action_copy_white.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_refresh_white.png b/src/main/res/drawable-xxhdpi/ic_action_refresh_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..44ee117ee91541ed71f27685dde0b03b51b89f7f
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_action_refresh_white.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_remove_white.png b/src/main/res/drawable-xxhdpi/ic_action_remove_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..5dc214356fa92bfe1ed3809118ede20f6f853656
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_action_remove_white.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_settings_white.png b/src/main/res/drawable-xxhdpi/ic_action_settings_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe5fec471f17c23c4f274d2594361d5db6922869
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_action_settings_white.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_content_copy_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_content_copy_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..074ea8807923a7b1f35a5c778d6ff4a6b17da54e
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_content_copy_black_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_content_copy_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_content_copy_grey600_24dp.png
deleted file mode 100644
index 2fdbbea1384bea28573f646704c0387608d5fab8..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_content_copy_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_content_copy_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_content_copy_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..9dff893e772731f6d5881dcaa30499dcab6567b2
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_content_copy_white_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_delete_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_delete_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d7cb81c566fddaa41239598fabbbd79e95644f3
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_delete_black_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_delete_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_delete_grey600_24dp.png
deleted file mode 100644
index 4886ab1e9d6d1c6e2dc4f1d988164ea3c3c2d06d..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_delete_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_edit_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_edit_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..4af4ae634b4c805b2b13c209262bba92d4ef5bdb
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_edit_black_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_edit_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_edit_grey600_24dp.png
deleted file mode 100644
index 6ed4351ca2887eaf60a69fdab72ee7279f32759f..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_edit_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_black54_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_black54_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..25ca3bf2bcbdb5a7c3b41b4f0a082c6cc4a69e6a
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_notifications_black54_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..74c46cf4377615662d035693d8ed896bf8920f79
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_notifications_black_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_grey600_24dp.png
deleted file mode 100644
index 7d58d25d803abe5f10e500563d857a9365cdcf31..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_notifications_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_none_black54_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_none_black54_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..d11bf922bb9a81a93eec4e310b2583760c03ab2d
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_notifications_none_black54_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_none_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_none_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..82954172878c402a72095adc175a99f1aa008db4
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_notifications_none_black_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_none_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_none_grey600_24dp.png
deleted file mode 100644
index b8772d3771cacc210e1e91959e686496c0c57008..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_notifications_none_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_none_white80.png b/src/main/res/drawable-xxhdpi/ic_notifications_none_white80.png
new file mode 100644
index 0000000000000000000000000000000000000000..48dd4755dca3dc208e891a7f6802cf549f2622c4
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_notifications_none_white80.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_none_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_none_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..a1b5b7efd0c6fb3b4f4baa1f52ba7c8e558957fa
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_notifications_none_white_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_off_black54_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_off_black54_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..bbef755487cde0af881620c175659eb7161c4994
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_notifications_off_black54_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_off_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_off_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7fa594682f4661835cb19d6a6f7266f1da9d9d4
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_notifications_off_black_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_off_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_off_grey600_24dp.png
deleted file mode 100644
index e627b30a8734b827e10ab32745c7a006687f968f..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_notifications_off_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_off_white80.png b/src/main/res/drawable-xxhdpi/ic_notifications_off_white80.png
new file mode 100644
index 0000000000000000000000000000000000000000..85faa9beecdb19201af367c03972ad739a5abec3
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_notifications_off_white80.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_off_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_off_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..f70ea12849479057ecfa927bd2f80828f36cab6c
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_notifications_off_white_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_paused_black54_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_paused_black54_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..108f7b94417b0941e60681f9b59e8435ec53e2db
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_notifications_paused_black54_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_paused_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_paused_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..796398e46def7227a793eac0e0d2320facefec9d
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_notifications_paused_black_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_paused_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_paused_grey600_24dp.png
deleted file mode 100644
index e38f52179eaff583470afb779a02b7d3573061aa..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_notifications_paused_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_paused_white80.png b/src/main/res/drawable-xxhdpi/ic_notifications_paused_white80.png
new file mode 100644
index 0000000000000000000000000000000000000000..d089457a2738d672e43c9fb89ba9ed70ab772a21
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_notifications_paused_white80.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_paused_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_paused_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..e31b0d36f017158a281d12297e0f05ee344887e6
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_notifications_paused_white_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_white80.png b/src/main/res/drawable-xxhdpi/ic_notifications_white80.png
new file mode 100644
index 0000000000000000000000000000000000000000..b05f3a2870bce4b096792b8da04c1bf1dd5e9935
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_notifications_white80.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..cbd0c1e9d3a948203ead1b23779c667247813cd9
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_notifications_white_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_refresh_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_refresh_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..91187eb038bce44562016c519e86a7a11388e3af
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_refresh_black_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_refresh_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_refresh_grey600_24dp.png
deleted file mode 100644
index 9c1e27d74d7b7414a8d4dc18df80ca5da2955ae9..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_refresh_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..1692d8a242162dc878d42fb1b112e918cc25c3ac
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_cancel_offline_white.png b/src/main/res/drawable-xxhdpi/ic_send_cancel_offline_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2203a0a19e21361e0db5f396226d472e32cdb5b
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_send_cancel_offline_white.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_location_offline_white.png b/src/main/res/drawable-xxhdpi/ic_send_location_offline_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..b5fcd9ce29b775bdd3fb65ce8c3a3bc7d5d005d0
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_send_location_offline_white.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_photo_offline_white.png b/src/main/res/drawable-xxhdpi/ic_send_photo_offline_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..016ec0792460c0bc162ff6099d65736482fc61bb
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_send_photo_offline_white.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_picture_offline_white.png b/src/main/res/drawable-xxhdpi/ic_send_picture_offline_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..dbf1f14b443f18df765d07d3a4d79cf8724bd47d
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_send_picture_offline_white.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_text_offline_white.png b/src/main/res/drawable-xxhdpi/ic_send_text_offline_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..93374aaa47c6f4807a627b2717860de19fb8c3f3
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_send_text_offline_white.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_send_voice_offline_white.png b/src/main/res/drawable-xxhdpi/ic_send_voice_offline_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..38fd2a6760096d4c4f75b57572ee68e4fe779f92
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_send_voice_offline_white.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..3023ff8daa925ac79e863caf679d03c56c3afc93
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_settings_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_settings_grey600_24dp.png
deleted file mode 100644
index 6a70402b4f85220a29aa1d15dfc9396ffafb6247..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xxhdpi/ic_settings_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..eabb0a2ba41bbe0e109263ee9b0d6ada40a6e792
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received.9.png
index 10e7840892a0e593451f217354da88db0c54196b..b2c3d0a8676dd266cc5c038037b5ff9360c1e57e 100644
Binary files a/src/main/res/drawable-xxhdpi/message_bubble_received.9.png and b/src/main/res/drawable-xxhdpi/message_bubble_received.9.png differ
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received_grey.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received_grey.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..f4c009c24beaeb2aa2a55e11f31d5f5ccbb1ce12
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/message_bubble_received_grey.9.png differ
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png
index 53ecbecf72cb42e171308053b0e37c68338423bf..2183ca992f19cc6f5464c88670e65f6b3537b420 100644
Binary files a/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png and b/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png differ
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png
index 436a1bd322dac6b18ca9f9ddd6067e08af28bc54..178fe1a1ab4248c65acd2a27b830083f80cc0b9c 100644
Binary files a/src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png and b/src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png differ
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png b/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png
index f78425d21e33be75d0a05c2e8353b07ceb3264b3..906386b3173648ab06214a2efd8b0eae86f082a6 100644
Binary files a/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png and b/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png differ
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_sent_grey.9.png b/src/main/res/drawable-xxhdpi/message_bubble_sent_grey.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..3f210ba5c5814ce5e949b8a59477d6e88de7d7fa
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/message_bubble_sent_grey.9.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_content_copy_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_content_copy_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f6af72d0576c9740aa95fa7994f6cc90920f4c6
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_content_copy_black_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_content_copy_grey600_24dp.png b/src/main/res/drawable-xxxhdpi/ic_content_copy_grey600_24dp.png
deleted file mode 100644
index 1eb62d42cc29809e63fba66881578e1b52427587..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xxxhdpi/ic_content_copy_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_content_copy_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_content_copy_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ddee9ef09f13f7c27faac1c159d37c8c8f3bbe7
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_content_copy_white_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_delete_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_delete_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..f2b75c31107d301df6e48c209636a60930a7776f
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_delete_black_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_delete_grey600_24dp.png b/src/main/res/drawable-xxxhdpi/ic_delete_grey600_24dp.png
deleted file mode 100644
index e4e218123bb5fd9b9c893c4ecc10fb1bbbb2f917..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xxxhdpi/ic_delete_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_edit_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_edit_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6761ba161c4bc5f665968f7cb761cc7db671822
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_edit_black_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_edit_grey600_24dp.png b/src/main/res/drawable-xxxhdpi/ic_edit_grey600_24dp.png
deleted file mode 100644
index 0c0fd76f6216a0e3bb12b25442df5c51c4b49c2c..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xxxhdpi/ic_edit_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_black54_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_black54_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..c05fd3b548ce0564cd98ce83aa971f86e50c7b18
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_notifications_black54_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..b06e6bc28296e00e5f18d08a5404002bdd61567a
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_notifications_black_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_grey600_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_grey600_24dp.png
deleted file mode 100644
index 98dff2f3c6ae87b101991567b67d0d7c78d91485..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xxxhdpi/ic_notifications_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_none_black54_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_none_black54_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..c433379fb616e8030f0f56f7f1b953d6d434dbd3
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_notifications_none_black54_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_none_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_none_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ebe6649c63c863941c83ebca2942ff46ab16a2d
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_notifications_none_black_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_none_grey600_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_none_grey600_24dp.png
deleted file mode 100644
index ffdb15a83c04be61b0efe6c1089bfcf6ea9c526f..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xxxhdpi/ic_notifications_none_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_none_white80.png b/src/main/res/drawable-xxxhdpi/ic_notifications_none_white80.png
new file mode 100644
index 0000000000000000000000000000000000000000..35936595435e9569f2b771559ceed06cd815f14f
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_notifications_none_white80.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_none_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_none_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..d4627a9ef9632e7b0c157c5cc352e09c04d8f124
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_notifications_none_white_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_off_black54_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_off_black54_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d50a52577c07a764e4c5d683fed8c5a5278d42b
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_notifications_off_black54_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_off_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_off_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..db8f1f3df87af532bfe7d2955cebc9b1114b9752
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_notifications_off_black_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_off_grey600_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_off_grey600_24dp.png
deleted file mode 100644
index ab65f4b225d8aca07a0831ec9e67628291d8f3cd..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xxxhdpi/ic_notifications_off_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_off_white80.png b/src/main/res/drawable-xxxhdpi/ic_notifications_off_white80.png
new file mode 100644
index 0000000000000000000000000000000000000000..daef1e0d8d81033228c1c9356aa894acb5681c6b
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_notifications_off_white80.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_off_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_off_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..874bc6277e324956f89158f997b00c4c6c16e875
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_notifications_off_white_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_paused_black54_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_paused_black54_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..647a611a2968239eb62a50d5c2ebda99d69e6685
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_notifications_paused_black54_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_paused_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_paused_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e12f7c188de374eb13f3f04e57e91370ba6a5fa
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_notifications_paused_black_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_paused_grey600_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_paused_grey600_24dp.png
deleted file mode 100644
index 53162e569d0f7adb14e07f3e3741ea0390a289ba..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xxxhdpi/ic_notifications_paused_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_paused_white80.png b/src/main/res/drawable-xxxhdpi/ic_notifications_paused_white80.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0dd0d38fc5bfb6ebf6ecb938670748966d6188c
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_notifications_paused_white80.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_paused_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_paused_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c65e5bc2ad392cf51cddaad06b5552491fa141f
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_notifications_paused_white_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_white80.png b/src/main/res/drawable-xxxhdpi/ic_notifications_white80.png
new file mode 100644
index 0000000000000000000000000000000000000000..062b4c2199a913c117c669afb1c0fc89fa6d0e1a
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_notifications_white80.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e70b6332d32b9a3bbf874842eedbb1bd7f30535
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_notifications_white_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_refresh_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_refresh_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..bcaba5f681e66affac25ab97273949d25a634b8c
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_refresh_black_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_refresh_grey600_24dp.png b/src/main/res/drawable-xxxhdpi/ic_refresh_grey600_24dp.png
deleted file mode 100644
index e44a6d2823f87827cc85b22153932381831463fc..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xxxhdpi/ic_refresh_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_refresh_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_refresh_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5beca2511d275c2f754b38989a1e1e69196da05
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_refresh_white_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_cancel_offline_white.png b/src/main/res/drawable-xxxhdpi/ic_send_cancel_offline_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e9c1f7ca30a32fed6d203a8fb2ef101311df8c4
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_send_cancel_offline_white.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_location_offline_white.png b/src/main/res/drawable-xxxhdpi/ic_send_location_offline_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..4fb12a0d9c71277e359db5a6a7257f53e4adcd5f
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_send_location_offline_white.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_photo_offline_white.png b/src/main/res/drawable-xxxhdpi/ic_send_photo_offline_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..26683df1750724200ee78b4cff9af14d6428e704
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_send_photo_offline_white.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_picture_offline_white.png b/src/main/res/drawable-xxxhdpi/ic_send_picture_offline_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..215abff23ae42f324f6479a7d6b498bb78302c41
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_send_picture_offline_white.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_text_offline_white.png b/src/main/res/drawable-xxxhdpi/ic_send_text_offline_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..b07abab38f1b4e42c686c085cf712bb337467ec0
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_send_text_offline_white.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_send_voice_offline_white.png b/src/main/res/drawable-xxxhdpi/ic_send_voice_offline_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..7258b8e3970b1f5d760796dfcfdb12cee8be287e
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_send_voice_offline_white.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png b/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..476d5c9780b6904004c7da0d86c1f02e4c37f892
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_settings_grey600_24dp.png b/src/main/res/drawable-xxxhdpi/ic_settings_grey600_24dp.png
deleted file mode 100644
index 5eba9e8ecc34d59c8301157e89b5af778e286bdd..0000000000000000000000000000000000000000
Binary files a/src/main/res/drawable-xxxhdpi/ic_settings_grey600_24dp.png and /dev/null differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_settings_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_settings_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..507c5edd44bfb5efe41327d5cef511a108d35f13
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_settings_white_24dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png
index c474359ea14d62d3771b64f13bfd4479652b80af..310e3803459ee3387f4b48c743803e66bdb0723b 100644
Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png and b/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_grey.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_grey.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..dbeaef1284ddeb432d9e63a5d7fc16e0484fbe06
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/message_bubble_received_grey.9.png differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png
index 1421768cc4a8554f618d7d09dc50ccbd93fb275e..336906baac57bdfd5ca4da6cbdbecd2198b2f08b 100644
Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png and b/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png
index ee89b6706fe6b7a5c8ae4022f1269b34851c99f1..9ad50df9cfa898df1a382acd2845c82d900ded14 100644
Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png and b/src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png
index d34038d074b2c6929486893b8b688414c538705f..1aa23141278214388206ccfb366714db3f7f9cf5 100644
Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png and b/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_sent_grey.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_sent_grey.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..473b1b0d8baced554efc87ad7c3a610e7ff827ff
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/message_bubble_sent_grey.9.png differ
diff --git a/src/main/res/drawable/infocard_border_dark.xml b/src/main/res/drawable/infocard_border_dark.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f5b5fed9a2834e275f3ed5acdcd34504f8465228
--- /dev/null
+++ b/src/main/res/drawable/infocard_border_dark.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/res/layout-w945dp/fragment_conversations_overview.xml b/src/main/res/layout-w945dp/fragment_conversations_overview.xml
index 7ae1788d77f86ed78eeb48fbb9c84cbe9377cbc9..63eb0e57c99b821a46b29245850baf6eb82362e0 100644
--- a/src/main/res/layout-w945dp/fragment_conversations_overview.xml
+++ b/src/main/res/layout-w945dp/fragment_conversations_overview.xml
@@ -9,14 +9,14 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
- android:background="@color/grey50"
+ android:background="?attr/color_background_primary"
android:orientation="vertical" >
diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml
index cac9a9fa69e861b792651f9d809312ec4e4e7188..605f63efde820cb81a417754430786d2a55c1923 100644
--- a/src/main/res/layout/account_row.xml
+++ b/src/main/res/layout/account_row.xml
@@ -33,7 +33,7 @@
android:layout_height="wrap_content"
android:scrollHorizontally="false"
android:singleLine="true"
- android:textColor="@color/black87"
+ android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeHeadline" />
diff --git a/src/main/res/layout/activity_about.xml b/src/main/res/layout/activity_about.xml
index 247e96e59ac8a9b1229fe4387f3423bdf30a2a22..cae60ebbb9f751a55d8ba9a0d74d415a80166453 100644
--- a/src/main/res/layout/activity_about.xml
+++ b/src/main/res/layout/activity_about.xml
@@ -1,9 +1,9 @@
+ android:layout_height="fill_parent"
+ android:background="?attr/color_background_primary">
diff --git a/src/main/res/layout/activity_change_password.xml b/src/main/res/layout/activity_change_password.xml
index 6fb1d0131e0c11303dfe4478a735241cd0d774a2..886c45c6533da3bb3c5caf95f370e0ba891f69e2 100644
--- a/src/main/res/layout/activity_change_password.xml
+++ b/src/main/res/layout/activity_change_password.xml
@@ -2,7 +2,7 @@
+ android:background="?attr/color_background_secondary">
@@ -24,7 +24,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/current_password"
- android:textColor="@color/black87"
+ android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeBody"/>
@@ -96,7 +96,7 @@
android:layout_height="fill_parent"
android:layout_marginBottom="7dp"
android:layout_marginTop="7dp"
- android:background="@color/black12"/>
+ android:background="?attr/divider"/>
@@ -115,7 +115,7 @@
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginTop="@dimen/activity_vertical_margin"
android:layout_marginBottom="@dimen/activity_vertical_margin"
- android:background="@drawable/infocard_border"
+ android:background="?attr/infocard_border"
android:divider="?android:dividerHorizontal"
android:orientation="vertical"
android:padding="@dimen/infocard_padding"
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index d308b4ce7d5ee023d5e0527a81c6b0e02c9a4b04..e180f1be48c49bb3fb728e2144878640fcfe38b4 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/grey200">
+ android:background="?attr/color_background_secondary">
@@ -136,7 +136,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/register_account"
- android:textColor="@color/black87"
+ android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeBody"/>
@@ -155,8 +155,8 @@
android:layout_marginTop="8dp"
android:hint="@string/confirm_password"
android:inputType="textPassword"
- android:textColor="@color/black87"
- android:textColorHint="@color/black54"
+ android:textColor="?attr/color_text_primary"
+ android:textColorHint="?attr/color_text_secondary"
android:textSize="?attr/TextSizeBody"
android:visibility="gone"/>
@@ -170,7 +170,7 @@
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginTop="@dimen/activity_vertical_margin"
- android:background="@drawable/infocard_border"
+ android:background="?attr/infocard_border"
android:orientation="vertical"
android:padding="@dimen/infocard_padding"
android:visibility="gone">
@@ -179,7 +179,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/battery_optimizations_enabled"
- android:textColor="@color/black87"
+ android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeHeadline"
android:textStyle="bold"/>