Android back button functionality. SceneLoader script removed, refactored into NavigationMenu.

MoCha/Assets/Scripts/FitbitCaller.cs.meta

@@ -1,11 +1,6 @@
 fileFormatVersion: 2
-<<<<<<< Updated upstream
 guid: 36444c03eedb84147a326a329de30d0e
 timeCreated: 1524716713
-=======
-guid: 80ba6a52e9d55564fbe8130844b17f29
-timeCreated: 1524756213
->>>>>>> Stashed changes
 licenseType: Free
 MonoImporter:
   externalObjects: {}

MoCha/Assets/Scripts/GetGoals.cs

@@ -22,14 +22,14 @@ namespace PedometerU.Tests {
 
 		//Progress Bar...
 		public float barDisplay; //current progress
-		private Vector2 barPos;
+		//private Vector2 barPos;
 		private Vector2 barSize = new Vector2(5000, 10);
 
 		//Pedometer
 		private Pedometer pedometer;
 		int userSteps;
 		int userPoints;
-		double userDistance;
+		//double userDistance;
 		int stepsGoal = 100;
 		public Text stepText;
 		public Text pointsText;
@@ -37,7 +37,7 @@ namespace PedometerU.Tests {
 		private int savedPoints;
 
 		void OnStep (int steps, double distance) {
-			userDistance = (distance * 3.28084);
+			//userDistance = (distance * 3.28084);
 			userSteps = steps + savedSteps;
 			PlayerPrefs.SetInt("currentSteps",userSteps);
 				stepText.text = userSteps.ToString () + "/" + stepsGoal.ToString();
@@ -87,7 +87,7 @@ namespace PedometerU.Tests {
 			goalText.color = new Color(0f, 0f, 0f);
 				Debug.Log(background.rectTransform.anchoredPosition.x.ToString() + " " + background.rectTransform.anchoredPosition.y.ToString());
 
-				barPos = new Vector2(background.transform.position.x, 1895 - background.transform.position.y);
+				//barPos = new Vector2(background.transform.position.x, 1895 - background.transform.position.y);
 
 			currentDayStr = System.DateTime.Now.ToString("MM/dd/yyyy");
 			goalDayStr = System.DateTime.Now.ToString("MM/dd/yyyy");

MoCha/Assets/Scripts/Item.cs

@@ -5,5 +5,5 @@ public class Item : ScriptableObject {
 
 	public Sprite sprite;
 
-	public string name;
+	public string nameString;
 }

MoCha/Assets/Scripts/NavigationManager.cs

@@ -2,9 +2,11 @@
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
+using UnityEngine.SceneManagement;
 
 public class NavigationManager : MonoBehaviour
 {
+	private float timelastactive;
 	private GameObject navMenu;
 
 	public void Start()
@@ -13,6 +15,26 @@ public class NavigationManager : MonoBehaviour
 		navMenu = gameObject.transform.Find("Navigation Menu").gameObject;
 	}
 
+	public void Update()
+	{
+		if (Input.GetKeyDown (KeyCode.Escape))
+		{
+			if (navMenu.activeSelf) {
+				CloseNavMenu ();
+				timelastactive = Time.time;
+			}
+			else if (Time.time > (timelastactive + 1.0f))
+			{
+				PreviousPage ();
+			}
+		}
+	}
+
+	public bool isActive()
+	{
+		return navMenu.activeSelf;
+	}
+
 	public void OpenNavMenu()
 	{
 		navMenu.SetActive (true);
@@ -22,4 +44,57 @@ public class NavigationManager : MonoBehaviour
 	{
 		navMenu.SetActive (false);
 	}
+
+	public void LoadScene(string scene)
+	{
+		string scenetext = scene;
+		Debug.Log (" " + scenetext);
+
+		switch (scenetext) {
+		case "Start":
+			if (!(SceneManager.GetActiveScene ().name == "Home"))
+				SceneManager.LoadScene ("Home");
+			break;
+		case "Run":
+			if (!(SceneManager.GetActiveScene ().name == "Goals"))
+				SceneManager.LoadScene ("Goals");
+			break;
+		case "Profile":
+			if (!(SceneManager.GetActiveScene ().name == "Stats"))
+				SceneManager.LoadScene ("Stats");
+			break;
+		case "Monster Creator":
+			if (!(SceneManager.GetActiveScene ().name == "MonsterCreator"))
+				SceneManager.LoadScene ("MonsterCreator");
+			break;
+		default:
+			if (!(SceneManager.GetActiveScene ().name == scenetext))
+				SceneManager.LoadScene (scenetext);
+			break;
+		}
+	}
+
+	public void PreviousPage()
+	{
+		string currentscene = SceneManager.GetActiveScene ().name;
+
+		switch(currentscene) {
+		case "Main":
+		case "Home":
+			Application.Quit();
+			break;
+		case "MonsterCreator":
+			SceneManager.LoadScene ("Stats");
+			break;
+		case "Leaderboard":
+			SceneManager.LoadScene ("Stats");
+			break;
+		case "Goals":
+		case "Credits":
+		case "Stats":
+		default:
+			SceneManager.LoadScene ("Home");
+			break;
+		}
+	}
 }

MoCha/Assets/Scripts/SceneLoader.cs

@@ -1,45 +0,0 @@
-using UnityEngine;
-using UnityEngine.SceneManagement;
-using System.Collections;
-using UnityEngine.UI;
-
-public class SceneLoader : MonoBehaviour {
-
-	Text buttontext;
-
-	public void Start()
-	{
-		buttontext = GetComponentInChildren<Text> ();
-		// grab a UI element, set its rectTransform.anchoredPosition = to a Vector2 of the new position coordinates.
-		//buttontext.rectTransform.anchoredPosition = new Vector2(buttontext.rectTransform.anchoredPosition.x, buttontext.rectTransform.anchoredPosition.y + 100);
-	}
-
-	public void LoadScene()
-	{ 
-		string scenetext = buttontext.text;
-		Debug.Log (" " + scenetext);
-
-		switch (scenetext) {
-		case "Start":
-			if (!(SceneManager.GetActiveScene ().name == "Home"))
-				SceneManager.LoadScene ("Home");
-			break;
-		case "Run":
-			if (!(SceneManager.GetActiveScene ().name == "Goals"))
-				SceneManager.LoadScene ("Goals");
-			break;
-		case "Profile":
-			if (!(SceneManager.GetActiveScene ().name == "Stats"))
-				SceneManager.LoadScene ("Stats");
-			break;
-		case "Monster Creator":
-			if (!(SceneManager.GetActiveScene ().name == "MonsterCreator"))
-				SceneManager.LoadScene ("MonsterCreator");
-			break;
-		default:
-			if (!(SceneManager.GetActiveScene ().name == scenetext))
-				SceneManager.LoadScene (scenetext);
-			break;
-		}
-	}
-}

MoCha/Assets/Scripts/SceneLoader.cs.meta

@@ -1,13 +0,0 @@
-fileFormatVersion: 2
-guid: 39ce724310132854a9cfdd3e31737ae7
-timeCreated: 1523377353
-licenseType: Free
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

MoCha/ProjectSettings/ProjectVersion.txt

@@ -1 +1 @@
-m_EditorVersion: 2017.4.0f1
+m_EditorVersion: 2017.4.1f1