From 81f481833c89ad2e86b95a139bc77007a9ecb9c7 Mon Sep 17 00:00:00 2001 From: John Zhen Mo Date: Mon, 22 Jan 2018 14:21:00 -0800 Subject: [PATCH] -Added icon for bookmark pager. --- .../schabi/newpipe/fragments/MainFragment.java | 5 +++-- .../res/drawable-hdpi/ic_bookmark_black_24dp.png | Bin 0 -> 180 bytes .../res/drawable-hdpi/ic_bookmark_white_24dp.png | Bin 0 -> 185 bytes .../res/drawable-mdpi/ic_bookmark_black_24dp.png | Bin 0 -> 137 bytes .../res/drawable-mdpi/ic_bookmark_white_24dp.png | Bin 0 -> 139 bytes .../res/drawable-xhdpi/ic_bookmark_black_24dp.png | Bin 0 -> 204 bytes .../res/drawable-xhdpi/ic_bookmark_white_24dp.png | Bin 0 -> 213 bytes .../drawable-xxhdpi/ic_bookmark_black_24dp.png | Bin 0 -> 261 bytes .../drawable-xxhdpi/ic_bookmark_white_24dp.png | Bin 0 -> 273 bytes .../drawable-xxxhdpi/ic_bookmark_black_24dp.png | Bin 0 -> 332 bytes .../drawable-xxxhdpi/ic_bookmark_white_24dp.png | Bin 0 -> 351 bytes app/src/main/res/values/attrs.xml | 1 + app/src/main/res/values/styles.xml | 2 ++ 13 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/ic_bookmark_black_24dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_bookmark_white_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_bookmark_black_24dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_bookmark_white_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_bookmark_black_24dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_bookmark_white_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_bookmark_black_24dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_bookmark_white_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_bookmark_black_24dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_bookmark_white_24dp.png diff --git a/app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java index e76b97086..fc4f9a323 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java @@ -85,14 +85,15 @@ public class MainFragment extends BaseFragment implements TabLayout.OnTabSelecte int channelIcon = ThemeHelper.resolveResourceIdFromAttr(activity, R.attr.ic_channel); int whatsHotIcon = ThemeHelper.resolveResourceIdFromAttr(activity, R.attr.ic_hot); + int bookmarkIcon = ThemeHelper.resolveResourceIdFromAttr(activity, R.attr.ic_bookmark); if (isSubscriptionsPageOnlySelected()) { tabLayout.getTabAt(0).setIcon(channelIcon); - tabLayout.getTabAt(1).setText(R.string.tab_bookmarks); + tabLayout.getTabAt(1).setIcon(bookmarkIcon); } else { tabLayout.getTabAt(0).setIcon(whatsHotIcon); tabLayout.getTabAt(1).setIcon(channelIcon); - tabLayout.getTabAt(2).setText(R.string.tab_bookmarks); + tabLayout.getTabAt(2).setIcon(bookmarkIcon); } } diff --git a/app/src/main/res/drawable-hdpi/ic_bookmark_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_bookmark_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..7ad39da3adb4e7edea43312e46bac72af4a97395 GIT binary patch literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8wWo_?NCo5D^BV;Z83?#se9sW& zP-?M&`$|K$V2t6p*mkWz-Y%9#4-P+d{)d0h-ak{Ml&?5RAk|;#^bE_4Hd$q@OFh*K zrkx3J@;x)b;*0zV#devZ6`P9x=PaMs&ZVDM!_AQ@cPc05$Jzopr0DpEqQUCw| literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/ic_bookmark_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_bookmark_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..9de15c51a92bbc29536fc7a8e34da51f1b6961de GIT binary patch literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8gQtsQh{y4_*EaGtCXxw1 zJlv$4!kF$T**4E|&JoEK`&v7DIc1K0vU?gE=foPj+|<4QurOEp;fvR2wk!!*Sl|(T zYJ#})J|0#>5s@Gd#a5AD?5A9Grg{A1oBPJ+{1E|*+Y6hgJ~Wk$v|JLPmeg(i-BtTS ikD%?Fw#fbFYh(9%S-#0z*fJ0376wmOKbLh*2~7a_ZbD%I literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_bookmark_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_bookmark_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..0a10c249467ff61ec41efe8951720d964cf9b8e1 GIT binary patch literal 137 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+i08bakkP60Ri8~4t9;zO$*ZCmY zY#;Wu;OUGHs%5)Iaz?{r|?s z@c(}|W*=B5!xEQty@9*PJwv*lZbnu4RXIwb+Xpg(_C> zuBdKQG}`7|c7iKr!rhKFC*N5-Xkg}-DLBwraDb8hpJ;|gt(q#vkvvDKNDNO*IwoXI*-BA)z4*}Q$iB} Dg$qwX literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_bookmark_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_bookmark_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..872349cca6ffc150af47fddd05a5cd9648619c1f GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0DIi4<#ArXh)Uf9Tc$Uww3&^)Ep zfYG3F`bPtU9&fG$ZvRPo3JW%}#O(4AJh91FX;%5|n&%$pC6=ajnX<2YQuh4FvM1lQ z&rK=QRJaj**--w)>V{~$4=b2Xu+L*+;dr3x(7+&|;Ba7nL&x!?k4IiM_UXR;PzWCs&hKm{}Ung#;dGK1}q&RP1!jxG{&BN`jM9sN0LV@mN N@O1TaS?83{1OP}SQ~Ce^ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_bookmark_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_bookmark_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..2189be346cf4bb7b0335b4e58e1c140790d1bd2d GIT binary patch literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw&Um^whEy=Vy?BuGkb_9e!~c(> znikbAnK?yak!*(HN>`4qMZQn8IFcM<{o`zG%=Szbn2|5_BT+zb;yWhqtUQE?^-f{N*#pR)!`v7Kfji}^^59SkVhFjUHx3vIVCg!0OO@*WB>pF literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_bookmark_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_bookmark_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..3faff90bb2b05245359ab9bc9ac54d7e7838f369 GIT binary patch literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawZg{#lhGg7(d(n}rDL|w(QT?V+ z*RA&1g`9$0o1=QNIhSZ;3HvoG2(8*5DR47*=X4i~|2KaB_~0@z$ZO>`L1XpjO-rS% zr}5ZY2=i5xCT0D%uC}ojy6s@RC;EniboqsAY*xFQ*O^_oE8D{RMZiO$kwwU3!Mx^q zOq?nc9GEz-6bnFEK<<pF literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_bookmark_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_bookmark_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..2b90acd7446b6737f60905b2f51679e8626ababe GIT binary patch literal 332 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%&M7z$onL;uuoF_~!iDz@rW_3?EGm zUNTfUu(%p)vPD%e9a<1CpO9?mqt$V2@8idOJZ!ByejDfKm23Y3g+IWy{qyf+mo zSWw08_2Q~`EHev-fP%w;=<5uOOhD#`d!`NzAZASoFHjuFoDWsv@JnA9J9H`$wr0 zZy3HcXmp(|G2Fn)!sA#jpO9_1M0>@t(jPOJxtvd=PO>&Pc|RxnzVQAh`+roY0l_g# z+i12;(l;(`PBDDD%=Z0`^ptaM?_NA(DzOQ;sC?I^A$rxT=L~ZUgRY)1k}vR0HUHV5 zu2p@GeNVtmJNXUEx6~ZCVB*lgz{te1$Bb7%0mRJrWoF?3G7nT=28nYBe7Fcz(gT%o zC}muWsi>^BNep8S44c-;+IzJ$YFi{=0KM{fM7-jHC@eP3T9gi}Gnx8UFc zErx>`P26mu{2lJX{Hx>)Doq|Pc*S_xU6^kbmq5Q-dcec(kJQ4;w e1!%j*4u4672{qE|*LeX0j=|H_&t;ucLK6V3Jc9`U literal 0 HcmV?d00001 diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 46676e200..e770cf102 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -26,6 +26,7 @@ + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 1f79bbf3d..bcbc759d2 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -41,6 +41,7 @@ @drawable/ic_play_arrow_black_24dp @drawable/ic_whatshot_black_24dp @drawable/ic_channel_black_24dp + @drawable/ic_bookmark_black_24dp @drawable/ic_playlist_add_black_24dp @color/light_separator_color @@ -89,6 +90,7 @@ @drawable/ic_play_arrow_white_24dp @drawable/ic_whatshot_white_24dp @drawable/ic_channel_white_24dp + @drawable/ic_bookmark_white_24dp @drawable/ic_playlist_add_white_24dp @color/dark_separator_color