From 3f838b0472c32646e295fe7ccbb0db3bd4cdcc95 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Thu, 2 Jun 2016 19:06:53 -0300 Subject: [PATCH] Blog Fragment in Navigation Drawer with Tabs This replaces the custom layouts in the navigation drawer with a `NavigationView` and adds a menu entry for Blogs. A Main Blogs fragment is added that holds a `TabLayout` and a `ViewPager`. Five tabs are already added, but they just have a single placeholder fragment that is to be replaced by the actual fragments. Closes #409 --- .../res/drawable-hdpi/action_about.png | Bin 1764 -> 0 bytes .../res/drawable-hdpi/action_settings.png | Bin 1505 -> 0 bytes .../res/drawable-hdpi/content_new_email.png | Bin 1517 -> 0 bytes .../res/drawable-hdpi/social_chat.png | Bin 1289 -> 0 bytes .../res/drawable-hdpi/social_person.png | Bin 1603 -> 0 bytes .../res/drawable-hdpi/social_reply_all.png | Bin 1652 -> 0 bytes .../res/drawable-mdpi/action_about.png | Bin 1441 -> 0 bytes .../res/drawable-mdpi/action_settings.png | Bin 1358 -> 0 bytes .../res/drawable-mdpi/content_new_email.png | Bin 1393 -> 0 bytes .../res/drawable-mdpi/social_chat.png | Bin 1201 -> 0 bytes .../res/drawable-mdpi/social_person.png | Bin 1373 -> 0 bytes .../res/drawable-mdpi/social_reply_all.png | Bin 1457 -> 0 bytes .../res/drawable-xhdpi/action_about.png | Bin 2257 -> 0 bytes .../res/drawable-xhdpi/action_settings.png | Bin 1671 -> 0 bytes .../res/drawable-xhdpi/content_new_email.png | Bin 1703 -> 0 bytes .../drawable-xhdpi/device_access_accounts.png | Bin 2042 -> 0 bytes .../res/drawable-xhdpi/social_chat.png | Bin 1374 -> 0 bytes .../res/drawable-xhdpi/social_person.png | Bin 1924 -> 0 bytes .../res/drawable-xhdpi/social_reply_all.png | Bin 1929 -> 0 bytes briar-android/res/drawable/blogs.xml | 10 ++ .../res/drawable/ic_contacts_black_24dp.xml | 10 ++ .../res/drawable/ic_forums_black_24dp.xml | 10 ++ .../res/drawable/ic_settings_black_24dp.xml | 10 ++ .../res/drawable/ic_signout_black_24dp.xml | 10 ++ .../res/layout/activity_nav_drawer.xml | 2 +- briar-android/res/layout/fragment_blogs.xml | 46 ++++++++ .../res/layout/fragment_blogs_my.xml | 26 +++++ .../res/layout/navigation_header.xml | 22 ++++ briar-android/res/layout/navigation_menu.xml | 110 +++--------------- briar-android/res/layout/transports_list.xml | 7 +- briar-android/res/menu/navigation_drawer.xml | 28 +++++ briar-android/res/values/dimens.xml | 2 - briar-android/res/values/strings.xml | 8 +- briar-android/res/values/styles.xml | 10 ++ .../android/ActivityComponent.java | 6 + .../briarproject/android/ActivityModule.java | 16 +++ .../android/BriarFragmentActivity.java | 3 + .../android/NavDrawerActivity.java | 24 ++-- .../android/blogs/BlogsFragment.java | 104 +++++++++++++++++ .../android/blogs/MyBlogsFragment.java | 55 +++++++++ 40 files changed, 410 insertions(+), 109 deletions(-) delete mode 100644 briar-android/res/drawable-hdpi/action_about.png delete mode 100644 briar-android/res/drawable-hdpi/action_settings.png delete mode 100644 briar-android/res/drawable-hdpi/content_new_email.png delete mode 100644 briar-android/res/drawable-hdpi/social_chat.png delete mode 100644 briar-android/res/drawable-hdpi/social_person.png delete mode 100644 briar-android/res/drawable-hdpi/social_reply_all.png delete mode 100644 briar-android/res/drawable-mdpi/action_about.png delete mode 100644 briar-android/res/drawable-mdpi/action_settings.png delete mode 100644 briar-android/res/drawable-mdpi/content_new_email.png delete mode 100644 briar-android/res/drawable-mdpi/social_chat.png delete mode 100644 briar-android/res/drawable-mdpi/social_person.png delete mode 100644 briar-android/res/drawable-mdpi/social_reply_all.png delete mode 100644 briar-android/res/drawable-xhdpi/action_about.png delete mode 100644 briar-android/res/drawable-xhdpi/action_settings.png delete mode 100644 briar-android/res/drawable-xhdpi/content_new_email.png delete mode 100644 briar-android/res/drawable-xhdpi/device_access_accounts.png delete mode 100644 briar-android/res/drawable-xhdpi/social_chat.png delete mode 100644 briar-android/res/drawable-xhdpi/social_person.png delete mode 100644 briar-android/res/drawable-xhdpi/social_reply_all.png create mode 100644 briar-android/res/drawable/blogs.xml create mode 100644 briar-android/res/drawable/ic_contacts_black_24dp.xml create mode 100644 briar-android/res/drawable/ic_forums_black_24dp.xml create mode 100644 briar-android/res/drawable/ic_settings_black_24dp.xml create mode 100644 briar-android/res/drawable/ic_signout_black_24dp.xml create mode 100644 briar-android/res/layout/fragment_blogs.xml create mode 100644 briar-android/res/layout/fragment_blogs_my.xml create mode 100644 briar-android/res/layout/navigation_header.xml create mode 100644 briar-android/res/menu/navigation_drawer.xml create mode 100644 briar-android/src/org/briarproject/android/blogs/BlogsFragment.java create mode 100644 briar-android/src/org/briarproject/android/blogs/MyBlogsFragment.java diff --git a/briar-android/res/drawable-hdpi/action_about.png b/briar-android/res/drawable-hdpi/action_about.png deleted file mode 100644 index 8f39c428ac6cacd0ad4fd9e7ab4252a77ce91a53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1764 zcmaJ?X;2eq7!F0za*QByiN{V56ohOx2O)t#fg~6p2!TRSYh98JNg>%BOA;)tBa9k| z9j`Lrg(DzZ$67$N7MO|x3d${t##%eHf>taPPz$2%1_Aq{bZ2(I?|bKcp7(mb+5Gsp zC^QcMqP5JI>FO+x^_0!~MS2rS7~ zw;~|~g7q4Ck_ZzCVp(ETL4qwlB!fbQqX~qNFoOyfXCN4mhNR1tY~pa;6(S&)u!$*j z0a>7mL}c;}+ciky_P8YR_6#voLJSK9LJTaNK!IQ|U{GW#wJZahIL*t#_ZBlq1g2fE z3^wsyQX)Y-5Q%CKfKDO@h{=Hv5J)3IG%}OM^am(phzvp$kjw~x$SgX8MTUTxhloeh zNTe(whc^=oKe3523{$Z{P_NgM^i&e6Ne3Y&lL?Y3AcYcudjx2+l^ARYP-?wq890bm ztdXlQIjRIKjBpy7g|UfvrteBnsOD&u+L<=t4Fe6Z3WP{xOG&ei0>S^gDim|xT1<$% z&-XuxwMp431Qa4#G)p7K2PgHigi^60H3*EMnj{p>ob6(~48>5b3{?SpmrGbw9y0<84`R?G$Q%gbLQERO^O7T6nE`|k9tzH)zO zYBkUjeP%&pAjG$=wYB5d+u2T9eexpl_lomNYdaRdBP^?oc$9%6WM4 zIeWz3-tJl3P@BKa*wwtey21Lf682#5U`~EcDEg-JfYG7JCe6BP=e>{0ZF-*8oOr7< zS(hgC=0Bg>!S^?&{+XKd$_)D)x<4`|S)3Q|8)uADi!xpANL98!rt?1I`kR*YA2#^j z%`+~dt76BE(gg3f6!WLej1oa_flUIaGwRe^>fIvK&i-WM*W|4(>F&ta54gE~cbJ&5 zP;s_+Q&cm*yXnHj>v($#;eaPO@i*Hn%N`Z#O=2)`q@@c&kl}eoDp}Q|BLlrMkI1Z*a<;vz{^UhU$)M)aI)j%o#hofZ|`kc3k_6#)k;I*Ch<{-CY0?yxT|eIYg}<$ z%`faQG?#3fXc5o&H9?GeZpZM6>OqhUF*tAj6`i|B}|^WXGgjkRaxz9thAG61^D_FQsCYe&)= zve%GOdR=9UC?lp@8}j-dLfgu_ZkDaQ*I;i~RZ@obb{p^d;W1)^M>R1X_BBB-k3S{b z7ayBCFkInP!t-j3}ZcC`IeV^nVC67AM3R#!`@hZ$Dp+Fic?11O}ZO)k|f zOFNYbQIGgFKG*7nN1Qwy86rtav!H0DZvU@UkKwg(J?UO1eZ#Z!!|7hs8~t$4X3t!H zQOp$OT()5%aB>xI{lSmCcy8>Abjem+;YR>ny#6rCQ2)m9s|Y2(6V z-?qSx>gbZ9;a8i#S$~Qosc2Hf?X9T1n6kw=J!V~|cj_aZ2U@pI^^74Zw#Z3>L`qlRr^9$-;)*7r%7WG+gJlVd=BJ4~c(9v`8vcDI& Y6RKUD#(0B`J1qYlJ~xhYK4M$$KMBsYYybcN diff --git a/briar-android/res/drawable-hdpi/action_settings.png b/briar-android/res/drawable-hdpi/action_settings.png deleted file mode 100644 index cc32e2d1d2f1838fd2ce1c35dbdeff740957c5a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1505 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 diff --git a/briar-android/res/drawable-hdpi/social_person.png b/briar-android/res/drawable-hdpi/social_person.png deleted file mode 100644 index 7b64886f7d79288bdbc7ba5377f73dfd5b1943e8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1603 zcmaJ>Yfuwc6i$Lr3tDI`1GF7nqf{G7b~offwu#}fq=JTG5+ypex+ELOkbSUOO`y{n ztu3XBr5)e4KCx3rWvYlR3N*p7fcQXhRD6^uSRJgQ#exd9-5_9p6nAF#-h1YJ-}%lx z-)u=%=6mBq-w5ULc;nM&q6Th-0`J%m?wc)mT+A&oY?_%hQa09wF*q;TO6A}{I)UZl z1{|{%7Bt~%9xrH$-DGCX`q_wuA|zNKN8%=E4$b4KwQd@- z)d;iYdPq;F;(7L&MGS5%$~0Mu@+~T>P&)%qyAh6nz*!7%6AsdexHZB-UWD5R!k`cs zOkwji!e^q)`Ya%oVsJn%fy5R_0Rsw|1eQT6nJONTLNElvQV>##VF-~c5eNo`9wAqa zvDy#=svD}soixHcmZcF8bh%s-SAv9MazR+7Qh|^ZluE^1hS*t1vY1;;Iwub^pt#e* z*lE^IkwAbE%b}LA8X>3jSqlU`LQ6V_u8F%a(2da`EP(~iPt zB?L~g!&vKctYTDbzzhVWP}n?~%TYe^WDZwPB0U5ji~EXaug1Ec-V zsE0$Ge*)VP<8p@)>*FNncZM_e9#vO2k0+=~N0UwN%YSS-Gs`sR^@dxewm5s-$~fE( zbhUhSJX%t|a@yGQ3((6FSH;u(g@-HCB2FDCof82k2e%zWGp=2t7S%qez1Zh<`Tr~{ zqV9dvecG$J@AFmnUG1sWp03_dP!Gi)Iv5!yCg*t~7YCd9^E~UT8VIvwLxA>ez%bWe7iTvK_f4h9qpDxQ7SeWhCUI@Fl{I#IH{P2P6 zeXj&><>&h1=!p*bv6wP(WuyOtkl1gIG~M#FS38b2*6D)Z;`LmWk}E!u^q*`khWXh( zy52wc)ngAaG%0Fh=i$8b>L<6QladTK;Zu$qtqniC%zt_^9szfj&3K|8dmFQzt@6|{ zQ7t=E{aqq<<1}l#a6*=Y?%mxUH9??QCpy}^+A!Pgxzj;yiU6W27uEDM;zUXHwUTP$ zh)-Z~Qz_o5Uq)L*HN4ok_!WlIZLQh&ip{nI^>ZV(2rlOI*77TyH$_NOQlIERNbIz_ z-@V^0GhNtKQ}r9(()VqXrQS(Uzon(IH@h<&b|um z+MiOva60_T3DLKfuKigvNdcK~Wz5%Y&b9MN<2lwF)3;9PytbxN*o>-Arg~)$dVkI= z&e&eCU$>)mU?8zMMIj&ywgbnqGN{xS2!tg_8hH?A>80@Y9BRvFe`IDO#8-1qwv_6}JmvgJf?wujGCckFb0R{rbR Pz;8W0EfcLsS-j$3-m_|y diff --git a/briar-android/res/drawable-hdpi/social_reply_all.png b/briar-android/res/drawable-hdpi/social_reply_all.png deleted file mode 100644 index 377f6286ce9d88bcb8e7e4bc2b331d583f5cd6c3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1652 zcmaJ?c~BE~6ked#h(|%HBG6_HDq_PPArX=qAP3QClYxMU&=y0oAt@vqvWtYsC8Cse ztQB=Ecm?q&AmB-((AsGo8H5P6QmF@c&_FFhEuBH|m~IfTf0XXb?(g^ByzhJ0H?zf2 z@>R3lecS;6m@Qo`R!}G6d}(h|-}SB|Mbxp7jEpB^a1EKMG+}^1jVEKERIg0I6qr(- zmEMf41OT_iy4ZL!UiJY`h3g@uGX^s2jT9OHR)(96N>wUGg2`Bl&cJ63He6zWIyIlM zo+CqKMiHjft+tr37>hhsWl2?W)r{~kaHW|?5$G{e37Yk327+hiGsbv%)ZOWZ8Q@q5 znaXFpDk@$U1&VMJ267-INQJCG!4+%>Wg}cRmkF{E6oF9|jD!TC2#*uOLr`%1VNlsj zY7I{zmW=13EIva^l13g3XJ%$XnZXclN`X->mkT2-n8gaBB7%r41F19z83_Lg1~Epc zOgbZ}!wsO5QJIWqkbDMJ>8lp>#z|TOF+L`0V6a(fgi#1_wlonall_0FUOyR4kP7T| zz5hu}#AX>WSb-6EhDk*&PUG)PW#oxWn3BXzu{fSKF~uk?PU3_XH-e%V4upa-rAlXT zdd3hk8Bb~;NTorANyU5y#R2JbY91$4A`l=fHb;nvQ8W_evQcg%TPPApIA{o4h)!U| zxGF=B8ORB&`Zbm_CDthhy^+c+#!R|Rm|9}O_25|3Jl)i_u%_f2$Ev5UC3s3KOcet= zSNpG3Pq--kIIok!rHo1GV+Km^CQ8`bB^TEKfU83)7Q~uw^_SXr&JuWE>8)t$AEn(F z3XPsW*b8l*@`5i<+CsT&{4VF+W86PA{Q+!D@OmS42?K(>L*~wHewP+d@=;4I8vMAj zr}F6a(n?EpgQh;@VoAXJ^p5jwbzR?dRSg6-rGJ>vT%$<1Ujr-y-1A*GW+fg?V*Bi1 zK0I0E@XNVUekm%T@JU?tJf`cjd6%r+s5YZZp$#E-d7e5?v_FYDOLvdhpVV^0`^HkM zSHD;9G|CD<@=9_nS(U=$BlX{BZ;p5T4D?)Wg!Ap$S=`oVKxgZ!?LX}*+vnQZdb4~( zABVKua4Z3!p>C_R42{{@sc?$5T4OjY|l zH%VUC!>}g@A6D(jZW^ux(j0q>>kc{W^;K;tJ{tdXMJl@pFYj$%KnI!&zO^4XyxMb9 zVt4K7>S|GUwEVi4HsQ>t!@_;$dTCjm;IQ=%cAe&Bn@6>5Uuwm*t@pMGeuwT(PZpls zlDp(D^H()3+j6~mgRbVc?iS7;?WtOxcl!dZ!?mF$tio3D`Hb|!Gm?95#Pbw7Z7*wo zdCMK!^@v!nDq7u6Zt)3QXH8&FL1)QahK7{AIDUFG-+gaufvoW?G2rHNBq@@$Xz564 z^?|qxn`%wzW!O4<-<&>=b1mtE?Ha7iVg99bs8}51G2@*rks^X=hpoQt{P{(n9h+6X ztbcdhqQJ}V^?e5%`D8?He=fRaP+$1?v1ek=)vsqJ2mCk+Sl+hs_>O_ZwchlU%L5T@ z*~2cr;wJAC3jtx|gB{Vwu7pMhw{yM-hq*gOnQ22h(eAvncYIrYe1BWp7x?$D!=aC7 zMxTjzT2E)rS-vi8d+u`O+7pY#w@5|PqeN(E!=ag_9vm03eW-u2yn)#v6ftR_#&-M7 za6q!K?xu&Y-;3k6_KHTAJ?7pXi|w{DC&_(w6qFkPIfZ5gp4Pd%oPhw`#v#)0(Uy4U Oe?S^37uO0m7W@NZe|=g2 diff --git a/briar-android/res/drawable-mdpi/action_about.png b/briar-android/res/drawable-mdpi/action_about.png deleted file mode 100644 index 7c57436fc57705e300e32dfb04a13508b47ec534..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1441 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 diff --git a/briar-android/res/drawable-mdpi/social_reply_all.png b/briar-android/res/drawable-mdpi/social_reply_all.png deleted file mode 100644 index 86334552edec456966f3b5bd4b9e00b73a180bd7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1457 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 Ql?nrcr>mdKI;Vst05B|kTL1t6 diff --git a/briar-android/res/drawable-xhdpi/device_access_accounts.png b/briar-android/res/drawable-xhdpi/device_access_accounts.png deleted file mode 100644 index 0bb1359520c41d9993caf83f00247ce688768101..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2042 zcmaJ?c~leU79S*7RzYMD1v?}G6d}ok1V|(bAp}#CG%Up+wKgOpj4+v)3=kG6iw_W5 z1Vy2U=u>2?S`|dV1&j+vo}#Zr9!lGT)D~N5MdVfLad{IJ+ds;i@63GnyXXFX_jkX0 z&zT)EX{4R?5^Dee>_lq?(Zn8VdM)P@-&SPn_r&IgN67IQY%`vr(855N3QL4R5voXn zqhWfx>q%(s2AqJNn#AQI> z+lNeK)2cReqXojZxrh^woQ&fdE}fo{kwMD{pkdl1I>g~{=nN*E$@C{8{B@aXT%q?@ z>nO7f0$8WiA{rdQ)S!t`k%*CvzbOVcWe#%-pUQfav1T3CT&+E@%roxMd_GKOQiWK08w z$FOM-C{ZX8waN1uA(3!JY8|dnD`AmwHOM%E}DzXsf86WC*NDF zYECUI;hb1HA%<>h?O$3w>mugIWWF0*;_ze< zdH^ooPF566?wYJ&2yY#U%PTwP?e3LIVJ(~@EgIl@#N@jeXodv_8-v8~km`7%T2pYs zviz**Zu|Lx0^7LjE`~INKi_i&sg68-Z`-Xdzmi*__k9h(>fM1h$(olXsC1Rr@n`2Q z)!C*fY8vxACkq(cbNaIh;IVcO*f#%%gs+7W5I(C7sxMA zuhjRty6qjOz!{HwU1HJ+N}r_-s*4T&tXO05vt-!Z5NSZ34@^TI!Ta1vEp4a7`F3m5 zEQ%*M+w8b?u2(PHTGR|qOmF5l`9WZDS68p+w!Oc{R2$j+nZlV-pJmM@L9Mo=cFLx4 zj{|K#ETZ+jq>3%%nA1PIotX}|@~4J0IrU-UX4Q?EFBTpYCWr3uw=lcI3>yBCJg7E& z1N`?w@T(>9jiHSK>iCL_>#n?j%M*4!DiBWD_D|F{T}*%Oy(zJZ)zBSiG>fUo@u|bo zV#{(@UUvETQnQ!Y9&w-3gK%Sg!63T$k3{Ej7gD4&Z^Wqv-zxCiqHT6bh;oh19t^R_ zT`x*pZe7!Hd#15Wb;*6jg`rJu1*3ZR!?Ht}257v@mXwp%aJxn{%73_ruw#xc`y~AH zfhW&jZNClQuo?xPS}xpFCVH8(KYMjtW#!lN<8UtjxWwq|un|_D z|8@62fQ~cUQ%Wqh*it9i&sJ95J-Mhieczc6&3xlbWd4UX1T+L^a^CBOi~4oc()AisrcxAo9E}h#b3#y z`V7r4VxF<{X`cWoW_+ujiVaulDbi!-^|vqeFF57c`_s20SF`QAAGa2NUcH&h?# zd{k4>zW-3Id28`R#g}wa$$3FQpc8NTJ$DhnwGJq;ld~R zz{$#fwfaa$3a5VhyRj{c!@RETJvLO_u!vEPRJIgdq>flxQ_6q$_v%-v`&l=V<_Yec zBmMh(x5?UryQadZFZ!-=&s62TS=}A4=Gg*=_{%yso}PMU`WuTPq=Mu8PYeDBeBc|a diff --git a/briar-android/res/drawable-xhdpi/social_chat.png b/briar-android/res/drawable-xhdpi/social_chat.png deleted file mode 100644 index 3f58695c5981c55cda078b0b96336b7a4a609b86..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1374 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+m{l@EB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%uvD1M9IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr4|esh**NZ(?$0 z9!LbN!`Ii!Gq1QLF)umQ)5TT^Xog;9W{Q=mnWL+di@B4jlYxt&p{t>#iJ_&diIcOV zo2j9>iIX8ruSMv>2~2MaLa#GUy`aR9TL84#CABECEH%ZgC_h&L>}jh^+-|YN zX&zK>3U0SJ;?%1Tbc{YIYLTKECIn1BASOKF0y*%cpPC0u??u3bz3J{-X9fnw3!W~H zAr-gY%-ZjF*g)XeWV59TW-SeV9&Zjzn(ChL%(Oym9;2gVMRS*WM@xe!Be!(VpOp%R z=`Vv^nVfRoSe5OYY!?|SeDwS0x#y>wi8;B%Zj%6KHVh(d+On5&yxL0+70ZizY>%84 z`}a#~Q1N54%*j)#U+qZv|D@voZP!wUFi+)6%a=1$+02`ySIXdV+}?)u!t*P#lhsPa z)fnGpKRq>ng5JMf7A6d}a>sq=@bflYI@QkRQ2ErEIpBrGdgg?Pg}J-Z_GjMP?O}Dj zFpkyX%#`(>`qMs@w?E|S{ZN0Qb^{kfrIL-ZZ4}qz#ivf5EmNt#Z5ev#Y#VRv^uA?g zTTS{`YBTscyBA2Eu!-Gl(9fvfmSN1W^QKJ18m9HRYyq>*KJ!R5{8VYbMW=Za)1J@i z;kNtkbX@mc+LI+|qjuNQ?rZKuKGX9&|NR5$fz5&ZZ1_n=8KbLh*2~7a5 Cw%Jku diff --git a/briar-android/res/drawable-xhdpi/social_person.png b/briar-android/res/drawable-xhdpi/social_person.png deleted file mode 100644 index 357229b80de402e4fc169bf28540ac472d448d6a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1924 zcmaJ?X;c$e6rO+}B5EU`EG|R9rIKwzLY5L)lCTJ&7!nDdVi}WxM3PKM1__835o=W} z*wf;MCW4APu82?-wTco&TNlI)k3t2CU`0@iOD71{AKE!*=DqvQ{l5F%`|drnGA=e^ zl(UyJ005(+B83us4Y9pWj`(-CI{iMrcw!n`LaFwLsnP8BKhZATK3Yjspd#0RdT5Iz>Sbgup;16=Kr4OfDH@&>=bvV$kSp3Pk6z*gQG}4n8D2nn9Vu zlL*5HW8oH`q{1*gk4DSP%%o-pP*FoF4dQaSG&+OEU{G)miZM%v!6u5%=sUz9M2rf9 zT92tw9cW{O=c5@IpM)!YpMqBZfmUZ6EE8TZnhDm^AS&IK(vYKA{Qs_6?FVloCPDtw z`$=M>G)s@rB#05sFevbgOYyaZ((?oc1jbN<6h$>dRg6=i7;03ZdQcG0qC%h;R;YEh zlL3TS%!|?)F<7TSqJ(@B&OueHl{^-Q0fjO+Oja0O2tgu<%Y?WhW|$x}oCUF&VbBm( zh$=F)hz=XVDhIIaaBe^#GiddAWFcZuFGQ5#22=|UB+XNQUd!kC2C>RdY8l8Q z;Imq2xEPx4YCpQ_p(DJ1Y}*fwiyI$WAJO6cZonJ+b>o6$d|vvZgrQQ??aqzO(QdQd z>Qa+3Zm{b2G7pojhZq5_ZfkO!R)u7@k9TYr{2_Rg5E}a2tJf_|>M??tI7cd#f3cI; z+R@d}`JDgKy&T?^Ub5lD>KC;uk``um@q11@zQ3qp^O~kg?OtTHns5Y|3s7>$g^aW~ zT(wgTm{)GzxY2s-l-T0X+1j7+`t|trj@=gu%;)Rs>JoCq>iqfLz+#K1#_@(FubGnD zY*`!R@NKDnhBINoX|>)(YBz%G+ERO0;wLE@RZ!&mfLPVd_L34U?k?%lYZKaYrk2Wu z-HyY5nO`A zZ(K@my$iIx6zI8IaWtpGMFrm&CH%lhqZ zU3T(POrAAfFoyH+r^BfQ=Xy?AXBuC|Tg>d>bCthTI3jDS&x-sTxMbN~S@F?%F{HK$ zoao7iHO4?y>RH~{MWc0j(VYSzr=Hn2>6H13F{$METi_N-Hc!6)kQIK=2@I@n>^cAJ zV$p>3B!ani_|pw#-j7y(?OGm_XWq_vRt9rD`?l`nyuHUNJ;dqq@vK9w9$nnGU92i= zLYdrwZnEz_4eLw%t1o*m>@&kv(aNA1KfuA=^8NByncJeu==>Rd zN%7MO%5>h@qDE>j1%k&S5ClY3jGQSi4{@u^l2M6t= fxx2aJ4KW#zUHr0ijHbw9`!7a`Vuky|lJour0%G^p diff --git a/briar-android/res/drawable-xhdpi/social_reply_all.png b/briar-android/res/drawable-xhdpi/social_reply_all.png deleted file mode 100644 index f10a492c0229009a9b358cbd8ccae910ba21cdab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1929 zcmaJ?eNQ?+CAsq_kEu8{C>~#ywC4F zcW06`&fU$&jY6Tgi{nMf~NHm4AG|H$$gHmd_l$aD@q| z6ny5Ya0w*Q2{ENAK39*W~uz1m692nL=$ zOfs8Zk%1(OVxQ(BEk0985IO_|v$L~V*tqU zw1G&*{;T(e#0FW84g-@h1HM@=CkL0|Z%?H|gnA4maJ>x2H%*^nk`gCygA&&P!jy0p z3`kJ9N^AE_AtVw+tThm*R*s29d?v}kQmGV3I5$=xfY?xYG$exI7?{U_c`=-5p&&LK zUc!lnr?DbjzFC85iD|6jKP>!GtX&Km9hq5#=~eGwida3a0j8QpR4=S$Nh~icBKoC# zPqB&@)-r_^z7z|R#enwFJ~!%V7pWin_L*==2L_K+5Cd49v%-A!s zcCDH!@IE3*uJr~1liT}c05fu4S6rYE#Dkw6K|xXCpGgh9)laGBYB^Ou+0@uk&u)>2uLJ zac8{lV4=k2`!{)AKl9d}DDPb{y|(q{Usi0lHBh(Bo~)oU=yd514im1v?ybW>$Ry*F zCc0I86ZN?v=}xFt9M0crUT>;W-CcSWd2e8Q2(_uh2JF1@@#sC%Sd}kq`*f}#p~Lo5 zCc~q;GLKe#v@_RNR#K}F_76~JhBKspQ$HD+J4mvtv6n6%G#JX&`pCaC3)N=`8TGlhB= zXO7=*m~-)*)39vf^WsrXVq_D4fN-r1h+1sx4}CbFRZ~S!9#Z5|?KQso9rb zYtA+gnQw3v-pOTo+-+*hmW60IN=0etA?RwRpLuj_uHbOvR=Q)~z(iTzae?7>VNc>M z#-!yMH-?+gz24K|{LLd9E{KL#72_)#5A=>Mwyv?xAAo*TxP|z8AG^3gUeKPk7cvic z_P3O#{p!fI3gNWn+@iYGKYD=8o6meSG43N82{>fYn|`L$oXCDKNdM}=@{-b5W$MWB zOR=em+z(%)Rre40)NO|Z=W2SL?=RT79;;bZYFK!&({Cfa=V<(V*O5*~<$nM38r|$` zalGdCuM-X$wmxnWE?)cB_`wRY+iVC$CeBCbl$nFNFWA;E{Qy9fTz7P%lZM_T07dCc+NpjTNE z-tuw#<7ELgRDHGe>;=a+ko*cua75Aj&gp|WcY}H^*RdB#H}2BzSnlY`6}0&^e3s+& zca?i>(SkzHtfDUx5AC7VugI;v)3bLEm42*a%L3ZKp2yrazV~fS8-LENdmepZW_FGE z&}&(JlOKHU7xd;$oLglCLK(LBkQ!=Nb-=LG%CS(?xy?Frk*%)bZ)JbtX?md9e{o>q z##x?wAN!UTmao=X6Rc`$N^fELZhiEn2h7gWP1~Y?5p&aZSIKybbMMyGX@SH0*0v$X zfVba0&Kz@!4_vpS9I+jc&ij_vQtww_zW=3ENy`}eeP2WL?yr*;xy)9^ENb3RJwnU< t#`$Ey&=ci}))udyp1*r#SpQLqBgJwut + + diff --git a/briar-android/res/drawable/ic_contacts_black_24dp.xml b/briar-android/res/drawable/ic_contacts_black_24dp.xml new file mode 100644 index 000000000..d7e92099b --- /dev/null +++ b/briar-android/res/drawable/ic_contacts_black_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/briar-android/res/drawable/ic_forums_black_24dp.xml b/briar-android/res/drawable/ic_forums_black_24dp.xml new file mode 100644 index 000000000..039f929dd --- /dev/null +++ b/briar-android/res/drawable/ic_forums_black_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/briar-android/res/drawable/ic_settings_black_24dp.xml b/briar-android/res/drawable/ic_settings_black_24dp.xml new file mode 100644 index 000000000..ddb38f6d6 --- /dev/null +++ b/briar-android/res/drawable/ic_settings_black_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/briar-android/res/drawable/ic_signout_black_24dp.xml b/briar-android/res/drawable/ic_signout_black_24dp.xml new file mode 100644 index 000000000..a61a3158a --- /dev/null +++ b/briar-android/res/drawable/ic_signout_black_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/briar-android/res/layout/activity_nav_drawer.xml b/briar-android/res/layout/activity_nav_drawer.xml index 5b167e4ff..7eb1d4e35 100644 --- a/briar-android/res/layout/activity_nav_drawer.xml +++ b/briar-android/res/layout/activity_nav_drawer.xml @@ -13,7 +13,7 @@ diff --git a/briar-android/res/layout/fragment_blogs.xml b/briar-android/res/layout/fragment_blogs.xml new file mode 100644 index 000000000..2e618a9b1 --- /dev/null +++ b/briar-android/res/layout/fragment_blogs.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/briar-android/res/layout/fragment_blogs_my.xml b/briar-android/res/layout/fragment_blogs_my.xml new file mode 100644 index 000000000..a552dc0fc --- /dev/null +++ b/briar-android/res/layout/fragment_blogs_my.xml @@ -0,0 +1,26 @@ + + + + + + + + + \ No newline at end of file diff --git a/briar-android/res/layout/navigation_header.xml b/briar-android/res/layout/navigation_header.xml new file mode 100644 index 000000000..7f6b9a89b --- /dev/null +++ b/briar-android/res/layout/navigation_header.xml @@ -0,0 +1,22 @@ + + + + + + + + \ No newline at end of file diff --git a/briar-android/res/layout/navigation_menu.xml b/briar-android/res/layout/navigation_menu.xml index f6934e5e0..bb6652468 100644 --- a/briar-android/res/layout/navigation_menu.xml +++ b/briar-android/res/layout/navigation_menu.xml @@ -1,110 +1,28 @@ - - - + android:layout_gravity="start" + app:headerLayout="@layout/navigation_header" + app:menu="@menu/navigation_drawer"> - - -