From 30c2ede8e5334cb26b7ad0fa69b7a254fab5afc5 Mon Sep 17 00:00:00 2001
From: Lennart Rosam <lennart@familie-rosam.de>
Date: Tue, 10 Apr 2012 04:40:53 +0200
Subject: [PATCH] Migration to ActionBarSherlock 4.0.1 / Custom Adapter to
 override text colors in the ListNavigation Dropdown spinner

---
 actionbarsherlock                                  |   2 +-
 project.properties                                 |   2 +-
 res/values/styles.xml                              |  14 +-
 src/eu/alefzero/owncloud/ui/FragmentListView.java  |   5 +-
 .../owncloud/ui/activity/FileDisplayActivity.java  | 395 ++++++++++++---------
 src/eu/alefzero/owncloud/ui/fragment/FileList.java |   2 +-
 6 files changed, 235 insertions(+), 185 deletions(-)

diff --git a/actionbarsherlock b/actionbarsherlock
index 989a0ffa..8fcee10a 160000
--- a/actionbarsherlock
+++ b/actionbarsherlock
@@ -1 +1 @@
-Subproject commit 989a0ffa90e1d7f665d9efc70e532d6c407ac5f2
+Subproject commit 8fcee10a340d54fb4acdbddcdc1746ad3f377eca
diff --git a/project.properties b/project.properties
index 66f56ed1..d476196b 100644
--- a/project.properties
+++ b/project.properties
@@ -8,5 +8,5 @@
 # project structure.
 
 # Project target.
-target=android-13
+target=android-14
 android.library.reference.1=actionbarsherlock/library
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 1d444550..307cdeea 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -3,16 +3,18 @@
 	<style name="Animations" />
 
 	<!-- Default ownCloud app style -->
-	<style name="Theme.ownCloud" parent="style/Theme.Sherlock.Light">
-    	<item name="abBackground">@drawable/main_header_bg</item>
-    	<item name="abTitleTextStyle">@style/ocActionBarTextStyle</item>
+	<style name="Theme.ownCloud" parent="style/Theme.Sherlock.Light.DarkActionBar">
+    	<item name="android:actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
+    	<item name="actionBarStyle">@style/Theme.ownCloud.Widget.ActionBar</item>
 	</style>
 
-	<style name="ocActionBarTextStyle">
+	<style name="Theme.ownCloud.Widget.ActionBar" parent="style/Widget.Sherlock.Light.ActionBar.Solid.Inverse">
     	<item name="android:textColor">#ffffff</item>
+    	<item name="android:background">@drawable/main_header_bg</item>
 	</style>
-	    
-	    
+	
+	
+	
 	<!-- PopDownMenu -->
 	<style name="Animations.PopDownMenu" />
 	
diff --git a/src/eu/alefzero/owncloud/ui/FragmentListView.java b/src/eu/alefzero/owncloud/ui/FragmentListView.java
index 7965f722..a8d0dcd5 100644
--- a/src/eu/alefzero/owncloud/ui/FragmentListView.java
+++ b/src/eu/alefzero/owncloud/ui/FragmentListView.java
@@ -1,7 +1,8 @@
 package eu.alefzero.owncloud.ui;
 
+import com.actionbarsherlock.app.SherlockFragment;
+
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -10,7 +11,7 @@ import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.AdapterView.OnItemClickListener;
 
-public class FragmentListView extends Fragment implements OnItemClickListener {
+public class FragmentListView extends SherlockFragment implements OnItemClickListener {
   ListView mList;
   
   @Override
diff --git a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
index f726fd9b..6c3f2a88 100644
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -21,21 +21,27 @@ package eu.alefzero.owncloud.ui.activity;
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.app.AlertDialog;
-import android.app.Dialog;
 import android.app.AlertDialog.Builder;
+import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnCancelListener;
 import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v4.app.ActionBar;
-import android.support.v4.app.ActionBar.OnNavigationListener;
-import android.support.v4.view.Menu;
-import android.support.v4.view.MenuItem;
-import android.view.MenuInflater;
+import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.EditText;
+import android.widget.TextView;
+
+import com.actionbarsherlock.app.ActionBar;
+import com.actionbarsherlock.app.ActionBar.OnNavigationListener;
+import com.actionbarsherlock.app.SherlockFragmentActivity;
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuInflater;
+import com.actionbarsherlock.view.MenuItem;
+
 import eu.alefzero.owncloud.R;
 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;
 import eu.alefzero.owncloud.authenticator.AuthUtils;
@@ -45,177 +51,218 @@ import eu.alefzero.webdav.WebdavClient;
 
 /**
  * Displays, what files the user has available in his ownCloud.
+ * 
  * @author Bartek Przybylski
- *
+ * 
  */
 
-public class FileDisplayActivity extends android.support.v4.app.FragmentActivity implements OnNavigationListener {
-  private ArrayAdapter<String> mDirectories;
- 
-  private static final int DIALOG_CHOOSE_ACCOUNT = 0;
-  
-  public void pushPath(String path) {
-    mDirectories.insert(path, 0);
-  }
-  
-  public boolean popPath() {
-    mDirectories.remove(mDirectories.getItem(0));
-    return !mDirectories.isEmpty();
-  }
-  
-  @Override
-  protected Dialog onCreateDialog(int id, Bundle args) {
-    final AlertDialog.Builder builder = new Builder(this);
-    final EditText dirName = new EditText(getBaseContext());
-    final Account a = AuthUtils.getCurrentOwnCloudAccount(this);
-    builder.setView(dirName);
-    builder.setTitle(R.string.uploader_info_dirname);
-    
-    builder.setPositiveButton(R.string.common_ok, new OnClickListener() {
-      public void onClick(DialogInterface dialog, int which) {
-        String s = dirName.getText().toString();
-        if (s.trim().isEmpty()) {
-          dialog.cancel();
-          return;
-        }
-        
-        String path = "";
-        for (int i = mDirectories.getCount()-2; i >= 0; --i) {
-          path += "/" + mDirectories.getItem(i);
+public class FileDisplayActivity extends SherlockFragmentActivity implements
+		OnNavigationListener {
+	private ArrayAdapter<String> mDirectories;
+
+	private static final int DIALOG_CHOOSE_ACCOUNT = 0;
+
+	public void pushPath(String path) {
+		mDirectories.insert(path, 0);
+	}
+
+	public boolean popPath() {
+		mDirectories.remove(mDirectories.getItem(0));
+		return !mDirectories.isEmpty();
+	}
+
+	@Override
+	protected Dialog onCreateDialog(int id, Bundle args) {
+		final AlertDialog.Builder builder = new Builder(this);
+		final EditText dirName = new EditText(getBaseContext());
+		final Account a = AuthUtils.getCurrentOwnCloudAccount(this);
+		builder.setView(dirName);
+		builder.setTitle(R.string.uploader_info_dirname);
+
+		builder.setPositiveButton(R.string.common_ok, new OnClickListener() {
+			public void onClick(DialogInterface dialog, int which) {
+				String s = dirName.getText().toString();
+				if (s.trim().isEmpty()) {
+					dialog.cancel();
+					return;
+				}
+
+				String path = "";
+				for (int i = mDirectories.getCount() - 2; i >= 0; --i) {
+					path += "/" + mDirectories.getItem(i);
+				}
+				OCFile parent = new OCFile(getContentResolver(), a, path + "/");
+				path += "/" + s + "/";
+				Thread thread = new Thread(new DirectoryCreator(path, a));
+				thread.start();
+				OCFile.createNewFile(getContentResolver(), a, path, 0, 0, 0,
+						"DIR", parent.getFileId()).save();
+
+				dialog.dismiss();
+			}
+		});
+		builder.setNegativeButton(R.string.common_cancel,
+				new OnClickListener() {
+					public void onClick(DialogInterface dialog, int which) {
+						dialog.cancel();
+					}
+				});
+		return builder.create();
+	}
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		mDirectories = new CustomArrayAdapter<String>(this,
+				R.layout.sherlock_spinner_dropdown_item);
+		mDirectories.add("/");
+		setContentView(R.layout.files);
+		ActionBar action_bar = getSupportActionBar();
+		action_bar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
+		action_bar.setDisplayShowTitleEnabled(false);
+		action_bar.setListNavigationCallbacks(mDirectories, this);
+		action_bar.setDisplayHomeAsUpEnabled(true);
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		switch (item.getItemId()) {
+		case R.id.settingsItem: {
+			Intent i = new Intent(this, Preferences.class);
+			startActivity(i);
+			break;
+		}
+		case R.id.createDirectoryItem: {
+			showDialog(0);
+			break;
+		}
+		}
+		return true;
+	}
+
+	@Override
+	protected Dialog onCreateDialog(int id) {
+		switch (id) {
+		case DIALOG_CHOOSE_ACCOUNT:
+			return createChooseAccountDialog();
+		default:
+			throw new IllegalArgumentException("Unknown dialog id: " + id);
+		}
+	}
+
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		MenuInflater inflater = getSherlock().getMenuInflater();
+		inflater.inflate(R.menu.menu, menu);
+		return true;
+	}
+
+	private Dialog createChooseAccountDialog() {
+		final AccountManager accMan = AccountManager.get(this);
+		CharSequence[] items = new CharSequence[accMan
+				.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE).length];
+		int i = 0;
+		for (Account a : accMan
+				.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE)) {
+			items[i++] = a.name;
+		}
+
+		AlertDialog.Builder builder = new AlertDialog.Builder(this);
+		builder.setTitle(R.string.common_choose_account);
+		builder.setCancelable(true);
+		builder.setItems(items, new DialogInterface.OnClickListener() {
+			public void onClick(DialogInterface dialog, int item) {
+				// mAccount =
+				// accMan.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE)[item];
+				dialog.dismiss();
+			}
+		});
+		builder.setOnCancelListener(new OnCancelListener() {
+			public void onCancel(DialogInterface dialog) {
+				FileDisplayActivity.this.finish();
+			}
+		});
+		AlertDialog alert = builder.create();
+		return alert;
+	}
+
+	@Override
+	public boolean onNavigationItemSelected(int itemPosition, long itemId) {
+		int i = itemPosition;
+		while (i-- != 0) {
+			onBackPressed();
+		}
+		return true;
+	}
+
+	@Override
+	public void onBackPressed() {
+		popPath();
+		if (mDirectories.getCount() == 0) {
+			super.onBackPressed();
+			return;
+		}
+		((FileList) getSupportFragmentManager().findFragmentById(R.id.fileList))
+				.onBackPressed();
+	}
+
+	private class DirectoryCreator implements Runnable {
+		private String mTargetPath;
+		private Account mAccount;
+		private AccountManager mAm;
+
+		public DirectoryCreator(String targetPath, Account account) {
+			mTargetPath = targetPath;
+			mAccount = account;
+			mAm = (AccountManager) getSystemService(ACCOUNT_SERVICE);
+		}
+
+		@Override
+		public void run() {
+			WebdavClient wdc = new WebdavClient(Uri.parse(mAm.getUserData(
+					mAccount, AccountAuthenticator.KEY_OC_URL)));
+
+			String username = mAccount.name.substring(0,
+					mAccount.name.lastIndexOf('@'));
+			String password = mAm.getPassword(mAccount);
+
+			wdc.setCredentials(username, password);
+			wdc.allowUnsignedCertificates();
+			wdc.createDirectory(mTargetPath);
+		}
+
+	}
+
+	// Custom array adapter to override text colors
+	private class CustomArrayAdapter<T> extends ArrayAdapter<T> {
+		
+		public CustomArrayAdapter(FileDisplayActivity ctx,
+				int view) {
+			super(ctx, view);
+		}
+
+		public View getView(int position, View convertView,
+                ViewGroup parent) {
+            View v = super.getView(position, convertView, parent);
+
+            ((TextView) v).setTextColor(
+                    getResources()
+                    .getColorStateList(android.R.color.white));
+            return v;
         }
-        OCFile parent = new OCFile(getContentResolver(), a, path+"/");
-        path += "/" + s + "/";
-        Thread thread = new Thread(new DirectoryCreator(path, a));
-        thread.start();
-        OCFile.createNewFile(getContentResolver(), a, path, 0, 0, 0, "DIR", parent.getFileId()).save();
-        
-        dialog.dismiss();
-      }
-    });
-    builder.setNegativeButton(R.string.common_cancel, new OnClickListener() {
-      public void onClick(DialogInterface dialog, int which) {
-        dialog.cancel();
-      }
-    });
-    return builder.create();
-  }
-  
-  @Override
-  public void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    mDirectories = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_dropdown_item);
-    mDirectories.add("/");
-    setContentView(R.layout.files);
-    ActionBar action_bar = getSupportActionBar();
-    action_bar.setNavigationMode(android.support.v4.app.ActionBar.NAVIGATION_MODE_LIST);
-    action_bar.setDisplayShowTitleEnabled(false);
-    action_bar.setListNavigationCallbacks(mDirectories, this);
-  }
-
-  @Override
-  public boolean onOptionsItemSelected(MenuItem item) {
-    switch (item.getItemId()) {
-      case R.id.settingsItem :
-      {
-        Intent i = new Intent(this, Preferences.class);
-        startActivity(i);
-        break;
-      }
-      case R.id.createDirectoryItem:
-      {
-        showDialog(0);
-        break;
-      }
-    }
-    return true;
-  }
-
-  @Override
-  protected Dialog onCreateDialog(int id) {
-    switch (id) {
-      case DIALOG_CHOOSE_ACCOUNT:
-        return createChooseAccountDialog();
-      default:
-        throw new IllegalArgumentException("Unknown dialog id: " + id);
-    }
-  }
-  
-  @Override
-  public boolean onCreateOptionsMenu(Menu menu) {
-    MenuInflater inflater = getMenuInflater();
-    inflater.inflate(R.menu.menu, menu);
-    return true;
-  }
-
-  private Dialog createChooseAccountDialog() {
-    final AccountManager accMan = AccountManager.get(this);
-    CharSequence[] items = new CharSequence[accMan.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE).length];
-    int i = 0;
-    for (Account a : accMan.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE)) {
-      items[i++] = a.name;
-    }
-    
-    AlertDialog.Builder builder = new AlertDialog.Builder(this);
-    builder.setTitle(R.string.common_choose_account);
-    builder.setCancelable(true);
-    builder.setItems(items, new DialogInterface.OnClickListener() {
-        public void onClick(DialogInterface dialog, int item) {
-            //mAccount = accMan.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE)[item];
-            dialog.dismiss();
+		
+		public View getDropDownView(int position, View convertView,
+                ViewGroup parent) {
+            View v = super.getDropDownView(position, convertView,
+                    parent);
+
+            ((TextView) v).setTextColor(getResources().getColorStateList(
+                            android.R.color.white));
+
+            return v;
         }
-    });
-    builder.setOnCancelListener(new OnCancelListener() {
-      public void onCancel(DialogInterface dialog) {
-        FileDisplayActivity.this.finish();
-      }
-    });
-    AlertDialog alert = builder.create();
-    return alert;
-  }
-
-  @Override
-  public boolean onNavigationItemSelected(int itemPosition, long itemId) {
-    int i = itemPosition;
-    while (i-- != 0) {
-      onBackPressed();
-    }
-    return true;
-  }
-  
-  @Override
-  public void onBackPressed() {
-    popPath();
-    if (mDirectories.getCount() == 0)
-    {
-      super.onBackPressed();
-      return;
-    }
-    ((FileList)getSupportFragmentManager().findFragmentById(R.id.fileList)).onBackPressed();
-  }
-  
-  private class DirectoryCreator implements Runnable {
-    private String mTargetPath;
-    private Account mAccount;
-    private AccountManager mAm;
-    
-    public DirectoryCreator(String targetPath, Account account) {
-      mTargetPath = targetPath;
-      mAccount = account;
-      mAm = (AccountManager) getSystemService(ACCOUNT_SERVICE);
-    }
-    
-    @Override
-    public void run() {
-      WebdavClient wdc = new WebdavClient(Uri.parse(mAm.getUserData(mAccount,
-          AccountAuthenticator.KEY_OC_URL)));
-      
-      String username = mAccount.name.substring(0, mAccount.name.lastIndexOf('@'));
-      String password = mAm.getPassword(mAccount);
-      
-      wdc.setCredentials(username, password);
-      wdc.allowUnsignedCertificates();
-      wdc.createDirectory(mTargetPath);
-    }
-    
-  }
+
+
+		
+	}
 }
\ No newline at end of file
diff --git a/src/eu/alefzero/owncloud/ui/fragment/FileList.java b/src/eu/alefzero/owncloud/ui/fragment/FileList.java
index bb600934..341d1d4c 100644
--- a/src/eu/alefzero/owncloud/ui/fragment/FileList.java
+++ b/src/eu/alefzero/owncloud/ui/fragment/FileList.java
@@ -82,7 +82,7 @@ public class FileList extends FragmentListView {
     i.putExtra("FULL_PATH", file.getPath());
     i.putExtra("FILE_ID", id_);
     i.putExtra("ACCOUNT", mAccount);
-    FileDetail fd = (FileDetail) getSupportFragmentManager().findFragmentById(R.id.fileDetail);
+    FileDetail fd = (FileDetail) getFragmentManager().findFragmentById(R.id.fileDetail);
     if (fd != null) {
       fd.setStuff(i);
     } else {
-- 
2.11.0