From 0f7c20d01586615a3b8a3315978b6b2d31126791 Mon Sep 17 00:00:00 2001
From: Yuri Revich <icanitgs@gmail.com>
Date: Tue, 1 Dec 2015 20:16:55 +0300
Subject: [PATCH 1/2] UI improvements

---
 .../data/source/base/BaseSource.java          |   9 +++
 .../ui/catalogue/CatalogueAdapter.java        |   7 ++
 .../drawable-hdpi/ic_action_favorite_blue.png | Bin 0 -> 651 bytes
 .../ic_play_arrow_white_36dp.png              | Bin 0 -> 242 bytes
 .../drawable-mdpi/ic_action_favorite_blue.png | Bin 0 -> 449 bytes
 .../ic_play_arrow_white_36dp.png              | Bin 0 -> 195 bytes
 .../ic_action_favorite_blue.png               | Bin 0 -> 807 bytes
 .../ic_play_arrow_white_36dp.png              | Bin 0 -> 283 bytes
 .../ic_action_favorite_blue.png               | Bin 0 -> 1186 bytes
 .../ic_play_arrow_white_36dp.png              | Bin 0 -> 390 bytes
 .../ic_action_favorite_blue.png               | Bin 0 -> 1542 bytes
 .../ic_play_arrow_white_36dp.png              | Bin 0 -> 461 bytes
 .../res/layout/fragment_manga_chapters.xml    |  67 ++++++++++++++++--
 app/src/main/res/layout/item_catalogue.xml    |  38 ++++++----
 app/src/main/res/layout/item_chapter.xml      |   9 +--
 app/src/main/res/menu/chapter_filter.xml      |  27 -------
 app/src/main/res/values/strings.xml           |   6 +-
 17 files changed, 113 insertions(+), 50 deletions(-)
 create mode 100644 app/src/main/res/drawable-hdpi/ic_action_favorite_blue.png
 create mode 100644 app/src/main/res/drawable-hdpi/ic_play_arrow_white_36dp.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_action_favorite_blue.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_play_arrow_white_36dp.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_action_favorite_blue.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_play_arrow_white_36dp.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_action_favorite_blue.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_play_arrow_white_36dp.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_action_favorite_blue.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_36dp.png
 delete mode 100644 app/src/main/res/menu/chapter_filter.xml

diff --git a/app/src/main/java/eu/kanade/mangafeed/data/source/base/BaseSource.java b/app/src/main/java/eu/kanade/mangafeed/data/source/base/BaseSource.java
index 4d65b037f1..5af86ef77a 100644
--- a/app/src/main/java/eu/kanade/mangafeed/data/source/base/BaseSource.java
+++ b/app/src/main/java/eu/kanade/mangafeed/data/source/base/BaseSource.java
@@ -5,6 +5,7 @@ import com.squareup.okhttp.Response;
 
 import org.jsoup.nodes.Document;
 
+import java.net.URI;
 import java.util.List;
 
 import eu.kanade.mangafeed.data.database.models.Chapter;
@@ -80,6 +81,14 @@ public abstract class BaseSource {
 
     // Get the URL of the first page that contains a source image and the page list
     protected String overrideChapterUrl(String defaultPageUrl) {
+        if(defaultPageUrl.startsWith("http")){
+            try {
+                URI uri = new URI(defaultPageUrl);
+                defaultPageUrl = uri.getPath() + "?" + uri.getQuery();
+            }catch (Exception ignored){
+                return defaultPageUrl;
+            }
+        }
         return defaultPageUrl;
     }
 
diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/catalogue/CatalogueAdapter.java b/app/src/main/java/eu/kanade/mangafeed/ui/catalogue/CatalogueAdapter.java
index d8380ce2b8..3ba48206d3 100644
--- a/app/src/main/java/eu/kanade/mangafeed/ui/catalogue/CatalogueAdapter.java
+++ b/app/src/main/java/eu/kanade/mangafeed/ui/catalogue/CatalogueAdapter.java
@@ -49,6 +49,7 @@ public class CatalogueAdapter extends ArrayAdapter<Manga> {
         @Bind(R.id.title) TextView title;
         @Bind(R.id.author) TextView author;
         @Bind(R.id.thumbnail) ImageView thumbnail;
+        @Bind(R.id.favorite_sticker) ImageView favorite_sticker;
 
         CatalogueFragment fragment;
 
@@ -73,6 +74,12 @@ public class CatalogueAdapter extends ArrayAdapter<Manga> {
             } else {
                 thumbnail.setImageResource(android.R.color.transparent);
             }
+
+            if(manga.favorite){
+                favorite_sticker.setVisibility(View.VISIBLE);
+            }else{
+                favorite_sticker.setVisibility(View.INVISIBLE);
+            }
         }
     }
 }
diff --git a/app/src/main/res/drawable-hdpi/ic_action_favorite_blue.png b/app/src/main/res/drawable-hdpi/ic_action_favorite_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..657c4874ed3ea04d6d647b78f140e68ce0f07861
GIT binary patch
literal 651
zcmV;60(AX}P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-wXi^8zLvX{UiVY0vJg|
zK~z}7?bkbN6+sjL;BT(P!cHL~3W9~js!aqRU?LifHZ~$ku=W?kLM{q+j)LG%unIPU
zKOi6kgAx;bA&mG$EtJF;sGuUQ%?fhK-TN@!EzBur&)NN$IlDW<QY^*aMQD|f)$^6u
zgN;~@In3a0iXm@OQ^QtlLqERa5hha%AG!i%^?WVP;u!iCNO^*DxRhe}S=21Uah$}4
z1!}%y9H&wYuiFM?^?Wz3VpSWnd<{pj3|BDJM$J1MN-<n-3CimE0H&~_gQdS;fHrqf
z^98$74ELIXvU=W!yV%sD9)5s<6vL0-1GR>PBR#~x799R_pb<1$!J9r>2HIW$Xh#{S
zzXH(eGSIgQKwry1&nf^tEdxzf0GccVjaL8~F9Y2yzS2FLofN}#Q&92uK7qUkn4cJH
z9BiB+DTZ6P&;!u<6vOS7pdwD=#y`YN;Y_Fdp*5Js`bEY($IcYP+(H+d&5#ts8yqP1
zE{hfOIM57J3Mx<!u^%570rMUsDTc>oNwrpYDH?C&FH!HYuW>Wh6{tYXVi<3`z|3K9
zis8<poH`mBJ;ManwOR7ASf)qqKBLwND8-Plt2olMiia5N1k*97K)t{qW=qm$FqC3=
z)#?3f-E?S*VZP|8i3KiCU^vClO}}*qDo~$r5SRZLzKnw@hR^@(DBVV**Ko1;A&>n&
l#a0?wJr7wu50>J8j9-sAmSKRIotyvw002ovPDHLkV1h$t6J!7Y

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/ic_play_arrow_white_36dp.png b/app/src/main/res/drawable-hdpi/ic_play_arrow_white_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..29adeed052eca537465f7919165ad9c04651a07d
GIT binary patch
literal 242
zcmV<O01f|%P)<h;3K|Lk000e1NJLTq001@s001@!1ONa4CQPDM0002FNkl<ZcmeI#
zF%7~{9E9<PsVf4IfCn%ED!>J(02M_98mgdsH#&SQH!_eAzTxG6Z*B5Rn!Cd5DwRs5
zp>SqJ_xt(oF?h1|Fj%<KD_AnJm$2l{+QVStC}GKijfcUUK`0m*gob4h7M4MHSO(!?
z8H9yp5FVC6SXc(pAU1QdUgKaDWa3~||7MMPWaoUYUR>xK`-w@(4Q#Of7Nq0?mXZrt
sO8$Q=C2#6tAzzt3pTY_&tT6Gs0j^tn*T5_tfdBvi07*qoM6N<$g0Q$?p8x;=

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_action_favorite_blue.png b/app/src/main/res/drawable-mdpi/ic_action_favorite_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..60b063257eb3f373d73e98af64229b033029feb1
GIT binary patch
literal 449
zcmV;y0Y3hTP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-wXi^9SzzyXZrvE0ZvIo
zK~zY`?UgYvL_rY8e?vl}xx_`HQOeWM_yQvLqL3re_ynTUNbY@tDI{9HfR<<^h;TKD
zM6>8LCmx*;Cy}RF$@6X>w`|9BJ2UzJW_PkP@NeIk6dh5LjR6fH2C6^`90F@b<-+Dn
z0IR@sE@vN5qjFgah>~mp*aG?-#k>J4KrgTk^f+?bz@kyv=>XWu&r8I8tPPACl`9HW
zGy;eN^aIJqArFWH_O|8%R09HrT!8z4fYb$O1_YeA02=`Tn;ih7at!PS5Z^W`P1g+o
zmVnz|h_`^{yyFwVsN4Z{;Q0sQPe9$Mq@@50IR)l{R}b+QD}GiCxaJ8)<p7wo-@aS%
zqpqfDVfani#t)RFJOZ=%rg{M^WD?i|1`DAFV8-<<UH}Ujwex<&x^94)QMvYBIA1`9
rEd(GoDy`t_FG{jXlw_5^we;TsN{U&&7L`7<00000NkvXXu0mjfVVbd9

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_play_arrow_white_36dp.png b/app/src/main/res/drawable-mdpi/ic_play_arrow_white_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..57c9fa5460323823edb0289c1d15f0f561e0c06e
GIT binary patch
literal 195
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8m#2$kh{y4_Q_k`_IEb*R=ADxY
zV6uJDq_v_+Z-tYfR|K!cZcn#wZ_1w*Zwfx3^1JLFH&cH)|4gqfmxMH3rgg?BZ~AgX
zO7P4Ssfnoy7dsLbs)cmuJnq)8IA+UruCTi)d!Bot@+%Rg#TB=_7E65dSjDj^h($AU
t;!LNFTjoCMkvN)I{QpIN|NiIvIZ;mvueQI+xBzq&gQu&X%Q~loCIB@QN?HH_

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_action_favorite_blue.png b/app/src/main/res/drawable-xhdpi/ic_action_favorite_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..8254e7482b10b6cfa82924ece30c38c491e09b73
GIT binary patch
literal 807
zcmV+?1K9kDP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-wXi^9WnJ-8+-r&0<=j)
zK~!ko?U_wTRY4erpYH^<Gy;W+C}?#^H?1>M%b-OBZA63?5fPQOJ#G3Cnr)j3+Y|-4
zC?Sj%A(j2?S`>v2LO+^HS%z7Q5R%iv5#n-x=A1LvJHdIE_s)FZ`^<bZcV;f+%9Sfu
zEhV-M!zf-4bO9YeBTx^l0%m}>z!1={l}uNNvkB+~_5e*l1F#5uGjSdQx3!WPCjem-
z*8#o2QDAk2=8M2h;EY!Cr6A4*;3Cj%z{_a?xC)%rN`9sW2&1?O7zDN?oY^_xkXCZv
z#5n-m0O}IP`2g(KN=6a`81v77wJFOp295v$a4kcb&jHP)Af!y$yiPIl#UK)`wGw&{
zY%f+$L5U8%4$Lnb7YA{+0_Ut|!0a~T77KQzwE%1`+?|TeK$nN+0oIu9w_*u(c>KGy
z*9M@`V}K?bfO?Ms8f*Y!j{#yEfbSjy%-R5Gj{!z)0ERsV7`6cz@EBmAB7jyh3Ox65
z^tF<)BxfPtbfMUXMFF&uA>e^W=I?1GPpkoqP5{3=Fh39Ul=`wHfL1aN9QOd=m{u~G
z7{EZ>0{Uub{)$%8U#>x55u^urS_AWsfYVN%Rl+D<XYR+_R>=GtphYYB;RL`yYy@67
zx@uOs|L!P!mdR2=%j;npXalCIXnq1{vo)Uxz(9NiT7k(bm>&mPwUSRsIt59yXeIA}
z7L(9r+3Yd{L{$O)nTcj#%z^n4mL9Gq(sT~eX4OijfStgr4CY^&k^h`FK#*nVw34r8
zO{6)!J_g#glG!XCf~@nemCT#xj===o?gIO?lFVnVz{LvGN`3<ef$J8{`+!cZWWh!5
zz|}UQmHYt?1FB53^X722=qj&J1%*+33b<789CA`Cx$HVuRR9b`Crkg<#6Y)Ja)<v-
lVHEEUqqv=1xpL(yrN0b4zmTRj2;u+$002ovPDHLkV1h2jR^0#q

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_play_arrow_white_36dp.png b/app/src/main/res/drawable-xhdpi/ic_play_arrow_white_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..547ef30aacdebbd5bc27a3831971aa49be8813f7
GIT binary patch
literal 283
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw9(lSrhEy=Vy|FR(Pyj<q;_iiC
z7<>fM61bK%=q7O8Xj0w7EPdhfr5^#S_IEwe==vgFzHZ{arrqiL9p^2}oCQR8HlO`a
zfBt>_q&-EaGMH-9&z)oSy0<gsF~danZ+rrgMW>%IOibq!5=i7xQ8?znl*Ho#q?l1C
zmLwh%pdb>pKr}hv!ldkF|5nzo_<J+tw`KgY#gAuPEZ_0%YjW+u-(21YMHRU87y>`k
zc}eR_hl%VF4-<)DT=alRfHl0KMErSu6_?hE1x;YW&OCE+==ML_XMw(D@O1TaS?83{
F1OO`naDo5;

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_favorite_blue.png b/app/src/main/res/drawable-xxhdpi/ic_action_favorite_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..e4645e9e65b5ffcf8e2eb6c6712f42d0b2e04b59
GIT binary patch
literal 1186
zcmV;T1YP@yP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-wXi^9vSPv;6(rc1TRTM
zK~#9!?b}<ZR8<_u@y{B|R0txpq6nfwI1d#F85m}fSVHCnC8`(6g2V^uMw~8`53wT%
zBFb)L7m7&J477`RNefD%sC?Mi4Z|QTBMm#pPTKS^D~RxTX7=ovIWv3zU>*kcTEG8%
z=fBood+q<CRH;&>N|h>As#K|CC^XwaUw?HBreh|iVlpOT0*3H2zQ(6`A3M?{9LeZ)
zB4$Ldi=)>hjKu)<N3WgOj1SW!{M`{ief`x_unbFaRs&7<;dwlsCShNlUT0uAZo+8|
zc>Rc{urf`;fwlnZ>#qjff&`~F@#hTU5j>nG;qWkC<8cq}#JDEBe#PBbl_sIuGC(nF
zUdEgphk1(Y(j@HqpVviL9fwg~T93tP5)S4LD5m*)xUdCt;Xs76A$rZlYZ%`GuP<>`
zy~8^+kU2YWK?`pfN3jSMypAy~^!frb(j@%eG@v-=yp{8?8cu)4n8vojYaJGjG$&Q+
z=;-D)!GV+71P2yiaZ?!-ht_vZ-mONn_T#+c4YiRnXju=#5f`*eGi6X*A^*_eBCs2^
z7v~JO;yzvmO)mf(I2)H{8DcXF^h`Q43!te50(40hK$8muXmS=n6AJ`rQWikt3j}CF
z7C-|90(2+~paTU0^jj7{y9)$pcNRdq3Iu3Z7C>7I1ZZm(K-<*zXL?<S@j=6Y(j*+h
z+5!MtlO|yxO9sJn1psv1-#8MW?f9gJ;d~T7*#O1;+6Q_V(1T6yNvBEJgbh6iXMLK4
zEhAl2sk5`?aklRj4dS+XF02bsnuPDwUfuSJ?nslcCpSP*PpDN)bi3Zg)Ae55=)3vT
z@j1@yQaF1tB~8NqdK)y7LE`)Dh4`xr;S6C>BXAl96d`@AR{qj$T9PJVXQPcOS)9@&
zyo86k2+oQ$39n>nSZTuaeyr*OIL~55*2YcMDE9SNPrw??8>Mj8s?{AG?FgU<X`EVl
z%&buc=N-&XlhD+bO~@mXSWCDOSBw%kn=xm&+Q)XyLI0h!2i0nbwv7TfTQD~dIJp6e
zkp93mYPHav(x#X>xxKQg<QZKI>{`6t0XQ3D<_zZ9X(jI{V`|UG8*PNM8Vm9oRxJe-
zAr0Yryx0afFW`pgsVe|QNJp>)kF^laqwx{qXsZk=t^8|aS=;TnuLa%Ti@O><TF{Yo
zP@QX~Td^_+&nlLtNqD9makmXngtQQ^%3cdSgd5W&wCx7aRzMNbm3R{;H`w$L=GC*&
z-qnC2q$%-Psot|+zhHKngwNU?YexV@Naw4a9y)h~OZQ+_nuKpU5oe`SfYKy<i)m^n
zZ-&!XnARyc9R(C2?Zf4cU0tyqm!(Pgsgp5w6i|e85VO^eC;h8+xVn*(fju_|9b--!
zgD2zHWvyHtcdh#Rt05lXD^;pgsZym%m1?#A0k**?o5GT4x&QzG07*qoM6N<$g4MVT
AkpKVy

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_play_arrow_white_36dp.png b/app/src/main/res/drawable-xxhdpi/ic_play_arrow_white_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..23bb1ba9f683d095e4b5f491ca27f65f5f26942e
GIT binary patch
literal 390
zcmeAS@N?(olHy`uVBq!ia0vp^IUvlz0wh)Q=esd5F#3ABIEGX(zP-KCm)TLmCDA+O
zh=~K|4)$`!PzTWqtRaqq;Y=n48;zI9$9^et*-%xrdFN97nUQm^Ef4b2Tsj3p*v$Mq
zC(P>q_h9?aX4~CvOnkr7BGKLM**R9_-!?ZBo)o`}H7J@peP`jp6K3h^ITDPLJ%Sew
zN-)ay2nrmMU{r+gFes25R0%2tRA~T|lZNXnICQUf!}^^PrypO9kh^Uo!Tu}K=)ynk
zt9JdHybX@7YYKd$Bmt)MB#z!=zq~Y2WH*P~#?=XMira1DcbTM2iKBWzwOVlM9gt^R
z7ANJlu^XtC3!;Tv?ceOH@%|eU4mPoJi|IrlG4{9p6;8^ES$iB9z6_qOelF{r5}E+~
CQIz8V

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_favorite_blue.png b/app/src/main/res/drawable-xxxhdpi/ic_action_favorite_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..76b491e6e1cec974ef2e639fc895df64c8a80ed3
GIT binary patch
literal 1542
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_36dp.png b/app/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_36dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..2745c3ab9297e89453fc82f5d3fd2aba163e3b37
GIT binary patch
literal 461
zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q1xWh(YZ)^zFi!DwaSW+oe0%4hCv%{L+r=G)
znT%lzOe0!DGsL4>%MyiO9^|{TyY%sUrH;mw9Rd=LHutq1ECuvCCvX3G-WUyRuAF)L
z=AXNp|MkzPod4UBc}q#z?Q^CJ9zU;^|7`KRf$#jkxaVvagf8UG|7;`P@a_D=d(Xr!
zoVVQ9VZWfqenB501XPBM2&zX@Ao_^^g!h}1-e=@r3LF1d_<Z{IxvQV@pR7GLce~WR
zHNSQ|4sYf=;l56`!~uf-eSPz=H54eu90Czo&33o>$-XXz6+p4;3$0!>08tq4uJx_E
zBNzhMWhb2Wg^F?Q^1c@%%<<yOg59e`0$5~0h*fri_U&-%1_nkZ77j)Q2MA*VGlu|#
g{e%H14rW`%%LUeE-k!a$1sF{Xp00i_>zopr02sN!rT_o{

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/fragment_manga_chapters.xml b/app/src/main/res/layout/fragment_manga_chapters.xml
index ae5666a547..35569d797c 100644
--- a/app/src/main/res/layout/fragment_manga_chapters.xml
+++ b/app/src/main/res/layout/fragment_manga_chapters.xml
@@ -19,6 +19,7 @@
             android:layout_height="fill_parent"
             android:layout_marginLeft="16dp"
             android:layout_marginRight="16dp"
+            android:descendantFocusability="blocksDescendants"
             tools:listitem="@layout/item_chapter">
 
         </android.support.v7.widget.RecyclerView>
@@ -37,10 +38,68 @@
         android:theme="@style/ThemeOverlay.AppTheme.Dark"
         app:popupTheme="@style/AppTheme.Popup">
 
-        <android.support.v7.widget.ActionMenuView
-            android:id="@+id/bottom_menu"
-            android:layout_width="wrap_content"
-            android:layout_height="?attr/actionBarSize"/>
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginRight="4dp">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical">
+
+                <ImageView
+                    android:id="@+id/action_sort_up"
+                    android:layout_width="wrap_content"
+                    android:layout_height="fill_parent"
+                    android:layout_gravity="center"
+                    android:src="@drawable/ic_expand_less_white_36dp"
+                    android:title="@string/action_sort_up"
+                    android:visible="true"/>
+
+                <ImageView
+                    android:id="@+id/action_sort_down"
+                    android:layout_width="wrap_content"
+                    android:layout_height="fill_parent"
+                    android:src="@drawable/ic_expand_more_white_36dp"
+                    android:title="@string/action_sort_down"
+                    android:visible="true"
+                    />
+
+                <View
+                    android:layout_width="1dp"
+                    android:layout_height="match_parent"
+                    android:layout_margin="4dp"
+                    android:background="@color/white"/>
+
+                <CheckBox
+                    android:id="@+id/action_show_unread"
+                    android:layout_width="wrap_content"
+                    android:layout_height="fill_parent"
+                    android:checkable="true"
+                    android:text="@string/action_show_unread"
+                    android:title="@string/action_show_unread"/>
+
+                <CheckBox
+                    android:id="@+id/action_show_downloaded"
+                    android:layout_width="wrap_content"
+                    android:layout_height="fill_parent"
+                    android:checkable="true"
+                    android:text="@string/action_show_downloaded"
+                    android:title="@string/action_show_downloaded"/>
+
+
+            </LinearLayout>
+
+            <ImageView
+                android:id="@+id/action_next_unread"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_alignParentRight="true"
+                android:src="@drawable/ic_play_arrow_white_36dp"
+                android:title="@string/action_next_unread"
+                android:visible="true"/>
+        </RelativeLayout>
     </android.support.v7.widget.Toolbar>
 
 
diff --git a/app/src/main/res/layout/item_catalogue.xml b/app/src/main/res/layout/item_catalogue.xml
index 6e34fa3b64..7273d1048d 100644
--- a/app/src/main/res/layout/item_catalogue.xml
+++ b/app/src/main/res/layout/item_catalogue.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@drawable/card_background"
-    android:orientation="vertical">
+                xmlns:tools="http://schemas.android.com/tools"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@drawable/card_background"
+                android:orientation="vertical">
 
     <ImageView
         android:id="@+id/thumbnail"
@@ -27,17 +27,29 @@
         android:paddingTop="1dp"
         android:textColor="@color/white"
         android:textSize="12sp"
-        android:visibility="gone" />
+        android:visibility="gone"/>
+
+    <ImageView
+        android:id="@+id/favorite_sticker"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignEnd="@+id/thumbnail"
+        android:layout_alignRight="@+id/thumbnail"
+        android:layout_alignTop="@+id/thumbnail"
+        android:layout_marginRight="5dp"
+        android:layout_marginTop="5dp"
+        android:src="@drawable/ic_action_favorite"
+        android:visibility="invisible"/>
 
     <LinearLayout
         android:id="@+id/footerLinearLayout"
         android:layout_width="match_parent"
         android:layout_height="36dp"
-        android:background="@color/white"
-        android:orientation="vertical"
         android:layout_alignBottom="@+id/thumbnail"
         android:layout_alignLeft="@+id/unreadText"
-        android:layout_alignStart="@+id/unreadText">
+        android:layout_alignStart="@+id/unreadText"
+        android:background="@color/white"
+        android:orientation="vertical">
 
         <TextView
             android:id="@+id/title"
@@ -50,11 +62,10 @@
             android:paddingRight="8dp"
             android:textColor="@color/primary_text"
             android:textSize="13sp"
-            tools:text="Sample name"
-            android:textStyle="bold" />
+            android:textStyle="bold"
+            tools:text="Sample name"/>
 
         <TextView
-            tools:text="Sample name"
             android:id="@+id/author"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -64,7 +75,8 @@
             android:paddingLeft="8dp"
             android:paddingRight="8dp"
             android:textColor="@color/hint_text"
-            android:textSize="13sp" />
+            android:textSize="13sp"
+            tools:text="Sample name"/>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/item_chapter.xml b/app/src/main/res/layout/item_chapter.xml
index 9ea7672838..5f02487ed9 100644
--- a/app/src/main/res/layout/item_chapter.xml
+++ b/app/src/main/res/layout/item_chapter.xml
@@ -64,7 +64,8 @@
         android:layout_above="@+id/relativeLayout"
         android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"
-        android:layout_alignParentTop="true"/>
+        android:layout_alignParentTop="true"
+        android:layout_marginRight="30dp"/>
 
     <RelativeLayout
         android:id="@+id/chapter_menu"
@@ -72,10 +73,10 @@
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
         android:gravity="center|end"
-        android:layout_alignRight="@+id/chapter_title"
-        android:layout_alignEnd="@+id/chapter_title"
         android:layout_alignBottom="@+id/relativeLayout"
-        android:paddingBottom="18dp">
+        android:paddingBottom="18dp"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true">
         <ImageView
             android:layout_width="24dp"
             android:layout_height="24dp"
diff --git a/app/src/main/res/menu/chapter_filter.xml b/app/src/main/res/menu/chapter_filter.xml
deleted file mode 100644
index 1fa81b76e7..0000000000
--- a/app/src/main/res/menu/chapter_filter.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/action_sort_up"
-        android:title="@string/action_sort_up"
-        android:icon="@drawable/ic_expand_less_white_36dp"
-        android:visible="true"
-        app:showAsAction="ifRoom" />
-
-    <item
-        android:id="@+id/action_sort_down"
-        android:title="@string/action_sort_down"
-        android:icon="@drawable/ic_expand_more_white_36dp"
-        android:visible="true"
-        app:showAsAction="ifRoom" />
-
-    <item
-        android:id="@+id/action_show_unread"
-        android:checkable="true"
-        android:title="@string/action_show_unread"
-        android:text="@string/action_show_unread"
-        app:actionViewClass="android.widget.CheckBox"
-        app:showAsAction="ifRoom|withText" />
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 19994301ce..0787c78d25 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -21,10 +21,12 @@
     <string name="action_edit">Edit</string>
     <string name="action_sort_up">Sort up</string>
     <string name="action_sort_down">Sort down</string>
-    <string name="action_show_unread">Show unread</string>
+    <string name="action_show_unread">Unread</string>
+    <string name="action_show_downloaded">Downloaded</string>
+    <string name="action_next_unread">Next unread</string>
 
     <!-- Buttons -->
-    <string name="button_ok">Ok</string>
+    <string name="button_ok">OK</string>
     <string name="button_cancel">Cancel</string>
 
 

From d7f5787ea021528f905bd06c2698c4e761c09ec2 Mon Sep 17 00:00:00 2001
From: Yuri Revich <icanitgs@gmail.com>
Date: Tue, 1 Dec 2015 22:18:19 +0300
Subject: [PATCH 2/2] UI improvements 2

---
 .../data/source/base/BaseSource.java          |  9 ----
 .../ui/manga/chapter/ChaptersFragment.java    | 30 +++++--------
 .../ui/manga/chapter/ChaptersPresenter.java   |  9 +++-
 .../res/layout/fragment_manga_chapters.xml    | 44 ++++++++++---------
 app/src/main/res/layout/item_catalogue.xml    |  2 +-
 5 files changed, 45 insertions(+), 49 deletions(-)

diff --git a/app/src/main/java/eu/kanade/mangafeed/data/source/base/BaseSource.java b/app/src/main/java/eu/kanade/mangafeed/data/source/base/BaseSource.java
index 5af86ef77a..4d65b037f1 100644
--- a/app/src/main/java/eu/kanade/mangafeed/data/source/base/BaseSource.java
+++ b/app/src/main/java/eu/kanade/mangafeed/data/source/base/BaseSource.java
@@ -5,7 +5,6 @@ import com.squareup.okhttp.Response;
 
 import org.jsoup.nodes.Document;
 
-import java.net.URI;
 import java.util.List;
 
 import eu.kanade.mangafeed.data.database.models.Chapter;
@@ -81,14 +80,6 @@ public abstract class BaseSource {
 
     // Get the URL of the first page that contains a source image and the page list
     protected String overrideChapterUrl(String defaultPageUrl) {
-        if(defaultPageUrl.startsWith("http")){
-            try {
-                URI uri = new URI(defaultPageUrl);
-                defaultPageUrl = uri.getPath() + "?" + uri.getQuery();
-            }catch (Exception ignored){
-                return defaultPageUrl;
-            }
-        }
         return defaultPageUrl;
     }
 
diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/manga/chapter/ChaptersFragment.java b/app/src/main/java/eu/kanade/mangafeed/ui/manga/chapter/ChaptersFragment.java
index 1563d86d71..8478188a1e 100644
--- a/app/src/main/java/eu/kanade/mangafeed/ui/manga/chapter/ChaptersFragment.java
+++ b/app/src/main/java/eu/kanade/mangafeed/ui/manga/chapter/ChaptersFragment.java
@@ -15,6 +15,7 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
+import android.widget.ImageView;
 
 import java.util.List;
 
@@ -39,9 +40,10 @@ public class ChaptersFragment extends BaseRxFragment<ChaptersPresenter> implemen
     @Bind(R.id.swipe_refresh) SwipeRefreshLayout swipeRefresh;
     @Bind(R.id.toolbar_bottom) Toolbar toolbarBottom;
 
-    private MenuItem sortUpBtn;
-    private MenuItem sortDownBtn;
-    private CheckBox readCb;
+    @Bind(R.id.action_sort) ImageView sortBtn;
+    @Bind(R.id.action_next_unread) ImageView nextUnreadBtn;
+    @Bind(R.id.action_show_unread) CheckBox readCb;
+    @Bind(R.id.action_show_downloaded) CheckBox downloadedCb;
 
     private ChaptersAdapter adapter;
 
@@ -69,20 +71,11 @@ public class ChaptersFragment extends BaseRxFragment<ChaptersPresenter> implemen
         createAdapter();
         setSwipeRefreshListener();
 
-        toolbarBottom.inflateMenu(R.menu.chapter_filter);
-
-        sortUpBtn = toolbarBottom.getMenu().findItem(R.id.action_sort_up);
-        sortDownBtn = toolbarBottom.getMenu().findItem(R.id.action_sort_down);
-        readCb = (CheckBox) toolbarBottom.findViewById(R.id.action_show_unread);
         readCb.setOnCheckedChangeListener((arg, isCheked) -> getPresenter().setReadFilter(isCheked));
-        toolbarBottom.setOnMenuItemClickListener(arg0 -> {
-            switch (arg0.getItemId()) {
-                case R.id.action_sort_up:
-                case R.id.action_sort_down:
-                    getPresenter().revertSortOrder();
-                    return true;
-            }
-            return false;
+        sortBtn.setOnClickListener(v->getPresenter().revertSortOrder());
+        nextUnreadBtn.setOnClickListener(v->{
+            getPresenter().onChapterClicked(getPresenter().getNextUnreadChapter());
+            startActivity(ReaderActivity.newIntent(getActivity()));
         });
         return view;
     }
@@ -247,8 +240,9 @@ public class ChaptersFragment extends BaseRxFragment<ChaptersPresenter> implemen
     }
 
     public void setSortIcon(boolean aToZ) {
-        if (sortUpBtn != null) sortUpBtn.setVisible(aToZ);
-        if (sortDownBtn != null) sortDownBtn.setVisible(!aToZ);
+        if (sortBtn != null) {
+            sortBtn.setImageResource(!aToZ ? R.drawable.ic_expand_less_white_36dp : R.drawable.ic_expand_more_white_36dp);
+        }
     }
 
     public void setReadFilter(boolean onlyUnread) {
diff --git a/app/src/main/java/eu/kanade/mangafeed/ui/manga/chapter/ChaptersPresenter.java b/app/src/main/java/eu/kanade/mangafeed/ui/manga/chapter/ChaptersPresenter.java
index afdde3f9f0..3358e7f230 100644
--- a/app/src/main/java/eu/kanade/mangafeed/ui/manga/chapter/ChaptersPresenter.java
+++ b/app/src/main/java/eu/kanade/mangafeed/ui/manga/chapter/ChaptersPresenter.java
@@ -1,7 +1,6 @@
 package eu.kanade.mangafeed.ui.manga.chapter;
 
 import android.os.Bundle;
-import android.support.v7.widget.RecyclerView;
 
 import java.io.File;
 import java.util.List;
@@ -122,6 +121,14 @@ public class ChaptersPresenter extends BasePresenter<ChaptersFragment> {
         EventBus.getDefault().postSticky(new SourceMangaChapterEvent(source, manga, chapter));
     }
 
+    public Chapter getNextUnreadChapter() {
+        List<Chapter> chapters = db.getNextUnreadChapter(manga).executeAsBlocking();
+        if(chapters.size() < 1){
+            return null;
+        }
+        return chapters.get(0);
+    }
+
     public void markChaptersRead(Observable<Chapter> selectedChapters, boolean read) {
         add(markReadSubscription = selectedChapters
                 .subscribeOn(Schedulers.io())
diff --git a/app/src/main/res/layout/fragment_manga_chapters.xml b/app/src/main/res/layout/fragment_manga_chapters.xml
index 35569d797c..6940e96a4d 100644
--- a/app/src/main/res/layout/fragment_manga_chapters.xml
+++ b/app/src/main/res/layout/fragment_manga_chapters.xml
@@ -43,39 +43,35 @@
             android:layout_height="match_parent"
             android:layout_marginRight="4dp">
 
+            <ImageView
+                android:id="@+id/action_sort"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_gravity="center"
+                android:background="?android:selectableItemBackground"
+                android:title="@string/action_sort_up"
+                tools:src="@drawable/ic_expand_less_white_36dp"
+                />
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:layout_toEndOf="@+id/action_sort"
+                android:layout_toLeftOf="@+id/action_next_unread"
+                android:layout_toRightOf="@+id/action_sort"
                 android:gravity="center_vertical">
 
-                <ImageView
-                    android:id="@+id/action_sort_up"
-                    android:layout_width="wrap_content"
-                    android:layout_height="fill_parent"
-                    android:layout_gravity="center"
-                    android:src="@drawable/ic_expand_less_white_36dp"
-                    android:title="@string/action_sort_up"
-                    android:visible="true"/>
-
-                <ImageView
-                    android:id="@+id/action_sort_down"
-                    android:layout_width="wrap_content"
-                    android:layout_height="fill_parent"
-                    android:src="@drawable/ic_expand_more_white_36dp"
-                    android:title="@string/action_sort_down"
-                    android:visible="true"
-                    />
-
                 <View
                     android:layout_width="1dp"
                     android:layout_height="match_parent"
-                    android:layout_margin="4dp"
+                    android:layout_margin="10dp"
                     android:background="@color/white"/>
 
                 <CheckBox
                     android:id="@+id/action_show_unread"
                     android:layout_width="wrap_content"
                     android:layout_height="fill_parent"
+                    android:layout_weight="1"
                     android:checkable="true"
                     android:text="@string/action_show_unread"
                     android:title="@string/action_show_unread"/>
@@ -84,10 +80,17 @@
                     android:id="@+id/action_show_downloaded"
                     android:layout_width="wrap_content"
                     android:layout_height="fill_parent"
+                    android:layout_weight="1"
                     android:checkable="true"
                     android:text="@string/action_show_downloaded"
                     android:title="@string/action_show_downloaded"/>
 
+                <View
+                    android:layout_width="1dp"
+                    android:layout_height="match_parent"
+                    android:layout_margin="10dp"
+                    android:background="@color/white"/>
+
 
             </LinearLayout>
 
@@ -96,9 +99,10 @@
                 android:layout_width="wrap_content"
                 android:layout_height="fill_parent"
                 android:layout_alignParentRight="true"
+                android:background="?android:selectableItemBackground"
                 android:src="@drawable/ic_play_arrow_white_36dp"
                 android:title="@string/action_next_unread"
-                android:visible="true"/>
+                />
         </RelativeLayout>
     </android.support.v7.widget.Toolbar>
 
diff --git a/app/src/main/res/layout/item_catalogue.xml b/app/src/main/res/layout/item_catalogue.xml
index 7273d1048d..eeb72151e3 100644
--- a/app/src/main/res/layout/item_catalogue.xml
+++ b/app/src/main/res/layout/item_catalogue.xml
@@ -38,7 +38,7 @@
         android:layout_alignTop="@+id/thumbnail"
         android:layout_marginRight="5dp"
         android:layout_marginTop="5dp"
-        android:src="@drawable/ic_action_favorite"
+        android:src="@drawable/ic_action_favorite_blue"
         android:visibility="invisible"/>
 
     <LinearLayout