select all / deselect all file in upload menu

diff --git a/.classpath b/.classpath
index 7bc01d9..5176974 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>

-       <classpathentry kind="src" path="src"/>
-       <classpathentry kind="src" path="gen"/>

        <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
        <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
        <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
        <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
        <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
        <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>

+       <classpathentry kind="src" path="src"/>
+       <classpathentry kind="src" path="gen"/>

        <classpathentry kind="output" path="bin/classes"/>
 </classpath>
        <classpathentry kind="output" path="bin/classes"/>
 </classpath>

diff --git a/res/menu/file_select_all.xml b/res/menu/file_select_all.xml
new file mode 100644 (file)
index 0000000..a8097aa
--- /dev/null
+++ b/res/menu/file_select_all.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:id="@+id/actionbar_select_all"
+        android:icon="@android:drawable/checkbox_off_background"
+        android:orderInCategory="1"
+        android:showAsAction="always"
+        android:title="actionbar_select_all"/>
+    
+
+</menu>

diff --git a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
index db0802b..3b2d1b4 100644 (file)
--- a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
+++ b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
@@ -34,6 +34,9 @@ import android.widget.TextView;
 
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.ActionBar.OnNavigationListener;
 
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.ActionBar.OnNavigationListener;

+import com.actionbarsherlock.internal.view.menu.ActionMenuItemView;
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuInflater;

 import com.actionbarsherlock.view.MenuItem;
 import com.owncloud.android.R;
 import com.owncloud.android.ui.dialog.ConfirmationDialogFragment;
 import com.actionbarsherlock.view.MenuItem;
 import com.owncloud.android.R;
 import com.owncloud.android.ui.dialog.ConfirmationDialogFragment;


@@ -73,6 +76,8 @@ public class UploadFilesActivity extends FileActivity implements
     private static final String WAIT_DIALOG_TAG = "WAIT";
     private static final String QUERY_TO_MOVE_DIALOG_TAG = "QUERY_TO_MOVE";
     
     private static final String WAIT_DIALOG_TAG = "WAIT";
     private static final String QUERY_TO_MOVE_DIALOG_TAG = "QUERY_TO_MOVE";
     

+    private boolean selectAllToggled = false;
+    private Menu menu;

     
     @Override
     public void onCreate(Bundle savedInstanceState) {
     
     @Override
     public void onCreate(Bundle savedInstanceState) {


@@ -119,6 +124,7 @@ public class UploadFilesActivity extends FileActivity implements
         actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
         actionBar.setListNavigationCallbacks(mDirectories, this);
         
         actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
         actionBar.setListNavigationCallbacks(mDirectories, this);
         

+        

         // wait dialog
         if (mCurrentDialog != null) {
             mCurrentDialog.dismiss();
         // wait dialog
         if (mCurrentDialog != null) {
             mCurrentDialog.dismiss();


@@ -127,8 +133,15 @@ public class UploadFilesActivity extends FileActivity implements
             
         Log_OC.d(TAG, "onCreate() end");
     }
             
         Log_OC.d(TAG, "onCreate() end");
     }

-
-
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        // Inflate the menu items for use in the action bar
+        MenuInflater inflater = getSherlock().getMenuInflater();
+        inflater.inflate(R.menu.file_select_all, menu);     
+        this.menu = menu;
+        return true;
+    }
+ 

     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         boolean retval = true;
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         boolean retval = true;


@@ -139,12 +152,37 @@ public class UploadFilesActivity extends FileActivity implements
                 }
                 break;
             }
                 }
                 break;
             }

+            case R.id.actionbar_select_all:{
+                if(selectAllToggled){
+                    // deselect all
+                    toggleOffSelectAll();
+                }else{
+                    // select alls
+                    toggleOnSelectAll(item);
+                }
+                break;
+            }

             default:
                 retval = super.onOptionsItemSelected(item);
         }
         return retval;
     }
             default:
                 retval = super.onOptionsItemSelected(item);
         }
         return retval;
     }

-
+    public void toggleOffSelectAll(MenuItem item){
+        selectAllToggled = false;
+        item.setIcon(android.R.drawable.checkbox_off_background);
+//        mFileListFragment.listDirectory()
+        mFileListFragment.deselectAll();
+    }
+    public void toggleOffSelectAll(){
+        MenuItem item = menu.findItem(R.id.actionbar_select_all);
+        toggleOffSelectAll(item);
+    }
+    public void toggleOnSelectAll(MenuItem item){
+        selectAllToggled = true;
+        item.setIcon(android.R.drawable.checkbox_on_background);
+        
+        mFileListFragment.selectAll();
+    }

     
     @Override
     public boolean onNavigationItemSelected(int itemPosition, long itemId) {
     
     @Override
     public boolean onNavigationItemSelected(int itemPosition, long itemId) {


@@ -175,6 +213,7 @@ public class UploadFilesActivity extends FileActivity implements
             ActionBar actionBar = getSupportActionBar(); 
             actionBar.setDisplayHomeAsUpEnabled(false);
         } 
             ActionBar actionBar = getSupportActionBar(); 
             actionBar.setDisplayHomeAsUpEnabled(false);
         } 

+        toggleOffSelectAll();

     }
 
     
     }
 
     


@@ -242,10 +281,11 @@ public class UploadFilesActivity extends FileActivity implements
      * {@inheritDoc}
      */
     @Override
      * {@inheritDoc}
      */
     @Override

-    public void onDirectoryClick(File directory) {
+    public void onDirectoryClick(File directory) { 

         pushDirname(directory);
         ActionBar actionBar = getSupportActionBar();
         actionBar.setDisplayHomeAsUpEnabled(true);
         pushDirname(directory);
         ActionBar actionBar = getSupportActionBar();
         actionBar.setDisplayHomeAsUpEnabled(true);

+        toggleOffSelectAll();

     }
     
     
     }
     
     

diff --git a/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java b/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
index bc46601..4cdf80f 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
@@ -97,13 +97,53 @@ public class LocalFileListFragment extends ExtendedListFragment {
         Log_OC.i(TAG, "onActivityCreated() stop");
     }
     
         Log_OC.i(TAG, "onActivityCreated() stop");
     }
     

+    public void selectAll(){
+        int numberOfFiles = mAdapter.getCount();
+        for(int i = 0; i < numberOfFiles; i++){
+            File file = (File) mAdapter.getItem(i);
+            if (file != null) {
+                /// Click on a directory
+                if (file.isDirectory()) {                    
+                
+                } else {    /// Click on a file
+                    getListView().setItemChecked(i, true);
+                       
+                    // notify the change to the container Activity
+                    mContainerActivity.onFileClick(file);
+                }
+            }
+        }
+    }
+    
+    public void deselectAll(){
+        /*
+        int numberOfFiles = mAdapter.getCount();
+        for(int i = 0; i < numberOfFiles; i++){
+            File file = (File) mAdapter.getItem(i);
+            if (file != null) {
+                /// Click on a directory
+                if (file.isDirectory()) {                    
+                
+                } else {    /// Click on a file
+                    if(getListView().isItemChecked(i)){
+                        getListView().setItemChecked(i, false);
+                    }     
+                    // notify the change to the container Activity
+                    mContainerActivity.onFileClick(file);
+                }
+            }
+        }*/
+        mAdapter = new LocalFileListAdapter(mContainerActivity.getInitialDirectory(), getActivity());
+        setListAdapter(mAdapter);
+    }

     
     /**
      * Checks the file clicked over. Browses inside if it is a directory. Notifies the container activity in any case.
      */
     @Override
     public void onItemClick(AdapterView<?> l, View v, int position, long id) {
     
     /**
      * Checks the file clicked over. Browses inside if it is a directory. Notifies the container activity in any case.
      */
     @Override
     public void onItemClick(AdapterView<?> l, View v, int position, long id) {

-        File file = (File) mAdapter.getItem(position); 
+        File file = (File) mAdapter.getItem(position);
+        

         if (file != null) {
             /// Click on a directory
             if (file.isDirectory()) {
         if (file != null) {
             /// Click on a directory
             if (file.isDirectory()) {

diff --git a/tests/.classpath b/tests/.classpath
index 9b141f6..26d8fe4 100644 (file)
--- a/tests/.classpath
+++ b/tests/.classpath
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>

-       <classpathentry kind="src" path="src"/>
-       <classpathentry kind="src" path="gen"/>

        <classpathentry combineaccessrules="false" kind="src" path="/owncloud-android"/>
        <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
        <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
        <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
        <classpathentry combineaccessrules="false" kind="src" path="/owncloud-android"/>
        <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
        <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
        <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>

+       <classpathentry kind="src" path="src"/>
+       <classpathentry kind="src" path="gen"/>

        <classpathentry kind="output" path="bin/classes"/>
 </classpath>
        <classpathentry kind="output" path="bin/classes"/>
 </classpath>