From 75894fdbf88148c21d733ab0e3627239564ea6bb Mon Sep 17 00:00:00 2001
From: Ricky Barrette <rickbarrette@gmail.com>
Date: Sat, 2 Jun 2012 16:05:35 -0400
Subject: [PATCH] Cleaned up the address search dialog

I also enabled the IME search action, allowing users to search by
pressing the action key on their keyboard

Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
---
 LocationRinger/res/layout/address_dialog.xml  |  17 ++-
 .../android/LocationRinger/debug/Debug.java   |   7 +-
 .../LocationRinger/ui/SearchDialog.java       | 133 +++++++++++-------
 3 files changed, 97 insertions(+), 60 deletions(-)

diff --git a/LocationRinger/res/layout/address_dialog.xml b/LocationRinger/res/layout/address_dialog.xml
index 279d6e3..a8a1a77 100644
--- a/LocationRinger/res/layout/address_dialog.xml
+++ b/LocationRinger/res/layout/address_dialog.xml
@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
+    android:gravity="center|center_horizontal"
     android:orientation="vertical" >
 
     <RelativeLayout
@@ -19,17 +20,27 @@
             android:id="@+id/ok"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_alignLeft="@+id/search_progress"
             android:layout_alignParentRight="true"
-            android:layout_toLeftOf="@id/search_progress"
+            android:layout_alignParentTop="true"
+            android:gravity="center|center_horizontal"
             android:text="@android:string/ok" />
 
         <EditText
             android:id="@+id/address"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_toLeftOf="@id/ok"
+            android:layout_alignBaseline="@+id/ok"
+            android:layout_alignBottom="@+id/ok"
+            android:layout_alignParentLeft="true"
+            android:layout_toLeftOf="@+id/ok"
+            android:ems="10"
             android:hint="@string/address"
-            android:inputType="textPostalAddress" />
+            android:imeOptions="actionSearch"
+            android:inputType="textPostalAddress" >
+
+            <requestFocus />
+        </EditText>
     </RelativeLayout>
 
     <ListView
diff --git a/LocationRinger/src/com/TwentyCodes/android/LocationRinger/debug/Debug.java b/LocationRinger/src/com/TwentyCodes/android/LocationRinger/debug/Debug.java
index 1b74ab3..9576ec1 100644
--- a/LocationRinger/src/com/TwentyCodes/android/LocationRinger/debug/Debug.java
+++ b/LocationRinger/src/com/TwentyCodes/android/LocationRinger/debug/Debug.java
@@ -10,15 +10,14 @@ import android.content.Context;
 
 /**
  * A convince class containing debugging variables
- * @author ricky barrette
- */
+ * @author ricky barrette */
 public class Debug {
 	
 	public static final boolean SUPPORTS_FROYO;
 
 	public static final boolean SUPPORTS_GINGERBREAD;
 
-	public  static final boolean SUPPORTS_HONEYCOMB;
+	public static final boolean SUPPORTS_HONEYCOMB;
 	
 	public static final int SHARED_PREFS_MODE;
 
@@ -51,6 +50,4 @@ public class Debug {
 	 * Max radius that can be set by a ringer
 	 */
 	public static final int MAX_RADIUS_IN_METERS = 600;
-	
-	
 }
\ No newline at end of file
diff --git a/LocationRinger/src/com/TwentyCodes/android/LocationRinger/ui/SearchDialog.java b/LocationRinger/src/com/TwentyCodes/android/LocationRinger/ui/SearchDialog.java
index 4d31f88..f2e815a 100644
--- a/LocationRinger/src/com/TwentyCodes/android/LocationRinger/ui/SearchDialog.java
+++ b/LocationRinger/src/com/TwentyCodes/android/LocationRinger/ui/SearchDialog.java
@@ -16,6 +16,7 @@ import android.app.Dialog;
 import android.content.Context;
 import android.os.Handler;
 import android.util.Log;
+import android.view.KeyEvent;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.AdapterView;
@@ -24,6 +25,8 @@ import android.widget.ArrayAdapter;
 import android.widget.EditText;
 import android.widget.ListView;
 import android.widget.ProgressBar;
+import android.widget.TextView;
+import android.widget.TextView.OnEditorActionListener;
 
 import com.TwentyCodes.android.LocationRinger.R;
 import com.TwentyCodes.android.LocationRinger.debug.Debug;
@@ -35,7 +38,7 @@ import com.google.android.maps.GeoPoint;
  * This dialog will be used to get users input for the address that they want to search for. A GeoPoint location will be returned via LocationSelectedListener
  * @author ricky barrette
  */
-public class SearchDialog extends Dialog implements android.view.View.OnClickListener, OnItemClickListener{
+public class SearchDialog extends Dialog implements android.view.View.OnClickListener, OnItemClickListener, OnEditorActionListener{
 
 	protected static final String TAG = "SearchDialog";
 	private ListView mAddressList;
@@ -59,6 +62,7 @@ public class SearchDialog extends Dialog implements android.view.View.OnClickLis
 		mAddressList = (ListView) findViewById(R.id.address_list);
 		mAddressList.setOnItemClickListener(this);
 		mAddress = (EditText) findViewById(R.id.address);
+		mAddress.setOnEditorActionListener(this);
 		mProgress = (ProgressBar) findViewById(R.id.search_progress);
 		mHandler = new Handler();
 		mContext = context;
@@ -106,64 +110,36 @@ public class SearchDialog extends Dialog implements android.view.View.OnClickLis
 		return null;
 	}
 	
+	/**
+	 * Called when the search button is clicked
+	 * (non-Javadoc)
+	 * @see android.view.View.OnClickListener#onClick(android.view.View)
+	 */
 	@Override
 	public void onClick(final View v) {
 		switch(v.getId()){
 			case R.id.ok:
-				InputMethodManager imm = (InputMethodManager)mContext.getSystemService(Context.INPUT_METHOD_SERVICE);
-				imm.hideSoftInputFromWindow(this.mAddress.getWindowToken(), 0);
-				v.setEnabled(false);
-				mProgress.setVisibility(View.VISIBLE);
-				mProgress.setIndeterminate(true);
-				new Thread( new Runnable(){
-					@Override
-					public void run(){
-						if(Debug.DEBUG)
-							Log.d(TAG,"strarting search and parsing") ;
-						try {
-							mResults = ReverseGeocoder.addressSearch(mAddress.getText().toString());
-						} catch (IOException e) {
-							e.printStackTrace();
-						} catch (JSONException e) {
-							e.printStackTrace();
-						}
-						if(mResults != null){
-							if(Debug.DEBUG)
-								Log.d(TAG,"finished searching and parsing");
-							//update UI
-							mHandler.post(new Runnable(){
-								@Override
-								public void run(){
-									if(Debug.DEBUG)
-										Log.d(TAG,"populating list");
-									mAddressList.setAdapter(new ArrayAdapter<String>(mContext, android.R.layout.simple_list_item_1, getAddress()));
-									v.setEnabled(true);
-									mProgress.setVisibility(View.INVISIBLE);
-									mProgress.setIndeterminate(false);
-									if(Debug.DEBUG)
-										Log.d(TAG,"finished");
-								}
-							});
-						} else {
-							//update the UI
-							mHandler.post(new Runnable(){
-								@Override
-								public void run(){
-									v.setEnabled(true);
-									mProgress.setVisibility(View.INVISIBLE);
-									mProgress.setIndeterminate(false);
-									if(Debug.DEBUG)
-										Log.d(TAG,"failed");
-								}
-							});
-						}
-					}
-				}).start();
+				search();
 				break;
 		}
 	}
-
 	
+	/**
+	 * Called when the seach button on the soft keyboard is pressed
+	 * (non-Javadoc)
+	 * @see android.widget.TextView.OnEditorActionListener#onEditorAction(android.widget.TextView, int, android.view.KeyEvent)
+	 */
+	@Override
+	public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+		search();
+		return false;
+	}
+
+	/**
+	 * Called when an Item from the list is selected
+	 * (non-Javadoc)
+	 * @see android.widget.AdapterView.OnItemClickListener#onItemClick(android.widget.AdapterView, android.view.View, int, long)
+	 */
 	@Override
 	public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
 		if(Debug.DEBUG)
@@ -171,4 +147,57 @@ public class SearchDialog extends Dialog implements android.view.View.OnClickLis
 		mListener.onLocationSelected(getCoords((int) id));
 		this.dismiss();
 	}
-}
+
+	private void search() {
+		final InputMethodManager imm = (InputMethodManager)mContext.getSystemService(Context.INPUT_METHOD_SERVICE);
+		imm.hideSoftInputFromWindow(this.mAddress.getWindowToken(), 0);
+		final View v = this.findViewById(R.id.ok);
+		v.setEnabled(false);
+		mProgress.setVisibility(View.VISIBLE);
+		mProgress.setIndeterminate(true);
+		new Thread( new Runnable(){
+			@Override
+			public void run(){
+				if(Debug.DEBUG)
+					Log.d(TAG,"strarting search and parsing") ;
+				try {
+					mResults = ReverseGeocoder.addressSearch(mAddress.getText().toString());
+				} catch (IOException e) {
+					e.printStackTrace();
+				} catch (JSONException e) {
+					e.printStackTrace();
+				}
+				if(mResults != null){
+					if(Debug.DEBUG)
+						Log.d(TAG,"finished searching and parsing");
+					//update UI
+					mHandler.post(new Runnable(){
+						@Override
+						public void run(){
+							if(Debug.DEBUG)
+								Log.d(TAG,"populating list");
+							mAddressList.setAdapter(new ArrayAdapter<String>(mContext, android.R.layout.simple_list_item_1, getAddress()));
+							v.setEnabled(true);
+							mProgress.setVisibility(View.INVISIBLE);
+							mProgress.setIndeterminate(false);
+							if(Debug.DEBUG)
+								Log.d(TAG,"finished");
+						}
+					});
+				} else {
+					//update the UI
+					mHandler.post(new Runnable(){
+						@Override
+						public void run(){
+							v.setEnabled(true);
+							mProgress.setVisibility(View.INVISIBLE);
+							mProgress.setIndeterminate(false);
+							if(Debug.DEBUG)
+								Log.d(TAG,"failed");
+						}
+					});
+				}
+			}
+		}).start();
+	}
+}
\ No newline at end of file