From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 2 Feb 2015 12:48:30 +0000 (+0100)
Subject: Merge branch 'develop' into imageGrid
X-Git-Tag: oc-android-1.7.0_signed~16^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/4af15f7b4ed255f8ccc378e9cf2e47280868129d?ds=inline;hp=--cc

Merge branch 'develop' into imageGrid
---

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