From fee76d839676c8eb4851bf2a01b17434172d7d99 Mon Sep 17 00:00:00 2001
From: Peter De Jonckheere <peter.de-jonckheere.2014@uni.strath.ac.uk>
Date: Wed, 25 Jul 2018 14:32:24 +0100
Subject: [PATCH] Added graph code to other screen
---
.../frontEnd/NotificationClicked.java | 27 +++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/src/main/java/com/notificationFramework/sedentary/frontEnd/NotificationClicked.java b/src/main/java/com/notificationFramework/sedentary/frontEnd/NotificationClicked.java
index 8f99f14..7ef04a0 100644
--- a/src/main/java/com/notificationFramework/sedentary/frontEnd/NotificationClicked.java
+++ b/src/main/java/com/notificationFramework/sedentary/frontEnd/NotificationClicked.java
@@ -9,6 +9,12 @@ import android.view.View;
import android.widget.Button;
import android.widget.ProgressBar;
+import com.jjoe64.graphview.GraphView;
+import com.jjoe64.graphview.series.DataPoint;
+import com.jjoe64.graphview.series.LineGraphSeries;
+
+import java.util.List;
+
/**
* Created by Peter De Jonckheere on 22/01/2018.
* <p>
@@ -62,5 +68,26 @@ public class NotificationClicked extends AppCompatActivity {
ProgressBar progress = findViewById(R.id.progressBar);
progress.setMax((shared.getInt(getString(R.string.daily_goal_set), R.integer.daily_goal_minutes)));
progress.setProgress(shared.getInt(getString(R.string.daily_progress), 0));
+ setUpGraph();
+ }
+
+ private void setUpGraph(){
+ GraphView graph = (GraphView) findViewById(R.id.graph);
+ List<Integer> acks = SaveFile.getWeeklyAcks(this.getApplicationContext());
+ DataPoint[] dataPoints = new DataPoint[7];
+ int j = 0;
+ for(int i = 0; i < acks.size(); i =+ 2){
+ DataPoint dp = new DataPoint(acks.get(i), acks.get(i+1));
+ dataPoints[j] = dp;
+ j++;
+ }
+ for(int i = 0; i < 7; i++){
+ if(dataPoints[i] == null){
+ dataPoints[i] = new DataPoint(0, 0);
+ }
+ }
+ LineGraphSeries<DataPoint> series = new LineGraphSeries<>(dataPoints);
+ graph.addSeries(series);
+ graph.setTitle(getString(R.string.your_progress));
}
}
--
GitLab