diff --git a/MoCha/Assets/Scenes/FitbitLogin.unity b/MoCha/Assets/Scenes/FitbitLogin.unity new file mode 100644 index 0000000..1976fca Binary files /dev/null and b/MoCha/Assets/Scenes/FitbitLogin.unity differ diff --git a/MoCha/Assets/Scenes/FitbitLogin.unity.meta b/MoCha/Assets/Scenes/FitbitLogin.unity.meta new file mode 100644 index 0000000..f5aae61 --- /dev/null +++ b/MoCha/Assets/Scenes/FitbitLogin.unity.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: e4e05e44213ffe141906009c29238b2e +timeCreated: 1525379963 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MoCha/Assets/Scenes/Main.unity b/MoCha/Assets/Scenes/Main.unity index 8368caa..f4fef04 100644 Binary files a/MoCha/Assets/Scenes/Main.unity and b/MoCha/Assets/Scenes/Main.unity differ diff --git a/MoCha/Assets/Scripts/FitBitAPI.cs b/MoCha/Assets/Scripts/FitBitAPI.cs index aca4ed7..fb44361 100644 --- a/MoCha/Assets/Scripts/FitBitAPI.cs +++ b/MoCha/Assets/Scripts/FitBitAPI.cs @@ -18,7 +18,7 @@ namespace Assets.Scripts.Fitbit private const string _consumerSecret = "69307b9f332caf9946ef4e23cabde2e4"; private const string _clientId = "22CX4L"; private const string _callbackURL = "http://localhost/callback"; - private const string CustomAndroidScheme = "mocha://"; + private const string CustomAndroidScheme = "http://localhost/callback"; private const string _tokenUrl = "https://api.fitbit.com/oauth2/token"; private const string _baseGetUrl = "https://api.fitbit.com/1/user/-/"; @@ -73,6 +73,7 @@ namespace Assets.Scripts.Fitbit { _bFirstFire = false; } + GUI.Label(new Rect(10, 10, 100, 20), "Calories: " + _fitbitData.CurrentCalories); } public void LoginToFitbit() diff --git a/MoCha/ProjectSettings/EditorBuildSettings.asset b/MoCha/ProjectSettings/EditorBuildSettings.asset index 779d0c6..846ffd7 100644 Binary files a/MoCha/ProjectSettings/EditorBuildSettings.asset and b/MoCha/ProjectSettings/EditorBuildSettings.asset differ diff --git a/MoCha/ProjectSettings/ProjectVersion.txt b/MoCha/ProjectSettings/ProjectVersion.txt index ac7d214..27997c5 100644 --- a/MoCha/ProjectSettings/ProjectVersion.txt +++ b/MoCha/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2017.4.0f1 +m_EditorVersion: 2017.3.1f1