Berack/upo-senior-assistant-pi
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Work on FITBIT classes proceeds

Browse Source
This commit is contained in:
Giulia
2018-06-01 12:30:44 +02:00
parent cd65149211
commit fc135908f5
11 changed files with 305 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.gradle/4.4/fileHashes/fileHashes.bin
View File

Binary file not shown.

BIN
.gradle/4.4/fileHashes/fileHashes.lock
View File

Binary file not shown.

1
.idea/gradle.xml generated
View File

@@ -3,6 +3,7 @@
<component name="GradleSettings"> <component name="GradleSettings">
<option name="linkedExternalProjectsSettings"> <option name="linkedExternalProjectsSettings">
<GradleProjectSettings> <GradleProjectSettings>
<option name="createEmptyContentRootDirectories" value="true" />
<option name="distributionType" value="DEFAULT_WRAPPED" /> <option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="modules"> <option name="modules">

348
.idea/workspace.xml generated
View File

@@ -4,8 +4,14 @@
<list default="true" id="78e01e81-87ab-43aa-be01-5489e21c7fc2" name="Default" comment=""> <list default="true" id="78e01e81-87ab-43aa-be01-5489e21c7fc2" name="Default" comment="">
<change beforePath="$PROJECT_DIR$/.gradle/4.4/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.4/fileHashes/fileHashes.bin" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/4.4/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.4/fileHashes/fileHashes.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/4.4/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.4/fileHashes/fileHashes.lock" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/4.4/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/4.4/fileHashes/fileHashes.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle" afterDir="false" /> <change beforePath="$PROJECT_DIR$/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/manage/AuthFITBIT.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/manage/AuthFITBIT.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/manage/Data.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/manage/FITIBITData.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/manage/OAuth2ClientCredentials.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/manage/OAuth2ClientCredentials.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/manage/UserData.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/manage/UserData.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/tests/TestLights.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/TestLights.java" afterDir="false" />
</list> </list>
<ignored path="$PROJECT_DIR$/.gradle/" /> <ignored path="$PROJECT_DIR$/.gradle/" />
<ignored path="$PROJECT_DIR$/build/" /> <ignored path="$PROJECT_DIR$/build/" />
@@ -86,26 +92,47 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="AuthFITBIT.java" pinned="false" current-in-tab="false"> <file leaf-file-name="build.gradle" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/manage/AuthFITBIT.java"> <entry file="file://$PROJECT_DIR$/build.gradle">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state> <state relative-caret-position="238">
<caret column="15" lean-forward="true" selection-start-column="15" selection-end-column="15" /> <caret line="14" column="62" selection-start-line="14" selection-start-column="62" selection-end-line="14" selection-end-column="62" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="UserData.java" pinned="false" current-in-tab="true"> <file leaf-file-name="FITIBITData.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/manage/FITIBITData.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306">
<caret line="20" column="1" selection-start-line="20" selection-start-column="1" selection-end-line="20" selection-end-column="1" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="UserData.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/manage/UserData.java"> <entry file="file://$PROJECT_DIR$/src/main/java/manage/UserData.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255"> <state relative-caret-position="255">
<caret line="15" column="54" selection-start-line="15" selection-start-column="54" selection-end-line="15" selection-end-column="54" /> <caret line="16" column="1" selection-start-line="16" selection-start-column="1" selection-end-line="16" selection-end-column="1" />
<folding> </state>
<element signature="imports" expanded="true" /> </provider>
</folding> </entry>
</file>
<file leaf-file-name="AuthFITBIT.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/manage/AuthFITBIT.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="237">
<caret line="48" column="74" selection-start-line="48" selection-start-column="74" selection-end-line="48" selection-end-column="74" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="OAuth2ClientCredentials.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/manage/OAuth2ClientCredentials.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
<caret line="11" column="43" selection-start-line="11" selection-start-column="43" selection-end-line="11" selection-end-column="43" />
</state> </state>
</provider> </provider>
</entry> </entry>
@@ -119,6 +146,11 @@
</list> </list>
</option> </option>
</component> </component>
<component name="FindInProjectRecents">
<findStrings>
<find>flow</find>
</findStrings>
</component>
<component name="Git.Settings"> <component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component> </component>
@@ -300,9 +332,9 @@
</option> </option>
<option name="modificationStamps"> <option name="modificationStamps">
<map> <map>
<entry key="$PROJECT_DIR$" value="6110144149611" /> <entry key="$PROJECT_DIR$" value="6110213635495" />
<entry key="$PROJECT_DIR$/.gradle" value="0" /> <entry key="$PROJECT_DIR$/.gradle" value="0" />
<entry key="$PROJECT_DIR$/build.gradle" value="384538824" /> <entry key="$PROJECT_DIR$/build.gradle" value="2105183856" />
<entry key="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties" value="2083459160" /> <entry key="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties" value="2083459160" />
<entry key="$PROJECT_DIR$/settings.gradle" value="2435099665" /> <entry key="$PROJECT_DIR$/settings.gradle" value="2435099665" />
</map> </map>
@@ -492,12 +524,14 @@
<option value="$PROJECT_DIR$/src/main/java/tests/Test.java" /> <option value="$PROJECT_DIR$/src/main/java/tests/Test.java" />
<option value="$PROJECT_DIR$/src/main/java/device/Hue.java" /> <option value="$PROJECT_DIR$/src/main/java/device/Hue.java" />
<option value="$PROJECT_DIR$/src/main/java/tests/TestLights.java" /> <option value="$PROJECT_DIR$/src/main/java/tests/TestLights.java" />
<option value="$PROJECT_DIR$/src/main/java/manage/OAuth2ClientCredentials.java" />
<option value="$PROJECT_DIR$/build.gradle" />
<option value="$PROJECT_DIR$/src/main/java/manage/FITBITUrl.java" /> <option value="$PROJECT_DIR$/src/main/java/manage/FITBITUrl.java" />
<option value="$PROJECT_DIR$/src/main/java/manage/AuthFITBIT.java" />
<option value="$PROJECT_DIR$/src/main/java/manage/Data.java" /> <option value="$PROJECT_DIR$/src/main/java/manage/Data.java" />
<option value="$PROJECT_DIR$/src/main/java/manage/UserData.java" /> <option value="$PROJECT_DIR$/src/main/java/manage/UserData.java" />
<option value="$PROJECT_DIR$/build.gradle" />
<option value="$PROJECT_DIR$/src/main/java/manage/FITIBITData.java" />
<option value="$PROJECT_DIR$/src/test/java/TestLights.java" />
<option value="$PROJECT_DIR$/src/main/java/manage/OAuth2ClientCredentials.java" />
<option value="$PROJECT_DIR$/src/main/java/manage/AuthFITBIT.java" />
</list> </list>
</option> </option>
</component> </component>
@@ -568,24 +602,48 @@
<item name="SeniorAssistant" type="b2602c69:ProjectViewProjectNode" /> <item name="SeniorAssistant" type="b2602c69:ProjectViewProjectNode" />
<item name="SeniorAssistant" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" /> <item name="SeniorAssistant" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" /> <item name="test" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
</path>
<path>
<item name="SeniorAssistant" type="b2602c69:ProjectViewProjectNode" />
<item name="SeniorAssistant" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="test" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" /> <item name="java" type="462c0819:PsiDirectoryNode" />
<item name="tests" type="462c0819:PsiDirectoryNode" /> </path>
<path>
<item name="SeniorAssistant" type="b2602c69:ProjectViewProjectNode" />
<item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
</path> </path>
</expand> </expand>
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="AndroidView" />
<pane id="Scope" /> <pane id="Scope" />
<pane id="AndroidView" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="Downloaded.Files.Path.Enabled" value="false" />
<property name="Repository.Attach.JavaDocs" value="false" />
<property name="Repository.Attach.Sources" value="false" />
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" /> <property name="aspect.path.notification.shown" value="true" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" /> <property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="settings.editor.selected.configurable" value="gradle.experimental" /> <property name="project.structure.last.edited" value="Modules" />
<property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2" />
<property name="settings.editor.selected.configurable" value="reference.settingsdialog.project.gradle" />
</component>
<component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
<recent name="C:\Users\Giulia\IdeaProjects\SeniorAssistant\src\test\java" />
<recent name="C:\Users\Giulia\IdeaProjects\SeniorAssistant\src" />
<recent name="C:\Users\Giulia\IdeaProjects\SeniorAssistant\src\main" />
<recent name="C:\Users\Giulia\IdeaProjects\SeniorAssistant\src\main\java" />
<recent name="C:\Users\Giulia\IdeaProjects\SeniorAssistant" />
</key>
</component> </component>
<component name="RunDashboard"> <component name="RunDashboard">
<option name="ruleStates"> <option name="ruleStates">
@@ -599,7 +657,18 @@
</list> </list>
</option> </option>
</component> </component>
<component name="RunManager" selected="JUnit.TestLights"> <component name="RunManager" selected="Application.AuthFITBIT">
<configuration name="AuthFITBIT" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="manage.AuthFITBIT" />
<module name="SeniorAssistant_main" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="manage.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
</configuration>
<configuration default="true" type="Application" factoryName="Application"> <configuration default="true" type="Application" factoryName="Application">
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
</configuration> </configuration>
@@ -702,9 +771,11 @@
<item itemvalue="Groovy.build (1)" /> <item itemvalue="Groovy.build (1)" />
<item itemvalue="Gradle.SeniorAssistant [build]" /> <item itemvalue="Gradle.SeniorAssistant [build]" />
<item itemvalue="JUnit.TestLights" /> <item itemvalue="JUnit.TestLights" />
<item itemvalue="Application.AuthFITBIT" />
</list> </list>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="Application.AuthFITBIT" />
<item itemvalue="JUnit.TestLights" /> <item itemvalue="JUnit.TestLights" />
<item itemvalue="Gradle.SeniorAssistant [build]" /> <item itemvalue="Gradle.SeniorAssistant [build]" />
<item itemvalue="Groovy.build (1)" /> <item itemvalue="Groovy.build (1)" />
@@ -724,7 +795,10 @@
<updated>1527511421271</updated> <updated>1527511421271</updated>
<workItem from="1527511465296" duration="493000" /> <workItem from="1527511465296" duration="493000" />
<workItem from="1527514123141" duration="8177000" /> <workItem from="1527514123141" duration="8177000" />
<workItem from="1527603873798" duration="4758000" /> <workItem from="1527603873798" duration="5739000" />
<workItem from="1527675790391" duration="794000" />
<workItem from="1527772850556" duration="10169000" />
<workItem from="1527848268892" duration="524000" />
</task> </task>
<task id="LOCAL-00001" summary="Updated build gradle &#10;Added functions ph. hue"> <task id="LOCAL-00001" summary="Updated build gradle &#10;Added functions ph. hue">
<created>1527518149240</created> <created>1527518149240</created>
@@ -740,7 +814,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1527522377670</updated> <updated>1527522377670</updated>
</task> </task>
<option name="localTasksCounter" value="3" /> <task id="LOCAL-00003" summary="Added classes for manage authentication and retrieve data to/from fitbit... but the code needs some mods!">
<created>1527610693612</created>
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
<updated>1527610693612</updated>
</task>
<option name="localTasksCounter" value="4" />
<servers /> <servers />
</component> </component>
<component name="TestHistory"> <component name="TestHistory">
@@ -758,7 +839,7 @@
</history-entry> </history-entry>
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="13428000" /> <option name="totallyTimeSpent" value="25896000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" /> <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
@@ -773,12 +854,11 @@
<window_info anchor="right" id="Maven Projects" order="5" /> <window_info anchor="right" id="Maven Projects" order="5" />
<window_info anchor="bottom" id="Database Changes" order="9" show_stripe_button="false" /> <window_info anchor="bottom" id="Database Changes" order="9" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="11" weight="0.32838285" /> <window_info anchor="bottom" id="Version Control" order="11" weight="0.32838285" />
<window_info anchor="bottom" id="Run" order="2" weight="0.32838285" /> <window_info anchor="bottom" id="Run" order="2" weight="0.23432343" />
<window_info anchor="bottom" id="Terminal" order="8" /> <window_info anchor="bottom" id="Terminal" order="8" weight="0.32838285" />
<window_info id="Capture Tool" order="5" /> <window_info id="Capture Tool" order="5" />
<window_info id="Designer" order="2" /> <window_info id="Designer" order="2" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.26172465" /> <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2730711" />
<window_info anchor="bottom" id="Build" order="7" weight="0.32838285" />
<window_info anchor="right" id="Database" order="7" /> <window_info anchor="right" id="Database" order="7" />
<window_info anchor="right" id="Gradle" order="6" weight="0.32980332" /> <window_info anchor="right" id="Gradle" order="6" weight="0.32980332" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
@@ -787,13 +867,14 @@
<window_info anchor="right" id="Theme Preview" order="8" /> <window_info anchor="right" id="Theme Preview" order="8" />
<window_info id="Favorites" order="4" side_tool="true" /> <window_info id="Favorites" order="4" side_tool="true" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="Messages" order="10" /> <window_info anchor="bottom" id="Messages" order="10" weight="0.32838285" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Build" order="7" weight="0.32838285" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="bottom" id="Find" order="1" /> <window_info anchor="bottom" id="Find" order="1" weight="0.32838285" />
</layout> </layout>
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
@@ -805,9 +886,52 @@
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<MESSAGE value="Updated build gradle &#10;Added functions ph. hue" /> <MESSAGE value="Updated build gradle &#10;Added functions ph. hue" />
<MESSAGE value="Seems that the test for lights passes, tried with the emulator" /> <MESSAGE value="Seems that the test for lights passes, tried with the emulator" />
<option name="LAST_COMMIT_MESSAGE" value="Seems that the test for lights passes, tried with the emulator" /> <MESSAGE value="Added classes for manage authentication and retrieve data to/from fitbit... but the code needs some mods!" />
<option name="LAST_COMMIT_MESSAGE" value="Added classes for manage authentication and retrieve data to/from fitbit... but the code needs some mods!" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="14" column="62" selection-start-line="14" selection-start-column="62" selection-end-line="14" selection-end-column="62" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/manage/FITIBITData.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="340">
<caret line="20" column="1" selection-start-line="20" selection-start-column="1" selection-end-line="20" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/manage/UserData.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="272">
<caret line="16" column="1" selection-start-line="16" selection-start-column="1" selection-end-line="16" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/manage/OAuth2ClientCredentials.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
<caret line="11" column="43" selection-start-line="11" selection-start-column="43" selection-end-line="11" selection-end-column="43" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/manage/AuthFITBIT.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="816">
<caret line="48" column="74" lean-forward="true" selection-start-line="48" selection-start-column="74" selection-end-line="48" selection-end-column="74" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="272">
<caret line="16" column="4" selection-start-line="16" selection-start-column="4" selection-end-line="16" selection-end-column="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/device/Hue.java"> <entry file="file://$PROJECT_DIR$/src/main/java/device/Hue.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306"> <state relative-caret-position="306">
@@ -815,13 +939,10 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tests/TestLights.java"> <entry file="file://$PROJECT_DIR$/src/test/java/TestLights.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="357"> <state relative-caret-position="357">
<caret line="21" column="22" selection-start-line="21" selection-start-column="22" selection-end-line="21" selection-end-column="22" /> <caret line="21" column="22" selection-start-line="21" selection-start-column="22" selection-end-line="21" selection-end-column="22" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@@ -832,31 +953,11 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/manage/Rest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="262">
<caret line="67" column="35" selection-start-line="67" selection-start-column="35" selection-end-line="67" selection-end-column="35" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore"> <entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1136" /> <state relative-caret-position="-1136" />
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/tests/TestLights.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323">
<caret line="21" column="22" selection-start-line="21" selection-start-column="22" selection-end-line="21" selection-end-column="22" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/device/Hue.java"> <entry file="file://$PROJECT_DIR$/src/main/java/device/Hue.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="17"> <state relative-caret-position="17">
@@ -864,24 +965,24 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/manage/OAuth2ClientCredentials.java"> <entry file="file://$PROJECT_DIR$/src/main/java/manage/Rest.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="308"> <state relative-caret-position="262">
<caret line="25" lean-forward="true" selection-start-line="25" selection-end-line="25" /> <caret line="67" column="35" selection-start-line="67" selection-start-column="35" selection-end-line="67" selection-end-column="35" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/build.gradle"> <entry file="file://$PROJECT_DIR$/build.gradle">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374"> <state relative-caret-position="238">
<caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" /> <caret line="14" column="62" selection-start-line="14" selection-start-column="62" selection-end-line="14" selection-end-column="62" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/manage/Data.java"> <entry file="file://$PROJECT_DIR$/src/test/java/TestLights.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187"> <state relative-caret-position="85">
<caret line="11" column="21" lean-forward="true" selection-start-line="11" selection-start-column="21" selection-end-line="11" selection-end-column="21" /> <caret line="5" column="8" selection-start-line="5" selection-start-column="8" selection-end-line="5" selection-end-column="8" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
@@ -890,43 +991,102 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/manage/FITBITUrl.java"> <entry file="file://$PROJECT_DIR$/src/main/java/manage/FITBITUrl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323"> <state relative-caret-position="238">
<caret line="19" column="5" lean-forward="true" selection-start-line="19" selection-start-column="5" selection-end-line="19" selection-end-column="5" /> <caret line="19" column="5" lean-forward="true" selection-start-line="19" selection-start-column="5" selection-end-line="19" selection-end-column="5" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#225#226#0" expanded="true" />
<element signature="e#258#259#0" expanded="true" />
<element signature="e#333#334#0" expanded="true" />
<element signature="e#362#363#0" expanded="true" />
<element signature="e#461#462#0" expanded="true" />
<element signature="e#497#498#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/manage/AuthFITBIT.java">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="15" lean-forward="true" selection-start-column="15" selection-end-column="15" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/manage/UserData.java"> <entry file="file://$PROJECT_DIR$/src/main/java/manage/UserData.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255"> <state relative-caret-position="255">
<caret line="15" column="54" selection-start-line="15" selection-start-column="54" selection-end-line="15" selection-end-column="54" /> <caret line="16" column="1" selection-start-line="16" selection-start-column="1" selection-end-line="16" selection-end-column="1" />
<folding> </state>
<element signature="imports" expanded="true" /> </provider>
</folding> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/manage/FITIBITData.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306">
<caret line="20" column="1" selection-start-line="20" selection-start-column="1" selection-end-line="20" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/manage/OAuth2ClientCredentials.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
<caret line="11" column="43" selection-start-line="11" selection-start-column="43" selection-end-line="11" selection-end-column="43" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/manage/AuthFITBIT.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="237">
<caret line="48" column="74" selection-start-line="48" selection-start-column="74" selection-end-line="48" selection-end-column="74" />
</state> </state>
</provider> </provider>
</entry> </entry>
</component> </component>
<component name="masterDetails"> <component name="masterDetails">
<states> <states>
<state key="ArtifactsStructureConfigurable.UI">
<settings>
<artifact-editor />
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="FacetStructureConfigurable.UI">
<settings>
<last-edited>No facets are configured</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="GlobalLibrariesConfigurable.UI">
<settings>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="JdkListConfigurable.UI">
<settings>
<last-edited>9</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="ModuleStructureConfigurable.UI">
<settings>
<last-edited>SeniorAssistant_test|SeniorAssistant</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
<option value="0.6" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="ProjectJDKs.UI"> <state key="ProjectJDKs.UI">
<settings> <settings>
<splitter-proportions> <splitter-proportions>
@@ -938,6 +1098,18 @@
</splitter-proportions> </splitter-proportions>
</settings> </settings>
</state> </state>
<state key="ProjectLibrariesConfigurable.UI">
<settings>
<last-edited>Gradle: com.fasterxml.jackson.core:jackson-core:2.1.3</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
</states> </states>
</component> </component>
</project> </project>

12
build.gradle
View File

@@ -14,12 +14,22 @@ repositories {
dependencies { dependencies {
testCompile group: 'junit', name: 'junit', version: '4.12' testCompile group: 'junit', name: 'junit', version: '4.12'
// compile "com.sparkjava:spark-core:2.5.5" // compile "com.sparkjava:spark-core:2.5.5"
// compile "org.slf4j:slf4j-simple:1.7.21" compile "org.slf4j:slf4j-simple:1.7.21"
compile "com.google.code.gson:gson:2.8.0" compile "com.google.code.gson:gson:2.8.0"
// compile "org.xerial:sqlite-jdbc:3.15.1" // compile "org.xerial:sqlite-jdbc:3.15.1"
compile 'org.apache.httpcomponents:httpclient:4.5.3' compile 'org.apache.httpcomponents:httpclient:4.5.3'
compile 'com.google.api-client:google-api-client:1.23.0' compile 'com.google.api-client:google-api-client:1.23.0'
compile group: 'com.google.oauth-client', name: 'google-oauth-client-jetty', version: '1.11.0-beta' compile group: 'com.google.oauth-client', name: 'google-oauth-client-jetty', version: '1.11.0-beta'
compile files('zway-lib-0.2.8-SNAPSHOT.jar')
compile 'org.apache.commons:commons-lang3:3.4'
compile 'org.eclipse.jetty:jetty-client:9.3.11.v20160721'
compile 'org.eclipse.jetty:jetty-http:9.3.11.v20160721'
compile 'org.eclipse.jetty:jetty-io:9.3.11.v20160721'
compile 'org.eclipse.jetty:jetty-util:9.3.11.v20160721'
compile 'org.eclipse.jetty.websocket:websocket-api:9.3.12.v20160915'
compile 'org.eclipse.jetty.websocket:websocket-client:9.3.12.v20160915'
compile 'org.eclipse.jetty.websocket:websocket-common:9.3.12.v20160915'
} }

15
src/main/java/manage/AuthFITBIT.java
View File

@@ -34,8 +34,8 @@ public class AuthFITBIT {
private static FileDataStoreFactory DATA_STORE_FACTORY; private static FileDataStoreFactory DATA_STORE_FACTORY;
/** OAuth 2 scope. */ /** OAuth 2 scope. */
private static final String SCOPE = "read"; private static final String SCOPE = "activity";
//private static final String SCOPE[] = new String[]{"activity","heartrate","location","sleep"};
/** Global instance of the HTTP transport. */ /** Global instance of the HTTP transport. */
private static final HttpTransport HTTP_TRANSPORT = new NetHttpTransport(); private static final HttpTransport HTTP_TRANSPORT = new NetHttpTransport();
@@ -63,7 +63,8 @@ public class AuthFITBIT {
// authorize // authorize
LocalServerReceiver receiver = new LocalServerReceiver.Builder().setHost( LocalServerReceiver receiver = new LocalServerReceiver.Builder().setHost(
OAuth2ClientCredentials.DOMAIN).setPort(OAuth2ClientCredentials.PORT).build(); OAuth2ClientCredentials.DOMAIN).setPort(OAuth2ClientCredentials.PORT).build();
return new AuthorizationCodeInstalledApp(flow, receiver).authorize("user");
return new AuthorizationCodeInstalledApp(flow, receiver).authorize("user" );
} }
private static void run(HttpRequestFactory requestFactory) throws IOException { private static void run(HttpRequestFactory requestFactory) throws IOException {
@@ -74,19 +75,19 @@ public class AuthFITBIT {
UserData data = request.execute().parseAs(UserData.class); UserData data = request.execute().parseAs(UserData.class);
if (data.list.isEmpty()) { if (data.list.isEmpty()) {
System.out.println("Error in retrieve user data"); System.out.println("Error in retrieve user data");
} /*else { } else/* {
if (data.hasMore) { if (data.hasMore) {
System.out.print("First "); System.out.print("First ");
}*/ //i don't think is necessary }*/ //i don't think is necessary
/* System.out.println(data.list.size() + " favorite videos found:"); /* System.out.println(data.list.size() + " favorite videos found:");
for (Data datas: data.list) { */for (FITIBITData datas: data.list) {
System.out.println(); System.out.println(datas.toString());/*
System.out.println("-----------------------------------------------"); System.out.println("-----------------------------------------------");
System.out.println("ID: " + datas.id); System.out.println("ID: " + datas.id);
System.out.println("Title: " + datas.title); System.out.println("Title: " + datas.title);
System.out.println("Tags: " + datas.tags); System.out.println("Tags: " + datas.tags);
System.out.println("URL: " + datas.url); System.out.println("URL: " + datas.url);
} */ }/*
}*/ //neither this }*/ //neither this
} }

22
src/main/java/manage/Data.java
View File

@@ -1,22 +0,0 @@
package manage;
import com.google.api.client.util.Key;
import java.util.List;
//da modificare inserendo gli attributi del json (activity, heartrate, sleep, location)
public class Data {
@Key
public String id;
@Key
public List<String> tags;
@Key
public String title;
@Key
public String url;
}

21
src/main/java/manage/FITIBITData.java Normal file
View File

@@ -0,0 +1,21 @@
package manage;
import com.google.api.client.util.Key;
import java.util.List;
public class FITIBITData {
@Key
public String activity;
@Key
public String heartrate;
@Key
public String sleep;
@Key
public String location;
}

6
src/main/java/manage/OAuth2ClientCredentials.java
View File

@@ -3,16 +3,16 @@ package manage;
public class OAuth2ClientCredentials { public class OAuth2ClientCredentials {
/** Value of the "API Key". */ /** Value of the "API Key". */
public static final String API_KEY = "22CSTL"; public static final String API_KEY = "22CSTL"; //maybe togliere le virgolette
/** Value of the "API Secret". */ /** Value of the "API Secret". */
public static final String API_SECRET = "ea2452013abd35609940ce5601960a08"; public static final String API_SECRET = "ea2452013abd35609940ce5601960a08"; //maybe togliere le virgolette
/** Port in the "Callback URL". */ /** Port in the "Callback URL". */
public static final int PORT = 8080; public static final int PORT = 8080;
/** Domain name in the "Callback URL". */ /** Domain name in the "Callback URL". */
public static final String DOMAIN = "http://127.0.0.1:8080/"; public static final String DOMAIN = "127.0.0.1";
public static void errorIfNotSpecified() { public static void errorIfNotSpecified() {
if (API_KEY.startsWith("Enter ") || API_SECRET.startsWith("Enter ")) { if (API_KEY.startsWith("Enter ") || API_SECRET.startsWith("Enter ")) {

2
src/main/java/manage/UserData.java
View File

@@ -7,7 +7,7 @@ import java.util.List;
public class UserData { public class UserData {
@Key @Key
public List<Data> list; public List<FITIBITData> list;
/* /*
@Key @Key
public int limit; public int limit;

2
src/main/java/tests/TestLights.java → src/test/java/TestLights.java
View File

@@ -1,5 +1,3 @@
package tests;
import device.Hue; import device.Hue;
import org.junit.Test; import org.junit.Test;