diff --git a/app/src/main/java/com/example/leo/fitnessdiy/Adapter/RecyclerViewAdapter.java b/app/src/main/java/com/example/leo/fitnessdiy/Adapter/RecyclerViewAdapter.java
index d6eaf16c7a2703c7bd0af5c7bcbd550093e55a21..12f9cbf92af641f656d7c6cb025b4a7826d3a664 100644
--- a/app/src/main/java/com/example/leo/fitnessdiy/Adapter/RecyclerViewAdapter.java
+++ b/app/src/main/java/com/example/leo/fitnessdiy/Adapter/RecyclerViewAdapter.java
@@ -8,7 +8,6 @@ import android.view.ViewGroup;
import android.widget.TextView;
import com.example.leo.fitnessdiy.R;
-import com.example.leo.fitnessdiy.model.History;
import java.util.List;
@@ -16,54 +15,54 @@ import java.util.List;
* Created by Leo on 16/02/2018.
*/
-public class RecyclerViewAdapter extends RecyclerView.Adapter<RecyclerViewAdapter.HistoryViewHolder> {
- private List<History> histories;
+//public class RecyclerViewAdapter extends RecyclerView.Adapter<RecyclerViewAdapter.HistoryViewHolder> {
+// private List<History> histories;
+//
+// public RecyclerViewAdapter(List<History> h) {
+// this.histories = h;
+// }
+// @Override
+// public HistoryViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+// View view = LayoutInflater.from(parent.getContext())
+// .inflate(R.layout.card, parent, false);
+//
+// HistoryViewHolder hvh = new HistoryViewHolder(view);
+//
+// return hvh;
+// }
+//
+// @Override
+// public void onBindViewHolder(HistoryViewHolder holder, int position) {
+// holder.sportName.setText(histories.get(position).getSport_name());
+// holder.sportDate.setText(histories.get(position).getSport_date());
+// holder.sportStart.setText(histories.get(position).getSport_start());
+// holder.sportEnd.setText(histories.get(position).getSport_end());
+// }
+//
+// @Override
+// public int getItemCount() {
+// return histories.size();
+// }
+//
+// @Override
+// public void onAttachedToRecyclerView(RecyclerView recyclerView) {
+// super.onAttachedToRecyclerView(recyclerView);
+// }
+//
+// public static class HistoryViewHolder extends RecyclerView.ViewHolder {
+// TextView sportName;
+// TextView sportDate;
+// TextView sportStart;
+// TextView sportEnd;
+//
+// public HistoryViewHolder(View itemView) {
+// super(itemView);
+//
+// sportName = (TextView) itemView.findViewById(R.id.sport_name);
+// sportDate = (TextView) itemView.findViewById(R.id.sport_date);
+// sportStart = (TextView) itemView.findViewById(R.id.sport_start);
+// sportEnd = (TextView) itemView.findViewById(R.id.sport_end);
+// }
+// }
- public RecyclerViewAdapter(List<History> h) {
- this.histories = h;
- }
- @Override
- public HistoryViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
- View view = LayoutInflater.from(parent.getContext())
- .inflate(R.layout.card, parent, false);
-
- HistoryViewHolder hvh = new HistoryViewHolder(view);
-
- return hvh;
- }
-
- @Override
- public void onBindViewHolder(HistoryViewHolder holder, int position) {
- holder.sportName.setText(histories.get(position).getSport_name());
- holder.sportDate.setText(histories.get(position).getSport_date());
- holder.sportStart.setText(histories.get(position).getSport_start());
- holder.sportEnd.setText(histories.get(position).getSport_end());
- }
-
- @Override
- public int getItemCount() {
- return histories.size();
- }
-
- @Override
- public void onAttachedToRecyclerView(RecyclerView recyclerView) {
- super.onAttachedToRecyclerView(recyclerView);
- }
-
- public static class HistoryViewHolder extends RecyclerView.ViewHolder {
- TextView sportName;
- TextView sportDate;
- TextView sportStart;
- TextView sportEnd;
-
- public HistoryViewHolder(View itemView) {
- super(itemView);
-
- sportName = (TextView) itemView.findViewById(R.id.sport_name);
- sportDate = (TextView) itemView.findViewById(R.id.sport_date);
- sportStart = (TextView) itemView.findViewById(R.id.sport_start);
- sportEnd = (TextView) itemView.findViewById(R.id.sport_end);
- }
- }
-
-}
+//}
diff --git a/app/src/main/java/com/example/leo/fitnessdiy/HIstoryActivity.java b/app/src/main/java/com/example/leo/fitnessdiy/HIstoryActivity.java
index 4c314cf31a331b5929b115ab6a96a98e6988783a..cfb5b6f7d83cf448cc602c0a2953eba59595d4d3 100644
--- a/app/src/main/java/com/example/leo/fitnessdiy/HIstoryActivity.java
+++ b/app/src/main/java/com/example/leo/fitnessdiy/HIstoryActivity.java
@@ -10,10 +10,11 @@ import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.widget.TextView;
-import com.example.leo.fitnessdiy.Adapter.RecyclerViewAdapter;
import com.example.leo.fitnessdiy.Utilities.NetworkUtils;
import com.example.leo.fitnessdiy.model.History;
import com.example.leo.fitnessdiy.model.Jogging;
+import com.example.leo.fitnessdiy.model.PushUp;
+import com.example.leo.fitnessdiy.model.SitUp;
import com.example.leo.fitnessdiy.routes.api;
@@ -22,6 +23,7 @@ import org.json.JSONException;
import org.json.JSONObject;
import java.io.IOException;
+import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
@@ -30,49 +32,46 @@ import java.util.List;
public class HIstoryActivity extends AppCompatActivity {
public static final String TAG = HIstoryActivity.class.getSimpleName();
private RecyclerView mRecyclerView;
- private List<History> histories;
+ private List<Jogging> joggingHistory;
+ private List<PushUp> pushupHistory;
+ private List<SitUp> situpHistory;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_history);
- if (android.os.Build.VERSION.SDK_INT > 9) {
- StrictMode.ThreadPolicy policy = new StrictMode.ThreadPolicy.Builder().permitAll().build();
- StrictMode.setThreadPolicy(policy);
- }
-
- String fetchResults = null;
- try {
-
-// fetchResults = "[{\"id\":\"1\",\"id_user\":\"1\",\"sport_name\":\"jogging\",\"sport_date\":\"2018-02-14\",\"sport_time_start\":\"09:00:00\",\"sport_time_end\":\"11:00:00\",\"created_at\":null,\"updated_at\":null},{\"id\":\"2\",\"id_user\":\"1\",\"sport_name\":\"jogging\",\"sport_date\":\"2018-02-15\",\"sport_time_start\":\"09:00:00\",\"sport_time_end\":\"11:00:00\",\"created_at\":null,\"updated_at\":null},{\"id\":\"3\",\"id_user\":\"1\",\"sport_name\":\"plank\",\"sport_date\":\"2018-02-16\",\"sport_time_start\":\"09:00:00\",\"sport_time_end\":\"09:45:00\",\"created_at\":null,\"updated_at\":null},{\"id\":\"4\",\"id_user\":\"1\",\"sport_name\":\"push-up\",\"sport_date\":\"2018-02-16\",\"sport_time_start\":\"10:00:00\",\"sport_time_end\":\"10:30:00\",\"created_at\":null,\"updated_at\":null}]";
- fetchResults = NetworkUtils.getResponseFromHttpUrl(new URL(api.HISTORY_URL + "1"));
- initializeData(fetchResults);
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- mRecyclerView = (RecyclerView) findViewById(R.id.rv_history);
-
- LinearLayoutManager layoutManager = new LinearLayoutManager(this);
-
- mRecyclerView.setLayoutManager(layoutManager);
- mRecyclerView.setHasFixedSize(true);
- RecyclerViewAdapter rv = new RecyclerViewAdapter(histories);
- mRecyclerView.setAdapter(rv);
+// mRecyclerView = (RecyclerView) findViewById(R.id.rv_history);
+//
+// LinearLayoutManager layoutManager = new LinearLayoutManager(this);
+//
+// mRecyclerView.setLayoutManager(layoutManager);
+// mRecyclerView.setHasFixedSize(true);
+// RecyclerViewAdapter rv = new RecyclerViewAdapter(histories);
+// mRecyclerView.setAdapter(rv);
}
- public void initializeData(String data) {
- this.histories = new ArrayList<>();
+ public void getJoggingData() {
try {
- JSONArray parser = new JSONArray(data);
- for (int i = 0; i < parser.length(); i++) {
- JSONObject json = parser.getJSONObject(i);
- histories.add(new History(json.getString("sport_name"),
- json.getString("sport_date"),
- json.getString("sport_time_start"),
- json.getString("sport_time_end")));
+ String response = NetworkUtils.getResponseFromHttpUrl(
+ new URL(api.JOGGING_HISTORY_URL + "1")
+ );
+ JSONArray jsonArray = new JSONArray(response);
+ for (int i = 0; i < jsonArray.length(); i++) {
+ JSONObject jsonObject = jsonArray.getJSONObject(i);
+ joggingHistory.add(new Jogging(
+ jsonObject.getString("jogging_date"),
+ jsonObject.getString("jogging_time_start"),
+ jsonObject.getString("jogging_time_end"),
+ (float) jsonObject.getDouble("jogging_distance"),
+ jsonObject.getString("starting_point"),
+ jsonObject.getString("end_point")
+ ));
}
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
} catch (JSONException e) {
e.printStackTrace();
}
diff --git a/app/src/main/java/com/example/leo/fitnessdiy/PlankActivity.java b/app/src/main/java/com/example/leo/fitnessdiy/PlankActivity.java
index ee601a947d021a256ae62214f85108794e146e05..96b5ae0399db087115758eccbd496ce4f5da8166 100644
--- a/app/src/main/java/com/example/leo/fitnessdiy/PlankActivity.java
+++ b/app/src/main/java/com/example/leo/fitnessdiy/PlankActivity.java
@@ -11,7 +11,6 @@ import android.view.View;
import android.widget.TextView;
import com.example.leo.fitnessdiy.Utilities.NetworkUtils;
-import com.example.leo.fitnessdiy.model.History;
import com.example.leo.fitnessdiy.model.Users;
import com.example.leo.fitnessdiy.routes.api;
diff --git a/app/src/main/java/com/example/leo/fitnessdiy/model/Plank.java b/app/src/main/java/com/example/leo/fitnessdiy/model/Plank.java
new file mode 100644
index 0000000000000000000000000000000000000000..0e5ca6d49a648967e49745c8d453b692107c5a37
--- /dev/null
+++ b/app/src/main/java/com/example/leo/fitnessdiy/model/Plank.java
@@ -0,0 +1,51 @@
+package com.example.leo.fitnessdiy.model;
+
+/**
+ * Created by Leo on 22/02/2018.
+ */
+
+public class Plank {
+ private String date;
+ private String start;
+ private String end;
+ private int duration;
+
+ public Plank(String date, String start, String end, int duration) {
+ this.date = date;
+ this.start = start;
+ this.end = end;
+ this.duration = duration;
+ }
+
+ public String getDate() {
+ return date;
+ }
+
+ public void setDate(String date) {
+ this.date = date;
+ }
+
+ public String getStart() {
+ return start;
+ }
+
+ public void setStart(String start) {
+ this.start = start;
+ }
+
+ public String getEnd() {
+ return end;
+ }
+
+ public void setEnd(String end) {
+ this.end = end;
+ }
+
+ public int getDuration() {
+ return duration;
+ }
+
+ public void setDuration(int duration) {
+ this.duration = duration;
+ }
+}
diff --git a/app/src/main/java/com/example/leo/fitnessdiy/model/PushUp.java b/app/src/main/java/com/example/leo/fitnessdiy/model/PushUp.java
new file mode 100644
index 0000000000000000000000000000000000000000..4475511cc74037588f1aba534ef7aec3fedf41ab
--- /dev/null
+++ b/app/src/main/java/com/example/leo/fitnessdiy/model/PushUp.java
@@ -0,0 +1,51 @@
+package com.example.leo.fitnessdiy.model;
+
+/**
+ * Created by Leo on 22/02/2018.
+ */
+
+public class PushUp {
+ private String date;
+ private String start;
+ private String end;
+ private String frequency;
+
+ public PushUp(String date, String start, String end, String frequency) {
+ this.date = date;
+ this.start = start;
+ this.end = end;
+ this.frequency = frequency;
+ }
+
+ public String getDate() {
+ return date;
+ }
+
+ public void setDate(String date) {
+ this.date = date;
+ }
+
+ public String getStart() {
+ return start;
+ }
+
+ public void setStart(String start) {
+ this.start = start;
+ }
+
+ public String getEnd() {
+ return end;
+ }
+
+ public void setEnd(String end) {
+ this.end = end;
+ }
+
+ public String getFrequency() {
+ return frequency;
+ }
+
+ public void setFrequency(String frequency) {
+ this.frequency = frequency;
+ }
+}
diff --git a/app/src/main/java/com/example/leo/fitnessdiy/model/SitUp.java b/app/src/main/java/com/example/leo/fitnessdiy/model/SitUp.java
new file mode 100644
index 0000000000000000000000000000000000000000..8974abb425794b40fb88936d5de013b994afa979
--- /dev/null
+++ b/app/src/main/java/com/example/leo/fitnessdiy/model/SitUp.java
@@ -0,0 +1,62 @@
+package com.example.leo.fitnessdiy.model;
+
+import com.example.leo.fitnessdiy.Utilities.NetworkUtils;
+import com.example.leo.fitnessdiy.routes.api;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+/**
+ * Created by Leo on 22/02/2018.
+ */
+
+public class SitUp {
+ private String date;
+ private String start;
+ private String end;
+ private String frequency;
+
+ public SitUp(String date, String start, String end, String frequency) {
+ this.date = date;
+ this.start = start;
+ this.end = end;
+ this.frequency = frequency;
+ }
+
+ public String getDate() {
+ return date;
+ }
+
+ public void setDate(String date) {
+ this.date = date;
+ }
+
+ public String getStart() {
+ return start;
+ }
+
+ public void setStart(String start) {
+ this.start = start;
+ }
+
+ public String getEnd() {
+ return end;
+ }
+
+ public void setEnd(String end) {
+ this.end = end;
+ }
+
+ public String getFrequency() {
+ return frequency;
+ }
+
+ public void setFrequency(String frequency) {
+ this.frequency = frequency;
+ }
+}
diff --git a/app/src/main/java/com/example/leo/fitnessdiy/routes/api.java b/app/src/main/java/com/example/leo/fitnessdiy/routes/api.java
index 3a8cd6acd997e402f742b87564b7809d1b2d1b7e..8da80def697ef55d74a180e72dbaa2b6a0a6e828 100644
--- a/app/src/main/java/com/example/leo/fitnessdiy/routes/api.java
+++ b/app/src/main/java/com/example/leo/fitnessdiy/routes/api.java
@@ -20,4 +20,10 @@ public class api {
"&date="+date+"&start="+start+"&end="+end+"&distance="+distance+"&spoint="+
sPoint+"&epoint=" + ePoint;
}
+
+ public static final String JOGGING_HISTORY_URL = BASE_URL + "jogging_history.php?user=";
+
+ public static final String PUSHUP_HISTORY_URL = BASE_URL + "pushup_history.php?user=";
+
+ public static final String SITUP_HISTORY_URL = BASE_URL + "situp_history.php?user=";
}
diff --git a/app/src/main/res/layout/activity_history.xml b/app/src/main/res/layout/activity_history.xml
index b982d3c6ef1f2bdae574d6de7f81da931d124b5d..609d7034a5828ab3f77867703ecab31ce9e849a9 100644
--- a/app/src/main/res/layout/activity_history.xml
+++ b/app/src/main/res/layout/activity_history.xml
@@ -6,8 +6,14 @@
android:layout_height="match_parent"
xmlns:card_view="http://schemas.android.com/tools"
tools:context="com.example.leo.fitnessdiy.HIstoryActivity"
+ android:padding="16dp"
android:orientation="vertical">
+ <android.support.v7.widget.CardView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ </android.support.v7.widget.CardView>
<android.support.v7.widget.RecyclerView
android:layout_width="match_parent"
android:layout_height="match_parent"