mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 17:46:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

further cleanup, moving folder icon determination into util class

Browse source
This commit is contained in:
Andy Scherzinger 2015-09-11 11:15:55 +02:00
parent ed094a7df6
commit b1aff42715
2 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/com/owncloud/android/ui/adapter/FileListListAdapter.java
View file

@ -336,18 +336,9 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
} else {
// Folder
if (checkIfFileIsSharedWithMe(file)) {
fileIcon.setImageResource(R.drawable.shared_with_me_folder);
} else if (file.isShareByLink()) {
// If folder is sharedByLink, icon folder must be changed to
// folder-public one
fileIcon.setImageResource(R.drawable.folder_public);
} else {
fileIcon.setImageResource(
MimetypeIconUtil.getFileTypeIconId(file.getMimetype(), file.getFileName())
);
}
fileIcon.setImageResource(
MimetypeIconUtil.getFolderTypeIconId(
checkIfFileIsSharedWithMe(file), file.isShareByLink()));
}
}

21
src/com/owncloud/android/utils/MimetypeIconUtil.java
View file

@ -12,8 +12,8 @@ import java.util.List;
import java.util.Map;
/**
* <p>Helper class for detecting the right icon for a file or directory,
* based on its mime type and/or file extension.</p>
* <p>Helper class for detecting the right icon for a file or folder,
* based on its mime type and file extension.</p>
*
* This class maintains all the necessary mappings fot these detections.<br/>
* In order to add further mappings, there are up to three look up maps that need further values:
@ -66,6 +66,23 @@ public class MimetypeIconUtil {
return determineIconIdByMimeTypeList(possibleMimeTypes);
}
/**
* Returns the resource identifier of an image to use as icon associated to a type of folder.
*
* @param isSharedWithUser flag if the folder is shared with the user
* @param isShareByLink flag if the folder is shared by link
* @return Identifier of an image resource.
*/
public static int getFolderTypeIconId(boolean isSharedWithUser, boolean isShareByLink) {
if (isSharedWithUser) {
return R.drawable.shared_with_me_folder;
} else if (isShareByLink) {
return R.drawable.folder_public;
}
return R.drawable.ic_menu_archive;
}
/**
* determines the icon based on the mime type.
*