From 67f3ce6e4eb311ab37260ad30efc005a0643f520 Mon Sep 17 00:00:00 2001
From: Vavassor <copernicus-@hotmail.com>
Date: Fri, 11 Aug 2017 16:34:43 -0400
Subject: [PATCH] Changes content warning show more/less button to use a
 drawable with built-in shadow for compatibility with API levels below 21.

---
 app/src/main/res/drawable/toggle_small.9.png  | Bin 0 -> 413 bytes
 app/src/main/res/drawable/toggle_small.xml    |   6 ----
 .../res/drawable/toggle_small_light.9.png     | Bin 0 -> 421 bytes
 .../main/res/drawable/toggle_small_light.xml  |   6 ----
 app/src/main/res/layout/item_status.xml       |  27 +++++++++---------
 5 files changed, 13 insertions(+), 26 deletions(-)
 create mode 100644 app/src/main/res/drawable/toggle_small.9.png
 delete mode 100644 app/src/main/res/drawable/toggle_small.xml
 create mode 100644 app/src/main/res/drawable/toggle_small_light.9.png
 delete mode 100644 app/src/main/res/drawable/toggle_small_light.xml

diff --git a/app/src/main/res/drawable/toggle_small.9.png b/app/src/main/res/drawable/toggle_small.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b910ee2cb0bba6574d22ae096bced360ba53155
GIT binary patch
literal 413
zcmV;O0b>4%P)<h;3K|Lk000e1NJLTq000*N000&U1^@s6D|QD30004GNkl<ZNK0d6
zAP)S;p^Ooqc5IR`F}xbl424;a;s_K2czLBnczD?-FfuXvFfcIk6Xz)ghJXM5uKf7^
zW7+rb@1Fzp{D$d6Hk?^PT4@s#Bcm6wh9ax`_xJC*7tbH00L4B5@n4V}vf-RkGRoh`
zF&L!h|NsAAo<F^(2V{a={{tk19KL)&!#|K~I7r{KCwD=HKLp~>K>QEca6zEqZz(j~
z7^wdN5Whz^TnK3R8ww3Kfg1h}W;iJMFahzX;h-=d4HiWD0;Y3})B?+?G)XNm!zs!{
z|NsB{_WbF6TU?olPh3i2Ju?%tBRLuA&+p&+UcG!&fRz2=WednWPF7ZKbwLr4Da=ev
zhK!6%T*O-P``52S@7})Z`uq3iHKc+IrBq}FN(cb4Fch-`X^<Ep@DHc}R0@KM4iLs#
z<bn)g1!9nkL6}s-LB%x)W34P;E~HI0hsFQ6DrR(tU=2C|_8y}P=N8@R00000NkvXX
Hu0mjfUhJ~Z

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/toggle_small.xml b/app/src/main/res/drawable/toggle_small.xml
deleted file mode 100644
index b6b80bfcd..000000000
--- a/app/src/main/res/drawable/toggle_small.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/color_background_dark" />
-    <corners android:radius="3dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/toggle_small_light.9.png b/app/src/main/res/drawable/toggle_small_light.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..24bb1f7ec074432f7a6661a43e0d63665ea0a42e
GIT binary patch
literal 421
zcmV;W0b2fvP)<h;3K|Lk000e1NJLTq000*N000&U1^@s6D|QD30004ONkl<ZNK0d6
zAP)S;p^Ooqc63P?A4KETh-N6ra+m|)4na16aoe_SA_fKq6WH0=eVCY-_=xiq1H=3G
z@7GM5Hm$6ur{^h9&u^GT$cD2#d-iNICnu)|v4$e6d-?L^CJhaZRG`>9ApQfALk<RR
zpbI{eV=ze1@87?_iiwGt0hteg_&X5)LpEFpX!sj)4F~BH6cn@qQa6G4J+k3UK#nNT
z@D~&s?f}$(1BhP(@n4wBL57O~4S!Cd;f_$lU%?CqB^~Bb!$*S!BVhs4IYw#$DWX|Y
zgc(jzCi?mF=XVJS2~TX92$Y$GZr;4P9#}rul9Q3HT)A@8*4DNZDf|CNDY%@Sopt;A
z`X&G^(Bl9CVl6p$?%e6z+}w%Ru3bBiRB*u!2bseH#3Dc}0mYoqoJ+`#e?SG_fEZMC
zfG|dp3o-!Y3pOC;0b*VtCe?6IaSg&)D+`zfFq*2>95(Ocs+eJF@j3tikNc<#by|zn
P00000NkvXXu0mjf=*q9Q

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/toggle_small_light.xml b/app/src/main/res/drawable/toggle_small_light.xml
deleted file mode 100644
index 6f317d601..000000000
--- a/app/src/main/res/drawable/toggle_small_light.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="#ffefefef" />
-    <corners android:radius="2dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_status.xml b/app/src/main/res/layout/item_status.xml
index 411126116..ad8c21f77 100644
--- a/app/src/main/res/layout/item_status.xml
+++ b/app/src/main/res/layout/item_status.xml
@@ -119,35 +119,34 @@
     </RelativeLayout>
 
     <com.keylesspalace.tusky.view.FlowLayout
+        android:id="@+id/status_content_warning_bar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:id="@+id/status_content_warning_bar"
-        android:visibility="gone"
-        android:layout_toRightOf="@+id/status_avatar"
-        android:layout_toEndOf="@+id/status_avatar"
         android:layout_below="@+id/status_name_bar"
         android:layout_marginBottom="4dp"
-        app:paddingHorizontal="4dp"
-        android:focusable="true">
+        android:layout_toEndOf="@+id/status_avatar"
+        android:layout_toRightOf="@+id/status_avatar"
+        android:focusable="true"
+        android:visibility="gone"
+        app:paddingHorizontal="4dp">
 
         <TextView
+            android:id="@+id/status_content_warning_description"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:id="@+id/status_content_warning_description"
             android:textColor="?android:textColorPrimary" />
 
         <ToggleButton
+            android:id="@+id/status_content_warning_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:minWidth="0dp"
+            android:background="?attr/content_warning_button"
             android:minHeight="0dp"
-            android:id="@+id/status_content_warning_button"
-            android:textOn="@string/status_content_warning_show_less"
-            android:textOff="@string/status_content_warning_show_more"
-            android:padding="3dp"
-            android:textSize="12sp"
+            android:minWidth="0dp"
             android:textAllCaps="true"
-            android:background="?attr/content_warning_button" />
+            android:textOff="@string/status_content_warning_show_more"
+            android:textOn="@string/status_content_warning_show_less"
+            android:textSize="12sp" />
 
     </com.keylesspalace.tusky.view.FlowLayout>