From 6b17d4a60d89229b3115b63abc8687c783f503a9 Mon Sep 17 00:00:00 2001 From: shadow8t4 Date: Thu, 26 Apr 2018 12:40:50 -0500 Subject: [PATCH] Make goals look nice. --- MoCha/Assets/Scenes/Goals.unity | Bin 30908 -> 48008 bytes MoCha/Assets/Scripts/GetGoals.cs | 13 ++++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/MoCha/Assets/Scenes/Goals.unity b/MoCha/Assets/Scenes/Goals.unity index 5333b1e135f8d75df9817a9c283fa63a3904413b..539c701b906b8f1a27d13f9683cc7326ece908b5 100644 GIT binary patch delta 9398 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 delta 1508 zcmZXTTS$~!6vy|TTa%8Z<=E(0ikBSAlM{`X9zrV+gX}0xSGw3s9f$+&cgv86gm&*7#!jBUwif!Mjx!b_W!rPz1RBI z+TW!)%k#fwx)9CvLbN;=LS$gx981rXS%bwHImW+hE~glkIse;@3l*^xBVKw)8Y^mN z)1=L?@2Hc~ZfyVYcbl{tg~2^m=`hahskcgLyxw1Bl@??Epx0?F5Q64U1w+2~tri3j zPK>|6+hC=dg~0}(?XWeP`K>~nfOf!oB9m%w57D*8Y zs)+|#Oj|=jq+vcj^ItZzX`JMNUjloh8J|=Hy%aXKtIrE3d|>C{Il-5j4S=14M&HCM z&8l(uUTBUuu2~e!Oy+e+LymX=FD+xcf4UG(G=oLpImmL&rokFn!!k9iMrM3qCd{qb z1F)T}VOg4SW_+2rC4-xTxLb%Z259zuNW*HRYxd62>>ZfdyWce9EX>w5_)AbrXs`fU z%2nk+)Yz6wEp64(K`+|sC_7X^(NGzcg(q-X{|O(KM)$cq3(ehMN>_SUlfQ2{9S^52 z6E#BAzY=5H#@|l*w;ny(wuSO9ep<<;__YKB9{ybO;cMulKO@;xcWJjVe|1LMxsrDJ zIhse^eICiPDmCVj>oMyorKhldR_TTqud|*}`bDf9dREcdSOHyo;)ag3dui+m?~k=_ zz<7i_G}Z3avwi)^nU|vdPHLod#reJK#HYQXa%v3QO8JNCIX1^mJ-D)B{|VYWac>oV zB_YgWI*g`{V-{@5G$y+~NUFWzq`gBP8#jt(u6o*UZ72T)7r7qBUHKwhV;cQ5RJgE= zBC_>s89zPzwv4M(2FZbgC(D@iXiJ)TZ}`t}(7|C`&_Q3n!g(kpvQ0V zR#C!(*``F5)~Kg?V<3@B9no|(|Cq>kb2BT~ud7VPPL2+mN)+U@^3C}n5ZJhGW5vQ% zq!D?_4Y0X6)%AY=cdL0++iA-Pe7k^sO(UvNDtK_jP5b&&sjoAcOb~0jVS3%qevxho zm3I}VE@%-Q?kdKo{WVgf-u8_aK{br7#n`IGyQ3R0|6{ZSqkOhjT~yw`u;pI>Q4(JD diff --git a/MoCha/Assets/Scripts/GetGoals.cs b/MoCha/Assets/Scripts/GetGoals.cs index 85d3e1a..6ffadb3 100644 --- a/MoCha/Assets/Scripts/GetGoals.cs +++ b/MoCha/Assets/Scripts/GetGoals.cs @@ -9,7 +9,8 @@ using UnityEngine.UI; namespace PedometerU.Tests { public class GetGoals : MonoBehaviour { - + + public Image background; public Text goalText; public string currentDayStr = System.DateTime.Now.ToString("MM/dd/yyyy"); public string goalDayStr = System.DateTime.Now.ToString("MM/dd/yyyy"); @@ -18,7 +19,7 @@ public class GetGoals : MonoBehaviour { //Progress Bar... public float barDisplay; //current progress private Vector2 barPos; - private Vector2 barSize = new Vector2(227,20); + private Vector2 barSize = new Vector2(725, 39); //Pedometer private Pedometer pedometer; @@ -76,8 +77,9 @@ public class GetGoals : MonoBehaviour { //goalText.text = prefKey; goalText.color = new Color(0f, 0f, 0f); - Debug.Log(goalText.transform.position.x.ToString() + " " + goalText.transform.position.y.ToString()); - barPos = new Vector2(goalText.transform.position.x, goalText.transform.position.y); + Debug.Log(background.rectTransform.anchoredPosition.x.ToString() + " " + background.rectTransform.anchoredPosition.y.ToString()); + + barPos = new Vector2(background.transform.position.x, 2135 - background.transform.position.y); currentDayStr = System.DateTime.Now.ToString("MM/dd/yyyy"); goalDayStr = System.DateTime.Now.ToString("MM/dd/yyyy"); @@ -109,7 +111,7 @@ public class GetGoals : MonoBehaviour { return false; return true; } - + // void OnGUI() { //draw the background: GUI.BeginGroup(new Rect(barPos.x, barPos.y, barSize.x, barSize.y)); @@ -122,6 +124,7 @@ public class GetGoals : MonoBehaviour { GUI.EndGroup(); } + void Update() { //needs current points counting toward this goal (daily?) //needs the total required points for this goal