From eb1dd58a0b2d8e90b80798532958244411c0a815 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 1 Mar 2019 10:50:48 -0800
Subject: [PATCH] Persistent media in multi-send.

---
 res/anim/slide_from_left.xml                  |   9 ++
 res/anim/slide_to_left.xml                    |   9 ++
 res/drawable-hdpi/ic_arrow_right.png          | Bin 0 -> 260 bytes
 res/drawable-hdpi/ic_select_off.png           | Bin 0 -> 1847 bytes
 res/drawable-hdpi/ic_select_on.png            | Bin 0 -> 2118 bytes
 res/drawable-mdpi/ic_arrow_right.png          | Bin 0 -> 238 bytes
 res/drawable-mdpi/ic_select_off.png           | Bin 0 -> 923 bytes
 res/drawable-mdpi/ic_select_on.png            | Bin 0 -> 1410 bytes
 .../media_count_button_background.xml         |  12 ++
 res/drawable-xhdpi/ic_arrow_right.png         | Bin 0 -> 344 bytes
 res/drawable-xhdpi/ic_select_off.png          | Bin 0 -> 2579 bytes
 res/drawable-xhdpi/ic_select_on.png           | Bin 0 -> 3235 bytes
 res/drawable-xxhdpi/ic_arrow_right.png        | Bin 0 -> 508 bytes
 res/drawable-xxhdpi/ic_select_off.png         | Bin 0 -> 4687 bytes
 res/drawable-xxhdpi/ic_select_on.png          | Bin 0 -> 5315 bytes
 res/drawable-xxxhdpi/ic_arrow_right.png       | Bin 0 -> 652 bytes
 res/drawable-xxxhdpi/ic_select_off.png        | Bin 0 -> 8534 bytes
 res/drawable-xxxhdpi/ic_select_on.png         | Bin 0 -> 8067 bytes
 .../media_count_button_background.xml         |   5 +
 .../media_count_number_background.xml         |   5 +
 res/drawable/pill.xml                         |   5 +
 res/layout/mediapicker_activity.xml           |  13 --
 res/layout/mediapicker_media_item.xml         |  39 ++++--
 res/layout/mediasend_activity.xml             |  54 ++++++++
 .../mediasend/MediaPickerFolderFragment.java  |   9 ++
 .../mediasend/MediaPickerItemAdapter.java     |  30 ++--
 .../mediasend/MediaPickerItemFragment.java    |  92 +++----------
 .../mediasend/MediaSendActivity.java          |  90 +++++++-----
 .../mediasend/MediaSendFragment.java          |  30 ++--
 .../MediaSendFragmentPagerAdapter.java        |  10 ++
 .../mediasend/MediaSendViewModel.java         | 128 +++++++++++++-----
 .../securesms/scribbles/ScribbleFragment.java |   4 +
 .../scribbles/widget/ScribbleView.java        |   2 +
 33 files changed, 359 insertions(+), 187 deletions(-)
 create mode 100644 res/anim/slide_from_left.xml
 create mode 100644 res/anim/slide_to_left.xml
 create mode 100644 res/drawable-hdpi/ic_arrow_right.png
 create mode 100644 res/drawable-hdpi/ic_select_off.png
 create mode 100644 res/drawable-hdpi/ic_select_on.png
 create mode 100644 res/drawable-mdpi/ic_arrow_right.png
 create mode 100644 res/drawable-mdpi/ic_select_off.png
 create mode 100644 res/drawable-mdpi/ic_select_on.png
 create mode 100644 res/drawable-v21/media_count_button_background.xml
 create mode 100644 res/drawable-xhdpi/ic_arrow_right.png
 create mode 100644 res/drawable-xhdpi/ic_select_off.png
 create mode 100644 res/drawable-xhdpi/ic_select_on.png
 create mode 100644 res/drawable-xxhdpi/ic_arrow_right.png
 create mode 100644 res/drawable-xxhdpi/ic_select_off.png
 create mode 100644 res/drawable-xxhdpi/ic_select_on.png
 create mode 100644 res/drawable-xxxhdpi/ic_arrow_right.png
 create mode 100644 res/drawable-xxxhdpi/ic_select_off.png
 create mode 100644 res/drawable-xxxhdpi/ic_select_on.png
 create mode 100644 res/drawable/media_count_button_background.xml
 create mode 100644 res/drawable/media_count_number_background.xml
 create mode 100644 res/drawable/pill.xml
 delete mode 100644 res/layout/mediapicker_activity.xml
 create mode 100644 res/layout/mediasend_activity.xml

diff --git a/res/anim/slide_from_left.xml b/res/anim/slide_from_left.xml
new file mode 100644
index 0000000000..8ad83d09ed
--- /dev/null
+++ b/res/anim/slide_from_left.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+     android:interpolator="@android:anim/decelerate_interpolator">
+    <translate
+        android:duration="150"
+        android:fromXDelta="-100%"
+        android:toXDelta="0%" />
+</set>
\ No newline at end of file
diff --git a/res/anim/slide_to_left.xml b/res/anim/slide_to_left.xml
new file mode 100644
index 0000000000..698746867a
--- /dev/null
+++ b/res/anim/slide_to_left.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+     android:interpolator="@android:anim/decelerate_interpolator">
+    <translate
+        android:duration="150"
+        android:fromXDelta="0%"
+        android:toXDelta="-100%" />
+</set>
\ No newline at end of file
diff --git a/res/drawable-hdpi/ic_arrow_right.png b/res/drawable-hdpi/ic_arrow_right.png
new file mode 100644
index 0000000000000000000000000000000000000000..bbc68bf0f6ae2d42b08a2a82c83a76393d17e8ed
GIT binary patch
literal 260
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbBI14-?iy0UMW`i(eN#`7Ipx`!7
z7srr@*0(bPxf&D%T+*#Q-9JAooy@zCKT*kOisYhJ)e2RcGevh#_*fiGO8p$Bp%m8C
zyeL{jiL2r5p1%HFZS&L`tc-7_yp;T}@|&F@b(sj`RsyK;W>EO~Et%m9CO%A$pLuoB
zwqI}7*7bx%w_kmh6<QY|nh~bDCUjzcDbFS=ja~9f+fQGqxw>K1+Zku>ygb(M!#ZO-
b;{%3A4D<gS+o*FE=mQ2%S3j3^P6<r_+52MK

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/ic_select_off.png b/res/drawable-hdpi/ic_select_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..644c55711f7057a035f65fc703ea5a2af8d25d3f
GIT binary patch
literal 1847
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

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/ic_select_on.png b/res/drawable-hdpi/ic_select_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..e50fcbdea75d345893ed7b6bb83cfabfe750ee87
GIT binary patch
literal 2118
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

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_arrow_right.png b/res/drawable-mdpi/ic_arrow_right.png
new file mode 100644
index 0000000000000000000000000000000000000000..0e3af28d8e2a7c0f3c03f4bba2b2877d5f01e7ae
GIT binary patch
literal 238
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GGLLkg|>2BR0px^>e
z7sn8f&ZE;BIU5XkSoZr}@Qpb*QTCu<iLiMGi&n?V%-Lo?K5*opXf(a(;PT;0$SYZ=
zj-0~9L0Sr?_iluBa8+cOIsf1>VScd8dit{LE3fX0Ii9l>5Ujb$CD@q8?ZUEHQAvVV
z@L)y<hm}J1x@Bb--kb`ouXkD3{^r-LU3{}%uPTTwTlad`c1u&9TZ{>ci#C@&=&Bd}
io_^`l9<B?j4B~aQ7qqwXx6c5&mBG{1&t;ucLK6T=16cb2

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_select_off.png b/res/drawable-mdpi/ic_select_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..fcb3c6a4ed39a9b4c99d1712431b14516e2e17d7
GIT binary patch
literal 923
zcmV;M17!S(P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px&RY^oaR9FesmrYMoK@^6s)+&lXXh6XRyk!F>ZW`jkM8U?LJ2rkSSoj~hYtj${
z3zGg0x2z#Cm6Z!qSSlnClpu*TkN{R}z2f`SJI$@$TUx#vPx59uGv~bL%$Yl9rk2%Y
zxo`~s*mwcO;a^~^E~z&F^eze^;gWD!2)lhXmLrseqVUu0|58g}HRY%PjANW#71}yG
zJKLwGrtbCi_4P+0ksGjYZ*PBHUtj;6N~PZK?Ck7nXixYq5L8`(NbeuPIgUGon4CUe
zSy`DY7K^)w0m7VgX3@pQwS^;ap+OU*8^iXov9ZBSCX*f*7<gPNl?rQXYws2p7qhus
zZfSmg{)=?1(b3Uc!^6Wv@p$}^ZQJ+5;qbN9)zvr2Wb)O_%*>Kh$co7ZCN+hit_VF7
z6BAGO_xCp)$N90au<%-r9%`JG-4w{obr<|*EQSuc*kB8X#(M-fgBGl*KY{`)?@p)F
z&$Qxig+d`eJw5$WW43@Ji1--E68gY=pv<9TV}mUmaA~YtsJR`QFB5kt?GK0^g7NY3
zCmQb+_y}=~!ysV}9dvuKg##`)HAZmE`wGS_LX3}%6uK+NIV)q8^$NP!^uhrboa)B}
zeE2Sc$Rd-IlP~m<JM5$Sw!mr{aW3_;V1um<7o2db9}#@BKym4JkJ_I5!PQKe^p6r8
zb-<+~y60x0Ut{>H5>nEtB6F9syu7?@(nT75(^X|1+`$%(7@Tn9L;Y5v%xh9hCrpLY
z8E)g8t6vZ(t4Eeo=>!S3a1_M(7H)i~UpWm`0Z?9HlJZA22f|65LxsR`AkGhTqS5GW
zHNF9aOl{9*vzt=lf;p`K9GBDT>gu8%@NHCWf%<1Fp-`yokZZ*2$!r0G4!0VUi9~|4
zUx|{j69|q&BO@b}V@tQ?mYPa-y#bWCQc=>SGNdN3V4%~05I~DK?_lHl;9{!E1WHXg
zh6H8gJPOgQocR_af?&^^T8hhir68Ji8JR3J?K&m^ve48Ai3x%W<XoO)tk_Se4`iZ|
zN9mx>dg3%5r6wS=9lQw|d6v(e#<ScTgvkc4o5~*(ZZ-E}vGV!+*2c!hr{nxF3EBb^
xfN9Yq5NgG_{xvfJcw2(;f;sBC7mWQM@*BE{J9KS7^QZs-002ovPDHLkV1h4bv=0CP

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_select_on.png b/res/drawable-mdpi/ic_select_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..464f1fcf67cf99ab906462042e23525ba7cbf59b
GIT binary patch
literal 1410
zcmV-|1%3L7P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px)JV``BR9FesS8qsLR}{Z_`D<e4pDdysDOQKdpp3!lHcD4!_m5&{H)*Ts#$XH_
zjIj><;QSy`#0e9&5BsnWwcq9x){b=!I@nq}DZ{p7Fkxz1O_-haPh<XQ;`1f%W#{*N
z@A(pAqixyPfs=dRz2}_Yx#ymH&kbY$F&XX?A9|U(DH;Rsh%$|Ar3^Wa*hp+5wh)_@
zZ)%uGoFEp6lghV5ZBB=BIiLaq%uehqB<k$!to3+2yIn3<35~H}Ft{)?GxHaXUkek_
z&@yqH7*1`=5t7?P00(d(aRnKFb7ErR63_E1sVxX|<KyF(APXHu7dEzB=vEU5Hxvu%
z>+7HB?d|QTuC6|~5aorhZ!E@toj2L<@D}r3J_R}UsLdcfmM0{hDM`k?``mW7(`K2R
zoV?Q7+Io6uXy{K8i4d#NfQm-h9Kaa%xVXK&{e`x+w$F@~yy8!Oy0h}#jJ;raP0FUD
z8FX5?RD&lT`S``Md{J0k>gnnEsJpxSG6^gZBS+Hm0!gJO7)O#768Iqs<(b<N!Tk1x
znCbGY$u5YgdxFCdWd2w(*?ykprGp-hJ9_w~22m8pMn*<vF-@H2K&C-Bluu!Qs=vQ~
za4se}PJW-vTZ~I`sA+CT<hFCtS4T{%r4BCU^?FaxcKl8TR)}$GWYRl;zLj_vCEFQK
zdF6rE2Sdykk|VM%eILKo#VmRLcoCZkOpVmk)Vxb35Q#NnITHFUK;KDWuWM{<JaziV
zzn2kq8haoLt}-qf4o8nYS5a*+7=9Zb9uAN}Z7cMll^tkmYI+CRj)Z$4WSuf>EiUr{
zY}2rlSX;Q>0W&U{^78Up9JO58uCt%ktt>XNAG}2jtxB-fe|<3y+rXf49C4Xc2eAKU
z3V*HDYIWe8EAu;Q06NfE$lMOq?1uX2g2@iszyKDpoPVmM>;SG;sNj-8yAx8uQ<PiH
z-$dBd5=z1b-CkX{sbFk!0Fp-aZdY$ORXtl+)j6~(xRgq<CV+?1!66e=ZcPOvYYsqe
zODb^~<?sSbPkQj?a}hS31zayLNvKU5q;3I5L{v3&aJQpX3E^x$ha$()oX~?e<p5W0
zhC(4=Xcv*{04{|DN-99gYyt{L8r>o%yywHrK-q#sd%4mow<5w$;Qkyd-$lg=1{DnS
z<%>wpL<Pw~C*<+Dxw)%fUR_xGe9Ts?jHfkKE)(k~2V8juHXoB{&%-Pb))tf|tN%E)
zmtT5se~GoUv~)i`8E(;B4D)IP&`;no5eNjXH9zgPqpD#rlYGG>J4unaFuAsEaM*%P
zzu&JuShNW19l$b{2L=YtmONs!prmGktKXA%lkCHb(QU09I<N(sgM))-=@YLdEoAyF
zK>wi^qpBj7{Px85iV@+<i6PQ9_})0$Q2+dHj=Shjnc|7u?*J%g63TJkVKeVAiqV#q
zmJfVB-!#ea#M&v-E(D#jNP;U=xo+YyamXVkMrTDX$fxCtPCR=TD+hSF%g%Lmb-mx$
z*EdR%Y2k-vHV2S=NqWJ|<0bQI-GRF1C!KjHss5P7n(I}Bggd@xHS)!4ZVOfpaOFvc
zi$ptq00(7r0ON2%z%y!WZ0yRjwfpv<o;Ox;LcSP{(xky?G#L^pW-uEKtjxhlH3bRb
zScMS%^p!&H$X=Iydg|sc2)nZKtl$8;7a=K8G*CV(IyySu+Rn2aGLVIiqN^1i`rbtP
zQ?O~01~8AK3L_}d5B-lxE(ZuxCe;ya8LH90_SbA3e)BIJ%5)xi1O9)}KbaJXQw2Fu
QApigX07*qoM6N<$f^GGb0ssI2

literal 0
HcmV?d00001

diff --git a/res/drawable-v21/media_count_button_background.xml b/res/drawable-v21/media_count_button_background.xml
new file mode 100644
index 0000000000..a5fdc45a06
--- /dev/null
+++ b/res/drawable-v21/media_count_button_background.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/transparent_white_40">
+    <item android:id="@+id/mask">
+        <shape>
+            <corners android:radius="1000dp" />
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+    <item android:drawable="@drawable/pill" />
+</ripple>
\ No newline at end of file
diff --git a/res/drawable-xhdpi/ic_arrow_right.png b/res/drawable-xhdpi/ic_arrow_right.png
new file mode 100644
index 0000000000000000000000000000000000000000..510690366d5b622791e4eb47841a2ce5ed91819a
GIT binary patch
literal 344
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC&H|6fVg?2=RS;(M3{v^Pz`)4m
z>EalY(fD>2H`gHp0T=ao3(Qx#e|RBx@ZJ$=7cnNbWslTNA3Cy$o!Zh;>w7sZJosE>
z%G?V#{Tmidxg?aRZnZ*kfl6Jk1e0L*kLwdeIPWLT5GvfWrRQg^%-)Xc?~E^2v6rPS
zeC;#CvDu)REs>4)5RX)gqzQ*{hCtc{g)<8ru}id-sTQ3p_Z0VxPIV6~+14GOu`M(z
z#FXV)){M0_Zu2wW@0`{B!*@aa;urjqRoadB&Me%1`9%|3Y|x_as*-5dyEmM+i(Nb$
zTT(6im-+aMC!giLPHDL5Ee(0I=-Ga$kkF}B>g$ymzO)3qe^M%Pz~k(?BLSXO3^Ts>
Vdw-MW>Hr26gQu&X%Q~loCII+ih2sDK

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/ic_select_off.png b/res/drawable-xhdpi/ic_select_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..2368c9e3d6ade25d017ed9d7f7287ebde656d53b
GIT binary patch
literal 2579
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

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/ic_select_on.png b/res/drawable-xhdpi/ic_select_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a83575aeb2fa1a017eb9579a72dbe31caea5bc3
GIT binary patch
literal 3235
zcmV;U3|#YxP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px>T}ebiRCodHn|q8@R~^Ui?99HP`(lB1d9;fxj{v&@U5O|Ui$xlxK+?h=B$_}I
zi>6{tN~y)7#gJ49F|EY<28%@tHAqwCu>}eeF@%=FLO>S_!G*1|%gnN{kJ)+n``o?1
zyLX0pvNKDK{F2|EbI(1G-}igY`JFrGoHdNQa+iVsYX)5XfSxwA9Sv#L8Rt37A4@b&
zsBwLl(J<PGOjS<3PR)^Llr(23kG6y)23TjPaU~+-WMq;6CtwBY7C;_LHBN|Xeu<jE
z0T*;=K;o*TXN8PR5THP!LFbCmd6wo|A!$m8jtWUK!2uAU-In?#>=GqJNr#YFWJvPu
z3C8qA6ukB-00D~@s@B%lmaksDddAqXW2?){%SV=!lvL#9<qhz7JmfI~fk21f?{9By
zZEb34Y5CW=bLUQP*s$R*$B!Rxk=Gp#g%A`nbhJn`yMBTOqQ%+U^zuET<)R}*$B9l|
zvSi6)yLa#2)Y#bgK`0dJ4yP%Up)7S!7j;^7(*|wPCT&B$`W1<0Ulcr}haM~utq`pe
zow|7O;>XXPJzFPugK1(;ls!nD)J+>!TeL~r*nlm!MFL>b5$BMH{Q}W}qQ%pvPapBh
zE3Z5;Wy+KVZnv9vP6_Wl)zn&dp*!cQKiA{!%JH;zd)&>PVT?8g7q~*DdBI?jClDM~
z80da@RBq@C)fIq?urC-4`cIrV@z%<fD}QzL=+Q=be_iyZXs0NCf@z^EhD4J~L<32(
zD|pxjAj}twmTum>`HM@JE`3(!HN(=D9mg+w>n<93?_J9qaIGT}jGZY?WKf|Io?7N_
zpEt_zKVCb$%$ZI6#f@#-w*7F~vSojkbe||h;42^jN0~ASsS*$ko?fSi$_^bm^tD;D
zW_?BCc3sljzD=jx15UTNqDO*cOJ8aRhy7o#3AWFxt|)bs4j(>z__f)yXTK_GUeQ)j
zMnhU8*hWjic%tBOHh6avd}U>2MO|Ipi&a%sv$f#qMqk_dBORW<{kzAzYkH=_Pv0Bp
zT=SWN?n(ET6=|L4&!0auckbNpUc7j*Nz#-AR*ICSLn;I?PXSMF4iGIB@WYNBJNDBd
zLxzl(XHyvN-#?yT+SV0LrA{rDc37P63a_p0@;+8Oe2^BtdiCnLY15{y5E8CP8dIWO
zRDA;97jY$-vAl->8@$8^H#9W-z}fTb_gwP+x?w<RD3o3Bio%`a3NIhi?tA```)%LA
zNEkC_%xcNgEb1gdzaX`EL}+^9h?L$3z@ysx4E<8(yc7IWJ1@8W^6!OZ{RJNLf<p8!
zq)po98NnuOlPG=yTj?}xR~!<(Rmc!ebm%kh@$O~f?H4RuxbSI-Q>j7Ezwu!K&hU;%
zL#sQ#-PhusSyjS{WIXV|1D}-Xd3o2aT^Hn$)gbz_nQRdfj{pEd081W~m&iI_xpCvh
zmt~EI5Q90t;bdWHINa;~N$+nt>CGz`?)G{o3@gS?*MtcZKDB@U{=M=Q$%>%AAL9Cf
zcvC<L;M<;xi}=XVbslez!|TssFE+#!ro+19`DLdsdClp7jo2!gSt+m`4B#|Jt%MO0
zj{q_;I?QEHK0!ah7oL`6smr#v*S1m#ugl7_{;!<?H3eI-Ssw5OV2C%;O=iqOjz8M_
z41be=b?eqWsh_ue<Ya4|ci512RBS5PTi=BDH?S3(C8`8~CFUrIH3F0XbNI_Iu~Fm4
zkDo)u$d6CCsq|whKasCbH4K}vU7iz8gLnimWLQQDmoH!bkc4JF9N(E1mp#-Zz2C&;
zav5kMIo0gSdsA$*^5n>G1#E`^=aLvvMKl4lfZ9KJCQX_&Lrd(tU{<7${T2fJrO)4E
zYBCb`I&7@2uEusH08EO{wmq5vUXW(ae|B<)4I4Jm${l{+n`aL(D=q7Rf?qPRz(64)
z5eb%!{2DZ{9Sjo1m#H7%l`YW(zz}KX6j-%t)l6xOf(F0m)BQ<HxxR=Ke5&<e<G%VP
zeiT8J2MiL`DF8Mw+7e9wFGvG)t~iov5|DQ;1R@Idq-O7LEbwof=`^0(f5VWiql69b
zci3uSz;C5I0szVg$Q?X*@Ca?`KYmZYIloxoe=p#_odS65z1-2eBV}R0b})f0q9db6
zfMy`GySTWReK%9s#?pAA5aZF?l~~|^ce>MfK1J}f+ZOO(zbO_56OSY)KI^TuyxC7Z
z5uGPFY+dU+_V6?wFI3}`IjUskads-(1pJx<$%nn>C-nN=wyhQh8<R61@#tRFt|QFR
zeS0$M1}5=XqTrpzr!rr)u2|)_)pr`-IhY=J>T9t!TZvm3lmL<xBk`UO95a^Wj|}W2
zIizMsmQ<E3tuT||sWTN@we4shpzf70#EFe&EH5yRuk`Vj5YPPFJ2#9!oMk(%M^Ygn
z7Wmh1v*)#4r>zzS=dO@qG_yw&K%!<2aa^U9mgEN5Tu3M(A>rA&wv<VT1^&0EWY`~Q
zOS;r0GQ?@CU|?Us#uQyHngG~A0UNx2{d$uYD9aDA!;(~#gq`OSkAzs@w+i?d4%)k1
zN!yB-!D*|UH-04fOgs`QKD%fl0=k=<n;SLf(7XV<D=7&iJhQLO_+uOrVu63{WT&w<
z1K=^xX)A}VlB9>Jw-6A$3Q(TmLT`7=DQ$gCP0f4~A0Fiizj={ZYGRTg(;-J3<AQN~
ziW}y)yq0#Z7QYej-+Q<3J+F0RtHwELmU!H)F^Atai}1`>6TkV(<%h%=+5dk_dJLk%
z5B~hBk?!vS*}^t{G_S~bbZid^Qcr|zIoV;n`0kB}w7xuWr1sudhfsw}9CJX<3l_*R
zdxJc4)UNx4HbK!-fPy*#x;US|a^=by5=C4O4(fG^JxR&`%ATF^t-Wo=+yChG30i9N
z2bl#=y_St;$6~v6$AHEe)nJQ|XaaPOkeQQ}j{5rgBU)l^rJ1IWDTk2ow2<(phF%f?
zzwS`xdR~oj+GyFH@X$1x0P2ARyrxNjoCO?|xXIjNIi;Oc9wt3)frM}FX)~UD`?~Sv
zovm2`k8Rj!85go_R|3Ff4}Ap?j{pGUI6Ag(-+n<H$pJ0!l$_FPJlzly_WiTVICAN>
zI854{(>83zb}0k_U;$HF1TYO4vp3hSUHdaGCrI3wS5r|cr?mDLB55B7!6t0O7Hq|4
ziQ@E}^FJj5r~_fhm;~(DvExH-W|*n+XU&YlK#`o%>hqlru?3sd4s69{c~%0z5>sML
z0Wt#4o(2+c<5~(gGk7^^L}}3rwOzg(Ii=<KP6{?)3pQZ~He#zp`LIYh{K;?sZss9M
zoZkp8Icp1y9zFWn<jIpiC;40x<t*-ox7qi8OD?;vcTAob+u>U=Yot29@Ybzc*KgXi
z>6jSAz99Z8?)=B-L<I1j9@buV$*Jp=IdkR|$SLe(Ue1zJ+4D`lHcn}I?r-_h{r<L>
z9vx|)PIF~u(V|7KiyfQ|Fj|?yF}=T}o8s(cO>>64XPU69%I*+O=8j*GVAyj(Voe4v
zNF*ab@b+$#OWY)(@(x~+!QnCI9qYZ(mn$;KrT_#WIu*>&=ks-ompwFp{`^sc1`Vnt
z13qEqef}F4uK7caH*>PGgUnL*^27O^4~-vc4|}f0$St*JtV>c{mvi0^(&>wdF(s7|
zKtb}M{3v2N@M8%h;$D;E5H(Zhh!e}h-QTDQ-qdwo+C?&QO)k|D(9>k^NMMO%-3@Np
zvgMRaiObx~&?EG!dy5K|)(mtH_xQZwU@+thxN|!KDQqfgD-!an?z2Pv?JETM`bR1T
zQm4LVsl(e_4)2<ztH<YK4ZC#2YLU2Msv|%v(2)Rfj0B8gH1zqZEZbP@<P6E{4$PIS
zveMg(un7CIaaC5@NLw(9m4WHNHvooKh*pXI&s~-ln{P{$1RV+7A}bdiAv#Xfye_|I
z&z?SCm#2<wUYCy;Vq$o@LU|M-P`p1MMJS`gRF0@QrRAW~`iF`8II+=#7so$Ld}RH@
zM130nFp=_n7kh4zz7jx%N&+EM10t9nkb$2-A%u`Llsx1`5u7T@R~w(MC=QJ;IYN{)
z)A343UIm_Xsgt~MB@+Z_<xV1^$$$`4M+%|lr@VrJ09C-Mk`@iRPr#)<Q!+__)=8+~
zG}PYanYf1JRZ)P>P~%EaMnG$Wgcy=-Q4(m!*`71bJ101eD{$W5mAeewWgznm{1-<k
VPxob!_6Yz0002ovPDHLkV1kIACpiEB

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/ic_arrow_right.png b/res/drawable-xxhdpi/ic_arrow_right.png
new file mode 100644
index 0000000000000000000000000000000000000000..daa544853ab5109fbb5398452799eb88eb817360
GIT binary patch
literal 508
zcmV<Y0R#StP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00009a7bBm001F3
z001F30W(;idH?_cu1Q2eRCt{2+tF=<KoErCAr+((x8PD!id%3e?%*OUkSrr|b|iM@
zmv1CqK=Q*U4$SV})LPTXe!h0EjNCJTIvGHn44_WRfTn5so{!Ci@RR^8FqiqDAsr6%
zfOA?76w;wUPdIB(NUn!82I)|s*4j<dS<-cL5rTC19YjYeSz=_QvS$z#sq`UDL@Ixa
z(U2^!c@mQCW0itr{hB8r*~=a2ND=j*WTcpaSt?RgMKKX6uH>4A6j_r_LW(Wgryxal
zH4>2G+dgh2L|@E_glQbQkWigf2NJIJT#bb6%~v8}hZm}l(9<0+ApLC4z8U=ZO9$z*
z@1Tm{fp!KY*4#E{-u->@lxqiPUUKJU3I03SJE#IjRG=yx5rHakL<6eE5edkFBMOiU
zM+6`zj?#hLI7$Xez)>nt3XT$il5ms;l!l`uphO&{0Hxw60Vo+qZlH7=Ie`c`asg3r
z<NzY!s2Yfdqv~DHG#nXrJ)>}B*!BFJXdIb#J+Fz!k@0^J0!OA@&lnt4wVofAnn*aR
y?9H#kOe7r9hZia`=7TyJK%ESrP6p6lk@O4U0%0i-ZmMkn0000<MNUMnLSTYW$I*!Z

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/ic_select_off.png b/res/drawable-xxhdpi/ic_select_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..a4bf4e53d98f7fb0e74fc5d0d52dfb4dce736ba2
GIT binary patch
literal 4687
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
R<VpYl002ovPDHLkV1mO*;;;Y!

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/ic_select_on.png b/res/drawable-xxhdpi/ic_select_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..51326566f78b9f5c49f7402cb99de12802fb15c4
GIT binary patch
literal 5315
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
V+Don2q7wiB002ovPDHLkV1kowHe>(*

literal 0
HcmV?d00001

diff --git a/res/drawable-xxxhdpi/ic_arrow_right.png b/res/drawable-xxxhdpi/ic_arrow_right.png
new file mode 100644
index 0000000000000000000000000000000000000000..f7ce1009b801a59f0e747fcc1920a120ec02ff06
GIT binary patch
literal 652
zcmV;70(1R|P)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h00009a7bBm001mX
z001mX0e5<IO#lD_K1oDDRCt{2-Q8`%KoA7raVkhENeh&aQd0tykWSLUMV5RD!a@Pb
z(az6~<QI6G53nuYa?2P4ow~eq_qAz&;xs^U8lX50P@D!R4i&(%EU)Xad&4+109*0r
z^+-aX0JtjueLG?h$^mZ5pNT;z1-MiGOaub^RggVGDZm)x8^8&`*Y3^VSR<5w1JV&F
zeu9z_XwCtt2vjHGL<G94pfm)^%g`hQ+WUYM1nL{H1O)o$0qzJA4`iGXWS)q*B1k=w
zbVQJQChUeF`B2^oL3UMy3xf2r6bA(PbwTO~77MeK5o}h*sUlb{O;kj%TN|o|V7WL~
z3Bh)Cv<iat@^l3R`}qKNgoptRW`vjt8CHa-5hX^1xEV1vgvcR1CWP22Nfw0YF;xbH
z_&MPx5I%RW9+3XKnk|3KtIfP^V236C8&I7Fc>L3UIr`I&26(vq_5AR$d-Z@s13Xdw
z=|4XGNCsdiAE^K=<s%V*seGgXu$7M_0LJo>0>D~65&)RXhdTg!`EUkMC?Bo>D&@lw
zK&gDV0jQM^CjiCr;R2vqJ{$m)%ZECEdihWWa3~+D050W25x}W@r~$Z@4<!J{@}UCY
zT0Rs2oXZD0fP49121qC$tN<zHgApL9d@$}KmQ+4S_YsRJAEf(;-HToMAl^spHkRds
zd>^qH+wviBCv06l$oCPmFCWDFh((kSra9rO^8r%I2iu_b{5yb@^3jv>^@*Pou1*6K
mrvZx70L5v5;xs^I0Q>;ILD@WWZ>E9(0000<MNUMnLSTYQ77&&I

literal 0
HcmV?d00001

diff --git a/res/drawable-xxxhdpi/ic_select_off.png b/res/drawable-xxxhdpi/ic_select_off.png
new file mode 100644
index 0000000000000000000000000000000000000000..da08bfe9a902ffd3e9198a70cbf1a99ddada045c
GIT binary patch
literal 8534
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

literal 0
HcmV?d00001

diff --git a/res/drawable-xxxhdpi/ic_select_on.png b/res/drawable-xxxhdpi/ic_select_on.png
new file mode 100644
index 0000000000000000000000000000000000000000..177ce2507211f16676ee9f64faa52b099fc0bcbc
GIT binary patch
literal 8067
zcmZvBcQoAHxBh3w=)JdLl<0&=!UP$;L>HphAc$xQL9{^x(TUzmcqP$$38S~@y^j_q
zI>G4I`~9u;TlcPe&syi~^VivX?X%B5dp}ROwx%*E5fc#r0Hn`U6rSHn<iC>u?{4it
zSPk3>(7Wf#azN=26axUTr_U5*^}Im4X2h|2lc{@I%EJ*W?BpQE16oSTE)}kNj?ZkR
z3iR%dLLopC6^wB9N5p4t-1MI3ub<;3Oc*=cRPZx}*Tf)^I+UIG)Ykp@T9j53D||S=
zM1JM_Wc|GL+%4PQpWl4HEIGb7PI7IKc{BXvOzL)D`u54$>Ca89@00##Y&?M(khfI5
z|6}t|4SZuhXXewoV^z0EHcvIzQ9Dp%QT{!suQ02UeEm&2Sw~ridO{e^8`AnyPFTl!
zcz^$#qj^X?DT`Hl-zfJ*+pa&$t4qcnkp{d3e^-fus>@yP)R;q~!AwY;Q`9TTzEK4B
zr$i>XzvOJ2?TnC}w;uRyw;hXcZzEloSQyf=RCYLFouFxj*Jx95Mw7|jbekp=UYBtm
zXP`U9561n@JU{MV+c%`a#u<Iz;;I*C2=2pbI;|O`!{L?Yh+YZZrU-q6j^tF9x>{eY
zx#EtlXDxbD3A{%=);_>dClw9EtCQph#zmx`K*(FUk$7VOl?tiY)%#GXNO@MQ4&usv
zHHy9S3~n0%mNA5U^mhe6J9s=|FWGUhEwWY&2!`6K9@+aH1QUem1K7v)5XR=Gs|=wc
z*XzHAMU6u5)%3Ey^6mE05<s%JyJuKZy1NFc<+KrV9!f;tTzxNX{C2A$zWC_Rn3`}2
zK*}oRrC?-abQ=^DG}hkU9v>!<B<kzr<izeKTYq|b`n#~OFrg=!Mbb;gesd@j-`sm6
z@sH=S-&w)ENt7<AcYa;sS`W{aKUN<vJUW+E7XqdjPa}aCmi-2ptfGxw!K!2<IB{Os
z{Jr1lF07(1OU(j3QOuqpXunkCQ-#u^NCm#v3b5M!nToai%`Bh2;FIm?X_XbgOcGdP
z3Lo#63CR%!T#a!Ll}fa_X#;^A%2bXiLd_nXG7WK=7_gu}K(5S1u;6#LxEY@Af7nH@
z#V;%@tz2pw$;8A&=6BS`W1|1VutIiW^Z5fL4|YxqH<xOr2p_2#dTOUfNPx#b1fg`D
zz?BZf-wd11QEp4xR$K)qaBDDC+w{dVbE~I_c%V^%^v_IV#>1(35PrAUXW~L8wL2$w
z3p5!|7G%tkp(?8g6p3y*1fm>mV+(!;6G(wJx4NOG+@)ppRh^`?2JCxax8yKp;l1=#
z?%}k@+e1$CwI#b-TLd9hUq-~LDV-G4Ih~YYBlLd>{p4Yz27ej-LP>JAVhK0oy`N2B
zw00s{H$*nLRxiS~g`LacDF?@$QFNXS^)6xQQUNzt-c6qS{xwxqRgcx&VjSt_K8xk=
zZpjx2Z&6=-LgbZgJ-i@el%b0y`~oCVROT&orX%FIF!z#%hqOB!_8bUDyi>d)@giba
zBu{_Pn|rO44hXki(S^%@(3;>YZ@!%k{}dDRY3^*&V;$yvpBFy$+;C=LZ<v0Q{5|$+
zP^4S#tLTmDk>5&ukZZk`Y`wLLo6r0~{Aukm{<=r>)24dM_H&$pYdMRrr+??!>8utr
zp1jLitZ_6bStkkan2;I51QIL#AcqTW6(h%kO*Mr)zUn%gpei3@fq3-%rYABcPP_T_
z<TqxQpC?m3pCcly_|3+fd}6Xc<bP|hRyMQh>p2NgBo(r%ZS!C({CFL4y`qL!9ol{B
zL~0gb<#5wUjNj(lRA?z;*z{^J&F<B3)^(Z<7~4irS4LegmcvnCM);hAE%=^cDK(bi
z@WX@&dfBaqB|k~nqQz^b+)5<5)ZWL#tmE4*>5AuT)k~-|Nk@A@rc%<SWErBVVP(i|
z!+TAMjMvj-C5}_MR>-(|i(a?|`?6*|m&)D|h=|qUV$*iMM02yqDjQ=@7RVE{&<;lr
z{-_z0nm)1JTWBEf#bNptPFS4(aN+!~3I3m3_wxGTJ!5IXXECEGRqajz;-WLI!|QR^
z$5%H6M7-qbOxXc9=N9)3%Pp%OH5x%_K~qS&HUyU|(Fh$om!D=0xLk@q5YHmrcVI$|
zTy;agbhtZ;nLZjO?XO?S8Zsv#;a_!*E>0%<axySsuQkPO4rAB1dZnm)eOAUiT30V3
zjY+fJo+@!H)JQ-5vLGj>%BT&|BrOMjaEhJ6AdwZY#T7vTN-Xr`>vNsHznJmixO4wh
z-nK0p+S^yhfpg3I0=oe}8XjVJ)%5ix%E<W!wlh3s*ZM+qmAK4W39vpkX5}^=pGZRs
zG|C}*5M%J=LmVfNJ#FJ;W<lDYTz4?JGt)V+EPB>H(79m2R_N;8>VG|ySk8HUK5kvq
za;BOPuuC7}mp1>r>YsN%1aaxp3ZeoK#)g#*--=Hb;(r%@4z%5>i&Iro!(V(q?=;=Z
z`J24XWqGN9>MO+bMOMD}3nEJ}%(i1k9)Q4zv}?T%SKYJ_=j+01s;aKSZwjVPhobSP
zS?w>*Lj#ZU2dAzp9+=fCu{xb@mK7i2BW{npI!@@5=+`$>r||=2a(ufZ8K-M%YxjQK
zjf5Kt-$9I)x2JCI-QiK=oG@YpDdLy^taZ#&F*nTE*O>gZUdy~p{69>$4t~0_8_6MD
zE9Et@kGKXd;MLa&2_cHiXSk9rh<}9O^)3(SP;U2bwUg9SMK?ZF5cr5Y&FOIx0&tcw
zT@V94S%YVK<9FZ<1da+FC-?MnaS4oxBR@Dy{-HaNz4$igG`ByfrLuS1c|PM?uh-RK
ztZ;x?Vwnhqgxk?J=VcpFw~o2F`AX+qQmd)1eiLN~E*#Ank8wN*4r?=Dk7-?`73D9g
z3XU0ty#Rili(G~)-NcwLS=>&P#)C>&W~HZnzEqL>eYjMS?W<Vp*)B4lfV~ap<ZWB;
zODHQXE%n!$f{?}|k?CHhH>C>h${+%%da>(_GeZB=AE(NeZJUoa*D7|~CqvWp19WyU
zgeC?O3*+AFe71*69Uf8QW~S!$ADSaEGV70ZZp?oC`1Y+m6U0iY3)<2$5(mr;!td@-
zx^XVqq}ku+bjQ0NQ)aR-AFvtoxFpenjzPoPfH`^hoSW2%ytLj)1%*ikIa4afuwMJE
zoQ%;gupi`7I#W_FvVQm@f!Zdb^o{oC2f<EVCoT9R(n2)R*6Z2fXnC}W!pc5fS15@(
zfSx5_jqQ8<BUuE_rYp$7Zf)q?3)Qq{mvxy)<dZQ_K{p%(&xXq9A9{IyYfkpe)=jWH
zU4}zZ0jqZRc3pl6EO^$JVoa<rnD)s&k+FO@?2Y66K3!_oWC1C-<yzOX)MFKHR}TSG
z_};(xLECy&@oq`W|0qHE`1m*~vm<C<J>@tdu;NTlmTk0M+x&HAx##|p=lX`8l&BaV
zD3RUhMfWztpm{IiLIb@voN?3<N`BjqvG|#2LN+0End5~_{_Nv3$7S&851slqk^c3t
zs|dI+_TW+xum0i4Ez8ykKzo;g4LE`c_laaFW0Q4(O@Bus)a|(@dX0U!%rj|KBL&Jw
zD8t=EHU(OM2MMz4HlX;X9E2#6#f?51;Fg;J>g;nwG%Fgc&A+U^&3tISeC6XNuU2F*
zV9j4@&?U=F-ZE+qVN8|4OO>mAOR6gb#bdD<#?9?k%3F-1$7QoeL$4vyuR#Y)$>Zr#
z<Ym$`%|)kweM<K=zbtB<Jj*OQSV<=TBOQ_#B3Bq&qJSbA0c#V6g?96%iO2OsfODX)
z8ILfdF?h6nYO$M2ODpno4DGESw#mM5`^|E4k25kD*0ok&E&lA$Ol>5amFs>>N{3Xn
ztOOVCbi?b2WY9VULI8guZaED)PMI}T$gNv4qUVO`ev-KNKe@a-%6Nn_N-+^XNRlZM
zVR02^AS6zCf$wAU-c1!}S|l#pQ>e_Re2j3s=gM##kHNH>DRjj)I+N#0J098)i#lDq
zLFuM{KcsVm%67-rn2xB*NQG&cB8muXT;(TtUG<fS0ZSa|YmC<Z7rS}wFoyPg^X5Kk
z>Qv%;iKurk{4V6*pMH#eU?X&xv=Bm#znWK3X%|D>qyx|pfR#V+gZPy=i4Gf*q{>t7
z-@w}?eP?f&3{3N@*zyXCAMQ&pN!gnc%S^>KJW8NrFq8p3Qrg0;2wqlkra?05FtjP#
zPBa58lL@V&R`D+hT=rLShf;b?Q8f@Y$@4OR-0LMl<)>d<R5-El86g>U)*>V`F53ZG
zMe88fFA1+dG;Lg+7CpK9#>Z!RV(3kj<P61-&+px99*y0Oo(d`#Bg++3pgvMRtv<C<
zd2N9gprZCIh|vN2<_X=J`Ux559ie~v(Mnl2E8_aYO!@71Z>ZM3zr%*oRwhgAps6_x
zNL2~}K?pP&ty}`M42yfvSnT}$tIS;Z{;MPz>h|<^OOjd$mCPr})9DpyB>Z!)xd7k_
zQtBl34r9M^`=Snt4GduyqD3BSvWwY;3B2GqXh`B~5$~bAa#Y6kb=Cf;$J+*b|ERMB
zhpi`Urx^G^R4x#hKeNaSi0TsNSV6CGXOg-c?8tn-ZyGuZH|Mn3ojv~wNmN#g8V791
zNeU2TDy#C%Gc?Ls>L5c3c+KZT8cQu!-M*v5J;oaB!$7SD8N!=mlf^2?rR@W3vR}{P
zYeT4_2zm=&j7eaXJ~@W6j|RXP62RN=g;Af>RV;bV73S?LcQ7C1;gs0oon_|BU!qZ#
zIkZSsnFT5_&Ny%mKy{^}X2%!QT<Xq9Z6CdV>``BLv536=O<&S-X^z-%bl6{tx1TOX
z9^Qg>!nlt%Q1=k%_g9f3Y*rk3ba7Q+M;PKf9`{&_WQ9xl%@76kEHREVYFQAy+|+W3
zmiL8C)6zuPuT>MwuUKg*JOgvFAvz<ViVS?IU^Z%EtCgf$D{3X(@R=m87n1K%`iDQk
z#nCPorb;bHVc5rlf<7L3D`^`?e!-xSMIs7u-6Z=AdR)uEBo0gbA$z|5;HTbt<<s7a
zLAOsITo!|~<rX&B<_YMaIi2Advr$rU;4LtEns(jl^2MEs*gl$N=G6sctB#Vt1S<3j
z@%`a`6h#{tJL4uN7RA~A;EM_<Ha4|Qc9f|6Y|lWaqID)pK&;U7<3doY2q|Yal@wGE
zC7%udY?+JCJ2q1hF%U{1Y>5G1S7Jq4+9OM5A|HEjQnllIcycXHa@T`yPlk>Ch;QBd
zr<3xYEKf|O#TtP)3_H=*{Vt!?UV&1S>75;z5HHsi2P??4$vmgER*L>qe49Qk_m>)R
z%Tq_jG%~Z;Ft^E>0IM4l>-NpexRzGy`mf&9u?i`AmlNg_y&w1<lKrjcn>ka#wr77`
zF8?)Wwg*0ojbld;Jnmsr+})ebj0?GNN>m#E*IhZxtO*AXiy?&<yNli$sM{L>%;U?(
zq2KST-f$W!RE&DZpa0~Ssg^39z}kGCFH@p^-<F_)P1O!kIH{7P!#ZRg8_|1@tl-TP
z68~1~Z2AF&6KR~)xbp`xA6P8%a9W^T_SFaFv)l&+bk5E60ch1reg<Y?&*bvC9?prn
z@0?9fn2FRwsqP#@3%bqj+Bt(@H7h;Z+u3UCdCQ1^#5(BEbhv;9NBMRw-;yKr3p(rM
zq{Z{pPKj^<d0X^Ts0H?y0vns1@E>arIUL1_a)_gYwhMr-l^c!8c=uF^x$1q)e!8fo
zC89{N!o=9yqu25=k-q)C&uYa4BfTm}Bt7$i-hAS&fa^@S*?>7i`&e&%45K<`p<9QL
zpS+;w&b9zQI%Kv=Ev2BK>AlQu{^FEHet>8UH`J{<t@v-7qSKH{s%U)}aX1%tXzs&u
z6MkmIUVj>j7Mop*-Aj%WUWV7(JA6oh_lX55k|3N-;?+U!xxCa?YU8e@S;g@yUw6sG
z1qvtj)^Z@k3WPWD99*uXH;%I)#J!DscY!+xW@})P?CjFvz_kSR(%@$KL%%T?q$!xf
z*`&YfB1<`E=uQ{8R1cPN_l&^e=(3L9VU7cKe4bgQawPb_g>gzOZmdb#C+f$kGRJD`
zkt{5lHOtR~k{e4Q&M1qfqOP+tBRs_V*8fvUA#m_<T@hpmQu4x&)_t59iIdbHarI0<
zY{P?@XTJM#kBSSsZRL{muTu%J5n?tmvqkD`y1hwOgPewj^(s<sc~n~kZZ|eWD7juE
zFZ`h~Cuir<ie%oNLaZ=m`qSd~F;%^wGjd7cCx6>VNU@Fx%7ZG`b@|v>J{w1R{^;r#
zn@rTORYm7vI#QnJfDL!saC@7O(|l{d?R)MK-v!`Uo+Fc+_NH*Ed>>{Zfw@GhyyZeI
z_h}RG7z?4L**GoCUwf#I<sWK_CZ59>W|XBx##lygQvB~d2e=hpN$5kCqJzJrsvK_%
z^Lpr(4vpEieuX&x@q=;e1Sz0zbx;8!5pAKah5c?G-0X@XD1wn03Snimk-lh-yX*wN
z{zSBHwNdPE13xG2))l`im2Aq_Z+8C<(sN<A)a=yI6S24Ri>p4o18t##nM3@Mcj*;K
zp%hr%obcOL)ar@&11A0)Bs@Lm_EAD}R3DSK<oM|kv-s0UZk38q)$++;D&VTC%&u&<
zC@jN<a8^0GA{0E62&8a*wV?xWDSYi|Gi+}{^4rCrx%Z`_Us>q0)>($DeOV=#eKRVq
zCD=BVZ*Tlk!VIM>oMFQl_tZJ08ce~nnxsw9M}su(Z2t$)3#z3R(0?N`={oxlXalY{
z>MoS&rX6(tecNxInz!xN-}ghLZ!e+fM?nqIh~6wBnQfBDF#1YLd0on^Lf|!BBB~M?
z3me|h4%X86I?O=Xzx4<umO;gpBA{BH&%H!-HQd9#yc#v@aym=T!zlMV_GiI3QO*NZ
z0;vJ5SD@JFIS4CG%SRpW?@*V@XI@ahv$@Za_whV%av<++4EIfH9<F~U4)F`Mi3w4z
zdvwmaG_&>4_hnJlt0-86bnnPSPS`K+_J7O>AH6Ev8HI}<KN>^H8Xct2lkMZImRP<4
zk1E#+G9ONvxLmhY>&^&^=}kZV*))MA4O}180TcRqs=r%Y#pJKrOwZ2FzTK^vUTUx%
zND7W;(Wi^Hqj>ie*`}&UQI@)346GO80-H>zF&T$mH*Z!aQ{pSj{;-x{wd0W#sCO)2
zgEyO6`ETK4S|wQSiX>Biq(oKSj*ebe0>!4LDI637|1hYIT&%%vvE(m}M{^k3b5)jG
z%4e~AGV1N7Y)atRRE!K?FGFQg=Uv_Pt`movA9VPcZ=A;UAub!N2;?di*Zw_w1_#gu
zMTfQNjd-5zElS5nML5$0Ko^fL)20^u+uUA0P%@PeS!mpwmyaAS*_hg|d0^cw#m`s~
z!K*I4^sAk?QR-=D0+m+{@LX%+m-ey!Cu7!ttHT#>SxCe3Vg4Pk_~UoEsZUhdK)nQ&
zZ&k)9;~t=D3oTYU1K%Mk8*2e)S|B9Iu>9H?h;lez-1k50s&$&5GU9WR4tO_;ZmH9=
zImP6Z5Edy?hz9*oj|zFiZr$+803eazM;6KczRMvZaQ@)n(>Cx3(Z}DvQjg#8(tJy-
zhhLlza;hq4+irw6B}E*ZvoZJf-Xrd%sZ4Y%Cxc$cN{X<tGI54$YMRpkUvt3{dPIZy
zR5Ai4?|0{3G<`VvW7i2&4h(9(;wcp%NTlDW$aQlVnjq+fR0c+>iz3z8O&VVH8Nu7?
zV*Ir#J(>t?(*M4s=nu977vfsATd%pwVOs;Ved&k?-LhRUiMex4+%Fhx-`<Pr>1M1M
z<Yd$1;8mDlk#OHyOMPg!WG?|fB6=eCQ)#Gk(a7-zHDP^S<aZ<~Ofn@6cd}W)fw`+A
zF6^84TQ2>1&u)6|^@ct*#hIZ;Ru7fhj?v<d=p)fpa=b_nGbX6i*}}URbGI(q>BGF=
zy25`9nm4u0)(}sg==Nkg+@$jxGbIoI5V?QBMr`!=>FHK}j6bjW!k#SXFHO#1tLc&E
zdtfmsClOGE*rgF&`2HPLK8v|ST#||{clhA@t*s=P4m_c{bOr;2tHX<k>Y2Z#u(3Cb
zjUG`XITqo`F+Lh+SK8ocU#(;5Kd7)>A`DRjSW(_f91ser71K%=+vS6XIDdn%+zLOD
zV+j&5+aGkhL-qC`h`T_S{j>@{YPi_!4c&Q6m!&xM0(XQq7j!BKene9zAd691+nKFO
z?w$Xx?9P30SWle~6vn#!%*-#_s>0|9UyvEezKYF+fLdBkI-0d`52RMPTu3}@Nhx%Z
zLa5@v(J30;7cXez>kOnb?xL4wc7)g2j`9J-ADZjWEl5&<?#PHi=&GdERaZ|e`t1KC
z?{%`M>3sM1?rSgx%px5FJZWV-<t}G|P9x{b(_M{{k`l>6_0+dNubd)J<e*koGj%^}
zPxI$wDt0Oz_=WEeW2gczuR?q9w=?uFxA0qz%o^P>9a_@Yj|$aE5rukw%UUB<?O+NU
zA8Q8gvlsgMQ+;^jK0KNk@V;k+t`S~?vqBm$*4<x{lsiXExJSR3+NoQXHHXQU;CpY@
z23YKQ@0#*(o||1e=}SiaE4XwD5peL}>+A6tzGRw2Vb11*y*sm$$HOKMS2WVaCc{$a
zCA^Q;zh|B@LC4DO9gthAwc|U!PCpfcfR9Q(-It$Eo%Fw|c=*ny{BX7v#>60&^T_#+
z^_tb`gCkn(ho!n;EmRxEPAAKopO(#N<INj}q@2dai=UYBA}taKxSO7p_~^<zz{jmM
zj}Rw~2~k3P=@?YJh!i!lZt`IXz}#=0n)W@L?6~~Q0l#1SueV_jE*Z`Ni?WL+M<?yV
zT<H9mVm&}S|IwVQ5%r^9AE(4hk!I7v5Lx@kaDKcb+QF6|g3`i<CMJ^<yzwsJ#R+SE
zeoi;9gw3S~ZH*Sg&?S5)Ej>Qx6X(|J)6j_^@>h3=Rhr+^{cV#Lg{}{cNw2LcrCj0m
zh%b@1jObz*bcv_hoICD#|Dw0LTsvAx93dF*uG4PR2>(pS^ZM0%;1{pJcXwFgQ}eaA
zjXxvaD@Ywp@1+&%7OgT8I-d|oDIwGmrW^+j8eB$aVMvd%FEa}eSjBrTB!>)0L=>F^
z(f%}+C}5zOD(Sh0Q;D$}8}D|#C#1>M)%NA7pBVene9!lJFCX!^;$(#JN4v{m>Dwz|
zdO^c-BaZr!wSP8yHy`>toyJMOmMv+2evm+hD^q27KQS-~IfYD;5s*D(@mzTD`uu1k
zB9xT*eZzdq3Q{#gC(Qbfs4cC?++hP<%Z%HFeaD3V)%QC4(L9T0>}tg1Tb7)670T$7
zAg$nGN-byp7Bx4>H?`CRo0qeisz^JKlA>YF>&d9Pr4QRrySkQcM7!NQ;1wjH`YQ{0
zdMswagNz4$2*hZ2@-P<r_}Q}c{WV*%t88JdGxG#uO_XCoHs!&nN)XLBng-9XMIUU8
zqmKW<NygFgu)?}0>!h7nc!A3?*yLX3W*7gBeLJHhydAG71<gjBVT;_|smOmKR`a{1
zdnS-NUF0PU@#bCVVtqL~_33(Bt>8>*2PV~z%E$x#`2HQH;GG&=m}NSAV!CTxVP|ph
z)pwo8!BbV(@!*68MXq+C<`mqO$+;)xmfvMXg#A?Ccf2{A&Evw{$`6yTCMqn#%`LHi
zI2VmjxClbzx@>V?d`9H&8y?Hhm49NOh^53M+~8gs&z@m)CyC~SMW968u+mVM4wC;(
zerPgkI7&)L$jyGkwP&6StIZpXtIa3hBEI<8k{h!na1q%ekC#HmPTe1R6#vg(D*pa^
znCP})vfyzE8HPEGhnx&Tp85ZiGlQ6!3-$K|9(^SX=H7)BZnKrPWy&oxfezEelE3!n
zW(S{YAU>;|tHMGgbP8#KUCT^8yb=O!u!J!oKMpO(YCu?PWXPi2vW*n3IFF%l)Jq|2
z|4o8Lz_RU?TgGs=GRAANQPl2&2lc(22TXq>ht43JETXD<+}o2-eZYzrSxcY|kqB}z
zh?dL9iwgeYmUKV5`f=uK{tfrka!w|(uJ$acyLP$qA$}Vdey<)FTf@1922#-x;uq@D
z`RM$YU?4z?VjI6`86m_*f_kE8Z=16`RFd!Hmd8!@0<vQNIHNQ~I>)tBwbSaRD<YYF
zr=FDOwjX!n+?S=+qKho!$axL4(@|9Way;j?^cR^>(4%%B4c$SG|EEId_Qi?C_46%>
zQl2Yg&=!8308SA;KTd}p@agfiZMphiN`DQgA2bz03<c&`+FnVu|4rByC4g^R8P>6{
z`8QFBE&(st=kuOixdT)v4t3-mpZY{rnZbX3)HJA+24K?x5pcInW;jrUN}<Czd)KKZ
z-~DDyoF@$G6MLDyV~V39L-+`eQj(ILo~CelOU1$!WU~p$S|Af$Bdq_;3*89Zx%xiC
zdK02unL2|Qd>qUD73HBTby0krc2UyS<3Y+@%0)bXY{#|LxJL6MdO%5f{#mrxYmvnZ
z4}`8XAzSI_en{1?ANX0MlVDrZ+IO|7(A}@Fg}rI3(<nER1Zwz4%rp_o%Wp6%d72@6
za^V?;(W1S{+6?|%^C>H=M~VZL8+iE9drL-cyT<X)KD7Oqu_ynboUhA+9m$)7c#`k`
jU*z<E=xQp$E9vm@SjAbv{a<&iI`B+UQ=wGOGU&em@&8+E

literal 0
HcmV?d00001

diff --git a/res/drawable/media_count_button_background.xml b/res/drawable/media_count_button_background.xml
new file mode 100644
index 0000000000..be4d965cfc
--- /dev/null
+++ b/res/drawable/media_count_button_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="1000dp" />
+    <solid android:color="@color/signal_primary" />
+</shape>
diff --git a/res/drawable/media_count_number_background.xml b/res/drawable/media_count_number_background.xml
new file mode 100644
index 0000000000..1ffe671559
--- /dev/null
+++ b/res/drawable/media_count_number_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="1000dp" />
+    <solid android:color="@color/core_white" />
+</shape>
\ No newline at end of file
diff --git a/res/drawable/pill.xml b/res/drawable/pill.xml
new file mode 100644
index 0000000000..be4d965cfc
--- /dev/null
+++ b/res/drawable/pill.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="1000dp" />
+    <solid android:color="@color/signal_primary" />
+</shape>
diff --git a/res/layout/mediapicker_activity.xml b/res/layout/mediapicker_activity.xml
deleted file mode 100644
index b7068b063a..0000000000
--- a/res/layout/mediapicker_activity.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <FrameLayout
-        android:id="@+id/mediapicker_fragment_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/mediapicker_media_item.xml b/res/layout/mediapicker_media_item.xml
index bc9c28bd19..e5aa0150a8 100644
--- a/res/layout/mediapicker_media_item.xml
+++ b/res/layout/mediapicker_media_item.xml
@@ -6,14 +6,16 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginRight="2dp"
-    android:layout_marginBottom="2dp">
+    android:layout_marginBottom="2dp"
+    android:animateLayoutChanges="true">
 
     <org.thoughtcrime.securesms.components.SquareImageView
         android:id="@+id/mediapicker_image_item_thumbnail"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:adjustViewBounds="true"
-        android:scaleType="centerCrop"/>
+        android:scaleType="centerCrop"
+        tools:src="@drawable/empty_inbox_1"/>
 
     <View
         android:layout_width="match_parent"
@@ -28,7 +30,7 @@
         android:layout_gravity="center"
         android:longClickable="false"
         android:visibility="gone"
-        tools:visibility="visible">
+        tools:visibility="gone">
 
         <ImageView
             android:layout_width="15dp"
@@ -41,20 +43,29 @@
 
     </FrameLayout>
 
-
-    <FrameLayout
-        android:id="@+id/mediapicker_selected"
+    <View
+        android:id="@+id/mediapicker_select_overlay"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/transparent_black_90"
-        android:visibility="gone">
+        android:background="@color/transparent_black_90" />
 
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:src="@drawable/ic_check_white_24dp" />
+    <ImageView
+        android:id="@+id/mediapicker_select_on"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="top|right|end"
+        android:padding="6dp"
+        android:src="@drawable/ic_select_on"
+        android:visibility="gone"
+        tools:visibility="visible" />
 
-    </FrameLayout>
+    <ImageView
+        android:id="@+id/mediapicker_select_off"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="top|right|end"
+        android:padding="6dp"
+        android:src="@drawable/ic_select_off"
+        android:visibility="gone" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/res/layout/mediasend_activity.xml b/res/layout/mediasend_activity.xml
new file mode 100644
index 0000000000..f279426812
--- /dev/null
+++ b/res/layout/mediasend_activity.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <FrameLayout
+        android:id="@+id/mediasend_fragment_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <LinearLayout
+        android:id="@+id/mediasend_count_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="32dp"
+        android:layout_marginRight="32dp"
+        android:layout_gravity="bottom|right|end"
+        android:padding="8dp"
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:background="@drawable/media_count_button_background"
+        android:elevation="4dp"
+        tools:parentTag="android.widget.LinearLayout">
+
+        <TextView
+            android:id="@+id/mediasend_count_button_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:minWidth="28dp"
+            android:paddingLeft="7dp"
+            android:paddingRight="7dp"
+            android:paddingTop="2dp"
+            android:paddingBottom="2dp"
+            android:gravity="center"
+            android:background="@drawable/media_count_number_background"
+            android:textColor="@color/signal_primary"
+            android:textSize="18sp"
+            tools:text="3" />
+
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="20dp"
+            android:layout_marginLeft="2dp"
+            android:layout_marginStart="2dp"
+            android:src="@drawable/ic_arrow_right"
+            android:tint="@color/core_white"/>
+
+    </LinearLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java b/src/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java
index 9215cddf5a..08c47a7399 100644
--- a/src/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java
@@ -15,6 +15,7 @@ import android.support.v7.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.mms.GlideApp;
@@ -88,6 +89,14 @@ public class MediaPickerFolderFragment extends Fragment implements MediaPickerFo
     initToolbar(view.findViewById(R.id.mediapicker_toolbar));
   }
 
+  @Override
+  public void onResume() {
+    super.onResume();
+
+    requireActivity().getWindow().addFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
+    requireActivity().getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+  }
+
   @Override
   public void onConfigurationChanged(Configuration newConfig) {
     super.onConfigurationChanged(newConfig);
diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaPickerItemAdapter.java b/src/org/thoughtcrime/securesms/mediasend/MediaPickerItemAdapter.java
index 651c8c4874..c7217b8976 100644
--- a/src/org/thoughtcrime/securesms/mediasend/MediaPickerItemAdapter.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaPickerItemAdapter.java
@@ -17,6 +17,7 @@ import org.thoughtcrime.securesms.util.StableIdGenerator;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
@@ -38,11 +39,7 @@ public class MediaPickerItemAdapter extends RecyclerView.Adapter<MediaPickerItem
     this.media             = new ArrayList<>();
     this.maxSelection      = maxSelection;
     this.stableIdGenerator = new StableIdGenerator<>();
-    this.selected          = new TreeSet<>((m1, m2) -> {
-      if      (m1.equals(m2))                                 return 0;
-      else if (Long.compare(m2.getDate(), m1.getDate()) == 0) return m2.getUri().compareTo(m1.getUri());
-      else                                                    return Long.compare(m2.getDate(), m1.getDate());
-    });
+    this.selected          = new LinkedHashSet<>();
 
     setHasStableIds(true);
   }
@@ -97,13 +94,17 @@ public class MediaPickerItemAdapter extends RecyclerView.Adapter<MediaPickerItem
 
     private final ImageView thumbnail;
     private final View      playOverlay;
-    private final View      selectedOverlay;
+    private final View      selectOn;
+    private final View      selectOff;
+    private final View      selectOverlay;
 
     ItemViewHolder(@NonNull View itemView) {
       super(itemView);
-      thumbnail       = itemView.findViewById(R.id.mediapicker_image_item_thumbnail);
-      playOverlay     = itemView.findViewById(R.id.mediapicker_play_overlay);
-      selectedOverlay = itemView.findViewById(R.id.mediapicker_selected);
+      thumbnail     = itemView.findViewById(R.id.mediapicker_image_item_thumbnail);
+      playOverlay   = itemView.findViewById(R.id.mediapicker_play_overlay);
+      selectOn      = itemView.findViewById(R.id.mediapicker_select_on);
+      selectOff     = itemView.findViewById(R.id.mediapicker_select_off);
+      selectOverlay = itemView.findViewById(R.id.mediapicker_select_overlay);
     }
 
     void bind(@NonNull Media media, boolean multiSelect, Set<Media> selected, int maxSelection, @NonNull GlideRequests glideRequests, @NonNull EventListener eventListener) {
@@ -113,10 +114,13 @@ public class MediaPickerItemAdapter extends RecyclerView.Adapter<MediaPickerItem
                    .into(thumbnail);
 
       playOverlay.setVisibility(MediaUtil.isVideoType(media.getMimeType()) ? View.VISIBLE : View.GONE);
-      selectedOverlay.setVisibility(selected.contains(media) ? View.VISIBLE : View.GONE);
 
       if (selected.isEmpty() && !multiSelect) {
         itemView.setOnClickListener(v -> eventListener.onMediaChosen(media));
+        selectOn.setVisibility(View.GONE);
+        selectOff.setVisibility(View.GONE);
+        selectOverlay.setVisibility(View.GONE);
+
         if (maxSelection > 1) {
           itemView.setOnLongClickListener(v -> {
             selected.add(media);
@@ -125,11 +129,17 @@ public class MediaPickerItemAdapter extends RecyclerView.Adapter<MediaPickerItem
           });
         }
       } else if (selected.contains(media)) {
+        selectOff.setVisibility(View.VISIBLE);
+        selectOn.setVisibility(View.VISIBLE);
+        selectOverlay.setVisibility(View.VISIBLE);
         itemView.setOnClickListener(v -> {
           selected.remove(media);
           eventListener.onMediaSelectionChanged(new ArrayList<>(selected));
         });
       } else {
+        selectOff.setVisibility(View.VISIBLE);
+        selectOn.setVisibility(View.GONE);
+        selectOverlay.setVisibility(View.GONE);
         itemView.setOnClickListener(v -> {
           if (selected.size() < maxSelection) {
             selected.add(media);
diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaPickerItemFragment.java b/src/org/thoughtcrime/securesms/mediasend/MediaPickerItemFragment.java
index e76bc62a03..5927e50a48 100644
--- a/src/org/thoughtcrime/securesms/mediasend/MediaPickerItemFragment.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaPickerItemFragment.java
@@ -50,8 +50,6 @@ public class MediaPickerItemFragment extends Fragment implements MediaPickerItem
   private MediaPickerItemAdapter adapter;
   private Controller             controller;
   private GridLayoutManager      layoutManager;
-  private ActionMode             actionMode;
-  private ActionMode.Callback    actionModeCallback;
 
   public static MediaPickerItemFragment newInstance(@NonNull String bucketId, @NonNull String folderTitle, int maxSelection) {
     Bundle args = new Bundle();
@@ -70,11 +68,10 @@ public class MediaPickerItemFragment extends Fragment implements MediaPickerItem
     super.onCreate(savedInstanceState);
     setHasOptionsMenu(true);
 
-    bucketId           = getArguments().getString(KEY_BUCKET_ID);
-    folderTitle        = getArguments().getString(KEY_FOLDER_TITLE);
-    maxSelection       = getArguments().getInt(KEY_MAX_SELECTION);
-    viewModel          = ViewModelProviders.of(requireActivity(), new MediaSendViewModel.Factory(new MediaRepository())).get(MediaSendViewModel.class);
-    actionModeCallback = new ActionModeCallback();
+    bucketId     = getArguments().getString(KEY_BUCKET_ID);
+    folderTitle  = getArguments().getString(KEY_FOLDER_TITLE);
+    maxSelection = getArguments().getInt(KEY_MAX_SELECTION);
+    viewModel    = ViewModelProviders.of(requireActivity(), new MediaSendViewModel.Factory(new MediaRepository())).get(MediaSendViewModel.class);
   }
 
   @Override
@@ -114,6 +111,8 @@ public class MediaPickerItemFragment extends Fragment implements MediaPickerItem
     }
 
     viewModel.getMediaInBucket(requireContext(), bucketId).observe(this, adapter::setMedia);
+
+    initMediaObserver(viewModel);
   }
 
   @Override
@@ -125,16 +124,19 @@ public class MediaPickerItemFragment extends Fragment implements MediaPickerItem
   }
 
   @Override
-  public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-    inflater.inflate(R.menu.mediapicker_default, menu);
+  public void onPrepareOptionsMenu(Menu menu) {
+    requireActivity().getMenuInflater().inflate(R.menu.mediapicker_default, menu);
+
+    MenuItem beginSelectionButton = menu.findItem(R.id.mediapicker_menu_add);
+
+    beginSelectionButton.setVisible(!viewModel.getCountButtonState().getValue().getVisibility());
   }
 
   @Override
   public boolean onOptionsItemSelected(MenuItem item) {
     if (item.getItemId() == R.id.mediapicker_menu_add) {
       adapter.setForcedMultiSelect(true);
-      actionMode = ((AppCompatActivity) requireActivity()).startSupportActionMode(actionModeCallback);
-      actionMode.setTitle(getResources().getString(R.string.MediaPickerItemFragment_tap_to_select));
+      viewModel.onMultiSelectStarted();
       return true;
     }
     return false;
@@ -148,23 +150,13 @@ public class MediaPickerItemFragment extends Fragment implements MediaPickerItem
 
   @Override
   public void onMediaChosen(@NonNull Media media) {
-    controller.onMediaSelected(bucketId, Collections.singleton(media));
     viewModel.onSelectedMediaChanged(requireContext(), Collections.singletonList(media));
+    controller.onMediaSelected(bucketId);
   }
 
   @Override
   public void onMediaSelectionChanged(@NonNull List<Media> selected) {
     adapter.notifyDataSetChanged();
-
-    if (actionMode == null && !selected.isEmpty()) {
-      actionMode = ((AppCompatActivity) requireActivity()).startSupportActionMode(actionModeCallback);
-      actionMode.setTitle(String.valueOf(selected.size()));
-    } else if (actionMode != null && selected.isEmpty()) {
-      actionMode.finish();
-    } else if (actionMode != null) {
-      actionMode.setTitle(String.valueOf(selected.size()));
-    }
-
     viewModel.onSelectedMediaChanged(requireContext(), selected);
   }
 
@@ -181,6 +173,12 @@ public class MediaPickerItemFragment extends Fragment implements MediaPickerItem
     toolbar.setNavigationOnClickListener(v -> requireActivity().onBackPressed());
   }
 
+  private void initMediaObserver(@NonNull MediaSendViewModel viewModel) {
+    viewModel.getCountButtonState().observe(this, media -> {
+      requireActivity().invalidateOptionsMenu();
+    });
+  }
+
   private void onScreenWidthChanged(int newWidth) {
     if (layoutManager != null) {
       layoutManager.setSpanCount(newWidth / getResources().getDimensionPixelSize(R.dimen.media_picker_item_width));
@@ -193,55 +191,7 @@ public class MediaPickerItemFragment extends Fragment implements MediaPickerItem
     return size.x;
   }
 
-  private class ActionModeCallback implements ActionMode.Callback {
-
-    private int statusBarColor;
-
-    @Override
-    public boolean onCreateActionMode(ActionMode mode, Menu menu) {
-      MenuInflater inflater = mode.getMenuInflater();
-      inflater.inflate(R.menu.mediapicker_multiselect, menu);
-
-      if (Build.VERSION.SDK_INT >= 21) {
-        Window window = requireActivity().getWindow();
-        statusBarColor = window.getStatusBarColor();
-        window.setStatusBarColor(getResources().getColor(R.color.action_mode_status_bar));
-      }
-
-      return true;
-    }
-
-    @Override
-    public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
-      return false;
-    }
-
-    @Override
-    public boolean onActionItemClicked(ActionMode mode, MenuItem menuItem) {
-      if (menuItem.getItemId() == R.id.mediapicker_menu_confirm) {
-        List<Media> selected = new ArrayList<>(adapter.getSelected());
-        actionMode.finish();
-        viewModel.onSelectedMediaChanged(requireContext(), selected);
-        controller.onMediaSelected(bucketId, selected);
-        return true;
-      }
-      return false;
-    }
-
-    @Override
-    public void onDestroyActionMode(ActionMode mode) {
-      actionMode = null;
-      adapter.setSelected(Collections.emptySet());
-      viewModel.onSelectedMediaChanged(requireContext(), Collections.emptyList());
-
-      if (Build.VERSION.SDK_INT >= 21) {
-        requireActivity().getWindow().setStatusBarColor(statusBarColor);
-      }
-    }
-  }
-
-
   public interface Controller {
-    void onMediaSelected(@NonNull String bucketId, @NonNull Collection<Media> media);
+    void onMediaSelected(@NonNull String bucketId);
   }
 }
diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java b/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
index 3441cccf5b..115aabbc23 100644
--- a/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
@@ -6,11 +6,18 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
 
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.TransportOption;
 import org.thoughtcrime.securesms.database.Address;
+import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.MediaConstraints;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.scribbles.ScribbleFragment;
@@ -23,6 +30,7 @@ import org.whispersystems.libsignal.util.guava.Optional;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Locale;
 
 /**
  * Encompasses the entire flow of sending media, starting from the selection process to the actual
@@ -56,10 +64,12 @@ public class MediaSendActivity extends PassphraseRequiredActionBarActivity imple
   private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
 
   private Recipient          recipient;
-  private String             body;
   private TransportOption    transport;
   private MediaSendViewModel viewModel;
 
+  private View     countButton;
+  private TextView countButtonText;
+
   /**
    * Get an intent to launch the media send flow starting with the picker.
    */
@@ -94,28 +104,42 @@ public class MediaSendActivity extends PassphraseRequiredActionBarActivity imple
 
   @Override
   protected void onCreate(Bundle savedInstanceState, boolean ready) {
-    setContentView(R.layout.mediapicker_activity);
+    setContentView(R.layout.mediasend_activity);
     setResult(RESULT_CANCELED);
 
     if (savedInstanceState != null) {
       return;
     }
 
+    countButton     = findViewById(R.id.mediasend_count_button);
+    countButtonText = findViewById(R.id.mediasend_count_button_text);
+
     viewModel = ViewModelProviders.of(this, new MediaSendViewModel.Factory(new MediaRepository())).get(MediaSendViewModel.class);
     recipient = Recipient.from(this, Address.fromSerialized(getIntent().getStringExtra(KEY_ADDRESS)), true);
-    body      = getIntent().getStringExtra(KEY_BODY);
     transport = getIntent().getParcelableExtra(KEY_TRANSPORT);
 
     viewModel.setMediaConstraints(transport.isSms() ? MediaConstraints.getMmsMediaConstraints(transport.getSimSubscriptionId().or(-1))
                                                     : MediaConstraints.getPushMediaConstraints());
 
+    viewModel.onBodyChanged(getIntent().getStringExtra(KEY_BODY));
+
     List<Media> media = getIntent().getParcelableArrayListExtra(KEY_MEDIA);
 
     if (!Util.isEmpty(media)) {
-      navigateToMediaSend(media, body, transport);
+      viewModel.onSelectedMediaChanged(this, media);
+
+      Fragment fragment = MediaSendFragment.newInstance(transport, dynamicLanguage.getCurrentLocale());
+      getSupportFragmentManager().beginTransaction()
+                                 .replace(R.id.mediasend_fragment_container, fragment, TAG_SEND)
+                                 .commit();
     } else {
-      navigateToFolderPicker(recipient);
+      MediaPickerFolderFragment fragment = MediaPickerFolderFragment.newInstance(recipient);
+      getSupportFragmentManager().beginTransaction()
+                                 .replace(R.id.mediasend_fragment_container, fragment, TAG_FOLDER_PICKER)
+                                 .commit();
     }
+
+    initializeCountButtonObserver(transport, dynamicLanguage.getCurrentLocale());
   }
 
   @Override
@@ -137,41 +161,34 @@ public class MediaSendActivity extends PassphraseRequiredActionBarActivity imple
   public void onFolderSelected(@NonNull MediaFolder folder) {
     viewModel.onFolderSelected(folder.getBucketId());
 
-    MediaPickerItemFragment fragment = MediaPickerItemFragment.newInstance(folder.getBucketId(),
-                                                                           folder.getTitle(),
-                                                                           transport.isSms() ? MAX_SMS : MAX_PUSH);
-
+    MediaPickerItemFragment fragment = MediaPickerItemFragment.newInstance(folder.getBucketId(), folder.getTitle(), transport.isSms() ? MAX_SMS  :MAX_PUSH);
     getSupportFragmentManager().beginTransaction()
-                               .setCustomAnimations(R.anim.fade_in, R.anim.fade_out, R.anim.fade_in, R.anim.fade_out)
-                               .replace(R.id.mediapicker_fragment_container, fragment, TAG_ITEM_PICKER)
+                               .setCustomAnimations(R.anim.slide_from_right, R.anim.slide_to_left, R.anim.slide_from_left, R.anim.slide_to_right)
+                               .replace(R.id.mediasend_fragment_container, fragment, TAG_ITEM_PICKER)
                                .addToBackStack(null)
                                .commit();
   }
 
   @Override
-  public void onMediaSelected(@NonNull String bucketId, @NonNull Collection<Media> media) {
-    MediaSendFragment fragment = MediaSendFragment.newInstance(body, transport, dynamicLanguage.getCurrentLocale());
-    getSupportFragmentManager().beginTransaction()
-                               .setCustomAnimations(R.anim.fade_in, R.anim.fade_out, R.anim.fade_in, R.anim.fade_out)
-                               .replace(R.id.mediapicker_fragment_container, fragment, TAG_SEND)
-                               .addToBackStack(null)
-                               .commit();
+  public void onMediaSelected(@NonNull String bucketId) {
+    navigateToMediaSend(transport, dynamicLanguage.getCurrentLocale());
   }
 
   @Override
   public void onAddMediaClicked(@NonNull String bucketId) {
+    // TODO: Get actual folder title somehow
     MediaPickerFolderFragment folderFragment = MediaPickerFolderFragment.newInstance(recipient);
-    MediaPickerItemFragment   itemFragment   = MediaPickerItemFragment.newInstance(bucketId,
-                                                                                   "",
-                                                                                   transport.isSms() ? MAX_SMS : MAX_PUSH);
+    MediaPickerItemFragment   itemFragment   = MediaPickerItemFragment.newInstance(bucketId, "", transport.isSms() ? MAX_SMS : MAX_PUSH);
 
     getSupportFragmentManager().beginTransaction()
-                               .replace(R.id.mediapicker_fragment_container, folderFragment, TAG_FOLDER_PICKER)
+                               .setCustomAnimations(R.anim.stationary, R.anim.slide_to_left, R.anim.slide_from_left, R.anim.slide_to_right)
+                               .replace(R.id.mediasend_fragment_container, folderFragment, TAG_FOLDER_PICKER)
                                .addToBackStack(null)
                                .commit();
 
     getSupportFragmentManager().beginTransaction()
-                               .replace(R.id.mediapicker_fragment_container, itemFragment, TAG_ITEM_PICKER)
+                               .setCustomAnimations(R.anim.slide_from_right, R.anim.stationary, R.anim.slide_from_left, R.anim.slide_to_right)
+                               .replace(R.id.mediasend_fragment_container, itemFragment, TAG_ITEM_PICKER)
                                .addToBackStack(null)
                                .commit();
   }
@@ -214,20 +231,29 @@ public class MediaSendActivity extends PassphraseRequiredActionBarActivity imple
     }
   }
 
-  private void navigateToMediaSend(List<Media> media, String body, TransportOption transport) {
-    viewModel.setInitialSelectedMedia(this, media);
+  private void initializeCountButtonObserver(@NonNull TransportOption transport, @NonNull Locale locale) {
+    viewModel.getCountButtonState().observe(this, buttonState -> {
+      if (buttonState == null) return;
 
-    MediaSendFragment sendFragment = MediaSendFragment.newInstance(body, transport, dynamicLanguage.getCurrentLocale());
-    getSupportFragmentManager().beginTransaction()
-                               .replace(R.id.mediapicker_fragment_container, sendFragment, TAG_SEND)
-                               .commit();
+      countButton.setVisibility(buttonState.getVisibility() ? View.VISIBLE : View.GONE);
+      countButton.setOnClickListener(v -> navigateToMediaSend(transport, locale));
+      countButtonText.setText(String.valueOf(buttonState.getCount()));
+    });
   }
 
-  private void navigateToFolderPicker(@NonNull Recipient recipient) {
-    MediaPickerFolderFragment folderFragment = MediaPickerFolderFragment.newInstance(recipient);
+  private void navigateToMediaSend(@NonNull TransportOption transport, @NonNull Locale locale) {
+    MediaSendFragment fragment     = MediaSendFragment.newInstance(transport, locale);
+    String            backstackTag = null;
+
+    if (getSupportFragmentManager().findFragmentByTag(TAG_SEND) != null) {
+      getSupportFragmentManager().popBackStack(TAG_SEND, FragmentManager.POP_BACK_STACK_INCLUSIVE);
+      backstackTag = TAG_SEND;
+    }
 
     getSupportFragmentManager().beginTransaction()
-                               .replace(R.id.mediapicker_fragment_container, folderFragment, TAG_FOLDER_PICKER)
+                               .setCustomAnimations(R.anim.slide_from_right, R.anim.slide_to_left, R.anim.slide_from_left, R.anim.slide_to_right)
+                               .replace(R.id.mediasend_fragment_container, fragment, TAG_SEND)
+                               .addToBackStack(backstackTag)
                                .commit();
   }
 }
diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java b/src/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java
index c96ad9f069..dc81b83c1b 100644
--- a/src/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java
@@ -72,7 +72,6 @@ public class MediaSendFragment extends Fragment implements ViewTreeObserver.OnGl
 
   private static final String TAG = MediaSendFragment.class.getSimpleName();
 
-  private static final String KEY_BODY      = "body";
   private static final String KEY_TRANSPORT = "transport";
   private static final String KEY_LOCALE    = "locale";
 
@@ -99,9 +98,8 @@ public class MediaSendFragment extends Fragment implements ViewTreeObserver.OnGl
 
   private final Rect visibleBounds = new Rect();
 
-  public static MediaSendFragment newInstance(@NonNull String body, @NonNull TransportOption transport, @NonNull Locale locale) {
+  public static MediaSendFragment newInstance(@NonNull TransportOption transport, @NonNull Locale locale) {
     Bundle args = new Bundle();
-    args.putString(KEY_BODY, body);
     args.putParcelable(KEY_TRANSPORT, transport);
     args.putSerializable(KEY_LOCALE, locale);
 
@@ -134,9 +132,6 @@ public class MediaSendFragment extends Fragment implements ViewTreeObserver.OnGl
     locale = (Locale) getArguments().getSerializable(KEY_LOCALE);
 
     initViewModel();
-
-    requireActivity().getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
-    requireActivity().getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
   }
 
   @Override
@@ -181,7 +176,7 @@ public class MediaSendFragment extends Fragment implements ViewTreeObserver.OnGl
     captionText.clearFocus();
     composeText.requestFocus();
 
-    fragmentPagerAdapter = new MediaSendFragmentPagerAdapter(requireActivity().getSupportFragmentManager(), locale);
+    fragmentPagerAdapter = new MediaSendFragmentPagerAdapter(getChildFragmentManager(), locale);
     fragmentPager.setAdapter(fragmentPagerAdapter);
 
     FragmentPageChangeListener pageChangeListener = new FragmentPageChangeListener();
@@ -208,7 +203,7 @@ public class MediaSendFragment extends Fragment implements ViewTreeObserver.OnGl
     sendButton.setTransport(transportOption);
     sendButton.disableTransport(transportOption.getType() == TransportOption.Type.SMS ? TransportOption.Type.TEXTSECURE : TransportOption.Type.SMS);
 
-    composeText.append(getArguments().getString(KEY_BODY));
+    composeText.append(viewModel.getBody());
 
 
     if (TextSecurePreferences.isSystemEmojiPreferred(getContext())) {
@@ -221,13 +216,25 @@ public class MediaSendFragment extends Fragment implements ViewTreeObserver.OnGl
   @Override
   public void onStart() {
     super.onStart();
+
     fragmentPagerAdapter.restoreState(viewModel.getDrawState());
+    viewModel.onImageEditorStarted();
+
+    requireActivity().getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+    requireActivity().getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
+  }
+
+  @Override
+  public void onHiddenChanged(boolean hidden) {
+    super.onHiddenChanged(hidden);
   }
 
   @Override
   public void onStop() {
     super.onStop();
+    fragmentPagerAdapter.saveAllState();
     viewModel.saveDrawState(fragmentPagerAdapter.getSavedState());
+    viewModel.onImageEditorEnded();
   }
 
   @Override
@@ -328,11 +335,13 @@ public class MediaSendFragment extends Fragment implements ViewTreeObserver.OnGl
     });
 
     viewModel.getBucketId().observe(this, bucketId -> {
-      if (bucketId == null || !bucketId.isPresent() || sendButton.getSelectedTransport().isSms()) {
+      if (bucketId == null) return;
+
+      if (sendButton.getSelectedTransport().isSms()) {
         addButton.setVisibility(View.GONE);
       } else {
         addButton.setVisibility(View.VISIBLE);
-        addButton.setOnClickListener(v -> controller.onAddMediaClicked(bucketId.get()));
+        addButton.setOnClickListener(v -> controller.onAddMediaClicked(bucketId));
       }
     });
 
@@ -505,6 +514,7 @@ public class MediaSendFragment extends Fragment implements ViewTreeObserver.OnGl
     @Override
     public void afterTextChanged(Editable s) {
       presentCharactersRemaining();
+      viewModel.onBodyChanged(s);
     }
 
     @Override
diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaSendFragmentPagerAdapter.java b/src/org/thoughtcrime/securesms/mediasend/MediaSendFragmentPagerAdapter.java
index d85eba9f1f..2283504fb8 100644
--- a/src/org/thoughtcrime/securesms/mediasend/MediaSendFragmentPagerAdapter.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaSendFragmentPagerAdapter.java
@@ -9,6 +9,7 @@ import android.support.v4.app.FragmentStatePagerAdapter;
 import android.view.View;
 import android.view.ViewGroup;
 
+import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.scribbles.ScribbleFragment;
 import org.thoughtcrime.securesms.util.MediaUtil;
 import org.whispersystems.libsignal.util.guava.Optional;
@@ -106,6 +107,15 @@ class MediaSendFragmentPagerAdapter extends FragmentStatePagerAdapter {
     return new HashMap<>(savedState);
   }
 
+  void saveAllState() {
+    for (MediaSendPageFragment fragment : fragments.values()) {
+      Object state = fragment.saveState();
+      if (state != null) {
+        savedState.put(fragment.getUri(), state);
+      }
+    }
+  }
+
   void restoreState(@NonNull Map<Uri, Object> state) {
     savedState.clear();
     savedState.putAll(state);
diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java b/src/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java
index 7bf95e6337..9212e1cdb6 100644
--- a/src/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java
@@ -15,7 +15,6 @@ import org.thoughtcrime.securesms.mms.MediaConstraints;
 import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.SingleLiveEvent;
 import org.thoughtcrime.securesms.util.Util;
-import org.whispersystems.libsignal.util.guava.Optional;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -31,31 +30,37 @@ class MediaSendViewModel extends ViewModel {
   private final MutableLiveData<List<Media>>       selectedMedia;
   private final MutableLiveData<List<Media>>       bucketMedia;
   private final MutableLiveData<Integer>           position;
-  private final MutableLiveData<Optional<String>>  bucketId;
+  private final MutableLiveData<String>            bucketId;
   private final MutableLiveData<List<MediaFolder>> folders;
+  private final MutableLiveData<CountButtonState>  countButtonState;
   private final SingleLiveEvent<Error>             error;
   private final Map<Uri, Object>                   savedDrawState;
 
-  private MediaConstraints mediaConstraints;
+  private MediaConstraints            mediaConstraints;
+  private CharSequence                body;
+  private CountButtonState.Visibility countButtonVisibility;
 
   private MediaSendViewModel(@NonNull MediaRepository repository) {
-    this.repository     = repository;
-    this.selectedMedia  = new MutableLiveData<>();
-    this.bucketMedia    = new MutableLiveData<>();
-    this.position       = new MutableLiveData<>();
-    this.bucketId       = new MutableLiveData<>();
-    this.folders        = new MutableLiveData<>();
-    this.error          = new SingleLiveEvent<>();
-    this.savedDrawState = new HashMap<>();
+    this.repository            = repository;
+    this.selectedMedia         = new MutableLiveData<>();
+    this.bucketMedia           = new MutableLiveData<>();
+    this.position              = new MutableLiveData<>();
+    this.bucketId              = new MutableLiveData<>();
+    this.folders               = new MutableLiveData<>();
+    this.countButtonState      = new MutableLiveData<>();
+    this.error                 = new SingleLiveEvent<>();
+    this.savedDrawState        = new HashMap<>();
+    this.countButtonVisibility = CountButtonState.Visibility.CONDITIONAL;
 
     position.setValue(-1);
+    countButtonState.setValue(new CountButtonState(0, CountButtonState.Visibility.CONDITIONAL));
   }
 
   void setMediaConstraints(@NonNull MediaConstraints mediaConstraints) {
     this.mediaConstraints = mediaConstraints;
   }
 
-  void setInitialSelectedMedia(@NonNull Context context, @NonNull List<Media> newMedia) {
+  void onSelectedMediaChanged(@NonNull Context context, @NonNull List<Media> newMedia) {
     repository.getPopulatedMedia(context, newMedia, populatedMedia -> {
       List<Media> filteredMedia = getFilteredMedia(context, populatedMedia, mediaConstraints);
 
@@ -63,26 +68,48 @@ class MediaSendViewModel extends ViewModel {
         error.postValue(Error.ITEM_TOO_LARGE);
       }
 
-      boolean allBucketsPopulated = Stream.of(filteredMedia).reduce(true, (populated, m) -> populated && m.getBucketId().isPresent());
+      if (filteredMedia.size() > 0) {
+        String computedId = Stream.of(filteredMedia)
+                                  .skip(1)
+                                  .reduce(filteredMedia.get(0).getBucketId().orNull(), (id, m) -> {
+                                    if (Util.equals(id, m.getBucketId().orNull())) {
+                                      return id;
+                                    } else {
+                                      return Media.ALL_MEDIA_BUCKET_ID;
+                                    }
+                                  });
+        bucketId.postValue(computedId);
+      } else {
+        bucketId.postValue(Media.ALL_MEDIA_BUCKET_ID);
+        countButtonVisibility = CountButtonState.Visibility.CONDITIONAL;
+      }
 
       selectedMedia.postValue(filteredMedia);
-      bucketId.postValue(allBucketsPopulated ? computeBucketId(filteredMedia) : Optional.absent());
+      countButtonState.postValue(new CountButtonState(filteredMedia.size(), countButtonVisibility));
     });
   }
 
-  void onSelectedMediaChanged(@NonNull Context context, @NonNull List<Media> newMedia) {
-    List<Media> filteredMedia = getFilteredMedia(context, newMedia, mediaConstraints);
+  void onMultiSelectStarted() {
+    countButtonVisibility = CountButtonState.Visibility.FORCED_ON;
+    countButtonState.postValue(new CountButtonState(getSelectedMediaOrDefault().size(), countButtonVisibility));
+  }
 
-    if (filteredMedia.size() != newMedia.size()) {
-      error.setValue(Error.ITEM_TOO_LARGE);
-    }
+  void onImageEditorStarted() {
+    countButtonVisibility = CountButtonState.Visibility.FORCED_OFF;
+    countButtonState.postValue(new CountButtonState(getSelectedMediaOrDefault().size(), countButtonVisibility));
+  }
+
+  void onImageEditorEnded() {
+    countButtonVisibility = CountButtonState.Visibility.CONDITIONAL;
+    countButtonState.postValue(new CountButtonState(getSelectedMediaOrDefault().size(), countButtonVisibility));
+  }
 
-    selectedMedia.setValue(filteredMedia);
-    position.setValue(filteredMedia.isEmpty() ? -1 : 0);
+  void onBodyChanged(@NonNull CharSequence body) {
+    this.body = body;
   }
 
   void onFolderSelected(@NonNull String bucketId) {
-    this.bucketId.setValue(Optional.of(bucketId));
+    this.bucketId.setValue(bucketId);
     bucketMedia.setValue(Collections.emptyList());
   }
 
@@ -91,7 +118,7 @@ class MediaSendViewModel extends ViewModel {
   }
 
   void onMediaItemRemoved(int position) {
-    selectedMedia.getValue().remove(position);
+    getSelectedMediaOrDefault().remove(position);
     selectedMedia.setValue(selectedMedia.getValue());
   }
 
@@ -110,11 +137,11 @@ class MediaSendViewModel extends ViewModel {
     return savedDrawState;
   }
 
-  LiveData<List<Media>> getSelectedMedia() {
+  @NonNull LiveData<List<Media>> getSelectedMedia() {
     return selectedMedia;
   }
 
-  LiveData<List<Media>> getMediaInBucket(@NonNull Context context, @NonNull String bucketId) {
+  @NonNull LiveData<List<Media>> getMediaInBucket(@NonNull Context context, @NonNull String bucketId) {
     repository.getMediaInBucket(context, bucketId, bucketMedia::postValue);
     return bucketMedia;
   }
@@ -124,11 +151,19 @@ class MediaSendViewModel extends ViewModel {
     return folders;
   }
 
+  @NonNull LiveData<CountButtonState> getCountButtonState() {
+    return countButtonState;
+  }
+
+  CharSequence getBody() {
+    return body;
+  }
+
   LiveData<Integer> getPosition() {
     return position;
   }
 
-  LiveData<Optional<String>> getBucketId() {
+  LiveData<String> getBucketId() {
     return bucketId;
   }
 
@@ -136,17 +171,9 @@ class MediaSendViewModel extends ViewModel {
     return error;
   }
 
-  private Optional<String> computeBucketId(@NonNull List<Media> media) {
-    if (media.isEmpty() || !media.get(0).getBucketId().isPresent()) return Optional.absent();
-
-    String candidate = media.get(0).getBucketId().get();
-    for (int i = 1; i < media.size(); i++) {
-      if (!Util.equals(candidate, media.get(i).getBucketId().orNull())) {
-        return Optional.of(Media.ALL_MEDIA_BUCKET_ID);
-      }
-    }
-
-    return Optional.of(candidate);
+  private @NonNull List<Media> getSelectedMediaOrDefault() {
+    return selectedMedia.getValue() == null ? Collections.emptyList()
+                                            : selectedMedia.getValue();
   }
 
   private @NonNull List<Media> getFilteredMedia(@NonNull Context context, @NonNull List<Media> media, @NonNull MediaConstraints mediaConstraints) {
@@ -165,6 +192,33 @@ class MediaSendViewModel extends ViewModel {
     ITEM_TOO_LARGE
   }
 
+  static class CountButtonState {
+    private final int        count;
+    private final Visibility visibility;
+
+    private CountButtonState(int count, @NonNull Visibility visibility) {
+      this.count      = count;
+      this.visibility = visibility;
+    }
+
+    int getCount() {
+      return count;
+    }
+
+    boolean getVisibility() {
+      switch (visibility) {
+        case FORCED_ON:   return true;
+        case FORCED_OFF:  return false;
+        case CONDITIONAL: return count > 0;
+        default:          return false;
+      }
+    }
+
+    enum Visibility {
+      CONDITIONAL, FORCED_ON, FORCED_OFF
+    }
+  }
+
   static class Factory extends ViewModelProvider.NewInstanceFactory {
 
     private final MediaRepository repository;
diff --git a/src/org/thoughtcrime/securesms/scribbles/ScribbleFragment.java b/src/org/thoughtcrime/securesms/scribbles/ScribbleFragment.java
index 9c8dd215df..a5b08f8eed 100644
--- a/src/org/thoughtcrime/securesms/scribbles/ScribbleFragment.java
+++ b/src/org/thoughtcrime/securesms/scribbles/ScribbleFragment.java
@@ -147,6 +147,10 @@ public class ScribbleFragment extends Fragment implements ScribbleHud.EventListe
   public void restoreState(@NonNull Object state) {
     if (state instanceof ScribbleView.SavedState) {
       savedState = (ScribbleView.SavedState) state;
+
+      if (scribbleView != null) {
+        scribbleView.restoreState(savedState);
+      }
     } else {
       Log.w(TAG, "Received a bad saved state. Received class: " + state.getClass().getName());
     }
diff --git a/src/org/thoughtcrime/securesms/scribbles/widget/ScribbleView.java b/src/org/thoughtcrime/securesms/scribbles/widget/ScribbleView.java
index 2986dc1f8b..a7453e24de 100644
--- a/src/org/thoughtcrime/securesms/scribbles/widget/ScribbleView.java
+++ b/src/org/thoughtcrime/securesms/scribbles/widget/ScribbleView.java
@@ -33,6 +33,7 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
 import com.bumptech.glide.request.target.SimpleTarget;
 import com.bumptech.glide.request.target.Target;
 import com.bumptech.glide.request.transition.Transition;
@@ -87,6 +88,7 @@ public class ScribbleView extends FrameLayout {
 
     glideRequests.load(new DecryptableUri(uri))
                  .diskCacheStrategy(DiskCacheStrategy.NONE)
+                 .transition(DrawableTransitionOptions.withCrossFade())
                  .fitCenter()
                  .into(imageView);
   }