From 13cb804fc288a51e3d964fa1a6cc69b1f7fd4b7b Mon Sep 17 00:00:00 2001 From: Christian Basler Date: Sun, 18 Oct 2015 13:40:17 +0200 Subject: [PATCH 1/4] Added ongoing notification showing network status - renamed packages to be more consistent - somewhate refactored the way notifications are made --- .../apps/abit/AbstractItemListFragment.java | 2 +- .../apps/abit/MessageDetailFragment.java | 2 +- .../dissem/apps/abit/MessageListActivity.java | 9 +- .../dissem/apps/abit/MessageListFragment.java | 10 +-- .../ActionBarListener.java | 2 +- .../ListSelectionListener.java | 2 +- .../MessageListener.java | 60 ++----------- .../notification/AbstractNotification.java | 33 +++++++ .../notification/NetworkNotification.java | 87 +++++++++++++++++++ .../notification/NewMessageNotification.java | 81 +++++++++++++++++ .../AndroidAddressRepository.java | 2 +- .../AndroidInventory.java | 4 +- .../AndroidMessageRepository.java | 4 +- .../SqlHelper.java | 4 +- .../dissem/apps/abit/service/Singleton.java | 11 ++- .../apps/abit/{utils => util}/Assets.java | 2 +- .../apps/abit/{utils => util}/Drawables.java | 19 +++- app/src/main/res/values-de/strings.xml | 6 +- app/src/main/res/values/strings.xml | 4 + 19 files changed, 262 insertions(+), 82 deletions(-) rename app/src/main/java/ch/dissem/apps/abit/{listeners => listener}/ActionBarListener.java (94%) rename app/src/main/java/ch/dissem/apps/abit/{listeners => listener}/ListSelectionListener.java (95%) rename app/src/main/java/ch/dissem/apps/abit/{listeners => listener}/MessageListener.java (54%) create mode 100644 app/src/main/java/ch/dissem/apps/abit/notification/AbstractNotification.java create mode 100644 app/src/main/java/ch/dissem/apps/abit/notification/NetworkNotification.java create mode 100644 app/src/main/java/ch/dissem/apps/abit/notification/NewMessageNotification.java rename app/src/main/java/ch/dissem/apps/abit/{repositories => repository}/AndroidAddressRepository.java (99%) rename app/src/main/java/ch/dissem/apps/abit/{repositories => repository}/AndroidInventory.java (98%) rename app/src/main/java/ch/dissem/apps/abit/{repositories => repository}/AndroidMessageRepository.java (99%) rename app/src/main/java/ch/dissem/apps/abit/{repositories => repository}/SqlHelper.java (96%) rename app/src/main/java/ch/dissem/apps/abit/{utils => util}/Assets.java (98%) rename app/src/main/java/ch/dissem/apps/abit/{utils => util}/Drawables.java (65%) diff --git a/app/src/main/java/ch/dissem/apps/abit/AbstractItemListFragment.java b/app/src/main/java/ch/dissem/apps/abit/AbstractItemListFragment.java index 7ddfce9..65acd36 100644 --- a/app/src/main/java/ch/dissem/apps/abit/AbstractItemListFragment.java +++ b/app/src/main/java/ch/dissem/apps/abit/AbstractItemListFragment.java @@ -21,7 +21,7 @@ import android.os.Bundle; import android.support.v4.app.ListFragment; import android.view.View; import android.widget.ListView; -import ch.dissem.apps.abit.listeners.ListSelectionListener; +import ch.dissem.apps.abit.listener.ListSelectionListener; import ch.dissem.apps.abit.service.Singleton; import ch.dissem.bitmessage.BitmessageContext; import ch.dissem.bitmessage.entity.valueobject.Label; diff --git a/app/src/main/java/ch/dissem/apps/abit/MessageDetailFragment.java b/app/src/main/java/ch/dissem/apps/abit/MessageDetailFragment.java index dbca865..4652f6b 100644 --- a/app/src/main/java/ch/dissem/apps/abit/MessageDetailFragment.java +++ b/app/src/main/java/ch/dissem/apps/abit/MessageDetailFragment.java @@ -7,7 +7,7 @@ import android.view.*; import android.widget.ImageView; import android.widget.TextView; import ch.dissem.apps.abit.service.Singleton; -import ch.dissem.apps.abit.utils.Drawables; +import ch.dissem.apps.abit.util.Drawables; import ch.dissem.bitmessage.BitmessageContext; import ch.dissem.bitmessage.entity.BitmessageAddress; import ch.dissem.bitmessage.entity.Plaintext; diff --git a/app/src/main/java/ch/dissem/apps/abit/MessageListActivity.java b/app/src/main/java/ch/dissem/apps/abit/MessageListActivity.java index 2bb0d6c..51de702 100644 --- a/app/src/main/java/ch/dissem/apps/abit/MessageListActivity.java +++ b/app/src/main/java/ch/dissem/apps/abit/MessageListActivity.java @@ -10,13 +10,13 @@ import android.view.MenuItem; import android.view.View; import android.widget.AdapterView; -import ch.dissem.apps.abit.listeners.ActionBarListener; -import ch.dissem.apps.abit.listeners.ListSelectionListener; +import ch.dissem.apps.abit.listener.ActionBarListener; +import ch.dissem.apps.abit.listener.ListSelectionListener; +import ch.dissem.apps.abit.notification.NetworkNotification; import ch.dissem.apps.abit.service.Singleton; import ch.dissem.bitmessage.BitmessageContext; import ch.dissem.bitmessage.entity.BitmessageAddress; import ch.dissem.bitmessage.entity.Plaintext; -import ch.dissem.bitmessage.entity.Streamable; import ch.dissem.bitmessage.entity.valueobject.Label; import com.mikepenz.community_material_typeface_library.CommunityMaterial; @@ -39,6 +39,8 @@ import org.slf4j.LoggerFactory; import java.io.Serializable; import java.util.ArrayList; +import java.util.Timer; +import java.util.TimerTask; /** @@ -288,6 +290,7 @@ public class MessageListActivity extends AppCompatActivity switch (item.getItemId()) { case R.id.sync_disabled: bmc.startup(); + new NetworkNotification(this).show(); updateMenu(); return true; case R.id.sync_enabled: diff --git a/app/src/main/java/ch/dissem/apps/abit/MessageListFragment.java b/app/src/main/java/ch/dissem/apps/abit/MessageListFragment.java index cb02e54..f251d8a 100644 --- a/app/src/main/java/ch/dissem/apps/abit/MessageListFragment.java +++ b/app/src/main/java/ch/dissem/apps/abit/MessageListFragment.java @@ -1,21 +1,15 @@ package ch.dissem.apps.abit; -import android.app.Activity; import android.content.Intent; import android.graphics.Typeface; import android.os.Bundle; import android.support.design.widget.FloatingActionButton; -import android.support.v4.app.ListFragment; import android.view.*; import android.widget.ArrayAdapter; import android.widget.ImageView; -import android.widget.ListView; import android.widget.TextView; -import ch.dissem.apps.abit.listeners.ActionBarListener; -import ch.dissem.apps.abit.listeners.ListSelectionListener; -import ch.dissem.apps.abit.service.Singleton; -import ch.dissem.bitmessage.BitmessageContext; -import ch.dissem.bitmessage.entity.BitmessageAddress; +import ch.dissem.apps.abit.listener.ActionBarListener; +import ch.dissem.apps.abit.listener.ListSelectionListener; import ch.dissem.bitmessage.entity.Plaintext; import ch.dissem.bitmessage.entity.valueobject.Label; import ch.dissem.bitmessage.ports.MessageRepository; diff --git a/app/src/main/java/ch/dissem/apps/abit/listeners/ActionBarListener.java b/app/src/main/java/ch/dissem/apps/abit/listener/ActionBarListener.java similarity index 94% rename from app/src/main/java/ch/dissem/apps/abit/listeners/ActionBarListener.java rename to app/src/main/java/ch/dissem/apps/abit/listener/ActionBarListener.java index 11b309a..7dfcdf2 100644 --- a/app/src/main/java/ch/dissem/apps/abit/listeners/ActionBarListener.java +++ b/app/src/main/java/ch/dissem/apps/abit/listener/ActionBarListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ch.dissem.apps.abit.listeners; +package ch.dissem.apps.abit.listener; /** * Created by chris on 06.09.15. diff --git a/app/src/main/java/ch/dissem/apps/abit/listeners/ListSelectionListener.java b/app/src/main/java/ch/dissem/apps/abit/listener/ListSelectionListener.java similarity index 95% rename from app/src/main/java/ch/dissem/apps/abit/listeners/ListSelectionListener.java rename to app/src/main/java/ch/dissem/apps/abit/listener/ListSelectionListener.java index 6e050a3..03fdc19 100644 --- a/app/src/main/java/ch/dissem/apps/abit/listeners/ListSelectionListener.java +++ b/app/src/main/java/ch/dissem/apps/abit/listener/ListSelectionListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ch.dissem.apps.abit.listeners; +package ch.dissem.apps.abit.listener; /** * A callback interface that all activities containing this fragment must diff --git a/app/src/main/java/ch/dissem/apps/abit/listeners/MessageListener.java b/app/src/main/java/ch/dissem/apps/abit/listener/MessageListener.java similarity index 54% rename from app/src/main/java/ch/dissem/apps/abit/listeners/MessageListener.java rename to app/src/main/java/ch/dissem/apps/abit/listener/MessageListener.java index 104ef70..edf17b3 100644 --- a/app/src/main/java/ch/dissem/apps/abit/listeners/MessageListener.java +++ b/app/src/main/java/ch/dissem/apps/abit/listener/MessageListener.java @@ -14,10 +14,9 @@ * limitations under the License. */ -package ch.dissem.apps.abit.listeners; +package ch.dissem.apps.abit.listener; import android.annotation.TargetApi; -import android.app.Notification; import android.app.NotificationManager; import android.app.PendingIntent; import android.content.Context; @@ -34,9 +33,11 @@ import android.text.Spannable; import android.text.SpannableString; import android.text.Spanned; import android.text.style.StyleSpan; + import ch.dissem.apps.abit.Identicon; import ch.dissem.apps.abit.MessageListActivity; import ch.dissem.apps.abit.R; +import ch.dissem.apps.abit.notification.NewMessageNotification; import ch.dissem.bitmessage.BitmessageContext; import ch.dissem.bitmessage.entity.Plaintext; @@ -50,18 +51,17 @@ import java.util.LinkedList; *

*/ public class MessageListener implements BitmessageContext.Listener { - private static final StyleSpan SPAN_EMPHASIS = new StyleSpan(Typeface.BOLD); private final Context ctx; private final NotificationManager manager; private final LinkedList unacknowledged = new LinkedList<>(); - private final int pictureSize; private int numberOfUnacknowledgedMessages = 0; + private final NewMessageNotification notification; public MessageListener(Context ctx) { this.ctx = ctx.getApplicationContext(); this.manager = (NotificationManager) ctx.getSystemService(Context.NOTIFICATION_SERVICE); - this.pictureSize = getMaxContactPhotoSize(ctx); + this.notification = new NewMessageNotification(ctx); } @TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH) @@ -94,57 +94,15 @@ public class MessageListener implements BitmessageContext.Listener { NotificationCompat.Builder builder = new NotificationCompat.Builder(ctx); if (numberOfUnacknowledgedMessages == 1) { - Spannable bigText = new SpannableString(plaintext.getSubject() + "\n" + plaintext.getText()); - bigText.setSpan(SPAN_EMPHASIS, 0, plaintext.getSubject().length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE); - builder.setSmallIcon(R.drawable.ic_notification_new_message) - .setLargeIcon(toBitmap(new Identicon(plaintext.getFrom()))) - .setContentTitle(plaintext.getFrom().toString()) - .setContentText(plaintext.getSubject()) - .setStyle(new NotificationCompat.BigTextStyle().bigText(bigText)) - .setContentInfo("Info"); - - Intent showMessageIntent = new Intent(ctx, MessageListActivity.class); - showMessageIntent.putExtra(MessageListActivity.EXTRA_SHOW_MESSAGE, plaintext); - PendingIntent pendingIntent = PendingIntent.getActivity(ctx, 0, showMessageIntent, PendingIntent.FLAG_UPDATE_CURRENT); - builder.setContentIntent(pendingIntent); - - builder.addAction(R.drawable.ic_action_reply, ctx.getString(R.string.reply), pendingIntent); - builder.addAction(R.drawable.ic_action_delete, ctx.getString(R.string.delete), pendingIntent); + notification.singleNotification(plaintext); } else { - builder.setSmallIcon(R.drawable.ic_notification_new_message) - .setContentTitle(ctx.getString(R.string.n_new_messages, this.unacknowledged.size())) - .setContentText(ctx.getString(R.string.app_name)); - - NotificationCompat.InboxStyle inboxStyle = new NotificationCompat.InboxStyle(); - synchronized (unacknowledged) { - inboxStyle.setBigContentTitle(ctx.getString(R.string.n_new_messages, numberOfUnacknowledgedMessages)); - for (Plaintext msg : unacknowledged) { - Spannable sb = new SpannableString(msg.getFrom() + " " + msg.getSubject()); - sb.setSpan(SPAN_EMPHASIS, 0, String.valueOf(msg.getFrom()).length(), Spannable.SPAN_INCLUSIVE_EXCLUSIVE); - inboxStyle.addLine(sb); - } - } - builder.setStyle(inboxStyle); - - Intent intent = new Intent(ctx, MessageListActivity.class); - intent.setAction(MessageListActivity.ACTION_SHOW_INBOX); - PendingIntent pendingIntent = PendingIntent.getActivity(ctx, 1, intent, 0); - builder.setContentIntent(pendingIntent); + notification.multiNotification(unacknowledged, numberOfUnacknowledgedMessages); } - - manager.notify(0, builder.build()); - } - - private Bitmap toBitmap(Identicon identicon) { - Bitmap bitmap = Bitmap.createBitmap(pictureSize, pictureSize, Bitmap.Config.ARGB_8888); - Canvas canvas = new Canvas(bitmap); - identicon.setBounds(0, 0, canvas.getWidth(), canvas.getHeight()); - identicon.draw(canvas); - return bitmap; + notification.show(); } public void resetNotification() { - manager.cancel(0); + notification.hide(); synchronized (unacknowledged) { unacknowledged.clear(); numberOfUnacknowledgedMessages = 0; diff --git a/app/src/main/java/ch/dissem/apps/abit/notification/AbstractNotification.java b/app/src/main/java/ch/dissem/apps/abit/notification/AbstractNotification.java new file mode 100644 index 0000000..60bb86d --- /dev/null +++ b/app/src/main/java/ch/dissem/apps/abit/notification/AbstractNotification.java @@ -0,0 +1,33 @@ +package ch.dissem.apps.abit.notification; + +import android.app.Notification; +import android.app.NotificationManager; +import android.content.Context; + +/** + * Some base class to create and handle notifications. + */ +public abstract class AbstractNotification { + protected final Context ctx; + protected final NotificationManager manager; + public Notification notification; + + + public AbstractNotification(Context ctx) { + this.ctx = ctx; + this.manager = (NotificationManager) ctx.getSystemService(Context.NOTIFICATION_SERVICE); + } + + /** + * @return an id unique to this notification class + */ + protected abstract int getNotificationId(); + + public void show() { + manager.notify(getNotificationId(), notification); + } + + public void hide() { + manager.cancel(getNotificationId()); + } +} diff --git a/app/src/main/java/ch/dissem/apps/abit/notification/NetworkNotification.java b/app/src/main/java/ch/dissem/apps/abit/notification/NetworkNotification.java new file mode 100644 index 0000000..7ddb271 --- /dev/null +++ b/app/src/main/java/ch/dissem/apps/abit/notification/NetworkNotification.java @@ -0,0 +1,87 @@ +package ch.dissem.apps.abit.notification; + +import android.annotation.SuppressLint; +import android.app.PendingIntent; +import android.content.Context; +import android.content.Intent; +import android.support.v7.app.NotificationCompat; + +import java.util.Timer; +import java.util.TimerTask; + +import ch.dissem.apps.abit.MessageListActivity; +import ch.dissem.apps.abit.R; +import ch.dissem.apps.abit.service.Singleton; +import ch.dissem.bitmessage.BitmessageContext; +import ch.dissem.bitmessage.utils.Property; + +/** + * Shows the network status (as long as the client is connected as a full node) + */ +public class NetworkNotification extends AbstractNotification { + private final BitmessageContext bmc; + private NotificationCompat.Builder builder; + + public NetworkNotification(Context ctx) { + super(ctx); + builder = new NotificationCompat.Builder(ctx); + builder.setSmallIcon(R.drawable.ic_notification_new_message) + .setContentTitle(ctx.getString(R.string.bitmessage_active)); + builder.setVisibility(NotificationCompat.VISIBILITY_PUBLIC); + bmc = Singleton.getBitmessageContext(ctx); + } + + @SuppressLint("StringFormatMatches") + private boolean update() { + boolean running = bmc.isRunning(); + builder.setOngoing(running); + Property connections = bmc.status().getProperty("network").getProperty("connections"); + if (!running) { + builder.setContentText(ctx.getString(R.string.connection_info_disconnected)); + } else if (connections.getProperties().length == 0) { + builder.setContentText(ctx.getString(R.string.connection_info_pending)); + } else { + StringBuilder info = new StringBuilder(); + for (Property stream : connections.getProperties()) { + int streamNumber = Integer.parseInt(stream.getName().substring("stream ".length())); + Integer nodeCount = (Integer) stream.getProperty("nodes").getValue(); + if (nodeCount == 1) { + info.append(ctx.getString(R.string.connection_info_1, + streamNumber)); + } else { + info.append(ctx.getString(R.string.connection_info_n, + streamNumber, nodeCount)); + } + info.append('\n'); + } + builder.setContentText(info); + } + Intent showMessageIntent = new Intent(ctx, MessageListActivity.class); + PendingIntent pendingIntent = PendingIntent.getActivity(ctx, 1, showMessageIntent, 0); + builder.setContentIntent(pendingIntent); + notification = builder.build(); + return running; + } + + @Override + public void show() { + update(); + super.show(); + + final Timer timer = new Timer(); + timer.schedule(new TimerTask() { + @Override + public void run() { + if (!update()) { + cancel(); + } + NetworkNotification.super.show(); + } + }, 10_000, 10_000); + } + + @Override + protected int getNotificationId() { + return 2; + } +} diff --git a/app/src/main/java/ch/dissem/apps/abit/notification/NewMessageNotification.java b/app/src/main/java/ch/dissem/apps/abit/notification/NewMessageNotification.java new file mode 100644 index 0000000..ee10bf1 --- /dev/null +++ b/app/src/main/java/ch/dissem/apps/abit/notification/NewMessageNotification.java @@ -0,0 +1,81 @@ +package ch.dissem.apps.abit.notification; + +import android.app.NotificationManager; +import android.app.PendingIntent; +import android.content.Context; +import android.content.Intent; +import android.graphics.Typeface; +import android.support.v7.app.NotificationCompat; +import android.text.Spannable; +import android.text.SpannableString; +import android.text.Spanned; +import android.text.style.StyleSpan; + +import java.util.LinkedList; + +import ch.dissem.apps.abit.Identicon; +import ch.dissem.apps.abit.MessageListActivity; +import ch.dissem.apps.abit.R; +import ch.dissem.bitmessage.entity.Plaintext; + +import static ch.dissem.apps.abit.util.Drawables.toBitmap; + +public class NewMessageNotification extends AbstractNotification { + private static final StyleSpan SPAN_EMPHASIS = new StyleSpan(Typeface.BOLD); + + public NewMessageNotification(Context ctx) { + super(ctx); + } + + public NewMessageNotification singleNotification(Plaintext plaintext) { + NotificationCompat.Builder builder = new NotificationCompat.Builder(ctx); + Spannable bigText = new SpannableString(plaintext.getSubject() + "\n" + plaintext.getText()); + bigText.setSpan(SPAN_EMPHASIS, 0, plaintext.getSubject().length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE); + builder.setSmallIcon(R.drawable.ic_notification_new_message) + .setLargeIcon(toBitmap(new Identicon(plaintext.getFrom()), 192)) + .setContentTitle(plaintext.getFrom().toString()) + .setContentText(plaintext.getSubject()) + .setStyle(new NotificationCompat.BigTextStyle().bigText(bigText)) + .setContentInfo("Info"); + + Intent showMessageIntent = new Intent(ctx, MessageListActivity.class); + showMessageIntent.putExtra(MessageListActivity.EXTRA_SHOW_MESSAGE, plaintext); + PendingIntent pendingIntent = PendingIntent.getActivity(ctx, 0, showMessageIntent, PendingIntent.FLAG_UPDATE_CURRENT); + builder.setContentIntent(pendingIntent); + + builder.addAction(R.drawable.ic_action_reply, ctx.getString(R.string.reply), pendingIntent); + builder.addAction(R.drawable.ic_action_delete, ctx.getString(R.string.delete), pendingIntent); + notification = builder.build(); + return this; + } + + public NewMessageNotification multiNotification(LinkedList<Plaintext> unacknowledged, int numberOfUnacknowledgedMessages) { + NotificationCompat.Builder builder = new NotificationCompat.Builder(ctx); + builder.setSmallIcon(R.drawable.ic_notification_new_message) + .setContentTitle(ctx.getString(R.string.n_new_messages, unacknowledged.size())) + .setContentText(ctx.getString(R.string.app_name)); + + NotificationCompat.InboxStyle inboxStyle = new NotificationCompat.InboxStyle(); + synchronized (unacknowledged) { + inboxStyle.setBigContentTitle(ctx.getString(R.string.n_new_messages, numberOfUnacknowledgedMessages)); + for (Plaintext msg : unacknowledged) { + Spannable sb = new SpannableString(msg.getFrom() + " " + msg.getSubject()); + sb.setSpan(SPAN_EMPHASIS, 0, String.valueOf(msg.getFrom()).length(), Spannable.SPAN_INCLUSIVE_EXCLUSIVE); + inboxStyle.addLine(sb); + } + } + builder.setStyle(inboxStyle); + + Intent intent = new Intent(ctx, MessageListActivity.class); + intent.setAction(MessageListActivity.ACTION_SHOW_INBOX); + PendingIntent pendingIntent = PendingIntent.getActivity(ctx, 1, intent, 0); + builder.setContentIntent(pendingIntent); + notification = builder.build(); + return this; + } + + @Override + protected int getNotificationId() { + return 1; + } +} diff --git a/app/src/main/java/ch/dissem/apps/abit/repositories/AndroidAddressRepository.java b/app/src/main/java/ch/dissem/apps/abit/repository/AndroidAddressRepository.java similarity index 99% rename from app/src/main/java/ch/dissem/apps/abit/repositories/AndroidAddressRepository.java rename to app/src/main/java/ch/dissem/apps/abit/repository/AndroidAddressRepository.java index 6dee3d0..9d490df 100644 --- a/app/src/main/java/ch/dissem/apps/abit/repositories/AndroidAddressRepository.java +++ b/app/src/main/java/ch/dissem/apps/abit/repository/AndroidAddressRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ch.dissem.apps.abit.repositories; +package ch.dissem.apps.abit.repository; import android.content.ContentValues; import android.database.Cursor; diff --git a/app/src/main/java/ch/dissem/apps/abit/repositories/AndroidInventory.java b/app/src/main/java/ch/dissem/apps/abit/repository/AndroidInventory.java similarity index 98% rename from app/src/main/java/ch/dissem/apps/abit/repositories/AndroidInventory.java rename to app/src/main/java/ch/dissem/apps/abit/repository/AndroidInventory.java index cafb76b..32b9ed8 100644 --- a/app/src/main/java/ch/dissem/apps/abit/repositories/AndroidInventory.java +++ b/app/src/main/java/ch/dissem/apps/abit/repository/AndroidInventory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ch.dissem.apps.abit.repositories; +package ch.dissem.apps.abit.repository; import android.content.ContentValues; import android.database.Cursor; @@ -36,7 +36,7 @@ import java.io.IOException; import java.util.LinkedList; import java.util.List; -import static ch.dissem.apps.abit.repositories.SqlHelper.join; +import static ch.dissem.apps.abit.repository.SqlHelper.join; import static ch.dissem.bitmessage.utils.UnixTime.now; /** diff --git a/app/src/main/java/ch/dissem/apps/abit/repositories/AndroidMessageRepository.java b/app/src/main/java/ch/dissem/apps/abit/repository/AndroidMessageRepository.java similarity index 99% rename from app/src/main/java/ch/dissem/apps/abit/repositories/AndroidMessageRepository.java rename to app/src/main/java/ch/dissem/apps/abit/repository/AndroidMessageRepository.java index 30bacb8..eba1b0d 100644 --- a/app/src/main/java/ch/dissem/apps/abit/repositories/AndroidMessageRepository.java +++ b/app/src/main/java/ch/dissem/apps/abit/repository/AndroidMessageRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ch.dissem.apps.abit.repositories; +package ch.dissem.apps.abit.repository; import android.content.ContentValues; import android.content.Context; @@ -40,7 +40,7 @@ import java.util.Collection; import java.util.LinkedList; import java.util.List; -import static ch.dissem.apps.abit.repositories.SqlHelper.join; +import static ch.dissem.apps.abit.repository.SqlHelper.join; /** * {@link MessageRepository} implementation using the Android SQL API. diff --git a/app/src/main/java/ch/dissem/apps/abit/repositories/SqlHelper.java b/app/src/main/java/ch/dissem/apps/abit/repository/SqlHelper.java similarity index 96% rename from app/src/main/java/ch/dissem/apps/abit/repositories/SqlHelper.java rename to app/src/main/java/ch/dissem/apps/abit/repository/SqlHelper.java index 0d8abfd..f79bbb2 100644 --- a/app/src/main/java/ch/dissem/apps/abit/repositories/SqlHelper.java +++ b/app/src/main/java/ch/dissem/apps/abit/repository/SqlHelper.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package ch.dissem.apps.abit.repositories; +package ch.dissem.apps.abit.repository; import android.content.Context; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; -import ch.dissem.apps.abit.utils.Assets; +import ch.dissem.apps.abit.util.Assets; /** * Handles database migration and provides access. diff --git a/app/src/main/java/ch/dissem/apps/abit/service/Singleton.java b/app/src/main/java/ch/dissem/apps/abit/service/Singleton.java index 76c3301..220dc36 100644 --- a/app/src/main/java/ch/dissem/apps/abit/service/Singleton.java +++ b/app/src/main/java/ch/dissem/apps/abit/service/Singleton.java @@ -1,13 +1,12 @@ package ch.dissem.apps.abit.service; -import android.app.NotificationManager; import android.content.Context; -import ch.dissem.apps.abit.listeners.MessageListener; -import ch.dissem.apps.abit.repositories.AndroidAddressRepository; -import ch.dissem.apps.abit.repositories.AndroidInventory; -import ch.dissem.apps.abit.repositories.AndroidMessageRepository; -import ch.dissem.apps.abit.repositories.SqlHelper; +import ch.dissem.apps.abit.listener.MessageListener; +import ch.dissem.apps.abit.repository.AndroidAddressRepository; +import ch.dissem.apps.abit.repository.AndroidInventory; +import ch.dissem.apps.abit.repository.AndroidMessageRepository; +import ch.dissem.apps.abit.repository.SqlHelper; import ch.dissem.bitmessage.BitmessageContext; import ch.dissem.bitmessage.networking.DefaultNetworkHandler; import ch.dissem.bitmessage.ports.MemoryNodeRegistry; diff --git a/app/src/main/java/ch/dissem/apps/abit/utils/Assets.java b/app/src/main/java/ch/dissem/apps/abit/util/Assets.java similarity index 98% rename from app/src/main/java/ch/dissem/apps/abit/utils/Assets.java rename to app/src/main/java/ch/dissem/apps/abit/util/Assets.java index 71fe65b..e3e2dc6 100644 --- a/app/src/main/java/ch/dissem/apps/abit/utils/Assets.java +++ b/app/src/main/java/ch/dissem/apps/abit/util/Assets.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ch.dissem.apps.abit.utils; +package ch.dissem.apps.abit.util; import android.content.Context; diff --git a/app/src/main/java/ch/dissem/apps/abit/utils/Drawables.java b/app/src/main/java/ch/dissem/apps/abit/util/Drawables.java similarity index 65% rename from app/src/main/java/ch/dissem/apps/abit/utils/Drawables.java rename to app/src/main/java/ch/dissem/apps/abit/util/Drawables.java index d646608..e392e36 100644 --- a/app/src/main/java/ch/dissem/apps/abit/utils/Drawables.java +++ b/app/src/main/java/ch/dissem/apps/abit/util/Drawables.java @@ -14,11 +14,16 @@ * limitations under the License. */ -package ch.dissem.apps.abit.utils; +package ch.dissem.apps.abit.util; import android.content.Context; +import android.graphics.Bitmap; +import android.graphics.Canvas; import android.view.Menu; + +import ch.dissem.apps.abit.Identicon; import ch.dissem.apps.abit.R; + import com.mikepenz.google_material_typeface_library.GoogleMaterial; import com.mikepenz.iconics.IconicsDrawable; @@ -29,4 +34,16 @@ public class Drawables { public static void addIcon(Context ctx, Menu menu, int menuItem, GoogleMaterial.Icon icon) { menu.findItem(menuItem).setIcon(new IconicsDrawable(ctx, icon).colorRes(R.color.primary_text_default_material_dark).actionBar()); } + + public static Bitmap toBitmap(Identicon identicon, int size) { + return toBitmap(identicon, size, size); + } + + public static Bitmap toBitmap(Identicon identicon, int width, int height) { + Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888); + Canvas canvas = new Canvas(bitmap); + identicon.setBounds(0, 0, canvas.getWidth(), canvas.getHeight()); + identicon.draw(canvas); + return bitmap; + } } diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 2222570..d296eca 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -30,7 +30,11 @@ <string name="archive">Archiv</string> <string name="empty_trash">Papierkorb leeren</string> <string name="mark_unread">Als ungelesen markieren</string> - <string name="stream_number">Stream #%d</string> + <string name="stream_number">Stream %d</string> <string name="enabled">Aktiv</string> <string name="title_subscription_detail">Abonnement</string> + <string name="connection_info_1">Stream %1$d: eine Verbindung</string> + <string name="connection_info_n">Stream %1$d: %2$d Verbindungen</string> + <string name="connection_info_disconnected">Getrennt</string> + <string name="connection_info_pending">Verbindung wird aufgebaut…</string> </resources> \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 43775b5..baf9d23 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -18,6 +18,8 @@ <string name="title_activity_open_bitmessage_link">Import Contact</string> <string name="action_settings">Settings</string> + <string name="connection_info_1">Stream #%1$d: one connection</string> + <string name="connection_info_n">Stream #%1$d: %2$d connections</string> <string name="import_address">Import Address</string> <string name="import_contact">Add to contacts</string> <string name="label">Label</string> @@ -33,4 +35,6 @@ <string name="empty_trash">Empty Trash</string> <string name="stream_number">Stream #%d</string> <string name="enabled">Enabled</string> + <string name="connection_info_disconnected">Disconnected</string> + <string name="connection_info_pending">Connecting…</string> </resources> From 64e0479a37d7b29b62137c06c58a3d01b0caaa4e Mon Sep 17 00:00:00 2001 From: Christian Basler <chrigu.meyer@gmail.com> Date: Sun, 18 Oct 2015 16:42:41 +0200 Subject: [PATCH 2/4] Changed notification icon and updated library versions --- app/build.gradle | 6 +++--- .../abit/notification/NetworkNotification.java | 8 ++++---- .../ic_notification_full_node.png | Bin 0 -> 423 bytes .../drawable-hdpi/ic_notification_full_node.png | Bin 0 -> 391 bytes .../ic_notification_full_node.png | Bin 0 -> 291 bytes .../drawable-mdpi/ic_notification_full_node.png | Bin 0 -> 317 bytes .../ic_notification_full_node.png | Bin 0 -> 584 bytes .../drawable-xhdpi/ic_notification_full_node.png | Bin 0 -> 562 bytes .../ic_notification_full_node.png | Bin 0 -> 976 bytes .../drawable-xxhdpi/ic_notification_full_node.png | Bin 0 -> 699 bytes 10 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi-v11/ic_notification_full_node.png create mode 100644 app/src/main/res/drawable-hdpi/ic_notification_full_node.png create mode 100644 app/src/main/res/drawable-mdpi-v11/ic_notification_full_node.png create mode 100644 app/src/main/res/drawable-mdpi/ic_notification_full_node.png create mode 100644 app/src/main/res/drawable-xhdpi-v11/ic_notification_full_node.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_notification_full_node.png create mode 100644 app/src/main/res/drawable-xxhdpi-v11/ic_notification_full_node.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_notification_full_node.png diff --git a/app/build.gradle b/app/build.gradle index 0e3dcb4..be506a6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,9 +22,9 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:23.0.1' - compile 'com.android.support:support-v4:23.0.1' - compile 'com.android.support:design:23.0.1' + compile 'com.android.support:appcompat-v7:23.1.0' + compile 'com.android.support:support-v4:23.1.0' + compile 'com.android.support:design:23.1.0' compile 'ch.dissem.jabit:jabit-domain:0.2.1-SNAPSHOT' compile 'ch.dissem.jabit:jabit-networking:0.2.1-SNAPSHOT' diff --git a/app/src/main/java/ch/dissem/apps/abit/notification/NetworkNotification.java b/app/src/main/java/ch/dissem/apps/abit/notification/NetworkNotification.java index 7ddb271..b51cc47 100644 --- a/app/src/main/java/ch/dissem/apps/abit/notification/NetworkNotification.java +++ b/app/src/main/java/ch/dissem/apps/abit/notification/NetworkNotification.java @@ -24,11 +24,11 @@ public class NetworkNotification extends AbstractNotification { public NetworkNotification(Context ctx) { super(ctx); - builder = new NotificationCompat.Builder(ctx); - builder.setSmallIcon(R.drawable.ic_notification_new_message) - .setContentTitle(ctx.getString(R.string.bitmessage_active)); - builder.setVisibility(NotificationCompat.VISIBILITY_PUBLIC); bmc = Singleton.getBitmessageContext(ctx); + builder = new NotificationCompat.Builder(ctx); + builder.setSmallIcon(R.drawable.ic_notification_full_node) + .setContentTitle(ctx.getString(R.string.bitmessage_active)) + .setVisibility(NotificationCompat.VISIBILITY_PUBLIC); } @SuppressLint("StringFormatMatches") diff --git a/app/src/main/res/drawable-hdpi-v11/ic_notification_full_node.png b/app/src/main/res/drawable-hdpi-v11/ic_notification_full_node.png new file mode 100644 index 0000000000000000000000000000000000000000..337fc0404b7647452e5ba6b720d466933046efed GIT binary patch literal 423 zcmV;Y0a*TtP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ0004QNkl<Zc-rmP zyDtPm0LSsWLnPu=2vJEiA|4%;P|^!Z@fQe{L~^teQIbeB9zl1N{{W@l<J2UZ6T;=Z z#&?n_HshAv+ufOFe#xhsz5FsakKIhh#l^)XT!au=3}6<^Sj8e{(2ty{B8`~95sG-i zJHAjs33u4XxE!BmnQpA(O@xaamzU3_QKlUy5z6>W9ilDCGOgGV@v@EPq!zDSxL(Xc zo?7tPT1wPoRIQiG8vdrBoTDRZnHDVJ2Hzst$lW*=walJ+Fs;b7IQ;KSF`z-sOhu#{ z`TO@MU=B?|g+_2K%tbDTXY9%&rCOo26xK|bd|>0(k)U>ytvp~-FXRckInWEeS}s)7 z3*A~SRMrcfS}ydc7n)Yv&{hh1p)Q<R+WKWIRJ+v&4Ihp|y=fk!Gw8&g!j-|9x<KDw zcUlfT*i^GsQkQK~1wZkk-n+NZ8}{a}lY@O<6?yf36xRyoF=Xt^#KpzMmmmHXQCEOu R9A*Fj002ovPDHLkV1kte!Q}t| literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/ic_notification_full_node.png b/app/src/main/res/drawable-hdpi/ic_notification_full_node.png new file mode 100644 index 0000000000000000000000000000000000000000..fa17418e84855938eecc9a756ee280f2ddfca0bc GIT binary patch literal 391 zcmV;20eJq2P)<h;3K|Lk000e1NJLTq000;O001Tk1^@s6-UnMH0003_Nkl<Zc-rk% z%SyvQ6dgC!f6$Hi2mXa%LHv()EA9g3or!tBR@vthT-0rKQ$_JVOhu@h@!UX*B2`k8 zg)#>Y8D{RBGv`i17?Y5YkoW^AisB$mQ#a4^$1KZU@q7UvFy>Jd?QbkBgxG@cd6Fb= zzV8dyb%o<N4QWhsSYLo=RNLAB!k0l1tVGw5YEa8tiK7Llbi$v+m!w*>^5k35s;UO) z>ll%5!!TUfwk_Ha_wls0RS@1q%zKK<ITvlkiL@_{<HIlFWm)cE;f|tOmh~$l`7;iB zg)~Pi1Bj2i5MPp#z=+aZGzMtPO;_R{>3N<&>yH^uKQ~QN^g+B`*9>lTUj}H`oEe5O z1w|i(NzLFg>dOG#nK0b=Hk@XC7~p<~&6@<1Jzdvlpy-O4rs<zPI7Lwgm>gko3f3D6 l)4qwSszdpslaTmNcn1ovAN9_7+*beq002ovPDHLkV1l3RucQC~ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi-v11/ic_notification_full_node.png b/app/src/main/res/drawable-mdpi-v11/ic_notification_full_node.png new file mode 100644 index 0000000000000000000000000000000000000000..074a2acbab3ea5e7e8b8b3e2a0d9c1afcb6ec32f GIT binary patch literal 291 zcmV+;0o?wHP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0002$Nkl<Zc-muN z7zIND{Qv)-1Bi`)*bj((fY=ZuMh$~mfH)S2&jax%ApQfzAof`xjs~eA*Kl?qo(nY) z7XZo42B{_0a7G~R{7*b+2k9ZkU~VAx0OEci{!W4gUx8SMkl~6zya|YZ{U;A};4@qR zh>!fI47>s2<<OMIf^I?4f9ipsKs*tMS&=Qc@Spl13E6_LG_c?dvITExV8J(J3%1d~ zf)~gZcmeTWDqFAsz0Bz$P%MxFo&vEddQxQt;!GgE4GKRX{zsyrAoX8>_%IL~6UuaU pKpYIjp(NlSAU3B;F+K{Y3IIqoOQx*0F#7-i002ovPDHLkV1gDtat{Ci literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_notification_full_node.png b/app/src/main/res/drawable-mdpi/ic_notification_full_node.png new file mode 100644 index 0000000000000000000000000000000000000000..02890154438263739941e580fa861ebc388c20ff GIT binary patch literal 317 zcmV-D0mA-?P)<h;3K|Lk000e1NJLTq000mG000>X1^@s6IQ*`u00035Nkl<Zc-muN z7zM)_Or1JaV#bUaUel&c^8~Sp)(F%f2-LV_`t<34r%ajhAE^01ko{-o%$bYk&z~=V zS2Iu%7f{35{{H^|-QC?N7$gQX{0z_#4h)T}R;^+NN=5-S@9ORC#n24HAUU9Gs!=re z_4RQAHSe1=X%bjLS63HaJYm9wJ3vDWkpru}r>EzCXJ;o-803=4lP811W)INI{0u<9 zJtkH&G6q=+G-M6~&{;n^Iy(N7gMo&8U;vtSmRtjXdf$T#2x)I`|4$AE8Zs9gkgct) z*==oYpMm&433wkc{16EXXc|AzAa|h2q4+RRV@OL&i^>20{~1R!{9pk9XLEoAr+3aC P00000NkvXXu0mjfw+4as literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi-v11/ic_notification_full_node.png b/app/src/main/res/drawable-xhdpi-v11/ic_notification_full_node.png new file mode 100644 index 0000000000000000000000000000000000000000..1d59a55d4ddcbbe07c7ea8892afda0c416554dc4 GIT binary patch literal 584 zcmV-O0=NB%P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0006HNkl<Zc-rmQ z&r4KM7{>8wG%zwz!7#O2C@6?K^)Cq82uUj!twazLv5jUSA}H9Rjp#zqqI8w++o%w_ z5?qLiD+?u1(L#)=MjbtV54<ZmGtQ5D@7xRLfzM{pnfJZibI*HEC}d+}V`F1u6ACG% zZs8%G;Vs57gU=Yn8#JK;VLug~gF1|08Q<|6{}B^^<+E)pVF<Oz&35rc=*A}g;6mM; z3;Ej(bfPd@#XpeSLtouXm3s95MDPivUKg+L;|1khzM|Z#;_u;$az6Sy^SxNGuarB{ zx717h8%`H}TON;%c#d7=UUpFJRN=X(K`TCB1;5f<u*pV0df#QdPw)i=XvQ3lTrT?h zZM256Oo}f=yF903%KPl;-8|jm@8AV~sO%+*Zy1m@SEk35WQq@?9$PB=ImfYF$a%D( z_@)N#Vlv5bz{|vB9ggV@G*JU}G8XtXQMte+@fsLZ{*Qi2^&rpGz>*3^_EBkS;HL^s zUYi<-1gL>UQv-(qYGB{gz-oXRh?p7}4^RVprUst+a1)D{1ycj}Wd;dCdgIOidW8NL zfPJ7U(J{%ehx30r=`-%c*N#iZGB_@AE2o%>I|~`sL%)o(Q6EgB`c-xUk5hTM$-@&& zV;u*wTYK@Ac7_vq$zMcAQdd5~dqM-c@Lo>iW?iJuhd#<$Y{4U69R}Oj*x1<EIGHQu W#5SAoq^T4D0000<MNUMnLSTa6Lkzh9 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_notification_full_node.png b/app/src/main/res/drawable-xhdpi/ic_notification_full_node.png new file mode 100644 index 0000000000000000000000000000000000000000..0b1cf07633c0efcd87500e580117e26f3d2615c7 GIT binary patch literal 562 zcmV-20?qx2P)<h;3K|Lk000e1NJLTq001BW001%w1^@s6J!IKr0005`Nkl<Zc-rlj z%S&596vl5U6pD*NS8lo~>c*lgmkKR{_$V%2bS3@=u9{6r;pY8*Ke&h+H`(M52;ByR zLLjzXwxB2_S@lI1NgaPj5=kQX%Hvv?4?gDJ+?n~lIp@qw3`0XhLqkJD<9~x?Sx>Xs z>^k&kGMQc49q7&H^K0^LXu^ohrqk&V?Vn^asbaBM7v(p;{}yAkGXoP=N<CnuuTrVh zmuNKlFAxZ*tB9E<W<JyZ<)Bu+#f0@xD5S0vZ&Ugv5{Vj-*z8N3yiUdA@snUMcw_N4 zWsHo)#PeH;77B%jgzp&x7imj(5$`m?9K~EN_vA+63>ssANyy8%uZP3orr+;Z{g63o zQbX5@ld~nns}!1Q=eu8Vq0GbF(JRFfo}klL3E3b-dl`vD4oT@dNvrItUh#3lU6PJI zpKmB^nUJECnkci_<xT?|g#6dA#CzG=9Y;iC{@egB#ZifOMg-jhihbI^(KoNxt42*s zG%(;WaP-#>148PeA_nSq86XNj4IVz&WdQz=2sk_*&nZ-+CfXH)>vNKqk2V-+kb<}8 zmk&<f*bs$J9Mdl@4kWkRy$!!ZH3A;9{TI59WNxj;d{}{1csfM!ebY2wU%C_8a5|lj z2+tfH-$M%)2EaX+%Vok<NxA-Ouc4u#p>eNp240ev3vem-JOBUy07*qoM6N<$g4OE) Ag#Z8m literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi-v11/ic_notification_full_node.png b/app/src/main/res/drawable-xxhdpi-v11/ic_notification_full_node.png new file mode 100644 index 0000000000000000000000000000000000000000..9b736bfbc9a79b9db4edf8551b2937648969c568 GIT binary patch literal 976 zcmV;>126oEP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!000A*Nkl<Zc-rln zTS!z<6owl|D=Q<A9;`HoprogwpofSg0*Op3B!V8Kpy)ynLQxq#R}fSLnH2@ypn8$$ zsf$E*4+9}nG6=e9R+grf&g}lh{DK6X8D~76b7rp}zNf)CXMXoud#$zis8K4FN~Kb% zR4SE9rBbO>|CKQ&1j1km*bYvB``|VB40=E}_yC&t*-@|=ECORdMmicZ7R(0~;5fJm z9?^t0@B{RMe$WSgf=+(+5<CDmz%j5M%mvx$V$5W)6jXs)@C`)F&?SG<0j`5RU>V4j zRTX4|ri0a73B6|cB%$~TtN{5zG$zb&x=eE<bfUv(P?X=<#%ELnA~!J!PXOiM8fZ1{ zOP+BRtODcZ9sF$2I53;Jro)V!+W8NeCGX&8gNnf!<DKN$#eOwsA-Ca=9vUR|(-APw zZ+RyR>;v`2TS@Z12X^tDLVhqP6HEk8Snzo*sl=aivj}@(NH)j=yFm@O%dqM<{?S)Z zIbt=E)EHnAx6%XP5_kq$Xim>C*Ey+5iqczbNiy6vM{0|FPzuh0M)pg7mb4{bz;ck| zwn1~i7WPnnH|AgM1ch#zvj$vX(HAkn(^*;hZdJsEG^fP`S1)Li%#+H%0x&J5yu^eo zU$TiqtRSn8zoC)++I|{Uz%n2+8G~{eTAcw6t3*a65*6#f%w!B&$)2Xqq^BY@NhX!m zoIHevvZYrsc5ToraGvAfoJ0(g*u3Jis@QEwDme&dBx2AG@YvWV=>qmj<sHwU(*fVs zQ_*b}#9=3c>O7w3cqu6dPD&&0WRR?$@5Wxq0$J;1keKtwVuNIX)HoT`mB#f?B9in{ z=VXv{?7uBGNG77KP6jnwo`WQMx}6NVWAQF#n18#R465cTvQ;vwZF4ecn~7aZu~m{@ znw<>Fx3Cu*EIH@D7_Xa`1HcAL4SEVH<Mm@DCU)Ls+ba5HVwWz8;u$38UuBHPh(!jy z2ZupcA~Wf!V1tQWD~VcS&>^tcBr;tzu~QAXYcp`F5l!>Zs%O;X4Rt<UPLtZxG~C3T zw<dNev>@4IAX!Np*{7si;;yGTVUz4t8HStWq*Cr~4FNYwR?R!+oPjg4P^u@b1GhU$ zSSQKN(uZtIq<8CNALF+$>}UHR@ArmvPAzvUNyt;&y6qt+uUo+>Hn>fLO!8fC#rKmd yJ91~J2#hv<z74BVsZ=VJN~Kb%R4SD!1^or;9O1d2CqDrI0000<MNUMnLSTXfX}N^} literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_notification_full_node.png b/app/src/main/res/drawable-xxhdpi/ic_notification_full_node.png new file mode 100644 index 0000000000000000000000000000000000000000..006b25ee9e3d2b102bd82dca7f94207fae85f736 GIT binary patch literal 699 zcmV;s0!00ZP)<h;3K|Lk000e1NJLTq001xm002t}1^@s6Hs=I|0007lNkl<Zc-rlm zOKTHR9L2}?M%-7l-$f8ak%EEhcTi~;LfuIa@|wKgk0N#xh3vXezkplU(pYzD+m%{^ zprN_`{zIZkHI~L?G8g^_4!N1k+<VTw=RT%&9EC!mP$(1%g+ifFC=?3CJke^kPE{(E z>(y#CQ>)cp!w;0d@!5gz``29VxmqX`&ILwzxm-Svut#u@vdQQ3CY#NgbUJNPsgy@4 z%Qg8;?&01~m|Mfhg}I7HNC+W&2pJK46y;udhUa%1jmFKn#D&HS#bVJDluRZkqC6{g zNL}G@_@r;*>GkKiTyA3FhbeV2H#VehKVp-WJWosfunDPqrsC=O+tcj%znJLJ#%$(< ztQh3=<E+FFNISc-vQ0&Fy<T4^l}ZoE=O)~d23*&jDWwezJos<n2yRl*4~a}BlQDjX zACUcG2MuQ?&N;pQSw#CKc+4nVnPgYJPX>E__Vze3-(trVA7bcw^A<iJOZ9is@CIE^ zSzd4abB{pyB0c{lkw};zQIa50?w_IBjLNlfOXL%A9W(=n&B*x)Bae+SCq{ao!&NuP z;)f}x0HT%nWq=iD#TM~HCVDLMOP&GN`B%0X5E7?tPOzsPvek~q<Hk1jm)biHg^rB| zgrukGFdX}~8sLSf?NHdV)qtc&=D-VE4M=)q4%~~yV#ZQ#Ic#E=DRgZ#z$i4my?`(4 zHX0y3%bo$Ubdd{RZ4w`iMz=>^dbqH}4+j>Rxb?@WG!ludV&njtAQSQK*mnaN3Ai6* z@kjmvjFDJ?>paj6kob2nbgb7*Cif*A--R!E_$}=CD7e#a^BL_gbMic^|HM!z6bgkx hp-?Ck3Wee~ege<<9~^<3M?(Mr002ovPDHLkV1jtXN2ve+ literal 0 HcmV?d00001 From e4d7bf48932804969f0d9e2717d79724d161e541 Mon Sep 17 00:00:00 2001 From: Christian Basler <chrigu.meyer@gmail.com> Date: Sun, 18 Oct 2015 18:17:57 +0200 Subject: [PATCH 3/4] Changed to using vector drawables for action icons --- .../ic_notification_full_node.png | Bin 423 -> 0 bytes .../res/drawable-hdpi/ic_action_close.png | Bin 246 -> 0 bytes .../res/drawable-hdpi/ic_action_delete.png | Bin 399 -> 0 bytes .../drawable-hdpi/ic_action_mark_unread.png | Bin 347 -> 0 bytes .../drawable-hdpi/ic_action_placeholder.png | Bin 678 -> 0 bytes .../res/drawable-hdpi/ic_action_reply.png | Bin 632 -> 0 bytes .../main/res/drawable-hdpi/ic_action_send.png | Bin 371 -> 0 bytes .../drawable-hdpi/ic_fab_compose_message.png | Bin 862 -> 0 bytes .../ic_notification_full_node.png | Bin 391 -> 0 bytes .../ic_notification_new_message.png | Bin 356 -> 0 bytes .../main/res/drawable-hdpi/ic_plus_sign.png | Bin 302 -> 0 bytes .../ic_notification_full_node.png | Bin 291 -> 0 bytes .../res/drawable-mdpi/ic_action_close.png | Bin 182 -> 0 bytes .../res/drawable-mdpi/ic_action_delete.png | Bin 257 -> 0 bytes .../drawable-mdpi/ic_action_mark_unread.png | Bin 257 -> 0 bytes .../drawable-mdpi/ic_action_placeholder.png | Bin 433 -> 0 bytes .../res/drawable-mdpi/ic_action_reply.png | Bin 412 -> 0 bytes .../main/res/drawable-mdpi/ic_action_send.png | Bin 277 -> 0 bytes .../drawable-mdpi/ic_fab_compose_message.png | Bin 593 -> 0 bytes .../ic_notification_full_node.png | Bin 317 -> 0 bytes .../ic_notification_new_message.png | Bin 273 -> 0 bytes .../main/res/drawable-mdpi/ic_plus_sign.png | Bin 232 -> 0 bytes .../ic_notification_full_node.png | Bin 584 -> 0 bytes .../res/drawable-xhdpi/ic_action_close.png | Bin 280 -> 0 bytes .../res/drawable-xhdpi/ic_action_delete.png | Bin 491 -> 0 bytes .../drawable-xhdpi/ic_action_mark_unread.png | Bin 394 -> 0 bytes .../drawable-xhdpi/ic_action_placeholder.png | Bin 844 -> 0 bytes .../res/drawable-xhdpi/ic_action_reply.png | Bin 849 -> 0 bytes .../res/drawable-xhdpi/ic_action_send.png | Bin 497 -> 0 bytes .../drawable-xhdpi/ic_fab_compose_message.png | Bin 1174 -> 0 bytes .../ic_notification_full_node.png | Bin 562 -> 0 bytes .../ic_notification_new_message.png | Bin 455 -> 0 bytes .../main/res/drawable-xhdpi/ic_plus_sign.png | Bin 383 -> 0 bytes .../ic_notification_full_node.png | Bin 976 -> 0 bytes .../res/drawable-xxhdpi/ic_action_close.png | Bin 422 -> 0 bytes .../res/drawable-xxhdpi/ic_action_delete.png | Bin 849 -> 0 bytes .../drawable-xxhdpi/ic_action_mark_unread.png | Bin 620 -> 0 bytes .../drawable-xxhdpi/ic_action_placeholder.png | Bin 1391 -> 0 bytes .../res/drawable-xxhdpi/ic_action_reply.png | Bin 1364 -> 0 bytes .../res/drawable-xxhdpi/ic_action_send.png | Bin 814 -> 0 bytes .../ic_fab_compose_message.png | Bin 1821 -> 0 bytes .../ic_notification_full_node.png | Bin 699 -> 0 bytes .../ic_notification_new_message.png | Bin 660 -> 0 bytes .../main/res/drawable-xxhdpi/ic_plus_sign.png | Bin 759 -> 0 bytes .../res/drawable-xxxhdpi/ic_action_delete.png | Bin 1072 -> 0 bytes .../res/drawable-xxxhdpi/ic_action_reply.png | Bin 1929 -> 0 bytes .../res/drawable-xxxhdpi/ic_plus_sign.png | Bin 1043 -> 0 bytes .../main/res/drawable/ic_action_archive.xml | 9 ++++ app/src/main/res/drawable/ic_action_close.xml | 9 ++++ .../drawable/ic_action_compose_message.xml | 9 ++++ .../res/drawable/ic_action_mark_unread.xml | 9 ++++ app/src/main/res/drawable/ic_action_reply.xml | 9 ++++ app/src/main/res/drawable/ic_action_send.xml | 9 ++++ .../drawable/ic_notification_full_node.xml | 9 ++++ .../main/res/layout/fragment_message_list.xml | 2 +- .../res/layout/fragment_subscribtions.xml | 2 +- app/src/main/res/layout/toolbar_layout.xml | 47 +++++++++--------- app/src/main/res/menu/message.xml | 8 +-- app/src/main/res/menu/message_list.xml | 2 +- app/src/main/res/values/colors.xml | 1 + build.gradle | 2 +- 61 files changed, 95 insertions(+), 32 deletions(-) delete mode 100644 app/src/main/res/drawable-hdpi-v11/ic_notification_full_node.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_action_close.png delete mode 100755 app/src/main/res/drawable-hdpi/ic_action_delete.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_action_mark_unread.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_action_placeholder.png delete mode 100755 app/src/main/res/drawable-hdpi/ic_action_reply.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_action_send.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_fab_compose_message.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_notification_full_node.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_notification_new_message.png delete mode 100755 app/src/main/res/drawable-hdpi/ic_plus_sign.png delete mode 100644 app/src/main/res/drawable-mdpi-v11/ic_notification_full_node.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_action_close.png delete mode 100755 app/src/main/res/drawable-mdpi/ic_action_delete.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_action_mark_unread.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_action_placeholder.png delete mode 100755 app/src/main/res/drawable-mdpi/ic_action_reply.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_action_send.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_fab_compose_message.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_notification_full_node.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_notification_new_message.png delete mode 100755 app/src/main/res/drawable-mdpi/ic_plus_sign.png delete mode 100644 app/src/main/res/drawable-xhdpi-v11/ic_notification_full_node.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_action_close.png delete mode 100755 app/src/main/res/drawable-xhdpi/ic_action_delete.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_action_mark_unread.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_action_placeholder.png delete mode 100755 app/src/main/res/drawable-xhdpi/ic_action_reply.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_action_send.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_fab_compose_message.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_notification_full_node.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_notification_new_message.png delete mode 100755 app/src/main/res/drawable-xhdpi/ic_plus_sign.png delete mode 100644 app/src/main/res/drawable-xxhdpi-v11/ic_notification_full_node.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_action_close.png delete mode 100755 app/src/main/res/drawable-xxhdpi/ic_action_delete.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_action_mark_unread.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_action_placeholder.png delete mode 100755 app/src/main/res/drawable-xxhdpi/ic_action_reply.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_action_send.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_fab_compose_message.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_notification_full_node.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_notification_new_message.png delete mode 100755 app/src/main/res/drawable-xxhdpi/ic_plus_sign.png delete mode 100755 app/src/main/res/drawable-xxxhdpi/ic_action_delete.png delete mode 100755 app/src/main/res/drawable-xxxhdpi/ic_action_reply.png delete mode 100755 app/src/main/res/drawable-xxxhdpi/ic_plus_sign.png create mode 100644 app/src/main/res/drawable/ic_action_archive.xml create mode 100644 app/src/main/res/drawable/ic_action_close.xml create mode 100644 app/src/main/res/drawable/ic_action_compose_message.xml create mode 100644 app/src/main/res/drawable/ic_action_mark_unread.xml create mode 100644 app/src/main/res/drawable/ic_action_reply.xml create mode 100644 app/src/main/res/drawable/ic_action_send.xml create mode 100644 app/src/main/res/drawable/ic_notification_full_node.xml diff --git a/app/src/main/res/drawable-hdpi-v11/ic_notification_full_node.png b/app/src/main/res/drawable-hdpi-v11/ic_notification_full_node.png deleted file mode 100644 index 337fc0404b7647452e5ba6b720d466933046efed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 423 zcmV;Y0a*TtP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ0004QNkl<Zc-rmP zyDtPm0LSsWLnPu=2vJEiA|4%;P|^!Z@fQe{L~^teQIbeB9zl1N{{W@l<J2UZ6T;=Z z#&?n_HshAv+ufOFe#xhsz5FsakKIhh#l^)XT!au=3}6<^Sj8e{(2ty{B8`~95sG-i zJHAjs33u4XxE!BmnQpA(O@xaamzU3_QKlUy5z6>W9ilDCGOgGV@v@EPq!zDSxL(Xc zo?7tPT1wPoRIQiG8vdrBoTDRZnHDVJ2Hzst$lW*=walJ+Fs;b7IQ;KSF`z-sOhu#{ z`TO@MU=B?|g+_2K%tbDTXY9%&rCOo26xK|bd|>0(k)U>ytvp~-FXRckInWEeS}s)7 z3*A~SRMrcfS}ydc7n)Yv&{hh1p)Q<R+WKWIRJ+v&4Ihp|y=fk!Gw8&g!j-|9x<KDw zcUlfT*i^GsQkQK~1wZkk-n+NZ8}{a}lY@O<6?yf36xRyoF=Xt^#KpzMmmmHXQCEOu R9A*Fj002ovPDHLkV1kte!Q}t| diff --git a/app/src/main/res/drawable-hdpi/ic_action_close.png b/app/src/main/res/drawable-hdpi/ic_action_close.png deleted file mode 100644 index 7031319f71d73acfdff14ec2746be72c7de7fc57..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUty`C<PAr-gY&hX_sARy3MID6jV zl~vB&_dGp4-bh)^P=D{8_WN15wS+T=VvB%6Qct*%x#RWJw>J;|PEou$_YBvoTZ?9H z{d?wAI=jE&M3q?&R_D#Q)OqRAwLsrPnU~(Iy;h*EvUQsEJ+VD5uc!C-rigA2|L5=U zs_DHXr)jeBCC;r=-+MUKe~@3is5r;Udg1O*$5j|?oi4OX{4(bHtK1x?x?sBHi&Cjy uPRzASTlQZ$Y`^+|eU9wMEgm4}B*uxB)yJN*N}mh#2!p4qpUXO@geCwHq-a+F diff --git a/app/src/main/res/drawable-hdpi/ic_action_delete.png b/app/src/main/res/drawable-hdpi/ic_action_delete.png deleted file mode 100755 index d912755d26e13bf4041b0a32f5bc945d68fb648c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 399 zcmV;A0dW3_P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00042Nkl<ZXhZFp zO-chn5QV=8y72&Bz?GK}Tu8iy%bY-5gdpM~<OD8r3&n+yOJtP`<N$6ILTE5y7EX6n zr3V>(v+Y+u@73#?Fd5MEXVCNh5rN;HpeFE_CNKo9jD+5SS0gqH^H}IOlj#z;b~f|| zEHW`)mV8zMN5BJc(vmctN1jbf(C2r(w)1_MhrnZoK&1IxOd>D=L|~^<vPiEdP}?Ha z@>%advtVu;)o9GLeRhQ+1g15*%;dQD<c|=Tc?txucb*s#@Tg_PY62ypbO#Cw$wIPF zNdZ}?p@3dw2ioPQaBZQIsCtoU3uz0LZpmTi+CnA$w1u>V{`(es>hL3P`lvfDUBc#h z<k#peaN#N9z%GHg10VXA@(dUOr=CIv><91+tPR*bBr<^%oJiaN=N0UfY_kGhyv?UZ tq69o5b&3^%PUSTu*8~hAbqeYI1h$0%HZfX9U8n#6002ovPDHLkV1h_jswn^f diff --git a/app/src/main/res/drawable-hdpi/ic_action_mark_unread.png b/app/src/main/res/drawable-hdpi/ic_action_mark_unread.png deleted file mode 100644 index c9ce72462afd9eec60c99f24a6f6374b5273a58f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 347 zcmV-h0i^zkP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0003ZNkl<Zc-rk) zK?=e!5Y*}es;!>=h2T*U#D91bQLJyOMSVqsC;wD8Fv1dwplwZs85k&KvpbWdo6t^& zAP9mW2%;GjMKKZ1JabaTz+U+9%smazfJXyU;mxCXTYFly6ZM7b9~-%$X1}WVu6phv z>9s-O7u4vLY52y#Mz|G*j*%6L)hT@C2oF(vQ^!Y~3wOdniIJ>=@T^4m0JZWax{yKg zp^6EF%MXoY7!#;GL*zEUXrp#^4#L=35i2TvBRoZnp79vDav$e_K}_VV$U=Blac8{K zGag~AX~RKgMI41A-8~?B?sT&eVoe)QVk;`qTg%xh$p^x{UL{^e#^C7-;jOp}-9cXF tXn+Q2fCgy5i-G_Cu|*IBK@bG-9#6$BFeoiTS5W`}002ovPDHLkV1l^$k+T2* diff --git a/app/src/main/res/drawable-hdpi/ic_action_placeholder.png b/app/src/main/res/drawable-hdpi/ic_action_placeholder.png deleted file mode 100644 index cde7713adafb858e31d495ae647969ec49a05c61..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 678 zcmV;X0$KfuP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0007QNkl<Zc-rln z$xB=@9LJygxPS|YLZKZ*R8T64Raz<Sp_CC?L=X=Z*Mki8;M!rlX(_FER*^0sp4^Hp z6-8X?idy}j#&6&^Fofid<1<N>1U{E6lkfK>?`8Ro<9JAsNaQ_u?V)`w7;{V|bp8-5 zf{YuqO#wf^W5;BIfKl*{%S!@9pqzLBlDRqo@P*YiZ6F`~0;Ql6d<BQ#lH(Z6gCHmY zOKb!k(+MJqN!W!zw2TWf{m8WVCa{-)aM7r=nGnwAc%KL1JRjIgt<yl)EsBpapi6um zIE(4{1XO`)F5hkbzW{!)!{xtHEj|sba)Ne2E+_y8*D&yp#Akp%T-g@LQfVL{5w!s} z6PPaS$*)Pu+Ep5uQ!w{=mX$1S_|Y8t?5Q?z&ej$c1}Zd&kMdlFftMN$G<#j7YCsQY z0oj!AqYau4GGqFD1A0LNzaf+v=;8J?KS3U7q_2k#*w-!-EN~+;;`)N4un?RIhICN( z6apQRMX)s9Dl7WIX#)l(BxOx*2I?h^W(*jZl#~Um0c*e-um-FFYrq<?2I3p|d=mp@ zl185l7#Nh4J#{mX3cd-hL23;c@C(l1E9{UH??A)uc*0;Ed}jw4Q%6b`I{>q!<s&<- z-TyPOi-Bhv4ZKwq$T-q;FXUHsGuKKlwMqj))fc>#6eb!1!(d->fg7eeLlj3llRWJZ z)#(RMbO$<;!Eb>uCN__|)fUCgPNMftrb0~CfHhzZ+;Ia*f|yxUSPr*I+!oYhd1<DD z-Q5CVQ-XRSQGED+_^UxGEo@s9r5ula`Z4u<w4kx5=3feKr+e-H3ce+T(S})+umAu6 M07*qoM6N<$f?EF}U;qFB diff --git a/app/src/main/res/drawable-hdpi/ic_action_reply.png b/app/src/main/res/drawable-hdpi/ic_action_reply.png deleted file mode 100755 index 7414772f6a8ecd0e21d26893c7786ba7e9d1ff8a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 632 zcmV-;0*C#HP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0006%Nkl<ZXhZGT z&C3o^7{~F?llPU^Y$OW{vanNZu)s$C1v~jK?4?++lVm3;DgOY8k}RHuSV&38OR*s2 zt*h>-yD`tqnKN@g&oecrW;1iHGr#Zkc4p3;fseU?>o)={bp*!<j1lPQfiZ<TI<T|( z7=e-t591#Gbarjx0)0l{7!Kmh5CKB`5&Rq?Kp{SYJ~)7B@q+^>iyss~mH5E`97SAJ zW7*e0beiyf-S~=kc#W5Mfgg!&z4f#<`#^{f&$qD&LErHl^LUEityR_-q>9NEUw-vR z+{NR*KvDow(x$CbKjAi>wKXiyZvyDc^Hn<k;t}q2sgXK>S&E+qdV{O@k`s;P01&!E z{FO=fYQ?dXDO48v8JF>)4M7t?tTl@wUPxnzzc^{VNgOEv1w_sskR+lsDfWtMh$3$s zsQ`-&aSIO{)o1LgP3aU~dy5rVjdfU?BBV6u8!n`DrZy2M-ci?Ht3KvdVI#I;8+J^t zxL-G(;Cd5$4nSQxrGAY@WOiXMc4K9Q&^Q=4kN0&Dxd01wr&NGxO`C8C`zk<Ur@lEW zfT~F302KN*;{^6h3I2t%b+ynX0#!B91)x}OKaOL~<VJie#aUD3=mTIno%#TX^|s?A z*5ef}%^IM9h?BX#4z@PnG@?e%A^s))8+}EfSU67R?)P{yw*{vrKS2)`1E8sG=RA*e zI)EEP1qj_cCx-(wPoW$Sce3fb20Dq!F&+VOyw<197=b>$nX}dyfgG>(Y4Z>NhHNn~ SmN@PJ0000<MNUMnLSTY!x)#L% diff --git a/app/src/main/res/drawable-hdpi/ic_action_send.png b/app/src/main/res/drawable-hdpi/ic_action_send.png deleted file mode 100644 index e6c165d03909ecc64fd5b0b5ae3ceb029c7de8ea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 371 zcmV-(0gV2MP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0003xNkl<Zc-rmQ zy-LGS9ER~a*;N!26%iGY>LR%7E-o%E-hiD1MWqx(tsjWsq8A`8j=DGtYO%HVls<(V z$k1Z6vFH5D`@(N2ba<dmPLj)Mnx<)*W?)eiZDPoBz!~1Li(!iaTWG{Su!j*#0ZWMh z=M(!FwGc3fYMY2g{P`iqLXUXp5a4{Fgz-=V4t@wohLkZGTEKeBfMm!qra}pr{$+qu z!%6G=z5@pE_QwbpQo)SRi2E)AoH{Ns=Odt)L4fm(Ys~jDU<FTjjqk|yj6!a(;Nw4$ zZyhNxi)E~01KZfa5iW3tM?A-O@J=zeDEJImO9T|#1iYjOSkzCbpZ~;JT}H2Zei_Z^ zMt1J)M%Lv~;xvS#g!#jq`Qvoj2bu{zQtF|;4_~X8f3aoz)uN_pnx<+0uqJ5;hgisF RBH91|002ovPDHLkV1j1;rZNBk diff --git a/app/src/main/res/drawable-hdpi/ic_fab_compose_message.png b/app/src/main/res/drawable-hdpi/ic_fab_compose_message.png deleted file mode 100644 index 4c86788aa39893ff08a92683b679f7caa13742ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 862 zcmV-k1EKthP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0009eNkl<Zc-rlm z`%4u;6vy}WGAYbTBkkdXh+Fjf!63}~p<leh?eRnXtP#{LE@Wl}MnOa*^dc~+gc6e^ zva$y$8Cj57>i=~69ykMsVQ#y7y*oP>8u%c0W_SIZ-I+79v!3Tz$>nl2;41hCroafu zf?Ch@0?8(po;NT9&VgmF${%6Lc^?KrwM*hlKz9If$$MvlfJh_Afaf8Dct*j;DZUsa z48hzE5kxx9yZ#w`0zDw9weJUC0tC<>hkQABp^40aUQnf_)7L%$jK}o^7J+?WKoj~( z_2RhIK0&;-EuI9c#P0-XWpO3-8yptL)Pl)80rc3E&+tF}10I29HHh(d9cLBUrPAWu zg9iC&P-jb?1aE<#n#4nD<73Le9qmapiEG@`0!+ox_t%1pET?2B+w2jOnhatbRB+o4 zQJ=LTyB=KUCBjO>SdfF0o=mfN5`&_xTa1?vppWJd8}eg9;yaIla&gQGa9;~zmq?*g zqP~*rJ1H~SmY2MvuAr@hZi@B^>So+_Le#f$-BKHab<Ah-nNdO_2suD|MZLOK#zvp7 z25$ncVJM3n*SgcFXisweN$^8HwJ7CBL#`%gWh&$>Gs|t4xNZyBZ6h^?l~?=%+r+hQ zaQ%?2yuJp!Do|cQ-EKKwZ!6c`wKXX%R9<mP<oate-9{x}SwwlY3RO=bVMG395#<#v zHo8qz^2DL2<trkTZ?_>o6p?(#e|et(I(X_YJ$Vtt25=Od1(%B;f7*sLy;#)bX?w5$ z`7^fedK)jUXsYk0mkH6fnOBK!%CqEvL14RR-y1TBj7|B*JQ5??Yhi=-{+f?$<VyrC zfUbYY^r>}=*rZMIK8+LdW!g@eiD6K$oi|~Uk7Ms972;*&ia2jrYwxsr=Y`1AkeQ{5 z&y!zSy5f>=C}7r2i_NOJ*yLH_LIJt`i8%j2obo{iuL;_1-sHl^w$_m1-?+Qfc`g)) zJPs&M+2&Z}FWw>L>wO0AH1FB$^js{QvrXc(o!w6RKc1_F2k)e|<wsvmS|Z<vFY@4} o40IlB^h&AlVk<2dXr)yC0-)2;ff$><AOHXW07*qoM6N<$g8jIisQ>@~ diff --git a/app/src/main/res/drawable-hdpi/ic_notification_full_node.png b/app/src/main/res/drawable-hdpi/ic_notification_full_node.png deleted file mode 100644 index fa17418e84855938eecc9a756ee280f2ddfca0bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 391 zcmV;20eJq2P)<h;3K|Lk000e1NJLTq000;O001Tk1^@s6-UnMH0003_Nkl<Zc-rk% z%SyvQ6dgC!f6$Hi2mXa%LHv()EA9g3or!tBR@vthT-0rKQ$_JVOhu@h@!UX*B2`k8 zg)#>Y8D{RBGv`i17?Y5YkoW^AisB$mQ#a4^$1KZU@q7UvFy>Jd?QbkBgxG@cd6Fb= zzV8dyb%o<N4QWhsSYLo=RNLAB!k0l1tVGw5YEa8tiK7Llbi$v+m!w*>^5k35s;UO) z>ll%5!!TUfwk_Ha_wls0RS@1q%zKK<ITvlkiL@_{<HIlFWm)cE;f|tOmh~$l`7;iB zg)~Pi1Bj2i5MPp#z=+aZGzMtPO;_R{>3N<&>yH^uKQ~QN^g+B`*9>lTUj}H`oEe5O z1w|i(NzLFg>dOG#nK0b=Hk@XC7~p<~&6@<1Jzdvlpy-O4rs<zPI7Lwgm>gko3f3D6 l)4qwSszdpslaTmNcn1ovAN9_7+*beq002ovPDHLkV1l3RucQC~ diff --git a/app/src/main/res/drawable-hdpi/ic_notification_new_message.png b/app/src/main/res/drawable-hdpi/ic_notification_new_message.png deleted file mode 100644 index 096746b4dfec5c879cbbf9a98c43a180cd3d7fcc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 356 zcmV-q0h|7bP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ0003iNkl<Zc-rll zF$%&!5Jk1o!a_-{g@Pc~>AXWg$Q?wiy@7W2c6J^?B(+^C5eq>NAc%!s8eRXwfJ;zU zOeTrAA6~V^K4vnrkX+8h<liHND1jzufI?al1<(UNxQa&t-~k8ZlagtHjnHQStR!Sk z;`6LQnX^r5WoEzyBWl&F%(;Yms!Zr?@J8qcYz`q`xx@{f)ite~a*Vb*O{36xS0l8I zTc{bjAfPtYN#>{#y2LHi5Yckxn6My%kk9c^dl7`j970Y6p$>;oo}PnmvIjK|DT|(i zOi7jHb3hw78&V`@%MC1-p4>BXv}v1<<u^l@Co829t{JIcma2k2ama*}BDcy+rATN3 zmSFcps*+}<hEFQhHbR=|OHYWTDpEqBX#NG5#GN}JX}QpzEyDT$0000<MNUMnLSTY+ CP?a<Q diff --git a/app/src/main/res/drawable-hdpi/ic_plus_sign.png b/app/src/main/res/drawable-hdpi/ic_plus_sign.png deleted file mode 100755 index 54aef0566744e0ce8e5335b666401256d624613e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 302 zcmV+}0nz@6P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0002>Nkl<ZXhZE; zyA1*{41FGgMGyl}u>l1WumU5n0uxZM0Tlxv7GVe@B&z5R-HT(P9Pet!=l5~qD2C2I z>%4vlz^@gQ0<%=W-PZti1-P@B-C6@qv5>oO0UU~Ak7jlefPw)jFk}f?h-eg9NERaO zG88Hc$wIPFkO5gJNZ{x$^cjg4mHC$dHpSX2fJbG%=h!Iz4ZsP&s`7`em)*^5Pn`qq zE&vT>_)i7i_u77&I3m9;Gz5E^Mm0(hcA*ZkNM1ED!Je8}O-$HDO+1w>?Lt$T0&-p{ z=b%8}PfUaZ!l5Y#S-2`9fdCL>rG!d>6k3U-FJDc#F#+#y(f|Me07*qoM6N<$g4UgJ ACjbBd diff --git a/app/src/main/res/drawable-mdpi-v11/ic_notification_full_node.png b/app/src/main/res/drawable-mdpi-v11/ic_notification_full_node.png deleted file mode 100644 index 074a2acbab3ea5e7e8b8b3e2a0d9c1afcb6ec32f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 291 zcmV+;0o?wHP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0002$Nkl<Zc-muN z7zIND{Qv)-1Bi`)*bj((fY=ZuMh$~mfH)S2&jax%ApQfzAof`xjs~eA*Kl?qo(nY) z7XZo42B{_0a7G~R{7*b+2k9ZkU~VAx0OEci{!W4gUx8SMkl~6zya|YZ{U;A};4@qR zh>!fI47>s2<<OMIf^I?4f9ipsKs*tMS&=Qc@Spl13E6_LG_c?dvITExV8J(J3%1d~ zf)~gZcmeTWDqFAsz0Bz$P%MxFo&vEddQxQt;!GgE4GKRX{zsyrAoX8>_%IL~6UuaU pKpYIjp(NlSAU3B;F+K{Y3IIqoOQx*0F#7-i002ovPDHLkV1gDtat{Ci diff --git a/app/src/main/res/drawable-mdpi/ic_action_close.png b/app/src/main/res/drawable-mdpi/ic_action_close.png deleted file mode 100644 index c71f1c4468bb206c78608d3816dc4c27e63ea067..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 182 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJT2B|pkcwMxr|srtP~>rzY~+-f zr77{OjLTB<sA>C;V<Ow87}ZT{Xc5rp+7+oZY0IXtIWKyz%?@MQ!`2@r$(i^eX>X<K zf$J-@kNBK7JN)*8;N#>Eat8`4xSz1)w|r>+-}0gLFtbBHLlx)3^8!{K3l>Z4>&c5a geuJOWHBfHV9tKI_06*qKK!-4Ry85}Sb4q9e0PF8W1poj5 diff --git a/app/src/main/res/drawable-mdpi/ic_action_delete.png b/app/src/main/res/drawable-mdpi/ic_action_delete.png deleted file mode 100755 index 864553a0637d42fb1fcfdf3d41b1151e535c2338..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 257 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ6P_-PArbCxuNihV845T&^w-IG z^H%5RG3|=(w|CrbXmiYS_`ucF8zz^$K0!GrJ$?UKG44rzQ+hw1Z{jdExSR6nnd*cs zHkMKT_u?6BvKBP+fBA2*OF8U^rtK{mhg&H%S68%8*=eEpG_^+Q;9VEKgqH7@Jl|c( z-B54YP%mY7f7ufuKP}H~JHM(joc3ynWN2wL5MVpxAi=@Bl}#+eyk=6p;d<5?NjC%@ zG?eN(i04b#Bq;g*Yn9!X%_zkezirJE@33nt6GIv1Fbd68RxG|Dkp}b=gQu&X%Q~lo FCIH>gWCs8M diff --git a/app/src/main/res/drawable-mdpi/ic_action_mark_unread.png b/app/src/main/res/drawable-mdpi/ic_action_mark_unread.png deleted file mode 100644 index f74f84a9259a037b6fc5ee3aea349dc1f52e364e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 257 zcmV+c0sj7pP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002UNkl<Zc-rlj zT?&IR5QN2oxr6`cLoX@P($ceO?49fcCXkoXXpOC~10RIM?99VvF^WVY(Z6Y)=NOy= z5&HyC;28*YhyV$g0+^eciEkgY;IUDViM3i^^Akw9ZonPr6~>x(8`erqZQmXkKnF7J z)eC}H<C=Ff)*99{p$(EdL2hq?Xr5W)+%f+86^x*Ff>hv2Q_Xed827xh`7<;{FQDMJ zrGe{$XX74ozy>MFC*xp)NH2ULN=C5+I7EQo{*Z`7qP_J35O?VYq08Ei00000NkvXX Hu0mjf{?BgO diff --git a/app/src/main/res/drawable-mdpi/ic_action_placeholder.png b/app/src/main/res/drawable-mdpi/ic_action_placeholder.png deleted file mode 100644 index 6fd4dcd7dd3393a258d3c18c09cb4ff9d84f1d5b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 433 zcmV;i0Z#sjP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004aNkl<Zc-muN zAQJrl|34pyd5KWR0mLN?)CNF9<$*X0iO&MW5>U*FBpwgMS`4%RK!b~bI0c9o0r3eS zJ_E%d_A($&1>!1NS?&SEdyy=~g%1F65Vb8&Bf?^ITu3d;y^#!U1mYGvmi7Q~1rk4; zQp<UPcps9189<zk#{nSAW03eqfLMeQ2Skz)^yoN^5(iA6f&=DK;(+y3aKLU-EcAmW zGH)o~9-93q!Ol>#oS|li;IiBf&E=LryqO9ium^~B(Zsy5IUoZ~Q8E=B5P>FELW~1a zsOW&GQ3s4VVAKJ`I3OKOQ4$p$5KfE(%+VAXQqcjbKztHO%o$g4Yy-q)pkf%xr-}oh zW*Gr-DG<AmQaNp)mIKJGj;pEQfKEyrzyWQ7ff^?B(d&7rI0$b?lUo86FCwNhL#$&= z&@7pNB-e^2=SGWu!KecU+yQE6mNX&Bm7>WR(W-x#4ee}zI-;^j;^IKO0EmwQaXAn( b5^E*^zvitJ#sOu800000NkvXXu0mjf_qV67 diff --git a/app/src/main/res/drawable-mdpi/ic_action_reply.png b/app/src/main/res/drawable-mdpi/ic_action_reply.png deleted file mode 100755 index a25803b295f16129331b38dd17b1260d13d9aad8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 412 zcmV;N0b~A&P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004FNkl<ZSV!&F zyGjF55XSLe5WH0uR@&K#rB5Ju>3jwYpT@${LQ4@#EiDBLu@q4dEi42PEG$G3uM8xx z#@)C%iP<ItTkQ_te`dZjXKN~sTE+VM0R0Z6c3=pv-7s(pz#{H&Rs}$a&ttm^fQEP! z-gAJgc+UYA5KlIG)`6IJRNowLxW^4HafQzmQ?@z<MdEonPdLF5p4$N_0%%7(tM`Hf z9G8X214tFmYF=Qs%(D6~fPlHh7NRSK(d`j53x!EH@m@sGEfcmXGW@WY0uVVxehAlp zU>I>RwTiF$D6aE9Dsvg-L1Y)vAjUC?DNJLuNi258Is)cLlmW==M5|3WfEmoyp&Eia zI86m;hA6v=XR(Zt`qtd&1Rx7h79euQu!0G!;UNoAb_Cg+@I=hCogb1g>MG80*eO8d zr~Hz|7?!Z#4S+vRUg7H)$77WMzsOQNkXn6iULT<H4txW$r$8a)g;M?i0000<MNUMn GLSTZ8Td2(d diff --git a/app/src/main/res/drawable-mdpi/ic_action_send.png b/app/src/main/res/drawable-mdpi/ic_action_send.png deleted file mode 100644 index ca5ad5ce44752a535bffbc419ec5488bd2aaa26d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 277 zcmV+w0qXvVP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002oNkl<Zc-rmO zy9&ZE6oBD+*_~YUF?3M`Q3MeLeF2>ueFA3(N2j_8Vg(Vgf}^XW?^J)G0SOduO^;v> zd~5SV+a!)-$Bvzd34$Oi9Z<v)Rmq4mu2`XlRMG+SFhE(Oo>&MAjkEw|gQoEi7N|r7 zC|k6UHWiS25}@qRM#e;h|6;`59-UZ2c-Zuf0Of#gEPDwL$)kh@`WRr031)EN;e?A8 zazyW|kT9V95HQpN7N!F}c?Eu)uR!i26#or>VIvaXiuJ?DOZqU9JC0ebAbKGYzmnOp b^EYz?Sa7w0eRmHZ00000NkvXXu0mjfh^uUu diff --git a/app/src/main/res/drawable-mdpi/ic_fab_compose_message.png b/app/src/main/res/drawable-mdpi/ic_fab_compose_message.png deleted file mode 100644 index ea4de0230320ba8211b9fe709ef68d6a9e064d68..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 593 zcmV-X0<QguP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80006QNkl<Zc-qC6 z%PT}t9LMh%kCErZ!YeT*kD5YRNF=rtk|c_Sg`y-@vSLA2#)idsKQ<D{!uwH@*Z(xW zKYeeVrn$z<J$Ib?bm#u=o%8*jbAIP{e%CM@Y~gS?1&o19@B}tMyOE3rArDvqUr`Wy zrjz1cux}x55(4RtOgpbRpc|b2;>5Ua@g}bIF2&t4N-%5Tz?p6bYQa2sqreU*=ChF~ z4&3Sz&IZFE!21f$f{0uLKkai74lL_(U;?}=!Bqv)z#?r|pa^7ubJ}jq*|8&>rTi`f ztL*#*bTSVt(Y6U(V1P^1XjeSIfRhmof>hdjDewV07=(v(q6L(LAzk9?dLDpMK5wHF zFN_BX&QGwwS#jABuLF-3+e+58n(y_|7Ucapn6x``5r2r0;lzm&zQ0CWAp<kTj(82Y zk0EZdCo#dPmss%G9eF(BCjI<xt6gzFxQkO<IM$J15*7d1_jbj745&oJLu!&rM7)wY zJo(~uARmm%VIgZ7hxm>T@p{nAlqp-O06hOuJX=TLZ7ZGj(AJ@x@zL1TCGL;t_)f|1 zlK+n^l1`4UbA2v~z@<`XxFQZAt>T_v^8CA5K;n8rn;fyZI_tUa7(sT<8JMDYp6-Hj z>kpCMz;au=cvTGHSJrnv!--}Qe8L64?YvHZ!>Pe1rBje)l{*<9kzLB3pO)&@NM?iJ f40nLX_=oll%_gz8oQR?A00000NkvXXu0mjfFPs=j diff --git a/app/src/main/res/drawable-mdpi/ic_notification_full_node.png b/app/src/main/res/drawable-mdpi/ic_notification_full_node.png deleted file mode 100644 index 02890154438263739941e580fa861ebc388c20ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 317 zcmV-D0mA-?P)<h;3K|Lk000e1NJLTq000mG000>X1^@s6IQ*`u00035Nkl<Zc-muN z7zM)_Or1JaV#bUaUel&c^8~Sp)(F%f2-LV_`t<34r%ajhAE^01ko{-o%$bYk&z~=V zS2Iu%7f{35{{H^|-QC?N7$gQX{0z_#4h)T}R;^+NN=5-S@9ORC#n24HAUU9Gs!=re z_4RQAHSe1=X%bjLS63HaJYm9wJ3vDWkpru}r>EzCXJ;o-803=4lP811W)INI{0u<9 zJtkH&G6q=+G-M6~&{;n^Iy(N7gMo&8U;vtSmRtjXdf$T#2x)I`|4$AE8Zs9gkgct) z*==oYpMm&433wkc{16EXXc|AzAa|h2q4+RRV@OL&i^>20{~1R!{9pk9XLEoAr+3aC P00000NkvXXu0mjfw+4as diff --git a/app/src/main/res/drawable-mdpi/ic_notification_new_message.png b/app/src/main/res/drawable-mdpi/ic_notification_new_message.png deleted file mode 100644 index 456614bfb69f6e8024e54d99ae303d66fb5dc3c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 273 zcmV+s0q*{ZP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0002kNkl<Zc-muN z7zN~l|Ns9p0kJI*X900K5F1m|a0?*5_8$`*17bC582$~2{{rzdES9_iVkJs~<r>s* z8>m<=7E88~Yk@7)fM-Zz(pW6`2gEYuSdfKeNG{ay8UL{Z4{|I>|4%${A;$t^A`Sly z#3JOz!!aT(cmTw_<XWHxO^SrTVM;7f0wqOgYC#T`2UN2JYLN^mwSXcN6y_kqpoUV< z5-gU|&5{W~yq0E`KrPaxwNKc9SQUsjAX$=6i@IYPk_CmdumBV%`5?oA*l4u6CJ6ul Xf6GlTac*`+00000NkvXXu0mjf2&!d& diff --git a/app/src/main/res/drawable-mdpi/ic_plus_sign.png b/app/src/main/res/drawable-mdpi/ic_plus_sign.png deleted file mode 100755 index 72840771415e2e1392147e5268798aa1286e96e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 232 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ^`0({ArbCxr=I3yaujfhXMMPA zLHgo?U;z`(#|E6@W~{x3HZNP?xJ5(x#H)pw>|qO^-<dxvJV4j2PO8#gQ^DuJnJ|ZF zojcyIl*;Oq6PR^QUy8eA#;Ve&GJ$24fClGvi?*|kkt?kk-QCZp&X|$!nUQ8|P|DLi zWsa)t<<A%YPiDGy;K;|l9jxJ=yRYA@?3v^s<iS+$`(WOT?nzngiH9sFefg~W!R*>9 g?&t|jS%Nzly`R=7`X*V_0G-a@>FVdQ&MBb@07>y!jsO4v diff --git a/app/src/main/res/drawable-xhdpi-v11/ic_notification_full_node.png b/app/src/main/res/drawable-xhdpi-v11/ic_notification_full_node.png deleted file mode 100644 index 1d59a55d4ddcbbe07c7ea8892afda0c416554dc4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 584 zcmV-O0=NB%P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0006HNkl<Zc-rmQ z&r4KM7{>8wG%zwz!7#O2C@6?K^)Cq82uUj!twazLv5jUSA}H9Rjp#zqqI8w++o%w_ z5?qLiD+?u1(L#)=MjbtV54<ZmGtQ5D@7xRLfzM{pnfJZibI*HEC}d+}V`F1u6ACG% zZs8%G;Vs57gU=Yn8#JK;VLug~gF1|08Q<|6{}B^^<+E)pVF<Oz&35rc=*A}g;6mM; z3;Ej(bfPd@#XpeSLtouXm3s95MDPivUKg+L;|1khzM|Z#;_u;$az6Sy^SxNGuarB{ zx717h8%`H}TON;%c#d7=UUpFJRN=X(K`TCB1;5f<u*pV0df#QdPw)i=XvQ3lTrT?h zZM256Oo}f=yF903%KPl;-8|jm@8AV~sO%+*Zy1m@SEk35WQq@?9$PB=ImfYF$a%D( z_@)N#Vlv5bz{|vB9ggV@G*JU}G8XtXQMte+@fsLZ{*Qi2^&rpGz>*3^_EBkS;HL^s zUYi<-1gL>UQv-(qYGB{gz-oXRh?p7}4^RVprUst+a1)D{1ycj}Wd;dCdgIOidW8NL zfPJ7U(J{%ehx30r=`-%c*N#iZGB_@AE2o%>I|~`sL%)o(Q6EgB`c-xUk5hTM$-@&& zV;u*wTYK@Ac7_vq$zMcAQdd5~dqM-c@Lo>iW?iJuhd#<$Y{4U69R}Oj*x1<EIGHQu W#5SAoq^T4D0000<MNUMnLSTa6Lkzh9 diff --git a/app/src/main/res/drawable-xhdpi/ic_action_close.png b/app/src/main/res/drawable-xhdpi/ic_action_close.png deleted file mode 100644 index 2eb9589dd6307b9d20c948744606920c00047669..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 280 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=_dQ)4Ln>~)o#oAUSb>N2<i(<; zIz?_`JB3pnm#&yS$!z1ne78?h=Y#G31Tg`X1Hld#&D51!uSUrpi@SZJd-<QZ*DI## zI%j;^*}Hdl%Y{q!eyKu-+W+j{_T&pk+GzosV=~JYK767pEgg1m(ZPpL=jW72{ZyBl z=lAd2vE@_uJ112Atamwd;=huJ-@mSih@Wx?KYWr^JTm>iP*YotJIBYTPnjpwu`aQ1 zy0qW%W#@!1ArV!EDtl$7-4mF2PiXQzk*W8@rrSwOw3C`_FY~k_=5NyxO_sCTMi8eO Z80x=@O59$z(7*sB;OXk;vd$@?2>`T0cToTU diff --git a/app/src/main/res/drawable-xhdpi/ic_action_delete.png b/app/src/main/res/drawable-xhdpi/ic_action_delete.png deleted file mode 100755 index 37e9c219cb4f028f2715714dad4f178f5c726040..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 491 zcmV<H0Tlj;P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00059Nkl<ZcwX(A zu`WhI5QV=#(NL;IB-9FerB|R3ox~H+YIy>QPBdOYsVAW(5m75?BxJb1sL1Y_f8FGs zTko0K`F3{hDR#ubztO<!#{k>`11I1sFz^QO5NvS;7J+SGy0F_`fm7hVP*=2k(g5aw zor>beMFfNs;Hjvpg2lA}7J%75^2CX+3&sD0Z~+92-@a$yp`iB9rL_PyfYs7u6JCD> zoR{V>fKp=JdUt@Yz`$of<<04ztab?Yuae3gWdK;I%$+5>Rsv-JI8ru{pxskq7=S{r z)4Br^ASxkz1r&Oo0SZ0OfG+|bf(c!ugzykl=y?b#^gIMT1pOEAZ_qx#M#xUkRye^+ zC?RZx6?(S93O!q4TVY#aTVY#aTVY#aTj2yRp@jH%D|{$Cw^Ira?K`lq1j(?%2f&Q7 z2|@b;ME>e81HcxrT)hKLcnh2<Au<5W1G~VKvXKhy8*mIfR%pK^82}<!biigq2vK}I zi@i~b4{a8Jh!vf%1}t?Cq%&iW2VOjwz5_1RlOKc2-lTdU&GiP*9C^<Yx&wN4AkDYq h4rq?NX9)-20UuzfMnSPsvF-o>002ovPDHLkV1g#?&=3Fs diff --git a/app/src/main/res/drawable-xhdpi/ic_action_mark_unread.png b/app/src/main/res/drawable-xhdpi/ic_action_mark_unread.png deleted file mode 100644 index 35083d1a58497d7967701dd54f9d11e914ef1b63..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 394 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU<~whaSW-r^>$WZ)*%NG*S~@; zyj>l;UkR~@uGG+I)jO}$=JMy|yi4L0%&h5bM^CC;EPhazIjOuqBduvJAJ7;OxS`Rt zNc(3-<Ss>4l}Y!fsX8(+2{beWFtJU_?mjhrGoRCauJlRyCzl>Ps&Dmp%_-A^TN;&o zK4zXdI#F=q^$45(pcuUi)6b~dp3W9N8J;4zGp;yk=JMs6zpdWEEfcHWuW~5-PL0QL ziR}mFPaaZ!q;Qf+?EIHG>mG5>)%<03Ks`z4roE=p<>DTBjkwcJD`b*1CE0`?YTHd& zV{<e+mUEs;c7MlQm9H}MUscB(y<XLOOuw~O$xTdf*$)kek8W>SPc5|1J^V*_W2uP$ zmm8P0bK1^LI&16va;sU@nbU9C<|;9X<sU8kk+bh}-~E>Dm2wlp0_LzQaX5hd$iSk& jzzAg4Pk;mjLqqgGhW=3f^X$xzf<Z!_u6{1-oD!M<?k}Ak diff --git a/app/src/main/res/drawable-xhdpi/ic_action_placeholder.png b/app/src/main/res/drawable-xhdpi/ic_action_placeholder.png deleted file mode 100644 index ae7c98f89c4e2d11a04a06b2084b3e63108d3975..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 844 zcmV-S1GD^zP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0009MNkl<Zc-rlo z-AhzK7{-rgVHbg=L{>`FMNovndLfw=NU#WjecFdcAeG)Igp`SRB@r1R-DE+~7h+r8 zlpsaf2UcqRPuugt95@`#%sIPzj`I$^13v`ko!NPw-JLTZ?|NR!rC2PU0#h0EI}EOS z+zSTT2!4as6#Hxj%iy5rLcu_X!1EOQy94fet`rP*6Ziu15p`8yGuTI;5=9GWpt^|o z7WIkR<+)Ta;7i~G*Z{VIUhoin0)I7-X)|De1S_+ifSaCcMG2n=Z@{WSw23+J3)H(N zejAuBQ*;zh!CqIy=fU?B#rx1x;C$3P!Abnp41|XnV`%~{Qr1Ac&p4>&B)-cqiOp3Y z^gVc{sk_2Od=prT7~r&ej8&^gTdCsTf?D+&BN6qhELMi<*&ZceBoH%E&deWZ-=~Qw zfEt_PTMYte_13Q@#^o}<0`$(G1z!y@d7B1It>MI{T`buWUsu69n>KrF7;ub<c%sLK z0RxN-n6zQQJw^t+vSGkuMh3jgN@P7atf&jsZBe^E4m5<uRtws}QK~Oje4pBj`!3UJ z?_8k%A{b@DwZOPK!D48|I8@RG3c)7~AGc1fUjh8x4^}iWgGt3##cW_+FgCz6F@H<6 zgQT^!!9~BL8m0ymV&a;T8er<=2UyS4fccoXonn9(AO?s5Vt^PR28aP-fEXYKhyh}N z7$62j8n8~?>*+dKWPBhp8xyxZ>9N>LLnkwgkHp3eF$;;4DiGMFIToY4zypj8XbhbQ z2RT{lv3Q5d^9v>{v~j-}p=`2HR>^13UCHGLB`h|(b~A+k?Vwv@n$zTJEF%LRFfyQE z!+>5!2Hdul5x&4c{Le%SoQzDM3G%f?@gG6XcA6Zm3UlCefVf2I$xu9TE2hnCDE^S2 zN9bbO?3su*M`GICcPU+73=jjv05L!e5Ci^W1NvjcbZZV_Ol>AyG9YIV@(1kJ>@AiI z?Ycadis4rxHw<kqXxco=>|i591L$=5av*h$au0jrGB#0vTpekxsAF#W+5E<=#`zC3 WyK6wXy9ZYQ0000<MNUMnLSTXd6?Lls diff --git a/app/src/main/res/drawable-xhdpi/ic_action_reply.png b/app/src/main/res/drawable-xhdpi/ic_action_reply.png deleted file mode 100755 index 8b1d03323c480f2b9a19583738875b34ac708a17..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 849 zcmV-X1FrmuP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0009RNkl<ZcwX(A z&&y3g7{@=aANjSA;<aEyb{5J;%0l6_uvNAe{unD8$&ZCBQ6#dlAbDehjT8xyUx|bw zzxAz|I^E8>Gjq<&x#!$DQ*XW9GiPR=&+~nrd1mgNA@eqqx%~_P1_fkJU<iTC1u!JR zAq0jH$eh3s0+|b-)m>mc@TzOT+X{g>U=?sKM*uQ@7jQpE05X2J@%p{o09eo4Fv|)+ z(epO!vjH&b`K$nxc|IEeRi4iRz&OuOJ%BxCt8*1qQ<(%+;OzCR?*0Owfp@?g;D!17 z?)iR_ZZ5Bln^eY2`c2082|NKF0S|z0Nvs?*Xx+t!c;45hKfq()wt@1`_r)gt>Hvu0 zdDog19@h*ASKmg@Ljk1l{5S)i1DAlejjW6m0&RG{Y^lG1>%a{_i8N~SRY2RGFEdhV zI1hY`Nx%odq&#0{r?$~E!0T8L`UXID{{YSc4`V>^0ib!h5CTPel^0F}Pn$yU1z;gG zEqt1;xA?x4pm1meAp}4dmGA{PYD(-{a6<ufQ3)!VP5}yw;8q7f7nN`mxEgGI!-Gth zwnv>CjsY)2A=FiXohM{>_zJuS76OZbrNDAvS?HoG`pfv^fDTpOtto(zoKSTkA{Z-y z)xa8H9iXq#^nd93t^l{Zt*<db)!05t2)z+n3v2>50~?HTT()UfI1K!Db+pez36C4s zl@me%6z5t2Yz4Lfvkv1f1M`yr;MyIU0I>Ebe+a}*6C!1HegKa6svxEUiixqTVvGU6 z&anX4ZZ2b`j?t!5<6R#WqySK*gqQ%VZTian0I+eySe3^oCkdczcSr$1^T>%ifPH|J zp{BY($?%g4LMjCm!@*vgrvhN-+5+qcmY5H`l3{89MJ2TH0}0g+hfIO>3^*}q1r(K_ zLZ^+N$S5BiG}WfUK(|Phtqld($yMP+yUKESRuH6wi>}?EO#m)6#(u8EsA}>;R}>K2 zK%encE8NK$z#>;gIL#s8qmba^rq`f->NF^zPu@zg)<FR&sP<{hK>>a8R*JO_3P?e< bPh<WEixPf8$YVo000000NkvXXu0mjfC-iuN diff --git a/app/src/main/res/drawable-xhdpi/ic_action_send.png b/app/src/main/res/drawable-xhdpi/ic_action_send.png deleted file mode 100644 index 04daa14977652e133c72ff22e8599edbd080b3bb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 497 zcmV<N0S^9&P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0005FNkl<Zc-rln z%PT}t9Ds+Jkr5Gp02^!B8(An})K&5r#KL1zmTXvBu*Jes$t!u}5k+1rYW}D3-8v`J zl+1AN%suz~zWVm}eBIZ1L?VJ92!bF8f*=S&apZEjW~{O~zyKa#(#jAFx)rm^L+r6C zggaP#$&286g1uO6ON8Bm0NPXR3w;O%nE4@q_6++m8rA^GUjk^)aS&r+{1j$O@Ct`Q z6@tOslo-MF8l6ytU=W*s2%x>i5saH0VCo+M@<WVbjfnv|JqVz^$8oGRDL?{0J&fS` zfN5hwaG}Q@2hcv^bl^j9f$Kg6&_3ZT)&(_y<8y%g5OY``v;gg83ZQ+)d29$ufT+3) zW^ftTa0~bFNPXtseF*W2i`Zz&%QA*7*oGb0g(;j+6RQ>6z-`>e3;ZY|#2YSQQ_us% z3j!onfV2v*ssik&0GCDtP>;ZHg&u)S#UFtRy#yD6^b&N+IPgGz2Ce@Q^7~gfVdG?I z(um2BOozQ$5V^xKQx`<6UlOx-QPlcn@e(&iQeoT}v3_gJ-px_#x5wpx#P<=IZd;GY n*nLP!5ClOG1VIo4!F0X={LZTJ@@%^i00000NkvXXu0mjfpA6hh diff --git a/app/src/main/res/drawable-xhdpi/ic_fab_compose_message.png b/app/src/main/res/drawable-xhdpi/ic_fab_compose_message.png deleted file mode 100644 index af0217a8945cb027787a822dab4d41938fa9226f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1174 zcmV;H1Zn$;P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000DCNkl<Zc-rNg z`%4s26vt=XR?XBDD-?YFP-109;-jL{9+HtzB>fNtm6eo8+4~7*MJYs98c9Tn1x1PU z0DEa!t-aj;$<Bo{a5&sM?#`~e_l^S}(3v~4^SzIA&pG#wWf^`<O-=cLO5g_Y1{ei~ zfa}0UV2<V01H`2QSAmcNqEhNbMR`s9e4u|C@s!&@wpYX#1H%!Bw|NgNF<txyVBCdx zn{U8!Q^jva0ih`Q2;`bt2`NAsZ~`s9+e)}^gkcoZm})A+Szuojy`n;Q@e6>L*wTGK z6ObV(w+LG_(h9huv-lj~mBNU%0CQP+KX4S7jGzKu=v)D%z<Gyp{#JN^lKXZ6|H7RX zP4V`2qvhrT{sPTF61%4<%nEp_qhP<{d^&I%MROq?+)%>*tzlF^n{MLEfiLLgT@qHB zPgNNBe2|E_MJoYkj|UFoe*^hCiLX?6c!NNdWOf*kl)X%c1N@x_{7_WDA>CSk6>z~} zP8U&MIw_w9^h(O@WzRh#DRWIV)O4tb4B()mH;6dDn0bYK{{JIp5K<-+2(liPs)NvU zjOu(2PEfa`62!Dv#(KgaEAyPTFeXdvd-HS<KM#0>FEs+Rs|*sH-^p4qgyXu5d4iu= znFeyb5oeDzx{2pqS2#Xdl6zK21d7%yBxTkyFK~cdTLv7~L42A*JP%dZE0Q21tgMI= z(j;9ygx+8-u@!z@TVBQ_Ix^hDD*`^TvS-<}H$kq|>g3M$xro+8izZ8kLy)<{CFFXC z%nq0+o+dK`l7NSn=_1!E@LZ4R`lgGw>0}<BSPQtz3}_Z{fp2<AyiE&xem?MvT(6@Q zq(k1WCx+r}tG=53&PA0AoJjG>z?~S24-uy+gZx$ro)1#TDA6rHQ{rt-k>5)aX)Rf1 z$gAQ*IL|MnF@r9t>#jJ6w>h9&-aek<1y6JlA4q_BJ0t9yt>Q%#xH#dNTik&WZ}DRy zwAEqEcP2pmS77OE6+fnfcwZR%alF~>NhQ>Y<)jD~AfsVC;VrMIh-{z+*pBOPLo+14 zT$=!An(GZSAbzDz>8xQ)PwfFVVe4nIX>q`F;!)gI#f!GGa)nXu+0m=p6Jh-h+s$%V z*;2(iemMNps^v*8-pS&3OH$Xl(=1D?#8>KQ?c2k6`D2p%M51CF@XloM0o<$*P75BF zt-RnfoQ6bDOY!*f^$~XCUfJ$T3|-A>dGg{9T^O?OxK%BSJm;~Z<!f{nUlhSsGZ~HK zS!X0Uy|tFk2af4z=JRvpS=FYAPm!#^y4jcSCo{rp?Dl$#cWL}oRFh{`86iFj<0oC! zwM;wUr3+#d>rdcTw18<9&=!NS->k)IjZ4qZO&~Lg%iy&}f1?L4zr{ta?j+r*W%Ln2 z1osTs!9Q3qU3`IJ8#*;=o%pd*lI69-!T5<lX1`~?xKt%Pneh`n;U4b1^jls(i18c6 oZ}AGO*>qs|+Ni}A@&p|J0pSK-ga+l*1^@s607*qoM6N<$f~5>Dd;kCd diff --git a/app/src/main/res/drawable-xhdpi/ic_notification_full_node.png b/app/src/main/res/drawable-xhdpi/ic_notification_full_node.png deleted file mode 100644 index 0b1cf07633c0efcd87500e580117e26f3d2615c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 562 zcmV-20?qx2P)<h;3K|Lk000e1NJLTq001BW001%w1^@s6J!IKr0005`Nkl<Zc-rlj z%S&596vl5U6pD*NS8lo~>c*lgmkKR{_$V%2bS3@=u9{6r;pY8*Ke&h+H`(M52;ByR zLLjzXwxB2_S@lI1NgaPj5=kQX%Hvv?4?gDJ+?n~lIp@qw3`0XhLqkJD<9~x?Sx>Xs z>^k&kGMQc49q7&H^K0^LXu^ohrqk&V?Vn^asbaBM7v(p;{}yAkGXoP=N<CnuuTrVh zmuNKlFAxZ*tB9E<W<JyZ<)Bu+#f0@xD5S0vZ&Ugv5{Vj-*z8N3yiUdA@snUMcw_N4 zWsHo)#PeH;77B%jgzp&x7imj(5$`m?9K~EN_vA+63>ssANyy8%uZP3orr+;Z{g63o zQbX5@ld~nns}!1Q=eu8Vq0GbF(JRFfo}klL3E3b-dl`vD4oT@dNvrItUh#3lU6PJI zpKmB^nUJECnkci_<xT?|g#6dA#CzG=9Y;iC{@egB#ZifOMg-jhihbI^(KoNxt42*s zG%(;WaP-#>148PeA_nSq86XNj4IVz&WdQz=2sk_*&nZ-+CfXH)>vNKqk2V-+kb<}8 zmk&<f*bs$J9Mdl@4kWkRy$!!ZH3A;9{TI59WNxj;d{}{1csfM!ebY2wU%C_8a5|lj z2+tfH-$M%)2EaX+%Vok<NxA-Ouc4u#p>eNp240ev3vem-JOBUy07*qoM6N<$g4OE) Ag#Z8m diff --git a/app/src/main/res/drawable-xhdpi/ic_notification_new_message.png b/app/src/main/res/drawable-xhdpi/ic_notification_new_message.png deleted file mode 100644 index 5621edb8c8bd24d0a5b37aa83f15cbff25d12b0a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 455 zcmV;&0XY7NP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0004wNkl<Zc-rll zy-or_6h?Q07QO%w6Dw;H5(_&i3Hku2Z$V*&v9qLvf`m69;T32oq_m)b#KMxq*bp0x z<2T7QStm@G)!n-@$^DYkz!dk)&z*rNl1L;H33rrIN1zQxU=Ciu3QR!{G(hZQ;Rm1t z)@pyALCdG&t6-+m<qPz|p%2Bc)Za4(r6RYDIrAU%*&>C+V^IPfqY!;iD~a!~z{Ww~ z6V!|7Hfv+%D?7&BIj+KlTcB+eFtd!SISOn+nNwh76tJ+2yGU^st~mwfI|{fo#>9GS zczKxVhBdRHJzt}lpQLQ5Lr#JJ^nP0goC4Dv1iG98y&MFZoC1xEi+|U53#UL#ugdWD ze?p=~ugWa)2F{9*=x4YJ{1W;-Pfy~YB})1hrB`Lp+o?{s?{-hO8Bme_Nsvex+|a5F zso<{e^FOUp7w5Hvqo_!Tgh>3BI05IxLy!^)ncHAj!a*R2?R2bvV-xoliDfANcsDHq xuOh%CaB69>VF)DdiKQ+&!BZrWNF<WH@(ulo{osJP^>zRN002ovPDHLkV1n~Z%QgT2 diff --git a/app/src/main/res/drawable-xhdpi/ic_plus_sign.png b/app/src/main/res/drawable-xhdpi/ic_plus_sign.png deleted file mode 100755 index d320ebf7ce139a50fe6d8a85b8d27f57240b6035..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 383 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV080zaSW-5dpmP4FOwlp>-=(u z00pZTkxgBk5e=LILdpRFL5CztdJZt~G&txas<f=oW0|7yV#@nlr{~Adlf8XD<Y)TS z+xiR*j8l~xxI_FHni2}d3%>U)@ocDcH{Lxx<*7Y`g!e7ho;kB`ax!o!F)(vA{k?PQ zZXsh5gX4tohV%(G3nUqZ6pb8%60;b)7EXF;c{IRti)Pyjw&)1H{Z$ozd)66E+QPMF z`?QjCJFc5vOYUKFET8Wgm0}Zea_P3TZU46@G8|dQ%=UokNW-h<gz!rWV%l{-?5Awu z>A9a$$EKfF=3T{FXYgkA!WT>&${Nld$;hymV*&3XD69(&PnQyT%awlX`CgvC48It^ zFjq}l#(3T8NL9to*i98YCvqKLRWVHHO1S;}aKpCy39o)8I%qZJ&X2ccmaBUD#c^Iv SelIX!89ZJ6T-G@yGywqmahHJr diff --git a/app/src/main/res/drawable-xxhdpi-v11/ic_notification_full_node.png b/app/src/main/res/drawable-xxhdpi-v11/ic_notification_full_node.png deleted file mode 100644 index 9b736bfbc9a79b9db4edf8551b2937648969c568..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 976 zcmV;>126oEP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!000A*Nkl<Zc-rln zTS!z<6owl|D=Q<A9;`HoprogwpofSg0*Op3B!V8Kpy)ynLQxq#R}fSLnH2@ypn8$$ zsf$E*4+9}nG6=e9R+grf&g}lh{DK6X8D~76b7rp}zNf)CXMXoud#$zis8K4FN~Kb% zR4SE9rBbO>|CKQ&1j1km*bYvB``|VB40=E}_yC&t*-@|=ECORdMmicZ7R(0~;5fJm z9?^t0@B{RMe$WSgf=+(+5<CDmz%j5M%mvx$V$5W)6jXs)@C`)F&?SG<0j`5RU>V4j zRTX4|ri0a73B6|cB%$~TtN{5zG$zb&x=eE<bfUv(P?X=<#%ELnA~!J!PXOiM8fZ1{ zOP+BRtODcZ9sF$2I53;Jro)V!+W8NeCGX&8gNnf!<DKN$#eOwsA-Ca=9vUR|(-APw zZ+RyR>;v`2TS@Z12X^tDLVhqP6HEk8Snzo*sl=aivj}@(NH)j=yFm@O%dqM<{?S)Z zIbt=E)EHnAx6%XP5_kq$Xim>C*Ey+5iqczbNiy6vM{0|FPzuh0M)pg7mb4{bz;ck| zwn1~i7WPnnH|AgM1ch#zvj$vX(HAkn(^*;hZdJsEG^fP`S1)Li%#+H%0x&J5yu^eo zU$TiqtRSn8zoC)++I|{Uz%n2+8G~{eTAcw6t3*a65*6#f%w!B&$)2Xqq^BY@NhX!m zoIHevvZYrsc5ToraGvAfoJ0(g*u3Jis@QEwDme&dBx2AG@YvWV=>qmj<sHwU(*fVs zQ_*b}#9=3c>O7w3cqu6dPD&&0WRR?$@5Wxq0$J;1keKtwVuNIX)HoT`mB#f?B9in{ z=VXv{?7uBGNG77KP6jnwo`WQMx}6NVWAQF#n18#R465cTvQ;vwZF4ecn~7aZu~m{@ znw<>Fx3Cu*EIH@D7_Xa`1HcAL4SEVH<Mm@DCU)Ls+ba5HVwWz8;u$38UuBHPh(!jy z2ZupcA~Wf!V1tQWD~VcS&>^tcBr;tzu~QAXYcp`F5l!>Zs%O;X4Rt<UPLtZxG~C3T zw<dNev>@4IAX!Np*{7si;;yGTVUz4t8HStWq*Cr~4FNYwR?R!+oPjg4P^u@b1GhU$ zSSQKN(uZtIq<8CNALF+$>}UHR@ArmvPAzvUNyt;&y6qt+uUo+>Hn>fLO!8fC#rKmd yJ91~J2#hv<z74BVsZ=VJN~Kb%R4SD!1^or;9O1d2CqDrI0000<MNUMnLSTXfX}N^} diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_close.png b/app/src/main/res/drawable-xxhdpi/ic_action_close.png deleted file mode 100644 index 76de2b1303156a1e8ad43ab2f38136a1a1bf77c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 422 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>V9fP&aSW-r_4bZq-ys7Yhl_bH zA|Le0FuXe=Shd_wOp-J7Rfd@H4ZnNS_qcAG{KqL^uMSWz3@lLlz3+b1o#-{KMRC>V zw!b>Ne_O@Y8&NjVF<eh-Uhd4Z{r;Nc?EgOZXRa^K*2@&F+s+Ydef(K|zIvkXs=3cS z&#e!#diC#4T}OzORmO9jcT>d@{<=D9mXs`-E3|xDP2yCuQ}uFh1!Pmt<^G5@TT`Yb zVzZ~rNd9N$mdS<ReV5Pm>75Z~Eg534w@j&A^(~88M;Vi-qjlr%sbx&1F4m1!i{?7W zUi4egm!Tf#zD0PA@-5E=P`pU_)<y;q7e~26``Ru|luufx^x{P7of)?ZWo1{+-EU(X z@kcc>%zFMGpIe+Zp<5;wG-kH<y?Wzi<#nOsW$6>v-jiFL-8;GGxw*#$FP&>yniAqz z6WCVDBAycC+tkF9<F$>$Z5r#V6Bq1YAqAvAMDAm7T)W16Zr@TNkg%t#pUXO@geCy^ CK(D|6 diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_delete.png b/app/src/main/res/drawable-xxhdpi/ic_action_delete.png deleted file mode 100755 index ef8e4bb424fe7f4ac8587f423d15167d4a64fbb6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 849 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>V3zQ7aSW-5dpmb`m#CwN>-8TV zCW3#M49$dmd3sC*m|6cHu>Wwh<<V>YKg^EIh8J!ea4|Fz+wWj-@rb%=+`;2_e7|2= zciH$&pPI#1|Lak;tKRz*q&LSbWij*Gz1&hT;E#Zd1B-~TM&5kRj)o+rqi>BF1p|B* z?5I^!VCv!&*?ykI<$yiQE$2cu3*NhR!T<Se*yl06eSS2?drrgVxewPTtXHv#<@wv^ zAF<wcF4H;5_p3cCnD)FVJ$(CYq0fQFnGCllUjBUJX4ly)p<5G8zGh|H`^Iirw{LsH z-UFr&9`ww<W1f7rY+B9CjX#tN*ne0hzpbBc!IE=M<U+RpxjAYN(pW46*Prieu=-|i z?e4&`M*TwEp-Oh23a?K>^BA<<FPKF1y*j#|S!VXVt26iZFNozmy>TZ;LBQMzmQDxe z*n9ijXxh7F?(c2cEe+AzcFPOb9KM;>(olVlm*>R3M{fifXXUYExLxbw*zoA;L%{`- zk=jZJy29Jt8`4tNb}(qi$;vU#nz&VoX-!3G#gJBb<0DfZ^V`=t<&UoJQ~tH<^D+0D z*t4MzHWUjVd-MH3Y;xW9{{b7{$>}qw&z)_Mwx2~#@^d?f1yc;$Hw*Km6aU!mu-}v1 zRPWwr(G<10`vB*2H=dj88`|6M*ekhn-r$d6>f334Me{%J2ZkSaH1ki-2xPj&Yr^@w z@iDhu->r?Gr7CQg>Y9y$4!qLLc;BM-P@^D&Q9kgt`&s@2x8pyoP5*a)ae(3h+pE@E o_Do%+u7uK~gJI*NZ}tpTuL}|nY}zsjm{k}&UHx3vIVCg!0Dm)ZegFUf diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_mark_unread.png b/app/src/main/res/drawable-xxhdpi/ic_action_mark_unread.png deleted file mode 100644 index 968b84969b6cfddd35c457f341a77d6883af16a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 620 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>U^4b}aSW-r^>)r_ze526Z97G! z6xLM8#hz$#>7CB1SF-T@18Kn^PD2(Up~eY6nDz<trL1aekaev3yYESS=1a@ZTZ3<1 zo^YBGXdntW(*Cq4a=Ojr(pP~T8D4fLtbAD%7#KMm7?=ba7+4e(l$oR^m3Qr5=cs&Y z_e1rQHqEW`U*CDXb48$Fzoeky^__0<KjK|<f+Bvn=5X(Kb<uTAZ>c|W{ZZJHLt1Ud zj~tDB6CN(N`u1yKsl~JF7uG!qnZ*C&{;DT&M&1q&)2*&$9hmdU>U*BdJLalM!k&f+ z(&ooN`gb!HYrKl7F5Dv+&ATd9Ah35L$NmqY&JUxdTl?S6-LSk_SHk6v=RGBjKUwo- zogZ>riR*XvEB%^e?5X)+vzAtpkkdo;UF*FL%<!`MRwp%&wer}tCvt%;@fFu^WbHAr z>#3f&rB})7|CL#P!jd&>ZdV*p|Cjk<wcoW%v+`6Q+kP{=maDsV+1lh&cOJiJ40QR) zuk`28^xjta4RRlJ7iCx|=at1MtNq&Ewec!X#DtsoW}Q>@JFsuAJjmtI+jd%PxSEpY znxnDPL}Y7DhG}2jwF#;x|GG~3CK0dMawt8`w_?fL!-hSl^G%h-p7s~J#pGsN-|AcE zZ1u?af7p@ht>urK&SYyUrVCyAtjzKuP5=@SNO1yWF8Bb9Ax8!#4yH{S4e~i%pV()k d#43nW_L<ZA+K&)D?oW*%uBWS?%Q~loCIAY1{wV+e diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_placeholder.png b/app/src/main/res/drawable-xxhdpi/ic_action_placeholder.png deleted file mode 100644 index 55f33b9dfc75330a1b9a1704384ff16e51620755..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1391 zcma)6`8yPN9R4!n%!F}{bJe<M%dMedNRCZRSXW`Bt;rSEIT*)ODAYv8-B>)tj?6Yi z3{lS68dGxYRIZ_MPm~-_So;U;^X%t&-uLr-etDngec$K#<Y3*LV3I15005YavxCRM z#{CO%(F2|-PB;O8h=q%TomV1vrDFRU?3{dm-8U}RSCv+qU4eh680JqFKLW3<veUb` zZP#-g-Y_qn-P76VuzcOOG_>CFVQA9+@E0^8keNSL@@#@RH<28<ezuI6Ab3?i^eTW| zo?OYhRPRvzMgj|AXp#6vVmspZt)41eh}8;8F)gHI@c5XPs`&aII(_QJ<|$eHHPQTl zzWz?B4Z1=XZr=QzaGnb<`nM`4tg6`{{aF_%+jcuCvGMb;u^}~xLyuKAEfe~hQF$t; z>Y+`lMQQ?^A>%LbK#gSWyiGuJ5#6MHrTQ-NdcWRZ)Wh@snI&%>>x;B@r|NpoRB#OE zkzOLN^98)MH1o7a{>c3?z1>7d`<s3+T1L|sPgxfa=n8@XD;?b3v&I+uc3NNeSfyCo z8xh<?`On*XW<K_VMFX1}&gaNCo>AhgmXBMW)W)l3%=2bV$mSTGp2tN)2s5JVBz0vJ zGj;5W^yVfR34hJld5`;^s;_}Bc%$#HT_%N-9vVLCXFxD;S6xtjahe8e&0ch+XOK>& zish=vMH!opuPl#=DLrnSc9qQCPyfKi%F-Yy-Xn}aJ<HxL2$i78V`kj!8A0?4Bwv`= zAd=g{kZrS`b!7HSD7Y^q6?>-~e=K2b_^whQFCf386l}2PBfn2CFKxDSyz#^f9dpr< zq-KZ4m5C2Tt;uP-zM896kZ~H0s;D6rif|qe!H6YTXZ@{CGcjMOtzKJ*7<-SbjA_W# zl#7ElvjDF@7V8A!M1>NSZCyCsTO_Fk;*73DNSv?{xsE7HV%X~fLzro2AP>03*JS|q zB9z*P0UK6A_2x2NyWyqNQX7Qmj3LKU1u#$YotM#gR%Y&1eRl9sr6hzqv2c@<v~JQy zSybZ}gcXanHj&i`Ayw6CSKbYf)mxI_Z!KNHhz8qOvXc90XU}fFHn`!8(Qw#$)XWIs zhI51R^CLJ-zsp<7Sb;x3MH<Ub^mt^6y8Fa<N}@AoBSQx=ML|&%j;vj-4YNBfIIrXf zsM#SonWK$vPX#`xL7E~cu2wz~rHuet^6oM1B7h~o6aWXp7$6RWegM#PAOnQ|_i+iG zuCM^b)+RRR9SAoSM=jc$07b(Z#id-4-&GFdS}*EQXoG+npm{vA5*IE<ng;lgK5}|o zX-E7h^oEfo2AR@=oK;+w9^ic)AjTQI<krx~L-^Kn6XjRBbvg)R=8Bk>ldIoZ&6_ze zl0`I2iPe#I*q?$ADTRR<3;s`YOyxrN85La}q|_Xn64CIdyYGP$w9xWF7qAMz`D39j z7{o6?aX7}3kD;rvjkdfRf8Hzcc38U>_=d77!jB2M8KL1@LCdnEmL-<jHhJ;C{&;N) z#*TcLuMmM|d^sBpdE%2?2$?ak?M3CU-ca{7JLVdd1CN{ZF&n)HUFmUXw$*1iJ=gZW zN3CG`76nuv;s>-=;f&g>Z=<=Yv*hlYy6(7|kTBW*40a$AMA!gPgIQEwbC$*AWq`VM z{Bs!-eyKoAuC0-yv73Iuw*Qkb1nFhuTk#-G<ADH+f5bX?0(f2Fc%@z;uF9)(p~Mw5 zeQ))SDOcuJ_2z){`<i>ClHo(P-^6LU7?F$HX=1Z6`RKfk5kl8O!J)lsGy(n;V~J`j iv-su1boLxG{MqUxq+4w)#k(&U9E{6pH-{#BT;@OKQFf02 diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_reply.png b/app/src/main/res/drawable-xxhdpi/ic_action_reply.png deleted file mode 100755 index 15a3089bef7e8cfb774de2f9521f5eee81acda66..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1364 zcmcIk`8(8k0RDXEV6evhgxs{QCn`-uG>$PDW=wWU3XOCPo76aFP4S&_grXR9OqONI zlgT)CBqpC-#Y5XRWx^_qCLL6!B$D0M{s;TZ{_tMU`~LjqGZ|D}ZF6k^fNsdPpokS^ z{|kb~3O~D;?gapTbx4puix>M=^kgP2(711FlgE@WezWl^nw!vW>I8$96y3p{bT{az zx@q@(AScKv&mr3D$Fh?1bI!)c|7bXRe?NcAgVu#Nmq;GnW0y1dGYgHriJul)he!EC zzmIpShggCbx~!9HK~@z)#0%}!-k3IPpakZw@(~#o#U5@X$1hkR#Hwb@xiLQOKMcg$ zBBTo}|GCT2V?h>-_NJ~+_D&XK*QvUtDyP3c!w1Bw8;c*(v~1qvpE+tW^~hZx+)Zz$ zfU=L)byp`(_9HCJx-g%>3L-Rxx7t+TETwqtD9wjhWr)%_eTXU6G}MO(^`UU3`vwUM zSqXql8$AYcklH#+O{OW#fs|@#>F6)vcOp#oG)Klzf7n{zV7H{JHc?X+7qrxTM!n1; zvBS#d{f@zQ^?Q5udbO=O4IM133sFh*saT0|);#Vj#!t^?9NcC^R5dr_QA3U+wcK4W zEU5S`BY?5@MPIoFb8f)eh{~BZQBsso)~j}QSK#EOi-Epb_)4S_i~ITdPHpl`n+Js@ z;92nu7mo}er0;3q)%?Ij?ZhG21NkJJ)!YRgc749}yxgzmkf0CU+8fle?5hbG+kE0j zIs4Mx)vqsBKc3|xZxpUsSBtuV9;PWOze_x^8I(I@DuPQl`^)LK61d=N*`CsN&4lq) zFM#}fg(==3C*q+moFE0nxuFEx_D4}Fi<gT$b6%T9wgm_+#`)Iy?bo$k1xsw5@Xp%C zx(CHLbWOcIeIyC**J8)ih9&lse5F+45-AD{0in5SzvTM6Dh>yPGN{Gaa3K-V0iow` zV|qziS1<*~Bp3;c;1V~1Tua$r8-;PYP{eY{bQP)J!Ackl$Kh?5Ihi#xXIdbhetnOk z@EqOH;w=@m+!daS;)5?(O(YMK2lBAgobIyRngjQ*AikCd+8>>MvazZ|zYdH%=eC1q zhm}0#P2jkvP14&Kbv*4lo}J`9fJj`5B1W2F2+W6ZX44${=OwijH`sGi=a5v_iDXE_ z?6Mp-fE?Hl5f9c07op2Ri=|mxlD$m^UBK3|DWZDLeTTLRP8%r{GG*OUvD;cuTU%oe zetPjG`;3>4SF+t1>hZ!<F$f~WUrA5IoVh&HFfGzIC@4De)<@YZIvKnc2@}XMWaH@K zmWrI!pEeP8`|?xw-C2InNJ5)a6ozPT9X0Bt*YmD*TG91$KGjUmLVrCVr355`?FxH= zs~~>pT4T$dRH(-#e8jMgvSY#F6Su6R@ghm^t1mqjvJ$h8IChNpv=-W1zguAf8(e8K zYp-^eJZ@s?&@6|OE9I+Ep4(FS*cA3J)<(r3^8=qCqmZ}!N~nGrUM{|!lDU^>=J5K| zj0ri6dMItVe*-7oIXQ{BOjo{hnD?Rk_i*KrMmzYkpIgfcaFoVJQ@Us@?$XnYBDCM} z;RutPbG>Kq;ak}0tU3mq6OKrCkmfH-?#48c=}AO(3#%sACFWXg?V5Z2_mQyjgp%r= vV}2L+o1L{F7wp!M5+PY3bhG>){8uFM+ljamTKK+|w*(;+M$nA__NjjWBUxk# diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_send.png b/app/src/main/res/drawable-xxhdpi/ic_action_send.png deleted file mode 100644 index d36f994db6136de671ab12aa242217a6da1b86af..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 814 zcmV+}1JV46P)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h0008@Nkl<Zc-rlp z%Wn-)9LKLJsie_Tqzg@GyC61JQVY)o5*3fMiAoS*L4zm~@mN@>4IyD;Ardwv;t?U< zuaqMCKV9F6-$^F!Z9DhgnK@(T^GQB?Js)?@%$YN%R0041000000000000000h)B6y zULj{O68-{QkYjSQY-U8#53o~Cnn8#ygh)3)ZzzECk=!bq7@_0?G|8`3A_P8>{c;W? zm28ANQv?Wy*e>TXTFC@BF+%|7bGeH-BK`oIA_j22kh^6IqZdzr&Kd(aU&;YOG#+5K zd{t)z7h*3V8jEnffdI}oa-W>Xh}It9Pz(W_ujPK(%E(3!uqMU;&bRU)zldl7+U1V~ zA_RVrN924)din^D6ABOxahMQO2e_PY0Ou!pln|8x22u*({9+*%F#3N3tV}t8Ggu5f zE<1`Ipjl3Mir{_`C*`6dN4V!Pfb*Lik&BBM;7kSrILGbZ(^;ed+cFd&{EIjzmlPpD zR|W$(Cu|eJ(!5W^?=l==(w^8a<~D@>uv-}q5dK935071W3$Q_6lGp5g@tCdo2lwmW z<?oDz_+=rM<$Zn#Ufi?>lc8KLSIc#_b7Dvyv&nK)-j?^}GrOdXrx4<&ydryetgf6_ zT4Y;r-Il9lpY1&wv<12m`(J!R-n9(?jf5B_L}h^XP=K{|%R6XG)u%1M%@_mp=J^uT zZI__+a)-T&9JWi)Rl5W|uuIT;yO&R6F8Kd1LHYwW{xb<bw3qf-pM<-)4Nd=fAYZqk zJczLrQQRkB7UNisuC^R~wrI=IypZuc0sDR>d8)9lBzY<CKY*`oDGOP!DW$qG>oXg( zss~7GYhoLtT{-wkZqEJ4=G>VBusz*#fH*(U2)>j#zy}(&1>h4UkAok_M|wkiq*s3c zK2!A^pq>x4_b~AB1>mRx&jF$w*3r*l9mx#-bjQ^^<+z&U1N3lUlivUwS>`#wc@FLK s8-Qag0RR9100000000000002QA0iFHV}!On_5c6?07*qoM6N<$f^KM8v;Y7A diff --git a/app/src/main/res/drawable-xxhdpi/ic_fab_compose_message.png b/app/src/main/res/drawable-xxhdpi/ic_fab_compose_message.png deleted file mode 100644 index 40ae82aa53495add93496912ac01be443b2bd801..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1821 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 LNkvXXu0mjfsW5L{ diff --git a/app/src/main/res/drawable-xxhdpi/ic_notification_full_node.png b/app/src/main/res/drawable-xxhdpi/ic_notification_full_node.png deleted file mode 100644 index 006b25ee9e3d2b102bd82dca7f94207fae85f736..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 699 zcmV;s0!00ZP)<h;3K|Lk000e1NJLTq001xm002t}1^@s6Hs=I|0007lNkl<Zc-rlm zOKTHR9L2}?M%-7l-$f8ak%EEhcTi~;LfuIa@|wKgk0N#xh3vXezkplU(pYzD+m%{^ zprN_`{zIZkHI~L?G8g^_4!N1k+<VTw=RT%&9EC!mP$(1%g+ifFC=?3CJke^kPE{(E z>(y#CQ>)cp!w;0d@!5gz``29VxmqX`&ILwzxm-Svut#u@vdQQ3CY#NgbUJNPsgy@4 z%Qg8;?&01~m|Mfhg}I7HNC+W&2pJK46y;udhUa%1jmFKn#D&HS#bVJDluRZkqC6{g zNL}G@_@r;*>GkKiTyA3FhbeV2H#VehKVp-WJWosfunDPqrsC=O+tcj%znJLJ#%$(< ztQh3=<E+FFNISc-vQ0&Fy<T4^l}ZoE=O)~d23*&jDWwezJos<n2yRl*4~a}BlQDjX zACUcG2MuQ?&N;pQSw#CKc+4nVnPgYJPX>E__Vze3-(trVA7bcw^A<iJOZ9is@CIE^ zSzd4abB{pyB0c{lkw};zQIa50?w_IBjLNlfOXL%A9W(=n&B*x)Bae+SCq{ao!&NuP z;)f}x0HT%nWq=iD#TM~HCVDLMOP&GN`B%0X5E7?tPOzsPvek~q<Hk1jm)biHg^rB| zgrukGFdX}~8sLSf?NHdV)qtc&=D-VE4M=)q4%~~yV#ZQ#Ic#E=DRgZ#z$i4my?`(4 zHX0y3%bo$Ubdd{RZ4w`iMz=>^dbqH}4+j>Rxb?@WG!ludV&njtAQSQK*mnaN3Ai6* z@kjmvjFDJ?>paj6kob2nbgb7*Cif*A--R!E_$}=CD7e#a^BL_gbMic^|HM!z6bgkx hp-?Ck3Wee~ege<<9~^<3M?(Mr002ovPDHLkV1jtXN2ve+ diff --git a/app/src/main/res/drawable-xxhdpi/ic_notification_new_message.png b/app/src/main/res/drawable-xxhdpi/ic_notification_new_message.png deleted file mode 100644 index 2b218dfb6a0474b591659aa72fc3e29f10b88f37..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 660 zcmV;F0&D$=P)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00078Nkl<Zc-rlo zKTASU7>6y1a1?_a+FZh+u_2oz$fY5$QTzZwMJ_>&(i&7tOA*e|CkTSRfJ95wRt*W! zP!<h!dS5t!NcVcZM?LrT{2usi9`HP!fA2XNiva)t00000B8F0Gj51AGpe$3CC^<@+ zGUBR~3CbGfg3?spJWx(31xnlnF_V-7%7^NnTS{ptMe$UjlqoODoGVIZ*w&aM)mvUE zi^C%4O!bE^Ueu*et0UE4K6%HJDyZz!v4$R5HA<cGV<72~l9ISv{kI^qh$<z~_W8W- zXjqP=3EKDQNY$rJmhv7_&^Kj9(joA}V_GFTwB0ipMKvjc);v0J7NBjxKoFnElM)17 zg#8QCXXXuewG|2H9<SP}9-#fIp`e4P3!3)%^1OrPecFywZVUxoMqSWCfHO<hL(XXr z4vzOx7qlFp6YqMrD(E$5wFe{TkLRchT2gj-in^dV%Yv?>E+}nT(7A*P{=uT4Z3zd( z6N`doB?u~5l5<BHl^`gtFW3i7MbdRg$%3FQNrK|~^<j{3DYGd_QbxZ%3|f+?skW$J zA25<S)MuZN<S!{_cq#9Mq!hnC=nHnNNj{=x^m|yd%R^v=xAG8gXtG99i>M^uAyW?d zCXg??_&$fPEVwG?!jrPY<wNU#bZ}>#kz^pZ0!f`Eg&j#1NWw^hB&<nTlk7;^&_{&U zG$6@e+AgM>xgd8Xbs@-2NnHwZa^dFJ-u1S;1(1|?bxj)4MR6yJ5ClOG1VI+d5_bg! uEO6Zxq$TlBAc`KDiU9xs00000`p7RR(^KE_>(m_p0000<MNUMnLSTX*3m>@v diff --git a/app/src/main/res/drawable-xxhdpi/ic_plus_sign.png b/app/src/main/res/drawable-xxhdpi/ic_plus_sign.png deleted file mode 100755 index 24e567d7429c6eacdeafdbdc6b19bbeb031c599d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 759 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>VA|*D;uum9_jdNitk6IK*Y6=x z6Q_s?<!-qU^vUy})!c-K;vKDP?@zuLv_U{o;uEu{$=QkBnTKZ@pV?!Wa<}UIyzkel zmhYJU+b3o%%bHT_)2$89<QbU+F8C~{v{h$dJj*icdNBs~fwIA|3XPXLmmHtmX+NoM z#?7hgcbb=``yG&Y+`8oZq<cOS=6Y47r`@l<_-mW;f#WN6S{sbE>`P+#VKH^7KtS8I z@E!*F<(ov9PF?ubCHUZR$TTMh$*6ckrkXjYf;cpsUu(NH^an?BF{WnJ9_9E@sO7D= zfM@M`2}V1=R85vC3%`m|YUpXEyn8`)uU7l}+D`rwcIma}>zzydC)F*>`#yE<?3+vV zf9Z<~ZeaYeVUvpHZ--05p8aaI*C(A*$z8wl{jXmcY4PFH+*oA1er?+HL@u@e?3<LQ zzm*bNui11rST4TA!sPYw+-X6B^pIH&4x0BWEt#J6cnNc89JSWJ-^q}7Bu{+fWa*8z zp0|@5W8>K;^{MQgrE^ctwI;7h<m2fxdSM52?su%6lAiW+ahcj#2XQ8*3r6k&6FiMC zv^FqoIU~rDa*3xzQGr3Xn1yks33Dt5hr?+ZM+Z79?KRx?pMC$7E%uWCbzk0o6@99) ye~M92`n^8CpWFT?ax%?Ys(>r;ASbQ=th?T9D42X`hc7TeGkCiCxvX<aXaWGJQakVf diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_delete.png b/app/src/main/res/drawable-xxxhdpi/ic_action_delete.png deleted file mode 100755 index b66482880bc46ca477f73b47fa90e2b4843e5ed9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1072 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrVE*pu;uum9_jayrwrHS;YxtG` zX~C8o9lcAB?VoV&*e$(fLI;lpd2bZ9wq{*D<J_%ddi4i0G7}FRYEXz;(JIfg=!k<4 z+o!a<<>%{i@6FwN{$BPup7kf0eopaASor0O<UED|nI;AShA#Dhnm;)W3;{Ncj~=Hp zvot*76p^==R$vhEU-09{O$NpV6--BupJ(G>I4Z1RS7+wH@It9E_yAWy-lEKH4W$nr zyHpuZewoPZ6Z>zz(XNJsdyE!*G4ns1yI-r$Ct$<4@7x=)xgT4fOExV0v--fL9^+f@ zKg~X{xw17Oj&Z}ae{lw9-abz7VrUcJ^7L=sa^`=3c{WrWc<=XhYwm-;ik-O(%pu1A zeK-%eCX_xC{;IfvZO^QvDGUa#ryiR!9r$r(mz5yHu2sc<3>Xt?(qiXwFvMQ9tee4L zV7GalA4|i!S2FfK3=;Dr!_}D_!b|()mw7WBJ3c|!*gxS^JX5-z56dxi0fuAg*RFOl zTnL@}xSf;XvGMCyF5C<;ueC0IJZvLd|Kx+;7KQ`Oho#f?)|cEak!3jZr9PXTVL$U# zM}~mM-;Xjk+;4oPz_8-u??;RW-aC{EFkJaj`;p;6`2s5rhO9sPDi}Uk2gtH8nAXMH zF#M2R!N=4fwO?P3;SXO3JEKGIeQ|z<I`&n~3=59E?;erHK4sj&FB7Q!;YdAGxlLup z!~4hYGyBa@?6?)*uzOLRFvA_DbF+ZF_YLhJUJT>3vjQ$}c^~Xtai4|ZdBf}jfyNw; zzpX!TRA^`XpPKVfHo;&sQ;bowz?OKX*G=#2C#_}Jz;TDc?^dJFlK+wwJURYLwlDY5 zX5e9KcR!fL$YIBrePCMbzXkV&7(^8^R{arUl(6CLZ$5pXwJ(mRU3}m51KncR{+&B} z`4-!am$?-xI*iX7FCW-w`RnKh_7A*281^ulMMwVJEpM&MeBqGtrfPo11;4xg+b1v} uvWvz%hmRjOGcq}RWa;Xk&r2xB?PsVIX>YU%Fs}xd1Pq?8elF{r5}E*~Z^_^Q diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_reply.png b/app/src/main/res/drawable-xxxhdpi/ic_action_reply.png deleted file mode 100755 index 2f08cc88d29c1b6abd86c457052a15378c8b801f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1929 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 R>XE!y;7n&YG~2V%{sTO)I`#kn diff --git a/app/src/main/res/drawable-xxxhdpi/ic_plus_sign.png b/app/src/main/res/drawable-xxxhdpi/ic_plus_sign.png deleted file mode 100755 index 491d801ec719d0ad6a9327922992ba7e8ff0275f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1043 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrV7}$);uum9_jayseu$$;+k8V- z#$~)M>k~XCa2T+(x`s6$_#FL9`Uk5;5PRE_gAE5A3^+Wr7BpxpwB>BtRDOB$c5CDB z=QjW1d48rk?p*D%;_bdaUPd)u`TFjzjnsl-;S2`e3p<(S=HKUBz-Se|;PYE+MiYnU zTqXNz)f?De#5A7U{+{Im!(8nPKfldo0BT^hy1!4@f%!~y<DAc88+c>5-+d9V@Y0lJ zzwWD5^G#Uc`5xvw>}Ab!Z?f|Rd2uVB`F6RPaUD~CL;68IJNCF`Q}(d{6~-|0Z1-mN zIdzKp=(9O<8MLKdvJ^0#dHDb52e~;6tAD=+@+=tHL<E?gC-BNM+A-O%R&ae_cXXB$ zU}`;JY4g&SZQX5G^#<XD*!MokbC)ytGtPsk5qa>NLA}a>LxgELWAW=SO%|?3rv(BU z5K7_+$9;AVu4^efU?O0N1c9KI0}B#-+qjX`YOt^=x^nPfSA3acTCp8_49mIsYWtkd zs6J5qpfck(>j$nMVlm-bfAl|CFa474bLe6|>+?D58Oj@^leum_xYcTzuU{XYpmMhQ zf$|6AO)C=K2!1Gg^WM;goB0m&JSKjwyn7)ZIB$4s?v++<W0P1McXzAQf_49{Zq9Ca zrMn`!fo;X=`mb-K7F2P+5?jFd>Q%h$ZnhQons%{fH0=5netsR}s_hH%7?HI&7_;r* z(|O07ckODj!Ee?FVg=?A_t_tOesoNC$GVUo<qv$lGOy%5jl9FUrB1e{vQqYs#f_Oq zOFv{k$S#Oo`Jw*6`d8NvE-l-gCl}8ZyY|it&JB6VUTZHiNFCVT6kc(F(?F;1J<Bwy z%d^isRzBd~(9a;xSZA1Wg4w8nXTwSLg1`0AY!et$7$hBl)Ssdko#5E}wP4#xt`-Ny z0AL)oLa6374|5X&HmDtj@?pXglvvnUvyEa9DuFTv9GXs~D=t1~ecE1PtF%smyoJPX z_nA$W-R<8$T-~6XARY0?>GX-`0zW1OS@r46ihA>g*I;Ygly%|EQ^NLatdUx<v2BW; eJ1sc>8LwXTnQwAoV;L~BGkCiCxvX<aXaWGuJg27s diff --git a/app/src/main/res/drawable/ic_action_archive.xml b/app/src/main/res/drawable/ic_action_archive.xml new file mode 100644 index 0000000..899700e --- /dev/null +++ b/app/src/main/res/drawable/ic_action_archive.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#DEFFFFFF" + android:pathData="M3,3H21V7H3V3M4,8H20V21H4V8M9.5,11A0.5,0.5 0,0 0,9 11.5V13H15V11.5A0.5,0.5 0,0 0,14.5 11H9.5Z"/> +</vector> diff --git a/app/src/main/res/drawable/ic_action_close.xml b/app/src/main/res/drawable/ic_action_close.xml new file mode 100644 index 0000000..a9f3069 --- /dev/null +++ b/app/src/main/res/drawable/ic_action_close.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#DEFFFFFF" + android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/> +</vector> diff --git a/app/src/main/res/drawable/ic_action_compose_message.xml b/app/src/main/res/drawable/ic_action_compose_message.xml new file mode 100644 index 0000000..fc450f7 --- /dev/null +++ b/app/src/main/res/drawable/ic_action_compose_message.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#DEFFFFFF" + android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/> +</vector> diff --git a/app/src/main/res/drawable/ic_action_mark_unread.xml b/app/src/main/res/drawable/ic_action_mark_unread.xml new file mode 100644 index 0000000..d07b8cd --- /dev/null +++ b/app/src/main/res/drawable/ic_action_mark_unread.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#DEFFFFFF" + android:pathData="M20,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V6c0,-1.1 -0.9,-2 -2,-2zm0,4l-8,5 -8,-5V6l8,5 8,-5v2z"/> +</vector> diff --git a/app/src/main/res/drawable/ic_action_reply.xml b/app/src/main/res/drawable/ic_action_reply.xml new file mode 100644 index 0000000..1cfa52c --- /dev/null +++ b/app/src/main/res/drawable/ic_action_reply.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#DEFFFFFF" + android:pathData="M10,9V5L3,12L10,19V14.9C15,14.9 18.5,16.5 21,20C20,15 17,10 10,9Z"/> +</vector> diff --git a/app/src/main/res/drawable/ic_action_send.xml b/app/src/main/res/drawable/ic_action_send.xml new file mode 100644 index 0000000..121d6e8 --- /dev/null +++ b/app/src/main/res/drawable/ic_action_send.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#DEFFFFFF" + android:pathData="M2,21L23,12L2,3V10L17,12L2,14V21Z"/> +</vector> diff --git a/app/src/main/res/drawable/ic_notification_full_node.xml b/app/src/main/res/drawable/ic_notification_full_node.xml new file mode 100644 index 0000000..4790d6e --- /dev/null +++ b/app/src/main/res/drawable/ic_notification_full_node.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#FF000000" + android:pathData="M19.35,10.03C18.67,6.59 15.64,4 12,4C9.11,4 6.6,5.64 5.35,8.03C2.34,8.36 0,10.9 0,14A6,6 0,0 0,6 20H19A5,5 0,0 0,24 15C24,12.36 21.95,10.22 19.35,10.03Z"/> +</vector> diff --git a/app/src/main/res/layout/fragment_message_list.xml b/app/src/main/res/layout/fragment_message_list.xml index cd73e5b..ba540ad 100644 --- a/app/src/main/res/layout/fragment_message_list.xml +++ b/app/src/main/res/layout/fragment_message_list.xml @@ -22,7 +22,7 @@ android:id="@+id/fab_compose_message" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/ic_fab_compose_message" + android:src="@drawable/ic_action_compose_message" app:elevation="8dp" android:layout_alignParentBottom="true" android:layout_alignParentEnd="true" diff --git a/app/src/main/res/layout/fragment_subscribtions.xml b/app/src/main/res/layout/fragment_subscribtions.xml index cd73e5b..ba540ad 100644 --- a/app/src/main/res/layout/fragment_subscribtions.xml +++ b/app/src/main/res/layout/fragment_subscribtions.xml @@ -22,7 +22,7 @@ android:id="@+id/fab_compose_message" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/ic_fab_compose_message" + android:src="@drawable/ic_action_compose_message" app:elevation="8dp" android:layout_alignParentBottom="true" android:layout_alignParentEnd="true" diff --git a/app/src/main/res/layout/toolbar_layout.xml b/app/src/main/res/layout/toolbar_layout.xml index 049a0b0..ade8b53 100644 --- a/app/src/main/res/layout/toolbar_layout.xml +++ b/app/src/main/res/layout/toolbar_layout.xml @@ -1,34 +1,33 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.design.widget.CoordinatorLayout - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:fitsSystemWindows="true"> +<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fitsSystemWindows="true"> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:layout_below="@id/toolbar" - android:id="@+id/content" - android:layout_width="match_parent" - android:layout_height="match_parent" - tools:context=".MessageListActivity" - tools:layout="@android:layout/list_content" - app:layout_behavior="@string/appbar_scrolling_view_behavior" /> + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/content" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_below="@id/toolbar" + app:layout_behavior="@string/appbar_scrolling_view_behavior" + tools:context=".MessageListActivity" + tools:layout="@android:layout/list_content" /> <android.support.design.widget.AppBarLayout - android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:layout_width="match_parent" + android:layout_height="wrap_content"> <android.support.v7.widget.Toolbar - android:id="@+id/toolbar" - android:layout_width="match_parent" - android:layout_height="?attr/actionBarSize" - android:background="?attr/colorPrimary" - android:elevation="4dp" - android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" - app:popupTheme="@style/ThemeOverlay.AppCompat.Light" - app:layout_scrollFlags="scroll|enterAlways"/> + android:id="@+id/toolbar" + android:layout_width="match_parent" + android:layout_height="?attr/actionBarSize" + android:background="?attr/colorPrimary" + android:elevation="4dp" + android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" + app:layout_scrollFlags="scroll|enterAlways" + app:popupTheme="@style/ThemeOverlay.AppCompat.Light" /> </android.support.design.widget.AppBarLayout> diff --git a/app/src/main/res/menu/message.xml b/app/src/main/res/menu/message.xml index aee2121..dc31fc3 100644 --- a/app/src/main/res/menu/message.xml +++ b/app/src/main/res/menu/message.xml @@ -5,21 +5,21 @@ <item android:id="@+id/reply" app:showAsAction="ifRoom" - android:icon="@drawable/ic_action_placeholder" + android:icon="@drawable/ic_action_reply" android:title="@string/reply"/> <item android:id="@+id/delete" app:showAsAction="ifRoom" - android:icon="@drawable/ic_action_placeholder" + android:icon="@drawable/ic_action_delete" android:title="@string/delete"/> <item android:id="@+id/mark_unread" app:showAsAction="ifRoom" - android:icon="@drawable/ic_action_placeholder" + android:icon="@drawable/ic_action_mark_unread" android:title="@string/mark_unread"/> <item android:id="@+id/archive" app:showAsAction="ifRoom" - android:icon="@drawable/ic_action_placeholder" + android:icon="@drawable/ic_action_archive" android:title="@string/archive"/> </menu> \ No newline at end of file diff --git a/app/src/main/res/menu/message_list.xml b/app/src/main/res/menu/message_list.xml index 75f182b..295a7e1 100644 --- a/app/src/main/res/menu/message_list.xml +++ b/app/src/main/res/menu/message_list.xml @@ -5,7 +5,7 @@ <item android:id="@+id/empty_trash" app:showAsAction="never" - android:icon="@drawable/ic_action_placeholder" + android:icon="@drawable/ic_action_delete" android:title="@string/empty_trash" android:visible="false"/> </menu> \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 8cbeca3..eb1f6e8 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -3,6 +3,7 @@ <resources> <color name="primary">#FFC107</color> <color name="primary_dark">#FFA000</color> + <color name="primary_dark_text">#DEFFFFFF</color> <color name="primary_light">#FFECB3</color> <color name="accent">#607D8B</color> <color name="primary_text">#212121</color> diff --git a/build.gradle b/build.gradle index 37a428b..8eb7947 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.3.0' + classpath 'com.android.tools.build:gradle:1.4.+' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files From 32a36e57f69aea1a3e889ecf29d463aa11285617 Mon Sep 17 00:00:00 2001 From: Christian Basler <chrigu.meyer@gmail.com> Date: Sun, 18 Oct 2015 18:20:58 +0200 Subject: [PATCH 4/4] Changed to using vector drawables for action icons --- app/src/main/res/drawable/ic_action_delete.xml | 9 +++++++++ .../main/res/drawable/ic_notification_new_message.xml | 9 +++++++++ 2 files changed, 18 insertions(+) create mode 100644 app/src/main/res/drawable/ic_action_delete.xml create mode 100644 app/src/main/res/drawable/ic_notification_new_message.xml diff --git a/app/src/main/res/drawable/ic_action_delete.xml b/app/src/main/res/drawable/ic_action_delete.xml new file mode 100644 index 0000000..d555d63 --- /dev/null +++ b/app/src/main/res/drawable/ic_action_delete.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#DEFFFFFF" + android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/> +</vector> diff --git a/app/src/main/res/drawable/ic_notification_new_message.xml b/app/src/main/res/drawable/ic_notification_new_message.xml new file mode 100644 index 0000000..395fdb0 --- /dev/null +++ b/app/src/main/res/drawable/ic_notification_new_message.xml @@ -0,0 +1,9 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + <path + android:fillColor="#FF000000" + android:pathData="M20.5,0A2.5,2.5 0,0 1,23 2.5V3A1,1 0,0 1,24 4V8A1,1 0,0 1,23 9H18A1,1 0,0 1,17 8V4A1,1 0,0 1,18 3V2.5A2.5,2.5 0,0 1,20.5 0M12,11L4,6V8L12,13L16.18,10.39C16.69,10.77 17.32,11 18,11H22V18A2,2 0,0 1,20 20H4A2,2 0,0 1,2 18V6A2,2 0,0 1,4 4H15V8C15,8.36 15.06,8.7 15.18,9L12,11M20.5,1A1.5,1.5 0,0 0,19 2.5V3H22V2.5A1.5,1.5 0,0 0,20.5 1Z"/> +</vector>