From 6f1620254383f62778f5246801ebaee2c95a4cbb Mon Sep 17 00:00:00 2001 From: Bartek Przybylski Date: Sun, 4 Sep 2011 22:46:53 +0200 Subject: [PATCH] proper filename displaying, bigger icons --- res/drawable-hdpi/file.png | Bin 0 -> 684 bytes res/drawable-hdpi/ic_menu_archive.png | Bin 1094 -> 525 bytes res/drawable-ldpi/file.png | Bin 0 -> 600 bytes res/drawable-ldpi/ic_menu_archive.png | Bin 1140 -> 511 bytes res/drawable-mdpi/file.png | Bin 0 -> 684 bytes res/drawable-mdpi/ic_menu_archive.png | Bin 831 -> 525 bytes res/drawable/file.png | Bin 391 -> 0 bytes src/eu/alefzero/owncloud/DisplayUtils.java | 15 +++++++++++++++ src/eu/alefzero/owncloud/FileListListAdapter.java | 2 +- src/eu/alefzero/owncloud/OwnCloudMainScreen.java | 13 ++++++++----- src/eu/alefzero/owncloud/PathLayout.java | 3 --- 11 files changed, 24 insertions(+), 9 deletions(-) create mode 100644 res/drawable-hdpi/file.png create mode 100644 res/drawable-ldpi/file.png create mode 100644 res/drawable-mdpi/file.png delete mode 100644 res/drawable/file.png diff --git a/res/drawable-hdpi/file.png b/res/drawable-hdpi/file.png new file mode 100644 index 0000000000000000000000000000000000000000..561c788a7809ec51c9540e43790b8c4e25aebf42 GIT binary patch literal 684 zcmV;d0#p5oP)9QXVEOHBaG zX7i~|in!?YdWYBng2CVoP180lDi#Ex&a&)7v)SytL7?5}bUFeyfKVvJYPswnonEO_ zdg3^aAHKQ=h`n~ZEnoo%hr_HM`l(i{m3%(`IDEVUfPE|gkw^p!Kp+sP#A2~K^gAAp zuggIci^ZpIx7$Z@0%?u(#H7Mg2+Im55{azO=WCA2>2NsaZ4kL!E)NhJ@bkXWXq?IA zG${qZ(cX&xDklPfv7X`cmfdb&QMCgmlL?p1Z=szJb8e0rI0xbP`EB*E}JKe)6-qf!22Kj@v7n#*dnPN_PDuw8vAYRBnxGE#k+OlBsXPOpudQ*RHT z0*?U#$-*u%gopR@*a2`!2#$A4tJNA@+Q65Bgj6i!&ZX;z%VuCJjr!&O zt7->u1r#~G3V}1HVaKSh02r?l*yHC`MkMr0B=qZdfOvp-fOz0Pcz{TV01yul4-fzX zKmZ7U3ILbO^}=!7tWiZW4D%wpxJnX;qIhKVN`nfv|KyigDZqolb;{2FD!>5jJ*qLT SzcteU0000`g@w{0BdwKVXmbQ*tZ)g5FE--de~hA5gr6K&tc-D4L6Q_E1P9Le|)IS9W07U3HiD zc4lX0l_ViTE)uymUVs`c)=5C4J_uYL4o0Jq(Q+N5EK8|(0w56lH%* zx=2wJ`D(T5pTHQT%_42*2^Z>;02tx5V{A#D=Mgmm|6o0Xss;LTzs?AFp67H43`e%* za>?%@J~y(}Gx0E^knj7OAP6?J!NqY*MxaT;F#ObYy4*G#RrfELW z0ymvbPbJ4B%d&`+z#F{##vO#v4=sNJ4IW_-Ti_2oi}ez59&laP=@amNzt6YZZF>TJ zTcCbl;f}z?F2po}b4m%;$_@UCpP^Ym9AZI05D)|y$^#hODYYz1!|!q1^bJiV&I2&% z(Q%xYs;cg}%meV;hQ>a%16-66P{Lkg;JD?ol$gzCw{Q>rf;%eW(uGu2oybBRtZCZrXwwe|5GJ2_*mdxfhrwKE>IBvtU|vf?gmfpr0t^6vXimLk ScX1Q|0000wxVO4zhe#JEECv&bQ{= zXM_FASU65G#x0q#V_l-(?QXxOiLIONuHM`Ku73ZF@`Wzm4@;*1Jn?&hZD`y|sX}EX zvwFrNb9a;FRsq?rhsuxpozszBl#C|4yFxRDj=H%aXyY^4$ z)Ze`DelO?GXH+%no~AsB^nwm3m-rJ z^!R(~(cHBT(p3?)Y5nI`FpB(KSSMU}gomML-R%5p-~H#^w0-(|zsU^`F`F2B27c;mXs0rVm>>u6aqt%eKCGDAw7+;&xszA{a-+dqAWbgMb>$%@Jr?fkC_Z`90 zF8TjtuKay|tT0jQyKL`1-W}ikmIn9PH8fe?R{HG3C%g8*Y&oM_^;2%LJ^lXYoY2X}^w^`dl9#KEkC%GAozAt$@fTMB*Oy#VzPU}p1K*^XI*%`jX^-~^>_21%vT;LNtW0d=A8PJ$Dy+MT=dP| zF58XyD!iB19$%xh+(zr^EdhtB`rrjh%U|hqcwK+b$0Xx%GBjL$n!|4Q<9tjkPkd%i z^$&Y#IlGK!fyCOA(|yIGKa|EXGkKmV0nqNcIR;Q8iHr;7H^pC|6i zayVnT%HF;`XRg22nUis}R-Du8@uu&yOjk}eFqyIbQ*}w*=l=?+%iMf@jv95uIm4U$$zoL^U8glbfGSez?Yhbx5e5!P!qB<7? NgQu&X%Q~loCIF^!)++!2 diff --git a/res/drawable-ldpi/file.png b/res/drawable-ldpi/file.png new file mode 100644 index 0000000000000000000000000000000000000000..8cdfc4f281083857464b29dee784300939343ca9 GIT binary patch literal 600 zcmV-e0;m0nP)F7X0V5tcF(A&Tf*n_Y zcsa3(S#U`(F)@K0q)P<{fy^)m;)(zM{kuGSgP&Z5*cpFe;8^6}%xuR!J( zMn=Z!KY#w*C(A(=KmepxP$ONuef#$HlP6DJ0v+=Y$er-}_wRi;V+N;785yaDMMOkI zH8eDoSy@?uDS@egot<5gZVoaqFnD?F*s+~~fq{3B#W{gMTU%QVm<%|8{8k`Wkt7EJ zeL@xv3k!P)^ANfmFl5+NRaKSQ*x2}h^7-6AKywEH6Y&$E_TKa7&mYGo4~#ZuQ1k&E zr2=%66V0P+<;sTM(fwB4c`1pY#C3x!8DWVHTvK;j4)hit!b)u-K2;`ugp08u`ge~upB*lRGJu1Qr$ru92{)GgzXHB9#9m)g#QA? zp97;vfReh5EC)#e0mw7IfB+`O3%0+83+ad007|tn3$781Sfw1p-DtRRCwBAVi;tAX|Oqn1&JLA#5zRk z+XTcXY3d**CMJ+$bcxh=<=?-5v~`e_loTHe3yU~0ntuKI#qsRfGulR(tgNgkkP;_S zA3x0<#K_1G$v7uMm@lh&J%^=g-bS50LF3E-tRBZ{NOMp;~_k zfgDeYdYVU>I24d;DKK<6&zw0!y(ps;@bK_3la+=X9UUKVb94Wpft$V`IBEamTas2HR-;6n-B5m_O|2?ZR*(WJWrOm|2OPozmdxsIXIaer) z>qL>YN?{@gyMDO4iZ^ux6()*n)h7w=4&J?T0SBu%t1E{_mU)=&iWycLXSV$DNqcth z_pTY9zf{#G=e=6>{%%c--uc>dJKOp7p4WG;t+P2BE%TgP%f!$@MB;&1)z2Nsz`f_-UK5FJvlO0b6bSgIlq%_d`hM$UN1Pq2+{5Pj zv%TLw>YC38k;&;3jH=%BV*0b3{#38P-v!KpDh7vH&aYusWoU0m+9Km+UMBxu()4;( zkcYV6^>@EsU$^x%-11IX^LdWunv8~tXM5&7@_Lr^{_=NrzA1Ail}YB=&8)3_dex%x z_S$c`Ld>VHs3gv~ZZ4%NA`#k{wXlCp=~jj$vHI`2y+7X++Fn~1=DB&%^%YCZ*7vXY zU?abdU3G?Jr_h-R0W2rDNnAGl6W#3J^?H3L?S zo~W!O@ZqYlq7+}ktx3ro=Jkv0j_B3Se;@ezER*BBA8*#JyMLPT;zf>7xq|ewnHkBO zqYaMNygmML?q64?=&Ncy4S#={dYU|n%)es9F)_nu+PiMf70&%Wa{oTKlvxK?PB<(m z@}Z+>p@@2gm5bYgx_#^wQ|f~&10>zk3_U-1OxoV3pxjn+Yr?vC{#|XEWm?NVZhTi5 zd+kk#n8N8t^EU;{9Wt0-m_D2DfVa(&z_Nn7dG-nOavhHR>Xm%ccjvOy0qrx1Yc3=^ zCcL#j6E^b!m)KjiX;-}E+dnB(Oym6aiLW_uORt~z%9SpHrgCxlEFbg)d8;z(OXOS` zk`j8Df@SV}d-F7==@0k1$~L!iYf1uvSxmLWHKHUXu_VKYh@ z7#dm`m{=K`>Kd3^85m3yUv(QrLvDUbW?Cg~4G+A8KpEMHA7n*ZW==_JkyTPoX%T~g oo?&oFdJRyH4@oK~KPk1C!K8ErhtfnvbuI=5Pgg&ebxsLQ05gox6#xJL diff --git a/res/drawable-mdpi/file.png b/res/drawable-mdpi/file.png new file mode 100644 index 0000000000000000000000000000000000000000..561c788a7809ec51c9540e43790b8c4e25aebf42 GIT binary patch literal 684 zcmV;d0#p5oP)9QXVEOHBaG zX7i~|in!?YdWYBng2CVoP180lDi#Ex&a&)7v)SytL7?5}bUFeyfKVvJYPswnonEO_ zdg3^aAHKQ=h`n~ZEnoo%hr_HM`l(i{m3%(`IDEVUfPE|gkw^p!Kp+sP#A2~K^gAAp zuggIci^ZpIx7$Z@0%?u(#H7Mg2+Im55{azO=WCA2>2NsaZ4kL!E)NhJ@bkXWXq?IA zG${qZ(cX&xDklPfv7X`cmfdb&QMCgmlL?p1Z=szJb8e0rI0xbP`EB*E}JKe)6-qf!22Kj@v7n#*dnPN_PDuw8vAYRBnxGE#k+OlBsXPOpudQ*RHT z0*?U#$-*u%gopR@*a2`!2#$A4tJNA@+Q65Bgj6i!&ZX;z%VuCJjr!&O zt7->u1r#~G3V}1HVaKSh02r?l*yHC`MkMr0B=qZdfOvp-fOz0Pcz{TV01yul4-fzX zKmZ7U3ILbO^}=!7tWiZW4D%wpxJnX;qIhKVN`nfv|KyigDZqolb;{2FD!>5jJ*qLT SzcteU0000l_>$oTM7^y-9NR9!R;|F7ViR5|!*yPq5NC*G?`SbgW7ca>7z<)r;0D6CA z$a#R`Bs8c!Kul9&ur)V^UgKxD#lUDL9`(Se2Sz?Ur$eO`Tzg_BZp)?02J2+Qo7heU`RA2fK6Cdki$XrkZelG$jHb7`=Kv^eN^!w znS{8wxOn8{<#~qksKn4{jYx`%i+_6c>J{H$cCeV3*e8@gN9F*F$(chT)PX4_eb{tp p&^_>Y2)Ow%!zdU9)B^wk1^`_OP?TDnuWkSU002ovPDHLkV1lLO-f{o{ delta 807 zcmeBW+0Rzr8Q|y6%O%Cdz`(%k>ERLtq!mDzg9S+5EZ$TPq?nSt-CY>|xA&jf59Dzc zctjQhX%8@VJDF_<5-cllOb5~mVBG#|&Rn22cTX3`5RcIDe**QntPCD@ccizl zN--ZuJbe20FTUdSD<)36{_?<)fKHaqS$z)cZ3`x>v#s0dVfV0gM}{~1Mv1l+KNsn- zmM?uA^gd=ou+YaYbL-fhhn3h|GnY1svbY{-`u4+i_k?K-N57SPvri~&zP5EKbA#&3 z_2+lFburzOVq7cx_Z(ln_ua*ZBQ$@b*ty{)TY(`v4=0eO+Uw`reB`j zd|mRp(86UQH|OrY>bGOnThnD)QdP{KbxiyjdzARI)wy<5Jqfbuxe#viyQU~kT1sQz zl{?Ypru|h(9)^w28~g4Zm%1E~uy_wASK9u5uPCdqjsE)#*;e&BI;AAM^vGk@^KGb4 z-MQ4{U<{MOf$F~JCq6K1dz_r=Ua-&P`GJ7mb)wx(w?Y~M-yC2{7P!R1p%}e+io4)4 z-^{L+ZZAa>jU!q1TsRq+6}xB_L(09luF9B1mVI8{?2(&w?cZFsRC6@typSWO`75gZ zc;pUA=109P%jIU-Ij@@GUh1|$KTb}LD`dY<{T!_yiBq(eCcWJ)X}7lH+KCezEf@1l zS|6hQK={whn*C4zKGHj#_{aI1@N*v7H>C%+UH~RA)e_f;l9a@fRIB8oR3OD*WMF8h zYhb8rWD#OyWMyJ*WooQzU}0rou*9$EB#MUI{FKbJN`wXxbRAcPPnAwoR0rk2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4MZMonH67GG+8|ab8Lx13YGu=b!nynkOZ=yswch>3kh$r7 zK~kZkN$3HU>Q03x?V4rZ=jT6*clP3pJ~FM{=Dhs#%CZu-!v=nrP40SY-q&N=q_bO5 ziA}2av4z&szSPKfx3|^)-E(~D$xS+LE+6*JT2}dRjva*515gQLJeWAJqKb6Mw<&;$TOvz&bZ diff --git a/src/eu/alefzero/owncloud/DisplayUtils.java b/src/eu/alefzero/owncloud/DisplayUtils.java index bb16f596..3f278b31 100644 --- a/src/eu/alefzero/owncloud/DisplayUtils.java +++ b/src/eu/alefzero/owncloud/DisplayUtils.java @@ -20,6 +20,8 @@ package eu.alefzero.owncloud; import java.util.HashMap; +import android.util.Log; + public class DisplayUtils { public static String bitsToHumanReadable(long bitsLen) { double result = bitsLen; @@ -32,6 +34,19 @@ public class DisplayUtils { return result+suffixes[attachedsuff]; } + public static String HtmlDecode(String s) { + String ret = ""; + for (int i = 0; i < s.length(); ++i) { + if (s.charAt(i) == '%') { + ret += (char)Integer.parseInt(s.substring(i+1, i+3), 16); + i+=2; + } else { + ret += s.charAt(i); + } + } + return ret; + } + public static String convertMIMEtoPrettyPrint(String mimetype) { if (mimeType2HUmanReadable.containsKey(mimetype)) { return mimeType2HUmanReadable.get(mimetype); diff --git a/src/eu/alefzero/owncloud/FileListListAdapter.java b/src/eu/alefzero/owncloud/FileListListAdapter.java index 4cf7c4df..3b432fca 100644 --- a/src/eu/alefzero/owncloud/FileListListAdapter.java +++ b/src/eu/alefzero/owncloud/FileListListAdapter.java @@ -66,7 +66,7 @@ public class FileListListAdapter implements ListAdapter { } if (mCursor.moveToPosition(position)) { TextView tv = (TextView) v.findViewById(R.id.Filename); - tv.setText(mCursor.getString(mCursor.getColumnIndex(ProviderMeta.ProviderTableMeta.FILE_NAME))); + tv.setText(DisplayUtils.HtmlDecode(mCursor.getString(mCursor.getColumnIndex(ProviderMeta.ProviderTableMeta.FILE_NAME)))); if (!mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta.FILE_CONTENT_TYPE)).equals("DIR")) { ImageView iv = (ImageView) v.findViewById(R.id.imageView1); iv.setImageResource(R.drawable.file); diff --git a/src/eu/alefzero/owncloud/OwnCloudMainScreen.java b/src/eu/alefzero/owncloud/OwnCloudMainScreen.java index 0d0b5e7e..7ca5eb8c 100644 --- a/src/eu/alefzero/owncloud/OwnCloudMainScreen.java +++ b/src/eu/alefzero/owncloud/OwnCloudMainScreen.java @@ -28,15 +28,14 @@ import android.app.ListActivity; import android.content.DialogInterface; import android.content.Intent; import android.content.DialogInterface.OnCancelListener; +import android.content.res.Configuration; import android.database.Cursor; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Matrix; import android.net.Uri; import android.os.Bundle; -import android.text.Html; import android.text.TextUtils; -import android.util.Log; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; @@ -168,7 +167,7 @@ public class OwnCloudMainScreen extends ListActivity { String s = mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta.FILE_PATH)); for (String str : s.split("/")) { if (!TextUtils.isEmpty(str)) - pl.push(str.replace("%20", " ")); + pl.push(DisplayUtils.HtmlDecode(str)); } } getListView().setAdapter(new FileListListAdapter(mCursor, this)); @@ -211,7 +210,7 @@ public class OwnCloudMainScreen extends ListActivity { if (mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta.FILE_CONTENT_TYPE)).equals("DIR")) { String id_ = mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta._ID)); String dirname = mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta.FILE_NAME)); - pl.push(dirname); + pl.push(DisplayUtils.HtmlDecode(dirname)); mParents.push(id_); mCursor = managedQuery(Uri.withAppendedPath(ProviderTableMeta.CONTENT_URI_DIR, id_), null, @@ -275,6 +274,10 @@ public class OwnCloudMainScreen extends ListActivity { getListView().invalidate(); } - + @Override + public void onConfigurationChanged(Configuration newConfig) { + // TODO Auto-generated method stub + //super.onConfigurationChanged(newConfig); + } } \ No newline at end of file diff --git a/src/eu/alefzero/owncloud/PathLayout.java b/src/eu/alefzero/owncloud/PathLayout.java index 1927404a..9d6e7516 100644 --- a/src/eu/alefzero/owncloud/PathLayout.java +++ b/src/eu/alefzero/owncloud/PathLayout.java @@ -1,12 +1,9 @@ package eu.alefzero.owncloud; -import java.net.Inet4Address; import java.util.Stack; import android.content.Context; import android.util.AttributeSet; -import android.view.View; -import android.view.View.OnClickListener; import android.widget.HorizontalScrollView; import android.widget.ImageView; import android.widget.LinearLayout; -- 2.11.0