provide drawables for different screen densities

haiwen · Mar 12, 2014 · b0e072a · b0e072a
1 parent cc77f53
commit b0e072a
Show file tree

Hide file tree

Showing 54 changed files with 7 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,4 @@ local.properties
 .project
 .settings
 libs
+tmp
diff --git a/res/drawable-hdpi/file.png b/res/drawable-hdpi/file.png
diff --git a/res/drawable-hdpi/file_audio.png b/res/drawable-hdpi/file_audio.png
diff --git a/res/drawable-hdpi/file_image.png b/res/drawable-hdpi/file_image.png
diff --git a/res/drawable-hdpi/file_ms_excel.png b/res/drawable-hdpi/file_ms_excel.png
diff --git a/res/drawable-hdpi/file_ms_ppt.png b/res/drawable-hdpi/file_ms_ppt.png
diff --git a/res/drawable-hdpi/file_ms_word.png b/res/drawable-hdpi/file_ms_word.png
diff --git a/res/drawable-hdpi/file_pdf.png b/res/drawable-hdpi/file_pdf.png
diff --git a/res/drawable-hdpi/file_text.png b/res/drawable-hdpi/file_text.png
diff --git a/res/drawable-hdpi/file_video.png b/res/drawable-hdpi/file_video.png
diff --git a/res/drawable-hdpi/folder.png b/res/drawable-hdpi/folder.png
diff --git a/res/drawable-ldpi/file.png b/res/drawable-ldpi/file.png
diff --git a/res/drawable-ldpi/file_audio.png b/res/drawable-ldpi/file_audio.png
diff --git a/res/drawable-ldpi/file_image.png b/res/drawable-ldpi/file_image.png
diff --git a/res/drawable-ldpi/file_ms_excel.png b/res/drawable-ldpi/file_ms_excel.png
diff --git a/res/drawable-ldpi/file_ms_ppt.png b/res/drawable-ldpi/file_ms_ppt.png
diff --git a/res/drawable-ldpi/file_ms_word.png b/res/drawable-ldpi/file_ms_word.png
diff --git a/res/drawable-ldpi/file_pdf.png b/res/drawable-ldpi/file_pdf.png
diff --git a/res/drawable-ldpi/file_text.png b/res/drawable-ldpi/file_text.png
diff --git a/res/drawable-ldpi/file_video.png b/res/drawable-ldpi/file_video.png
diff --git a/res/drawable-ldpi/folder.png b/res/drawable-ldpi/folder.png
diff --git a/res/drawable-ldpi/repo.png b/res/drawable-ldpi/repo.png
diff --git a/res/drawable-ldpi/repo_encrypted.png b/res/drawable-ldpi/repo_encrypted.png
diff --git a/res/drawable-mdpi/file.png b/res/drawable-mdpi/file.png
diff --git a/res/drawable-mdpi/file_audio.png b/res/drawable-mdpi/file_audio.png
diff --git a/res/drawable-mdpi/file_binary.png b/res/drawable-mdpi/file_binary.png
diff --git a/res/drawable-mdpi/file_image.png b/res/drawable-mdpi/file_image.png
diff --git a/res/drawable-mdpi/file_ms_excel.png b/res/drawable-mdpi/file_ms_excel.png
diff --git a/res/drawable-mdpi/file_ms_ppt.png b/res/drawable-mdpi/file_ms_ppt.png
diff --git a/res/drawable-mdpi/file_ms_word.png b/res/drawable-mdpi/file_ms_word.png
diff --git a/res/drawable-mdpi/file_pdf.png b/res/drawable-mdpi/file_pdf.png
diff --git a/res/drawable-mdpi/file_text.png b/res/drawable-mdpi/file_text.png
diff --git a/res/drawable-mdpi/file_video.png b/res/drawable-mdpi/file_video.png
diff --git a/res/drawable-mdpi/folder.png b/res/drawable-mdpi/folder.png
diff --git a/res/drawable-nodpi/file_binary.png b/res/drawable-nodpi/file_binary.png
diff --git a/res/drawable-xhdpi/file.png b/res/drawable-xhdpi/file.png
diff --git a/res/drawable-xhdpi/file_audio.png b/res/drawable-xhdpi/file_audio.png
diff --git a/res/drawable-xhdpi/file_image.png b/res/drawable-xhdpi/file_image.png
diff --git a/res/drawable-xhdpi/file_ms_excel.png b/res/drawable-xhdpi/file_ms_excel.png
diff --git a/res/drawable-xhdpi/file_ms_ppt.png b/res/drawable-xhdpi/file_ms_ppt.png
diff --git a/res/drawable-xhdpi/file_ms_word.png b/res/drawable-xhdpi/file_ms_word.png
diff --git a/res/drawable-xhdpi/file_pdf.png b/res/drawable-xhdpi/file_pdf.png
diff --git a/res/drawable-xhdpi/file_text.png b/res/drawable-xhdpi/file_text.png
diff --git a/res/drawable-xhdpi/file_video.png b/res/drawable-xhdpi/file_video.png
diff --git a/res/drawable-xhdpi/folder.png b/res/drawable-xhdpi/folder.png
diff --git a/res/drawable-xhdpi/repo.png b/res/drawable-xhdpi/repo.png
diff --git a/res/drawable-xhdpi/repo_encrypted.png b/res/drawable-xhdpi/repo_encrypted.png
diff --git a/res/drawable/perm_group_activity.xml → res/drawable/tab_activity.xml b/res/drawable/perm_group_activity.xml → res/drawable/tab_activity.xml
diff --git a/res/drawable/perm_group_library.xml → res/drawable/tab_library.xml b/res/drawable/perm_group_library.xml → res/drawable/tab_library.xml
diff --git a/res/drawable/perm_group_starred.xml → res/drawable/tab_starred.xml b/res/drawable/perm_group_starred.xml → res/drawable/tab_starred.xml
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
@@ -50,7 +50,7 @@
     <string name="download_failed">下载失败</string>
     <string name="trust_https_server">此证书不是由受信任的组织颁发，要继续吗？</string>
     <string name="upload_to">上传至： </string>
-    <string name="task_cancel">取消上传</string>
+    <string name="task_cancel">取消</string>
     <string name="task_retry">重新上传</string>
     <string name="task_remove">移除</string>
     <string name="task_remove_all_finished">移除所有任务</string>
@@ -86,7 +86,6 @@
     <string name="no_app_available">没有找到应用</string>
     <string name="add_to_seafile">添加到Seafile中</string>
     <string name="ok">确定</string>
-    <string name="cancel">取消</string>
     <string name="no_account">首先请在Seafile上创建一个账户</string>
     <string name="no_library">对不起，您还没有任何资料库</string>
     <string name="choose_an_account">请选择一个账户</string>
@@ -138,7 +137,6 @@
     <string name="error_when_load_starred">加载星标文件失败</string>
     <string name="open_as">打开为</string>
     <string name="select_upload_files">请选择要上传的文件</string>
-    <string name="cancel">取消上传</string>
     <string name="upload">上传</string>
     <string name="storage_removed">存储卡已被移出</string>
     <string name="error_selecting_file">选择文件时出错</string>

diff --git a/src/com/seafile/seadroid2/Utils.java b/src/com/seafile/seadroid2/Utils.java
@@ -215,8 +215,8 @@ public static int getResIdforMimetype(String mimetype) {
             } else if (mimetype.contains("presentationml")) {
                 return R.drawable.file_ms_ppt;
             }
-        } else if (mimetype.contains("application")) {
-            return R.drawable.file_binary;
+        // } else if (mimetype.contains("application")) {
+        //     return R.drawable.file_binary;
         }
 
         return R.drawable.file;

diff --git a/src/com/seafile/seadroid2/ui/SeafItemAdapter.java b/src/com/seafile/seadroid2/ui/SeafItemAdapter.java
@@ -165,7 +165,7 @@ private View getDirentView(SeafDirent dirent, View convertView, ViewGroup parent
 
         viewHolder.title.setText(dirent.getTitle());
         if (dirent.isDir()) {
-            viewHolder.subtitle.setText("");
+            viewHolder.subtitle.setText(dirent.getSubtitle());
             viewHolder.icon.setImageResource(dirent.getIcon());
             viewHolder.action.setVisibility(View.VISIBLE);
             setDirAction(dirent, viewHolder, position);

diff --git a/src/com/seafile/seadroid2/ui/TabsFragment.java b/src/com/seafile/seadroid2/ui/TabsFragment.java
@@ -23,9 +23,8 @@
 public class TabsFragment extends SherlockFragment {
 
     private static final int[] ICONS = new int[] {
-            R.drawable.perm_group_library, R.drawable.perm_group_starred,
-            R.drawable.perm_group_activity
-
+        R.drawable.tab_library, R.drawable.tab_starred,
+        R.drawable.tab_activity
     };
 
     private int currentPosition = 0;
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,3 +6,4 @@ local.properties @@
     .project
     .settings
     libs
+    tmp