changes due to code review

setup_env.bat

@@ -24,7 +24,7 @@ call git submodule update
 
 call android.bat update project -p libs/android-support-appcompat-v7-exploded-aar --target android-23
 call android.bat update project -p libs/android-support-design-exploded-aar --target android-23
-call android.bat update project -p libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar --target android-23
+call android.bat update project -p libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar --target android-22
 call android.bat update lib-project -p owncloud-android-library
 call android.bat update project -p .
 call android.bat update project -p oc_jb_workaround

setup_env.sh

@@ -19,7 +19,7 @@ function initForAnt {
 	#Prepare project android-support-appcompat-v7 ; JAR file is not enough, includes resources
 	android update lib-project -p libs/android-support-appcompat-v7-exploded-aar --target android-23
 	android update lib-project -p libs/android-support-design-exploded-aar --target android-23
-	android update lib-project -p libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar --target android-23
+	android update lib-project -p libs/com-getbase-floatingactionbutton-1-10-1-exploded-aar --target android-22
 
 	#As default it updates the ant scripts
 	android update lib-project -p owncloud-android-library

src/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -46,14 +46,12 @@ import android.os.IBinder;
 import android.preference.PreferenceManager;
 import android.provider.OpenableColumns;
 import android.support.design.widget.Snackbar;
-import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v4.content.ContextCompat;
 import android.support.v4.view.GravityCompat;
 import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatDialog;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -88,7 +86,6 @@ import com.owncloud.android.ui.dialog.ConfirmationDialogFragment;
 import com.owncloud.android.ui.dialog.CreateFolderDialogFragment;
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog.OnSslUntrustedCertListener;
-import com.owncloud.android.ui.dialog.UploadSourceDialogFragment;
 import com.owncloud.android.ui.fragment.FileDetailFragment;
 import com.owncloud.android.ui.fragment.FileFragment;
 import com.owncloud.android.ui.fragment.OCFileListFragment;
@@ -975,7 +972,9 @@ public class FileDisplayActivity extends HookActivity
     }
 
     public boolean isFabOpen() {
-        if(getListOfFilesFragment() != null && getListOfFilesFragment().getFabMain() != null && getListOfFilesFragment().getFabMain().isExpanded()) {
+        if(getListOfFilesFragment() != null
+                && getListOfFilesFragment().getFabMain() != null
+                && getListOfFilesFragment().getFabMain().isExpanded()) {
             return true;
         } else {
             return false;

src/com/owncloud/android/ui/fragment/ExtendedListFragment.java

@@ -22,7 +22,6 @@ package com.owncloud.android.ui.fragment;
 
 import java.util.ArrayList;
 
-import android.app.Activity;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -37,7 +36,6 @@ import android.widget.GridView;
 import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.getbase.floatingactionbutton.FloatingActionButton;
 import com.getbase.floatingactionbutton.FloatingActionsMenu;
@@ -46,7 +44,6 @@ import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.ui.ExtendedListView;
 import com.owncloud.android.ui.activity.OnEnforceableRefreshListener;
 import com.owncloud.android.ui.adapter.FileListListAdapter;
-import com.owncloud.android.ui.dialog.CreateFolderDialogFragment;
 
 import third_parties.in.srain.cube.GridViewWithHeaderAndFooter;
 
@@ -70,10 +67,10 @@ public class ExtendedListFragment extends Fragment
     private SwipeRefreshLayout mRefreshEmptyLayout;
     private TextView mEmptyListMessage;
 
-    private FloatingActionsMenu fabMain;
-    private FloatingActionButton fabUpload;
-    private FloatingActionButton fabMkdir;
-    private FloatingActionButton fabUploadFromApp;
+    private FloatingActionsMenu mFabMain;
+    private FloatingActionButton mFabUpload;
+    private FloatingActionButton mFabMkdir;
+    private FloatingActionButton mFabUploadFromApp;
     
     // Save the state of the scroll in browsing
     private ArrayList<Integer> mIndexes;
@@ -107,19 +104,19 @@ public class ExtendedListFragment extends Fragment
     }
 
     public FloatingActionButton getFabUpload() {
-        return fabUpload;
+        return mFabUpload;
     }
 
     public FloatingActionButton getFabUploadFromApp() {
-        return fabUploadFromApp;
+        return mFabUploadFromApp;
     }
 
     public FloatingActionButton getFabMkdir() {
-        return fabMkdir;
+        return mFabMkdir;
     }
 
     public FloatingActionsMenu getFabMain() {
-        return fabMain;
+        return mFabMain;
     }
 
     public void switchToGridView() {
@@ -203,10 +200,10 @@ public class ExtendedListFragment extends Fragment
 
         mCurrentListView = mListView;   // list as default
 
-        fabMain = (FloatingActionsMenu) v.findViewById(R.id.fab_main);
-        fabUpload = (FloatingActionButton) v.findViewById(R.id.fab_upload);
-        fabMkdir = (FloatingActionButton) v.findViewById(R.id.fab_mkdir);
-        fabUploadFromApp = (FloatingActionButton) v.findViewById(R.id.fab_upload_from_app);
+        mFabMain = (FloatingActionsMenu) v.findViewById(R.id.fab_main);
+        mFabUpload = (FloatingActionButton) v.findViewById(R.id.fab_upload);
+        mFabMkdir = (FloatingActionButton) v.findViewById(R.id.fab_mkdir);
+        mFabUploadFromApp = (FloatingActionButton) v.findViewById(R.id.fab_upload_from_app);
 
         return v;
     }
@@ -367,9 +364,9 @@ public class ExtendedListFragment extends Fragment
      */
     public void setFabEnabled(boolean enabled) {
         if(enabled) {
-            fabMain.setVisibility(View.VISIBLE);
+            mFabMain.setVisibility(View.VISIBLE);
         } else {
-            fabMain.setVisibility(View.GONE);
+            mFabMain.setVisibility(View.GONE);
         }
     }
 

src/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -39,12 +39,10 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.AdapterView.AdapterContextMenuInfo;
-import android.widget.ListView;
 import android.widget.PopupMenu;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.getbase.floatingactionbutton.FloatingActionsMenu;
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.datamodel.FileDataStorageManager;
@@ -63,7 +61,6 @@ import com.owncloud.android.ui.dialog.CreateFolderDialogFragment;
 import com.owncloud.android.ui.dialog.FileActionsDialogFragment;
 import com.owncloud.android.ui.dialog.RemoveFileDialogFragment;
 import com.owncloud.android.ui.dialog.RenameFileDialogFragment;
-import com.owncloud.android.ui.dialog.UploadSourceDialogFragment;
 import com.owncloud.android.ui.preview.PreviewImageFragment;
 import com.owncloud.android.ui.preview.PreviewMediaFragment;
 import com.owncloud.android.ui.preview.PreviewTextFragment;
@@ -140,31 +137,6 @@ public class OCFileListFragment extends ExtendedListFragment
         Log_OC.i(TAG, "onCreateView() start");
         View v = super.onCreateView(inflater, container, savedInstanceState);
 
-        // Setup FAB listeners
-        getFabUpload().setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                ((FileDisplayActivity)getActivity()).uploadLocalFilesSelected();
-                getFabMain().collapse();
-            }
-        });
-
-        getFabMkdir().setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                ((FileDisplayActivity) getActivity()).createFolder();
-                getFabMain().collapse();
-            }
-        });
-
-        getFabUploadFromApp().setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                ((FileDisplayActivity) getActivity()).uploadFromOtherAppsSelected();
-                getFabMain().collapse();
-            }
-        });
-
         Log_OC.i(TAG, "onCreateView() end");
         return v;
     }
@@ -361,9 +333,12 @@ public class OCFileListFragment extends ExtendedListFragment
         getFabUpload().setTitle(null);
         getFabMkdir().setTitle(null);
         getFabUploadFromApp().setTitle(null);
-        ((TextView) getFabUpload().getTag(com.getbase.floatingactionbutton.R.id.fab_label)).setVisibility(View.GONE);
-        ((TextView) getFabMkdir().getTag(com.getbase.floatingactionbutton.R.id.fab_label)).setVisibility(View.GONE);
-        ((TextView) getFabUploadFromApp().getTag(com.getbase.floatingactionbutton.R.id.fab_label)).setVisibility(View.GONE);
+        ((TextView) getFabUpload().getTag(
+                com.getbase.floatingactionbutton.R.id.fab_label)).setVisibility(View.GONE);
+        ((TextView) getFabMkdir().getTag(
+                com.getbase.floatingactionbutton.R.id.fab_label)).setVisibility(View.GONE);
+        ((TextView) getFabUploadFromApp().getTag(
+                com.getbase.floatingactionbutton.R.id.fab_label)).setVisibility(View.GONE);
     }
 
     private void registerLongClickListener() {