From 1d11f0c3dddd4ccc2a7210606c80da5c48faa097 Mon Sep 17 00:00:00 2001
From: Darrel Marek <darrelmarek@tamu.edu>
Date: Thu, 26 Apr 2018 00:18:01 -0500
Subject: [PATCH] Piped pedometer steps into goals

---
 MoCha/Assets/Scenes/Goals.unity          | Bin 29244 -> 30804 bytes
 MoCha/Assets/Scripts/GetGoals.cs         |  44 +++++++++++++++--------
 MoCha/ProjectSettings/ProjectVersion.txt |   2 +-
 3 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/MoCha/Assets/Scenes/Goals.unity b/MoCha/Assets/Scenes/Goals.unity
index 9bb606e1d60bb095a40a698b2ff1446883b4865e..167c118fddf4f319d43d1df0c388c6ccd654e8d7 100644
GIT binary patch
delta 1229
zcma))Ur1A76u{4&cWdS{bN<(C`G+LtpUu)q*_xJ?Y%tnvL8eakSFhWW2^Pgxy_rva
zJrq=E2t^N3T>>K^Bch0)2&tC{gP;dP=9>_-&e`sjQi9GnJLmhIKi|3E_sxCd77|=F
zz=<h<aVG$5Lw_DE7#j@Db&Yifp8<X)lSwZBVYS69KI>Xl>PIQg!<D1gYbPfc3+|uq
zQmmA>m`f)W@9$mwnP|HG<k2VX@{3B$dMU1$Iu)5o1;lG`nZqpmw0n)Ia)4sABpfK<
z3qZUDeIB)hAd1W_==1FB0d1_4Jk&B&5)OY<X-A*<c7iCxr;)qSCtgkvh4@qk#D`Np
zzz%}gUgno1u3N`%q<IPKTo-td4nPGfHyL7fx5pC<`C+8b>h(p@91HpbWS!v%{<npr
z(eMa5?SY`+u?RtbXv7<$xFg~oOc$m?9pTYI@8R)?JLGW%J<)(%@&`ZSm0G6?+QXsf
zXt+Z7D?1GZDKm9xN>MO3XK*TUrma-XRf@Crt6VIpZ%v)gY8F5czlRPCYSS#B0hq&O
z4k{<Hnk@hVuJNfr?wzxA&2SCb1+-MFm6$FYfG#E%HBVv@WD&|i%}=u!EFyGJ5^8~z
zXxa)egKOHjXY4sW8CXPCgcj$7QxaQ6R)uSv6DCYcHZ-8aB02A}#7xNKyjNXbKjrl!
zJEW`!*o=#M<Ma^0yZN}OGR<rayJEy<@kM^dPoum|tku!XFMaQ}F~RYMS)CfO$(gO$
zt)N5_>6FNoPYm0E3f1a96CR7QiQ^s2?&Ntocy_K&&x!{0JbgH`I1AaZGphv5#Snk&
z^L;!B@Vc#0RJUWbnG{p1isT#PkdS1crY6E5n|JYSzME&`y*k`Q&3?GlqP71mhXEB0
zf%CEb0}Gk*pvBA`c&DQAYa7_|piy>1!8Nzn^MNH!=CMU@F1t0<!R--mdY>xzRI8rA
mf?V;hVjt5C2^$&&IMF7Qa%*!G{?8mfRu<ma%EdA3>BMh1;tq`f

delta 571
zcmaKoF-SsD6o$_&Eh`nXR~a@46-B1KCyEV01uaEVkf4LnqNYAU5hDn}T5CKFjV}mV
zi?_PuPz^y24nmDBQA0z6L-;zEUggyAbME=>fB$>#t-rI%Gn)Vij{+3t0id7OB31B-
zQqb%7ib)Atnx-+~YGP@jtH8Gms<IO7WJa~I<}|6vg{G0Y)Q|89E88#j$GD@}2XM%p
zqye2Bm;pAZw~+*$)rjS(r(0oAXNwkqP3rBWA)TEPt582citS$es6f;T;GjxZ!PYk`
zL!RI`0m_A=xz`XCIBhc?>+G`4ce|R{;l2j3Wg|c@t!I5_8O~e+4Xm?}I9cXQ907Qu
zmvLVgiIHAf=0{D#YGfLlk*azVwVJUMGpVKIJ;U0T0ZWM~EXHh@O;rs1RXCHbV>InX
zcgBMGZ2^^(8I_y^@6vvJ%gy0aCfnUf$(~>U*X0BX@~B#qm5!dDKXIUxe)uQi+{Az1
lBl!ZjA;<OeA*Ln@PWBrz{BOu-@%(!R%J`dMo?(3N{R?wgk%j;O

diff --git a/MoCha/Assets/Scripts/GetGoals.cs b/MoCha/Assets/Scripts/GetGoals.cs
index f4850d9..df7b284 100644
--- a/MoCha/Assets/Scripts/GetGoals.cs
+++ b/MoCha/Assets/Scripts/GetGoals.cs
@@ -6,7 +6,8 @@ using UnityEngine;
 using UnityEngine.UI;
 
 //Pretty much a copy of GetData...
-
+namespace PedometerU.Tests {
+	
 public class GetGoals : MonoBehaviour {
 
 	public Text goalText;
@@ -20,24 +21,36 @@ public class GetGoals : MonoBehaviour {
 
 	//Progress Bar...
 	public float barDisplay; //current progress
-	public Vector2 barPos;
+	private Vector2 barPos;
 	Vector2 barSize = new Vector2(227,20);
 
+	//Pedometer
+	private Pedometer pedometer;
+	int userSteps;
+	double userDistance;
+	int totalSteps = 30;
+	
+	void OnStep (int steps, double distance) {
+		userSteps = steps;
+		userDistance = (distance * 3.28084);
+	}
+
+	private void OnDisable () {
+		// Release the pedometer
+		pedometer.Dispose();
+		pedometer = null;
+	}
+
 	void Start () {
+		// Create a new pedometer
+		pedometer = new Pedometer(OnStep);
+		// Reset UI
+		OnStep(0, 0);
+		
 		//goalText.text = prefKey;
 		goalText.color = new Color(0f, 0f, 0f);
 
-		goalText.transform.position = new Vector2(barPos.x + 45.0f,barPos.y + 55.0f);
-
-
-		//barPos.x = goalText.transform.position.x;
-		//barPos.y = goalText.transform.position.y + 10.0f;
-
-		//Debug.Log(barPos.x + " " + barPos.y);
-
-		//barPos.x = 0;
-		//barPos.y = 0;
-
+		barPos = new Vector2(goalText.transform.position.x - 105, goalText.transform.position.y - 30);
 
 		currentDayStr = System.DateTime.Now.ToString("MM/dd/yyyy");
 		goalDayStr = System.DateTime.Now.ToString("MM/dd/yyyy");
@@ -87,8 +100,8 @@ public class GetGoals : MonoBehaviour {
 		//needs current points counting toward this goal (daily?)
 		//needs the total required points for this goal
 		currentDayStr = System.DateTime.Now.ToString("MM/dd/yyyy");
-		barDisplay = Time.time*0.05f; //put actual progress here (current/total)
-
+		//barDisplay = Time.time*0.05f; //put actual progress here (current/total)
+		barDisplay = userSteps/totalSteps;
 		//failed to complete goal
 		if(currentDayStr != goalDayStr)
 		{
@@ -122,3 +135,4 @@ public class GetGoals : MonoBehaviour {
 		}
 	}
 }
+}
\ No newline at end of file
diff --git a/MoCha/ProjectSettings/ProjectVersion.txt b/MoCha/ProjectSettings/ProjectVersion.txt
index ac7d214..27997c5 100644
--- a/MoCha/ProjectSettings/ProjectVersion.txt
+++ b/MoCha/ProjectSettings/ProjectVersion.txt
@@ -1 +1 @@
-m_EditorVersion: 2017.4.0f1
+m_EditorVersion: 2017.3.1f1