mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-23 13:45:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

Add custom folder icon

Browse source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2017-05-04 00:52:16 +02:00 committed by AndyScherzinger
parent 48d66b36c9
commit 662b08a12c
No known key found for this signature in database
GPG key ID: 6CADC7E3523C308B
4 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/owncloud/android/datamodel/MediaFolder.java
View file

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

2
src/main/java/com/owncloud/android/ui/activity/FolderSyncActivity.java
View file

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

6
src/main/java/com/owncloud/android/ui/adapter/FolderSyncAdapter.java
View file

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

3
src/main/res/values/strings.xml
View file

@ -678,6 +678,9 @@
<string name="privacy">Privacy</string> <string name="privacy">Privacy</string>
<string name="file_not_found">File not found!</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="folder_sync_folders">Configure folders</string>
<string name="empty" translatable="false"/> <string name="empty" translatable="false"/>