fragments branch initial commit

AndroidManifest.xml

@@ -21,11 +21,11 @@
         android:name="android.permission.READ_SYNC_SETTINGS" />
     <uses-permission
         android:name="android.permission.WRITE_SYNC_SETTINGS" />
-    <uses-sdk android:minSdkVersion="7"></uses-sdk>
+    <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="10" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission>
 
     <application android:icon="@drawable/icon" android:label="@string/app_name">
-        <activity android:name=".OwnCloudMainScreen"
+        <activity android:name=".MainScreen"
                   android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -70,5 +70,6 @@
          <activity android:name=".authenticator.AuthenticatorActivity"></activity>
          <service android:name="FileDownloader">
          </service>
+         <activity android:name="FileDetailActivity"></activity>
     </application>
 </manifest>

res/layout-port/main.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="#F7F7F7"
+    android:orientation="vertical" >
+
+    <fragment 
+        android:id="@+id/actionBar"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        class="eu.alefzero.owncloud.ui.ActionBar">
+        <!-- Preview: layout=@layout/action_bar -->
+    </fragment>
+
+    <fragment
+        android:id="@+id/fileList"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        class="eu.alefzero.owncloud.FileList" >
+
+        <!-- Preview: layout=@layout/list_layout -->
+    </fragment>
+    <!-- </LinearLayout> -->
+
+</LinearLayout>

res/layout/action_bar.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:background="#F7F7F7"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:id="@+id/linearLayout1"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="vertical" >
+
+        <LinearLayout
+            android:id="@+id/linearLayout7"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:background="@drawable/main_header_bg"
+            android:gravity="top"
+            android:orientation="horizontal" >
+
+            <ImageView
+                android:id="@+id/main_header_small"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical|left"
+                android:src="@drawable/icon" >
+            </ImageView>
+
+            <eu.alefzero.owncloud.PathLayout
+                android:id="@+id/pathLayout1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical" >
+            </eu.alefzero.owncloud.PathLayout>
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>

res/layout/file_activity_details.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
+
+<fragment
+    android:id="@+id/fileDetail"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    class="eu.alefzero.owncloud.FileDetail" />
+
+</LinearLayout>

res/layout/file_display.xml → res/layout/file_details.xml

@@ -2,9 +2,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="fill_parent" android:layout_height="fill_parent"
 	android:orientation="vertical" android:background="#F7F7F7">
-	<LinearLayout android:id="@+id/linearLayout7" android:paddingBottom="2pt" android:gravity="center_vertical|top" android:layout_gravity="top" android:layout_height="wrap_content" android:paddingTop="2pt" android:orientation="vertical" android:layout_width="fill_parent" android:background="#1D2D44">
-        <ImageView android:id="@+id/main_header_small" android:src="@drawable/owncloud_logo_small_white" android:layout_gravity="center|center_vertical|center_horizontal" android:layout_height="wrap_content" android:layout_width="wrap_content" android:focusable="true"></ImageView>
-    </LinearLayout>
 	<LinearLayout android:layout_width="fill_parent"
 		android:id="@+id/linearLayout1" android:layout_height="wrap_content">
 		<LinearLayout android:layout_width="wrap_content"

res/layout/main.xml

@@ -1,20 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent" android:background="#F7F7F7"
-	android:orientation="vertical" android:layout_height="fill_parent">
-	<LinearLayout android:layout_width="fill_parent"
-		android:id="@+id/linearLayout7" android:background="@drawable/main_header_bg" android:gravity="top"
-		android:layout_gravity="center_vertical" android:layout_height="wrap_content" android:orientation="horizontal">
-		<ImageView android:layout_height="wrap_content"
-			android:src="@drawable/icon"
-			android:layout_width="wrap_content" android:layout_gravity="center_vertical|left"
-			android:id="@+id/main_header_small"></ImageView>
-		<eu.alefzero.owncloud.PathLayout android:id="@+id/pathLayout1" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical"></eu.alefzero.owncloud.PathLayout>
-	</LinearLayout>
-	<FrameLayout android:layout_height="fill_parent"
-    android:layout_width="fill_parent" android:id="@+id/frameLayout1">
-    <ListView android:id="@android:id/list" android:layout_width="fill_parent"
-      android:layout_height="fill_parent" android:divider="@drawable/uploader_list_separator"
-      android:dividerHeight="1dip" android:fadingEdge="none"></ListView>
-  </FrameLayout>
-</LinearLayout>
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="#F7F7F7"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:id="@+id/linearLayout1"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="vertical" >
+
+        <fragment
+            android:id="@+id/actionBar"
+            android:layout_height="wrap_content"
+            android:layout_width="fill_parent"
+            class="eu.alefzero.owncloud.ui.ActionBar">
+            <!-- Preview: layout=@layout/action_bar -->
+        </fragment>
+
+        <LinearLayout
+            android:id="@+id/linearLayout2"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content" >
+
+            <fragment
+                android:id="@+id/fileList"
+                android:layout_width="0dp"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                class="eu.alefzero.owncloud.FileList" >
+
+                <!-- Preview: layout=@layout/list_layout -->
+            </fragment>
+
+            <fragment
+                android:id="@+id/fileDetail"
+                android:layout_width="0dp"
+                android:layout_height="fill_parent"
+                android:layout_weight="2"
+                class="eu.alefzero.owncloud.FileDetail" >
+
+                <!-- Preview: layout=@layout/file_details -->
+            </fragment>
+        </LinearLayout>
+    </LinearLayout>
+
+</LinearLayout>

src/eu/alefzero/owncloud/FileDetail.java

@@ -0,0 +1,38 @@
+package eu.alefzero.owncloud;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import android.widget.Toast;
+
+public class FileDetail extends Fragment {
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+    // TODO Auto-generated method stub
+    super.onCreate(savedInstanceState);
+    Log.e("TEST", "TEST");
+  }
+
+  @Override
+  public void onActivityCreated(Bundle savedInstanceState) {
+    // TODO Auto-generated method stub
+    super.onActivityCreated(savedInstanceState);
+  }
+
+  @Override
+  public View onCreateView(LayoutInflater inflater, ViewGroup container,
+      Bundle savedInstanceState) {
+    View v = inflater.inflate(R.layout.file_details, container, false);
+    return v;
+  }
+
+  public void use(CharSequence text) {
+    Toast.makeText(getActivity(), text, Toast.LENGTH_LONG).show();
+    // TODO Auto-generated method stub
+    
+  }
+}

src/eu/alefzero/owncloud/FileDetailActivity.java

@@ -0,0 +1,23 @@
+package eu.alefzero.owncloud;
+
+import android.app.Activity;
+import android.content.res.Configuration;
+import android.os.Bundle;
+import android.support.v4.app.FragmentActivity;
+import android.support.v4.app.FragmentTransaction;
+import android.view.Window;
+
+public class FileDetailActivity extends FragmentActivity {
+@Override
+protected void onCreate(Bundle savedInstanceState) {
+  // TODO Auto-generated method stub
+  super.onCreate(savedInstanceState);
+  getWindow().requestFeature(Window.FEATURE_NO_TITLE);
+  setContentView(R.layout.file_activity_details);
+  
+  FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
+  ft.add(R.id.fileDetail, new FileDetail());
+  ft.commit();
+  
+}
+}

src/eu/alefzero/owncloud/FileDownloader.java

@@ -1,30 +1,9 @@
 package eu.alefzero.owncloud;
 
 import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.UnknownHostException;
-import java.util.Date;
-
-import org.apache.http.HttpHost;
-import org.apache.http.HttpResponse;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.auth.BasicScheme;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.protocol.BasicHttpContext;
-
-import eu.alefzero.owncloud.authenticator.AccountAuthenticator;
-import eu.alefzero.webdav.HttpPropFind;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
-import android.accounts.AuthenticatorException;
-import android.accounts.OperationCanceledException;
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
@@ -34,7 +13,7 @@ import android.net.Uri;
 import android.os.Environment;
 import android.os.IBinder;
 import android.util.Log;
-import android.widget.FrameLayout;
+import eu.alefzero.owncloud.authenticator.AccountAuthenticator;
 
 public class FileDownloader extends Service {
   static final String EXTRA_ACCOUNT = "ACCOUNT";
@@ -78,7 +57,7 @@ public class FileDownloader extends Service {
     wdc.allowUnsignedCertificates();
 
     Notification n = new Notification(R.drawable.icon, "Downloading file", System.currentTimeMillis());
-    PendingIntent pi = PendingIntent.getActivity(this, 1, new Intent(this, OwnCloudMainScreen.class), 0);
+    PendingIntent pi = PendingIntent.getActivity(this, 1, new Intent(this, MainScreen.class), 0);
     n.setLatestEventInfo(this, "A", "B", pi);
     nm.notify(1, n);
 
@@ -91,5 +70,6 @@ public class FileDownloader extends Service {
     
     return START_NOT_STICKY;
   }
-
+  
+  
 }

src/eu/alefzero/owncloud/FileList.java

@@ -0,0 +1,65 @@
+package eu.alefzero.owncloud;
+
+import eu.alefzero.owncloud.authenticator.AccountAuthenticator;
+import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.app.Activity;
+import android.app.Service;
+import android.content.Intent;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.support.v4.app.FragmentTransaction;
+import android.support.v4.app.ListFragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+public class FileList extends ListFragment {
+  private Cursor mCursor;
+  private Account mAccount;
+  private AccountManager mAccountManager;
+  
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+    // TODO Auto-generated method stub
+    super.onCreate(savedInstanceState);
+    
+    mAccountManager = (AccountManager)getActivity().getSystemService(Service.ACCOUNT_SERVICE);
+    mAccount = mAccountManager.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE)[0];
+    populateFileList();
+  }
+  
+  @Override
+  public void onActivityCreated(Bundle savedInstanceState) {
+    // TODO Auto-generated method stub
+    super.onActivityCreated(savedInstanceState);
+  }
+ 
+  @Override
+  public void onListItemClick(ListView l, View v, int position, long id) {
+    // TODO Auto-generated method stub
+    FileDetail fd = (FileDetail) getFragmentManager().findFragmentById(R.id.fileDetail);
+    if (fd != null) {
+      fd.use(((TextView)v.findViewById(R.id.Filename)).getText());
+    } else {
+      Intent i = new Intent(getActivity(), FileDetailActivity.class);
+      startActivity(i);
+    }
+    super.onListItemClick(l, v, position, id);
+  }
+  
+  private void populateFileList() {
+    mCursor = getActivity().getContentResolver().query(ProviderTableMeta.CONTENT_URI,
+        null,
+        ProviderTableMeta.FILE_ACCOUNT_OWNER+"=?",
+        new String[]{mAccount.name},
+        null);
+    
+    setListAdapter(new FileListListAdapter(mCursor, getActivity()));
+  }
+}

src/eu/alefzero/owncloud/OwnCloudMainScreen.java → src/eu/alefzero/owncloud/MainScreen.java

@@ -41,6 +41,8 @@ import android.graphics.Matrix;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
+import android.support.v4.app.FragmentActivity;
+import android.support.v4.app.FragmentTransaction;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.Menu;
@@ -54,7 +56,7 @@ import android.widget.TextView;
 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;
 import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;
 
-public class OwnCloudMainScreen extends ListActivity {
+public class MainScreen extends FragmentActivity {
   private DbHandler mDBHandler;
   private Stack<String> mParents;
   private LinkedList<String> mPath;
@@ -64,10 +66,25 @@ public class OwnCloudMainScreen extends ListActivity {
 
   private static final int DIALOG_CHOOSE_ACCOUNT = 0;
 
-  @SuppressWarnings("unchecked")
   @Override
   public void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
+    getWindow().requestFeature(Window.FEATURE_NO_TITLE);
+    setContentView(R.layout.main);
+    
+    FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
+    ft.add(R.id.fileList, new FileList());
+    if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
+      ft.add(R.id.fileDetail, new FileDetail());
+    }
+    ft.commit();
+
+    /*getSupportFragmentManager().beginTransaction().add(arg0, arg1);
+    FileList fl = new FileList();
+    ft.add(R.id.fileList, fl);
+    ft.commit();
+    /*
+
     
     if (savedInstanceState != null) {
       mParents = (Stack<String>)savedInstanceState.getSerializable("parentsStack");
@@ -98,7 +115,7 @@ public class OwnCloudMainScreen extends ListActivity {
     } else {
       mAccount = accounts[0];
       populateFileList();
-    }
+    }*/
   }
 
   @Override
@@ -128,12 +145,6 @@ public class OwnCloudMainScreen extends ListActivity {
     inflater.inflate(R.menu.menu, menu);
     return true;
   }
-  
-  @Override
-  protected void onDestroy() {
-    mDBHandler.close();
-    super.onDestroy();
-  }
     
   private Dialog createChooseAccountDialog() {
     final AccountManager accMan = AccountManager.get(this);
@@ -155,16 +166,16 @@ public class OwnCloudMainScreen extends ListActivity {
     });
     builder.setOnCancelListener(new OnCancelListener() {
       public void onCancel(DialogInterface dialog) {
-        OwnCloudMainScreen.this.finish();
+        MainScreen.this.finish();
       }
     });
     AlertDialog alert = builder.create();
     return alert;
   }
 
-  @Override
-  public void onBackPressed() {
-    PathLayout pl = (PathLayout) findViewById(R.id.pathLayout1);
+  //@Override
+  //public void onBackPressed() {
+    /*PathLayout pl = (PathLayout) findViewById(R.id.pathLayout1);
     if (mIsDisplayingFile) {
       mIsDisplayingFile = false;
       setContentView(R.layout.main);
@@ -215,13 +226,13 @@ public class OwnCloudMainScreen extends ListActivity {
     }
     
     setListAdapter(new FileListListAdapter(mCursor, this));
-    getListView().invalidate();
-  }
+    getListView().invalidate();*/
+  //}
 
-  @Override
-  protected void onListItemClick(ListView l, View v, int position, long id) {
+  //@Override
+/*  protected void onListItemClick(ListView l, View v, int position, long id) {
     super.onListItemClick(l, v, position, id);
-    PathLayout pl = (PathLayout) findViewById(R.id.pathLayout1);
+    /*PathLayout pl = (PathLayout) findViewById(R.id.pathLayout1);
     if (!mCursor.moveToPosition(position)) {
       throw new IndexOutOfBoundsException("Incorrect item selected");
     }
@@ -291,10 +302,10 @@ public class OwnCloudMainScreen extends ListActivity {
           } else {
             startActivity(i);            
           }*/
-        }
+       // }
 
-    }
-  }
+    //}
+//  }
   
   private void populateFileList() {
     if (mParents.empty()) {
@@ -309,18 +320,18 @@ public class OwnCloudMainScreen extends ListActivity {
                                            ProviderTableMeta.FILE_ACCOUNT_OWNER + "=?",
                                            new String[]{mAccount.name}, null);
       if (!mIsDisplayingFile) {
-        PathLayout pl = (PathLayout) findViewById(R.id.pathLayout1);
-        for (String s : mPath) {
-          pl.push(s);
-        }
+        //PathLayout pl = (PathLayout) findViewById(R.id.pathLayout1);
+        //for (String s : mPath) {
+        //  pl.push(s);
+       // }
       }
     }
-    setListAdapter(new FileListListAdapter(mCursor, this));
-    getListView().invalidate();
+//    setListAdapter(new FileListListAdapter(mCursor, this));
+//    getListView().invalidate();
   }
   
-  @Override
-  protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+  //@Override
+  /*protected void onActivityResult(int requestCode, int resultCode, Intent data) {
     super.onActivityResult(requestCode, resultCode, data);
   }
   
@@ -330,6 +341,6 @@ public class OwnCloudMainScreen extends ListActivity {
     outState.putSerializable("parentsStack", mParents);
     outState.putSerializable("path", mPath);
     outState.putBoolean("isDisplayingFile", mIsDisplayingFile);
-  }
+  }*/
 
 }

src/eu/alefzero/owncloud/ui/ActionBar.java

@@ -0,0 +1,29 @@
+package eu.alefzero.owncloud.ui;
+
+import eu.alefzero.owncloud.R;
+import android.app.Activity;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+public class ActionBar extends Fragment {
+
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    
+  }
+  @Override
+  public View onCreateView(LayoutInflater inflater, ViewGroup container,
+      Bundle savedInstanceState) {
+    View v = inflater.inflate(R.layout.action_bar, container, false);
+    return v;
+  }
+  
+  @Override
+  public void onAttach(Activity activity) {
+    super.onAttach(activity);
+  }
+}