Merge branch 'develop' into imageGrid

diff --cc src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 1e6670d,df05ba4..d809f14
--- 1/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
--- 2/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@@ -1,6 -1,6 +1,6 @@@
  /* ownCloud Android client application\r
   *   Copyright (C) 2011  Bartek Przybylski\r
-- *   Copyright (C) 2012-2014 ownCloud Inc.\r
++ *   Copyright (C) 2012-2015 ownCloud Inc.\r
   *\r
   *   This program is free software: you can redistribute it and/or modify\r
   *   it under the terms of the GNU General Public License version 2,\r
@@@ -36,11 -31,9 +31,9 @@@ import android.view.LayoutInflater
  import android.view.View;\r
  import android.view.ViewGroup;\r
  import android.widget.BaseAdapter;\r
- import android.widget.Filter;\r
- import android.widget.Filterable;\r
 +import android.widget.GridView;\r
  import android.widget.ImageView;\r
  import android.widget.ListAdapter;\r
 -import android.widget.ListView;\r
  import android.widget.TextView;\r
  \r
  import com.owncloud.android.R;\r
@@@ -75,25 -68,21 +69,22 @@@ public class FileListListAdapter extend
      private FileDataStorageManager mStorageManager;\r
      private Account mAccount;\r
      private ComponentsGetter mTransferServiceGetter;\r
-     private Integer mSortOrder;\r
-     public static final Integer SORT_NAME = 0;\r
-     public static final Integer SORT_DATE = 1;\r
-     public static final Integer SORT_SIZE = 2;\r
-     private Boolean mSortAscending;\r
+ \r
 +    private enum ViewType {LIST_ITEM, GRID_IMAGE, GRID_ITEM };\r
++\r
      private SharedPreferences mAppPreferences;\r
      \r
      public FileListListAdapter(\r
              boolean justFolders, \r
-             Context context, \r
+             Context context,\r
              ComponentsGetter transferServiceGetter\r
              ) {\r
 -\r
 +        \r
          mJustFolders = justFolders;\r
          mContext = context;\r
          mAccount = AccountUtils.getCurrentOwnCloudAccount(mContext);\r
 -\r
          mTransferServiceGetter = transferServiceGetter;\r
-         \r
+ \r
          mAppPreferences = PreferenceManager\r
                  .getDefaultSharedPreferences(mContext);\r
          \r
@@@ -142,145 -132,80 +133,149 @@@
  \r
      @Override\r
      public View getView(int position, View convertView, ViewGroup parent) {\r
 +\r
 +        boolean fileView = DisplayUtils.decideViewLayout(mFiles);\r
 +\r
          View view = convertView;\r
 -        if (view == null) {\r
 -            LayoutInflater inflator = (LayoutInflater) mContext\r
 -                    .getSystemService(Context.LAYOUT_INFLATER_SERVICE);\r
 -            view = inflator.inflate(R.layout.list_item, null);\r
 -        }\r
 -         \r
 +        OCFile file = null;\r
 +        LayoutInflater inflator = (LayoutInflater) mContext\r
 +                .getSystemService(Context.LAYOUT_INFLATER_SERVICE);\r
 +\r
          if (mFiles != null && mFiles.size() > position) {\r
 -            OCFile file = mFiles.get(position);\r
 -            TextView fileName = (TextView) view.findViewById(R.id.Filename);           \r
 -            String name = file.getFileName();\r
 +            file = mFiles.get(position);\r
 +        }\r
 +\r
 +        // Find out which layout should be displayed\r
 +        ViewType viewType;\r
 +        if (!fileView){\r
 +            viewType = ViewType.LIST_ITEM;\r
 +        } else if (file.isImage()){\r
 +            viewType = ViewType.GRID_IMAGE;\r
 +        } else {\r
 +            viewType = ViewType.GRID_ITEM;\r
 +        }\r
 +\r
 +        // Create View\r
 +        switch (viewType){\r
 +            case GRID_IMAGE:\r
 +                view = inflator.inflate(R.layout.grid_image, null);\r
 +                break;\r
 +            case GRID_ITEM:\r
 +                view = inflator.inflate(R.layout.grid_item, null);\r
 +                break;\r
 +            case LIST_ITEM:\r
 +                view = inflator.inflate(R.layout.list_item, null);\r
 +                break;\r
 +        }\r
  \r
 -            fileName.setText(name);\r
 -            ImageView fileIcon = (ImageView) view.findViewById(R.id.imageView1);\r
 +        view.invalidate();\r
 +\r
 +        if (file != null){\r
 +\r
 +            ImageView fileIcon = (ImageView) view.findViewById(R.id.thumbnail);\r
+             fileIcon.setTag(file.getFileId());\r
 -            ImageView sharedIconV = (ImageView) view.findViewById(R.id.sharedIcon);\r
 -            ImageView sharedWithMeIconV = (ImageView) view.findViewById(R.id.sharedWithMeIcon);\r
 -            sharedWithMeIconV.setVisibility(View.GONE);\r
 -\r
 -            ImageView localStateView = (ImageView) view.findViewById(R.id.imageView2);\r
 -            localStateView.bringToFront();\r
 -            FileDownloaderBinder downloaderBinder = mTransferServiceGetter.getFileDownloaderBinder();\r
 -            FileUploaderBinder uploaderBinder = mTransferServiceGetter.getFileUploaderBinder();\r
 -            boolean downloading = (downloaderBinder != null && downloaderBinder.isDownloading(mAccount, file));\r
 -            OperationsServiceBinder opsBinder = mTransferServiceGetter.getOperationsServiceBinder();\r
 -            downloading |= (opsBinder != null && opsBinder.isSynchronizing(mAccount, file.getRemotePath()));\r
 -            if (downloading) {\r
 -                localStateView.setImageResource(R.drawable.downloading_file_indicator);\r
 -                localStateView.setVisibility(View.VISIBLE);\r
 -            } else if (uploaderBinder != null && uploaderBinder.isUploading(mAccount, file)) {\r
 -                localStateView.setImageResource(R.drawable.uploading_file_indicator);\r
 -                localStateView.setVisibility(View.VISIBLE);\r
 -            } else if (file.isDown()) {\r
 -                localStateView.setImageResource(R.drawable.local_file_indicator);\r
 -                localStateView.setVisibility(View.VISIBLE);\r
 -            } else {\r
 -                localStateView.setVisibility(View.INVISIBLE);\r
 +            TextView fileName;\r
 +            String name;\r
 +\r
 +            switch (viewType){\r
 +                case LIST_ITEM:\r
 +                    TextView fileSizeV = (TextView) view.findViewById(R.id.file_size);\r
 +                    TextView lastModV = (TextView) view.findViewById(R.id.last_mod);\r
 +                    ImageView checkBoxV = (ImageView) view.findViewById(R.id.custom_checkbox);\r
 +\r
 +                    lastModV.setVisibility(View.VISIBLE);\r
 +                    lastModV.setText(showRelativeTimestamp(file));\r
 +\r
 +                    checkBoxV.setVisibility(View.GONE);\r
 +\r
 +                    fileSizeV.setVisibility(View.VISIBLE);\r
 +                    fileSizeV.setText(DisplayUtils.bytesToHumanReadable(file.getFileLength()));\r
 +\r
 +                    if (!file.isFolder()) {\r
 +                        GridView parentList = (GridView)parent;\r
 +                        if (parentList.getChoiceMode() == GridView.CHOICE_MODE_NONE) {\r
 +                            checkBoxV.setVisibility(View.GONE);\r
 +                        } else {\r
 +                            if (parentList.isItemChecked(position)) {\r
 +                                checkBoxV.setImageResource(android.R.drawable.checkbox_on_background);\r
 +                            } else {\r
 +                                checkBoxV.setImageResource(android.R.drawable.checkbox_off_background);\r
 +                            }\r
 +                            checkBoxV.setVisibility(View.VISIBLE);\r
 +                        }\r
 +\r
 +                    } else { //Folder\r
 +                        fileSizeV.setVisibility(View.INVISIBLE);\r
 +                    }\r
 +\r
 +                case GRID_ITEM:\r
 +                    // filename\r
 +                    fileName = (TextView) view.findViewById(R.id.Filename);\r
 +                    name = file.getFileName();\r
 +                    fileName.setText(name);\r
 +\r
 +                case GRID_IMAGE:\r
 +                    // sharedIcon\r
 +                    ImageView sharedIconV = (ImageView) view.findViewById(R.id.sharedIcon);\r
 +                    if (file.isShareByLink()) {\r
 +                        sharedIconV.setVisibility(View.VISIBLE);\r
 +                        sharedIconV.bringToFront();\r
 +                    } else {\r
 +                        sharedIconV.setVisibility(View.GONE);\r
 +                    }\r
 +\r
 +                    // local state\r
 +                    ImageView localStateView = (ImageView) view.findViewById(R.id.localFileIndicator);\r
 +                    localStateView.bringToFront();\r
 +                    FileDownloaderBinder downloaderBinder = mTransferServiceGetter.getFileDownloaderBinder();\r
 +                    FileUploaderBinder uploaderBinder = mTransferServiceGetter.getFileUploaderBinder();\r
-                     if (downloaderBinder != null && downloaderBinder.isDownloading(mAccount, file)) {\r
++                    boolean downloading = (downloaderBinder != null && downloaderBinder.isDownloading(mAccount, file));\r
++                    OperationsServiceBinder opsBinder = mTransferServiceGetter.getOperationsServiceBinder();\r
++                    downloading |= (opsBinder != null && opsBinder.isSynchronizing(mAccount, file.getRemotePath()));\r
++                    if (downloading) {\r
 +                        localStateView.setImageResource(R.drawable.downloading_file_indicator);\r
 +                        localStateView.setVisibility(View.VISIBLE);\r
 +                    } else if (uploaderBinder != null && uploaderBinder.isUploading(mAccount, file)) {\r
 +                        localStateView.setImageResource(R.drawable.uploading_file_indicator);\r
 +                        localStateView.setVisibility(View.VISIBLE);\r
 +                    } else if (file.isDown()) {\r
 +                        localStateView.setImageResource(R.drawable.local_file_indicator);\r
 +                        localStateView.setVisibility(View.VISIBLE);\r
 +                    } else {\r
 +                        localStateView.setVisibility(View.INVISIBLE);\r
 +                    }\r
 +\r
 +                    // share with me icon\r
 +                    if (!file.isFolder()) {\r
 +                        ImageView sharedWithMeIconV = (ImageView) view.findViewById(R.id.sharedWithMeIcon);\r
 +                        sharedWithMeIconV.bringToFront();\r
 +                        if (checkIfFileIsSharedWithMe(file)) {\r
 +                            sharedWithMeIconV.setVisibility(View.VISIBLE);\r
 +                        } else {\r
 +                            sharedWithMeIconV.setVisibility(View.GONE);\r
 +                        }\r
 +                    }\r
 +\r
 +                    break;\r
              }\r
              \r
 -            TextView fileSizeV = (TextView) view.findViewById(R.id.file_size);\r
 -            TextView lastModV = (TextView) view.findViewById(R.id.last_mod);\r
 -            ImageView checkBoxV = (ImageView) view.findViewById(R.id.custom_checkbox);\r
 +            // For all Views\r
              \r
 +            // this if-else is needed even though favorite icon is visible by default\r
 +            // because android reuses views in listview\r
 +            if (!file.keepInSync()) {\r
 +                view.findViewById(R.id.favoriteIcon).setVisibility(View.GONE);\r
 +            } else {\r
 +                view.findViewById(R.id.favoriteIcon).setVisibility(View.VISIBLE);\r
 +            }\r
 +            \r
 +            // No Folder\r
              if (!file.isFolder()) {\r
 -                fileSizeV.setVisibility(View.VISIBLE);\r
 -                fileSizeV.setText(DisplayUtils.bytesToHumanReadable(file.getFileLength()));\r
 -                lastModV.setVisibility(View.VISIBLE);\r
 -                lastModV.setText(showRelativeTimestamp(file));\r
 -                // this if-else is needed even thoe fav icon is visible by default\r
 -                // because android reuses views in listview\r
 -                if (!file.keepInSync()) {\r
 -                    view.findViewById(R.id.imageView3).setVisibility(View.GONE);\r
 -                } else {\r
 -                    view.findViewById(R.id.imageView3).setVisibility(View.VISIBLE);\r
 -                }\r
 -                \r
 -                ListView parentList = (ListView)parent;\r
 -                if (parentList.getChoiceMode() == ListView.CHOICE_MODE_NONE) { \r
 -                    checkBoxV.setVisibility(View.GONE);\r
 -                } else {\r
 -                    if (parentList.isItemChecked(position)) {\r
 -                        checkBoxV.setImageResource(android.R.drawable.checkbox_on_background);\r
 -                    } else {\r
 -                        checkBoxV.setImageResource(android.R.drawable.checkbox_off_background);\r
 -                    }\r
 -                    checkBoxV.setVisibility(View.VISIBLE);\r
 -                }               \r
 -                \r
 -                // get Thumbnail if file is image\r
                  if (file.isImage() && file.getRemoteId() != null){\r
 -                     // Thumbnail in Cache?\r
 +                    // Thumbnail in Cache?\r
                      Bitmap thumbnail = ThumbnailsCacheManager.getBitmapFromDiskCache(\r
                              String.valueOf(file.getRemoteId())\r
 -                    );\r
 +                            );\r
                      if (thumbnail != null && !file.needsUpdateThumbnail()){\r
                          fileIcon.setImageBitmap(thumbnail);\r
                      } else {\r

diff --cc src/com/owncloud/android/ui/fragment/OCFileListFragment.java
Simple merge