From 2488056bb4d9a48f9600b663e62d06f1ee2d6f1b Mon Sep 17 00:00:00 2001
From: calvinstanford <cstanford342@gmail.com>
Date: Mon, 21 May 2018 14:13:45 +1200
Subject: [PATCH 1/5] Set up ProgressBar types

---
 .vs/LifeApp/v15/.suo             | Bin 265728 -> 345600 bytes
 LifeApp/LifeApp/MainPage.xaml    |   8 +++----
 LifeApp/LifeApp/MainPage.xaml.cs |  39 ++++++++++++++++++++++++++++++-
 3 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/.vs/LifeApp/v15/.suo b/.vs/LifeApp/v15/.suo
index 4e9839461ff533cb3c4aab956c378a488c3bb14b..3347c67d66d5b8e26d60e167e3dead7c48be7d52 100644
GIT binary patch
delta 3540
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

delta 3988
zcmeI#dsI}%9S86`Gk0NmXh5DCl!c}VRg8#=3!+>Qff}nz-TKJ!^pu>YHL12~x}2uR
z)5A&{V-lLcPRo$glDMXjv}r5c$fl{b>nkB93e^~G8Yw{~Xbnb-Mzlh|zhxK6IZgl6
z{?Xa<+4;@fxsRRw-JQGcngsWjnA)tFTByWmS_EPNL&L+v)XgA+Y6OX>CxFpX5yc}6
zbMCWg=Z~;)W+h+BA_5~V*s40`vW#&bBclDNgiEH!Ro#V%j+%hl2DgC~CPOUr;0)M2
z9ELa<=vdd$o{0JrY>N)IX^h54jzw`K`o92lY$~@Sjsl8PQKyf@k<<>96uO+rcL#^e
zKs_rMhep`zD&j1;=q#(NxSd_E`+jQq;^2^bP%nY6z*1NS4k(AO!g6rJ*I)&#gjKK_
z?u9i#r`cFn@r;MBi*R?%`TSXw1L5&i;n;)bfj%G2A?+QS!%1k<98zCs4ry+vO(isk
zcVJ9t4ym8!oN6jM;<0l$9&MV#B*1wSM<+2f!L-x=%p7{7xi^QmM(^V~eGp~q5jL5{
zqvgPOhm{hUrYDe+rt3B*)2D=*av;X3XNOv*EB0wFd18^3J{{c=fqkUQ*=eOjpbQE2
zB)M6pc_}GM_u9B8%NhID<)p_??{YP4Soz@kNssz2Xh<IOk*v+kdnZ>H!}LTmF+Gx-
zwkh2#fd{`Efm#O(#I;mB&+6PuycxP@L9vy-Zn_DBXIrpL?scq|DFt^~7~L5+KA@|>
zVWsbl?u)?Ssv1PwfJ$}nZh92;Pv9}w1dqdJcmke;r=SLY3Qxl`Pz!b70SP~YpF=$;
zXn<$oIrs%^fnPGMN^3;$JiGu~!3*2qMfepoK{LDrFT=0lH}DGl7Jdi6hwab;tzg2d
zumjq_2d}{&;C1*T?1WvcO4I&?;LqTP-LMDt!amp!Z@`<-4sXE$cpKh<gK!8spcDQA
zhv5jk3rFESI0nbzukb$n4L*PqRe0-yze6{C2z1Y!M12ZQLoa*;eQ*ZO!av{~d<^|?
z9-hNjcmefA_$Lg&CAbWq!W9^Vt8fke1u@s@4Lec_Q}HC1=?l;frc&}UxlqiM1If!G
z7;T<^W7EVM)p}iI%bN6b)0zE>K<aw!VWI3j%e;nObqg|TY(iDtf{YrQP{^*Eo>BNd
zM-z&&>t<&ZB^3Q&Qnu*y<}J}<c23*0^PT*%)Rnu6igp}om@8xQW?K!6qD3W`YI&Vj
z$}ZcDo_RH%nD)>6^_8yJ8c%t;OwUiF6g6G>HO%YKJ;@6rSOJbPHi;dwI6n(X+#&bo
zWk=%zTQPu&MV8MmFb$iZdF;jdRP>DgR<hHw(!Ml8%S0!w`+=)u_sC23<+9zL$x6)1
z)lYFxe7im`v{eqozpGCVwW8=gMuUpncyF3%`+B$V7z^oY*~_xh7-lDBWnoohDF)Dr
zgJDC9O04M!?u6j9lyq3w7pXbAO1VmdH)BR<R1~f0@qi+SEB0IGAfWYo<QM~Gj=&N{
zPdp<ZqfAzQc`02;)VI+$G;(%zVK>V)?Q8QnTP!ObNA$GNc<CyyZCTsE%<b!)9B(n)
z`><}!Ua{PPxzv15e!#CpZQHt@H&^%Z@oK_8e$G6%DV{Y~U*=q8w^Oq|KCQX>3YtB8
zSh8IAVTvj_z+L7`udl+eV!cfD>}PAtHHTlMrpRi_VK|ygOlVuoig|sCSf{4^m}RT}
zjjWGazSlO3SLaDvYhv3Q!q9nlzpR*+ibdQi{Wg69E#jXos^FMNkkPhG<vu1JNHV{-
zL@$kx<#hd2XqkLs_<o;pKo~-~4+%rHye%B6^Pt#Xe^5N=o7y3gENXYJC{XUBLRU>6
zi7eH1N<@bT51}rc5~-^9sF+lLR5+ElSENUj;iwz5g<7FZ;|Z##S7c&zV7w~r6S*T#
zANnzouZ;J^H<ay+urY?Qamsl{WVRg_Khoz@9@8!)af$YT_ATvxtx$Uiue-G$XzR4^
z{+CT^+6l2jy?IH@Vmp+d;`$R}YO~QLxbmMAZlBRD+`?y^5{E6NMVeh(q|L<jmS|bp
zTy45G8}%HVjG`j+WFsoV2)mYxs1Pq2F$;UmL6n0!SIbemy2O`M^;waR2Nj?HtT31w
zHy~n^<D7Vi)yR$03Yz^H7NKhU#YDB?yjY|fGcD=Le_ps%>~u?>Z_6j*4z3z!Q0GNl
zq<@Cxha#H(NrZ~;^kuP~#nWR<sL(ITY*68YVutF!CL)zFD3+_ZK`~wV2SwnSRg;A?
z6O<9D+eUX?)e)&Fca)yTb90n&O=PIPt0KACeN8a=aC4Dw&jL%MMcv1_t=Vn2Ab)qW
zGBw`MYgJYeOHq;S+$D|57v!45DYEZ`%WOElmigR~x?6ZM+}`)6Zo0~vuJXvhQb>>F
zH}T=>|4ZSmUkZnC-wuPoUo2JkP4SrO{tlbuYYY?jecG01aq|E8U%>ZBzGbtROppGQ
WGh-k9!_XHFL*~}?Cs|XNZv8hl+b6XE

diff --git a/LifeApp/LifeApp/MainPage.xaml b/LifeApp/LifeApp/MainPage.xaml
index 2699420..f35444f 100644
--- a/LifeApp/LifeApp/MainPage.xaml
+++ b/LifeApp/LifeApp/MainPage.xaml
@@ -41,7 +41,7 @@
             Text = "Fitness"
             Grid.Row="1"
             Grid.Column="0"/>
-            <ProgressBar x:Name="fitness" 
+            <ProgressBar x:Name="FitnessBar" 
                 Progress="0.1" 
                 Scale="1.0"
                 Grid.Row="2"
@@ -52,7 +52,7 @@
             Text = "Intellect"
             Grid.Row="1"
             Grid.Column="1"/>
-            <ProgressBar x:Name="intellect" 
+            <ProgressBar x:Name="IntellectBar" 
                 Progress="0.7" 
                 Scale="1.0"
                 Grid.Row="2"
@@ -63,7 +63,7 @@
             Text = "Social"
             Grid.Row="3"
             Grid.Column="0"/>
-            <ProgressBar x:Name="Social" 
+            <ProgressBar x:Name="SocialBar" 
                 Progress="0.3" 
                 Scale="1.0"
                 Grid.Row="4"
@@ -74,7 +74,7 @@
             Text = "Financial"
             Grid.Row="3"
             Grid.Column="1"/>
-            <ProgressBar x:Name="Financial" 
+            <ProgressBar x:Name="FinancialBar" 
                 Progress="0.9" 
                 Scale="1.0"
                 Grid.Row="4"
diff --git a/LifeApp/LifeApp/MainPage.xaml.cs b/LifeApp/LifeApp/MainPage.xaml.cs
index 0563049..fbc718d 100644
--- a/LifeApp/LifeApp/MainPage.xaml.cs
+++ b/LifeApp/LifeApp/MainPage.xaml.cs
@@ -20,10 +20,47 @@ async void OnButtonClicked(object sender, EventArgs args)
             Label User = this.FindByName<Label>("User");
             User.Text = "Calvin";
             Label Level = this.FindByName<Label>("Level");
-            
+            String tasktype1 = "Fitness";
+            String tasktype2 = "Social";
             
             ProgressBar MainLevel = this.FindByName<ProgressBar>("MainLevel");
+            ProgressBar FitnessBar = this.FindByName<ProgressBar>("FitnessBar");
+            ProgressBar SocialBar = this.FindByName<ProgressBar>("SocialBar");
+            ProgressBar FinancialBar = this.FindByName<ProgressBar>("FinancialBar");
+            ProgressBar IntellectBar = this.FindByName<ProgressBar>("IntellectBar");
             await MainLevel.ProgressTo(MainLevel.Progress+.2, 250, Easing.Linear);
+            if(tasktype1 == "Fitness" || tasktype2 == "Fitness")
+            {
+                await FitnessBar.ProgressTo(FitnessBar.Progress+ .1, 100, Easing.Linear);
+            }
+            else
+            {
+                await FitnessBar.ProgressTo(FitnessBar.Progress - .1, 100, Easing.Linear);
+            }
+            if (tasktype1 == "Intellect" || tasktype2 == "Intellect")
+            {
+                await IntellectBar.ProgressTo(IntellectBar.Progress + .1, 100, Easing.Linear);
+            }
+            else
+            {
+                await IntellectBar.ProgressTo(IntellectBar.Progress - .1, 100, Easing.Linear);
+            }
+            if (tasktype1 == "Social" || tasktype2 == "Social")
+            {
+                await SocialBar.ProgressTo(SocialBar.Progress + .1, 100, Easing.Linear);
+            }
+            else
+            {
+                await SocialBar.ProgressTo(SocialBar.Progress - .1, 100, Easing.Linear);
+            }
+            if (tasktype1 == "Financial" || tasktype2 == "Financial")
+            {
+                await FinancialBar.ProgressTo(FinancialBar.Progress + .1, 100, Easing.Linear);
+            }
+            else
+            {
+                await FinancialBar.ProgressTo(FinancialBar.Progress - .1, 100, Easing.Linear);
+            }
             if (MainLevel.Progress == 1)
             {
                 User.Text = "Level up";

From 35601211540460d6def76758dbfd0caf25f764b3 Mon Sep 17 00:00:00 2001
From: calvinstanford <cstanford342@gmail.com>
Date: Wed, 23 May 2018 11:55:14 +1200
Subject: [PATCH 2/5] Can check if progress is within range of 1

---
 LifeApp/LifeApp/MainPage.xaml.cs | 83 ++++++++++++++++++++++++++------
 1 file changed, 69 insertions(+), 14 deletions(-)

diff --git a/LifeApp/LifeApp/MainPage.xaml.cs b/LifeApp/LifeApp/MainPage.xaml.cs
index fbc718d..8b807e8 100644
--- a/LifeApp/LifeApp/MainPage.xaml.cs
+++ b/LifeApp/LifeApp/MainPage.xaml.cs
@@ -20,8 +20,7 @@ async void OnButtonClicked(object sender, EventArgs args)
             Label User = this.FindByName<Label>("User");
             User.Text = "Calvin";
             Label Level = this.FindByName<Label>("Level");
-            String tasktype1 = "Fitness";
-            String tasktype2 = "Social";
+            String tasktype = "Fitness";
             
             ProgressBar MainLevel = this.FindByName<ProgressBar>("MainLevel");
             ProgressBar FitnessBar = this.FindByName<ProgressBar>("FitnessBar");
@@ -29,37 +28,93 @@ async void OnButtonClicked(object sender, EventArgs args)
             ProgressBar FinancialBar = this.FindByName<ProgressBar>("FinancialBar");
             ProgressBar IntellectBar = this.FindByName<ProgressBar>("IntellectBar");
             await MainLevel.ProgressTo(MainLevel.Progress+.2, 250, Easing.Linear);
-            if(tasktype1 == "Fitness" || tasktype2 == "Fitness")
+            if(tasktype == "Fitness")
             {
-                await FitnessBar.ProgressTo(FitnessBar.Progress+ .1, 100, Easing.Linear);
+                if(FitnessBar.Progress>=0.85)
+                {
+                    double progresscalc = 1.0 - FitnessBar.Progress;
+                    await FitnessBar.ProgressTo(FitnessBar.Progress + progresscalc, 100, Easing.Linear);
+                    progresscalc = progresscalc / 3;
+                    await IntellectBar.ProgressTo(IntellectBar.Progress - progresscalc, 100, Easing.Linear);
+                    await SocialBar.ProgressTo(SocialBar.Progress - progresscalc, 100, Easing.Linear);
+                    await FinancialBar.ProgressTo(FinancialBar.Progress - progresscalc, 100, Easing.Linear);
+
+                }
+                else
+                {
+                    await FitnessBar.ProgressTo(FitnessBar.Progress + .15, 100, Easing.Linear);
+                }
+                
             }
             else
             {
-                await FitnessBar.ProgressTo(FitnessBar.Progress - .1, 100, Easing.Linear);
+                await FitnessBar.ProgressTo(FitnessBar.Progress - .05, 100, Easing.Linear);
             }
-            if (tasktype1 == "Intellect" || tasktype2 == "Intellect")
+            if (tasktype == "Intellect")
             {
-                await IntellectBar.ProgressTo(IntellectBar.Progress + .1, 100, Easing.Linear);
+                if (IntellectBar.Progress >= 0.85)
+                {
+                    double progresscalc = 1.0 - IntellectBar.Progress;
+                    await IntellectBar.ProgressTo(IntellectBar.Progress + progresscalc, 100, Easing.Linear);
+                    progresscalc = progresscalc / 3;
+                    await FitnessBar.ProgressTo(FitnessBar.Progress - progresscalc, 100, Easing.Linear);
+                    await SocialBar.ProgressTo(SocialBar.Progress - progresscalc, 100, Easing.Linear);
+                    await FinancialBar.ProgressTo(FinancialBar.Progress - progresscalc, 100, Easing.Linear);
+
+                }
+                else
+                {
+                    await IntellectBar.ProgressTo(IntellectBar.Progress + .15, 100, Easing.Linear);
+                }
+               
             }
             else
             {
-                await IntellectBar.ProgressTo(IntellectBar.Progress - .1, 100, Easing.Linear);
+                await IntellectBar.ProgressTo(IntellectBar.Progress - .05, 100, Easing.Linear);
             }
-            if (tasktype1 == "Social" || tasktype2 == "Social")
+            if (tasktype == "Social")
             {
-                await SocialBar.ProgressTo(SocialBar.Progress + .1, 100, Easing.Linear);
+                if (SocialBar.Progress >= 0.85)
+                {
+                    double progresscalc = 1.0 - SocialBar.Progress;
+                    await SocialBar.ProgressTo(SocialBar.Progress + progresscalc, 100, Easing.Linear);
+                    progresscalc = progresscalc / 3;
+                    await IntellectBar.ProgressTo(IntellectBar.Progress - progresscalc, 100, Easing.Linear);
+                    await FitnessBar.ProgressTo(FitnessBar.Progress - progresscalc, 100, Easing.Linear);
+                    await FinancialBar.ProgressTo(FinancialBar.Progress - progresscalc, 100, Easing.Linear);
+
+                }
+                else
+                {
+                    await SocialBar.ProgressTo(SocialBar.Progress + .15, 100, Easing.Linear);
+                }
+                
             }
             else
             {
-                await SocialBar.ProgressTo(SocialBar.Progress - .1, 100, Easing.Linear);
+                await SocialBar.ProgressTo(SocialBar.Progress - .05, 100, Easing.Linear);
             }
-            if (tasktype1 == "Financial" || tasktype2 == "Financial")
+            if (tasktype == "Financial")
             {
-                await FinancialBar.ProgressTo(FinancialBar.Progress + .1, 100, Easing.Linear);
+                if (FinancialBar.Progress >= 0.85)
+                {
+                    double progresscalc = 1.0 - FitnessBar.Progress;
+                    await FinancialBar.ProgressTo(FinancialBar.Progress + progresscalc, 100, Easing.Linear);
+                    progresscalc = progresscalc / 3;
+                    await IntellectBar.ProgressTo(IntellectBar.Progress - progresscalc, 100, Easing.Linear);
+                    await SocialBar.ProgressTo(SocialBar.Progress - progresscalc, 100, Easing.Linear);
+                    await FitnessBar.ProgressTo(FitnessBar.Progress - progresscalc, 100, Easing.Linear);
+
+                }
+                else
+                {
+                    await FinancialBar.ProgressTo(FinancialBar.Progress + .15, 100, Easing.Linear);
+                }
+                
             }
             else
             {
-                await FinancialBar.ProgressTo(FinancialBar.Progress - .1, 100, Easing.Linear);
+                await FinancialBar.ProgressTo(FinancialBar.Progress - .05, 100, Easing.Linear);
             }
             if (MainLevel.Progress == 1)
             {

From 2f302765c99ca9fa552e6ae6e24bcd07cb12ae47 Mon Sep 17 00:00:00 2001
From: calvinstanford <cstanford342@gmail.com>
Date: Wed, 6 Jun 2018 14:21:49 +1200
Subject: [PATCH 3/5] Fitness Test

---
 LifeApp/LifeApp/MainPage.xaml.cs | 65 +++++++++++++++++---------------
 1 file changed, 35 insertions(+), 30 deletions(-)

diff --git a/LifeApp/LifeApp/MainPage.xaml.cs b/LifeApp/LifeApp/MainPage.xaml.cs
index 8b807e8..7acd228 100644
--- a/LifeApp/LifeApp/MainPage.xaml.cs
+++ b/LifeApp/LifeApp/MainPage.xaml.cs
@@ -28,29 +28,37 @@ async void OnButtonClicked(object sender, EventArgs args)
             ProgressBar FinancialBar = this.FindByName<ProgressBar>("FinancialBar");
             ProgressBar IntellectBar = this.FindByName<ProgressBar>("IntellectBar");
             await MainLevel.ProgressTo(MainLevel.Progress+.2, 250, Easing.Linear);
+            double progression_main = 0.15;
+            double progression_sub = 0.05;
+            double progression_calc = 0.0;
             if(tasktype == "Fitness")
             {
-                if(FitnessBar.Progress>=0.85)
+                if (FitnessBar.Progress >= 0.85)
                 {
-                    double progresscalc = 1.0 - FitnessBar.Progress;
-                    await FitnessBar.ProgressTo(FitnessBar.Progress + progresscalc, 100, Easing.Linear);
-                    progresscalc = progresscalc / 3;
-                    await IntellectBar.ProgressTo(IntellectBar.Progress - progresscalc, 100, Easing.Linear);
-                    await SocialBar.ProgressTo(SocialBar.Progress - progresscalc, 100, Easing.Linear);
-                    await FinancialBar.ProgressTo(FinancialBar.Progress - progresscalc, 100, Easing.Linear);
-
+                    progression_main = 1.0 - FitnessBar.Progress;
+                    progression_sub = progression_main / 3;
                 }
-                else
+                if(IntellectBar.Progress <=progression_sub)
                 {
-                    await FitnessBar.ProgressTo(FitnessBar.Progress + .15, 100, Easing.Linear);
+                    progression_calc = progression_sub - IntellectBar.Progress;
+                    progression_sub = progression_sub + (progression_calc / 2);
                 }
-                
-            }
-            else
-            {
-                await FitnessBar.ProgressTo(FitnessBar.Progress - .05, 100, Easing.Linear);
+                if (SocialBar.Progress <= progression_sub)
+                {
+                    progression_calc = progression_sub - SocialBar.Progress;
+                    progression_sub = progression_sub + (progression_calc / 2);
+                }
+                if (FinancialBar.Progress <= progression_sub)
+                {
+                    progression_calc = progression_sub - FinancialBar.Progress;
+                    progression_sub = progression_sub + (progression_calc / 2);
+                }
+                await IntellectBar.ProgressTo(IntellectBar.Progress - progression_sub, 100, Easing.Linear);
+                await SocialBar.ProgressTo(SocialBar.Progress - progression_sub, 100, Easing.Linear);
+                await FinancialBar.ProgressTo(FinancialBar.Progress - progression_sub, 100, Easing.Linear);
+                await FitnessBar.ProgressTo(FitnessBar.Progress + progression_main, 100, Easing.Linear);   
             }
-            if (tasktype == "Intellect")
+            else if (tasktype == "Intellect")
             {
                 if (IntellectBar.Progress >= 0.85)
                 {
@@ -66,13 +74,18 @@ async void OnButtonClicked(object sender, EventArgs args)
                 {
                     await IntellectBar.ProgressTo(IntellectBar.Progress + .15, 100, Easing.Linear);
                 }
-               
-            }
-            else
-            {
-                await IntellectBar.ProgressTo(IntellectBar.Progress - .05, 100, Easing.Linear);
+                
+                    if (IntellectBar.Progress <= 0.05)
+                    {
+
+                    }
+                    else
+                    {
+                        await IntellectBar.ProgressTo(IntellectBar.Progress - .05, 100, Easing.Linear);
+                    }
+
             }
-            if (tasktype == "Social")
+            else if (tasktype == "Social")
             {
                 if (SocialBar.Progress >= 0.85)
                 {
@@ -91,10 +104,6 @@ async void OnButtonClicked(object sender, EventArgs args)
                 
             }
             else
-            {
-                await SocialBar.ProgressTo(SocialBar.Progress - .05, 100, Easing.Linear);
-            }
-            if (tasktype == "Financial")
             {
                 if (FinancialBar.Progress >= 0.85)
                 {
@@ -112,10 +121,6 @@ async void OnButtonClicked(object sender, EventArgs args)
                 }
                 
             }
-            else
-            {
-                await FinancialBar.ProgressTo(FinancialBar.Progress - .05, 100, Easing.Linear);
-            }
             if (MainLevel.Progress == 1)
             {
                 User.Text = "Level up";

From 08b9b852e40907831ac0a5b5fecacfabc0b91787 Mon Sep 17 00:00:00 2001
From: calvinstanford <cstanford342@gmail.com>
Date: Wed, 6 Jun 2018 14:40:48 +1200
Subject: [PATCH 4/5] Progression Complete

---
 LifeApp/LifeApp/MainPage.xaml.cs | 96 +++++++++++++++++++-------------
 1 file changed, 57 insertions(+), 39 deletions(-)

diff --git a/LifeApp/LifeApp/MainPage.xaml.cs b/LifeApp/LifeApp/MainPage.xaml.cs
index 7acd228..ff44231 100644
--- a/LifeApp/LifeApp/MainPage.xaml.cs
+++ b/LifeApp/LifeApp/MainPage.xaml.cs
@@ -62,64 +62,82 @@ async void OnButtonClicked(object sender, EventArgs args)
             {
                 if (IntellectBar.Progress >= 0.85)
                 {
-                    double progresscalc = 1.0 - IntellectBar.Progress;
-                    await IntellectBar.ProgressTo(IntellectBar.Progress + progresscalc, 100, Easing.Linear);
-                    progresscalc = progresscalc / 3;
-                    await FitnessBar.ProgressTo(FitnessBar.Progress - progresscalc, 100, Easing.Linear);
-                    await SocialBar.ProgressTo(SocialBar.Progress - progresscalc, 100, Easing.Linear);
-                    await FinancialBar.ProgressTo(FinancialBar.Progress - progresscalc, 100, Easing.Linear);
-
+                    progression_main = 1.0 - IntellectBar.Progress;
+                    progression_sub = progression_main / 3;
                 }
-                else
+                if (FitnessBar.Progress <= progression_sub)
                 {
-                    await IntellectBar.ProgressTo(IntellectBar.Progress + .15, 100, Easing.Linear);
+                    progression_calc = progression_sub - FitnessBar.Progress;
+                    progression_sub = progression_sub + (progression_calc / 2);
                 }
-                
-                    if (IntellectBar.Progress <= 0.05)
-                    {
-
-                    }
-                    else
-                    {
-                        await IntellectBar.ProgressTo(IntellectBar.Progress - .05, 100, Easing.Linear);
-                    }
-
+                if (SocialBar.Progress <= progression_sub)
+                {
+                    progression_calc = progression_sub - SocialBar.Progress;
+                    progression_sub = progression_sub + (progression_calc / 2);
+                }
+                if (FinancialBar.Progress <= progression_sub)
+                {
+                    progression_calc = progression_sub - FinancialBar.Progress;
+                    progression_sub = progression_sub + (progression_calc / 2);
+                }
+                await FitnessBar.ProgressTo(FitnessBar.Progress - progression_sub, 100, Easing.Linear);
+                await SocialBar.ProgressTo(SocialBar.Progress - progression_sub, 100, Easing.Linear);
+                await FinancialBar.ProgressTo(FinancialBar.Progress - progression_sub, 100, Easing.Linear);
+                await IntellectBar.ProgressTo(IntellectBar.Progress + progression_main, 100, Easing.Linear);
             }
             else if (tasktype == "Social")
             {
                 if (SocialBar.Progress >= 0.85)
                 {
-                    double progresscalc = 1.0 - SocialBar.Progress;
-                    await SocialBar.ProgressTo(SocialBar.Progress + progresscalc, 100, Easing.Linear);
-                    progresscalc = progresscalc / 3;
-                    await IntellectBar.ProgressTo(IntellectBar.Progress - progresscalc, 100, Easing.Linear);
-                    await FitnessBar.ProgressTo(FitnessBar.Progress - progresscalc, 100, Easing.Linear);
-                    await FinancialBar.ProgressTo(FinancialBar.Progress - progresscalc, 100, Easing.Linear);
-
+                    progression_main = 1.0 - SocialBar.Progress;
+                    progression_sub = progression_main / 3;
                 }
-                else
+                if (IntellectBar.Progress <= progression_sub)
                 {
-                    await SocialBar.ProgressTo(SocialBar.Progress + .15, 100, Easing.Linear);
+                    progression_calc = progression_sub - IntellectBar.Progress;
+                    progression_sub = progression_sub + (progression_calc / 2);
                 }
-                
+                if (FitnessBar.Progress <= progression_sub)
+                {
+                    progression_calc = progression_sub - FitnessBar.Progress;
+                    progression_sub = progression_sub + (progression_calc / 2);
+                }
+                if (FinancialBar.Progress <= progression_sub)
+                {
+                    progression_calc = progression_sub - FinancialBar.Progress;
+                    progression_sub = progression_sub + (progression_calc / 2);
+                }
+                await IntellectBar.ProgressTo(IntellectBar.Progress - progression_sub, 100, Easing.Linear);
+                await FitnessBar.ProgressTo(FitnessBar.Progress - progression_sub, 100, Easing.Linear);
+                await FinancialBar.ProgressTo(FinancialBar.Progress - progression_sub, 100, Easing.Linear);
+                await SocialBar.ProgressTo(SocialBar.Progress + progression_main, 100, Easing.Linear);
             }
             else
             {
                 if (FinancialBar.Progress >= 0.85)
                 {
-                    double progresscalc = 1.0 - FitnessBar.Progress;
-                    await FinancialBar.ProgressTo(FinancialBar.Progress + progresscalc, 100, Easing.Linear);
-                    progresscalc = progresscalc / 3;
-                    await IntellectBar.ProgressTo(IntellectBar.Progress - progresscalc, 100, Easing.Linear);
-                    await SocialBar.ProgressTo(SocialBar.Progress - progresscalc, 100, Easing.Linear);
-                    await FitnessBar.ProgressTo(FitnessBar.Progress - progresscalc, 100, Easing.Linear);
-
+                    progression_main = 1.0 - FinancialBar.Progress;
+                    progression_sub = progression_main / 3;
+                }
+                if (IntellectBar.Progress <= progression_sub)
+                {
+                    progression_calc = progression_sub - IntellectBar.Progress;
+                    progression_sub = progression_sub + (progression_calc / 2);
                 }
-                else
+                if (SocialBar.Progress <= progression_sub)
                 {
-                    await FinancialBar.ProgressTo(FinancialBar.Progress + .15, 100, Easing.Linear);
+                    progression_calc = progression_sub - SocialBar.Progress;
+                    progression_sub = progression_sub + (progression_calc / 2);
                 }
-                
+                if (FitnessBar.Progress <= progression_sub)
+                {
+                    progression_calc = progression_sub - FitnessBar.Progress;
+                    progression_sub = progression_sub + (progression_calc / 2);
+                }
+                await IntellectBar.ProgressTo(IntellectBar.Progress - progression_sub, 100, Easing.Linear);
+                await SocialBar.ProgressTo(SocialBar.Progress - progression_sub, 100, Easing.Linear);
+                await FitnessBar.ProgressTo(FitnessBar.Progress - progression_sub, 100, Easing.Linear);
+                await FinancialBar.ProgressTo(FinancialBar.Progress + progression_main, 100, Easing.Linear);
             }
             if (MainLevel.Progress == 1)
             {

From 73733b58f2b6532dac5b7bab865cd7352375de9b Mon Sep 17 00:00:00 2001
From: calvinstanford <cstanford342@gmail.com>
Date: Mon, 11 Jun 2018 12:28:37 +1200
Subject: [PATCH 5/5] Final change

---
 LifeApp/LifeApp/MainPage.xaml    |  4 +--
 LifeApp/LifeApp/MainPage.xaml.cs | 58 ++++++++++++++++----------------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/LifeApp/LifeApp/MainPage.xaml b/LifeApp/LifeApp/MainPage.xaml
index f35444f..8658297 100644
--- a/LifeApp/LifeApp/MainPage.xaml
+++ b/LifeApp/LifeApp/MainPage.xaml
@@ -41,7 +41,7 @@
             Text = "Fitness"
             Grid.Row="1"
             Grid.Column="0"/>
-            <ProgressBar x:Name="FitnessBar" 
+            <ProgressBar x:Name="PhysicalBar" 
                 Progress="0.1" 
                 Scale="1.0"
                 Grid.Row="2"
@@ -52,7 +52,7 @@
             Text = "Intellect"
             Grid.Row="1"
             Grid.Column="1"/>
-            <ProgressBar x:Name="IntellectBar" 
+            <ProgressBar x:Name="MentalBar" 
                 Progress="0.7" 
                 Scale="1.0"
                 Grid.Row="2"
diff --git a/LifeApp/LifeApp/MainPage.xaml.cs b/LifeApp/LifeApp/MainPage.xaml.cs
index ff44231..378d423 100644
--- a/LifeApp/LifeApp/MainPage.xaml.cs
+++ b/LifeApp/LifeApp/MainPage.xaml.cs
@@ -20,27 +20,27 @@ async void OnButtonClicked(object sender, EventArgs args)
             Label User = this.FindByName<Label>("User");
             User.Text = "Calvin";
             Label Level = this.FindByName<Label>("Level");
-            String tasktype = "Fitness";
+            String tasktype = "";
             
             ProgressBar MainLevel = this.FindByName<ProgressBar>("MainLevel");
-            ProgressBar FitnessBar = this.FindByName<ProgressBar>("FitnessBar");
+            ProgressBar PhysicalBar = this.FindByName<ProgressBar>("PhysicalBar");
             ProgressBar SocialBar = this.FindByName<ProgressBar>("SocialBar");
             ProgressBar FinancialBar = this.FindByName<ProgressBar>("FinancialBar");
-            ProgressBar IntellectBar = this.FindByName<ProgressBar>("IntellectBar");
+            ProgressBar MentalBar = this.FindByName<ProgressBar>("MentalBar");
             await MainLevel.ProgressTo(MainLevel.Progress+.2, 250, Easing.Linear);
             double progression_main = 0.15;
             double progression_sub = 0.05;
             double progression_calc = 0.0;
-            if(tasktype == "Fitness")
+            if(tasktype == "Physical")
             {
-                if (FitnessBar.Progress >= 0.85)
+                if (PhysicalBar.Progress >= 0.85)
                 {
-                    progression_main = 1.0 - FitnessBar.Progress;
+                    progression_main = 1.0 - PhysicalBar.Progress;
                     progression_sub = progression_main / 3;
                 }
-                if(IntellectBar.Progress <=progression_sub)
+                if(MentalBar.Progress <=progression_sub)
                 {
-                    progression_calc = progression_sub - IntellectBar.Progress;
+                    progression_calc = progression_sub - MentalBar.Progress;
                     progression_sub = progression_sub + (progression_calc / 2);
                 }
                 if (SocialBar.Progress <= progression_sub)
@@ -53,21 +53,21 @@ async void OnButtonClicked(object sender, EventArgs args)
                     progression_calc = progression_sub - FinancialBar.Progress;
                     progression_sub = progression_sub + (progression_calc / 2);
                 }
-                await IntellectBar.ProgressTo(IntellectBar.Progress - progression_sub, 100, Easing.Linear);
+                await MentalBar.ProgressTo(MentalBar.Progress - progression_sub, 100, Easing.Linear);
                 await SocialBar.ProgressTo(SocialBar.Progress - progression_sub, 100, Easing.Linear);
                 await FinancialBar.ProgressTo(FinancialBar.Progress - progression_sub, 100, Easing.Linear);
-                await FitnessBar.ProgressTo(FitnessBar.Progress + progression_main, 100, Easing.Linear);   
+                await PhysicalBar.ProgressTo(PhysicalBar.Progress + progression_main, 100, Easing.Linear);   
             }
-            else if (tasktype == "Intellect")
+            else if (tasktype == "Mental")
             {
-                if (IntellectBar.Progress >= 0.85)
+                if (MentalBar.Progress >= 0.85)
                 {
-                    progression_main = 1.0 - IntellectBar.Progress;
+                    progression_main = 1.0 - MentalBar.Progress;
                     progression_sub = progression_main / 3;
                 }
-                if (FitnessBar.Progress <= progression_sub)
+                if (PhysicalBar.Progress <= progression_sub)
                 {
-                    progression_calc = progression_sub - FitnessBar.Progress;
+                    progression_calc = progression_sub - PhysicalBar.Progress;
                     progression_sub = progression_sub + (progression_calc / 2);
                 }
                 if (SocialBar.Progress <= progression_sub)
@@ -80,10 +80,10 @@ async void OnButtonClicked(object sender, EventArgs args)
                     progression_calc = progression_sub - FinancialBar.Progress;
                     progression_sub = progression_sub + (progression_calc / 2);
                 }
-                await FitnessBar.ProgressTo(FitnessBar.Progress - progression_sub, 100, Easing.Linear);
+                await PhysicalBar.ProgressTo(PhysicalBar.Progress - progression_sub, 100, Easing.Linear);
                 await SocialBar.ProgressTo(SocialBar.Progress - progression_sub, 100, Easing.Linear);
                 await FinancialBar.ProgressTo(FinancialBar.Progress - progression_sub, 100, Easing.Linear);
-                await IntellectBar.ProgressTo(IntellectBar.Progress + progression_main, 100, Easing.Linear);
+                await MentalBar.ProgressTo(MentalBar.Progress + progression_main, 100, Easing.Linear);
             }
             else if (tasktype == "Social")
             {
@@ -92,14 +92,14 @@ async void OnButtonClicked(object sender, EventArgs args)
                     progression_main = 1.0 - SocialBar.Progress;
                     progression_sub = progression_main / 3;
                 }
-                if (IntellectBar.Progress <= progression_sub)
+                if (MentalBar.Progress <= progression_sub)
                 {
-                    progression_calc = progression_sub - IntellectBar.Progress;
+                    progression_calc = progression_sub - MentalBar.Progress;
                     progression_sub = progression_sub + (progression_calc / 2);
                 }
-                if (FitnessBar.Progress <= progression_sub)
+                if (PhysicalBar.Progress <= progression_sub)
                 {
-                    progression_calc = progression_sub - FitnessBar.Progress;
+                    progression_calc = progression_sub - PhysicalBar.Progress;
                     progression_sub = progression_sub + (progression_calc / 2);
                 }
                 if (FinancialBar.Progress <= progression_sub)
@@ -107,8 +107,8 @@ async void OnButtonClicked(object sender, EventArgs args)
                     progression_calc = progression_sub - FinancialBar.Progress;
                     progression_sub = progression_sub + (progression_calc / 2);
                 }
-                await IntellectBar.ProgressTo(IntellectBar.Progress - progression_sub, 100, Easing.Linear);
-                await FitnessBar.ProgressTo(FitnessBar.Progress - progression_sub, 100, Easing.Linear);
+                await MentalBar.ProgressTo(MentalBar.Progress - progression_sub, 100, Easing.Linear);
+                await PhysicalBar.ProgressTo(PhysicalBar.Progress - progression_sub, 100, Easing.Linear);
                 await FinancialBar.ProgressTo(FinancialBar.Progress - progression_sub, 100, Easing.Linear);
                 await SocialBar.ProgressTo(SocialBar.Progress + progression_main, 100, Easing.Linear);
             }
@@ -119,9 +119,9 @@ async void OnButtonClicked(object sender, EventArgs args)
                     progression_main = 1.0 - FinancialBar.Progress;
                     progression_sub = progression_main / 3;
                 }
-                if (IntellectBar.Progress <= progression_sub)
+                if (MentalBar.Progress <= progression_sub)
                 {
-                    progression_calc = progression_sub - IntellectBar.Progress;
+                    progression_calc = progression_sub - MentalBar.Progress;
                     progression_sub = progression_sub + (progression_calc / 2);
                 }
                 if (SocialBar.Progress <= progression_sub)
@@ -129,14 +129,14 @@ async void OnButtonClicked(object sender, EventArgs args)
                     progression_calc = progression_sub - SocialBar.Progress;
                     progression_sub = progression_sub + (progression_calc / 2);
                 }
-                if (FitnessBar.Progress <= progression_sub)
+                if (PhysicalBar.Progress <= progression_sub)
                 {
-                    progression_calc = progression_sub - FitnessBar.Progress;
+                    progression_calc = progression_sub - PhysicalBar.Progress;
                     progression_sub = progression_sub + (progression_calc / 2);
                 }
-                await IntellectBar.ProgressTo(IntellectBar.Progress - progression_sub, 100, Easing.Linear);
+                await MentalBar.ProgressTo(MentalBar.Progress - progression_sub, 100, Easing.Linear);
                 await SocialBar.ProgressTo(SocialBar.Progress - progression_sub, 100, Easing.Linear);
-                await FitnessBar.ProgressTo(FitnessBar.Progress - progression_sub, 100, Easing.Linear);
+                await PhysicalBar.ProgressTo(PhysicalBar.Progress - progression_sub, 100, Easing.Linear);
                 await FinancialBar.ProgressTo(FinancialBar.Progress + progression_main, 100, Easing.Linear);
             }
             if (MainLevel.Progress == 1)