diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 483018c..4191a02 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,10 +1,9 @@ - - - - + + + - - - - + diff --git a/app/src/main/java/com/example/petneeds/MainActivity.java b/app/src/main/java/com/example/petneeds/MainActivity.java index 2d795a8..23a5456 100644 --- a/app/src/main/java/com/example/petneeds/MainActivity.java +++ b/app/src/main/java/com/example/petneeds/MainActivity.java @@ -12,8 +12,6 @@ import android.view.View; import android.widget.AdapterView; import android.widget.ArrayAdapter; -import android.widget.EditText; -import android.widget.ImageButton; import android.widget.SearchView; import android.widget.Spinner; @@ -31,7 +29,6 @@ import java.util.List; import okhttp3.Headers; -import com.google.android.gms.maps.CameraUpdate; import com.google.android.gms.maps.CameraUpdateFactory; import com.google.android.gms.maps.GoogleMap; import com.google.android.gms.maps.OnMapReadyCallback; @@ -40,12 +37,15 @@ import com.google.android.gms.maps.model.MarkerOptions; public class MainActivity extends FragmentActivity implements OnMapReadyCallback,AdapterView.OnItemSelectedListener { + public static final String TAG = "MainActivity"; static Double lng; static Double lat; List info; private Spinner sp; GoogleMap map; + SupportMapFragment mapFragment; + SearchView searchView; @Override protected void onCreate(Bundle savedInstanceState) { @@ -54,8 +54,10 @@ protected void onCreate(Bundle savedInstanceState) { RecyclerView rvPetDetails = findViewById(R.id.rvPetDetails); - final EditText enteredZip = (EditText) findViewById(R.id.etZipcode); - ImageButton search = findViewById(R.id.searchbutton); +// final EditText enteredZip = (EditText) findViewById(R.id.etZipcode); +// ImageButton search = findViewById(R.id.searchbutton); + searchView = findViewById(R.id.sv_location); + mapFragment = (SupportMapFragment) getSupportFragmentManager().findFragmentById(R.id.map); //below is the code for setting up the drop down menu sp = (Spinner) findViewById(R.id.drSpin); // ArrayAdapter adapter = new ArrayAdapter(this, android.R.layout.simple_spinner_item, items); @@ -85,11 +87,25 @@ protected void onCreate(Bundle savedInstanceState) { rvPetDetails.setLayoutManager(new LinearLayoutManager(this)); rvPetDetails.setAdapter(petAdapter); - search.setOnClickListener(new View.OnClickListener() { + searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() { @Override - public void onClick(View view) { - String value = enteredZip.getText().toString(); - final String ZIPCODE = "https://maps.googleapis.com/maps/api/geocode/json?address=" + value + "&key=AIzaSyA3eIDiQk5MNmPvyx62qERmyb54UzORsIg"; + public boolean onQueryTextSubmit(String query) { + String location = searchView.getQuery().toString(); + final String ZIPCODE = "https://maps.googleapis.com/maps/api/geocode/json?address=" + location + "&key=AIzaSyA3eIDiQk5MNmPvyx62qERmyb54UzORsIg"; + List
addressList = null; + if (location != null || !location.equals("")) { + Geocoder geocoder = new Geocoder(MainActivity.this); + try { + addressList = geocoder.getFromLocationName(location, 1); + } catch (IOException e) { + e.printStackTrace(); + } + Address address = addressList.get(0); + LatLng latLng = new LatLng(address.getLatitude(), address.getLongitude()); + map.addMarker(new MarkerOptions().position(latLng).title(location)); + map.animateCamera(CameraUpdateFactory.newLatLngZoom(latLng, 10)); + } + final AsyncHttpClient client = new AsyncHttpClient(); client.get(ZIPCODE, new JsonHttpResponseHandler() { @@ -123,9 +139,9 @@ public void onSuccess(int i, Headers headers, JSON json) { } catch (JSONException e) { e.printStackTrace(); } - } + @Override public void onFailure(int i, Headers headers, String s, Throwable throwable) { } @@ -136,20 +152,23 @@ public void onFailure(int i, Headers headers, String s, Throwable throwable) { public void onFailure(int i, Headers headers, String s, Throwable throwable) { } + }); + return false; + } + + @Override + public boolean onQueryTextChange(String newText) { + return false; } }); - SupportMapFragment mapFragment = (SupportMapFragment) getSupportFragmentManager() - .findFragmentById(R.id.map); + mapFragment.getMapAsync(this); } @Override public void onMapReady(GoogleMap googleMap) { map = googleMap; - LatLng Dallas = new LatLng(32.789444, 96.791131); - map.addMarker(new MarkerOptions().position(Dallas).title("Dallas")); - map.moveCamera(CameraUpdateFactory.newLatLng(Dallas)); } @Override @@ -162,8 +181,3 @@ public void onNothingSelected(AdapterView parent) { } } - - - - - diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index dd33881..09a6e3c 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -8,67 +8,80 @@ android:background="@drawable/gradient_background" tools:context=".MainActivity"> - + + + + + + + + + - + + + + + + + + + - + + + + + + + + + + + + + + + + android:layout_marginTop="110dp" /> \ No newline at end of file diff --git a/app/src/main/res/values/map_api.xml b/app/src/main/res/values/map_api.xml deleted file mode 100644 index 8876904..0000000 --- a/app/src/main/res/values/map_api.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - AIzaSyCRinuZCwJtyXYvMDE1S5Ex3cst6JJB_7c - - \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e6b3d76..46db5a0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,6 +1,6 @@ PetNeeds - + AIzaSyCRinuZCwJtyXYvMDE1S5Ex3cst6JJB_7c Pet Stores Trainers