Prechádzať zdrojové kódy

attempt to fix smells.

Yiupang 9 rokov pred
rodič
commit
543456e75e

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

@@ -40,7 +40,7 @@ public class EventsScreen extends Fragment
         return view;
     }
 
-    public void setItemListener(final ListView listView)
+    private void setItemListener(final ListView listView)
     {
         listView.setOnItemClickListener(new AdapterView.OnItemClickListener()
         {
@@ -48,24 +48,11 @@ public class EventsScreen extends Fragment
             public void onItemClick(AdapterView<?> adapterView, View view, int position, long id)
             {
                 Event selectedEvent = (Event) adapterView.getAdapter().getItem(position);
-                switchActivity(selectedEvent);
+                startActivity(Utility.getDetail(selectedEvent, getContext()));
             }
         });
     }
 
-    public void switchActivity(Event selectedEvent)
-    {
-        Intent details = new Intent(getContext(), EventDetailsScreen.class);
-
-        details.putExtra("selectedEventName", selectedEvent.getName());
-        details.putExtra("selectedEventTime", selectedEvent.getTime());
-        details.putExtra("selectedEventPlace", selectedEvent.getPlace());
-        details.putExtra("selectedEventDesc", selectedEvent.getDescription());
-        details.putExtra("selectedEventFoodType", selectedEvent.getFoodType());
-
-        startActivity(details);
-    }
-
     private class HttpRequestSpecial extends HttpRequest {
         View view;
 

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

@@ -64,7 +64,6 @@ public class MyEventScreen extends android.support.v4.app.Fragment
             public void onClick(View v) {
 
                 Intent details = new Intent(getContext(), CreateEventScreen.class);
-
                 startActivity(details);
             }
         });
@@ -72,7 +71,7 @@ public class MyEventScreen extends android.support.v4.app.Fragment
         return view;
     }
 
-    public void setItemListener(final ListView listView)
+    private void setItemListener(final ListView listView)
     {
         listView.setOnItemClickListener(new AdapterView.OnItemClickListener()
         {
@@ -80,22 +79,8 @@ public class MyEventScreen extends android.support.v4.app.Fragment
             public void onItemClick(AdapterView<?> adapterView, View view, int position, long id)
             {
                 Event selectedEvent = (Event) adapterView.getAdapter().getItem(position);
-
-                switchActivity(selectedEvent);
+                startActivity(Utility.getDetail(selectedEvent, getContext()));
             }
         });
     }
-
-    public void switchActivity(Event selectedEvent)
-    {
-        Intent details = new Intent(getContext(), EventDetailsScreen.class);
-
-        details.putExtra("selectedEventName", selectedEvent.getName());
-        details.putExtra("selectedEventTime", selectedEvent.getTime());
-        details.putExtra("selectedEventPlace", selectedEvent.getPlace());
-        details.putExtra("selectedEventDesc", selectedEvent.getDescription());
-        details.putExtra("selectedEventFoodType", selectedEvent.getFoodType());
-
-        startActivity(details);
-    }
 }

+ 22 - 3
app/src/main/java/com/example/yiupang/freefoodfinder/Utility.java

@@ -1,12 +1,18 @@
 package com.example.yiupang.freefoodfinder;
 
+import android.content.Context;
+import android.content.Intent;
 import android.util.Log;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ListView;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.type.TypeFactory;
 
 import java.io.IOException;
+import java.util.LinkedList;
 import java.util.List;
 
 /**
@@ -14,9 +20,10 @@ import java.util.List;
  *
  */
 
-public class Utility
+class Utility
 {
-    public static List<Event> parseFromJSONToEventObjs(JsonNode node)
+    private Utility(){}
+    static List<Event> parseFromJSONToEventObjs(JsonNode node)
     {
         ObjectMapper mapper = new ObjectMapper();
         TypeFactory typeFactory = mapper.getTypeFactory();
@@ -30,7 +37,19 @@ public class Utility
         {
             Log.d("size:  ", e + "");
         }
-        return null;
+        return new LinkedList<>();
     }
 
+    static Intent getDetail(Event selectedEvent, Context context)
+    {
+        Intent details = new Intent(context, EventDetailsScreen.class);
+
+        details.putExtra("selectedEventName", selectedEvent.getName());
+        details.putExtra("selectedEventTime", selectedEvent.getTime());
+        details.putExtra("selectedEventPlace", selectedEvent.getPlace());
+        details.putExtra("selectedEventDesc", selectedEvent.getDescription());
+        details.putExtra("selectedEventFoodType", selectedEvent.getFoodType());
+
+        return details;
+    }
 }