From 9d6bf707a64eda6ee56bee65e37869637c2426e5 Mon Sep 17 00:00:00 2001 From: Kristin Dagley Date: Mon, 13 Nov 2017 23:12:29 -0500 Subject: [PATCH] pushing shit --- .idea/modules.xml | 1 + .../rattracker2/CreateReportActivity.java | 21 +++---------------- .../rattracker2/DetailReportActivity.java | 2 +- .../cs2340/rattracker2/GraphActivity.java | 6 ++++-- .../rattracker2/GraphDateRangeActivity.java | 3 ++- .../cs2340/rattracker2/HomeActivity.java | 6 +++--- .../cs2340/rattracker2/MapActivity.java | 3 ++- .../cs2340/rattracker2/NavigationDrawer.java | 2 +- 8 files changed, 17 insertions(+), 27 deletions(-) diff --git a/.idea/modules.xml b/.idea/modules.xml index aeaa47f..2f90f53 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,6 +2,7 @@ + diff --git a/app/src/main/java/team10x/cs2340/rattracker2/CreateReportActivity.java b/app/src/main/java/team10x/cs2340/rattracker2/CreateReportActivity.java index 6bb9e50..ac92e7d 100644 --- a/app/src/main/java/team10x/cs2340/rattracker2/CreateReportActivity.java +++ b/app/src/main/java/team10x/cs2340/rattracker2/CreateReportActivity.java @@ -41,7 +41,7 @@ protected void onCreate(Bundle savedInstanceState) { //the objects from the layout final EditText etDate = (EditText) findViewById(R.id.etDate); final EditText etLocationType = (EditText) findViewById(R.id.etLocationType); - final EditText etZipCode = (EditText) findViewById(R.id.etZipCode); + final EditText etZipCode = findViewById(R.id.etZipCode); final EditText etAddress = (EditText) findViewById(R.id.etAddress); final EditText etCity = (EditText) findViewById(R.id.etCity); final EditText etBorough = (EditText) findViewById(R.id.etBorough); @@ -65,23 +65,8 @@ protected void onCreate(Bundle savedInstanceState) { */ @Override public boolean onNavigationItemSelected(MenuItem menuItem) { - switch (menuItem.getItemId()) { - case(R.id.reports_list): - Intent reportsListIntent = new Intent(CreateReportActivity.this, HomeActivity.class); - startActivity(reportsListIntent); - break; - case(R.id.create_report): - Intent createReportIntent = new Intent(CreateReportActivity.this, CreateReportActivity.class); - startActivity(createReportIntent); - break; - case(R.id.view_map): - Intent viewMapIntent = new Intent(CreateReportActivity.this, MapActivity.class); - startActivity(viewMapIntent); - break; - case(R.id.logout): - Intent logoutIntent = new Intent(CreateReportActivity.this, MainActivity.class); - startActivity(logoutIntent); - } + NavigationDrawer nav = new NavigationDrawer(); + nav.getActivityOptions(CreateReportActivity.this, menuItem); return true; } }); diff --git a/app/src/main/java/team10x/cs2340/rattracker2/DetailReportActivity.java b/app/src/main/java/team10x/cs2340/rattracker2/DetailReportActivity.java index 71f301c..9f48d71 100644 --- a/app/src/main/java/team10x/cs2340/rattracker2/DetailReportActivity.java +++ b/app/src/main/java/team10x/cs2340/rattracker2/DetailReportActivity.java @@ -56,7 +56,7 @@ public void onClick(View v) { * turns it into a new RatReport object. * * @param response id of object selected - * @throws e JSONException if occurs + * @throws JSONException if occurs */ @Override public void onResponse(String response) { diff --git a/app/src/main/java/team10x/cs2340/rattracker2/GraphActivity.java b/app/src/main/java/team10x/cs2340/rattracker2/GraphActivity.java index 82626f7..df87e0e 100644 --- a/app/src/main/java/team10x/cs2340/rattracker2/GraphActivity.java +++ b/app/src/main/java/team10x/cs2340/rattracker2/GraphActivity.java @@ -83,7 +83,8 @@ protected void onCreate(Bundle savedInstanceState) { */ @Override public boolean onNavigationItemSelected(MenuItem menuItem) { - NavigationDrawer.getActivityOptions(GraphActivity.this, menuItem); + NavigationDrawer nav = new NavigationDrawer(); + nav.getActivityOptions(GraphActivity.this, menuItem); return true; } }); @@ -101,7 +102,8 @@ public boolean onNavigationItemSelected(MenuItem menuItem) { * a JSON object if an ID corresponds with the entered String. * It then updates graph with new entry. * - * @param response String that should correspond with an id + * @param response String that should correspond with an id* + * @throws JSONException */ @Override public void onResponse(String response) { diff --git a/app/src/main/java/team10x/cs2340/rattracker2/GraphDateRangeActivity.java b/app/src/main/java/team10x/cs2340/rattracker2/GraphDateRangeActivity.java index 455de37..083072c 100644 --- a/app/src/main/java/team10x/cs2340/rattracker2/GraphDateRangeActivity.java +++ b/app/src/main/java/team10x/cs2340/rattracker2/GraphDateRangeActivity.java @@ -34,7 +34,8 @@ protected void onCreate(Bundle savedInstanceState) { nv.setNavigationItemSelectedListener(new NavigationView.OnNavigationItemSelectedListener() { @Override public boolean onNavigationItemSelected(MenuItem menuItem) { - NavigationDrawer.getActivityOptions(GraphDateRangeActivity.this, menuItem); + NavigationDrawer nav = new NavigationDrawer(); + nav.getActivityOptions(GraphDateRangeActivity.this, menuItem); return true; } }); diff --git a/app/src/main/java/team10x/cs2340/rattracker2/HomeActivity.java b/app/src/main/java/team10x/cs2340/rattracker2/HomeActivity.java index f8df16d..3403464 100644 --- a/app/src/main/java/team10x/cs2340/rattracker2/HomeActivity.java +++ b/app/src/main/java/team10x/cs2340/rattracker2/HomeActivity.java @@ -10,7 +10,6 @@ import android.view.View; import android.widget.AdapterView; import android.widget.ArrayAdapter; -import android.widget.Button; import android.widget.ListAdapter; import android.widget.ListView; import com.android.volley.RequestQueue; @@ -68,7 +67,8 @@ protected void onCreate (Bundle savedInstanceState) { */ @Override public boolean onNavigationItemSelected(MenuItem menuItem) { - NavigationDrawer.getActivityOptions(HomeActivity.this, menuItem); + NavigationDrawer nav = new NavigationDrawer(); + nav.getActivityOptions(HomeActivity.this, menuItem); return true; } }); @@ -82,7 +82,7 @@ public boolean onNavigationItemSelected(MenuItem menuItem) { * into a new JSONArray object. * * @param response String used to identify desired JSON object - * @throws e JSONException + * @throws JSONException e */ @Override public void onResponse(String response) { diff --git a/app/src/main/java/team10x/cs2340/rattracker2/MapActivity.java b/app/src/main/java/team10x/cs2340/rattracker2/MapActivity.java index 43ecf22..617a4c8 100644 --- a/app/src/main/java/team10x/cs2340/rattracker2/MapActivity.java +++ b/app/src/main/java/team10x/cs2340/rattracker2/MapActivity.java @@ -67,7 +67,8 @@ protected void onCreate(Bundle savedInstanceState) { */ @Override public boolean onNavigationItemSelected(MenuItem menuItem) { - NavigationDrawer.getActivityOptions(MapActivity.this, menuItem); + NavigationDrawer nav = new NavigationDrawer(); + nav.getActivityOptions(MapActivity.this, menuItem); return true; } }); diff --git a/app/src/main/java/team10x/cs2340/rattracker2/NavigationDrawer.java b/app/src/main/java/team10x/cs2340/rattracker2/NavigationDrawer.java index 909c5e1..c3d2fa7 100644 --- a/app/src/main/java/team10x/cs2340/rattracker2/NavigationDrawer.java +++ b/app/src/main/java/team10x/cs2340/rattracker2/NavigationDrawer.java @@ -19,7 +19,7 @@ public class NavigationDrawer { * @param currActivity current activity state of application * @param menuItem new menu item object */ - public static void getActivityOptions(AppCompatActivity currActivity, MenuItem menuItem) { + public void getActivityOptions(AppCompatActivity currActivity, MenuItem menuItem) { final AppCompatActivity current = currActivity; switch (menuItem.getItemId()) { case (R.id.reports_list):