From 4157d0c1ef7b2b75b738383dce9d832bce13c717 Mon Sep 17 00:00:00 2001
From: Brian Pellin <bpellin@gmail.com>
Date: Mon, 26 Jan 2009 23:41:14 -0600
Subject: [PATCH] Minor group layout tweaks.

---
 res/layout/list.xml                        |  4 ++--
 res/values/strings.xml                     |  1 +
 src/com/android/keepass/KeePass.java       |  2 +-
 src/com/android/keepass/PwGroupView.java   |  5 +++++
 src/com/android/keepass/PwItemView.java    | 10 +++++++---
 src/com/android/keepass/PwListAdapter.java |  5 ++++-
 6 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/res/layout/list.xml b/res/layout/list.xml
index 1faaf266a..603694fa0 100644
--- a/res/layout/list.xml
+++ b/res/layout/list.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-      android:layout_width="wrap_content"
+      android:layout_width="fill_parent"
     android:layout_height="wrap_content">
   <ListView android:id="@android:id/list"
-        android:layout_width="wrap_content"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"/>
   <TextView android:id="@android:id/empty"
         android:layout_width="wrap_content"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0ee66ff40..bab9001bf 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -18,4 +18,5 @@
 <string name="menu_copy_user">Copy User</string>
 <string name="menu_copy_pass">Copy Password</string>
 <string name="pass_filename">Filename:</string>
+<color name="group">#FF00FF</color>
 </resources>
diff --git a/src/com/android/keepass/KeePass.java b/src/com/android/keepass/KeePass.java
index cc2c11658..e0ddf051d 100644
--- a/src/com/android/keepass/KeePass.java
+++ b/src/com/android/keepass/KeePass.java
@@ -69,7 +69,6 @@ public class KeePass extends Activity {
 	protected void onStop() {
 		super.onStop();
 		
-		saveDefaultPrefs();
 	}
 
 	private void loadDefaultPrefs() {
@@ -113,6 +112,7 @@ public class KeePass extends Activity {
 			
 			switch (result) {
 			case 0:
+				saveDefaultPrefs();
 				GroupActivity.Launch(mAct, null);
 				break;
 			case -1:
diff --git a/src/com/android/keepass/PwGroupView.java b/src/com/android/keepass/PwGroupView.java
index a780b4d58..5a99ea291 100644
--- a/src/com/android/keepass/PwGroupView.java
+++ b/src/com/android/keepass/PwGroupView.java
@@ -22,6 +22,9 @@ package com.android.keepass;
 import org.phoneid.keepassj2me.PwGroup;
 
 import android.app.Activity;
+import android.graphics.Color;
+import android.util.TypedValue;
+import android.widget.TextView;
 
 public class PwGroupView extends PwItemView {
 	
@@ -33,6 +36,8 @@ public class PwGroupView extends PwItemView {
 		mAct = act;
 		mPw = pw;
 		
+		getTextView().setTextColor(Color.BLUE);
+		
 	}
 	
 	public void setGroup(PwGroup pw) {
diff --git a/src/com/android/keepass/PwItemView.java b/src/com/android/keepass/PwItemView.java
index 59ef7f233..34a3e9a97 100644
--- a/src/com/android/keepass/PwItemView.java
+++ b/src/com/android/keepass/PwItemView.java
@@ -29,16 +29,20 @@ abstract public class PwItemView extends LinearLayout {
 	
 	PwItemView(Context context, String title) {
 		super(context);
-
+		
 		mTitle = new TextView(context);
 		mTitle.setText(title);
 		mTitle.setTextSize(TypedValue.COMPLEX_UNIT_SP, 30);
-		addView(mTitle, new LinearLayout.LayoutParams(LayoutParams.FILL_PARENT,LayoutParams.WRAP_CONTENT));
+		addView(mTitle, new LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT,LayoutParams.WRAP_CONTENT));
 	}
 	
-	void setTitle(String title) {
+	protected void setTitle(String title) {
 		mTitle.setText(title);
 	}
 	
+	protected TextView getTextView() {
+		return mTitle;
+	}
+	
 	abstract void onClick();
 }
diff --git a/src/com/android/keepass/PwListAdapter.java b/src/com/android/keepass/PwListAdapter.java
index 351a55007..47ce53f12 100644
--- a/src/com/android/keepass/PwListAdapter.java
+++ b/src/com/android/keepass/PwListAdapter.java
@@ -25,6 +25,8 @@ import android.app.Activity;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
+import android.widget.LinearLayout;
+import android.widget.LinearLayout.LayoutParams;
 
 import org.phoneid.keepassj2me.PwEntry;
 import org.phoneid.keepassj2me.PwGroup;
@@ -67,7 +69,7 @@ public class PwListAdapter extends BaseAdapter {
 		}
 	}
 
-	private PwGroupView createGroupView(int position, View convertView) {
+	private View createGroupView(int position, View convertView) {
 		PwGroupView gv;
 		if (convertView == null || ! (convertView instanceof PwGroupView)) {
 			PwGroup group = (PwGroup) mGroup.childGroups.elementAt(position);
@@ -76,6 +78,7 @@ public class PwListAdapter extends BaseAdapter {
 			gv = (PwGroupView) convertView;
 			gv.setGroup((PwGroup) mGroup.childGroups.elementAt(position));
 		}
+		
 		return gv;
 	}