From 97cb8d41a5ae90450ac3031d33b298867ffa129b Mon Sep 17 00:00:00 2001 From: Morgan McMillian Date: Fri, 21 Oct 2016 08:42:49 -0700 Subject: [PATCH] re-introducing tabs --- assets/.assets.index | 3 ++- assets/StreamTab.qml | 2 +- assets/icons/globe.png | Bin 4387 -> 1457 bytes assets/icons/home.png | Bin 0 -> 1137 bytes assets/main.qml | 24 +++++++++++++----------- buildnum | 2 +- config.pri | 1 + translations/Goober.ts | 11 ++++++++--- 8 files changed, 26 insertions(+), 17 deletions(-) create mode 100644 assets/icons/home.png diff --git a/assets/.assets.index b/assets/.assets.index index 48d7d0a..a2ab220 100644 --- a/assets/.assets.index +++ b/assets/.assets.index @@ -1,10 +1,11 @@ 1 -34 +35 icons/bell-slash.png icons/bell.png icons/comments.png icons/default_cover.png icons/globe.png +icons/home.png icons/ic_add.png icons/ic_add_bookmarks.png icons/ic_cancel.png diff --git a/assets/StreamTab.qml b/assets/StreamTab.qml index 4430e3c..220f1d2 100644 --- a/assets/StreamTab.qml +++ b/assets/StreamTab.qml @@ -216,7 +216,7 @@ NavigationPane { onCreationCompleted: { switch (stream_type) { case "Home": - endpoint = "/posts/streams/me"; + endpoint = "/posts/streams/unified"; break; case "Global": default: diff --git a/assets/icons/globe.png b/assets/icons/globe.png index a020ffeb7eb37253f928c475694bac90cb259da0..404f10790acc42ba800496dde8cc7f50544fc9d3 100644 GIT binary patch literal 1457 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wF4!XJ_h)Nxc(mnqaiSoLcs9&w-jI= zU@Qsp3ubV5b|VeMN%D4gVd!9$^#F1>3p^r=85p>QL70(Y)*K0-AbW|YuPgflE>V6} z-N5Nb8-dx!($mE;B;(%ONN;auN1k)*zrVQId`sN*LqOF^r3!(M3KbKSnzp$vxzv8? zTGsq$DI4$RzCL$GZKjUKn{o}ElXdscluVkL!Wgu~W8$Ouh24r)ub#N}ELd^e&W-z+ z)Em|krT3@p4_Q=PROU?j#VB-f`p4_M%3C$A*i2WiICbdaqjIMAQl~}s{bJ)jb+pLz zV`8R(zss5UW&eH}{ZmWM_WZ%Stho2B)Skf3h)-IKf!lxG&oA^8Wh;AcdUajk!t;>} zf|omd;P|6y5$n86`t&j-?k$gHeAs0(C#tnfR5)igugdhC2$#zK_-8-c9HvPytv8JO z_F&mFg^xR3?C)z{`JAz#cgwL&2TTw2NS=GM!#rh)@vFaHHM#-OiVfmEVGZ-QRx-8c zH1fGWI9c^>OGj|o=Wtc^*(J{2tVN#O36Gfif;dZA0?O7t=i!dx0@J$>^2quh6u7D`zs)jH-KVGZzJAfYX=+qG3vZHv$| zL&2pR9v^soVEqUA+xM&Eco)_@fA;^&OTP=XOWyV`bYB;z)^Xe^G0ZRCGghc_HhQw_@7M z>i&G>l3wS#e_FUs{fuAxOsY2pR?XkGm~r~DbIX?<>fihDZtOO98K3QP)e5eM&K5@9 zdeJPuDeo7LMnXoi{L0#+nloRd--=&!Ysv58E)mV3Kdv>*j?Y~K9^bf?1x!~Ap00i_ I>zopr0I_T&AOHXW literal 4387 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 - + Reload - + Load Older @@ -157,7 +157,12 @@ - + + Home + + + + Global