From: Bartek Przybylski Date: Sun, 4 Sep 2011 20:46:53 +0000 (+0200) Subject: proper filename displaying, bigger icons X-Git-Tag: oc-android-1.4.3~517 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/6f1620254383f62778f5246801ebaee2c95a4cbb proper filename displaying, bigger icons --- diff --git a/res/drawable-hdpi/file.png b/res/drawable-hdpi/file.png new file mode 100644 index 00000000..561c788a Binary files /dev/null and b/res/drawable-hdpi/file.png differ diff --git a/res/drawable-hdpi/ic_menu_archive.png b/res/drawable-hdpi/ic_menu_archive.png index e2d9bc1a..bc60b00a 100644 Binary files a/res/drawable-hdpi/ic_menu_archive.png and b/res/drawable-hdpi/ic_menu_archive.png differ diff --git a/res/drawable-ldpi/file.png b/res/drawable-ldpi/file.png new file mode 100644 index 00000000..8cdfc4f2 Binary files /dev/null and b/res/drawable-ldpi/file.png differ diff --git a/res/drawable-ldpi/ic_menu_archive.png b/res/drawable-ldpi/ic_menu_archive.png index 719ecd85..ebe6e4a2 100644 Binary files a/res/drawable-ldpi/ic_menu_archive.png and b/res/drawable-ldpi/ic_menu_archive.png differ diff --git a/res/drawable-mdpi/file.png b/res/drawable-mdpi/file.png new file mode 100644 index 00000000..561c788a Binary files /dev/null and b/res/drawable-mdpi/file.png differ diff --git a/res/drawable-mdpi/ic_menu_archive.png b/res/drawable-mdpi/ic_menu_archive.png index 49ac569d..66f02446 100644 Binary files a/res/drawable-mdpi/ic_menu_archive.png and b/res/drawable-mdpi/ic_menu_archive.png differ diff --git a/res/drawable/file.png b/res/drawable/file.png deleted file mode 100644 index 49790448..00000000 Binary files a/res/drawable/file.png and /dev/null differ 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;