From 63241a158696bb6cd9cc30d2e8e470a6f9a1fb47 Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Mon, 27 Mar 2017 19:10:47 +0200 Subject: [PATCH] empty list icon, use latest empty list layout and butterknife --- .../ic_list_empty_upload_backup.svg | 57 +++++++++++++++++ .../ic_notification_light_grey.svg | 58 +++++++++++++++++ .../notification-icon_backup.svg | 50 +++++++++++++++ .../ui/activity/NotificationsActivity.java | 59 ++++++++++++++++++ .../ic_notification_light_grey.png | Bin 0 -> 1158 bytes .../ic_notification_light_grey.png | Bin 0 -> 805 bytes .../ic_notification_light_grey.png | Bin 0 -> 1490 bytes .../ic_notification_light_grey.png | Bin 0 -> 2186 bytes .../ic_notification_light_grey.png | Bin 0 -> 2959 bytes src/main/res/layout/notifications_layout.xml | 33 +--------- src/main/res/values/strings.xml | 3 +- 11 files changed, 227 insertions(+), 33 deletions(-) create mode 100644 drawable_resources/ic_list_empty_upload_backup.svg create mode 100644 drawable_resources/ic_notification_light_grey.svg create mode 100644 drawable_resources/notification-icon_backup.svg create mode 100644 src/main/res/drawable-hdpi/ic_notification_light_grey.png create mode 100644 src/main/res/drawable-mdpi/ic_notification_light_grey.png create mode 100644 src/main/res/drawable-xhdpi/ic_notification_light_grey.png create mode 100644 src/main/res/drawable-xxhdpi/ic_notification_light_grey.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_notification_light_grey.png diff --git a/drawable_resources/ic_list_empty_upload_backup.svg b/drawable_resources/ic_list_empty_upload_backup.svg new file mode 100644 index 0000000000..02ecad0b38 --- /dev/null +++ b/drawable_resources/ic_list_empty_upload_backup.svg @@ -0,0 +1,57 @@ + + + + + + image/svg+xml + + + + + + + + diff --git a/drawable_resources/ic_notification_light_grey.svg b/drawable_resources/ic_notification_light_grey.svg new file mode 100644 index 0000000000..762dbee58a --- /dev/null +++ b/drawable_resources/ic_notification_light_grey.svg @@ -0,0 +1,58 @@ + + + + + + image/svg+xml + + + + + + + + diff --git a/drawable_resources/notification-icon_backup.svg b/drawable_resources/notification-icon_backup.svg new file mode 100644 index 0000000000..abe3ee0fed --- /dev/null +++ b/drawable_resources/notification-icon_backup.svg @@ -0,0 +1,50 @@ + +image/svg+xml \ No newline at end of file diff --git a/src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.java b/src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.java index 61466c1140..b59603479a 100644 --- a/src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.java +++ b/src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.java @@ -21,11 +21,22 @@ package com.owncloud.android.ui.activity; import android.os.Bundle; +import android.support.v7.widget.RecyclerView; import android.view.MenuItem; +import android.view.View; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.ProgressBar; +import android.widget.TextView; import com.owncloud.android.R; import com.owncloud.android.lib.common.utils.Log_OC; +import butterknife.BindString; +import butterknife.BindView; +import butterknife.ButterKnife; +import butterknife.Unbinder; + /** * Activity displaying all server side stored activity items. */ @@ -33,12 +44,39 @@ public class NotificationsActivity extends FileActivity { private static final String TAG = NotificationsActivity.class.getSimpleName(); + @BindView(R.id.empty_list_view) + public LinearLayout emptyContentContainer; + + @BindView(R.id.empty_list_view_text) + public TextView emptyContentMessage; + + @BindView(R.id.empty_list_view_headline) + public TextView emptyContentHeadline; + + @BindView(R.id.empty_list_icon) + public ImageView emptyContentIcon; + + @BindView(R.id.empty_list_progress) + public ProgressBar emptyContentProgressBar; + + @BindView(android.R.id.list) + public RecyclerView recyclerView; + + @BindString(R.string.notifications_no_results_headline) + public String noResultsHeadline; + + @BindString(R.string.notifications_no_results_message) + public String noResultsMessage; + + private Unbinder unbinder; + @Override protected void onCreate(Bundle savedInstanceState) { Log_OC.v(TAG, "onCreate() start"); super.onCreate(savedInstanceState); setContentView(R.layout.notifications_layout); + unbinder = ButterKnife.bind(this); // setup toolbar setupToolbar(); @@ -54,6 +92,9 @@ public class NotificationsActivity extends FileActivity { * sets up the UI elements and loads all activity items. */ private void setupContent() { + emptyContentIcon.setImageResource(R.drawable.ic_notification_light_grey); + setEmptyContent(noResultsHeadline,noResultsMessage); + // TODO add all (recycler) view relevant code + data loading + adapter etc. } @@ -75,4 +116,22 @@ public class NotificationsActivity extends FileActivity { return retval; } + + private void setLoadingMessage() { + emptyContentHeadline.setText(R.string.file_list_loading); + emptyContentMessage.setText(""); + + emptyContentIcon.setVisibility(View.GONE); + emptyContentProgressBar.setVisibility(View.VISIBLE); + } + + private void setEmptyContent(String headline, String message) { + if (emptyContentContainer != null && emptyContentMessage != null) { + emptyContentHeadline.setText(headline); + emptyContentMessage.setText(message); + + emptyContentProgressBar.setVisibility(View.GONE); + emptyContentIcon.setVisibility(View.VISIBLE); + } + } } diff --git a/src/main/res/drawable-hdpi/ic_notification_light_grey.png b/src/main/res/drawable-hdpi/ic_notification_light_grey.png new file mode 100644 index 0000000000000000000000000000000000000000..174aef918c57fc72deac98b9f212de8d495266fc GIT binary patch literal 1158 zcmV;11bO?3P)k+O$y=HT8v|tsNB| zNhw7tf`6csjzpa(J`kL!1F=5Af(kycwN`A<=wRPlOK3>%&E9M6b?)yoNdh-#t&?BQ z$=>IloDCu(A|fIpA|fIp(l`U&4P^Eq@Hw!u{q-~8E->TPQD#jEtOa}vOp`+Uw;A99 za1NL??kl@N?*=j$0uBRT@!$J12&@Ojfos59yVmk+LSP4gE&tiEIOu4R=30B(ALkC^ z7qXNzPkRgePOwp9qk6sG%%?~ZGmk8eg>9!Hv)V>>gNgY*twT~)D+lO(rK`!o?5^r;3@FPxfh_GAI=2u z6Ln5%2Y^Y^>G7F!FI5D#8aP5a1=XqrYy@rqFTES_Gz9!e9e=YHvV?RNaQ(&dKEn2s zPB&3}M7k8__MV#O5jFmeXj`6j(3{EEokAi~B_>D6n7@STL4>HSxl4 zhuOYa{WHWMaENBU;|%FGf$JDN-p?YiPFPxZy9OhPLeSU-i;Q9QI# zf%Rip9YsSc5m-Nm)ln?85`i5g_(LQ!874i@?AM$dEin&k;=PBx%Ko#^m5yK(STG7K z7zGxL0t=?Z{~C{B_XN?}y#gM1Hz6V-A|g!};Soa9!1qSAP68K=YV{<-#MyF9lI~Jb1Tj~H!0rQo8`PO0z*UI|fxRZJg;LtBcCD&K2n^C1U!`3&sIh2K0=ohH zR&e|GfSU!kpG}m&08RmK3T*ccX*eH(_d)~Rcn-WE|H1^vNk?!9kpcsFNLra8*Fz;Q z0OvDp%S5!m0Pc_`xD)h#N}mNz0B3VGWhG)@kdCxFq(`cEd+*;p;24>2@U#-)TH-<` zNy{HjF#np)Go%G>t`KB2IG-j2)-go7pJWB^*Li*c{6V^cQT?P?L_|bHL_|bHL`3@3 YJAFrSvrSwSa{vGU07*qoM6N<$f_`@XMF0Q* literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-mdpi/ic_notification_light_grey.png b/src/main/res/drawable-mdpi/ic_notification_light_grey.png new file mode 100644 index 0000000000000000000000000000000000000000..5da4e5e8f9193685a504ce7c84c3f4cb9d25d8a4 GIT binary patch literal 805 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!EX7WqAsj$Z!;#Vf4nJ zI2C{}W8SCuT%e$2iEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$QVa}Ci#%N% zLn`LHoxL|J#8IMc{vVCk$4tGr9Ipuk|7h-DTfA}8r65;UZteAlr9T915#Y|vZHZ~> z;_@s>UYPNa-*6+R<};ayWV7OLXRM9YKiHmix>5Q4?(>v%v&ohT5^aefWNk2Mx5Gh` zf~^%SFBsQ1T+Qj_nx*hUr$Aid?zhjr4>UiRRW7#MHr?wi~(>-hawpRcx7Kn0J{T zU(cl9=)cOzE{OBh1GVIl@eb7$+;{qC-1pba?Bpm8>RD~gcSlPu z*pTlI+qad?$uSRK@6et#%k14>9c|~U`yFK;Y_cep5EEEGEz6Pn$?r10cZXGp6D08N?d`gh*jZneNp*65N@%i~p}?Ey@Z*W%P-*4J+B9cUf@dk~TUJX|$4RgJE)~DwwN#ya z;HMRH?#%BHBTN6+-(wb=>MC^MbnF2Gp5%xidFHwf>u8BX@ed|0@Kz1d|GZynQsB%h zO(Nd8o1C9ah`W&Ocud;SEj5TciY<)kSUr!7y@}<&D;0ga4O1hob#L@MSvaqN`A3g+ zM%>pM@2ozs{194wMWIM`#~;o;hwq9#y&V(JC^y-W&*bsEtC4qVS6|-It6RWSy~ES? h<(y<_;+cAbNk75ek1u`68(@-V@O1TaS?83{1OW1EPX+)0 literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-xhdpi/ic_notification_light_grey.png b/src/main/res/drawable-xhdpi/ic_notification_light_grey.png new file mode 100644 index 0000000000000000000000000000000000000000..b930f0aff2a56e6f478a69c842061bb5f0a958b0 GIT binary patch literal 1490 zcma)+Yc!Mz7{}jtUSq~}P#Cu%xo;E^GBz|#Lm~HZS&{p7rlDrck{MLQpb{masl=iN z6^TsR+`0^B?WEk^uo>B0mSOj(>~!{={jz=7|2hBXf1cm-<@xZOC+~>IK?PY&SpWbO zTuB6PNfv)KT3S+PiBoNokV`~7f1a?WW>>EmqkW7ENMvYPiF-?Q+b zbnF@EY>jz^7uc_CB$BGHrCEKpqAy&Dlhgl(n$9$!sIiJ{cF~C3vHt z4Zec9YOrSN=JTL7qx8wt+=v|h=<<#?aZINazK(L$KInzN^`X*o++fzlq{#X?&^>_1 z30-`9PPoeIVP=xdNBjJLfr9RaX?6MWIEgmPNuQFtpRGjj4S4lgNrjZpe{JD;Jy~lW zx_LMvl^#5h$MYIEc0(%7PXOIlU}{ z?Xo1UiC!L;WpEC0!Q_876Nva=Ofh?l5K3KH&5hJT4j09BFQNmRaZ;b8hKbAa-R=Y& zBK`*BWcLAr5WMe&w|ud^S-zGtRhJb<@c#<@tn&NxtM{BUMqbSQpeUKR)~)4!2qh)H z?&vZKYDkHh@aG!t{^mY}e`U~kA=7pvVI*_ZySIuzFWi6g$RCXbC+5L+M)@soLsaTZ zCd(qA5kwNpc3@|YW<9zvDmRPB-M0-#*>=_dce+M6& z-{x&rQdc1opVJ#-GQ|q61XinWsSs&w7qVpDsGeo!Uj}5nnQgKJ^1<1mZ;i( z(3#vr25?}FXp@ns;(uA76sqPpW@S0F%4&B9QgW(xGnB9>;)5?q*QgH1IMj$$1ah)c eN%_C3dp)Vf%=fWCkozV77jQk`LAc`*mi0GkgMD`Z literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-xxhdpi/ic_notification_light_grey.png b/src/main/res/drawable-xxhdpi/ic_notification_light_grey.png new file mode 100644 index 0000000000000000000000000000000000000000..026fb801206a9fe319063c5f5c942dc02480cb12 GIT binary patch literal 2186 zcmb_ec~sKd7G@|Q#VAe1IjdV)Sqj&ok_N>TP3xkj7!-!XHT61BVyN|_Nli`bnx!NT zXuZ3f$kd$uX$d|D400+n$;v5BER)K_OZWbF-&$|IKi*kqpYMG8?DNOoXYFsDq@(Um z8fyA#5C}wrnVX?wZb`jIamT1D{;k4jm_E#Z&l)iWei_tetOeBK`N7V{y&+ z!1fm!hS1fJAz(&*d1;&6L}nO)h}nM1wp0w(O)|hw;48~z<$mBKG~AQx{QeYu7^e|u z6muqLd09_(AFL8?mR>zf#N;VvU`Vp)E!*urM9VfuG_^894s#2T*qT!C znYPKYt^7cnXkZ(9NB^^o+svv^#6H^GT$LI;`E218hFyQFWhEM({As=XsJbYtD69B) zUnD&F*&*s$k(7qsA+9d`8#8s%tcFJ)oY93RGi%!zw9|7wb;%|_KMGf~B~rwd^+k+V zzF(Ny-qDpEee*Meu(-Q>713^p?#N4f73n!bFGZi84{Z@RLe8`gTg`iS!e(p!5=V1* zW-u}eCm3^sIGJ^3L?e1|Wu4%vj!_x6NN7E>iZg?~Q`?1B7@*QT_ zL1F4vzxbrRv4Qi$c5>Xi_-s{OtOIrBumDVI${27v!XxJ_Uhp|<1rNT@LD{1j4lRc@ z=Tor~eeB?iZrBK9fryb-sDnp<3x_b$E$5%wHLaCXWXIp0E3eWy&bbdLfM#Tm)Bs`4 zBXvZd&fU1|+IlM#wwiowJh#ouv=}Go3*(2nFfG{WtFwxxhhubDWxh8!rJ=h5%I#lNuf3JU>7f%>V;diMELF{vX5%EUg` zL{#^lmksp}&zNyZ9i45Tu+Nd$LF7#92=%=c>3Pc(TJA32k>f{ay*yHzXZfV3Cc7dA zKN(EjfyNFNn00iv=9h~9<(D1hF_}BZ#KDitt@@X9sJ^EcTXP5a$fQ7ez}KFK5{FHd z$eLErdlYl-IVQtklOch4*%T3tvNa?;fe_qZ zHM(Y6Jpp;C#&nR!pbvSX%>|D^Cw>A}5RaY~_L;7Oxn#kI z))D|=<^omkPTl&MtF~Ei*I22h%i?1TCO!CwuYGWj*BE$@k9;~PW>C^UwPAp-@-U~)C6^TuT{H7O~~)XzT)hA&gP>QXYnlP z{vK<7oBlocZwXuS~_H#ON_xUv%Y=aAztXfq^ z+>h}slm_>6?l0EEL&SefK=m^wYcH!5tPAR0knk(0{W4sjlJ2`hU^rhzSH+zh#KJ@R zbAe)sLnvq$fnz5gMwd`*fRj#`2hd$`8-7Cj6EK^lX{$?kvZo7L?ufaO%ITX^|5oL* zpfBIhq&Q8jj=fViN|T)gwIr8PCLN>74y_8Jf2OXu2P{c0m5gf3`X)>(aDqB96c4_d zIG7o!7GuUv>_V3`J<~#3 zECfDUpa&Q!Yq@H&s21@01Bt3!Cj{&Kh_#TYb++hG+W4CWx7xg@n;*$fld&!6lGsBT zieHgH0+5r@`TZF;5M#EK*`d3g2!#q3nFA`ZqvG Mj_$-Vd-}yc0qn~B*#H0l literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-xxxhdpi/ic_notification_light_grey.png b/src/main/res/drawable-xxxhdpi/ic_notification_light_grey.png new file mode 100644 index 0000000000000000000000000000000000000000..653be22635bcfc065e9b3ab5904697a2e90dd283 GIT binary patch literal 2959 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 literal 0 HcmV?d00001 diff --git a/src/main/res/layout/notifications_layout.xml b/src/main/res/layout/notifications_layout.xml index adc1717207..73cccf8b52 100644 --- a/src/main/res/layout/notifications_layout.xml +++ b/src/main/res/layout/notifications_layout.xml @@ -49,39 +49,8 @@ android:layout_marginLeft="-3dp" android:layout_marginBottom="-3dp"/> - + - - - - - - diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 310a0cdbda..f7179a768b 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -582,7 +582,8 @@ No activities found. Loading notifications… - No notifications. + No notifications + Please check back later. Input upload filename and filetype Filename