From 1ba97fa9bee9929d0c7527800c194a2b33a55aba Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Thu, 24 Jun 2021 17:40:45 +0200
Subject: [PATCH] Clean after Benoits review

---
 .../main/res/values/styles_jump_to_unread.xml    |   2 +-
 .../ui-styles/src/main/res/values/theme_dark.xml |   4 +++-
 .../src/main/res/values/theme_light.xml          |   4 +++-
 .../main/res/drawable-hdpi/arrow_up_circle.png   | Bin 686 -> 0 bytes
 .../main/res/drawable-mdpi/arrow_up_circle.png   | Bin 414 -> 0 bytes
 .../main/res/drawable-xhdpi/arrow_up_circle.png  | Bin 869 -> 0 bytes
 .../main/res/drawable-xxhdpi/arrow_up_circle.png | Bin 1332 -> 0 bytes
 .../res/drawable-xxxhdpi/arrow_up_circle.png     | Bin 1910 -> 0 bytes
 .../src/main/res/layout/fragment_room_detail.xml |   2 +-
 9 files changed, 8 insertions(+), 4 deletions(-)
 delete mode 100755 vector/src/main/res/drawable-hdpi/arrow_up_circle.png
 delete mode 100755 vector/src/main/res/drawable-mdpi/arrow_up_circle.png
 delete mode 100755 vector/src/main/res/drawable-xhdpi/arrow_up_circle.png
 delete mode 100755 vector/src/main/res/drawable-xxhdpi/arrow_up_circle.png
 delete mode 100755 vector/src/main/res/drawable-xxxhdpi/arrow_up_circle.png

diff --git a/library/ui-styles/src/main/res/values/styles_jump_to_unread.xml b/library/ui-styles/src/main/res/values/styles_jump_to_unread.xml
index d0561425ff..21f0ebd5d4 100644
--- a/library/ui-styles/src/main/res/values/styles_jump_to_unread.xml
+++ b/library/ui-styles/src/main/res/values/styles_jump_to_unread.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <attr name="jumpToUnreadStyle" format="reference" />
+    <attr name="vctr_jump_to_unread_style" format="reference" />
 
     <style name="Widget.Vector.JumpToUnread.Base" parent="Widget.MaterialComponents.Chip.Action">
         <item name="android:textAppearance">@style/TextAppearance.Vector.Body.Medium</item>
diff --git a/library/ui-styles/src/main/res/values/theme_dark.xml b/library/ui-styles/src/main/res/values/theme_dark.xml
index 69f1b4d5cc..94306ff760 100644
--- a/library/ui-styles/src/main/res/values/theme_dark.xml
+++ b/library/ui-styles/src/main/res/values/theme_dark.xml
@@ -86,7 +86,6 @@
         <item name="snackbarButtonStyle">@style/Widget.Vector.SnackBar.Button</item>
         <item name="snackbarTextViewStyle">@style/Widget.Vector.SnackBar.TextView</item>
         <item name="actionModeStyle">@style/Widget.Vector.ActionMode</item>
-        <item name="jumpToUnreadStyle">@style/Widget.Vector.JumpToUnread.Dark</item>
 
         <!-- Default theme -->
         <item name="bottomSheetDialogTheme">@style/Theme.Vector.BottomSheetDialog.Dark</item>
@@ -133,6 +132,9 @@
         <item name="vctr_social_login_button_twitter_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Twitter.Dark</item>
         <item name="vctr_social_login_button_apple_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Apple.Dark</item>
         <item name="vctr_social_login_button_gitlab_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Gitlab.Dark</item>
+
+        <item name="vctr_jump_to_unread_style">@style/Widget.Vector.JumpToUnread.Dark</item>
+
     </style>
 
     <style name="Theme.Vector.Dark" parent="Base.Theme.Vector.Dark" />
diff --git a/library/ui-styles/src/main/res/values/theme_light.xml b/library/ui-styles/src/main/res/values/theme_light.xml
index db379028f3..b11fd97504 100644
--- a/library/ui-styles/src/main/res/values/theme_light.xml
+++ b/library/ui-styles/src/main/res/values/theme_light.xml
@@ -86,7 +86,6 @@
         <item name="snackbarButtonStyle">@style/Widget.Vector.SnackBar.Button</item>
         <item name="snackbarTextViewStyle">@style/Widget.Vector.SnackBar.TextView</item>
         <item name="actionModeStyle">@style/Widget.Vector.ActionMode</item>
-        <item name="jumpToUnreadStyle">@style/Widget.Vector.JumpToUnread.Light</item>
 
         <!-- Default theme -->
         <item name="bottomSheetDialogTheme">@style/Theme.Vector.BottomSheetDialog.Light</item>
@@ -135,6 +134,9 @@
         <item name="vctr_social_login_button_twitter_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Twitter.Light</item>
         <item name="vctr_social_login_button_apple_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Apple.Light</item>
         <item name="vctr_social_login_button_gitlab_style">@style/Widget.Vector.Button.Outlined.SocialLogin.Gitlab.Light</item>
+
+        <item name="vctr_jump_to_unread_style">@style/Widget.Vector.JumpToUnread.Light</item>
+
     </style>
 
     <style name="Theme.Vector.Light" parent="Base.Theme.Vector.Light" />
diff --git a/vector/src/main/res/drawable-hdpi/arrow_up_circle.png b/vector/src/main/res/drawable-hdpi/arrow_up_circle.png
deleted file mode 100755
index c7fba081c151926a44f8b955da6857a2c9a7e6f7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 686
zcmV;f0#W^mP)<h;3K|Lk000e1NJLTq000{R000{Z1^@s6jnwp200001b5ch_0Itp)
z=>Px%Xh}ptR7efImcL2^K@i40u?z}EEJR645yiq+5L+P@K7obcGx!ERfTfMCwu(g_
zKr1bUfQq0fhzM$9{C$@hZ|~eoOoV*!?d<&7nZ4a*Z<CQfpxtg)2wQ_oa0XW4GrWhF
z@H9!1H{{@;$O=4$@30%>SKLb9)fhAh58)RK@qlsxPfSV=p?Hm({8Lc^7vME?Jki;O
zi?IZ<n_qDbjbDhx|JW1&Uwi~|4^I39bm=J0;t?s7CteVTmd?LOd$8Fhcd1L`pzpEr
z{a#XxT5HEZg?t7iQ9;L{+f#{Er_K+<Ud~xih?|E8k_A^z#jh<8ls7x2C_1)+HhDZZ
zDp2s%;42g)Yk@o0#iu>=Lvx%uF;w6O6n1kX0tH_UwqS@BO1FYK#e(uzMraz+3}wf=
zhQDPoS{A`&i+;2q_C@Guj52v$LBb<f&Q+(IwL~gW6V_oH>Ut6+rPpE8;^=0ue2->X
zQZe0i!fi)nEeWR4ny?O)cpKh8K~j2HQ1M0FnPEo7s;1~-En*!*9j1kt>3$esdRS2L
zMLe0II!4Efc+oKU2xS?bk+^fBLN9$4WCb4Ru0q8ZF=d8l71M7*nCpnFC6Q*elUd?D
zn@DsrjF`1i_gY5Z@M&fkJ&o}ay{(qd_wiE2PT{8wZS+pjSHy-ze;`$d-Ot}36REMJ
zAy#`N<PJ+Q9RKedL_s+Exf`d5--5pJ#X6~uKYlk_!QtHcR&03xGb=cpKXtm$G_3V-
z-XK9iEos^7>Kvb5SCapGU3o!ClKH#Q|96<8kiX}<F$t5G^+{C0w+8h)8u&&04KpW?
U^)RQ5s{jB107*qoM6N<$f<p~7bN~PV

diff --git a/vector/src/main/res/drawable-mdpi/arrow_up_circle.png b/vector/src/main/res/drawable-mdpi/arrow_up_circle.png
deleted file mode 100755
index aad94e9a4e8492b15a30423dd8965ea33cf2eff4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 414
zcmV;P0b%}$P)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px$SV=@dR5%f>l)XyBU=)TML8uPhN{3#Flel#DCfY>@ucEuVV`uRS3S9)DH{jx+
zb<tTDh4?(}IW*Cz1byMn`Oe>)lYC!NbQ(~WWuNddJcPq2dBiT@RZ$er5o<OGbm0`f
zLh%A`gBjCW(`{5CF@QHv%;5;`X0hvtnG@CyGQYM2oW#UCJgFrc9BZQ1p6z5fjw*f?
zNnLB#9rWfjeF8rBJd4s2>%mp9m+`drKzsWgE@LQ0S)j#N<l02QbxjQ4_bA3T%%Hnd
zeX&)Mdva3L#PHn!Cz|bWbI-|&v+?F6flKTGJcCa`*T&4P5j_t$Lxq}fM{q*nc_w2$
z!8i96js<IvR;?npl+{?SiPs*@W4{lNvY>^vXAdrX+23xzg5)ox>(3y*-F}k<rcksw
zkf)oLIFKRqKc7g5{r#g=NHFS8zY%v<H2y}4jYR!QaqA!32O|OJ7P9JB-~a#s07*qo
IM6N<$f;gDDQUCw|

diff --git a/vector/src/main/res/drawable-xhdpi/arrow_up_circle.png b/vector/src/main/res/drawable-xhdpi/arrow_up_circle.png
deleted file mode 100755
index 8973128ccc8d7619593a2ef369379827ef6d7aa3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 869
zcmV-r1DgDaP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00001b5ch_0Itp)
z=>Px&A4x<(R9Fekn7eKhK@^6wQEE!0q_UMVHHc8e6(S8ygp?*UNzX&@47>md4?qzq
za!I5hA-{lyWZ{ZPAaSXJP>A{dWlr|&usiEZVtl0EXXaf0-LYq9oh?lvqtR%Ew0och
zR>2yOd;;fS2zptTU7~MCL;~!9L+}+eiDDG199_W8NhsP!Pb<pZ8HZ7p3Zh6G|7-BD
zBJK*?0BD&6iIz@S2g@LqcNq3q%8#+5aSoXd_yS@%!EgZX))kR2#3(iv)!eGft+bP{
z2YyABPMJTbOh_1&1C;AUwf7Qfg^R!r@MJETKQAJt8>t3REfe+VB&!k727Z~oGk=s!
zn!u@AKs8O&OW)IK!FgtpXkE>Xk+F`d8ET_)IWu2L<I;ZNW#(lnHE<J}X!*R9w*)-e
z^!z?^>hhCA@^-;Rz-}_wIf?gQboDMaPbTr*8SB?Xo_;|;fr-YG<XWC|ahI4JInRl^
zklG>fBJ;!L*-*A|N%?*1FmFb(mdihz4r*BhhZ=$^GMIB2ixiRCU`@nfWr>eXv!H*2
z+8tPY@W*7XT)rPSl2R|Ao+g`m-n7&x$bjd}XPd;DEG<PB+zCEC&)$Zyl*Y126w?hk
zxgq`tz4SaZX^D`|GbZ+swE4BB@O>sRnSE>@u7m!LWs6BEw@!S|RT0wD*~B}|X8I)q
ze`of&!dK=r9c(cv<<^Psxh6uBimtwrj1{UNWv)i8&8WmMk)ciR8R*jReIhP*i4@D+
zXYv>vCE`mfBtkj^n|P<$a!msrs$P_g4U<5;iM;Q5t|c3~y6aq3@@Ma2XC8)LI$fF!
zMW_e91&iiS!gwA^z0^}84!vb=t6o)(WeM`s26NE9*Ri-5yEm@+Hn(!DXHm$xaJhc$
z%>NEUk8S5EIN+S+__0C$AYj8aNDhgwKYl2afcOaV{|;z&DUe#6BW$=!i*?8kq&nQG
zdA$a0+3F-Ugcj#T(U?L?cgnw`G0jEC&RJijYhMsEBT%Jj+{V5be>Ql65Yv{>2h)mj
vi?<42eA+Pu=kkYDa>?q*iyXdN`AhE)<ijmSLv2N700000NkvXXu0mjfFJzQe

diff --git a/vector/src/main/res/drawable-xxhdpi/arrow_up_circle.png b/vector/src/main/res/drawable-xxhdpi/arrow_up_circle.png
deleted file mode 100755
index c13179d2205f42b983425b660ac05bbdf4632e9f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1332
zcmV-41<U%0P)<h;3K|Lk000e1NJLTq001@s001@!1^@s6j74hQ00001b5ch_0Itp)
z=>Px(?ny*JRA>d=n$K@cQ545#RMY}pS+F90MEr<gsSA;?kO(Uae}Kf!!WQYmUqEbh
zV}S^Z+So{BBvMOFNH-#FB3Nn>q3HO0r}r{F&U^2^H#4oyNxr?k_nz}T=lg!Y`=(y&
zku{sm0jRfvEnov!4`iRgCom1B>h=0B+OAu@TZ{-<3)eAl6dVD&!5WZfb4*Tx26zG<
zBlH{X@*9E<ftz3kbZX)d*P&%oM)Gao9+(H+HgSr3+mZ<+*+y^;%z<8;awylvvI0w;
zV<b31f;(U+A<=t$UIVosLQ7NI3^s*!M`&qsZI;=yoPUpUy{b$i>LU0B@@#_15pW<i
zhkQefV)IP7FQ)Pq`aw1bZslcUZVc=xBr9+bN8qB#G}SU#K$Sl&0`N35MYB21+;Bci
z`B`xSac7xosxFS;tUdLUxeMh>E*GI3K)F1-RgNuq!=!V{vyTiOuS8lQNV$M=dRFe7
zgW&}5E);JV-&vu)jzW|ZD7Q7$s4I1`;i&u6jAfv&t+wQ%V#UfGYM@zUs<rq&hm&rI
z)^waN+2I$(*j6<F@0`14eHZl!(qoeMMA7pL#iBxTI@G5NiZ#`o{rJVCp3kg}=j2J6
zg77xbmKJU&1?4!wF%GQVb3^dbQ@Zy+d)N&~9E9__tw3Xm;jSC;!w#ov|M#tc!BNL~
z%w<j-gzvJ$8HX+>(ztGrj76fhc65<56Klb2n?wA!@?#PNd7>hJWpNPb@ynX7kb2==
zFgho#2mOgSU$!MSMN~}LiMWYK($=0-y{kgedY!lS&<>>ZB?`Zh6yM-85@Je({BiYa
z{Hq0GPkHjIM@*vvK~*cg=SZYi9&0aJ^)NaBzMI*1vDnm>_$*Pn#9Q;m<Woi5J3}rl
z12z6^HxueMQU%Em|143uao!N2F^zc-0&*)Q4*!ONjBVFBw$%~w-WhX;Aj~?aeh_d5
zco!j!X-+=Y%ARvxty?5ai<#E6Mp0;pI**fgp=gO>jUw|t80PZCi95x-T8AWTofGYC
z1;?#+$r&sZ6=Mp-dE7Cyz4dBcCt=;RWKl6`fw<^ax|OgmPL!6&QtS#&^TF{e?U}s8
zFN?5EoH%6S6nBbwwSHbr<g62|b-zNRAT38f$8jHcM*nSLP=<rV!L^HNEe^e;|0=`P
z4tv5rN!YaYr0+R9Znat{AhigWBMycQb2s)ATW=>!>rk8mbB07Kv@6AIt<o~JimjyY
zQ<Fx;W)6$ek5q=E=Ur+%ND_N=O-fU|DmI)dPCH}&+t4YepoYexuqTd#7v#7t>yTGt
zOG^~?nDXq^aX-7d@{4A#<%Zh!n>^AWEem^$V^W_-A85eXRnxE1{pkdGV~$(ykXPIN
zpyh8MTOeyONB5P=2Jc=l529)Hc5h`u0*Oyw%uyl&dbRv^4sN|S3FkTy73xf1ehUHp
zxnLT^_1_YA5Z0d`C4#vA`-~)EGEVaT`|!6QttGDiKGlZ3mhy4^aNH2xYB^eTpYks0
z47cnle+N6tCjyYQ=UQ3#qnE^vAHT#AxM(s>wR9$`eTzW0qJF?qZ!f;+f5i3QPmZE!
z#I1-QiN$(Lw+QU7pY_=-fIz(!jDi`^sfj~e|9*0{i3|Fr&apf$iutd8I@>j2Ry0D}
qf9yQOd|XP`0<GS3r$Ntt?ED*vz9_Ly3Is&}0000<MNUMnLSTXdFMMeL

diff --git a/vector/src/main/res/drawable-xxxhdpi/arrow_up_circle.png b/vector/src/main/res/drawable-xxxhdpi/arrow_up_circle.png
deleted file mode 100755
index 61fd2b1e48dd4a03e94839c014b2de8fa0176a87..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1910
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

diff --git a/vector/src/main/res/layout/fragment_room_detail.xml b/vector/src/main/res/layout/fragment_room_detail.xml
index de0f95f583..59d1fbfb32 100644
--- a/vector/src/main/res/layout/fragment_room_detail.xml
+++ b/vector/src/main/res/layout/fragment_room_detail.xml
@@ -129,7 +129,7 @@
 
     <com.google.android.material.chip.Chip
         android:id="@+id/jumpToReadMarkerView"
-        style="?attr/jumpToUnreadStyle"
+        style="?vctr_jump_to_unread_style"
         app:chipIcon="@drawable/ic_jump_to_unread"
         app:closeIcon="@drawable/ic_close_24dp"
         android:layout_width="wrap_content"