Move create folder button to action bar in Uploader

diff --git a/res/layout/uploader_layout.xml b/res/layout/uploader_layout.xml
index 0210e17..6245c8b 100644 (file)
--- a/res/layout/uploader_layout.xml
+++ b/res/layout/uploader_layout.xml
@@ -53,12 +53,12 @@
            android:orientation="horizontal" >
 
                <Button
            android:orientation="horizontal" >
 
                <Button

-                   android:id="@+id/uploader_new_folder"
+                   android:id="@+id/uploader_cancel"

                    android:layout_width="fill_parent"
                    android:layout_height="wrap_content"
                    android:layout_gravity="bottom"
                    android:layout_weight="1"
                    android:layout_width="fill_parent"
                    android:layout_height="wrap_content"
                    android:layout_gravity="bottom"
                    android:layout_weight="1"

-                   android:text="@string/uploader_btn_new_folder_text" />
+                   android:text="@string/common_cancel" />

                
                <Button
                    android:id="@+id/uploader_choose_folder"
                
                <Button
                    android:id="@+id/uploader_choose_folder"

diff --git a/src/com/owncloud/android/ui/activity/Uploader.java b/src/com/owncloud/android/ui/activity/Uploader.java
index f0e0695..8b5be06 100644 (file)
--- a/src/com/owncloud/android/ui/activity/Uploader.java
+++ b/src/com/owncloud/android/ui/activity/Uploader.java
@@ -57,6 +57,8 @@ import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v7.app.ActionBar;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v7.app.ActionBar;

+import android.view.Menu;
+import android.view.MenuInflater;

 import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;


@@ -356,9 +358,8 @@ public class Uploader extends FileActivity
 
             break;
             
 
             break;
             

-        case R.id.uploader_new_folder:
-            CreateFolderDialogFragment dialog = CreateFolderDialogFragment.newInstance(mFile);
-            dialog.show(getSupportFragmentManager(), "createdirdialog");
+        case R.id.uploader_cancel:
+            finish();

             break;
             
             
             break;
             
             


@@ -432,7 +433,7 @@ public class Uploader extends FileActivity
             Button btnChooseFolder = (Button) findViewById(R.id.uploader_choose_folder);
             btnChooseFolder.setOnClickListener(this);
             
             Button btnChooseFolder = (Button) findViewById(R.id.uploader_choose_folder);
             btnChooseFolder.setOnClickListener(this);
             

-            Button btnNewFolder = (Button) findViewById(R.id.uploader_new_folder);
+            Button btnNewFolder = (Button) findViewById(R.id.uploader_cancel);

             btnNewFolder.setOnClickListener(this);
             
             mListView.setOnItemClickListener(this);
             btnNewFolder.setOnClickListener(this);
             
             mListView.setOnItemClickListener(this);


@@ -648,11 +649,26 @@ public class Uploader extends FileActivity
         }
     }
 
         }
     }
 

+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.main_menu, menu);
+        menu.findItem(R.id.action_upload).setVisible(false);
+        menu.findItem(R.id.action_sort).setVisible(false);
+        menu.findItem(R.id.action_sync_account).setVisible(false);
+        return true;
+    }

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

+            case R.id.action_create_dir:
+                CreateFolderDialogFragment dialog = CreateFolderDialogFragment.newInstance(mFile);
+                dialog.show(
+                        getSupportFragmentManager(),
+                        CreateFolderDialogFragment.CREATE_FOLDER_FRAGMENT);
+                break;

             case android.R.id.home:
                 if((mParents.size() > 1)) {
                     onBackPressed();
             case android.R.id.home:
                 if((mParents.size() > 1)) {
                     onBackPressed();