From e5f5c08bef2ab8530d5c0768cc9f04c2ceccd3c9 Mon Sep 17 00:00:00 2001 From: shadow8t4 Date: Thu, 3 May 2018 20:56:07 -0500 Subject: [PATCH] Fixed Fitbit Login screen. --- MoCha/Assets/Prefabs/Navigation.prefab | Bin 40664 -> 43632 bytes MoCha/Assets/Scenes/FitbitLogin.unity | Bin 45888 -> 59120 bytes MoCha/Assets/Scripts/FitBitAPI.cs | 2 +- MoCha/Assets/Scripts/NavigationManager.cs | 3 ++- 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/MoCha/Assets/Prefabs/Navigation.prefab b/MoCha/Assets/Prefabs/Navigation.prefab index b782c45a0c5e846ae3c65583951893d783be4bf1..9fc7b8222bba9ace8fe28dd29bcefe866d1911cd 100644 GIT binary patch delta 3862 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 UGRW~rb&k9QkfReI=PZ!;Ki52<&;S4c delta 3030 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 CP?gL8 delta 2194 zcmZ{lZA_C_6vt1Y)dB^If))^4#WALUVqL(=q9BbdGf03X#F+>pQm0d9x<#i3mu!pK zTb$>^Oy(jVT!s@vZ5LXcA`F*Qz=W|l69ot2+ZI1yvSi&0+5YF@KC6Uzlc&$UzjK~* z&pG#;+lgz@-S?xcL?8T2aFUZECU-lGSrE}N zFx}~UidpfI?(}`dTESK+rynRbnke>~r@Ve)`Sw*}(2OijL=!7< zH9c!G(HmGxbk8Yv6inZEsbY?l$i~YQtC<%GB)&QQY&~qy5kTEwf?{E?CdiOAN>t2^ z!z#rZCrsNaN4MieUNAk?^@cPbVJ(~J6oV&-Qfnf_KWn*}AUS9J_e zwl~I%9%z@H$i!cG(|FwbGW*UulQKJKvhCm}8_!jrjCr*7P;>hdLzqRZ*&vp@>P|m&a<<= zx?#VEII-s?qg)v59h%3nfh@i|GM8WV#m%9$M6-K|y1R+)mSC$At_@^Q>3$TrlKND) z_=oT8X>zocuIg7R%N^@CmAV|U8#cMB9A&Ob7oyCXvXbv}@S&f~JRDq+D0feZXV2CR z4W80EPaWKHacyTD2Zj>)=D~naKt-QQE z&hIIR*9%^{&cqp^0)zb8*%Pv1_OZ5}4B1onLoW7mSK#M~VdBY9X3Enf_SCnb`~T9{ zugYFuUbQDVpRgxW6UX;0PTP+wpK@0^SLZ!HT`uCx6gjh%1uLhCOnjg(oooAyDRK|w z7CNUnD^h!^6i#kF%uf4KHXXyap*{(Ftk0?a+BmmAUCrvW+2Q`>SfA^6E)hE|jlauF z8!~AspR8Y2y+B+exwBCp4(*_}^xomMJ`>*>TBM!rV6T~*u5@cb%;*Q69Lr?)_oY1C z8w>3O-gy1**^)!_9v64yqR>9$&wJwd_N6pKG_Ss4H%hl~c30-Knkt)7Q~uzMV066X z=G0R0k;vdbd~2%#7pja<32u6{N?9rHGdxp+!^1&U+ZMKTS*-faB4YU$;-c#|Zt|Ot z-!6i?W(n9|dfOK@En>%5=&8}x^RdwcEmCQrlXq6|?twz~Ub1Pqa*W4u|ELx%SBxhc erDAz>WWFBjk-fb{M`y&!j&ZYpaC}Dp0RIcM@cPvN diff --git a/MoCha/Assets/Scripts/FitBitAPI.cs b/MoCha/Assets/Scripts/FitBitAPI.cs index fb44361..0877b91 100644 --- a/MoCha/Assets/Scripts/FitBitAPI.cs +++ b/MoCha/Assets/Scripts/FitBitAPI.cs @@ -73,7 +73,7 @@ namespace Assets.Scripts.Fitbit { _bFirstFire = false; } - GUI.Label(new Rect(10, 10, 100, 20), "Calories: " + _fitbitData.CurrentCalories); + //GUI.Label(new Rect(10, 10, 100, 20), "Calories: " + _fitbitData.CurrentCalories); } public void LoginToFitbit() diff --git a/MoCha/Assets/Scripts/NavigationManager.cs b/MoCha/Assets/Scripts/NavigationManager.cs index a3ea4cf..81b92ec 100644 --- a/MoCha/Assets/Scripts/NavigationManager.cs +++ b/MoCha/Assets/Scripts/NavigationManager.cs @@ -78,7 +78,8 @@ public class NavigationManager : MonoBehaviour { string currentscene = SceneManager.GetActiveScene ().name; - switch(currentscene) { + switch(currentscene) + { case "Main": Application.Quit(); break;