Explorar el Código

Edited Event and CreateEventScreen1.

Zachary Hatton hace 9 años
padre
commit
9f85592c10

+ 3 - 14
app/src/main/java/com/example/yiupang/freefoodfinder/CreateEventScreen1.java

@@ -1,17 +1,10 @@
 package com.example.yiupang.freefoodfinder;
 
-import android.content.Intent;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.EditText;
-import android.support.v4.app.Fragment;
-
-import java.security.AccessController;
-import java.util.List;
 
 public class CreateEventScreen1 extends AppCompatActivity {
 
@@ -20,8 +13,6 @@ public class CreateEventScreen1 extends AppCompatActivity {
     {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_create_event_screen1);
-        // View view = inflater.inflate(R.layout.create_event, container, false);
-        // View view = inflater.inflate(R.layout.activity_create_event_screen1, container, false);
         final Event newEvent = new Event();
 
         Button button = (Button) findViewById(R.id.button_create);
@@ -35,6 +26,7 @@ public class CreateEventScreen1 extends AppCompatActivity {
         button.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v){
+
                 String title = titleEdit.getText().toString();
                 String date = dateEdit.getText().toString();
                 String time = timeEdit.getText().toString();
@@ -43,10 +35,7 @@ public class CreateEventScreen1 extends AppCompatActivity {
                 String desc = descEdit.getText().toString();
 
                 newEvent.setName(title);
-                //newEvent.setTime(null);
                 newEvent.setPlace(place);
-                //newEvent.setLatitude(0);
-                //newEvent.setLongitude(0);
                 newEvent.setDate(date);
                 newEvent.setTime(time);
                 newEvent.setFoodType(food);
@@ -55,12 +44,12 @@ public class CreateEventScreen1 extends AppCompatActivity {
                 HttpCall httpr = new HttpCall();
                 httpr.setMethodType(HttpCall.PUT);
                 httpr.setBody(newEvent);
-                httpr.setUrl("https://free-food-finder.herokuapp.com/events");
+                httpr.setUrl("http://free-food-finder.herokuapp.com/events");
                 new HttpRequest(){
                     @Override
                     public void onResponse(Object response, int code)
                     {
-                        finishActivity(0);
+                        finish();
                     }
                 }.execute(httpr);
 

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

@@ -7,7 +7,7 @@ class Event
     private long eventId;
     private long userId;
     private String name;
-    private Date date_time;
+    private Date dateTime;
     private String date;
     private String time;
     private String foodType;
@@ -37,8 +37,8 @@ class Event
     public long getUserId(){ return userId; }
     public void setUserId(long id){ userId = id; }
 
-    public Date getDateTime(){ return date_time; }
-    public void setDateTime(Date d){ date_time = d; }
+    public Date getDateTime(){ return dateTime; }
+    public void setDateTime(Date d){ dateTime = d; }
 
     public boolean setName(String name) {
         if (name.length() > 3 && name.length() < 31) {