From dde52effedb95dd4c2021e45c01d5939eeeaaa61 Mon Sep 17 00:00:00 2001
From: Alex Huddleston <adh9694@gmail.com>
Date: Sun, 29 Apr 2018 22:53:51 -0500
Subject: [PATCH] Second progress bar added. Now fills based on how much time
 is left in the day.

---
 .../Prefabs/Progress Bars & Text.prefab       | Bin 27968 -> 29456 bytes
 MoCha/Assets/Scenes/Goals.unity               | Bin 40160 -> 40160 bytes
 MoCha/Assets/Scenes/Home.unity                | Bin 95432 -> 89904 bytes
 MoCha/Assets/Scripts/GetGoals.cs              | 116 ++++++++++++------
 MoCha/ProjectSettings/ProjectVersion.txt      |   2 +-
 5 files changed, 78 insertions(+), 40 deletions(-)

diff --git a/MoCha/Assets/Prefabs/Progress Bars & Text.prefab b/MoCha/Assets/Prefabs/Progress Bars & Text.prefab
index 0f6213b7ccea69f250d066badc934f2bff948806..a511dc4616d36b141003bfd62d271f56da602a95 100644
GIT binary patch
delta 2907
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
HftddT>tdD2

delta 2309
zcmaKt4NwzD6oB8dAp`{lg(OH4LQEi{LK0CZB1EZ*R5A6ZqJjoX3<_vOsKK8m#j)eG
z{xF_k+ENECZPQ{$^wesr9YoX=w6&w7*eYUm5N*Ziw3e!!c5~)>H+H6%*}3Gq@9lf{
zvU^w4gIaz>GJx@3fHEThgaf39kuw-{`jo`vMBM?IP$pI{ZyLYm;S-HAzft<2wj(%=
z2*-hL2+s+isukJDNOdT(LMIdYDj6YUD5$rBC6pmX9h!~7xqy(r$q`F!OOPNHRVb98
z;nX&@BuY)LAZ8%&nZ<rn!<cc58PAy77tGaua|B~1Fy=^~sUO8N_W(H8k>3I`Mw8(?
z5c&9OeVYtlt%<%`Q4$p%D2dWB*PZ`5+x?E7aSV(zhUdIbzBl=uWX2iGIOAS$4*8uF
z#!2-#K`%XbsE4uRluHU<FR_-dtXxq9OP7_Fg2_}-p01u_u~%e(b!A~GRi@HYCRIc%
zccHS}Vt6?NEM>NeDk8$t%F<GDrax3Y2uE|Mt;w?;?LXB=2P6o<O<G*VWCKWBwQ=E-
z5&>uf04n_~_wvI-1DXZUz+>-heb}eDEdVJ7SmyV#r}ZYa5w@8yHg<1Xy809ZGA(9v
zTyuBCuN4J4z)AYP${*abAf`U2DiHb!V}o~AW`6s@+CZ?8cs4k3Xx4;+qk-V%G4IBN
zi-HTp6LPU<hAO^1+!qMFgt0mLwhkL`Um^r^kZ(T6^R-nvF=%Iek`THHEc6$%ZLsym
zk-0+17IBH)Q)0TNScKpqj4e>Cnss5;E+H6$xg?JptcfkO5RMYYc4kPpQrGsi5VQlh
z`RX0-U21=NRtRn$6z^|7{)4F&X$Jy?k-vp>9Qr?=bYR4+T9iswBg>L4zdUMj)uQZB
z03-28$Dz1LW9>d%i#8A9Jj2Q3f0=t~k!vu=ifV3{y-#bA!%em_JE7={l%6_49Xd+3
zILovdpO#G>Scg1AIQDaDS7>lt9qJs)u_*%6_c@7ms5gRRK<DL#7uBKuNPtoP0<|$$
zniuV_Ls|*L98A?KKB^7YT&qKQQZD$L6*k?e=v}Bdies0~Z)o|=unXCTacp<%2GKd|
zF0?tCW7V@)Z&75qkc&LGJfthWt^M8l+-rZ%bRn~x^PHO;_hwA9yO2!*pd%HM^#uFm
zf9wc77J(aL0DMmrvUVW1t8DEteI)kqSpJ=+_V%-p*vn&`<yC^1bCFo8<YG;yT2*_4
z#n{MWqdFeYzpKQ!*ujGl=dWa39V5myJQmlxwkygZ#z%Q<uYSqoLA%Aco5wC!nNM%m
zNU$iDOYC_=Lfy4Vu#U%`UGGc`*(kwze&+Dq-TJ)2{kQi>u#+b~espa5y3-Qu<}uy=
zR}SQBrT7Am_1)>ebudAS`+2OW)je;jUW%0}u9*HYF!O$j6le38y&&6hvpP$LZ3H%x
zLdfoedtEEtrmZrp91hUvXH(8@%YC<AhCPI_p6FNC)$~RgwyObLe$RYjaa&`H42Nkr
zwrKRY!)N+r*iD#kE%<T-?A0_lm2zy0Bm18XR^+L2+GFKd6wf7Yj$U{vYOWkN6UKV>
z>&MJ<&2pSg76;3`mWiL=T_wleJhniaH2>yja%>;Ld9Sq%X|&LC9G2i`BtHxqWpFq2
z$+4S2_U>BeMK>8l3Y<5R3qJVFK0C>vz+N7E^hxZ<i|GoynY_{1V$LL4PAs0Gz)JEq
zWA8XkWS(0+Ux9lGW4oHSaCG#f&U^)~N#qh&Xy252ZYi)ai4#*#=6rSJF$pG&O|pLC
zw04vfgPl71$oK?A^=GOn<%AGgG@%hu9$N^d%QR6flV!BpSP@FQbIm~^B66>}mNiP>
zD~s|PrF7}M5cFSKpSML2<lMw;Osb?{EH%AAN<~hH*pVrtj~DF2)P+T1lxMk;s+lgL
zy@lO~wih)ac_x{iKgdttaW9K(_eqp-sTT<-y)}iZuo|g`0wvvPU5Nibh&GkD1$2$g
G8SoFqH2c{A

diff --git a/MoCha/Assets/Scenes/Goals.unity b/MoCha/Assets/Scenes/Goals.unity
index 4bde3dbbbf8cfb2f0378a3fde909cf5dc23b5427..4292e3cf7d7592a8f51da0f323c2a00f0b69b331 100644
GIT binary patch
delta 14
WcmaE`lj*@urU}xFh8ty$%mDy0D+WOT

delta 14
WcmaE`lj*@urU}xF1{-CL%mDy0CI&zN

diff --git a/MoCha/Assets/Scenes/Home.unity b/MoCha/Assets/Scenes/Home.unity
index 7ef2903515ea0d96b69ba98bf234a3f5085185c3..a229a1d7d9ca78e54b77caca3aa84d20810cde99 100644
GIT binary patch
delta 7885
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
M3NrUx4_{*XFE82kZU6uP

delta 8989
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

diff --git a/MoCha/Assets/Scripts/GetGoals.cs b/MoCha/Assets/Scripts/GetGoals.cs
index d09c0e9..d61e680 100644
--- a/MoCha/Assets/Scripts/GetGoals.cs
+++ b/MoCha/Assets/Scripts/GetGoals.cs
@@ -7,32 +7,48 @@ using UnityEngine.UI;
 using System.Text;
 
 //Pretty much a copy of GetData...
-namespace PedometerU.Tests {
+namespace PedometerU.Tests
+{
+
+	public class GetGoals : MonoBehaviour
+	{
+		// Goals Progress Bar
+		public Image pbbg;
+		public Image pbf;
+
+		// Monster Progress Bar
+		public Image mpbbg;
+		public Image mpbf;
 
-	public class GetGoals : MonoBehaviour {
-		
-		public Image background;
-		public Image fill;
 		private string[] items = { "circle_eye", "crazy_hair", "circle_head", "gap_mouth", "pig_nose", "crown" };
 
+		// Display Text
 		public Text goalText;
+		public Text stepText;
+		public Text pointsText;
+		public Text remainingText;
+
+		// Goal information.
 		public string currentDayStr = System.DateTime.Now.ToString("MM/dd/yyyy");
 		public string goalDayStr = System.DateTime.Now.ToString("MM/dd/yyyy");
 		public string prefKey;
 
+		// Used for time calculation.
+		private int timeUsed;
+		private int timeRemaining;
+		private const int secondsperday = 86400;
+
 		//Progress Bar...
 		public float barDisplay; //current progress
 		//private Vector2 barPos;
+		// This gets overwritten later by the background's size values.
 		private Vector2 barSize = new Vector2(5000, 10);
 
 		//Pedometer
 		private Pedometer pedometer;
 		int userSteps;
 		int userPoints;
-		//double userDistance;
 		int stepsGoal = 100;
-		public Text stepText;
-		public Text pointsText;
 		private int savedSteps;
 		private int savedPoints;
 
@@ -58,9 +74,6 @@ namespace PedometerU.Tests {
 
 		void Start ()
 		{
-			fill.type = Image.Type.Filled;
-			fill.fillMethod = Image.FillMethod.Horizontal;
-			fill.type = Image.Type.Sliced;
 			savedSteps = PlayerPrefs.GetInt("currentSteps");
 			savedPoints = PlayerPrefs.GetInt("totalPoints");
 			// Create a new pedometer
@@ -85,9 +98,9 @@ namespace PedometerU.Tests {
 
 			//goalText.text = prefKey;
 			goalText.color = new Color(0f, 0f, 0f);
-				Debug.Log(background.rectTransform.anchoredPosition.x.ToString() + " " + background.rectTransform.anchoredPosition.y.ToString());
+				Debug.Log(pbbg.rectTransform.anchoredPosition.x.ToString() + " " + pbbg.rectTransform.anchoredPosition.y.ToString());
 
-				//barPos = new Vector2(background.transform.position.x, 1895 - background.transform.position.y);
+				//barPos = new Vector2(pbbg.transform.position.x, 1895 - pbbg.transform.position.y);
 
 			currentDayStr = System.DateTime.Now.ToString("MM/dd/yyyy");
 			goalDayStr = System.DateTime.Now.ToString("MM/dd/yyyy");
@@ -97,11 +110,6 @@ namespace PedometerU.Tests {
 				savePersistantGoalDate("daily");
 		}
 
-
-		//Texture the progress bar using these parameters
-		public Texture2D emptyTex;
-		public Texture2D fullTex;
-
 		//on a button press? begin a goal?
 		void startGoal()
 		{
@@ -119,45 +127,75 @@ namespace PedometerU.Tests {
 				return false;
 			return true;
 		}
-			/*
-		void OnGUI() {
-				Debug.Log (background.rectTransform.rect.width);
-				barSize = new Vector2 (background.rectTransform.rect.width, background.rectTransform.rect.height);
-			//draw the background:
-				GUI.BeginGroup(new Rect(barPos.x, barPos.y, barSize.x, barSize.y));
-				GUI.Box(new Rect(0,0, barSize.x, barSize.y), emptyTex);
-
-				//draw the filled-in part:
-				GUI.BeginGroup(new Rect(0,0, barSize.x * barDisplay, barSize.y));
-				GUI.Box(new Rect(0,0, barSize.x, barSize.y), fullTex);
-				GUI.EndGroup();
-			GUI.EndGroup();
-		}
-		*/
 
 		// Was used for testing.
-		//private float tempcounter = 0.1f;
+		private float tempcounter = 0.1f;
 
+		// Call this to update the goals progress bar.
 		public void updateProgressBar()
 		{
-			//Debug.Log (background.rectTransform.rect.width + " " + background.rectTransform.rect.height);
-			barSize.x = background.rectTransform.rect.width;
-			barSize.y = background.rectTransform.rect.height;
+			//Debug.Log (pbbg.rectTransform.rect.width + " " + pbbg.rectTransform.rect.height);
+			barSize.x = pbbg.rectTransform.rect.width;
 
 			//tempcounter += 0.0005f;
 
 			// resize the fill.
-			RectTransform temp = fill.rectTransform;
-			temp.sizeDelta = new Vector2 (barSize.x * barDisplay, barSize.y);
+			RectTransform temp = pbf.rectTransform;
+			//temp.sizeDelta = new Vector2 (-barSize.x + barSize.x * tempcounter, 0);
+			temp.sizeDelta = new Vector2 (-barSize.x + (barSize.x * barDisplay), 0);
 			temp.anchoredPosition = new Vector2 (temp.rect.width * 0.5f - (barSize.x * 0.5f),0);
 		}
 
+		// Call this to update the monster's progress bar.
+		public void updateMonsterProgressBar()
+		{
+			float fractionused = (float)(timeUsed) / (float)(secondsperday);
+			//Debug.Log (dayleft);
+
+			barSize.x = mpbbg.rectTransform.rect.width;
+
+			//tempcounter += 0.0005f;
+
+			// resize the fill.
+			RectTransform temp = mpbf.rectTransform;
+			//temp.sizeDelta = new Vector2 (-barSize.x + barSize.x * tempcounter, 0);
+			temp.sizeDelta = new Vector2 (-barSize.x + (barSize.x * fractionused), 0);
+			temp.anchoredPosition = new Vector2 (temp.rect.width * 0.5f - (barSize.x * 0.5f),0);
+		}
+
+		// Calculates the time remaining for the day.
+		// Will likely make a separate function for smaller timed goals if we have time.
+		public void updateTimeRemaining()
+		{
+			timeUsed = ((System.DateTime.Now.Hour * 60 * 60) + (System.DateTime.Now.Minute * 60) + System.DateTime.Now.Second);
+
+			timeRemaining =  secondsperday - timeUsed;
+		}
+
+		// Format the time remaining variable to a proper string.
+		public string formatTimeRemaining()
+		{
+			string output = "Time remaining: ";
+
+			output += "" + (timeRemaining / 3600);
+			output += ":" + (timeRemaining % 3600 / 60);
+			output += ":" + (timeRemaining % 60);
+
+			return output;
+		}
+
 		void Update()
 		{
+			updateTimeRemaining ();
 			updateProgressBar ();
+			updateMonsterProgressBar ();
+
 			//needs current points counting toward this goal (daily?)
 			//needs the total required points for this goal
 			currentDayStr = System.DateTime.Now.ToString("MM/dd/yyyy");
+
+			remainingText.text = formatTimeRemaining ();
+
 			//barDisplay = Time.time*0.05f; //put actual progress here (current/total)
 			barDisplay = (float)userSteps/(float)stepsGoal;
 
diff --git a/MoCha/ProjectSettings/ProjectVersion.txt b/MoCha/ProjectSettings/ProjectVersion.txt
index ac7d214..e3618f1 100644
--- a/MoCha/ProjectSettings/ProjectVersion.txt
+++ b/MoCha/ProjectSettings/ProjectVersion.txt
@@ -1 +1 @@
-m_EditorVersion: 2017.4.0f1
+m_EditorVersion: 2017.4.1f1