From 9a3b92ecbc909467a6897a0fa63f116749fbb9cd Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Thu, 3 Oct 2019 18:55:32 +0200
Subject: [PATCH] change active boost icon (#1513)

---
 .../tusky/adapter/StatusBaseViewHolder.java              | 2 +-
 app/src/main/res/drawable/ic_reblog_active_24dp.xml      | 9 +++++++++
 .../{ic_reblog_dark_18dp.xml => ic_reblog_dark_24dp.xml} | 0
 ...ic_reblog_light_18dp.xml => ic_reblog_light_24dp.xml} | 0
 app/src/main/res/drawable/reblog_active.xml              | 9 ---------
 app/src/main/res/layout/item_status.xml                  | 2 +-
 app/src/main/res/layout/item_status_detailed.xml         | 2 +-
 app/src/main/res/values-night/styles.xml                 | 2 +-
 app/src/main/res/values/styles.xml                       | 2 +-
 9 files changed, 14 insertions(+), 14 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_reblog_active_24dp.xml
 rename app/src/main/res/drawable/{ic_reblog_dark_18dp.xml => ic_reblog_dark_24dp.xml} (100%)
 rename app/src/main/res/drawable/{ic_reblog_light_18dp.xml => ic_reblog_light_24dp.xml} (100%)
 delete mode 100644 app/src/main/res/drawable/reblog_active.xml

diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
index 6cbdc7d0..5a082cfe 100644
--- a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
+++ b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
@@ -324,7 +324,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
             } else {
                 inactiveId = ThemeUtils.getDrawableId(reblogButton.getContext(),
                         R.attr.status_reblog_inactive_drawable, R.drawable.reblog_inactive_dark);
-                activeId = R.drawable.reblog_active;
+                activeId = R.drawable.ic_reblog_active_24dp;
             }
             reblogButton.setInactiveImage(inactiveId);
             reblogButton.setActiveImage(activeId);
diff --git a/app/src/main/res/drawable/ic_reblog_active_24dp.xml b/app/src/main/res/drawable/ic_reblog_active_24dp.xml
new file mode 100644
index 00000000..8d28a400
--- /dev/null
+++ b/app/src/main/res/drawable/ic_reblog_active_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@color/tusky_blue"
+      android:pathData="M17,2L17,5L5,5L5,11L7,11L7,7L17,7L17,10L21,6L17,2zM9.75,9.75L9.75,14.25L14.25,14.25L14.25,9.75L9.75,9.75zM17,13L17,17L7,17L7,14L3,18L7,22L7,19L19,19L19,13L17,13z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_reblog_dark_18dp.xml b/app/src/main/res/drawable/ic_reblog_dark_24dp.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_reblog_dark_18dp.xml
rename to app/src/main/res/drawable/ic_reblog_dark_24dp.xml
diff --git a/app/src/main/res/drawable/ic_reblog_light_18dp.xml b/app/src/main/res/drawable/ic_reblog_light_24dp.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_reblog_light_18dp.xml
rename to app/src/main/res/drawable/ic_reblog_light_24dp.xml
diff --git a/app/src/main/res/drawable/reblog_active.xml b/app/src/main/res/drawable/reblog_active.xml
deleted file mode 100644
index d27942e5..00000000
--- a/app/src/main/res/drawable/reblog_active.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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="@color/tusky_blue"
-        android:pathData="M7,7h10v3l4,-4 -4,-4v3L5,5v6h2L7,7zM17,17L7,17v-3l-4,4 4,4v-3h12v-6h-2v4z"/>
-</vector>
diff --git a/app/src/main/res/layout/item_status.xml b/app/src/main/res/layout/item_status.xml
index 2a9614b9..a0e2b851 100644
--- a/app/src/main/res/layout/item_status.xml
+++ b/app/src/main/res/layout/item_status.xml
@@ -435,7 +435,7 @@
         app:layout_constraintEnd_toStartOf="@id/status_favourite"
         app:layout_constraintStart_toEndOf="@id/status_reply"
         app:layout_constraintTop_toTopOf="@id/status_reply"
-        sparkbutton:activeImage="@drawable/reblog_active"
+        sparkbutton:activeImage="@drawable/ic_reblog_active_24dp"
         sparkbutton:iconSize="28dp"
         sparkbutton:inactiveImage="?attr/status_reblog_inactive_drawable"
         sparkbutton:primaryColor="@color/tusky_blue"
diff --git a/app/src/main/res/layout/item_status_detailed.xml b/app/src/main/res/layout/item_status_detailed.xml
index 01db587e..8db4d0d9 100644
--- a/app/src/main/res/layout/item_status_detailed.xml
+++ b/app/src/main/res/layout/item_status_detailed.xml
@@ -525,7 +525,7 @@
         app:layout_constraintEnd_toStartOf="@id/status_favourite"
         app:layout_constraintStart_toEndOf="@id/status_reply"
         app:layout_constraintTop_toTopOf="@id/status_reply"
-        sparkbutton:activeImage="@drawable/reblog_active"
+        sparkbutton:activeImage="@drawable/ic_reblog_active_24dp"
         sparkbutton:iconSize="28dp"
         sparkbutton:inactiveImage="?attr/status_reblog_inactive_drawable"
         sparkbutton:primaryColor="@color/tusky_blue"
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index 8212c850..2733e1e6 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -30,7 +30,7 @@
         <item name="toolbar_background_color">@color/toolbar_background_dark</item>
         <item name="toolbar_icon_tint">@color/toolbar_icon_dark</item>
         <item name="image_button_style">@style/TuskyImageButton.Dark</item>
-        <item name="status_reblog_small_drawable">@drawable/ic_reblog_dark_18dp</item>
+        <item name="status_reblog_small_drawable">@drawable/ic_reblog_dark_24dp</item>
         <item name="status_reblog_inactive_drawable">@drawable/reblog_inactive_dark</item>
         <item name="status_reblog_disabled_drawable">@drawable/reblog_private_dark</item>
         <item name="status_reblog_direct_drawable">@drawable/reblog_direct_dark</item>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 22353321..919a5417 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -80,7 +80,7 @@
         <item name="toolbar_background_color">@color/toolbar_background_light</item>
         <item name="toolbar_icon_tint">@color/toolbar_icon_light</item>
         <item name="image_button_style">@style/TuskyImageButton.Light</item>
-        <item name="status_reblog_small_drawable">@drawable/ic_reblog_light_18dp</item>
+        <item name="status_reblog_small_drawable">@drawable/ic_reblog_light_24dp</item>
         <item name="status_reblog_inactive_drawable">@drawable/reblog_inactive_light</item>
         <item name="status_reblog_disabled_drawable">@drawable/reblog_private_light</item>
         <item name="status_reblog_direct_drawable">@drawable/reblog_direct_light</item>