From 936b9398deba5b1f6b89f7b59aff96dcc4fc71b3 Mon Sep 17 00:00:00 2001
From: Peter De Jonckheere <peter.de-jonckheere.2014@uni.strath.ac.uk>
Date: Tue, 3 Jul 2018 15:12:46 +0100
Subject: [PATCH] Do array store of daily ack for graph tomorrow.
---
.../sedentary/frontEnd/DataAnalysis.java | 1 +
.../sedentary/frontEnd/MainActivity.java | 6 ++++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/notificationFramework/sedentary/frontEnd/DataAnalysis.java b/src/main/java/com/notificationFramework/sedentary/frontEnd/DataAnalysis.java
index 58e7a74..6184c14 100644
--- a/src/main/java/com/notificationFramework/sedentary/frontEnd/DataAnalysis.java
+++ b/src/main/java/com/notificationFramework/sedentary/frontEnd/DataAnalysis.java
@@ -66,5 +66,6 @@ public class DataAnalysis {
editor.putInt(context.getString(R.string.ack_days), ackDays);
editor.putFloat(context.getString(R.string.avg_ack), avgAck);
editor.commit();
+
}
}
\ No newline at end of file
diff --git a/src/main/java/com/notificationFramework/sedentary/frontEnd/MainActivity.java b/src/main/java/com/notificationFramework/sedentary/frontEnd/MainActivity.java
index 7e81de4..0eb95c9 100644
--- a/src/main/java/com/notificationFramework/sedentary/frontEnd/MainActivity.java
+++ b/src/main/java/com/notificationFramework/sedentary/frontEnd/MainActivity.java
@@ -33,6 +33,7 @@ import com.notificationFramework.stimulusStrategy.SigMotionDetect;
public class MainActivity extends AppCompatActivity {
+ private SharedPreferences shared;
/**
* Called when the MainActivity activity is started from somewhere else in the application, or
@@ -46,6 +47,7 @@ public class MainActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ shared = this.getSharedPreferences(getString(R.string.preference_file_key), Context.MODE_PRIVATE);
setContentView(R.layout.activity_main);
setUpButtons();
}
@@ -72,8 +74,6 @@ public class MainActivity extends AppCompatActivity {
startActivity(intent);
}
});
- SharedPreferences shared =
- this.getSharedPreferences(getString(R.string.preference_file_key), Context.MODE_PRIVATE);
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));
@@ -83,6 +83,7 @@ public class MainActivity extends AppCompatActivity {
private void setUpGraph(){
GraphView graph = (GraphView) findViewById(R.id.graph);
+
LineGraphSeries<DataPoint> series = new LineGraphSeries<>(new DataPoint[] {
new DataPoint(0, 1),
new DataPoint(1, 5),
@@ -91,6 +92,7 @@ public class MainActivity extends AppCompatActivity {
new DataPoint(4, 6)
});
graph.addSeries(series);
+
}
/**
* Creates the stimulus object which initiates the background processes of the application. Uses
--
GitLab