Browse Source

Add custom folder icon

Signed-off-by: Mario Danic <mario@lovelyhq.com>
Mario Danic 8 years ago
parent
commit
662b08a12c

+ 1 - 1
src/main/java/com/owncloud/android/datamodel/MediaFolder.java

@@ -30,7 +30,7 @@ public class MediaFolder {
     public static final Integer CUSTOM = 0;
     public static final Integer IMAGE = 1;
     public static final Integer VIDEO = 2;
-    public static final Integer IMAGE_VIDEO = 3;
+    public static final Integer LEGACY = 3;
 
     /** name of the folder. */
     public String folderName;

+ 1 - 1
src/main/java/com/owncloud/android/ui/activity/FolderSyncActivity.java

@@ -181,7 +181,7 @@ public class FolderSyncActivity extends FileActivity implements FolderSyncAdapte
                 final List<MediaFolder> mediaFolders = MediaProvider.getImageFolders(getContentResolver(),
                         perFolderMediaItemLimit, FolderSyncActivity.this);
                 Log_OC.w(TAG, "Picture Folders: " + mediaFolders.size());
-                mediaFolders.addAll(MediaProvider.getVideoFolders(getContentResolver(),perFolderMediaItemLimit));
+                mediaFolders.addAll(MediaProvider.getVideoFolders(getContentResolver(), perFolderMediaItemLimit));
                 Log_OC.w(TAG, "Picture+Video Folders: " + mediaFolders.size());
 
                 //TODO properly merge image and video lists to remove duplicates

+ 5 - 1
src/main/java/com/owncloud/android/ui/adapter/FolderSyncAdapter.java

@@ -91,11 +91,15 @@ public class FolderSyncAdapter extends SectionedRecyclerViewAdapter<FolderSyncAd
     @Override
     public void onBindHeaderViewHolder(final MainViewHolder holder, final int section) {
         holder.title.setText(mSyncFolderItems.get(section).getFolderName());
+
         if (MediaFolder.VIDEO == mSyncFolderItems.get(section).getType()) {
             holder.type.setImageResource(R.drawable.ic_video_18dp);
-        } else {
+        } else if (MediaFolder.IMAGE == mSyncFolderItems.get(section).getType()) {
             holder.type.setImageResource(R.drawable.ic_image_18dp);
+        } else {
+            holder.type.setImageResource(R.drawable.ic_folder_star_18dp);
         }
+        
         holder.syncStatusButton.setVisibility(View.VISIBLE);
         holder.syncStatusButton.setTag(section);
         holder.syncStatusButton.setOnClickListener(new View.OnClickListener() {

+ 3 - 0
src/main/res/values/strings.xml

@@ -678,6 +678,9 @@
     <string name="privacy">Privacy</string>
     <string name="file_not_found">File not found!</string>
 
+    <!-- Auto upload -->
+    <string name="autoupload_custom_folder">Setup a custom folder</string>
+
     <string name="folder_sync_folders">Configure folders</string>
 
   <string name="empty" translatable="false"/>