incorporate activities managements into controllers

wit-design-patterns-2016 · Feb 27, 2016 · 5333a26 · 5333a26
1 parent 73812bb
commit 5333a26
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 51 deletions.
diff --git a/app/src/main/java/org/pacemaker/controllers/ActivitiesList.java b/app/src/main/java/org/pacemaker/controllers/ActivitiesList.java
@@ -1,43 +1,63 @@
 package org.pacemaker.controllers;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.pacemaker.R;
+import org.pacemaker.http.Response;
+import org.pacemaker.main.PacemakerApp;
+import org.pacemaker.models.MyActivity;
+
 import android.content.Context;
-import android.support.v7.app.AppCompatActivity;
+import android.content.Intent;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
+import android.widget.Toast;
 
-import org.pacemaker.R;
-import org.pacemaker.main.PacemakerApp;
-import org.pacemaker.models.MyActivity;
 
-import java.util.List;
-
-public class ActivitiesList extends  android.app.Activity
-{
+public class ActivitiesList extends  android.app.Activity implements Response <MyActivity> {
   private PacemakerApp app;
-  private ListView     activitiesListView;
+  private ListView activitiesListView;
+  private ActivityAdapter activitiesAdapter;
+  private List<MyActivity> activities = new ArrayList<MyActivity>();
 
   @Override
-  protected void onCreate(Bundle savedInstanceState)
-  {
+  protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     setContentView(R.layout.activity_activities_list);
 
     app = (PacemakerApp) getApplication();
 
     activitiesListView = (ListView) findViewById(R.id.activitiesListView);
+    activitiesAdapter = new ActivityAdapter(this, activities);
+    activitiesListView.setAdapter(activitiesAdapter);
+
+    app.getActivities(this, this);
+  }
 
-    List<MyActivity> activities  = app.getActivities();
 
-    ActivityAdapter activitiesAdapter = new ActivityAdapter(this,  activities);
-    activitiesListView.setAdapter(activitiesAdapter);
+  @Override
+  public void setResponse(List<MyActivity> aList) {
+    activitiesAdapter.activities = aList;
     activitiesAdapter.notifyDataSetChanged();
   }
+
+  @Override
+  public void setResponse(MyActivity anObject) {
+  }
+
+  @Override
+  public void errorOccurred(Exception e) {
+    Toast toast = Toast.makeText(this, "Error Retrieving Activities...", Toast.LENGTH_SHORT);
+    toast.show();
+  }
 }
 
 class ActivityAdapter extends ArrayAdapter<MyActivity>
@@ -57,11 +77,11 @@ public View getView(int position, View convertView, ViewGroup parent)
   {
     LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 
-    View     view      = inflater.inflate(R.layout.activity_row_layout, parent, false);
-    MyActivity activity  = activities.get(position);
-    TextView type      = (TextView) view.findViewById(R.id.type);
-    TextView location  = (TextView) view.findViewById(R.id.location);
-    TextView distance  = (TextView) view.findViewById(R.id.distance);
+    View     view       = inflater.inflate(R.layout.activity_row_layout, parent, false);
+    MyActivity activity = activities.get(position);
+    TextView type       = (TextView) view.findViewById(R.id.type);
+    TextView location   = (TextView) view.findViewById(R.id.location);
+    TextView distance   = (TextView) view.findViewById(R.id.distance);
 
     type.setText(activity.kind);
     location.setText(activity.location);

diff --git a/app/src/main/java/org/pacemaker/controllers/CreateActivity.java b/app/src/main/java/org/pacemaker/controllers/CreateActivity.java
@@ -1,63 +1,68 @@
 package org.pacemaker.controllers;
 
 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
 import android.util.Log;
+import android.widget.Toast;
+import org.pacemaker.R;
+import org.pacemaker.http.Response;
+import org.pacemaker.main.PacemakerApp;
+import org.pacemaker.models.MyActivity;
+
+import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 import android.widget.NumberPicker;
 import android.widget.TextView;
-import org.pacemaker.main.PacemakerApp;
-import org.pacemaker.models.MyActivity;
-import java.util.ArrayList;
 import java.util.List;
-import org.pacemaker.R;
 
-public class CreateActivity extends AppCompatActivity
-{
+public class CreateActivity extends android.app.Activity implements Response<MyActivity> {
   private PacemakerApp app;
 
-  private Button       createActivityButton;
-  private TextView     activityType;
-  private TextView     activityLocation;
+  private Button createActivityButton;
+  private TextView activityType;
+  private TextView activityLocation;
   private NumberPicker distancePicker;
 
-  private ArrayList<MyActivity> activities = new ArrayList<MyActivity>();
-
   @Override
-  protected void onCreate(Bundle savedInstanceState)
-  {
+  protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     setContentView(R.layout.activity_create);
 
     app = (PacemakerApp) getApplication();
 
-    createActivityButton = (Button)       findViewById(R.id.createActivityButton);
-    activityType         = (TextView)     findViewById(R.id.activityType);
-    activityLocation     = (TextView)     findViewById(R.id.activityLocation);
-    distancePicker       = (NumberPicker) findViewById(R.id.numberPicker);
+    createActivityButton = (Button) findViewById(R.id.createActivityButton);
+    activityType = (TextView) findViewById(R.id.activityType);
+    activityLocation = (TextView) findViewById(R.id.activityLocation);
+    distancePicker = (NumberPicker) findViewById(R.id.numberPicker);
 
     distancePicker.setMinValue(0);
     distancePicker.setMaxValue(20);
-
-    Log.v("Pacemaker", "got the CreateActivity button");
   }
 
-  public void createActivityButtonPressed (View view)
-  {
+  public void createActivityButtonPressed(View view) {
     double distance = distancePicker.getValue();
-    MyActivity activity = new MyActivity (activityType.getText().toString(), activityLocation.getText().toString(), distance);
+    MyActivity activity = new MyActivity(activityType.getText().toString(), activityLocation.getText().toString(), distance);
+
+    app.createActivity(this, activity, this);
+  }
+
+  @Override
+  public void setResponse(List<MyActivity> aList) {
+  }
 
-    app.createActivity(activity);
-    Log.v("Pacemaker", "CreateActivity Button Pressed with " + distance);
+  @Override
+  public void setResponse(MyActivity anObject) {
   }
 
+  @Override
+  public void errorOccurred(Exception e) {
+    Toast toast = Toast.makeText(this, "Failed to create Activity", Toast.LENGTH_SHORT);
+    toast.show();
+  }
 
   public void listActivityButtonPressed (View view)
   {
-    Log.v("Pacemaker", "List Activityies Button Pressed");
-    Intent intent = new Intent(this, ActivitiesList.class);
-    startActivity (intent);
+    Log.v("Pacemaker", "List Activities Button Pressed");
+    startActivity (new Intent(this, ActivitiesList.class));
   }
 }
diff --git a/app/src/main/java/org/pacemaker/controllers/Signup.java b/app/src/main/java/org/pacemaker/controllers/Signup.java
@@ -30,7 +30,7 @@ public void registerPressed (View view)
     TextView password  = (TextView)  findViewById(R.id.Password);
 
     User user = new User(firstName.getText().toString(), lastName.getText().toString(), email.getText().toString(), password.getText().toString());
-    app.registerUser(user);
+    app.registerUser(this, user);
 
     startActivity (new Intent(this, Login.class));
   }

diff --git a/app/src/main/java/org/pacemaker/controllers/Welcome.java b/app/src/main/java/org/pacemaker/controllers/Welcome.java
@@ -19,7 +19,7 @@ public void onCreate(Bundle savedInstanceState)
     super.onCreate(savedInstanceState);
     setContentView(R.layout.activity_welcome);
     app = (PacemakerApp) getApplication();
-    PacemakerAPI.getUsers(this, app, "Retrieving list of users");
+    app.connectToPacemakerAPI(this);
   }
 
   public void loginPressed (View view)