瀏覽代碼

Got rid of code smells.

Fernando Diaz 9 年之前
父節點
當前提交
abc367defb

+ 0 - 10
app/src/main/java/com/example/yiupang/freefoodfinder/EventDetailsScreen.java

@@ -2,10 +2,8 @@ package com.example.yiupang.freefoodfinder;
 
 
 import android.os.Bundle;
 import android.os.Bundle;
 import android.widget.TextView;
 import android.widget.TextView;
-
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.app.AppCompatActivity;
 
 
-
 public class EventDetailsScreen extends AppCompatActivity
 public class EventDetailsScreen extends AppCompatActivity
 {
 {
 
 
@@ -15,8 +13,6 @@ public class EventDetailsScreen extends AppCompatActivity
         super.onCreate(savedInstanceState);
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_event_details_screen);
         setContentView(R.layout.activity_event_details_screen);
 
 
-       // Event selectedEvent = (Event)getIntent().getSerializableExtra("selectedEvent");
-
         String selectedEventName = (String)getIntent().getExtras().getSerializable("selectedEventName");
         String selectedEventName = (String)getIntent().getExtras().getSerializable("selectedEventName");
         String selectedEventTime = (String)getIntent().getExtras().getSerializable("selectedEventTime");
         String selectedEventTime = (String)getIntent().getExtras().getSerializable("selectedEventTime");
         String selectedEventPlace = (String)getIntent().getExtras().getSerializable("selectedEventPlace");
         String selectedEventPlace = (String)getIntent().getExtras().getSerializable("selectedEventPlace");
@@ -39,11 +35,5 @@ public class EventDetailsScreen extends AppCompatActivity
         TextView descText = (TextView) findViewById( R.id.descText);
         TextView descText = (TextView) findViewById( R.id.descText);
         descText.setText(selectedEventDesc);
         descText.setText(selectedEventDesc);
 
 
-
-
-       /* Log.d("NAME", selectedEventName);
-        Log.d("DESCRIPTION", selectedEventDesc);
-        Log.d("FOODTYPE", selectedEventFoodType); */
-
     }
     }
 }
 }

+ 2 - 2
app/src/main/java/com/example/yiupang/freefoodfinder/EventsScreen.java

@@ -44,12 +44,12 @@ public class EventsScreen extends Fragment
                 super.onResponse(response, code);
                 super.onResponse(response, code);
                 if (code != HttpURLConnection.HTTP_OK)
                 if (code != HttpURLConnection.HTTP_OK)
                 {
                 {
-                    /* Error Handling */
+                    Log.d("ON RESPONSE ERROR", "HTTP ERR: NOT OK");
                 }
                 }
                 else {
                 else {
                     ObjectMapper mapper = new ObjectMapper();
                     ObjectMapper mapper = new ObjectMapper();
                     TypeFactory typeFactory = mapper.getTypeFactory();
                     TypeFactory typeFactory = mapper.getTypeFactory();
-                    List<Event> events = null;/*Parse to Event Objs*/
+                    List<Event> events = null; /*Parse to Event Objs*/
                     try {
                     try {
                         events = mapper.reader(
                         events = mapper.reader(
                                 typeFactory.constructCollectionType(List.class, Event.class)
                                 typeFactory.constructCollectionType(List.class, Event.class)

+ 9 - 13
app/src/main/java/com/example/yiupang/freefoodfinder/LoginActivity.java

@@ -1,5 +1,6 @@
 package com.example.yiupang.freefoodfinder;
 package com.example.yiupang.freefoodfinder;
 
 
+import android.util.Log;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.app.AppCompatActivity;
 import android.content.Intent;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Bundle;
@@ -18,14 +19,14 @@ import com.facebook.login.widget.LoginButton;
 public class LoginActivity extends AppCompatActivity
 public class LoginActivity extends AppCompatActivity
 {
 {
 
 
-    private CallbackManager callbackManager;
-    private TextView info;
-    private LoginButton loginButton;
-
+    CallbackManager callbackManager;
+    TextView info;
+    LoginButton loginButton;
 
 
     @Override
     @Override
     protected void onCreate(Bundle savedInstanceState)
     protected void onCreate(Bundle savedInstanceState)
     {
     {
+
         super.onCreate(savedInstanceState);
         super.onCreate(savedInstanceState);
 
 
         FacebookSdk.sdkInitialize(getApplicationContext());
         FacebookSdk.sdkInitialize(getApplicationContext());
@@ -56,18 +57,16 @@ public class LoginActivity extends AppCompatActivity
 
 
             @Override
             @Override
             public void onCancel() {
             public void onCancel() {
-                info.setText("Login attempt cancelled.");
-
+                Log.d("LOGIN CANCEL","Login attempt cancelled.");
             }
             }
 
 
             @Override
             @Override
             public void onError(FacebookException error) {
             public void onError(FacebookException error) {
-                info.setText("Login attempt failed.");
-
+                Log.d("LOGIN FAIL", "Login attempt failed.");
             }
             }
-        });
-
 
 
+        });
+        
     }
     }
 
 
     // Check token to determine if already logged in
     // Check token to determine if already logged in
@@ -75,9 +74,6 @@ public class LoginActivity extends AppCompatActivity
 
 
         if (currentAccessToken != null) {
         if (currentAccessToken != null) {
             nextActivity();
             nextActivity();
-
-        } else {
-            return;
         }
         }
     }
     }
 
 

+ 2 - 26
app/src/main/java/com/example/yiupang/freefoodfinder/MapScreen.java

@@ -6,7 +6,6 @@ import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewGroup;
-import android.widget.ListView;
 
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -15,7 +14,6 @@ import com.google.android.gms.maps.CameraUpdateFactory;
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.OnMapReadyCallback;
 import com.google.android.gms.maps.OnMapReadyCallback;
 import com.google.android.gms.maps.SupportMapFragment;
 import com.google.android.gms.maps.SupportMapFragment;
-import com.google.android.gms.maps.model.BitmapDescriptorFactory;
 import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.MarkerOptions;
 import com.google.android.gms.maps.model.MarkerOptions;
 
 
@@ -45,7 +43,7 @@ public class MapScreen extends android.support.v4.app.Fragment implements OnMapR
         SupportMapFragment mapFragment = (SupportMapFragment) fragmentManager.findFragmentById(R.id.map);
         SupportMapFragment mapFragment = (SupportMapFragment) fragmentManager.findFragmentById(R.id.map);
         mapFragment.getMapAsync(this);
         mapFragment.getMapAsync(this);
 
 
-        //
+
         HttpCall httpCall = new HttpCall();
         HttpCall httpCall = new HttpCall();
         httpCall.setMethodType(HttpCall.GET);
         httpCall.setMethodType(HttpCall.GET);
         httpCall.setUrl("http://free-food-finder.herokuapp.com/events");
         httpCall.setUrl("http://free-food-finder.herokuapp.com/events");
@@ -56,7 +54,7 @@ public class MapScreen extends android.support.v4.app.Fragment implements OnMapR
             public void onResponse(Object response, int code) {
             public void onResponse(Object response, int code) {
                 super.onResponse(response, code);
                 super.onResponse(response, code);
                 if (code != HttpURLConnection.HTTP_OK) {
                 if (code != HttpURLConnection.HTTP_OK) {
-                    /* Error Handling */
+                    Log.d("ON RESPONSE ERROR", "HTTP ERR: NOT OK");
                 } else {
                 } else {
                     ObjectMapper mapper = new ObjectMapper();
                     ObjectMapper mapper = new ObjectMapper();
                     TypeFactory typeFactory = mapper.getTypeFactory();
                     TypeFactory typeFactory = mapper.getTypeFactory();
@@ -105,39 +103,17 @@ public class MapScreen extends android.support.v4.app.Fragment implements OnMapR
 
 
         map.addMarker(new MarkerOptions().position(currPos).title(titles.get(i)).snippet(descrips.get(i)));
         map.addMarker(new MarkerOptions().position(currPos).title(titles.get(i)).snippet(descrips.get(i)));
 
 
-
-
     }
     }
 
 
     @Override
     @Override
     public void onMapReady(GoogleMap map)
     public void onMapReady(GoogleMap map)
     {
     {
         this.map = map;
         this.map = map;
-
-        /*
-
-        // Add a marker in Sydney and move the camera
         LatLng slo = new LatLng(35.2827778, -120.6586111);
         LatLng slo = new LatLng(35.2827778, -120.6586111);
-        LatLng sf = new LatLng(37.774929, -122.419416);
-        LatLng theP = new LatLng(35.302833, -120.651662);
-        map.addMarker(new MarkerOptions().position(slo).title("Downtown").icon(BitmapDescriptorFactory.defaultMarker(BitmapDescriptorFactory.HUE_RED)).snippet("Downtown of slo"));
-        map.addMarker(new MarkerOptions().position(theP).title("The P").snippet("The “P” is a 50-by-30 foot landmark located atop a northwestern hill of California Polytechnic State University, San Luis Obispo, California."));
-        map.addMarker(new MarkerOptions().position(sf).title("Marker in sf").snippet("Golden Gate Bridge"));
-        map.moveCamera(CameraUpdateFactory.newLatLngZoom(slo, 12.0f));
-
-        */
-
-        LatLng slo = new LatLng(35.2827778, -120.6586111);
-        //map.addMarker(new MarkerOptions().position(slo).title("Downtown").icon(BitmapDescriptorFactory.defaultMarker(BitmapDescriptorFactory.HUE_RED)).snippet("Downtown of slo"));
 
 
         map.moveCamera(CameraUpdateFactory.newLatLngZoom(slo, 12.0f));
         map.moveCamera(CameraUpdateFactory.newLatLngZoom(slo, 12.0f));
 
 
         Log.d("LATS NUM", "Events #: " + lats.size());
         Log.d("LATS NUM", "Events #: " + lats.size());
-/*
-        for(int i = 0; i < lats.size(); i++)
-        {
-
 
 
-        }*/
     }
     }
 }
 }