diff --git a/bin/classes.dex b/bin/classes.dex index bcb6376..2a429ad 100644 Binary files a/bin/classes.dex and b/bin/classes.dex differ diff --git a/bin/com/architects/findme/FindMe.class b/bin/com/architects/findme/FindMe.class index 989bbb4..1cf796c 100644 Binary files a/bin/com/architects/findme/FindMe.class and b/bin/com/architects/findme/FindMe.class differ diff --git a/bin/com/architects/findme/FindMeMenu$1.class b/bin/com/architects/findme/FindMeMenu$1.class new file mode 100644 index 0000000..040c857 Binary files /dev/null and b/bin/com/architects/findme/FindMeMenu$1.class differ diff --git a/bin/com/architects/findme/FindMeMenu$2.class b/bin/com/architects/findme/FindMeMenu$2.class new file mode 100644 index 0000000..5aa5500 Binary files /dev/null and b/bin/com/architects/findme/FindMeMenu$2.class differ diff --git a/bin/com/architects/findme/FindMeMenu.class b/bin/com/architects/findme/FindMeMenu.class index 33a5cd2..b839f86 100644 Binary files a/bin/com/architects/findme/FindMeMenu.class and b/bin/com/architects/findme/FindMeMenu.class differ diff --git a/bin/com/architects/findme/Friends$1.class b/bin/com/architects/findme/Friends$1.class index 840af82..8f6eb06 100644 Binary files a/bin/com/architects/findme/Friends$1.class and b/bin/com/architects/findme/Friends$1.class differ diff --git a/bin/com/architects/findme/Friends.class b/bin/com/architects/findme/Friends.class index 7dc1300..7350400 100644 Binary files a/bin/com/architects/findme/Friends.class and b/bin/com/architects/findme/Friends.class differ diff --git a/bin/com/architects/findme/Login.class b/bin/com/architects/findme/Login.class index bcbdf19..86ae147 100644 Binary files a/bin/com/architects/findme/Login.class and b/bin/com/architects/findme/Login.class differ diff --git a/bin/com/architects/findme/Nearby$1.class b/bin/com/architects/findme/Nearby$1.class index b58eaa7..06fbdab 100644 Binary files a/bin/com/architects/findme/Nearby$1.class and b/bin/com/architects/findme/Nearby$1.class differ diff --git a/bin/com/architects/findme/Nearby$MyLocationListener.class b/bin/com/architects/findme/Nearby$MyLocationListener.class index 84b90ee..cc9ed9c 100644 Binary files a/bin/com/architects/findme/Nearby$MyLocationListener.class and b/bin/com/architects/findme/Nearby$MyLocationListener.class differ diff --git a/bin/com/architects/findme/Nearby.class b/bin/com/architects/findme/Nearby.class index aa388e3..9bf9687 100644 Binary files a/bin/com/architects/findme/Nearby.class and b/bin/com/architects/findme/Nearby.class differ diff --git a/bin/com/architects/findme/Profile.class b/bin/com/architects/findme/Profile.class new file mode 100644 index 0000000..0869e5d Binary files /dev/null and b/bin/com/architects/findme/Profile.class differ diff --git a/bin/com/architects/findme/R$color.class b/bin/com/architects/findme/R$color.class index cbcf80d..7d198a4 100644 Binary files a/bin/com/architects/findme/R$color.class and b/bin/com/architects/findme/R$color.class differ diff --git a/bin/com/architects/findme/R$drawable.class b/bin/com/architects/findme/R$drawable.class index 4a84a59..66eafb4 100644 Binary files a/bin/com/architects/findme/R$drawable.class and b/bin/com/architects/findme/R$drawable.class differ diff --git a/bin/com/architects/findme/R$id.class b/bin/com/architects/findme/R$id.class index 489c466..381426b 100644 Binary files a/bin/com/architects/findme/R$id.class and b/bin/com/architects/findme/R$id.class differ diff --git a/bin/com/architects/findme/R$layout.class b/bin/com/architects/findme/R$layout.class index 20ea846..9c15aee 100644 Binary files a/bin/com/architects/findme/R$layout.class and b/bin/com/architects/findme/R$layout.class differ diff --git a/bin/com/architects/findme/R$menu.class b/bin/com/architects/findme/R$menu.class index 41386cc..ad58e00 100644 Binary files a/bin/com/architects/findme/R$menu.class and b/bin/com/architects/findme/R$menu.class differ diff --git a/bin/com/architects/findme/R$string.class b/bin/com/architects/findme/R$string.class index d86442b..898903e 100644 Binary files a/bin/com/architects/findme/R$string.class and b/bin/com/architects/findme/R$string.class differ diff --git a/bin/com/architects/findme/Registration.class b/bin/com/architects/findme/Registration.class index a96e304..f42eeb5 100644 Binary files a/bin/com/architects/findme/Registration.class and b/bin/com/architects/findme/Registration.class differ diff --git a/bin/com/architects/findme/Search$1.class b/bin/com/architects/findme/Search$1.class new file mode 100644 index 0000000..36c4e46 Binary files /dev/null and b/bin/com/architects/findme/Search$1.class differ diff --git a/bin/com/architects/findme/Search.class b/bin/com/architects/findme/Search.class index b09f96c..065745d 100644 Binary files a/bin/com/architects/findme/Search.class and b/bin/com/architects/findme/Search.class differ diff --git a/bin/com/architects/helper/LocationHelper$MyLocationListener.class b/bin/com/architects/helper/LocationHelper$MyLocationListener.class index 6eed978..1cd1567 100644 Binary files a/bin/com/architects/helper/LocationHelper$MyLocationListener.class and b/bin/com/architects/helper/LocationHelper$MyLocationListener.class differ diff --git a/bin/com/architects/helper/LocationHelper.class b/bin/com/architects/helper/LocationHelper.class index 2669003..223d152 100644 Binary files a/bin/com/architects/helper/LocationHelper.class and b/bin/com/architects/helper/LocationHelper.class differ diff --git a/bin/com/architects/helper/SearchHelper.class b/bin/com/architects/helper/SearchHelper.class new file mode 100644 index 0000000..d2f605f Binary files /dev/null and b/bin/com/architects/helper/SearchHelper.class differ diff --git a/bin/findMe.apk b/bin/findMe.apk index 9a7876c..f6a4a14 100644 Binary files a/bin/findMe.apk and b/bin/findMe.apk differ diff --git a/bin/resources.ap_ b/bin/resources.ap_ index 958ef8b..f0446b2 100644 Binary files a/bin/resources.ap_ and b/bin/resources.ap_ differ diff --git a/gen/com/architects/findme/R.java b/gen/com/architects/findme/R.java index af80014..0a68593 100644 --- a/gen/com/architects/findme/R.java +++ b/gen/com/architects/findme/R.java @@ -14,6 +14,9 @@ public final class R { public static final class attr { } public static final class color { + public static final int contentdark=0x7f050004; + public static final int light=0x7f050002; + public static final int lightdiv=0x7f050003; public static final int transparent=0x7f050000; public static final int white=0x7f050001; } @@ -22,58 +25,77 @@ public final class R { public static final int background_dark=0x7f020001; public static final int background_row=0x7f020002; public static final int background_row_dark=0x7f020003; - public static final int friends=0x7f020004; - public static final int ic_tab_artists_grey=0x7f020005; - public static final int ic_tab_artists_white=0x7f020006; - public static final int ic_tab_friends=0x7f020007; - public static final int icon=0x7f020008; - public static final int logo=0x7f020009; - public static final int logout=0x7f02000a; - public static final int me=0x7f02000b; - public static final int messages=0x7f02000c; - public static final int nearby=0x7f02000d; - public static final int search=0x7f02000e; - public static final int tab_bg_selected=0x7f02000f; - public static final int tab_bg_selector=0x7f020010; - public static final int tab_bg_unselected=0x7f020011; - public static final int tab_divider=0x7f020012; - public static final int tab_text_selector=0x7f020013; + public static final int bg_top=0x7f020004; + public static final int findme_light=0x7f020005; + public static final int friends=0x7f020006; + public static final int home_button=0x7f020007; + public static final int ic_tab_artists_grey=0x7f020008; + public static final int ic_tab_artists_white=0x7f020009; + public static final int ic_tab_friends=0x7f02000a; + public static final int icon=0x7f02000b; + public static final int logo=0x7f02000c; + public static final int logout=0x7f02000d; + public static final int me=0x7f02000e; + public static final int messages=0x7f02000f; + public static final int nearby=0x7f020010; + public static final int search=0x7f020011; + public static final int tab_bg_selected=0x7f020012; + public static final int tab_bg_selector=0x7f020013; + public static final int tab_bg_unselected=0x7f020014; + public static final int tab_divider=0x7f020015; + public static final int tab_text_selector=0x7f020016; + public static final int top_bg=0x7f020017; + public static final int user=0x7f020018; } public static final class id { - public static final int ButtonLoginUser=0x7f08000d; - public static final int ButtonRegisterUser=0x7f080013; - public static final int ButtonUserRegistration=0x7f08000f; - public static final int EditTextLoginMail=0x7f080009; - public static final int EditTextLoginPassword=0x7f08000a; - public static final int EditTextRegistrationMail=0x7f080011; - public static final int EditTextRegistrationName=0x7f080010; - public static final int EditTextRegistrationPassword=0x7f080012; - public static final int SpinnerLoginUserStatus=0x7f08000c; - public static final int TextViewTitle=0x7f08000b; + public static final int ButtonLoginUser=0x7f08000e; + public static final int ButtonRegisterUser=0x7f080018; + public static final int ButtonUserRegistration=0x7f080010; + public static final int EditTextLoginMail=0x7f08000a; + public static final int EditTextLoginPassword=0x7f08000b; + public static final int EditTextRegistrationMail=0x7f080016; + public static final int EditTextRegistrationName=0x7f080015; + public static final int EditTextRegistrationPassword=0x7f080017; + public static final int SearchInput=0x7f08001c; + public static final int SpinnerLoginUserStatus=0x7f08000d; + public static final int TextViewTitle=0x7f08000c; public static final int friends=0x7f080001; - public static final int friendslist=0x7f080007; - public static final int icon=0x7f080016; - public static final int icontext=0x7f080018; + public static final int friendslist=0x7f080008; + public static final int homebutton=0x7f08001f; + public static final int icon=0x7f080020; + public static final int icontext=0x7f080022; public static final int logout=0x7f080005; public static final int me=0x7f080004; public static final int messages=0x7f080002; public static final int nearby=0x7f080000; - public static final int requests=0x7f080008; + public static final int nearby_list_text=0x7f080014; + public static final int nearbylist=0x7f080012; + public static final int requests=0x7f080009; public static final int search=0x7f080003; - public static final int tabhost=0x7f080006; - public static final int tabsLayout=0x7f080014; - public static final int tabsText=0x7f080015; - public static final int test_image=0x7f08000e; - public static final int text=0x7f080017; + public static final int searchList=0x7f08001a; + public static final int search_dialog=0x7f08001b; + public static final int tabhost=0x7f080007; + public static final int tabsLayout=0x7f08001d; + public static final int tabsText=0x7f08001e; + public static final int test_image=0x7f08000f; + public static final int text=0x7f080021; + public static final int topbb=0x7f080011; + public static final int topbb2=0x7f080006; + public static final int topbb2412=0x7f080019; + public static final int user_image=0x7f080013; } public static final class layout { public static final int findmemenu=0x7f030000; public static final int friends=0x7f030001; public static final int login=0x7f030002; public static final int main=0x7f030003; - public static final int nearby_list_item=0x7f030004; - public static final int registration=0x7f030005; - public static final int tabs_bg=0x7f030006; + public static final int nearby=0x7f030004; + public static final int nearby_list_item=0x7f030005; + public static final int registration=0x7f030006; + public static final int search=0x7f030007; + public static final int search_dialog=0x7f030008; + public static final int tabs_bg=0x7f030009; + public static final int topbar=0x7f03000a; } public static final class menu { public static final int menu=0x7f070000; diff --git a/res/drawable-hdpi/background.png b/res/drawable-hdpi/background.png index 03a4fc1..036db91 100644 Binary files a/res/drawable-hdpi/background.png and b/res/drawable-hdpi/background.png differ diff --git a/res/drawable-hdpi/bg_top.png b/res/drawable-hdpi/bg_top.png new file mode 100644 index 0000000..37a7e83 Binary files /dev/null and b/res/drawable-hdpi/bg_top.png differ diff --git a/res/drawable-hdpi/findme_light.png b/res/drawable-hdpi/findme_light.png new file mode 100644 index 0000000..dd09d2d Binary files /dev/null and b/res/drawable-hdpi/findme_light.png differ diff --git a/res/drawable-hdpi/home_button.png b/res/drawable-hdpi/home_button.png new file mode 100644 index 0000000..602b23e Binary files /dev/null and b/res/drawable-hdpi/home_button.png differ diff --git a/res/drawable-hdpi/logo.png b/res/drawable-hdpi/logo.png index 9f618b5..89490cb 100644 Binary files a/res/drawable-hdpi/logo.png and b/res/drawable-hdpi/logo.png differ diff --git a/res/drawable-hdpi/logout.png b/res/drawable-hdpi/logout.png index eafb1ea..782541c 100644 Binary files a/res/drawable-hdpi/logout.png and b/res/drawable-hdpi/logout.png differ diff --git a/res/drawable-hdpi/user.png b/res/drawable-hdpi/user.png new file mode 100644 index 0000000..5e800ae Binary files /dev/null and b/res/drawable-hdpi/user.png differ diff --git a/res/drawable/tab_bg_selected.xml b/res/drawable/tab_bg_selected.xml index b73f8d7..7f84df1 100644 --- a/res/drawable/tab_bg_selected.xml +++ b/res/drawable/tab_bg_selected.xml @@ -1,6 +1,5 @@ - + \ No newline at end of file diff --git a/res/drawable/tab_bg_selector.xml b/res/drawable/tab_bg_selector.xml index 8c9be97..a122dab 100644 --- a/res/drawable/tab_bg_selector.xml +++ b/res/drawable/tab_bg_selector.xml @@ -1,6 +1,5 @@ - @@ -8,8 +7,8 @@ - + + android:state_pressed="false" android:drawable="@color/lightdiv" /> diff --git a/res/drawable/tab_bg_unselected.xml b/res/drawable/tab_bg_unselected.xml index 0cf9d2f..ff71dd4 100644 --- a/res/drawable/tab_bg_unselected.xml +++ b/res/drawable/tab_bg_unselected.xml @@ -1,7 +1,6 @@ - \ No newline at end of file diff --git a/res/drawable/top_bg.xml b/res/drawable/top_bg.xml new file mode 100644 index 0000000..2496595 --- /dev/null +++ b/res/drawable/top_bg.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/res/layout/friends.xml b/res/layout/friends.xml index 4f2874f..d853e9b 100644 --- a/res/layout/friends.xml +++ b/res/layout/friends.xml @@ -1,8 +1,12 @@ + + + + android:layout_width="fill_parent" android:layout_height="fill_parent" + android:paddingTop="-6dip"> diff --git a/res/layout/nearby.xml b/res/layout/nearby.xml index 7557f55..909545a 100644 --- a/res/layout/nearby.xml +++ b/res/layout/nearby.xml @@ -1,61 +1,20 @@ - - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/res/layout/nearby_list_item.xml b/res/layout/nearby_list_item.xml index f0958d6..5eb2ad6 100644 --- a/res/layout/nearby_list_item.xml +++ b/res/layout/nearby_list_item.xml @@ -1,7 +1,28 @@ - - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/res/layout/search.xml b/res/layout/search.xml new file mode 100644 index 0000000..3e00f0f --- /dev/null +++ b/res/layout/search.xml @@ -0,0 +1,21 @@ + + + + + + + + + + \ No newline at end of file diff --git a/res/layout/search_dialog.xml b/res/layout/search_dialog.xml new file mode 100644 index 0000000..bec4959 --- /dev/null +++ b/res/layout/search_dialog.xml @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/res/layout/tabs_bg.xml b/res/layout/tabs_bg.xml index 6ecd3c7..8987f50 100644 --- a/res/layout/tabs_bg.xml +++ b/res/layout/tabs_bg.xml @@ -6,7 +6,7 @@ + android:padding="8dip" android:gravity="center" android:orientation="vertical"> + + + + diff --git a/res/values/colors.xml b/res/values/colors.xml index 59521e4..0b86a04 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -1,5 +1,8 @@ #00000000 - #ffffff + #ffffffff + #f1f3f5ff + #d2d4d5ff + #23262c diff --git a/src/com/architects/findme/FindMeMenu.java b/src/com/architects/findme/FindMeMenu.java index e280ba1..e9e86b7 100644 --- a/src/com/architects/findme/FindMeMenu.java +++ b/src/com/architects/findme/FindMeMenu.java @@ -1,12 +1,20 @@ package com.architects.findme; import android.app.Activity; +import android.app.AlertDialog; +import android.app.Dialog; +import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; import android.os.Bundle; import android.util.Log; +import android.view.LayoutInflater; import android.view.View; +import android.view.View.OnClickListener; import android.view.Window; +import android.widget.Button; +import android.widget.EditText; +import android.widget.TextView; import android.widget.Toast; public class FindMeMenu extends Activity @@ -46,8 +54,37 @@ public class FindMeMenu extends Activity } public void searchMenuHandler(View button) { - Intent myIntent = new Intent(button.getContext(), Search.class); - startActivity(myIntent); + final AlertDialog.Builder alertbox = new AlertDialog.Builder(this); + LayoutInflater factory = LayoutInflater.from(this); + final View input = factory.inflate(R.layout.search_dialog, null); + + alertbox.setTitle("Search People"); + alertbox.setView(input); + + alertbox.setPositiveButton("Ok", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int whichButton) { + // get the input value + EditText mText; + mText = (EditText) input.findViewById(R.id.SearchInput); + String text = mText.getText().toString(); + + // redirect to search results + Bundle bundle = new Bundle(); + bundle.putString("query", text); + + Intent newIntent = new Intent(FindMeMenu.this.getApplicationContext(), Search.class); + newIntent.putExtras(bundle); + startActivityForResult(newIntent, 0); + } + }); + + alertbox.setNegativeButton("Cancel", + new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int whichButton) { + dialog.cancel(); + } + }); + alertbox.show(); } public void logoutMenuHandler(View button) { @@ -66,10 +103,17 @@ public class FindMeMenu extends Activity prefsEditor.clear(); prefsEditor.commit(); + Toast.makeText(button.getContext(), "Logout successful", Toast.LENGTH_LONG).show(); Intent myIntent = new Intent(button.getContext(), FindMe.class); startActivity(myIntent); - Toast.makeText(button.getContext(), "Logout successful", Toast.LENGTH_LONG).show(); + } else Toast.makeText(this, "Logout failed. Try again!", Toast.LENGTH_LONG).show(); } + + public void searchHandler(View button) + { + Intent myIntent = new Intent(button.getContext(), Search.class); + startActivity(myIntent); + } } diff --git a/src/com/architects/findme/Friends.java b/src/com/architects/findme/Friends.java index a0dc71b..53aeb61 100644 --- a/src/com/architects/findme/Friends.java +++ b/src/com/architects/findme/Friends.java @@ -10,6 +10,7 @@ import com.architects.helper.*; import android.app.Activity; import android.content.Context; +import android.content.Intent; import android.content.SharedPreferences; import android.location.Location; import android.os.Bundle; @@ -45,7 +46,6 @@ public class Friends extends Activity { setContentView(R.layout.friends); setupTabHost(); - mTabHost.getTabWidget().setDividerDrawable(R.drawable.tab_divider); // setup list views friends = (ListView) findViewById(R.id.friendslist); @@ -58,8 +58,10 @@ public class Friends extends Activity { String[] friendslist = FriendsHelper.getFriendsList(mail); String[] requestslist = FriendsHelper.getRequestsList(mail); - friends.setAdapter(new ArrayAdapter(this, R.layout.nearby_list_item, friendslist)); - requests.setAdapter(new ArrayAdapter(this, R.layout.nearby_list_item, requestslist)); + friends.setAdapter(new ArrayAdapter + (this, R.layout.nearby_list_item, R.id.nearby_list_text, friendslist)); + requests.setAdapter(new ArrayAdapter + (this, R.layout.nearby_list_item,R.id.nearby_list_text, requestslist)); setupTab(friends, "Friends"); setupTab(requests, "Requests"); @@ -83,4 +85,10 @@ public class Friends extends Activity { tv.setText(text); return view; } + + public void enterMenuHandler(View button) + { + Intent myIntent = new Intent(button.getContext(), FindMeMenu.class); + startActivity(myIntent); + } } diff --git a/src/com/architects/findme/Login.java b/src/com/architects/findme/Login.java index 9e5cda3..9d93d75 100644 --- a/src/com/architects/findme/Login.java +++ b/src/com/architects/findme/Login.java @@ -102,6 +102,7 @@ public class Login extends Activity Intent myIntent = new Intent(button.getContext(), FindMeMenu.class); startActivity(myIntent); + finish(); } else Toast.makeText(this, response, Toast.LENGTH_LONG).show(); } diff --git a/src/com/architects/findme/Nearby.java b/src/com/architects/findme/Nearby.java index bfb3ea1..07bba02 100644 --- a/src/com/architects/findme/Nearby.java +++ b/src/com/architects/findme/Nearby.java @@ -23,22 +23,25 @@ import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.Button; import android.widget.ListView; +import android.widget.TabHost; import android.widget.TextView; import android.widget.Toast; -public class Nearby extends ListActivity { +public class Nearby extends Activity { private static final long MINIMUM_DISTANCE_CHANGE_FOR_UPDATES = 1; // in Meters private static final long MINIMUM_TIME_BETWEEN_UPDATES = 100; // in Milliseconds private static final String TAG = "test"; protected LocationManager locationManager; + private ListView nearby; @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); requestWindowFeature(Window.FEATURE_NO_TITLE); + setContentView(R.layout.nearby); locationManager = (LocationManager) getSystemService(Context.LOCATION_SERVICE); locationManager.requestLocationUpdates( @@ -91,13 +94,12 @@ public class Nearby extends ListActivity { // TODO Auto-generated catch block e.printStackTrace(); } - - setListAdapter(new ArrayAdapter(this, R.layout.nearby_list_item, onlineUser)); + nearby = (ListView) findViewById(R.id.nearbylist); + nearby.setAdapter(new ArrayAdapter(this, R.layout.nearby_list_item, R.id.nearby_list_text, onlineUser)); - ListView lv = getListView(); - lv.setTextFilterEnabled(true); + nearby.setTextFilterEnabled(true); - lv.setOnItemClickListener(new OnItemClickListener() { + nearby.setOnItemClickListener(new OnItemClickListener() { public void onItemClick(AdapterView parent, View view, int position, long id) { // When clicked, show a toast with the TextView text Toast.makeText(getApplicationContext(), ((TextView) view).getText(), Toast.LENGTH_SHORT).show(); @@ -123,8 +125,7 @@ public class Nearby extends ListActivity { "Current Location \n Longitude: %1$s \n Latitude: %2$s", location.getLongitude(), location.getLatitude() ); - Toast.makeText(Nearby.this, message, - Toast.LENGTH_LONG).show(); + // Toast.makeText(Nearby.this, message, Toast.LENGTH_LONG).show(); } } @@ -135,12 +136,11 @@ public class Nearby extends ListActivity { "New Location \n Longitude: %1$s \n Latitude: %2$s", location.getLongitude(), location.getLatitude() ); - Toast.makeText(Nearby.this, message, Toast.LENGTH_LONG).show(); + //Toast.makeText(Nearby.this, message, Toast.LENGTH_LONG).show(); } public void onStatusChanged(String s, int i, Bundle b) { - Toast.makeText(Nearby.this, "Provider status changed", - Toast.LENGTH_LONG).show(); + //Toast.makeText(Nearby.this, "Provider status changed", Toast.LENGTH_LONG).show(); } public void onProviderDisabled(String s) { @@ -179,4 +179,10 @@ public class Nearby extends ListActivity { Intent myIntent = new Intent(button.getContext(), Search.class); startActivity(myIntent); } + + public void enterMenuHandler(View button) + { + Intent myIntent = new Intent(button.getContext(), FindMeMenu.class); + startActivity(myIntent); + } } diff --git a/src/com/architects/findme/Profile.java b/src/com/architects/findme/Profile.java new file mode 100644 index 0000000..8b346c3 --- /dev/null +++ b/src/com/architects/findme/Profile.java @@ -0,0 +1,7 @@ +package com.architects.findme; + +import android.app.Activity; + +public class Profile extends Activity { + +} diff --git a/src/com/architects/findme/Search.java b/src/com/architects/findme/Search.java index 34d6f95..3dcc8d8 100644 --- a/src/com/architects/findme/Search.java +++ b/src/com/architects/findme/Search.java @@ -1,15 +1,62 @@ package com.architects.findme; +import com.architects.helper.*; + import android.app.Activity; +import android.app.AlertDialog; +import android.app.Dialog; +import android.content.Context; +import android.content.Intent; +import android.content.SharedPreferences; import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.view.Window; +import android.widget.AdapterView; +import android.widget.ArrayAdapter; +import android.widget.ImageView; +import android.widget.ListView; +import android.widget.TabHost; import android.widget.TextView; +import android.widget.Toast; +import android.widget.AdapterView.OnItemClickListener; public class Search extends Activity { + private ListView resultsList; + public static final String PREFS_NAME = "LoginCredentials"; + private static final String TAG = "findme"; + public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + requestWindowFeature(Window.FEATURE_NO_TITLE); + setContentView(R.layout.search); + + // get search query + Bundle bundle = this.getIntent().getExtras(); + String query = bundle.getString("query"); + + // get results list view + resultsList = (ListView) findViewById(R.id.searchList); + + // search results to string + String[] results = SearchHelper.getResults(query); + + resultsList.setAdapter(new ArrayAdapter(this, R.layout.nearby_list_item, R.id.nearby_list_text, results)); - TextView textview = new TextView(this); - textview.setText("Search"); - setContentView(textview); + resultsList.setTextFilterEnabled(true); + + resultsList.setOnItemClickListener(new OnItemClickListener() { + public void onItemClick(AdapterView parent, View view, int position, long id) { + // When clicked, show a toast with the TextView text + Toast.makeText(getApplicationContext(), ((TextView) view).getText(), Toast.LENGTH_SHORT).show(); + } + }); + } + + public void enterMenuHandler(View button) + { + Intent myIntent = new Intent(button.getContext(), FindMeMenu.class); + startActivity(myIntent); } } diff --git a/src/com/architects/helper/LocationHelper.java b/src/com/architects/helper/LocationHelper.java index da7c6fc..a0464a7 100644 --- a/src/com/architects/helper/LocationHelper.java +++ b/src/com/architects/helper/LocationHelper.java @@ -52,8 +52,7 @@ public class LocationHelper "Current Location \n Longitude: %1$s \n Latitude: %2$s", location.getLongitude(), location.getLatitude() ); - Toast.makeText(myContext, message, - Toast.LENGTH_LONG).show(); + //Toast.makeText(myContext, message, Toast.LENGTH_LONG).show(); } } @@ -64,12 +63,11 @@ public class LocationHelper "New Location \n Longitude: %1$s \n Latitude: %2$s", location.getLongitude(), location.getLatitude() ); - Toast.makeText(myContext, message, Toast.LENGTH_LONG).show(); + //Toast.makeText(myContext, message, Toast.LENGTH_LONG).show(); } public void onStatusChanged(String s, int i, Bundle b) { - Toast.makeText(myContext, "Provider status changed", - Toast.LENGTH_LONG).show(); + // Toast.makeText(myContext, "Provider status changed", Toast.LENGTH_LONG).show(); } public void onProviderDisabled(String s) { diff --git a/src/com/architects/helper/SearchHelper.java b/src/com/architects/helper/SearchHelper.java new file mode 100644 index 0000000..41687ae --- /dev/null +++ b/src/com/architects/helper/SearchHelper.java @@ -0,0 +1,35 @@ +package com.architects.helper; + +import org.json.JSONObject; + +import android.util.Log; + +public class SearchHelper +{ + private static final String TAG = "test"; + + public static String[] getResults(String query) + { + JSONObject j = new JSONObject(); + String params = "?query="+query; + j = AccountHelper.doHttpGet("search.php", params); + Log.v(TAG, j.toString()); + + String[] results = new String[j.length()]; + + try { + JSONObject json_data = null; + String x; + + for(int i=0;i