From 8c6d767190071487df97b47ef552669df36f1256 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 4 Jun 2015 20:57:32 +0300 Subject: [PATCH] move offline/online prompts to the sidebar --- .../org/fox/ttrss/BaseFeedlistFragment.java | 19 ++++++++++++++- .../org/fox/ttrss/FeedCategoriesFragment.java | 23 +++++++++++------- .../java/org/fox/ttrss/FeedsFragment.java | 23 +++++++++++------- .../java/org/fox/ttrss/OnlineActivity.java | 6 ++--- .../fox/ttrss/offline/OfflineActivity.java | 6 ++--- .../OfflineFeedCategoriesFragment.java | 23 +++++++++++------- .../ttrss/offline/OfflineFeedsFragment.java | 23 +++++++++++------- .../drawable-hdpi/ic_cloud_download_dark.png | Bin 0 -> 976 bytes .../drawable-hdpi/ic_cloud_upload_dark.png | Bin 0 -> 971 bytes .../drawable-xhdpi/ic_cloud_download_dark.png | Bin 0 -> 1318 bytes .../drawable-xhdpi/ic_cloud_upload_dark.png | Bin 0 -> 1378 bytes .../ic_cloud_download_dark.png | Bin 0 -> 1929 bytes .../drawable-xxhdpi/ic_cloud_upload_dark.png | Bin 0 -> 1942 bytes .../ic_cloud_download_dark.png | Bin 0 -> 2616 bytes .../drawable-xxxhdpi/ic_cloud_upload_dark.png | Bin 0 -> 2631 bytes org.fox.ttrss/src/main/res/menu/main_menu.xml | 4 +-- .../src/main/res/menu/offline_menu.xml | 4 +-- org.fox.ttrss/src/main/res/values/attrs.xml | 2 ++ org.fox.ttrss/src/main/res/values/style.xml | 4 +++ 19 files changed, 90 insertions(+), 47 deletions(-) create mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_cloud_download_dark.png create mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_cloud_upload_dark.png create mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_cloud_download_dark.png create mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_cloud_upload_dark.png create mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_cloud_download_dark.png create mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_cloud_upload_dark.png create mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_cloud_download_dark.png create mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_cloud_upload_dark.png diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/BaseFeedlistFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/BaseFeedlistFragment.java index 9f9afe73..1dc880be 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/BaseFeedlistFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/BaseFeedlistFragment.java @@ -20,7 +20,8 @@ import java.net.URL; public abstract class BaseFeedlistFragment extends Fragment { abstract public void refresh(boolean background); - public void initDrawerHeader(LayoutInflater inflater, View view, ListView list, final CommonActivity activity, final SharedPreferences prefs) { + public void initDrawerHeader(LayoutInflater inflater, View view, ListView list, final CommonActivity activity, final SharedPreferences prefs, + boolean rootView, boolean isOffline) { if (true /*m_activity.findViewById(R.id.headlines_drawer) != null*/) { try { @@ -87,6 +88,22 @@ public abstract class BaseFeedlistFragment extends Fragment { } }); + if (rootView) { + // offline + footer = inflater.inflate(R.layout.feeds_row, list, false); + list.addFooterView(footer); + text = (TextView) footer.findViewById(R.id.title); + text.setText(isOffline ? R.string.go_online : R.string.go_offline); + + icon = (ImageView) footer.findViewById(R.id.icon); + tv = new TypedValue(); + getActivity().getTheme().resolveAttribute(isOffline ? R.attr.ic_cloud_upload : R.attr.ic_cloud_download, tv, true); + icon.setImageResource(tv.resourceId); + + TextView counter = (TextView) footer.findViewById(R.id.unread_counter); + counter.setText(R.string.blank); + } + // settings footer = inflater.inflate(R.layout.feeds_row, list, false); list.addFooterView(footer); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java index db748846..4f2f72ee 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java @@ -217,7 +217,7 @@ public class FeedCategoriesFragment extends BaseFeedlistFragment implements OnIt m_list = (ListView)view.findViewById(R.id.feeds); m_adapter = new FeedCategoryListAdapter(getActivity(), R.layout.feeds_row, (ArrayList)m_cats); - initDrawerHeader(inflater, view, m_list, m_activity, m_prefs); + initDrawerHeader(inflater, view, m_list, m_activity, m_prefs, true, false); m_list.setAdapter(m_adapter); m_list.setOnItemClickListener(this); @@ -511,14 +511,6 @@ public class FeedCategoriesFragment extends BaseFeedlistFragment implements OnIt if (list != null) { - if (position == list.getCount() - 1) { - Intent intent = new Intent(m_activity, - PreferencesActivity.class); - startActivityForResult(intent, 0); - - return; - } - FeedCategory cat = (FeedCategory)list.getItemAtPosition(position); if (cat != null) { @@ -531,6 +523,19 @@ public class FeedCategoriesFragment extends BaseFeedlistFragment implements OnIt m_selectedCat = cat; m_adapter.notifyDataSetChanged(); + } else { + if (position == list.getCount() - 1) { + Intent intent = new Intent(m_activity, + PreferencesActivity.class); + startActivityForResult(intent, 0); + + return; + } + + if (position == list.getCount() - 2) { + m_activity.switchOffline(); + return; + } } } } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java index a3a6222d..97a96490 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java @@ -283,7 +283,7 @@ public class FeedsFragment extends BaseFeedlistFragment implements OnItemClickLi m_list = (ListView)view.findViewById(R.id.feeds); - initDrawerHeader(inflater, view, m_list, m_activity, m_prefs); + initDrawerHeader(inflater, view, m_list, m_activity, m_prefs, !m_enableParentBtn, false); if (m_enableParentBtn) { View layout = inflater.inflate(R.layout.feeds_goback, m_list, false); @@ -358,14 +358,6 @@ public class FeedsFragment extends BaseFeedlistFragment implements OnItemClickLi ListView list = (ListView)av; if (list != null) { - if (position == list.getCount() - 1) { - Intent intent = new Intent(m_activity, - PreferencesActivity.class); - startActivityForResult(intent, 0); - - return; - } - Feed feed = (Feed)list.getItemAtPosition(position); if (feed != null) { @@ -378,6 +370,19 @@ public class FeedsFragment extends BaseFeedlistFragment implements OnItemClickLi } else { m_activity.onFeedSelected(feed); } + } else { + if (position == list.getCount() - 1) { + Intent intent = new Intent(m_activity, + PreferencesActivity.class); + startActivityForResult(intent, 0); + + return; + } + + if (position == list.getCount() - 2) { + m_activity.switchOffline(); + return; + } } m_selectedFeed = feed; diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java index ab7c95e8..8766d3cd 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java @@ -200,7 +200,7 @@ public class OnlineActivity extends CommonActivity { return GlobalState.getInstance().m_canUseProgress; } - private void switchOffline() { + protected void switchOffline() { if (m_offlineModeStatus == 2) { AlertDialog.Builder builder = new AlertDialog.Builder( @@ -729,9 +729,9 @@ public class OnlineActivity extends CommonActivity { case R.id.login: login(); return true; - case R.id.go_offline: + /*case R.id.go_offline: switchOffline(); - return true; + return true;*/ case R.id.article_set_note: if (ap != null && ap.getSelectedArticle() != null) { editArticleNote(ap.getSelectedArticle()); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java index 1bd2342c..5041fd3a 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java @@ -271,9 +271,9 @@ public class OfflineActivity extends CommonActivity { } } return true; */ - case R.id.go_online: + /*case R.id.go_online: switchOnline(); - return true; + return true;*/ case R.id.search: if (ohf != null) { Dialog dialog = new Dialog(this); @@ -602,7 +602,7 @@ public class OfflineActivity extends CommonActivity { } } - private void switchOnline() { + protected void switchOnline() { SharedPreferences localPrefs = getSharedPreferences("localprefs", Context.MODE_PRIVATE); SharedPreferences.Editor editor = localPrefs.edit(); editor.putBoolean("offline_mode_active", false); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java index 0c48df4e..88abf0f5 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java @@ -148,7 +148,7 @@ public class OfflineFeedCategoriesFragment extends BaseFeedlistFragment implemen m_adapter = new FeedCategoryListAdapter(getActivity(), R.layout.feeds_row, m_cursor, new String[] { "title", "unread" }, new int[] { R.id.title, R.id.unread_counter }, 0); - initDrawerHeader(inflater, view, m_list, m_activity, m_prefs); + initDrawerHeader(inflater, view, m_list, m_activity, m_prefs, true, true); m_list.setAdapter(m_adapter); m_list.setOnItemClickListener(this); @@ -188,14 +188,6 @@ public class OfflineFeedCategoriesFragment extends BaseFeedlistFragment implemen ListView list = (ListView)getActivity().findViewById(R.id.feeds); if (list != null) { - if (position == list.getCount() - 1) { - Intent intent = new Intent(m_activity, - PreferencesActivity.class); - startActivityForResult(intent, 0); - - return; - } - Cursor cursor = (Cursor) list.getItemAtPosition(position); if (cursor != null) { @@ -207,6 +199,19 @@ public class OfflineFeedCategoriesFragment extends BaseFeedlistFragment implemen m_selectedCatId = feedId; m_adapter.notifyDataSetChanged(); + } else { + if (position == list.getCount() - 1) { + Intent intent = new Intent(m_activity, + PreferencesActivity.class); + startActivityForResult(intent, 0); + + return; + } + + if (position == list.getCount() - 2) { + m_activity.switchOnline(); + return; + } } } } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java index 13d57dea..1504a734 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java @@ -150,7 +150,7 @@ public class OfflineFeedsFragment extends BaseFeedlistFragment implements OnItem m_list = (ListView)view.findViewById(R.id.feeds); - initDrawerHeader(inflater, view, m_list, m_activity, m_prefs); + initDrawerHeader(inflater, view, m_list, m_activity, m_prefs, !m_enableParentBtn, true); if (m_enableParentBtn) { View layout = inflater.inflate(R.layout.feeds_goback, container, false); @@ -215,14 +215,6 @@ public class OfflineFeedsFragment extends BaseFeedlistFragment implements OnItem ListView list = (ListView)getActivity().findViewById(R.id.feeds); if (list != null) { - if (position == list.getCount() - 1) { - Intent intent = new Intent(m_activity, - PreferencesActivity.class); - startActivityForResult(intent, 0); - - return; - } - Cursor cursor = (Cursor) list.getItemAtPosition(position); if (cursor != null) { @@ -234,6 +226,19 @@ public class OfflineFeedsFragment extends BaseFeedlistFragment implements OnItem m_selectedFeedId = feedId; m_adapter.notifyDataSetChanged(); + } else { + if (position == list.getCount() - 1) { + Intent intent = new Intent(m_activity, + PreferencesActivity.class); + startActivityForResult(intent, 0); + + return; + } + + if (position == list.getCount() - 2) { + m_activity.switchOnline(); + return; + } } } } diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_cloud_download_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_cloud_download_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..056fcba9915a9016a4cfc76b8afc9b922e1a57ca GIT binary patch literal 976 zcmV;>126oEP)7a$Wc5X0y3>DgxB& z^%>W7Us2U{l8=noZ5P0ouIql?Y&QE-3lK$-+27y4I)?aBdH}A+aeOncgOjtL7-Oyg z*dRGmU<_seJmY!Z!)coS@NWf>Fbv-U@O%OBLy%ndeg9mNBsT%*L<0mtumRwOvgGgL zao_i6lO!2yCdLY2jEP8Io`C!T%f9dbmL$o}s2ya~hU@F=50KoLpgi!;N9E0Wy*~1L zb>_I6VHnP->a!$kyeFHQajfE`BuAL(J1GgnrT~gKO z!Z7Ua?d^Ti>2wbLCj>yWg?%bgseOnCsX*8b{ryWPI$c?%?$N~(Lo_kAQu z^3x>c0f6M^0syMIrK*Jvn2vC0CMF>d;7+Yp`);@>GRCZtd>7@eNVg6Gl`Ibt`LNY$ zwTIiqG);Fr&-;tyN{JyZ46ag9)f;gfe+3*lR!P%z+w;8J09Hw!$yI&AsOpV&yZtE! z2VnPX*wZxKSzKKFMpb7;RHEe)<~`bcvM8rs%nw5 y&~bz_YwaH*a$8l~uIqNnI+CxbsHmv;@9;O3{X+kj&Q)=q-0T^Xd9J4GVm6z}Z{IDwEU=%9;5fdGjn9d)W8 z#9x6Z-5|M05m#W)(LiI)Tr2_vAp}M@<3uRBqaY`p=cCBQII(eV_kLNhPqW3&H~YN1 zv%50`yAjVge|ar`cT7yA&u50dj?7@ju9Tmzs(4NxwZmjJvpDEU1+ z6^7xYF(%cMNEIN8qJ-pyA;{ljJ`BU(j4|827D%rR7Z(?glUy32JaG4;@>a1}?D@Sq zcG$@{j;B=h1(JnUt2Gb6Pbsw8J-(Kr#-E;^ei^`Ly(T_T+&OmvKuj|0muj_Et6c?v za=H9^$`GwWp>SzsWo74K4fn}KQIr69kK`GWJrA*elLr7}%#AP%3E*sx^%Koz^T$S` z@kgovaU8z_;B5epW)$BipEZQ4HjObqJgnXB5K59Ha?V{ue}Cr#<@b_eICTItNd8Xp zoAvee>j2z=0V2yA+*X#HFCp-X{nVDH4`Sd8{flTiN z0Gtq!=Yt>+YweBQ0F_GRlymMKWFI=I@Jpg#Kv$GWdrBTZF8v;Nf z2!btZ?Y5A7b{z8e==QOivW(qXfiRBa4^?%xUy(gR7Y{pME|)(V)U{OgV*xNVs1C=# zd2!CAntvZ9MC6Q!NORmGeJ~}?xm)A5$cl4L#q+$)af@U{M4HlWx9cQb|J{uq=iINd zxw(1UIrr7LWwJo>TLQqs!ooDk4@e##w^Ryl6$*v-Jpi!Q-U-9dkW4Vx?Z%-YBFk%Q zYmMCnjkR_=2!g*zo;&IxRQ1zZt@Z`*z>3UT`%4f6TL4NVk7eq81o9gj8&}ZX0Nb}F zw$^UX&CPwSs*@t}B#y|_AbC?nmb-U;clL0oT&Yw#>3QCHk|h97h{#D*?Po7Ejd0sJ tcUwfZRCUAm{raG`1=;$EP)ht(u000EB zNklCsN1Hk>?T<(b=y$Wn4Os>VnrD$LckX7p&-SJs366U zgY+zj-aOcYUeucx33#v`>Me&-NOV7{L9vDyA<2ZMRX2;R$!6yDkWFY}nr3(BW25tf zz3k5W{@>@>cW3_}14KkbL_|bHL`3{QVbBAfIdevvoSfY6x^A0@v?--D5xEVZ1mH$4 zm#h5e4A6D`AprdV9wwOv5ZkaA(iM>@lGhx^DHe;xaR9O{4X`Y$rBo_C0pJA5WSwbd zNM6e2a^C`Qw~YaYVVD3;1K96HJ`uSI;EO_`aJ8uouq; z4-fy{bOxBFxevfwBJ!Xg;#UhMuWOq2;pph-O)v6k9*Iwh$lCz+`YFCjo8vgy&d$!O zwr$@E-GJWS-aSgG^8j`SARYifau-P>olX~~r>Ac>l1nubY?@}QwYBv%0EwW)uOK3O zDwWDBjcRBp7{K!)av*5&E08>x&1O%9VnBa?e;UAvu*9#RY1&|QqE#0ywOnkPW=tuS zb{yw`<2X;E@eXPj5m8F1X90X%PyCkt1`Wf=h{#hU&00+h%7<7i_TI?I$W*O?n~Le{ z>+4iXy$IkS8Th)X7Pz#uGzj2RuMAMSuAc-jNYazJf{2V33Wd+Ma;>iGFOwXoafnAV znM{0qe0-rH11!sGnV+A33BWNgga?I)#1o0cVE{kW61V0iW?5ECxm-TC-NfI4kj>-rm(W$oC|fKsV+oMe00#rg@! zqvdk>{Q7%@!t%F170AlC6s0m*bc9zVNk0Li0a7Zn1J zXS3Nu0MH^L8IO|Q2JqwEJ|y|;RufgP-E0Q>2!Nf96su|4a{xY|VHocK=s2ChpT~9jVuIJ=s~k}PJlkXU z%LJdqgJin`@TU(3cxHlM;;SSS0NbbJ4V&Pzc(|@B3cxQu8c??hev1bHrBq3g{2o3Z zLDy3Jz5vGEuoHq7FCr89eEyQUeez#gHJy1NbhV&wm1}TXEU8eIuDnmPz&^nC-Fd>MJlvPAx1fd^9&V=lsh6 z0GOSf{jH;;W2S0CGaiFABL4c~;^Kv|v9Z5a-rI1^ZQHip)zvlTx^6c~uNO;U@e|1l z#bU9%#+1z>ss|+}MC2I&4}`6tPD&)d%H?ubu)(8tTl$@wrWtcxw-3NEl7|7bg{|ry zR7B)wrBngH$YxKU)^nrdz`#H|fW4JUWhcp|xlg#RJ0Fk7=a-h2eh>PQ+lYvWh=_=Y ch=}dRKdT9i*1|4CA^-pY07*qoM6N<$g6<+_tpET3 literal 0 HcmV?d00001 diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_cloud_upload_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_cloud_upload_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..75e647d406763521c23f79371f884025656ecbf9 GIT binary patch literal 1378 zcmV-o1)chdP)ht(u000E- zNkl7%Q7>3_>)=r!n2yuUsCb4KBErF8S-X%d1KUzf~Re}mQ9*{V2Kte(&hyy3MpdM(WggWa+kqT`osg!o3(x$i(O&r_%aY!5`LUP;Zh?3J0LdLB^>{pPUAuN|)=gc?O<}_@!gY0Z?*M4r zD)A*mq$!`zzwK6otHJ=@5RrXbExrWF$CJtA5nl}G>FJ3B==V!}2~E=uFHW>7BD9%@ z4Z{d4rQ*e6abK}md=V~tkceCX7T%uYeC81It2=s3>V&d$#9!NI|G{}xLIq*AE_$#>!L3URaI zJv3oKAbHzyobN5mI=9w+4Or;tY$OsnRhl)rjH{jGdj}65 ztXnd`FpRjDW4)K+t6>7kczu2S(Io>&K2yu$t6>6wzGO1F9{@rk(&sBK2kl%s$$Wsb{XW!Vj z8zf^2z(0Nm;v;)q7 zy8-}B(|-0l7(Y--WtKjE=(_#^fUasaCL+@$%bE&{NC(MSInTO?=Za-npN5uQ_=e=i za5=|bk3~Uci6X0iaz{jd0G55{w=C;#0AG@<%2AXW<6I__xwOIn02mz|z2G>`x44f- z1(K7wT<+`A?^XK(Q&Uq{TU%SNlkA2^+hDZ<$s6-l7^ackI~bdl~9ZH^gt`AoRt&2OeHiEFlUKMV*Zx<`*_4($J7M37$qbA zR{H0mMF7ID;jz2gjoSHqMqz+Qlbss(L7sczKBujP*ES|zRMgl`_PRO< z+squWVJNH@6=9}xRWoCnV717l6(MLhwPsETGAy%u<74rUJJXs%xEE2@7KaLaguyZU zB|d3~`G}}}W(4LjEbrL0UJ{ZLIy{^D1j;T3qQ7(=c@DeX>#0UYgq7 zd-sg2ABrxT9&P*Z6Fdq%ori%cF!3eN&phQy2cLg+3gz5RI#?ob-;Sg@uL? z%M;u`hlhu4y}i7?z^iUJK*#146xzZn$op4k>xHu#i5KJI;(F0Cfp$lfV|UB7~vaYI=vw;pi+cEqRZ; z$@sinWUNv{wJgLLLKf9vBAZ`D;|o%T*So%$0+wuq9B7?VO7Zz&)UJLjw{1**U46b$ z3ujKfXxdE94^1e}ruZbMq->j*oOE5Xxpn1$u|aN%hDjJI_YVISY^+Kw_WxRXngmDU zR`$d9e1EzIBsGE7c8b%l?9?o))F`oET)kB+ShO9o$_U@Og&g#lgVlKcKyw+TnZY$Y z@Y~XH4Y;fNC^PIKFTTLt-F*v(!*Ru;nSeC(*xBuO=k6YJ3kw$`w~<6GKio<7K+K43 z^$6S2Er4~V2gp8>s|iSRYNCOmA%AZbX}Dy|@dQ{w>aNMlcDJ7w$3bwlrIGcDC$O=^ z=q>DCZpdt73(2(*_w()35c*k~Xk4HCEa<|a*IGDc9~QWpR!Zlt!9To}=nGY8tcqNO#11A}(nJpS5M>%fij14mJtS~Qgsw&V5 z=-gn{)m?XXacOx`{BpM=(yAXidOEskY|sLQ)&;(?EdH$X7FqzOabQCqwf0A6p^d1^ zfL*KAobdb2sEMFUWqcxi#dEe}&Nra;Be%7+wff+fD8cmfbeb5iXHov|pYsU49Q5^F z_uF^Y5%GtSR@=@^Fuj8!_<|4Zk7-vdtGdq@$4iMxShAhb^Qv2s3$Ft)x0HC2hMqLec{x%8T+`KSY=EYtDDF#Yd3}5 zrAOdNz_`NJ4ee=8P0;+9Wlx#gs*9I~dRMI=jm@(#B#@4V`L`w;?3DFq<>%-C7+!j| z4||+!XP)Ix0vE($@jQYY@sQ{A?vx(N8UggjSp?3RO7S-=X!nYdgVN*AvV%!LkuY;4 z;%%~d%BNGF8e9dC)dMoF$`OmME>oYXx6#8RNf;~FeBfuPZ!L~pv?pKh!}g!^81c8E z_@dL8)z#}S5-rDiO#Z2gq#h{WrnD4Y3Ix(Q&7Q8V!b)+hwjjvcf}{PpDeH{x9%N%c z?b@&B&Xuz-+Sl><8+IQ^qU2QVPcQee^A*Mw%LCt^e_pI!ySMZ3tA++SA4PF6UC1cQ za(Pj^kNrRaik|dO^=M_IRBPbd%e>70Kv4!6LyHM1du@3egp;ILR%Xi5RDUMR=n6MT zxVA(E;8P}_%@N8oVze{4g%4|LpViwvg)tP9>)aczF<8c%u%E)7u+Hir9^ z`vo7(__25`H#c`*nn@6SE*}Na9T~)Lyql3r^A63WV=H(L?HtIXCYvXm$JSYj)y~e& zaR!62dJpkh>Qr7I{H&72n$aiwrzOta2n(N@{en1K8@S#~^?vK3dznO9>sVM=faxyj z`Ev%Esg%4?xs%5#i}yq&I7QXYUT)EdpZO_~NQyPS3XA?v^Ay2knTl>gQm@kmn6fAV M_M{KG4i$0pzW}nE>i_@% literal 0 HcmV?d00001 diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_cloud_upload_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_cloud_upload_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..b66decd897884e8896e370b162fb2653b9a9fcb3 GIT binary patch literal 1942 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

``-dzJoKxc{NcuW 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 QbIb#7=o+KSwe4g60WTczpa1{> literal 0 HcmV?d00001 diff --git a/org.fox.ttrss/src/main/res/menu/main_menu.xml b/org.fox.ttrss/src/main/res/menu/main_menu.xml index 8693dc2b..d183f591 100755 --- a/org.fox.ttrss/src/main/res/menu/main_menu.xml +++ b/org.fox.ttrss/src/main/res/menu/main_menu.xml @@ -14,12 +14,12 @@ android:icon="@drawable/ic_filter_remove" app:showAsAction="" android:title="@string/menu_all_feeds"/> --> - + android:title="@string/go_offline"/> --> + android:visible="false"/> -->