From e2963c11859229fdbd8b22032d56d3c266a06603 Mon Sep 17 00:00:00 2001 From: Floens Date: Mon, 1 Jun 2015 20:42:47 +0200 Subject: [PATCH] Material icons correctness with proper alpha values --- .../floens/chan/ui/adapter/PinAdapter.java | 5 +- .../ui/controller/PostRepliesController.java | 20 ++++++-- .../floens/chan/ui/layout/ReplyLayout.java | 10 +++- .../org/floens/chan/ui/theme/DarkTheme.java | 19 ++++++++ .../java/org/floens/chan/ui/theme/Theme.java | 46 ++++++++++++++++++ .../org/floens/chan/ui/theme/ThemeHelper.java | 8 ++- .../org/floens/chan/ui/toolbar/Toolbar.java | 2 +- .../res/drawable-hdpi/ic_clear_black_24dp.png | Bin 0 -> 207 bytes .../res/drawable-hdpi/ic_clear_white_24dp.png | Bin 0 -> 221 bytes .../drawable-hdpi/ic_close_grey600_24dp.png | Bin 329 -> 0 bytes .../res/drawable-hdpi/ic_close_white_24dp.png | Bin 324 -> 0 bytes .../res/drawable-hdpi/ic_image_black_24dp.png | Bin 0 -> 256 bytes .../drawable-hdpi/ic_image_grey600_24dp.png | Bin 350 -> 0 bytes .../res/drawable-hdpi/ic_image_white_24dp.png | Bin 0 -> 261 bytes .../res/drawable-hdpi/ic_send_black_24dp.png | Bin 0 -> 250 bytes .../drawable-hdpi/ic_send_grey600_24dp.png | Bin 352 -> 0 bytes .../res/drawable-hdpi/ic_send_white_24dp.png | Bin 0 -> 251 bytes .../drawable-hdpi/ic_settings_black_24dp.png | Bin 0 -> 453 bytes .../ic_settings_grey600_24dp.png | Bin 572 -> 0 bytes .../drawable-hdpi/ic_settings_white_24dp.png | Bin 0 -> 460 bytes .../res/drawable-mdpi/ic_clear_black_24dp.png | Bin 0 -> 164 bytes .../res/drawable-mdpi/ic_clear_white_24dp.png | Bin 0 -> 175 bytes .../drawable-mdpi/ic_close_grey600_24dp.png | Bin 269 -> 0 bytes .../res/drawable-mdpi/ic_close_white_24dp.png | Bin 279 -> 0 bytes .../res/drawable-mdpi/ic_image_black_24dp.png | Bin 0 -> 183 bytes .../drawable-mdpi/ic_image_grey600_24dp.png | Bin 270 -> 0 bytes .../res/drawable-mdpi/ic_image_white_24dp.png | Bin 0 -> 185 bytes .../res/drawable-mdpi/ic_send_black_24dp.png | Bin 0 -> 205 bytes .../drawable-mdpi/ic_send_grey600_24dp.png | Bin 295 -> 0 bytes .../res/drawable-mdpi/ic_send_white_24dp.png | Bin 0 -> 208 bytes .../drawable-mdpi/ic_settings_black_24dp.png | Bin 0 -> 322 bytes .../ic_settings_grey600_24dp.png | Bin 423 -> 0 bytes .../drawable-mdpi/ic_settings_white_24dp.png | Bin 0 -> 326 bytes .../drawable-xhdpi/ic_clear_black_24dp.png | Bin 0 -> 235 bytes .../drawable-xhdpi/ic_clear_white_24dp.png | Bin 0 -> 257 bytes .../drawable-xhdpi/ic_close_grey600_24dp.png | Bin 400 -> 0 bytes .../drawable-xhdpi/ic_close_white_24dp.png | Bin 402 -> 0 bytes .../drawable-xhdpi/ic_image_black_24dp.png | Bin 0 -> 295 bytes .../drawable-xhdpi/ic_image_grey600_24dp.png | Bin 397 -> 0 bytes .../drawable-xhdpi/ic_image_white_24dp.png | Bin 0 -> 304 bytes .../res/drawable-xhdpi/ic_send_black_24dp.png | Bin 0 -> 333 bytes .../drawable-xhdpi/ic_send_grey600_24dp.png | Bin 448 -> 0 bytes .../res/drawable-xhdpi/ic_send_white_24dp.png | Bin 0 -> 344 bytes .../drawable-xhdpi/ic_settings_black_24dp.png | Bin 0 -> 557 bytes .../ic_settings_grey600_24dp.png | Bin 704 -> 0 bytes .../drawable-xhdpi/ic_settings_white_24dp.png | Bin 0 -> 562 bytes .../drawable-xxhdpi/ic_clear_black_24dp.png | Bin 0 -> 309 bytes .../drawable-xxhdpi/ic_clear_white_24dp.png | Bin 0 -> 347 bytes .../drawable-xxhdpi/ic_close_grey600_24dp.png | Bin 484 -> 0 bytes .../drawable-xxhdpi/ic_close_white_24dp.png | Bin 492 -> 0 bytes .../drawable-xxhdpi/ic_image_black_24dp.png | Bin 0 -> 424 bytes .../drawable-xxhdpi/ic_image_grey600_24dp.png | Bin 629 -> 0 bytes .../drawable-xxhdpi/ic_image_white_24dp.png | Bin 0 -> 450 bytes .../drawable-xxhdpi/ic_send_black_24dp.png | Bin 0 -> 412 bytes .../drawable-xxhdpi/ic_send_grey600_24dp.png | Bin 565 -> 0 bytes .../drawable-xxhdpi/ic_send_white_24dp.png | Bin 0 -> 446 bytes .../ic_settings_black_24dp.png | Bin 0 -> 827 bytes .../ic_settings_grey600_24dp.png | Bin 994 -> 0 bytes .../ic_settings_white_24dp.png | Bin 0 -> 843 bytes .../drawable-xxxhdpi/ic_clear_black_24dp.png | Bin 0 -> 377 bytes .../drawable-xxxhdpi/ic_clear_white_24dp.png | Bin 0 -> 436 bytes .../ic_close_grey600_24dp.png | Bin 644 -> 0 bytes .../drawable-xxxhdpi/ic_close_white_24dp.png | Bin 662 -> 0 bytes .../drawable-xxxhdpi/ic_image_black_24dp.png | Bin 0 -> 548 bytes .../ic_image_grey600_24dp.png | Bin 808 -> 0 bytes .../drawable-xxxhdpi/ic_image_white_24dp.png | Bin 0 -> 570 bytes .../drawable-xxxhdpi/ic_send_black_24dp.png | Bin 0 -> 543 bytes .../drawable-xxxhdpi/ic_send_grey600_24dp.png | Bin 750 -> 0 bytes .../drawable-xxxhdpi/ic_send_white_24dp.png | Bin 0 -> 586 bytes .../ic_settings_black_24dp.png | Bin 0 -> 1073 bytes .../ic_settings_grey600_24dp.png | Bin 1299 -> 0 bytes .../ic_settings_white_24dp.png | Bin 0 -> 1074 bytes .../main/res/layout/layout_reply_input.xml | 6 +-- .../app/src/main/res/layout/post_replies.xml | 2 - .../res/layout/post_replies_bottombuttons.xml | 2 - Clover/app/src/main/res/values/styles.xml | 3 ++ 76 files changed, 105 insertions(+), 18 deletions(-) create mode 100644 Clover/app/src/main/java/org/floens/chan/ui/theme/DarkTheme.java create mode 100644 Clover/app/src/main/res/drawable-hdpi/ic_clear_black_24dp.png create mode 100644 Clover/app/src/main/res/drawable-hdpi/ic_clear_white_24dp.png delete mode 100644 Clover/app/src/main/res/drawable-hdpi/ic_close_grey600_24dp.png delete mode 100644 Clover/app/src/main/res/drawable-hdpi/ic_close_white_24dp.png create mode 100644 Clover/app/src/main/res/drawable-hdpi/ic_image_black_24dp.png delete mode 100644 Clover/app/src/main/res/drawable-hdpi/ic_image_grey600_24dp.png create mode 100644 Clover/app/src/main/res/drawable-hdpi/ic_image_white_24dp.png create mode 100644 Clover/app/src/main/res/drawable-hdpi/ic_send_black_24dp.png delete mode 100644 Clover/app/src/main/res/drawable-hdpi/ic_send_grey600_24dp.png create mode 100644 Clover/app/src/main/res/drawable-hdpi/ic_send_white_24dp.png create mode 100644 Clover/app/src/main/res/drawable-hdpi/ic_settings_black_24dp.png delete mode 100644 Clover/app/src/main/res/drawable-hdpi/ic_settings_grey600_24dp.png create mode 100644 Clover/app/src/main/res/drawable-hdpi/ic_settings_white_24dp.png create mode 100644 Clover/app/src/main/res/drawable-mdpi/ic_clear_black_24dp.png create mode 100644 Clover/app/src/main/res/drawable-mdpi/ic_clear_white_24dp.png delete mode 100644 Clover/app/src/main/res/drawable-mdpi/ic_close_grey600_24dp.png delete mode 100644 Clover/app/src/main/res/drawable-mdpi/ic_close_white_24dp.png create mode 100644 Clover/app/src/main/res/drawable-mdpi/ic_image_black_24dp.png delete mode 100644 Clover/app/src/main/res/drawable-mdpi/ic_image_grey600_24dp.png create mode 100644 Clover/app/src/main/res/drawable-mdpi/ic_image_white_24dp.png create mode 100644 Clover/app/src/main/res/drawable-mdpi/ic_send_black_24dp.png delete mode 100644 Clover/app/src/main/res/drawable-mdpi/ic_send_grey600_24dp.png create mode 100644 Clover/app/src/main/res/drawable-mdpi/ic_send_white_24dp.png create mode 100644 Clover/app/src/main/res/drawable-mdpi/ic_settings_black_24dp.png delete mode 100644 Clover/app/src/main/res/drawable-mdpi/ic_settings_grey600_24dp.png create mode 100644 Clover/app/src/main/res/drawable-mdpi/ic_settings_white_24dp.png create mode 100644 Clover/app/src/main/res/drawable-xhdpi/ic_clear_black_24dp.png create mode 100644 Clover/app/src/main/res/drawable-xhdpi/ic_clear_white_24dp.png delete mode 100644 Clover/app/src/main/res/drawable-xhdpi/ic_close_grey600_24dp.png delete mode 100644 Clover/app/src/main/res/drawable-xhdpi/ic_close_white_24dp.png create mode 100644 Clover/app/src/main/res/drawable-xhdpi/ic_image_black_24dp.png delete mode 100644 Clover/app/src/main/res/drawable-xhdpi/ic_image_grey600_24dp.png create mode 100644 Clover/app/src/main/res/drawable-xhdpi/ic_image_white_24dp.png create mode 100644 Clover/app/src/main/res/drawable-xhdpi/ic_send_black_24dp.png delete mode 100644 Clover/app/src/main/res/drawable-xhdpi/ic_send_grey600_24dp.png create mode 100644 Clover/app/src/main/res/drawable-xhdpi/ic_send_white_24dp.png create mode 100644 Clover/app/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png delete mode 100644 Clover/app/src/main/res/drawable-xhdpi/ic_settings_grey600_24dp.png create mode 100644 Clover/app/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png create mode 100644 Clover/app/src/main/res/drawable-xxhdpi/ic_clear_black_24dp.png create mode 100644 Clover/app/src/main/res/drawable-xxhdpi/ic_clear_white_24dp.png delete mode 100644 Clover/app/src/main/res/drawable-xxhdpi/ic_close_grey600_24dp.png delete mode 100644 Clover/app/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png create mode 100644 Clover/app/src/main/res/drawable-xxhdpi/ic_image_black_24dp.png delete mode 100644 Clover/app/src/main/res/drawable-xxhdpi/ic_image_grey600_24dp.png create mode 100644 Clover/app/src/main/res/drawable-xxhdpi/ic_image_white_24dp.png create mode 100644 Clover/app/src/main/res/drawable-xxhdpi/ic_send_black_24dp.png delete mode 100644 Clover/app/src/main/res/drawable-xxhdpi/ic_send_grey600_24dp.png create mode 100644 Clover/app/src/main/res/drawable-xxhdpi/ic_send_white_24dp.png create mode 100644 Clover/app/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png delete mode 100644 Clover/app/src/main/res/drawable-xxhdpi/ic_settings_grey600_24dp.png create mode 100644 Clover/app/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png create mode 100644 Clover/app/src/main/res/drawable-xxxhdpi/ic_clear_black_24dp.png create mode 100644 Clover/app/src/main/res/drawable-xxxhdpi/ic_clear_white_24dp.png delete mode 100644 Clover/app/src/main/res/drawable-xxxhdpi/ic_close_grey600_24dp.png delete mode 100644 Clover/app/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png create mode 100644 Clover/app/src/main/res/drawable-xxxhdpi/ic_image_black_24dp.png delete mode 100644 Clover/app/src/main/res/drawable-xxxhdpi/ic_image_grey600_24dp.png create mode 100644 Clover/app/src/main/res/drawable-xxxhdpi/ic_image_white_24dp.png create mode 100644 Clover/app/src/main/res/drawable-xxxhdpi/ic_send_black_24dp.png delete mode 100644 Clover/app/src/main/res/drawable-xxxhdpi/ic_send_grey600_24dp.png create mode 100644 Clover/app/src/main/res/drawable-xxxhdpi/ic_send_white_24dp.png create mode 100644 Clover/app/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png delete mode 100644 Clover/app/src/main/res/drawable-xxxhdpi/ic_settings_grey600_24dp.png create mode 100644 Clover/app/src/main/res/drawable-xxxhdpi/ic_settings_white_24dp.png diff --git a/Clover/app/src/main/java/org/floens/chan/ui/adapter/PinAdapter.java b/Clover/app/src/main/java/org/floens/chan/ui/adapter/PinAdapter.java index aedb532a..e5ed1a5f 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/adapter/PinAdapter.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/adapter/PinAdapter.java @@ -37,6 +37,7 @@ import org.floens.chan.utils.AndroidUtils; import java.util.ArrayList; import java.util.List; +import static org.floens.chan.ui.theme.ThemeHelper.theme; import static org.floens.chan.utils.AndroidUtils.ROBOTO_MEDIUM; import static org.floens.chan.utils.AndroidUtils.dp; import static org.floens.chan.utils.AndroidUtils.getAttrColor; @@ -80,7 +81,7 @@ public class PinAdapter extends RecyclerView.Adapter im case TYPE_HEADER: HeaderHolder headerHolder = (HeaderHolder) holder; headerHolder.text.setText(R.string.drawer_pinned); - headerHolder.image.setImageResource(R.drawable.ic_settings_grey600_24dp); + theme().settingsDrawable.apply(headerHolder.image); break; case TYPE_PIN: @@ -94,7 +95,7 @@ public class PinAdapter extends RecyclerView.Adapter im switch (position) { case 1: linkHolder.text.setText(R.string.settings_screen); - linkHolder.image.setImageResource(R.drawable.ic_settings_grey600_24dp); + theme().settingsDrawable.apply(linkHolder.image); break; } break; diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/PostRepliesController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/PostRepliesController.java index ac6a54b6..ca430d06 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/PostRepliesController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/PostRepliesController.java @@ -21,6 +21,7 @@ import android.animation.ValueAnimator; import android.app.Activity; import android.content.Context; import android.graphics.Color; +import android.graphics.drawable.Drawable; import android.os.Build; import android.view.LayoutInflater; import android.view.View; @@ -42,7 +43,8 @@ import org.floens.chan.ui.cell.PostCell; import org.floens.chan.ui.helper.PostPopupHelper; import org.floens.chan.ui.view.LoadView; import org.floens.chan.ui.view.ThumbnailView; -import org.floens.chan.ui.theme.ThemeHelper; + +import static org.floens.chan.ui.theme.ThemeHelper.theme; public class PostRepliesController extends Controller { private static final int TRANSITION_DURATION = 200; @@ -148,9 +150,19 @@ public class PostRepliesController extends Controller { } }); - if (!ThemeHelper.getInstance().getTheme().isLightTheme) { - ((TextView) dataView.findViewById(R.id.replies_back_icon)).setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_arrow_back_white_24dp, 0, 0, 0); - ((TextView) dataView.findViewById(R.id.replies_close_icon)).setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_done_white_24dp, 0, 0, 0); + Drawable backDrawable = theme().backDrawable.makeDrawable(context); + Drawable doneDrawable = theme().doneDrawable.makeDrawable(context); + + TextView repliesBackText = ((TextView) dataView.findViewById(R.id.replies_back_icon)); + TextView repliesCloseText = ((TextView) dataView.findViewById(R.id.replies_close_icon)); + repliesBackText.setCompoundDrawablesWithIntrinsicBounds(backDrawable, null, null, null); + repliesCloseText.setCompoundDrawablesWithIntrinsicBounds(doneDrawable, null, null, null); + if (theme().isLightTheme) { + repliesBackText.setTextColor(0x8a000000); + repliesCloseText.setTextColor(0x8a000000); + } else { + repliesBackText.setTextColor(0xffffffff); + repliesCloseText.setTextColor(0xffffffff); dataView.findViewById(R.id.container).setBackgroundResource(R.drawable.dialog_full_dark); } diff --git a/Clover/app/src/main/java/org/floens/chan/ui/layout/ReplyLayout.java b/Clover/app/src/main/java/org/floens/chan/ui/layout/ReplyLayout.java index 72114168..6e7d4e56 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/layout/ReplyLayout.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/layout/ReplyLayout.java @@ -47,6 +47,7 @@ import org.floens.chan.ui.theme.ThemeHelper; import java.io.File; +import static org.floens.chan.ui.theme.ThemeHelper.theme; import static org.floens.chan.utils.AndroidUtils.dp; import static org.floens.chan.utils.AndroidUtils.getAttrColor; import static org.floens.chan.utils.AndroidUtils.getString; @@ -125,9 +126,11 @@ public class ReplyLayout extends LoadView implements View.OnClickListener, Anima setRoundItemBackground(more); more.setOnClickListener(this); attach = (ImageView) replyInputLayout.findViewById(R.id.attach); + theme().imageDrawable.apply(attach); setRoundItemBackground(attach); attach.setOnClickListener(this); submit = (ImageView) replyInputLayout.findViewById(R.id.submit); + theme().sendDrawable.apply(submit); setRoundItemBackground(submit); submit.setOnClickListener(this); @@ -319,7 +322,12 @@ public class ReplyLayout extends LoadView implements View.OnClickListener, Anima @Override public void openPreview(boolean show, File previewFile) { - attach.setImageResource(show ? R.drawable.ic_close_grey600_24dp : R.drawable.ic_image_grey600_24dp); + if (show) { + theme().clearDrawable.apply(attach); + } else { + theme().imageDrawable.apply(attach); + } + if (show) { ImageDecoder.decodeFileOnBackgroundThread(previewFile, dp(100), dp(100), this); } else { diff --git a/Clover/app/src/main/java/org/floens/chan/ui/theme/DarkTheme.java b/Clover/app/src/main/java/org/floens/chan/ui/theme/DarkTheme.java new file mode 100644 index 00000000..78de8c86 --- /dev/null +++ b/Clover/app/src/main/java/org/floens/chan/ui/theme/DarkTheme.java @@ -0,0 +1,19 @@ +package org.floens.chan.ui.theme; + +import org.floens.chan.R; + +public class DarkTheme extends Theme { + public DarkTheme(String displayName, String name, int resValue, boolean isLightTheme, ThemeHelper.PrimaryColor primaryColor) { + super(displayName, name, resValue, isLightTheme, primaryColor); + } + + public void resolveDrawables() { + super.resolveDrawables(); + settingsDrawable = new ThemeDrawable(R.drawable.ic_settings_white_24dp, 1f); + imageDrawable = new ThemeDrawable(R.drawable.ic_image_white_24dp, 1f); + sendDrawable = new ThemeDrawable(R.drawable.ic_send_white_24dp, 1f); + clearDrawable = new ThemeDrawable(R.drawable.ic_clear_white_24dp, 1f); + backDrawable = new ThemeDrawable(R.drawable.ic_arrow_back_white_24dp, 1f); + doneDrawable = new ThemeDrawable(R.drawable.ic_done_white_24dp, 1f); + } +} diff --git a/Clover/app/src/main/java/org/floens/chan/ui/theme/Theme.java b/Clover/app/src/main/java/org/floens/chan/ui/theme/Theme.java index 8a728f97..9489f90b 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/theme/Theme.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/theme/Theme.java @@ -17,8 +17,11 @@ */ package org.floens.chan.ui.theme; +import android.content.Context; import android.content.res.Resources; import android.content.res.TypedArray; +import android.graphics.drawable.Drawable; +import android.widget.ImageView; import org.floens.chan.R; import org.floens.chan.utils.AndroidUtils; @@ -46,6 +49,13 @@ public class Theme { public int idBackgroundDark; public int capcodeColor; + public ThemeDrawable settingsDrawable; + public ThemeDrawable imageDrawable; + public ThemeDrawable sendDrawable; + public ThemeDrawable clearDrawable; + public ThemeDrawable backDrawable; + public ThemeDrawable doneDrawable; + public Theme(String displayName, String name, int resValue, boolean isLightTheme, ThemeHelper.PrimaryColor primaryColor) { this.displayName = displayName; this.name = name; @@ -54,6 +64,16 @@ public class Theme { this.primaryColor = primaryColor; resolveSpanColors(); + resolveDrawables(); + } + + public void resolveDrawables() { + settingsDrawable = new ThemeDrawable(R.drawable.ic_settings_black_24dp, 0.54f); + imageDrawable = new ThemeDrawable(R.drawable.ic_image_black_24dp, 0.54f); + sendDrawable = new ThemeDrawable(R.drawable.ic_send_black_24dp, 0.54f); + clearDrawable = new ThemeDrawable(R.drawable.ic_clear_black_24dp, 0.54f); + backDrawable = new ThemeDrawable(R.drawable.ic_arrow_back_black_24dp, 0.54f); + doneDrawable = new ThemeDrawable(R.drawable.ic_done_black_24dp, 0.54f); } private void resolveSpanColors() { @@ -87,4 +107,30 @@ public class Theme { ta.recycle(); } + + public static class ThemeDrawable { + public int drawable; + public float alpha; + public int intAlpha; + + public ThemeDrawable(int drawable, float alpha) { + this.drawable = drawable; + this.alpha = alpha; + intAlpha = Math.round(alpha * 0xff); + } + + public void apply(ImageView imageView) { + imageView.setImageResource(drawable); + // Use the int one! + //noinspection deprecation + imageView.setAlpha(intAlpha); + } + + public Drawable makeDrawable(Context context) { + //noinspection deprecation + Drawable d = context.getResources().getDrawable(drawable); + d.setAlpha(intAlpha); + return d; + } + } } diff --git a/Clover/app/src/main/java/org/floens/chan/ui/theme/ThemeHelper.java b/Clover/app/src/main/java/org/floens/chan/ui/theme/ThemeHelper.java index b2bb23b5..a62e8f73 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/theme/ThemeHelper.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/theme/ThemeHelper.java @@ -37,14 +37,18 @@ public class ThemeHelper { return instance; } + public static Theme theme() { + return getInstance().getTheme(); + } + private List themes = new ArrayList<>(); private Theme theme; public ThemeHelper() { themes.add(new Theme("Light", "light", R.style.Chan_Theme, true, PrimaryColor.GREEN)); - themes.add(new Theme("Dark", "dark", R.style.Chan_Theme_Dark, false, PrimaryColor.DARK)); - themes.add(new Theme("Black", "black", R.style.Chan_Theme_Black, false, PrimaryColor.BLACK)); + themes.add(new DarkTheme("Dark", "dark", R.style.Chan_Theme_Dark, false, PrimaryColor.DARK)); + themes.add(new DarkTheme("Black", "black", R.style.Chan_Theme_Black, false, PrimaryColor.BLACK)); updateCurrentTheme(); } diff --git a/Clover/app/src/main/java/org/floens/chan/ui/toolbar/Toolbar.java b/Clover/app/src/main/java/org/floens/chan/ui/toolbar/Toolbar.java index c7999a76..f028b91f 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/toolbar/Toolbar.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/toolbar/Toolbar.java @@ -327,7 +327,7 @@ public class Toolbar extends LinearLayout implements View.OnClickListener, LoadV searchViewParams.gravity = Gravity.CENTER_VERTICAL; searchViewWrapper.addView(searchView, searchViewParams); - clearButton.setImageResource(R.drawable.ic_close_white_24dp); + clearButton.setImageResource(R.drawable.ic_clear_white_24dp); clearButton.setAlpha(searchView.length() == 0 ? 0.6f : 1.0f); clearButton.setScaleType(ImageView.ScaleType.CENTER); clearButton.setOnClickListener(new OnClickListener() { diff --git a/Clover/app/src/main/res/drawable-hdpi/ic_clear_black_24dp.png b/Clover/app/src/main/res/drawable-hdpi/ic_clear_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..1a9cd75a0d2692fa380f367bdb41c2420df310b0 GIT binary patch literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8LpG*1`DkP61PSG>8J9RwIIzPh7b zJflYMsk(bE^P@Beu4=(eGmA7oyR_x~a$D?{a5p37g|Cs|p&E~Q4@@WZu3cW0RzKfl zOG4W1`7gJ literal 0 HcmV?d00001 diff --git a/Clover/app/src/main/res/drawable-hdpi/ic_clear_white_24dp.png b/Clover/app/src/main/res/drawable-hdpi/ic_clear_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..ceb1a1eebf2b2cc9a008f42010e144f4dab968de GIT binary patch literal 221 zcmV<303!d1P)og+*{ z>6z1@lfD*AYSPav7|k0wldT1B8K;Lb6AYF9SoB8UsT^3j@P1pisjL z28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeOgEbxddW?p<|k0wldT1B8K;Lb6AYF9SoB8UsT^3j@P1pisjL z28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeOgEbxddW?IB4!nj``h|k0wldT1B8LpaZeY=kP60R1X|{Hu@&s|&Ag-FGDXro&V_2U(SdKn8~3KLrKrI|Wt)y~N<@>gTe~DWM4f DxdmAD literal 0 HcmV?d00001 diff --git a/Clover/app/src/main/res/drawable-hdpi/ic_image_grey600_24dp.png b/Clover/app/src/main/res/drawable-hdpi/ic_image_grey600_24dp.png deleted file mode 100644 index c837fd89d55dfd7d71c7d2eb688ed636890fcdd4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 350 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;Lb6AYF9SoB8UsT^3j@P1pisjL z28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeOgEbxddW?pgbV2%3A&+nWHA|he+;;{zajkdU-qk4S9kS`n4ZsMx%2>L-Cz0i7ioGdI0n5&C0txa`k>kmk70=0VF?4$W5sjUO7JFf&v@cBq1Ms0ry%8`7Z~azh1Vga)YM6n-_y2o)b~ zqK+_?4h@i)I&TR57CHy$@Bv-vmY~Ejo`L;BT2I69PE+?3%XG9n3m^X+W4uQ?MnFc4 zfb19z=@=i|k0wldT1B8K;Lb6AYF9SoB8UsT^3j@P1pisjL z28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeOgEbxddW?AL~`x1rW}?Jxo?=F4jO4N$iMJ$(A&xU$0E+I zGIx{bJH3;wxk^84FU*`(#~t8*daCr@DglS%b0?MAX3Q`ZDZA)@K_D%VGewNI(Pxq2 zgs2eqppI9Lf`QT+3cuJ=W%f>-9Oe3avYD!Usbi|k0wldT1B8LpAx{^_kP61PS2yxD1&Fjhyx+o@ z!eDqYGlqYQ*!G6d0v@&svsndQ(kFL@9CLR5`tjeMCRypX-xn4oE?BbQ)3g~o3e(Ry zGZ^z*Ez|i@DV?c$rG;U_1s;`!nI2A?C$yv~a-MY-n$_?qpf$^{d-=jB`Bf9vEfU=E zPe{sf(~mtuyTq*Y7c@J?yi{KCNF)6QdnU8);w7y2d(1Ci{#dd;K8Yd5BPqrs*~cSU l2TUR}axyl@m+i6t!c>+yg|(=5O)$_m44$rjF6*2UngCSUU-bY0 literal 0 HcmV?d00001 diff --git a/Clover/app/src/main/res/drawable-hdpi/ic_settings_black_24dp.png b/Clover/app/src/main/res/drawable-hdpi/ic_settings_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..acf1ddf85b3388b4fb02a683664d7599d96ebfe3 GIT binary patch literal 453 zcmV;$0XqJPP)bdAc8oEppaIOE(LXPbaD_uiXgfuI0y=Ui?$Rg z3N9|rijvq&CiQlchlhJevpDqnjrr%mb8?c{t6qzumxlIL6n!zIh8Gl(U}e3LlM0Ef;V2BeJSjZb=;SQ|z+u z4yaibL-bf>PG6*TZCbM}(t2i;JWOXDi<+RJrJZgbD4Fy&xy-!MTym*5Ce+-mj<=}R zs*bfH=Sq2RG}Riq#p042E*7&*ne}3EUJe(E*_zBou{bA(tHo?vL#bs|A+IvyeHm7t#M^wEtHOK?m*3tk?OFDx*kh6Lst!v$eu1NdssLB&DM32-Q z^h4~jZ>A+~7n2>4r=NU@Dq}tg9ji`Suql$(%vHn+eg}v!7dsOm%)+nCb00000NkvXXu0mjfkE75f literal 0 HcmV?d00001 diff --git a/Clover/app/src/main/res/drawable-hdpi/ic_settings_grey600_24dp.png b/Clover/app/src/main/res/drawable-hdpi/ic_settings_grey600_24dp.png deleted file mode 100644 index 20d2b66e05272ae1caa3575316ed6d8d5360610e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 572 zcmV-C0>k}@P)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00Fc~L_t(Y$KBS?E5mUd$MMZ%EBhh-1j4k@kRpGDlpLg} zp|s0-;^64yASEer*}*|k{)+||N>ht-$ zKl{vs=V!|E$Dj*@R2lcsivm5nh5XbNs7j|hD5@|5!9c4}oE1Wi?+&&!D2=x<8fKLd z8`Q}Yf)b}pFv-2f2n2VGGsPKY1P}PkP)eHcWn`Qq8z!ia59?%Gz0spX$89qL!J!k1 zQL{wLab;lQN^`^v)Fnav)V3YVThrPu=~!0U z){qOz-UJMnrYt4q?43O;#q!3hkdqQKtwC8MbSovM?a-nWE8*9efU>lCGvsC0@w1WC zpmk-u#*Pj}xY3TbKulpqDQcN(!mTu9fn;NW0oDzSp&>`8TCYfsTV-$Lsxau>qa#vHT=MSeAY<;nJtp(fS&fBJvaMtuWoo=4>kIV21T<&3Kg>clSSXlU}7 zNsTbZb7CDT8exhj%*e(#KY#)6xy}u?uzckjH(4PAzEPEh1-w0q?BPAtVVvU+$MuUd zim^-?Z*&k19JY)eT?W{4>I$)hC8bSG`$%Zf$FisplYAzY(o}#3ePW-OP>dHiLTyE8 z5z6Vv#(lhunj$1*cz0EVJ9s@A*ucB3BFy1+WndHUmWuEIZ$P35H8Q+=vQXg_LqaV@ zm?z|TsTk9IA=am%09Qzftuv(%OIZ4}NVJa{^Q2f76=H@QTgC>PWY~7OsDpS*8Lt)N zEWbIfpG@m8p5YBC;_%wCP~|(2vdmRx>0#;8WR`dQ1-2NIjXDoGtr048h%M+pCV0dp z9SxU>omUy0Vn}G0s>)%9(6-8A4Tr6%Lb0000=Dm!pL5PtJwWQDwD%^7mKX72vfc*YT)xac;A{}-v*=ps zr9JO5s)Jrvt$1~wJ<6?Hv?}9?*Yy)i*G<&jSt@L~vF4xM{qD^_8RvC6y^4F&G81Sm NgQu&X%Q~loCIAp8KMVi> literal 0 HcmV?d00001 diff --git a/Clover/app/src/main/res/drawable-mdpi/ic_clear_white_24dp.png b/Clover/app/src/main/res/drawable-mdpi/ic_clear_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..af7f8288da6854204dcc4e6678b9053cd72032c4 GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iGEW!B5R21KC-3Avpdi4K$<+1X zay^SH!@6{thMdKZi+L1hS^BMZUAdKCT}(HRw{NeWg~AlBHtr3jj>2B5kK^|J))MUC zlz7ydwCsb8xn}W?^r?}5wtsjdmvX{3=JbT!J9sKPrYmk={m|7^>A|Z*7j^D$`>}ry Zqi^Z9GQN4ct^!@a;OXk;vd$@?2>?I&LQeny literal 0 HcmV?d00001 diff --git a/Clover/app/src/main/res/drawable-mdpi/ic_close_grey600_24dp.png b/Clover/app/src/main/res/drawable-mdpi/ic_close_grey600_24dp.png deleted file mode 100644 index 1c382e5f5ba23fdc95ff6e937958a633e184f681..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 269 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1g=CK)Uj~LMH3o);76yi2K%s^g z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&_}|`tWO=~G=WkL+ z>gnPbVsZNJ%Vgndp7Z&*==MmTxJo` z%3%|xSCMkWQBdYYLCl7Z=AaJ+xkdH&loXXi8y-}>SjKTY(kn=`>vM#6epkKHmi_KR zMuNXqOw%@wY4>4~P2sQHCFQu*&8hAAA+y+hPxp&|U*Y#=j+dojU)mF(gBUzr{an^L HB{Ts5OS)F* diff --git a/Clover/app/src/main/res/drawable-mdpi/ic_close_white_24dp.png b/Clover/app/src/main/res/drawable-mdpi/ic_close_white_24dp.png deleted file mode 100644 index e80681aeb7305ab08c1f55df7edd35fc9d0eb171..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 279 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1g=CK)Uj~LMH3o);76yi2K%s^g z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&_}|`tWO=~G=WkL+ z@9E+gVsZNEWNV?r3OuY&?=Z?L&Ho)f{7Mm9$xa9H@#qTmGi6+RV TUAFrSbQ*)FtDnm{r-UW|v%+BV diff --git a/Clover/app/src/main/res/drawable-mdpi/ic_image_black_24dp.png b/Clover/app/src/main/res/drawable-mdpi/ic_image_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..377ce1331881a9e3a65230890c53d75a1afadf2e GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iI!_nJkP60Ri9HGv9;zO$xA`F2 zY~NKip@`{&>Z-Q?EsCWkJy}1F2%PyabwitRK^RAXP2+^NT%I#L+6ULftvJI}BlXUh zgYo7Zp5>B!h8rAGcSx*zbm_y~gB+(OCrxmebUEoqSFE$qxh-=XS`%tr1AcOc@c!e` h=hXNvyJe<4!{gtg&1u^v`~|v%!PC{xWt~$(698OCMb!WR literal 0 HcmV?d00001 diff --git a/Clover/app/src/main/res/drawable-mdpi/ic_image_grey600_24dp.png b/Clover/app/src/main/res/drawable-mdpi/ic_image_grey600_24dp.png deleted file mode 100644 index 9470dddfa7e8eb115ae201d39dfb9167481ee9e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1g=CK)Uj~LMH3o);76yi2K%s^g z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&_}|`tWO=~G=WkL+ z=IP=XVsScIBUORd=z_0v!pqZ_{#QI$9aJB}`(tYJ1Md*t|D6qsrB*C@7@S$~GW?L# zxdV}k4j);Zq_#~pn!b)@bJap4?hlze;(il@!fvkf`LH1(m@-Y)OM--DDj{8xoA zX|`rL);29vluTdbx4>z`KBX0ZSXZ&tGg&@zU8%qKv&lsP1|wOSO9xJ=E(f}Z!PC{x JWt~$(6953}TI~P; diff --git a/Clover/app/src/main/res/drawable-mdpi/ic_image_white_24dp.png b/Clover/app/src/main/res/drawable-mdpi/ic_image_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..d474bd577d00d2aa045685f38b1729e4b2c314e2 GIT binary patch literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+i22U5q5R22v2@-1_)Iaz?{r|_t z@c(}UO&^5wG3f`I3NX5v2Dl$y{{P_r{X*9Y*v@e=cBuVzj-6zmROnb2dbs~(^j5ic0>pDDE2 jzES4mqy6s}oc+sic8*Qfk2kwOj%4t3^>bP0l+XkKat%vT literal 0 HcmV?d00001 diff --git a/Clover/app/src/main/res/drawable-mdpi/ic_send_black_24dp.png b/Clover/app/src/main/res/drawable-mdpi/ic_send_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..83156aa38fc3644b0e394e8ab32ffd916be57ea6 GIT binary patch literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iDV{ElAr*{AFC64;au8^Jc)x{d z34`IqzU!xNG2J*3#JR13-PXrP?PIHr{;wUMCeFY4@o62al(<`%yiH@P_SB=S8>dRQ zK5M=q(`cu_zDt4imIFK63(KYH3obV@+FduCV1MDc18-l-2K56jiFN98FLSd`3|V>S z?tHx-n>Cx=T1v0UY~*!mVKYjSe!;<;VdccU@qd$eaj2Ul1NWh4K=(0ty85}Sb4q9e E0Nig(TmS$7 literal 0 HcmV?d00001 diff --git a/Clover/app/src/main/res/drawable-mdpi/ic_send_grey600_24dp.png b/Clover/app/src/main/res/drawable-mdpi/ic_send_grey600_24dp.png deleted file mode 100644 index 6fef4883d32630714d7fb7f593d2af325f01d2fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1g=CK)Uj~LMH3o);76yi2K%s^g z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&_}|`tWO=~G=WkJ` z-_yl0#NzbP$p?9x4R~DTg_sX8EDf5uv3tq%64n<=DMGuLWL`9G^HRBOH2vDnXRi9+ z%1fU{gxWKy~b};Kse^YX0*8-Cr zv({BCILn&)Aco7MxxaPh9@}^1y*t*{?kmD%rnJ{ot~A!iK}@9xpzI ksXSpdQu(*}GW#pm750IG(~fR)2RfC()78&qol`;+0AvGZ{r~^~ diff --git a/Clover/app/src/main/res/drawable-mdpi/ic_send_white_24dp.png b/Clover/app/src/main/res/drawable-mdpi/ic_send_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..048d3eb29d98d77149a0294270eedc869d3a6205 GIT binary patch literal 208 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+i>7Fi*Ar*{AFC64Nm;#-%`{{Gnlwc zD^Lx5bil0BL3{yoEg12Bky(|#;Buq}gpb{DQUO1+WZP}|7e`EqW_nz$RCOMIS* z{e5}lgl$P!_lNUZN-70PCSatZ;n%{D^q+-4{d6?TjhRilKqoSIy85}Sb4q9e0N(CT AmjD0& literal 0 HcmV?d00001 diff --git a/Clover/app/src/main/res/drawable-mdpi/ic_settings_black_24dp.png b/Clover/app/src/main/res/drawable-mdpi/ic_settings_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..c59419c02b6273e09063a0529d2239784818207f GIT binary patch literal 322 zcmV-I0lof-P)J%}fHzV<>iUk{yCv=|P(yFM9CIKrv6;vdj!^e)OQ=oM~3L z3Hov zYMc*TMS6^4Y*s#v8YK}AT(ig&XB4{J=afm7xZ$2C{CQWp)PoCx)G7YcXPY7T1DnU) UWG_v5V*mgE07*qoM6N<$f<$+V!T004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00AFKL_t(I%e9oTN&`Ujd{R0$n-KL!ePRN)8@gTbe!+z-}t5A(F-bWdjD%PlX=xnte6rAlIqfpyFM z@6ZFP>3~JrwiMz^Jj=6nTP$c`lTX!N%_3QjmD^!G1`eD7h6Dt1dQW>XFv;7{hijA5 zJ!}nKjY6{N47W5`Vun*934d|IG|M!(ahGr8_13x&;5;2rCbHW8r%&Kd{Q}_U>O6 zS70QgNAU8v+(?*#6#o9*V@~mgC;x#Rf^DRK!rxsIH1Y+{1W$v50*~CV#54`Q2vW|N zVwqbWh7Wvdgwql&RGT?0V4Y7)9ZgCcW4f$baDbN(6Vt-m zvtW!jvUC`+K-kE98fAa!h8DEZ3V|*s2`1aV~kzx#D@}&nn~61{Xzi+b(jKntiPo%%5fP`-@uPgu|~7wTA~r iR9eY#70Eo`TEl2=&Qt5V_=GOd^$eb_elF{r5}E*W zOA5m<3jYBNi%A&<@ZO?$P9};P4Y5CjG5$M&YXI45J{s}~# zf|&?x1_gn4B7+hS@X!l}&!voFhmZP^sujifL@~PKMMM~{6xH}^g$q7WOzwCQ5vHTU z6`v~H@rlA8e;CUh_(b84zg=+ih`wG<)HiJjzSlQx5#CnjMR;A)R^jtaTa9;7rSy)7O%~`cm?ZjXImW?6TYRT<;U^@VKiSj`soFk00000NkvXX Hu0mjfhD&W| literal 0 HcmV?d00001 diff --git a/Clover/app/src/main/res/drawable-xhdpi/ic_close_grey600_24dp.png b/Clover/app/src/main/res/drawable-xhdpi/ic_close_grey600_24dp.png deleted file mode 100644 index fb9f88d2ad464925546cc86c22dbcf22f3c1a30f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 400 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}tg=CK)Uj~LMH3o);76yi2K%s^g z3=E|}g|8AA7_4S6Fo+k-*%fF5lweBoc6VX;-`;;_Kaj^+;1OBOz`!jG!i)^F=14Fw zFmiahIEF+VetXTEugO59^`Y7Zmm`jiv2$1#E;yze6~rzjx3IrhFxf|H`KS8MJ8`QQ z?E4+a>EXas$NuC+;Sysh^%Nn6-370-%ycV4PyxSD0)>Y@{G{XEX$ z!_VgLFJ7*7kd5I|d3gSKIiIV+&q=oeqnJ$I-1nSQV1I4$Pt}W`9NMB^EPJ40b@HgU rqO<$6co*&6R?A*jGYNf&KOoF`O!GsbP0l+XkKU8tDG diff --git a/Clover/app/src/main/res/drawable-xhdpi/ic_close_white_24dp.png b/Clover/app/src/main/res/drawable-xhdpi/ic_close_white_24dp.png deleted file mode 100644 index 76e07f0970ac317b1bddfb265c5b3b57079dc4fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 402 zcmV;D0d4+?P)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_009a~L_t(o!|m5g4uUWgh2e{kxIvTw;NDPC;}$JB4lqhd zALpV>OkoK9KLVwJ46^RFS-GEp1SB8;6w*sYS86#*?l}h6Uf>SEpn?#4jRC*~x$CHV z$Q9$p5DkXc*(V;TVMyYWH`wz4OGNX2fFas<{^84qfEYpL!$622^D)3j947f)xWLTv zIibiiz?@L!Ilv}9`H~sS0aHSi=K-6b^H{iCXR@WwrLTXmZjnL#%Uje;9<9+4+I(rv zD1y-D=aV){#PY3k-YW<`Z@;xPu`I73{Q3BrLlI2gzuptXH+hP159`UiO>{hv;}-f- wa1v+DhnFD7naqzw=gvd2^p}}{1pEQ;1dp!cmVSGKY5)KL07*qoM6N<$f)#I~?f?J) diff --git a/Clover/app/src/main/res/drawable-xhdpi/ic_image_black_24dp.png b/Clover/app/src/main/res/drawable-xhdpi/ic_image_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..6b7cd7838b5ab18a63036d58a054a7f7588df8d5 GIT binary patch literal 295 zcmV+?0oeYDP)A-PL#CT5Az5qiARtADF310vJ002ovPDHLkV1k7`cx3

yUxSv5y>0508_ByU^?hY>~E%?OZ zm8s3ARJckaH#>LM$q%`Wd*t`9KXg?%;}-GYKSTQjiAZD3>^VjU6j#OCcrOvs63Ci9 z-6QO%!yS$ZBFvi>MjT)g+t9$e>eyj(&NnYEq~>#37&<6O6kcSvnU=3!zU;j8I=u~x zooBBt+7|Hchn2&%F1hySH`}HaspkucHeL_ou~eQY^RiwieE#GW94pq&D0qCzqP)KN zHN*S00%vB5uIu=>-XTu=)FQt}+5uO(Hthk@2CKJv?*9K_*0N>O@0Th&Bz$8oN{jf{ n8Z|M)L_Og2?ff;YvraHu-6?jO@~MFl7)lJDu6{1-oD!M0++mR7nD4pd~x$TQLGba6~{cu-M!3I>jYZG8L#~C$dSzGCa?>% zii{qBH_l~3H}Ow_R&mWIA6&_uY{DqeDkOK@%2_vI7ibl>$R-Q|t-=u5gh8NHSX1ob zZ91p^`0a>6o%RQ$Cqo6Qpk>-nPOXnuLHxL2AA)bf8YiVe5h%F;0000k}u zz4yJ$&1J--q};JXhGV`7G#rzA0=j;3#hM==_F;TsE#X%ij>tU$QCR5&(1qCnQP=`P zf}xVIU~Uv90(4;lAPT#r6aj|bvrVQ0bYaY~%qIJsG3A-BLBa~mnPHK2b~)jiN8WT{ zW8UwTx=)yXzmHCs0$5^$Jx-bM#QUFs3s(Q9XoW2fIOm3!UPXt@3uo+kAnntJ f+zL`$lalfSE(3Y*vbZRd00000NkvXXu0mjf@9dA^ literal 0 HcmV?d00001 diff --git a/Clover/app/src/main/res/drawable-xhdpi/ic_send_grey600_24dp.png b/Clover/app/src/main/res/drawable-xhdpi/ic_send_grey600_24dp.png deleted file mode 100644 index e138046223025f5a9422590d78a47b3d4984a4c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 448 zcmV;x0YCnUP)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00B5jL_t(o!|j*RZNe}RKwl68lmVbpnUO_o37l?F!W@Ot zK}uE#0{Ri95J<3nw!fOoXQDj&*}gkx3(`h50R9tT%aRYObbu2hO5R!VlMVoIWP@g# z4p7H8I*za_;7oS+t|Z5V3VQ}kcOb_!!ekZAKEH}h zEldh{Z2?|700oM@kD~d_52qGI2199EWZM|~7Fn_8*u72N$JiBrQc@hW*1n0KDilSU zR8di&AJ1+az!NFq089Q1E18`MEl$yQmLdUoN%3vGyruZGj)pv5>v-S%DybBE`|i*y q$S)uf`sqHvC(AfehHLBqh#kMS#iSv<*6SGn0000&W`22C;JryNwK41(MIA#GvFb#~s zwsao25E&6n03w(GL@)`A!D$_85` z%9!`-s3_@X0OI`y_5>OaJWhc7Ux1pxX-=Z&t1o;=Bq}NC$3*rSV}~5rah@Eqct#)^ z#sARKe>b^SMWD8;A|0im5z9_QQGnQ=9+)gN{ZC&+5rBvy01-u99ZM?OT$kUFh@ye? qUBLr0?$ZKzW0Q{J0Y5k327Cd{Pq+sr^Mm~W0000Nkla9V}f0{{|82kXi@9MRd@?$weK4A^ju7 zLRBcZi6~YV4Y?x0YCBk^ee93}@A5qN9`;=V`Fy9md5-r894+Q7Vwa zKGHbsTJ3CbB>k$}G!3du63TIxO+;yvI}8$@RV#hZwGsJa1 zG(UeLOQIW*%YP$A_S8JsifkZzY=a`Er-+B1U^vMR;-MW*pvdqV@zg66vq)lJDKSEJ zw`0sxb4<_B;v8FuS(#q`)kg&}+hPL6xOrb?GQ?%fExvFHL!Kq|$LU4WPhFXQ&M?@z zxR1mtVOeOIy~lo>;tz)rETgf>fK;}TNLegBvB^KiQ=u3Ot|-Y( z2Uu+mzU3;1m}L#YE?|a1uJMlWb*&qR^Q=+kG@*msHr|$gaEk##XL&}z6#u1a9Hidf vu2=2VHre2#z3N8+Q5wRd6(rV6I@-ivWBUX&LwAlh00000NkvXXu0mjfs0IG% literal 0 HcmV?d00001 diff --git a/Clover/app/src/main/res/drawable-xhdpi/ic_settings_grey600_24dp.png b/Clover/app/src/main/res/drawable-xhdpi/ic_settings_grey600_24dp.png deleted file mode 100644 index 2251d2bbbd44c6ce43a6e244b7278a4cfc2d96d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 704 zcmV;x0zdtUP)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00KBkL_t(o!|j+$D}+%P$H#S)I|-kGSh%HJA`7u08^wYT zAVvSiWkDjbU}0s0#bh!cLe#{9vXLlkn1HVMd=?1PbK4p7Yks>}hpSwNRLzyu2zHwW;tfR*n7 zns7;}_2J)Hn8E`Kc)%nw!@7FPx~6O!fD^}|^nLV^c?aR%HF1G^10l!fMP+%C=n+pS5;9i*4f2LX2(D( z0*rbUIl4xR$BdNXQcjv7Njr@=`(bw_Bo!zDMS}7yl3^DsJ(W`lND`DU(FQz6b{>fH zvrq{r7L);dKmz8ZHyBU?h9&K+c%c!esgEfACaK!f&p@lab?pWdrIf|ya!Vl%!1)K*1QH%YX$!|dXGjb?6%e8$H08ovi6h7O!p zdPhYSEf@jJtIISOcR#kj(N9yCMf@0%rB&6Z@8m=rhJ?H5K?WV9=UVeKIvg|6i@or5 zEx~RUHIk+K%hfy`V~X3-Ek>vxK6N!%CS1e!F25^^gEY$5_t9v7fOMJzRIz{xbAUV+ mkZtlac1yDN{r{ElTL2%8ev{aB*JYFd0000lpy;7r2s24Mgk2IZK^^iBh`hXFsLp$Hi^-XdC|o$nN|w}JYolv9aiaA3)AHJ#jL^+Vnw!iASI;~WiKXmD0RMEHO!?-j&6;kHOKLX;?@ zWGE7DPJUcs54$WqYC|tM?Dm*a5EB$J%My_f5ptOQ;JnO8utv}pJu;w=5<;?v>&>8 zhF?Y&EaUf-F4>V}ouDGUG9XTwpfwUQW0DePIU@2QLIJZP6AEI68g@DQ)P^_(>}pKO zkE?_$vBVfLVvMs)nQ&JW#5%6Ll?i8P;6j~onehS_p38;=e>tq*49Si(?RM$JF6|Z- zhLe1y=@Yj&%{<$LDKkeuxA{!dCfy3hWwyzZQVXYeKoyfe+#{|QF7lc(Gdc+Jm}KP& zE12AuD=c7gL#~j*pF literal 0 HcmV?d00001 diff --git a/Clover/app/src/main/res/drawable-xxhdpi/ic_clear_black_24dp.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_clear_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..51b4401ca053ca8cad6e9903646709a2f44444df GIT binary patch literal 309 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw{&>1LhEy=VysgJ$~x+g}6OvsxLimbaeN-!xQItoH=3nd`|H@dF!kYp_dChV`b9AudQLRn7yg2 zv~UiON9*MGOYAy6D=_*g@;c3(5`S(Hi^X;wk8Ms*3SMP^!WTf z-E_DAd$kLMWY`Z`);MuKF9=d$?_mzLoFj7Xp~|_3ODg!(3;AT&wLoS^O+0tsvcZJ& zD(m_$dNm(!9@n+CTyDa$w$*a^-$!>qK3P{4end8+qbAwoFEAV!JYD@<);T3K0RXh> Be)#|Z literal 0 HcmV?d00001 diff --git a/Clover/app/src/main/res/drawable-xxhdpi/ic_clear_white_24dp.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_clear_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..6b717e0dda8649aa3b5f1d6851ba0dd20cc4ea66 GIT binary patch literal 347 zcmV-h0i^zkP)vMkH8EXyh{JTRaptiwcq@D(P;=ehLbl?EMKm*m7(@7_siS}}k zNFtnck{HL4mc!ypcyUoqJV~4rM^fS3C#iAnkyJU3biCmDy`VZLOv=LXld^HVqI(3)EF2VS{N990fib~ zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g&? zz`z*e>EalYaqsO-N4_Ql0oH)BuNkiAjE@IJa#Wd=bLKGP~9JF5lIsRcecul|FLFQ+cq&RQ*@qW7k5V1D>~2B{&}~ndj{H%k`sO zkj#@M^RHB@%$R)H>XIjm`ugchCu;cR757f|@T=QiUKDNf!K_;0tmC8O`IDH~Pdg`0 z;$r8`Py~|xJ+HqnJd~*PMy!*gI7Vl0cJYk~@=CEgzx)kfaHww6A-h+Hw$;7}d3U0) zfuVJF%VovP!XKQhEV*A@yd^Vh%lQDG3EyU2OuUq5T$LiD;7}3P z=JC7GA!tpCx7k_Kmxmhn{F*v1egDF!ua_=ozuA-=dHoP;+??C>vhcw1D70l<;y=g# UyXpHiz`$qlboFyt=akR{03ZjyWdHyG diff --git a/Clover/app/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png deleted file mode 100644 index 0eb9d8b083f0e23cad450e6b81e6e31c06e730e5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 492 zcmV004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00Cr4L_t(&-tF2!a>F1D1yH3Md^D1r)vXtGlB0R|yYM1S zLX6OtJ4{Eg^@ukHjKuf=>8pK6fC3bt00k&O0Sb`FSw>0JID<@*RZpVc&sYF_BSDOP zzzx8HTz^)}0YO?h0I=Z5g6CRb6Cl2(9$2K>T9ytIoa-f8nAiZ*`@30IdihI998&O^-W#$ zE8eR<`gyLR?O%&Chls5choVhVmCp&?Gd)wx?0#|VP~L8%%w$p-R(yr$;{~C~*0aQ- zs?IgBWz4kTp0!A|+(Jmj5e0owZ&G_RIaKonL&qxNl4CJJy$iIb&5VA0&o>}y-{Vf+ zDHG1r1x#19Qr&G{7AbO*Pb!!_%zNG?L)Xr;3&OX}$oL zDwTSQHR(l^wA|V&5Tv(BaLS|4S6@E=HsQVMvgUa=7p*v^YH9g=O3?HaqZf1cUXtJS zaF%GD*rb`FVdQ&MBb@09A9bRsaA1 literal 0 HcmV?d00001 diff --git a/Clover/app/src/main/res/drawable-xxhdpi/ic_image_grey600_24dp.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_image_grey600_24dp.png deleted file mode 100644 index b69c520404b91fd415cf181c4f93807ef4a14363..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 629 zcmV-*0*d{KP)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00HeuL_t(&-tF4GFGEon$MJ6s72-ee9}sNJMlq0hTbf81 z#A_@VCG5l`1_@yxW%ROll9mV}MuTFqp!LpDl%DoJr`nS%d7duk+>_Ju$+^FK+B6M} z;jbz|K?+ikg8T^zGRz*gycgm1K#WmJ%?k&NCv_!T)D?Lvj%gw;+o7NX4%DzsPzLIA zzyYYGUj_;}OK?aAs&WRZmVqjqfy(q?RFHxcq#y+;NI?oxkb?dP=#F+0eggHd$)JBg zvxI>qmi+;WFrI1+aOwuMpJVKrE?!dY1ReHCvIp(ZKsd|T3!Pl0^-t}SWD7bc#4Fud zc4>mhuPfF`vI9NP#to39h0Bc5Ff)cZmPxV$4RMfa#c3t^W9*Dx;~dK**?<;VOzTDI zN$cIy#%-2)R!J(cc(#7O?Hbcx?cSU>#v(~l&<*W8W?Y?Q1AsZ!J?4v(Wcn5MJ>$w7 z&FmWImlGjLBhQ{IRS~5;bN&2wXetW_6131M;E0nX0qroAWAwss0Q@0I-k@_rhMSmQ z36kUm`aB8?Q-U+e3-o;y7N$ItBzww=SAl%bA^nn{UXRXJPs%_i&Oj$J(5f@giVQT* zu@lZA3(^cVapZv0%#-vfi&M`iF;nOY66Gi(G?+gF1NwIz1t~~D3i??e?Bt!g>TNs8 P00000NkvXXu0mjfW*r5c diff --git a/Clover/app/src/main/res/drawable-xxhdpi/ic_image_white_24dp.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_image_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..f9f1defa6df89b5a7a68df6787a4ba799d3bd3b2 GIT binary patch literal 450 zcmV;z0X_bSP)q8m|@f&vEk zXhJXy z)&q8Jdy{=h?m>-(r*@dK*d3epCi{|HgU+qz4*BYtIwp6bB0wo2#+nm8I>3B8iEGdk zTNzJQxB%cRn_*v)JJ1{dbN|paSFGhz>`QV3I>zMAKdKnfM6N&`Di|k|EDy3@h4PVK zk{o2e3gsieq-8-3jN^&)U)Wy&nw9O-LW-|?GEfU&#WGOH2p`=L$UkuoJ#eZRDaa7g sq|daVQ|=KHU?d>_qaXz-NI@l=ck_!~>**H-(*OVf07*qoM6N<$f*#evGXMYp literal 0 HcmV?d00001 diff --git a/Clover/app/src/main/res/drawable-xxhdpi/ic_send_black_24dp.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_send_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..40b74ebc16e0bf2a85ebc3d920353fc4eb8337aa GIT binary patch literal 412 zcmV;N0b~A&P)9SiX~8^U zs0^|Jg+V%CkHn^!XN_G>x#5Y=+yEz-Wrb~yx#EG>?g9P#`GEfYY{2gC_rie#Xx{HV z9WZ^+9INbb!ZnY){W<8IMW1Yeb@n*pmggk0eWts)LHZl8!Q?;PKtK|1ApBhkH%LaR z+<&eDk~K&`G6xAr>G?=KM#@GSITuODMG{hxgxp`sLh?^hp*9(*rqfy<$sZ&l`GXn{ zN%(M{j3g9PB%z=p2?Z5ND5xJVg@XEhUa0RPl}e>jN$3j$I+7_=g2%A{0000004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00FH@L_t(&-tF02Zh}w{fZ^Z91=I!9ChZ!#5l9regNo~@ ztuCap1xzmwgjACP=Q1;r=HRO)U*-ql9A-~U>zE}_0wquaO$xMQ#S6`JK%d-D^URu$ z>3{%EY{}V82h<)1a{GWoAb^^Z!ZP3(s0*0!b`8)Mv)*qS1#|})1@r?M1oQ_f2Mh(N z1-t}(d;eZMU@S;HpbV%BxaK$=P#dr!j|(UZYL7iRo6vw7ps0Xapx}U-prC;IAkTm{ zpe|s>yB}!5!`Wxa+&7t9I|8c6*h?pSJOkW$Br7PWB~EIe8T6gh85>UFmwng_Mk4wAF~-lp z;kp{Wb;!-2KT_p>>(IQp_C~q}XfTrf1KLO=J5WPKKK=w`1M-Muu?+HxqzMX&qy-9& zqydUrt4eRjIISgYHmr`6l)4*M?jXTPu^{nCF`$}4K2j*?K&BIE2-Np#K{b*e$RLtC z$S9HvNMQ3)4rKm@YzXwq%080R?neS8Py!{;KLz~&$HDh8V7w~v00000NkvXXu0mjf D^l|4S diff --git a/Clover/app/src/main/res/drawable-xxhdpi/ic_send_white_24dp.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_send_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..1bc7552a96d4ba2ce3416c4c666a4752ea281607 GIT binary patch literal 446 zcmV;v0YUzWP)^MovOQy2%69g!l`1nlRu9q5pvE zX@myYNfB_YP>O(!La_r*Bos5CgHW7+xT6~oU$g=ef(baElh82WwP-+Oc&05B5IJN5 zB1?EcGzbZZ7QO+|!~|S(6`Ez4Z4SBMo;QAS3pm9ho9xr!mKQ!VTYnjTO4rC9j|;f3SF@(pKOI4j=1E3cc)~>%*CI9?W5jhI{pl# zB8ki(Y+Z@Yz#eJxok#U>^@^m0@8+i>;}%I($V3X;e=~@rA`}uySSUP_ppeEjA|O&b zm&b-m^(N!^U}YjHKUfWtNAeJ=)UTTkLOu0J4no~1k!nKyNvNc!>`06 zl!7Kix5q+Fq6=w?Bq2zRX%{Q=l9q~JFAfaD-fMk(ql{OMJp*hZ8Le@FKzb36b`fRvPbJZ#ihbmi`-huQ`v`H+dnnz5 zIO;AGB7BE9YM!%LJ&ic*2`mcPKpgfvmoR!03D^-c43Z$hAhR4H0ecmL8#qMtu}v3c zWQvny2hqm?F??uNd0r4z>Rub{-SwiV_KcJlc$@G(Y7OnY{oYXaZ@4M{dXjJ$v z`$eh=sKvO?Cei3I?)A;6Md`CXq2t(8SWgZw6G7n$pCQ&JiDGgU(}=YRim_lq5{{Tt>$z%L(Sw8>(002ovPDHLk FV1g%Ge~AD9 literal 0 HcmV?d00001 diff --git a/Clover/app/src/main/res/drawable-xxhdpi/ic_settings_grey600_24dp.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_settings_grey600_24dp.png deleted file mode 100644 index 6a70402b4f85220a29aa1d15dfc9396ffafb6247..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 994 zcmV<810DQ{P)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00UY{L_t(&-tF33NK`=_$MMy?P+C-8BV8>-F%gj-3`vLx zdJBRii9!qu3n~h}Z_x$P)hNR3B7q>3f+j?_$3iWl3u%fZ(S_2qi}OVGMVF%K#hax5$knFrNNK{e(< zty0i^^PoW~=#yzstdwJ65n&dTV+&eg7PQqCw8bo_#1?dTszHG?&_^YilYR+h2d`~G zT@(>Isqb>m@t#@&^g)I0=m!)M=02WBmn~+zy<(%gUpU)&=>8>N7c`G|9?=7wA%j@1 zD`UpnRieqHk}n=ddkNPA9rGIgO`9X`<!b=r59s)MdgJIBJ}k}7De5srn$ zY86lrkBx!anPm^!V~k^AvC|F|NxxCh2NuXdXSE~8XrYP{N~ofhG41{*WuV23YK09_ zOuR>e6Bk2T89#{Up8df^e6_^5+qy)gQ-(Y=_bqWDT|>| z>FNYY%ZOl_6;f_^4wqdL2g$yau$u&NEy@LHn;;?Ax0-sNAg)RoR4qu@?HlNTAg)9i0F39-X(YxDl*1dv!l6z=3gMz+N)OpGP!z)&rB$yt z2K9MX)ZU)5T}DAgDzDNV#yF1%RGApp7z3?RT{dF#==pK{WO;)*t>o(R&Z;PZqfBTTm*`n^|whkRzckLU728S|8N?tXJ9 z;I92XzZeui4c%0b?xj50rm$E2k^(Q~MFywo<-9K&=QHlpg1i;jf;O84t+WMY{pTO> z9234>{PjRPWZAHfP!)RVB2S(!`lt|Um(uYf2_cGfFjG~?QJ_SKM>Hu7Qz_%` zC^KY0j^p?%F-hrI#t?oEkx>e=^x$WZC9-20$8bAJMiyi_f!j|s$&C!#uq!e{4&*3d z*U4D<;$4cQ>yQUJNq3uf6oz@6$E?Ckd0-Y5%+4`a;aG`TuRL)UvsTrDjhJ=G6Wy3? zP%Zcjv%EY}z-*IhK|5x7d7^;XCe?zCn03h$-I#4qEm(P<#_c#+Sul>1xE*7f>{!k} z_~{|56pZ6*{0y;7>1g5}{!WmS0WF-w-(4mv4bw>oQKFMsszM7}DHGx$QauHt_cw57G zmNrf?VwFPCz(EGt%|eYrmJb-fVG|Z VF?y~eTbBR;002ovPDHLkV1i=jh>-vQ literal 0 HcmV?d00001 diff --git a/Clover/app/src/main/res/drawable-xxxhdpi/ic_clear_black_24dp.png b/Clover/app/src/main/res/drawable-xxxhdpi/ic_clear_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..df42feecb812b02df59b016f4d9ba995be1da82a GIT binary patch literal 377 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%&M7!06!V;uuoF`1aP_Or}5)*N1l- zmd#l`*P1uuRG{<>g~}cLi3NSnFL zkGQYSP&@m;*IK6Q-#O#%t5^JG`{BMqf8+n2Z|={&zE4otx%%IU37m2NTYWzKGCBDA zGRyk&LVN6HtbDhUpKVe#i0?1F$Iko1uY_g0mfJ~qyju(6`+^n!Z*4iz5hh+Bv?p(-%zt$M-+!?Iw6Q#P16<$f#A@_7oVT44$rjF6*2U FngA8*uUr5C literal 0 HcmV?d00001 diff --git a/Clover/app/src/main/res/drawable-xxxhdpi/ic_clear_white_24dp.png b/Clover/app/src/main/res/drawable-xxxhdpi/ic_clear_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..39641921925f090e33df2767a4ee5e6d5911194f GIT binary patch literal 436 zcmV;l0ZaagP)32ETvhYyB39D^lU%DgQgv&#U%8l^-CA%qY@2qA=!B5=cm zUgehujQG*l{{`@rPr!f|fEk^>KI9WteE@ilV6HEl&_rJ@p_zU*;T}RirIc{5NocNLm*7JGdV(AM zYYDFOvk5~8{Z*t_>U=!XvoehUSEh=adIga45oe)B9kGgT}7UT3Cirmr(oHPv^YQ1-p=Hlh5u;xggf zX{&yw+El-OrrKQJRl@b7x{HLmNkj95`a#LLnW{Veb2C+!`ppt#r)=g4@?c8RY{yJj~W@W|h^mU4q`i)2y~Rw@J`jIh$1%|In!~{Tb{nMqaxlgb+dq eA%qY@zJ@mriVM?qfwL0;0000I(3)EF2VS{N990fib~ zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g&? zz`*#&)5S5Q;?~<+fkB51L|Px_ITRW$a6Y~5-Ms@BuSb;{TI^`}ae!HY_ler`B?iUI z^6h5)pDj4+$nA*Y`~J!e3``sf$i!9#V?JhSF}d3w+PXcpHO=RP&F-hRM%`eLgW zXY7;hcE)zh6;6fwzDIL-Gd%fypV@**#s0Z(k7C28&)=M$ww$Xo{JC@XP9rCs`oLoI zS^f>rrspjG%<QkCISyyt<8zh@Ecp3j_RegU0=vgqAB7m_o!=?l zE6DLv#zC6#O-?0$!?#281sVg4=R2*K?XPg z_qi3A?C1NenCP#1<)pfh*Js<~qFjv=_ZQ@S?&2{0tl6^bCyUeD8Vg1B`p_CzZWW)2 z{Hi{a`Bi+T@+`1=NYEIDRMq>Us$Ur_TC-LxSDxh{(RWdlg|^*lmZh6 NgQu&X%Q~loCIC6n3v>Vg diff --git a/Clover/app/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png b/Clover/app/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png deleted file mode 100644 index 7b2a480a02138f7e1627c47c7810769c07d02987..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 662 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcg6p}rHd>I(3)EF2VS{N990fib~ zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g$s zRKe%z;uunK>+Nmdyh8>8ZHbpxdC!t-6PsA@Az*9tuW|{ks)qI5Is(2vHs8$WDV#^lJw82zHADRtFfbG4gHTD`+TfU|z#4lOX$m0W5We-Q=O=n$W0Q z7uuIr=%3ieCeN^Mqu4w1{aY=VZaj|LHa}+~drgvrS>g%y26IV8{rSEYPrErM{n4Mp z-(4_IUuB8@=dO*4!X_uX5V?1HO6%{pS+`z&G2gTLp@3D==llE%%bt1rs9!l7u5jhta^Z@fm-)T; zCa)Lby!CVS3D2o+7tZl>>|*&_lj_u46Y4a##?>iv-;*-e)&&#g_eX{(Tsaf22-92i zY5URsj82yB8m)tB^F214S}yqJlPAmR8ZO1!mEx^`EEYazmfF+*$++&iuhN^1PniD+ zMf^-|Qi!h-vl5)~^Epf4zCTt50yloDHyPMJ_qvm?e1g3|Ri@pcL;t;BGO)*dw>VHG ulVHoYL5@A5pLxx3#%qrmUhk|rpuh24@WsQ^%4LDcg~8L+&t;ucLK6To`3n{R diff --git a/Clover/app/src/main/res/drawable-xxxhdpi/ic_image_black_24dp.png b/Clover/app/src/main/res/drawable-xxxhdpi/ic_image_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..ebe206ff7bb1de48d109e24282501264d1c85251 GIT binary patch literal 548 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%&M7!1&tJ#WAFU@$D_&t}6}_?H}DG zUtF78%ap#9!};-X(IfrAEF$5LMBUCCTvqAkux#a8#IvsSCC_EOFHChgM@+0V!-Go} ztWHi{v5xCs{noXv_7lwYO&kTx1qB6n`W>9Znszw-prK{(xhG7jYOgXiB))yeH<#dZofRb8aKMh65v4Km(J=0tQxe zrh}*HlLr2tohObjWUF~<#BlwG<&g&AcZFKgNe6i} zfNYr$^8};!yxS34JUMjJ3C3@0i#mVas^%|TnZ!1yV0v))k9T{%%dlH>PGl;JESr7* z+|{QE>WW?mxX)euR&jJ~e$Hi8Zm9Tj<;&2I@{RDB)ul%4IcxY~~shuCjiJz7=%!}+XkP3S}BH?LlOXmQ{1 zbtX&xyQ`v;<^mP(Zkg7~vthON3ayZa*jUD$>Ib8bzq<89<;SOp*oW$l^*Ndhtbf|& z_sOY?7IbX4S=nH_$2U{x*PlA}wm*#j?DqCp9#AQ`XVkQh)Ab4a%EbAC=|-u?1WQ}Q jpDR|sd7z>M1oey&Pa+y;l`K*O#y*3mtDnm{r-UW|Gl}p9 literal 0 HcmV?d00001 diff --git a/Clover/app/src/main/res/drawable-xxxhdpi/ic_image_grey600_24dp.png b/Clover/app/src/main/res/drawable-xxxhdpi/ic_image_grey600_24dp.png deleted file mode 100644 index c5cb5e969ddb11be915be7dbe9cb8e314353938e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 808 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcg6p}rHd>I(3)EF2VS{N990fib~ zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g$s zRI$L*#WAGf*4x{svxEa>j(^No&A8P&U0mQ`wz*=Oq$`Kl)i1IlYt~NJYTB{wD`(3s zDW~9C&e$fUyK0L%XNz1eIXBaCZn2v2hyUx-jM@$6fBAE+e%Z_( z8>O43N(_t~4h&2J4Gb&~geIi6F}dHA|2XsSvXjzYH9X7`sg2Uke;amBsdUKBZwP!f zr~jZ%liA75{k+E}bKX#L7nVqG-uQ&k$|vY; zZv1oCPYj>We0{su#LJ0?!L+O7*SF(6lO6~JEIccFKhU=*hj&lfB$o6Bw#t7&PZyPi z%(mg}zuv5VP%xo7)bh-(Z_#IG>uC3}_%;bUv@31B_f7Mf#S)3_i+-N7&k&l!@NCBW z+q;iwX}Z3?WV24tfRm3Qw2OIhTI3DWSK^j+KlTJqP>Eo#SgZA6PBim-qmx+;`6Mtc!(zlZ@~6-8Iu(L-wEa5IfQowI9-hvuwR$tP^fy(>8sSO2|8{wRtGpvc@#B$n~B~Rwm&yIIB)&jy;7gW zTKL?7mzK@v|L<(N|7b3=;GHmT*|XKxR_ zisKEuaTo73N#D@a7GnOhx@e+huI&M-u%#?A#q8EMMfY92V!WoXj#HDtTEZ^x>C~Zf8IWQby>8Ib0dT5wN0yQ*dG`x>m;y#Wc*hW`8x0OY*zD)2SPUjd28<` z%OxHB?A^isVY&9DKSD{2WgAXtCo%nb*|kec?7;kW6+k(LjH+Fa;+@JJK3|^tKx*fkZ{B`g7i!8I&_G+^jp3D98-1uOyT{3%&NQbJ*DmH;h=0&4#;NKAvc zngWD8@00GiD>ySpPfw%ED;&ph9LI5-3$`dDOrO9#M^uFcUS_~=>dFFfx_Utk2yf<& zL#na@CMZ#XI2|@AiwWojH6)m^LH(kxEMS9@5fBJ!L`Y6LsAWk36I4l8AWn}K6=i`! z1T`jn!d%jzq%2^A5)_C*{hV}APXs$kL0JK@psavcP*y-Js4$V~aX>{+zy`G>DPV)r z6R<(eC=1x2@(bh(YKnQ**yWUeTr*S;>I<{1u+1@l=<+bZpnjx+Qo5fu8;PKF?k63T z&i%xoY9x@kpL9@4_j5}#5tPvV^kY!@1?E^~hZFvC#pAmKzO$Gop#{FN#~J^*`EWw} zOc(o%)6-_1uf;#(bTk5Ioc`_<{*2Snl!|`F>1b;C&p1moA>Y{Fg$x4uf7pUlG#0UF zEGp6De_Cu(k$v1X(Z~qcw}$)z`QM|BfL1h?v05}nKrI?0pcRc}l>M1JgMf)fQJ_OZ zb=@XLBfE0eiqR+um}v9_;>v*7;;V^9Nx(!SBw#n;^aNrwGW6B<)s28&G*%#PM2m8+ h5{=_Hj^j9v^9)ES=TShce4YRR002ovPDHLkV1nL{>pK7d literal 0 HcmV?d00001 diff --git a/Clover/app/src/main/res/drawable-xxxhdpi/ic_send_grey600_24dp.png b/Clover/app/src/main/res/drawable-xxxhdpi/ic_send_grey600_24dp.png deleted file mode 100644 index 9b2c61964631659574e3432603fe6c91b750e3f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 750 zcmV004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00L%7L_t(|+U?tIPQpMCfZ;*W-*Nyo(KC9Hk_dPL5cL$w zmv{}OdIG3l+Y%yL>bBjP+1X^uKNFB=_iZWd(zt-Iw}t`~pa2CZKmiI+04Cr8uAmRg zZ~;p=gg1k@gy(Pp>6XA9L@){$u-=}aEjy?@UPQW$3_x^HWdZALZh{)f z3aT1FU{HBL0!{0)61X*UF$xzTC@2?zh@kR-ci6A^8fj1wjKc-|1l2c(fM5aX7H2`d zgbVNxR37jFdkC-lm>r>3;R4u#q6Dmix-oMx<^+5~1O2}c2E_v)42lmx6cjIjAgDax zi{c9w(K)pLqz%c6GXG z2-~0*TTnwY7ZZ1Y-}#vt#P$C{x!oV&m>)|}xHmYc<|hp*f+;Y7K)wG-DJe zV{0_HA7r>=TLSL-A*Mq#<(b&_U_MK`{^|27}tnK_7|EG=bv)FQWl=D z$p=)5MjD`UG;#nnqmcoKO)@>2ON$&AcO#c*d;&^eYmf*)yB_TWfEtYrfPIq>JsLg$ zQ8YXN!f0#&_oW61_g#DeSfZf<%+0tD!dz~{9E}Z7b;((edxa1lz*96B0P-~`E&%(& zSI^P707OJn58!oar7J*KG&aERA3z9PuU-})HkvX3(ZAWS0q)J4AB6lftiUz}C_n)U gP=Epypa6&M8+B7kP%l#F6951J07*qoM6N<$f(ecxUH||9 diff --git a/Clover/app/src/main/res/drawable-xxxhdpi/ic_send_white_24dp.png b/Clover/app/src/main/res/drawable-xxxhdpi/ic_send_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..6aeaa850b0f6687787ee735a7078ecffd3746ae3 GIT binary patch literal 586 zcmV-Q0=4~#P)iiyj@9(xVOVg#(7p003K_Gj#>nXC*>~ z2iWpwKJ$p7Er1B+1Rz;*lb$1h2o)J%M>$)bF?9w|p{xKzs8|5sDMy8xSOSPpT{8g5 znuiPw03r#cM?d%dGk^-^0w6*?WzsCbPb2|^Y6(Duas&{e0sur3N{^b!ng=Cx8fL2p~fB9RWlrPXH0B4&V$IxXN9QdBq2I(S<5~;1uV$%xw;N!HTa93iX6> zJwV&@S#X1H4M2eTh)@*(jm}4e8dU%UnU4rn28cJGPt5680EC#&=C@E00M2uTI~?(n z_k8;+fX7^FN1=;c;~pox=Hovrbf2@TP>>!Mvfw(W^-CP6$7N}>LiM=(yQ3AL#|3FB zA0?`LTp`VfPPtm@aakJIKQ#KdU<05JY(@YojR$~8V*nu1_+Bl}8TelAsx&45de>kA zp!d-R03wa+OFosx13;uP01#X7fJkEiAS(mD zi?1q;4S-5x1E8C59snYZ0l=obUhDy&(ij2gMzj&Y8?ENDOXxEq##k{R3pG`V_=<^3NWfR4)j)KkE?kf% zU}CHb1trze6>4h;sTD;rtpyq(711_6TOXmFPeL**CLQm0&Kbrt$^HG8P44Zq_ne-d zIYT6GB9TZWvWW>Kq@TD8Z%rbKCJFFT3Q=|)UTQ^@t;I_ZBg!7bOS=$dFXN?m5M}%E z(wB&`ukq3!h_Yz{ypu!>x)$#=AqKVLoh^t#k5E8sIL>$MVhOq3&gY0hM`8YgceIr|YY&iqQ@`QK~6 zQos?!gFYj`%4WoqwqT*0?-5V>feMW6L_F#x3@zbr#H0S91|$0r&w3vNHzOXl4y8E9 z5Dz;}9F@lr$I={PD~(h#??P2Hv5k*OBaS_R%D0F^Gwfz5bE%<=S;V1HRE7}izM+=? zvXWuMx}&JnaTc-a1LhN^j9$d5v#dlZNx#*%UxG%$>Lq+a5(6c?YW(obN2{C>#Hd#& z!B{)f219oRCRP~?=PB;R(sE89s&->)k9y|05eEzCQO)~HF|~}eY5{Q-jsl(y{dFJ0 zLg+*>%Tom8#bC&-wqj#@$W=cjZ_b3=su3H_Ay*wEUqWZ2%FD7H{2O^AAiF$gQgUe1!CaxCt9AAy+*GP?%|S8#ZFe%*GOO> z#bLy_Ugb>^^dZI#kVL7TbBI;FloO_cKI?z#>rnXuv2KJ_AwQf^#JVG>3?mNBvWI0k zCeFQ%8(UwY@+jh1ntry^Op?+IC23&?1EdS}PEAbz5c&FESu5gU4Th($JgXZci}?%j zAcuGCUqC#n17l^3BOc^%YUO^!lkUMvz+uFL`muJC2Zudosl~w?NY31kB51DEg_A{d zo(4V7yWC2^CMFTbCfGp0ZS3d#oLeiEIC_%o8Q~cgkx|9lh(m9&kc<=^oYC)hXq9s6 z($m<(9mL4iY&qBmXe3*lJNfX^nst-}xU1(FC+XyRa$C!w;mW?1+!pg9Cm5oZ0(uZJ z=)Phh(s literal 0 HcmV?d00001 diff --git a/Clover/app/src/main/res/drawable-xxxhdpi/ic_settings_grey600_24dp.png b/Clover/app/src/main/res/drawable-xxxhdpi/ic_settings_grey600_24dp.png deleted file mode 100644 index 5eba9e8ecc34d59c8301157e89b5af778e286bdd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1299 zcmV+u1?>8XP)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00fIkL_t(|+U=WNY*bYcfV*4T3M~d>XqQ^$r{PT!EC>Ng zi3lN-7#mE4R3#L|knjj!K-5MHfxwIU-~%B66GM3r5K=6C0&NK)P*MKUT7Ck`j|Tih z3K-g69)Jz$-o0neIhW zcnZ1BTz3JkE8V}35OWitROG&g$MbFiOcMi4cN1W-7~nlO0oIEFHo6J$wHRQRn*cwF z0ZzIJ@UIx4JG?*|p8E;0`yL+8xd%|G1u)G$fI2OJcQXkviBnu)JtG62navMc0LQ2f z&^Cf~T%?o9VE{bE`3FY(XrYGOlqY7;uI2ngY3J1xUAfe-kKPAQTx6gWp)5x z1(^Qb+IfklMjL>M^o8c6xlA?%h;i5f_dSjVo!dbG3!HG@!=ugwpoq)P09<9TKEOI> z-1qR}NSs zC?=nLN~mN7--U1}E|UTLY-OZ}O^otgnB{Cv=9y;FB?D-;Fmalf0+W+*bXaIVCIhJ8 zilKqM3{s}&g)|##zrr|a6iU!)wz(x5gOT~-A~vejyx~gRAfVF62<*d+5n?P=fZBDwk_&o ze5Cxl_Z#(eRDq(G)#?_c%+wKuspUohD-~J~hS!<ek|?a zf5HNYE4Ny{5kP@*4@3acB~;?}5>jvCN+W5%^<{wS@J10Xo0m!|fMLGVpm*89 zOk&Ix4%`RHHC`viEOv3%x3yAiThzaw5)nRRSn}5rwp+QsjiHZJA@%&C+wYL{&(0-R zV-s_T`!s3IHhY^-Q#hB`_%@ldcBxAwS^avPvo!ERz%$d8y`%n_ebDIZaMp5$cEu;# zkOyBEY5}~J?W4yNvwiscSr^CeZ;0Lh)6M$>@;dHFwqHSM%=Sw_4Q>J~5(B*BCP0-K zU{bbUMI7qtWzcKF9;dUnS!)C%`B#|}-RO=0B7g`W0*C;@l6%JMO`{x4!`%P?002ov JPDHLkV1jzQPhJ23 diff --git a/Clover/app/src/main/res/drawable-xxxhdpi/ic_settings_white_24dp.png b/Clover/app/src/main/res/drawable-xxxhdpi/ic_settings_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..507c5edd44bfb5efe41327d5cef511a108d35f13 GIT binary patch literal 1074 zcmV-21kL-2P)+t)}?IPi4`?n-BcG{I5ur- z(S>O`4876<#~6}k=`>Up4hWM~CUltm-)|Ri1Ni>m=Xw7B>2vXZK2lazR#sM4OxVB` zGWm@sMM^ z-;l({UGfbz*r=0l*o=*rbn~#1)BM5?7AY+r;d^YHV6D>PUbfT6IjR&Lx6#YE6o*+) zuBKoO-MHxHK}|s}>p4WgxIShmD&AzWe%_@-6DZ+pqS#BZCQ!mV^fOt5qM?`(rW@k` zYsq0Fe-hOnJV_2~IlvgxjZ&g0_?+}E6PL@R*DQCeAjPd$B{wAK#0SSo$OW75#b()K zHUs$LSLVnT+wsWmw*M;;$z=L|Dth}oRO&PU|Q78@DG)EG-;f#n348sTZV zVF~9kvs0GXg_$1ilRM_pLS`uz%MxXz$ZS8iD;g5KO+dIKazGp50^T5@IM7A7EpotC z!W~mwxJ0;WIiQwsy^0H?ge#H*l7zdexR6PK98gHOKye|H0y&_NaDn2&2;t_-0ZGDL zRb044xEeWN72z%_E_4yDUJlqsxMPX~IW&?Y+)+88op1pSBoqyIaEQ!Ol*$riq{ys= zxpK!+dNI=^OYFwX1(wJSoA?`3V^qijl?0d?Wut77&!^Zq%PbjU4n5fUgnXH!m=5f< zk}m_~a~ON=BxQz5hH%r$Y-PY44&!E!3Yp*}?#{7XA*iGWcbzi9S)vHoMVW4ZGIkRX z#g8(<%S4r;jjhy@q>w_AtYRDOq=;&>OpwD#d~}?I%ut7qs$`Bm_@-GlSja#4WRw!w z;XQoPAY06$A7At_L-u$UUpyrjB^DU#RVFRX2UE@R5j!x|C?D|xrk<0JScR#T@)5nxBvhE literal 0 HcmV?d00001 diff --git a/Clover/app/src/main/res/layout/layout_reply_input.xml b/Clover/app/src/main/res/layout/layout_reply_input.xml index 6fb95fe9..8f857761 100644 --- a/Clover/app/src/main/res/layout/layout_reply_input.xml +++ b/Clover/app/src/main/res/layout/layout_reply_input.xml @@ -168,15 +168,13 @@ along with this program. If not, see . android:id="@+id/attach" android:layout_width="36dp" android:layout_height="36dp" - android:padding="6dp" - android:src="@drawable/ic_image_grey600_24dp" /> + android:padding="6dp" /> + android:padding="6dp" /> diff --git a/Clover/app/src/main/res/layout/post_replies.xml b/Clover/app/src/main/res/layout/post_replies.xml index 1981029b..c074f060 100644 --- a/Clover/app/src/main/res/layout/post_replies.xml +++ b/Clover/app/src/main/res/layout/post_replies.xml @@ -53,7 +53,6 @@ along with this program. If not, see . android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:drawableLeft="@drawable/ic_arrow_back_black_24dp" android:drawablePadding="8dp" android:gravity="center_vertical" android:paddingRight="20dp" @@ -73,7 +72,6 @@ along with this program. If not, see . android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:drawableLeft="@drawable/ic_done_black_24dp" android:drawablePadding="8dp" android:gravity="center_vertical" android:paddingRight="20dp" diff --git a/Clover/app/src/main/res/layout/post_replies_bottombuttons.xml b/Clover/app/src/main/res/layout/post_replies_bottombuttons.xml index b4bf65e4..daf82548 100644 --- a/Clover/app/src/main/res/layout/post_replies_bottombuttons.xml +++ b/Clover/app/src/main/res/layout/post_replies_bottombuttons.xml @@ -59,7 +59,6 @@ along with this program. If not, see . android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:drawableLeft="@drawable/ic_arrow_back_black_24dp" android:drawablePadding="8dp" android:gravity="center_vertical" android:paddingRight="20dp" @@ -79,7 +78,6 @@ along with this program. If not, see . android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:drawableLeft="@drawable/ic_done_black_24dp" android:drawablePadding="8dp" android:gravity="center_vertical" android:paddingRight="20dp" diff --git a/Clover/app/src/main/res/values/styles.xml b/Clover/app/src/main/res/values/styles.xml index 84d82c71..f8e59e22 100644 --- a/Clover/app/src/main/res/values/styles.xml +++ b/Clover/app/src/main/res/values/styles.xml @@ -65,6 +65,9 @@ along with this program. If not, see .