diff --git a/.gitignore b/.gitignore
index 7e9e5127b079d22568db60bb2cf2cb8fd7d29881..3c073d0fa16743950ed6dde38621e76d6a5a2e26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,20 @@
-*.iml
-.gradle
-/local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
-.DS_Store
+/.idea
+/.settings
+
+/app/build/generated
+/app/build/intermediates
+/app/build/tmp
+/app/src/androidTest
+/app/src/test
+
/build
+
+/local.properties
/captures
+
+.gradle
+.DS_Store
.externalNativeBuild
.cxx
-*.docx
\ No newline at end of file
+
+*.iml
\ No newline at end of file
diff --git a/.idea/workspace-DESKTOP-6HHPPQT-2.xml b/.idea/workspace-DESKTOP-6HHPPQT-2.xml
deleted file mode 100644
index 0ea735d94fb2db22a46b2b6777712350bcb26b1c..0000000000000000000000000000000000000000
--- a/.idea/workspace-DESKTOP-6HHPPQT-2.xml
+++ /dev/null
@@ -1,677 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="AndroidLayouts">
- <shared>
- <config />
- </shared>
- </component>
- <component name="AndroidLogFilters">
- <option name="TOOL_WINDOW_LOG_LEVEL" value="verbose" />
- <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="No Filters" />
- </component>
- <component name="BookmarkManager">
- <bookmark url="file://$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/LoginActivity.java" line="41" />
- </component>
- <component name="ChangeListManager">
- <list default="true" id="901156b8-4ed3-48c9-9feb-1fa598856dd4" name="Default Changelist" comment="">
- <change beforePath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/ExperimentSurveyCreatorActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/ExperimentSurveyCreatorActivity.java" afterDir="false" />
- </list>
- <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
- <option name="SHOW_DIALOG" value="false" />
- <option name="HIGHLIGHT_CONFLICTS" value="true" />
- <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
- <option name="LAST_RESOLUTION" value="IGNORE" />
- </component>
- <component name="CodeInsightWorkspaceSettings">
- <option name="optimizeImportsOnTheFly" value="true" />
- </component>
- <component name="DefaultGradleProjectSettings">
- <option name="isMigrated" value="true" />
- </component>
- <component name="ExecutionTargetManager" SELECTED_TARGET="Pixel_2_API_29" />
- <component name="ExternalProjectsManager">
- <system id="GRADLE">
- <state>
- <projects_view>
- <tree_state>
- <expand>
- <path>
- <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
- <item name="XBFramework" type="f1a62948:ProjectNode" />
- </path>
- </expand>
- <select />
- </tree_state>
- </projects_view>
- </state>
- </system>
- </component>
- <component name="FileEditorManager">
- <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/ExperimentSurveyCreatorActivity.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="255">
- <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/LoginActivity.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="289">
- <caret line="25" column="60" selection-start-line="25" selection-start-column="60" selection-end-line="25" selection-end-column="60" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/NewBox.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="391">
- <caret line="67" selection-start-line="67" selection-end-line="67" />
- </state>
- </provider>
- </entry>
- </file>
- </leaf>
- </component>
- <component name="FileTemplateManagerImpl">
- <option name="RECENT_TEMPLATES">
- <list>
- <option value="valueResourceFile" />
- <option value="resourceFile" />
- <option value="Class" />
- <option value="layoutResourceFile_vertical" />
- </list>
- </option>
- </component>
- <component name="FindInProjectRecents">
- <findStrings>
- <find>testing</find>
- <find>loginButton</find>
- <find>Delete</find>
- <find>CropImage</find>
- <find>TitleList</find>
- <find>experimentTitle</find>
- <find>EditText</find>
- <find>ID</find>
- <find>getid</find>
- <find>groupIndex</find>
- <find>inFiveLayout</find>
- <find>ExperimentIndex</find>
- <find>MEECS</find>
- <find>locked</find>
- <find>DateUntil</find>
- </findStrings>
- </component>
- <component name="Git.Settings">
- <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
- </component>
- <component name="IdeDocumentHistory">
- <option name="CHANGED_PATHS">
- <list>
- <option value="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/ArtefactShop.java" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_shop.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_progress.xml" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/NewExperiment.java" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/content_new_activity.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_new_experiment.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/content_new_experiment.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/values/strings.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/drawable/ic_logo.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/values/colors.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_about.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/values/idValues.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/content_about.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/content_boxes.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/content_experiments_list.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/content_login.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/content_progress.xml" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/ExperimentsListActivity.java" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/content_experiment.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/content_shop.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/raw/shop.json" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/CommonFunctions.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/AboutActivity.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/LoginActivity.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/ShopActivity.java" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_experiment_survey_creator_activity.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/content_experiment_survey_creator_.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_experiment_survey_creator.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/content_experiment_survey_creator.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/content_new_box.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/raw/box.json" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/FileStoreReader.java" />
- <option value="$PROJECT_DIR$/app/src/main/res/values/arrays.xml" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/ProgressActivity.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/ExperimentActivity.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/BoxesActivity.java" />
- <option value="$USER_HOME$/Documents/AndroidStudio/DeviceExplorer/emulator-5554/data/data/com.yearthreeproject.xbframework/files/localUserData.json" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/content_main.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/drawable/notification_icon.xml" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/MyNotificationPublisher.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/TestingPage.java" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_testing.xml" />
- <option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/MainActivity.java" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/content_testing.xml" />
- <option value="$PROJECT_DIR$/build.gradle" />
- <option value="$PROJECT_DIR$/settings.gradle" />
- <option value="$PROJECT_DIR$/app/build.gradle" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/TestingActivity.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/NewBox.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/ExperimentSurveyCreatorActivity.java" />
- </list>
- </option>
- </component>
- <component name="ProjectFrameBounds" extendedState="6">
- <option name="x" value="2" />
- <option name="y" value="-8" />
- <option name="width" value="792" />
- <option name="height" value="1566" />
- </component>
- <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
- <component name="ProjectView">
- <navigator proportions="" version="1">
- <foldersAlwaysOnTop value="true" />
- </navigator>
- <panes>
- <pane id="Scope" />
- <pane id="AndroidView">
- <subPane>
- <expand>
- <path>
- <item name="XBFramework" type="1abcf292:AndroidViewProjectNode" />
- <item name="Gradle Scripts" type="ae0cef3a:AndroidBuildScriptsGroupNode" />
- </path>
- </expand>
- <select />
- </subPane>
- </pane>
- <pane id="ProjectPane" />
- <pane id="PackagesPane" />
- </panes>
- </component>
- <component name="PropertiesComponent">
- <property name="DeviceAndSnapshotComboBoxAction.selectedDevice" value="Pixel_2_API_29" />
- <property name="DeviceAndSnapshotComboBoxAction.selectionTime" value="2020-02-11T20:50:41.427Z" />
- <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
- <property name="android.sdk.path" value="$USER_HOME$/AppData/Local/Android/Sdk" />
- <property name="last_opened_file_path" value="$PROJECT_DIR$" />
- <property name="project.structure.last.edited" value="Project" />
- <property name="project.structure.proportion" value="0.17" />
- <property name="project.structure.side.proportion" value="0.0" />
- <property name="settings.editor.selected.configurable" value="AndroidSdkUpdater" />
- </component>
- <component name="RecentsManager">
- <key name="CreateClassDialog.RecentsKey">
- <recent name="com.yearthreeproject.xbframework" />
- </key>
- <key name="MoveFile.RECENT_KEYS">
- <recent name="C:\Users\Eamonn\OneDrive\Documents\Y3Proj\app\src\main\res\raw" />
- </key>
- </component>
- <component name="RunDashboard">
- <option name="ruleStates">
- <list>
- <RuleState>
- <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
- </RuleState>
- <RuleState>
- <option name="name" value="StatusDashboardGroupingRule" />
- </RuleState>
- </list>
- </option>
- </component>
- <component name="RunManager">
- <configuration default="true" type="AndroidJUnit" factoryName="Android JUnit">
- <option name="TEST_OBJECT" value="class" />
- <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
- <method v="2">
- <option name="Android.Gradle.BeforeRunTask" enabled="true" />
- </method>
- </configuration>
- <configuration name="app" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
- <module name="app" />
- <option name="DEPLOY" value="true" />
- <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
- <option name="DEPLOY_AS_INSTANT" value="false" />
- <option name="ARTIFACT_NAME" value="" />
- <option name="PM_INSTALL_OPTIONS" value="" />
- <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
- <option name="ACTIVITY_EXTRA_FLAGS" value="" />
- <option name="MODE" value="default_activity" />
- <option name="CLEAR_LOGCAT" value="false" />
- <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
- <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
- <option name="FORCE_STOP_RUNNING_APP" value="true" />
- <option name="TARGET_SELECTION_MODE" value="DEVICE_AND_SNAPSHOT_COMBO_BOX" />
- <option name="USE_LAST_SELECTED_DEVICE" value="false" />
- <option name="PREFERRED_AVD" value="" />
- <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
- <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
- <option name="DEBUGGER_TYPE" value="Auto" />
- <Auto>
- <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
- <option name="SHOW_STATIC_VARS" value="true" />
- <option name="WORKING_DIR" value="" />
- <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
- <option name="SHOW_OPTIMIZED_WARNING" value="true" />
- </Auto>
- <Hybrid>
- <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
- <option name="SHOW_STATIC_VARS" value="true" />
- <option name="WORKING_DIR" value="" />
- <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
- <option name="SHOW_OPTIMIZED_WARNING" value="true" />
- </Hybrid>
- <Java />
- <Native>
- <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
- <option name="SHOW_STATIC_VARS" value="true" />
- <option name="WORKING_DIR" value="" />
- <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
- <option name="SHOW_OPTIMIZED_WARNING" value="true" />
- </Native>
- <Profilers>
- <option name="ADVANCED_PROFILING_ENABLED" value="false" />
- <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
- <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" />
- </Profilers>
- <option name="DEEP_LINK" value="" />
- <option name="ACTIVITY_CLASS" value="" />
- <method v="2">
- <option name="Android.Gradle.BeforeRunTask" enabled="true" />
- </method>
- </configuration>
- </component>
- <component name="SvnConfiguration">
- <configuration />
- </component>
- <component name="TaskManager">
- <task active="true" id="Default" summary="Default task">
- <changelist id="901156b8-4ed3-48c9-9feb-1fa598856dd4" name="Default Changelist" comment="" />
- <created>1572372213329</created>
- <option name="number" value="Default" />
- <option name="presentableId" value="Default" />
- <updated>1572372213329</updated>
- </task>
- <task id="LOCAL-00001" summary="Change to v0.0.1">
- <created>1573421262618</created>
- <option name="number" value="00001" />
- <option name="presentableId" value="LOCAL-00001" />
- <option name="project" value="LOCAL" />
- <updated>1573421262618</updated>
- </task>
- <task id="LOCAL-00002" summary="Change to v0.0.2">
- <created>1573656911327</created>
- <option name="number" value="00002" />
- <option name="presentableId" value="LOCAL-00002" />
- <option name="project" value="LOCAL" />
- <updated>1573656911327</updated>
- </task>
- <task id="LOCAL-00003" summary="Daily Commit Changes: - Implemented a button to reset the boxJSONData - Implemented the addition to the boxJSON">
- <created>1580408186131</created>
- <option name="number" value="00003" />
- <option name="presentableId" value="LOCAL-00003" />
- <option name="project" value="LOCAL" />
- <updated>1580408186131</updated>
- </task>
- <task id="LOCAL-00004" summary="Daily Commit Changes: - Implemented Date check for boxes - Introduced localUserData json for local meta data">
- <created>1580491517972</created>
- <option name="number" value="00004" />
- <option name="presentableId" value="LOCAL-00004" />
- <option name="project" value="LOCAL" />
- <updated>1580491517972</updated>
- </task>
- <task id="LOCAL-00005" summary="Daily Commit Changes: - Implemented more of the survey creation page including: 0 A notification section 0 A completed survey layout (with one specific bug, but everything else works great)">
- <created>1581454623609</created>
- <option name="number" value="00005" />
- <option name="presentableId" value="LOCAL-00005" />
- <option name="project" value="LOCAL" />
- <updated>1581454623609</updated>
- </task>
- <task id="LOCAL-00006" summary="Daily Commit Changes: - Created the "template" for all the experiment details that can be manipulated - Have defined a plan for the differences between the layout types and how to move forward">
- <created>1581509178069</created>
- <option name="number" value="00006" />
- <option name="presentableId" value="LOCAL-00006" />
- <option name="project" value="LOCAL" />
- <updated>1581509178069</updated>
- </task>
- <option name="localTasksCounter" value="7" />
- <servers />
- </component>
- <component name="TodoView">
- <todo-panel id="selected-file">
- <is-autoscroll-to-source value="true" />
- </todo-panel>
- <todo-panel id="all">
- <are-packages-shown value="true" />
- <is-autoscroll-to-source value="true" />
- </todo-panel>
- </component>
- <component name="ToolWindowManager">
- <frame x="-6" y="-6" width="1513" height="973" extended-state="6" />
- <editor active="true" />
- <layout>
- <window_info id="Captures" order="0" sideWeight="0.5071048" side_tool="true" weight="0.15672205" />
- <window_info id="Structure" order="1" side_tool="true" />
- <window_info id="Favorites" order="2" side_tool="true" />
- <window_info id="Build Variants" order="3" side_tool="true" />
- <window_info id="Image Layers" order="4" />
- <window_info id="Designer" order="5" />
- <window_info content_ui="combo" id="Project" order="6" sideWeight="0.35371178" visible="true" weight="0.10927835" />
- <window_info id="Resources Explorer" order="7" show_stripe_button="false" sideWeight="0.49858624" weight="0.3289275" />
- <window_info id="Capture Tool" order="8" />
- <window_info id="Device File Explorer" order="9" sideWeight="0.6462882" side_tool="true" visible="true" weight="0.10927835" />
- <window_info anchor="bottom" id="Messages" order="0" sideWeight="0.49960256" weight="0.32936078" />
- <window_info anchor="bottom" id="Run" order="1" sideWeight="0.49823323" weight="0.32384342" />
- <window_info anchor="bottom" id="TODO" order="2" sideWeight="0.49960256" weight="0.32574567" />
- <window_info anchor="bottom" id="Debug" order="3" />
- <window_info anchor="bottom" id="Terminal" order="4" sideWeight="0.49960256" weight="0.32810047" />
- <window_info anchor="bottom" id="Version Control" order="5" sideWeight="0.49920508" weight="0.32810047" />
- <window_info anchor="bottom" id="Build" order="6" sideWeight="0.4898036" weight="0.14709371" />
- <window_info anchor="bottom" id="Android Profiler" order="7" weight="0.32967034" />
- <window_info anchor="bottom" id="Find" order="8" sideWeight="0.49705535" weight="0.3289166" />
- <window_info active="true" anchor="bottom" id="Event Log" order="9" sideWeight="0.48430142" visible="true" weight="0.18505338" />
- <window_info anchor="right" id="Capture Analysis" order="0" />
- <window_info anchor="right" id="Gradle" order="1" weight="0.32968277" />
- <window_info anchor="right" id="Theme Preview" order="2" />
- <window_info anchor="right" id="Preview" order="3" weight="0.35601375" />
- <window_info anchor="right" id="Palette	" order="4" />
- <window_info anchor="right" id="Assistant" order="5" weight="0.32942432" />
- <window_info anchor="right" id="Logcat" order="6" sideWeight="0.49058086" visible="true" weight="0.23230241" />
- </layout>
- </component>
- <component name="VcsManagerConfiguration">
- <MESSAGE value="Change to v0.0.1" />
- <MESSAGE value="Change to v0.0.2" />
- <MESSAGE value="Daily Commit Changes: - Implemented a button to reset the boxJSONData - Implemented the addition to the boxJSON" />
- <MESSAGE value="Daily Commit Changes: - Implemented Date check for boxes - Introduced localUserData json for local meta data" />
- <MESSAGE value="Daily Commit Changes: - Implemented more of the survey creation page including: 0 A notification section 0 A completed survey layout (with one specific bug, but everything else works great)" />
- <MESSAGE value="Daily Commit Changes: - Created the "template" for all the experiment details that can be manipulated - Have defined a plan for the differences between the layout types and how to move forward" />
- <option name="LAST_COMMIT_MESSAGE" value="Daily Commit Changes: - Created the "template" for all the experiment details that can be manipulated - Have defined a plan for the differences between the layout types and how to move forward" />
- </component>
- <component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="323">
- <caret line="19" column="67" lean-forward="true" selection-start-line="19" selection-start-column="67" selection-end-line="19" selection-end-column="67" />
- </state>
- </provider>
- <provider editor-type-id="android-designer2" />
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_new_box.xml">
- <provider selected="true" editor-type-id="text-editor" />
- <provider editor-type-id="android-designer2" />
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_boxes.xml">
- <provider editor-type-id="text-editor">
- <state relative-caret-position="493">
- <caret line="29" column="45" lean-forward="true" selection-start-line="29" selection-start-column="45" selection-end-line="29" selection-end-column="45" />
- </state>
- </provider>
- <provider selected="true" editor-type-id="android-designer2" />
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_about.xml">
- <provider editor-type-id="text-editor">
- <state relative-caret-position="629">
- <caret line="37" column="11" lean-forward="true" selection-start-line="37" selection-start-column="11" selection-end-line="37" selection-end-column="11" />
- </state>
- </provider>
- <provider selected="true" editor-type-id="android-designer2" />
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/mipmap-xhdpi/ic_launcher.png">
- <provider selected="true" editor-type-id="images" />
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/mipmap-hdpi/ic_launcher.png">
- <provider selected="true" editor-type-id="images" />
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_shop.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="646">
- <caret line="38" column="15" selection-start-line="38" selection-start-column="15" selection-end-line="38" selection-end-column="15" />
- </state>
- </provider>
- <provider editor-type-id="android-designer2" />
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/raw/shop.json" />
- <entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/ic_launcher_background.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state>
- <caret selection-end-column="2" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/drawable-v24/ic_launcher_foreground.xml">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/menu/menu_main.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="170">
- <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
- </state>
- </provider>
- <provider editor-type-id="android-designer2" />
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/CommonFunctions.java" />
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/AboutActivity.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="408">
- <caret line="24" column="61" selection-start-line="24" selection-start-column="61" selection-end-line="24" selection-end-column="61" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_experiment.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="476">
- <caret line="28" column="54" lean-forward="true" selection-end-line="28" selection-end-column="54" />
- </state>
- </provider>
- <provider editor-type-id="android-designer2" />
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_experiment.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="17">
- <caret line="1" column="62" selection-end-line="51" selection-end-column="15" />
- </state>
- </provider>
- <provider editor-type-id="android-designer2" />
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_experiment_survey_creator.xml" />
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_experiment_survey_creator.xml" />
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_new_box.xml">
- <provider editor-type-id="text-editor">
- <state relative-caret-position="3162">
- <caret line="186" column="27" selection-start-line="186" selection-start-column="27" selection-end-line="186" selection-end-column="27" />
- </state>
- </provider>
- <provider selected="true" editor-type-id="android-designer2" />
- </entry>
- <entry file="file://$USER_HOME$/Documents/AndroidStudio/DeviceExplorer/Pixel_2_API_29 [emulator-5554]/data/data/com.yearthreeproject.xbframework/files/boxData.json" />
- <entry file="file://$PROJECT_DIR$/app/src/main/res/values/arrays.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="187">
- <caret line="11" column="12" lean-forward="true" selection-start-line="11" selection-start-column="12" selection-end-line="11" selection-end-column="12" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/FileStoreReader.java" />
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/ShopActivity.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="678">
- <caret line="149" column="49" lean-forward="true" selection-start-line="149" selection-start-column="49" selection-end-line="149" selection-end-column="49" />
- </state>
- </provider>
- </entry>
- <entry file="file://$USER_HOME$/Documents/AndroidStudio/DeviceExplorer/emulator-5554/data/data/com.yearthreeproject.xbframework/files/boxData.json" />
- <entry file="file://$USER_HOME$/Documents/AndroidStudio/DeviceExplorer/emulator-5554/data/data/com.yearthreeproject.xbframework/files/localUserData.json" />
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_main.xml">
- <provider editor-type-id="text-editor">
- <state relative-caret-position="374">
- <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
- </state>
- </provider>
- <provider selected="true" editor-type-id="android-designer2" />
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/BoxesActivity.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="2023">
- <caret line="147" column="88" selection-start-line="147" selection-start-column="88" selection-end-line="147" selection-end-column="88" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/notification_icon.xml" />
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_shop.xml">
- <provider editor-type-id="text-editor" />
- <provider selected="true" editor-type-id="android-designer2" />
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_progress.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state>
- <caret selection-end-line="27" selection-end-column="15" />
- </state>
- </provider>
- <provider editor-type-id="android-designer2" />
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
- <provider editor-type-id="android-manifest" />
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="442">
- <caret line="35" column="34" selection-start-line="35" selection-start-column="34" selection-end-line="35" selection-end-column="34" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_testing.xml" />
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_progress.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="561">
- <caret line="33" lean-forward="true" selection-end-line="40" selection-end-column="15" />
- </state>
- </provider>
- <provider editor-type-id="android-designer2" />
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/MyNotificationPublisher.java" />
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_testing.xml" />
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/MainActivity.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="4182">
- <caret line="279" column="58" selection-start-line="279" selection-start-column="58" selection-end-line="279" selection-end-column="58" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/build.gradle">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="340">
- <caret line="20" column="8" selection-start-line="20" selection-start-column="8" selection-end-line="20" selection-end-column="8" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/build.gradle">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="476">
- <caret line="28" column="41" lean-forward="true" selection-start-line="28" selection-start-column="41" selection-end-line="28" selection-end-column="41" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/app/proguard-rules.pro">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/gradle.properties">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/settings.gradle">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="17">
- <caret line="1" column="30" selection-start-line="1" selection-start-column="30" selection-end-line="1" selection-end-column="30" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/local.properties">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/ExperimentActivity.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="680">
- <caret line="63" column="35" selection-start-line="63" selection-start-column="23" selection-end-line="63" selection-end-column="35" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/ProgressActivity.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="357">
- <caret line="21" lean-forward="true" selection-start-line="21" selection-end-line="21" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/raw/box.json">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="315">
- <caret line="38" column="23" lean-forward="true" selection-start-line="38" selection-start-column="23" selection-end-line="38" selection-end-column="23" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/TestingActivity.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="623">
- <caret line="102" column="48" lean-forward="true" selection-start-line="102" selection-start-column="48" selection-end-line="102" selection-end-column="48" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_login.xml">
- <provider editor-type-id="text-editor">
- <state relative-caret-position="170">
- <caret line="10" column="64" selection-start-line="10" selection-start-column="64" selection-end-line="10" selection-end-column="64" />
- </state>
- </provider>
- <provider selected="true" editor-type-id="android-designer2" />
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/ExperimentSurveyCreatorActivity.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="255">
- <caret line="87" lean-forward="true" selection-start-line="87" selection-end-line="87" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/LoginActivity.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="289">
- <caret line="25" column="60" selection-start-line="25" selection-start-column="60" selection-end-line="25" selection-end-column="60" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/NewBox.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="391">
- <caret line="67" selection-start-line="67" selection-end-line="67" />
- </state>
- </provider>
- </entry>
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/workspace-DESKTOP-6HHPPQT-3.xml b/.idea/workspace-DESKTOP-6HHPPQT-3.xml
deleted file mode 100644
index 6effc8510c0f454d143d86b4679123de46ec6caa..0000000000000000000000000000000000000000
--- a/.idea/workspace-DESKTOP-6HHPPQT-3.xml
+++ /dev/null
@@ -1,313 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="AndroidLayouts">
- <shared>
- <config />
- </shared>
- </component>
- <component name="AndroidLogFilters">
- <option name="TOOL_WINDOW_CUSTOM_FILTER" value="com.yearthreeproject.xbframework" />
- <option name="TOOL_WINDOW_LOG_LEVEL" value="verbose" />
- <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="No Filters" />
- </component>
- <component name="ChangeListManager">
- <list default="true" id="901156b8-4ed3-48c9-9feb-1fa598856dd4" name="Default Changelist" comment="Changes since last commit: - Colour changes for most pages">
- <change afterPath="$PROJECT_DIR$/app/src/main/res/raw/local_user_data.json" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/BoxesActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/BoxesActivity.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/LoginActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/LoginActivity.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/MainActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/MainActivity.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/ProgressActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/ProgressActivity.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/TestingActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/TestingActivity.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/content_login.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/content_login.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/content_progress.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/content_progress.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/res/values/styles.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/styles.xml" afterDir="false" />
- </list>
- <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
- <option name="SHOW_DIALOG" value="false" />
- <option name="HIGHLIGHT_CONFLICTS" value="true" />
- <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
- <option name="LAST_RESOLUTION" value="IGNORE" />
- </component>
- <component name="CodeInsightWorkspaceSettings">
- <option name="optimizeImportsOnTheFly" value="true" />
- </component>
- <component name="ExecutionTargetManager" SELECTED_TARGET="Pixel_2_API_29" />
- <component name="ExternalProjectsData">
- <projectState path="$PROJECT_DIR$">
- <ProjectState />
- </projectState>
- </component>
- <component name="ExternalProjectsManager">
- <system id="GRADLE">
- <state>
- <task path="$PROJECT_DIR$">
- <activation />
- </task>
- <task path="$PROJECT_DIR$/app">
- <activation />
- </task>
- <projects_view>
- <tree_state>
- <expand />
- <select />
- </tree_state>
- </projects_view>
- </state>
- </system>
- </component>
- <component name="FileTemplateManagerImpl">
- <option name="RECENT_TEMPLATES">
- <list>
- <option value="layoutResourceFile_vertical" />
- <option value="Class" />
- <option value="resourceFile" />
- <option value="valueResourceFile" />
- </list>
- </option>
- </component>
- <component name="Git.Settings">
- <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
- </component>
- <component name="ProjectId" id="1YGdFr4LLCXPCzaKdUL32gvMs2q" />
- <component name="ProjectLevelVcsManager" settingsEditedManually="true">
- <ConfirmationsSetting value="2" id="Add" />
- </component>
- <component name="PropertiesComponent">
- <property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
- <property name="DeviceAndSnapshotComboBoxAction.selectedDevice" value="Pixel_2_API_29" />
- <property name="DeviceAndSnapshotComboBoxAction.selectionTime" value="2020-02-11T20:50:41.427Z" />
- <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
- <property name="android.sdk.path" value="$USER_HOME$/AppData/Local/Android/Sdk" />
- <property name="last_opened_file_path" value="$PROJECT_DIR$" />
- <property name="project.structure.last.edited" value="Suggestions" />
- <property name="project.structure.proportion" value="0.17" />
- <property name="project.structure.side.proportion" value="0.2" />
- <property name="run.code.analysis.last.selected.profile" value="pProject Default" />
- <property name="settings.editor.selected.configurable" value="AndroidSdkUpdater" />
- </component>
- <component name="RecentsManager">
- <key name="MoveFile.RECENT_KEYS">
- <recent name="C:\Users\Eamonn\OneDrive\Documents\Y3Proj\app\src\main\res\" />
- <recent name="C:\Users\Eamonn\OneDrive\Documents\Y3Proj\app\src\main\res\drawable-xxhdpi" />
- <recent name="C:\Users\Eamonn\OneDrive\Documents\Y3Proj\app\src\main\res\raw" />
- </key>
- <key name="CreateClassDialog.RecentsKey">
- <recent name="com.yearthreeproject.xbframework" />
- </key>
- </component>
- <component name="RunDashboard">
- <option name="ruleStates">
- <list>
- <RuleState>
- <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
- </RuleState>
- <RuleState>
- <option name="name" value="StatusDashboardGroupingRule" />
- </RuleState>
- </list>
- </option>
- </component>
- <component name="RunManager">
- <configuration default="true" type="AndroidJUnit" factoryName="Android JUnit">
- <option name="TEST_OBJECT" value="class" />
- <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
- <method v="2">
- <option name="Android.Gradle.BeforeRunTask" enabled="true" />
- </method>
- </configuration>
- <configuration name="app" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
- <module name="app" />
- <option name="DEPLOY" value="true" />
- <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
- <option name="DEPLOY_AS_INSTANT" value="false" />
- <option name="ARTIFACT_NAME" value="" />
- <option name="PM_INSTALL_OPTIONS" value="" />
- <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
- <option name="ACTIVITY_EXTRA_FLAGS" value="" />
- <option name="MODE" value="default_activity" />
- <option name="CLEAR_LOGCAT" value="false" />
- <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
- <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
- <option name="FORCE_STOP_RUNNING_APP" value="true" />
- <option name="TARGET_SELECTION_MODE" value="DEVICE_AND_SNAPSHOT_COMBO_BOX" />
- <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
- <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
- <option name="DEBUGGER_TYPE" value="Auto" />
- <Auto>
- <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
- <option name="SHOW_STATIC_VARS" value="true" />
- <option name="WORKING_DIR" value="" />
- <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
- <option name="SHOW_OPTIMIZED_WARNING" value="true" />
- </Auto>
- <Hybrid>
- <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
- <option name="SHOW_STATIC_VARS" value="true" />
- <option name="WORKING_DIR" value="" />
- <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
- <option name="SHOW_OPTIMIZED_WARNING" value="true" />
- </Hybrid>
- <Java />
- <Native>
- <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
- <option name="SHOW_STATIC_VARS" value="true" />
- <option name="WORKING_DIR" value="" />
- <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
- <option name="SHOW_OPTIMIZED_WARNING" value="true" />
- </Native>
- <Profilers>
- <option name="ADVANCED_PROFILING_ENABLED" value="false" />
- <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
- <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" />
- </Profilers>
- <option name="DEEP_LINK" value="" />
- <option name="ACTIVITY_CLASS" value="" />
- <method v="2">
- <option name="Android.Gradle.BeforeRunTask" enabled="true" />
- </method>
- </configuration>
- </component>
- <component name="SvnConfiguration">
- <configuration />
- </component>
- <component name="TaskManager">
- <task active="true" id="Default" summary="Default task">
- <changelist id="901156b8-4ed3-48c9-9feb-1fa598856dd4" name="Default Changelist" comment="" />
- <created>1572372213329</created>
- <option name="number" value="Default" />
- <option name="presentableId" value="Default" />
- <updated>1572372213329</updated>
- </task>
- <task id="LOCAL-00001" summary="Change to v0.0.1">
- <created>1573421262618</created>
- <option name="number" value="00001" />
- <option name="presentableId" value="LOCAL-00001" />
- <option name="project" value="LOCAL" />
- <updated>1573421262618</updated>
- </task>
- <task id="LOCAL-00002" summary="Change to v0.0.2">
- <created>1573656911327</created>
- <option name="number" value="00002" />
- <option name="presentableId" value="LOCAL-00002" />
- <option name="project" value="LOCAL" />
- <updated>1573656911327</updated>
- </task>
- <task id="LOCAL-00003" summary="Daily Commit Changes: - Implemented a button to reset the boxJSONData - Implemented the addition to the boxJSON">
- <created>1580408186131</created>
- <option name="number" value="00003" />
- <option name="presentableId" value="LOCAL-00003" />
- <option name="project" value="LOCAL" />
- <updated>1580408186131</updated>
- </task>
- <task id="LOCAL-00004" summary="Daily Commit Changes: - Implemented Date check for boxes - Introduced localUserData json for local meta data">
- <created>1580491517972</created>
- <option name="number" value="00004" />
- <option name="presentableId" value="LOCAL-00004" />
- <option name="project" value="LOCAL" />
- <updated>1580491517972</updated>
- </task>
- <task id="LOCAL-00005" summary="Daily Commit Changes: - Implemented more of the survey creation page including: 0 A notification section 0 A completed survey layout (with one specific bug, but everything else works great)">
- <created>1581454623609</created>
- <option name="number" value="00005" />
- <option name="presentableId" value="LOCAL-00005" />
- <option name="project" value="LOCAL" />
- <updated>1581454623609</updated>
- </task>
- <task id="LOCAL-00006" summary="Daily Commit Changes: - Created the "template" for all the experiment details that can be manipulated - Have defined a plan for the differences between the layout types and how to move forward">
- <created>1581509178069</created>
- <option name="number" value="00006" />
- <option name="presentableId" value="LOCAL-00006" />
- <option name="project" value="LOCAL" />
- <updated>1581509178069</updated>
- </task>
- <task id="LOCAL-00007" summary="Changes since last commit: - Made small changes to code to suppress typos or errors or warnings">
- <created>1582048181350</created>
- <option name="number" value="00007" />
- <option name="presentableId" value="LOCAL-00007" />
- <option name="project" value="LOCAL" />
- <updated>1582048181350</updated>
- </task>
- <task id="LOCAL-00008" summary="Changes since last commit: - Completed the survey response functionality - Started with the notification functionality, have a worked version in testing activity (dev screen)">
- <created>1582668852049</created>
- <option name="number" value="00008" />
- <option name="presentableId" value="LOCAL-00008" />
- <option name="project" value="LOCAL" />
- <updated>1582668852050</updated>
- </task>
- <task id="LOCAL-00009" summary="Changes since last commit: - Fixing local index issue">
- <created>1582903224886</created>
- <option name="number" value="00009" />
- <option name="presentableId" value="LOCAL-00009" />
- <option name="project" value="LOCAL" />
- <updated>1582903224887</updated>
- </task>
- <task id="LOCAL-00010" summary="Changes since last commit: - Fixing local index issue">
- <created>1582905521139</created>
- <option name="number" value="00010" />
- <option name="presentableId" value="LOCAL-00010" />
- <option name="project" value="LOCAL" />
- <updated>1582905521139</updated>
- </task>
- <task id="LOCAL-00011" summary="Changes since last commit: - Fixing local index issue">
- <created>1583319473806</created>
- <option name="number" value="00011" />
- <option name="presentableId" value="LOCAL-00011" />
- <option name="project" value="LOCAL" />
- <updated>1583319473806</updated>
- </task>
- <task id="LOCAL-00012" summary="Changes since last commit: - Colour changes for most pages">
- <created>1584458255083</created>
- <option name="number" value="00012" />
- <option name="presentableId" value="LOCAL-00012" />
- <option name="project" value="LOCAL" />
- <updated>1584458255083</updated>
- </task>
- <option name="localTasksCounter" value="13" />
- <servers />
- </component>
- <component name="Vcs.Log.Tabs.Properties">
- <option name="TAB_STATES">
- <map>
- <entry key="MAIN">
- <value>
- <State>
- <option name="COLUMN_ORDER" />
- </State>
- </value>
- </entry>
- </map>
- </option>
- <option name="RECENT_FILTERS">
- <map>
- <entry key="Branch">
- <value>
- <list />
- </value>
- </entry>
- <entry key="User">
- <value>
- <list />
- </value>
- </entry>
- </map>
- </option>
- </component>
- <component name="VcsManagerConfiguration">
- <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
- <MESSAGE value="Change to v0.0.1" />
- <MESSAGE value="Change to v0.0.2" />
- <MESSAGE value="Daily Commit Changes: - Implemented a button to reset the boxJSONData - Implemented the addition to the boxJSON" />
- <MESSAGE value="Daily Commit Changes: - Implemented Date check for boxes - Introduced localUserData json for local meta data" />
- <MESSAGE value="Daily Commit Changes: - Implemented more of the survey creation page including: 0 A notification section 0 A completed survey layout (with one specific bug, but everything else works great)" />
- <MESSAGE value="Daily Commit Changes: - Created the "template" for all the experiment details that can be manipulated - Have defined a plan for the differences between the layout types and how to move forward" />
- <MESSAGE value="Changes since last commit: - Finished the newBox and ExperimentSurveyCreator pages - Full JSON production is completed so far for the boxes and experiments" />
- <MESSAGE value="Changes since last commit: - Made small changes to code to suppress typos or errors or warnings" />
- <MESSAGE value="Changes since last commit: - Completed the survey response functionality - Started with the notification functionality, have a worked version in testing activity (dev screen)" />
- <MESSAGE value="Changes since last commit: - Fixing local index issue" />
- <MESSAGE value="Changes since last commit: - Colour changes for most pages" />
- <option name="LAST_COMMIT_MESSAGE" value="Changes since last commit: - Colour changes for most pages" />
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/workspace-DESKTOP-6HHPPQT-4.xml b/.idea/workspace-DESKTOP-6HHPPQT-4.xml
deleted file mode 100644
index 76985a0d94d8341b5e38dac7026c011e72f351d2..0000000000000000000000000000000000000000
--- a/.idea/workspace-DESKTOP-6HHPPQT-4.xml
+++ /dev/null
@@ -1,339 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="AndroidLayouts">
- <shared>
- <config />
- </shared>
- </component>
- <component name="AndroidLogFilters">
- <option name="TOOL_WINDOW_CUSTOM_FILTER" value="com.yearthreeproject.xbframework " />
- <option name="TOOL_WINDOW_LOG_LEVEL" value="verbose" />
- <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="No Filters" />
- </component>
- <component name="ChangeListManager">
- <list default="true" id="901156b8-4ed3-48c9-9feb-1fa598856dd4" name="Default Changelist" comment="Changes since last commit: - Finished progress page - Implemented Auth0 login and signup">
- <change afterPath="$PROJECT_DIR$/.idea/dictionaries/eamon.xml" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/.idea/workspace-DESKTOP-6HHPPQT-2.xml" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/.idea/workspace-DESKTOP-6HHPPQT-3.xml" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/.idea/workspace-DESKTOP-FQUKLHE.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/BoxesActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/BoxesActivity.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/ExperimentActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/ExperimentActivity.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/ExperimentSurveyCreatorActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/ExperimentSurveyCreatorActivity.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/LoginActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/LoginActivity.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/MainActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/MainActivity.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/NewBox.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/NewBox.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/ProjectMacros.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/ProjectMacros.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/SurveyResponseActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/SurveyResponseActivity.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/TestingActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/TestingActivity.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/content_boxes.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/content_boxes.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/content_main.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/content_main.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/content_new_box.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/content_new_box.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/content_progress.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/content_progress.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/res/raw/local_user_data.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/raw/local_user_data.json" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/res/values/arrays.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/arrays.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/res/values/colors.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/colors.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/res/values/styles.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/styles.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle" afterDir="false" />
- </list>
- <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
- <option name="SHOW_DIALOG" value="false" />
- <option name="HIGHLIGHT_CONFLICTS" value="true" />
- <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
- <option name="LAST_RESOLUTION" value="IGNORE" />
- </component>
- <component name="CodeInsightWorkspaceSettings">
- <option name="optimizeImportsOnTheFly" value="true" />
- </component>
- <component name="ExecutionTargetManager" SELECTED_TARGET="Pixel_2_API_29_64" />
- <component name="ExternalProjectsData">
- <projectState path="$PROJECT_DIR$">
- <ProjectState />
- </projectState>
- </component>
- <component name="ExternalProjectsManager">
- <system id="GRADLE">
- <state>
- <task path="$PROJECT_DIR$">
- <activation />
- </task>
- <task path="$PROJECT_DIR$/app">
- <activation />
- </task>
- <projects_view>
- <tree_state>
- <expand />
- <select />
- </tree_state>
- </projects_view>
- </state>
- </system>
- </component>
- <component name="FileTemplateManagerImpl">
- <option name="RECENT_TEMPLATES">
- <list>
- <option value="layoutResourceFile_vertical" />
- <option value="Class" />
- <option value="resourceFile" />
- <option value="valueResourceFile" />
- </list>
- </option>
- </component>
- <component name="Git.Settings">
- <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
- </component>
- <component name="ProjectId" id="1YGdFr4LLCXPCzaKdUL32gvMs2q" />
- <component name="ProjectLevelVcsManager" settingsEditedManually="true">
- <ConfirmationsSetting value="2" id="Add" />
- </component>
- <component name="PropertiesComponent">
- <property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
- <property name="DeviceAndSnapshotComboBoxAction.selectedDevice" value="Pixel_2_API_29_64" />
- <property name="DeviceAndSnapshotComboBoxAction.selectionTime" value="2020-03-29T20:24:49.862Z" />
- <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
- <property name="android.sdk.path" value="$USER_HOME$/AppData/Local/Android/Sdk" />
- <property name="last_opened_file_path" value="$PROJECT_DIR$" />
- <property name="project.structure.last.edited" value="Modules" />
- <property name="project.structure.proportion" value="0.17578948" />
- <property name="project.structure.side.proportion" value="0.2" />
- <property name="run.code.analysis.last.selected.profile" value="pProject Default" />
- <property name="settings.editor.selected.configurable" value="settings.github" />
- </component>
- <component name="PsdUISettings">
- <option name="MODULE_TAB" value="Default Config" />
- </component>
- <component name="RecentsManager">
- <key name="MoveFile.RECENT_KEYS">
- <recent name="C:\Users\Eamonn\OneDrive\Documents\Y3Proj\app\src\main\res\" />
- <recent name="C:\Users\Eamonn\OneDrive\Documents\Y3Proj\app\src\main\res\drawable-xxhdpi" />
- <recent name="C:\Users\Eamonn\OneDrive\Documents\Y3Proj\app\src\main\res\raw" />
- </key>
- <key name="CreateClassDialog.RecentsKey">
- <recent name="com.yearthreeproject.xbframework" />
- </key>
- </component>
- <component name="RunDashboard">
- <option name="ruleStates">
- <list>
- <RuleState>
- <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
- </RuleState>
- <RuleState>
- <option name="name" value="StatusDashboardGroupingRule" />
- </RuleState>
- </list>
- </option>
- </component>
- <component name="RunManager">
- <configuration default="true" type="AndroidJUnit" factoryName="Android JUnit">
- <option name="TEST_OBJECT" value="class" />
- <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
- <method v="2">
- <option name="Android.Gradle.BeforeRunTask" enabled="true" />
- </method>
- </configuration>
- <configuration name="app" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
- <module name="app" />
- <option name="DEPLOY" value="true" />
- <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
- <option name="DEPLOY_AS_INSTANT" value="false" />
- <option name="ARTIFACT_NAME" value="" />
- <option name="PM_INSTALL_OPTIONS" value="" />
- <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
- <option name="ACTIVITY_EXTRA_FLAGS" value="" />
- <option name="MODE" value="default_activity" />
- <option name="CLEAR_LOGCAT" value="false" />
- <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
- <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
- <option name="FORCE_STOP_RUNNING_APP" value="true" />
- <option name="TARGET_SELECTION_MODE" value="DEVICE_AND_SNAPSHOT_COMBO_BOX" />
- <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
- <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
- <option name="DEBUGGER_TYPE" value="Auto" />
- <Auto>
- <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
- <option name="SHOW_STATIC_VARS" value="true" />
- <option name="WORKING_DIR" value="" />
- <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
- <option name="SHOW_OPTIMIZED_WARNING" value="true" />
- </Auto>
- <Hybrid>
- <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
- <option name="SHOW_STATIC_VARS" value="true" />
- <option name="WORKING_DIR" value="" />
- <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
- <option name="SHOW_OPTIMIZED_WARNING" value="true" />
- </Hybrid>
- <Java />
- <Native>
- <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
- <option name="SHOW_STATIC_VARS" value="true" />
- <option name="WORKING_DIR" value="" />
- <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
- <option name="SHOW_OPTIMIZED_WARNING" value="true" />
- </Native>
- <Profilers>
- <option name="ADVANCED_PROFILING_ENABLED" value="false" />
- <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
- <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" />
- </Profilers>
- <option name="DEEP_LINK" value="" />
- <option name="ACTIVITY_CLASS" value="" />
- <method v="2">
- <option name="Android.Gradle.BeforeRunTask" enabled="true" />
- </method>
- </configuration>
- </component>
- <component name="SvnConfiguration">
- <configuration />
- </component>
- <component name="TaskManager">
- <task active="true" id="Default" summary="Default task">
- <changelist id="901156b8-4ed3-48c9-9feb-1fa598856dd4" name="Default Changelist" comment="" />
- <created>1572372213329</created>
- <option name="number" value="Default" />
- <option name="presentableId" value="Default" />
- <updated>1572372213329</updated>
- </task>
- <task id="LOCAL-00001" summary="Change to v0.0.1">
- <created>1573421262618</created>
- <option name="number" value="00001" />
- <option name="presentableId" value="LOCAL-00001" />
- <option name="project" value="LOCAL" />
- <updated>1573421262618</updated>
- </task>
- <task id="LOCAL-00002" summary="Change to v0.0.2">
- <created>1573656911327</created>
- <option name="number" value="00002" />
- <option name="presentableId" value="LOCAL-00002" />
- <option name="project" value="LOCAL" />
- <updated>1573656911327</updated>
- </task>
- <task id="LOCAL-00003" summary="Daily Commit Changes: - Implemented a button to reset the boxJSONData - Implemented the addition to the boxJSON">
- <created>1580408186131</created>
- <option name="number" value="00003" />
- <option name="presentableId" value="LOCAL-00003" />
- <option name="project" value="LOCAL" />
- <updated>1580408186131</updated>
- </task>
- <task id="LOCAL-00004" summary="Daily Commit Changes: - Implemented Date check for boxes - Introduced localUserData json for local meta data">
- <created>1580491517972</created>
- <option name="number" value="00004" />
- <option name="presentableId" value="LOCAL-00004" />
- <option name="project" value="LOCAL" />
- <updated>1580491517972</updated>
- </task>
- <task id="LOCAL-00005" summary="Daily Commit Changes: - Implemented more of the survey creation page including: 0 A notification section 0 A completed survey layout (with one specific bug, but everything else works great)">
- <created>1581454623609</created>
- <option name="number" value="00005" />
- <option name="presentableId" value="LOCAL-00005" />
- <option name="project" value="LOCAL" />
- <updated>1581454623609</updated>
- </task>
- <task id="LOCAL-00006" summary="Daily Commit Changes: - Created the "template" for all the experiment details that can be manipulated - Have defined a plan for the differences between the layout types and how to move forward">
- <created>1581509178069</created>
- <option name="number" value="00006" />
- <option name="presentableId" value="LOCAL-00006" />
- <option name="project" value="LOCAL" />
- <updated>1581509178069</updated>
- </task>
- <task id="LOCAL-00007" summary="Changes since last commit: - Made small changes to code to suppress typos or errors or warnings">
- <created>1582048181350</created>
- <option name="number" value="00007" />
- <option name="presentableId" value="LOCAL-00007" />
- <option name="project" value="LOCAL" />
- <updated>1582048181350</updated>
- </task>
- <task id="LOCAL-00008" summary="Changes since last commit: - Completed the survey response functionality - Started with the notification functionality, have a worked version in testing activity (dev screen)">
- <created>1582668852049</created>
- <option name="number" value="00008" />
- <option name="presentableId" value="LOCAL-00008" />
- <option name="project" value="LOCAL" />
- <updated>1582668852050</updated>
- </task>
- <task id="LOCAL-00009" summary="Changes since last commit: - Fixing local index issue">
- <created>1582903224886</created>
- <option name="number" value="00009" />
- <option name="presentableId" value="LOCAL-00009" />
- <option name="project" value="LOCAL" />
- <updated>1582903224887</updated>
- </task>
- <task id="LOCAL-00010" summary="Changes since last commit: - Fixing local index issue">
- <created>1582905521139</created>
- <option name="number" value="00010" />
- <option name="presentableId" value="LOCAL-00010" />
- <option name="project" value="LOCAL" />
- <updated>1582905521139</updated>
- </task>
- <task id="LOCAL-00011" summary="Changes since last commit: - Fixing local index issue">
- <created>1583319473806</created>
- <option name="number" value="00011" />
- <option name="presentableId" value="LOCAL-00011" />
- <option name="project" value="LOCAL" />
- <updated>1583319473806</updated>
- </task>
- <task id="LOCAL-00012" summary="Changes since last commit: - Colour changes for most pages">
- <created>1584458255083</created>
- <option name="number" value="00012" />
- <option name="presentableId" value="LOCAL-00012" />
- <option name="project" value="LOCAL" />
- <updated>1584458255083</updated>
- </task>
- <task id="LOCAL-00013" summary="Changes since last commit: - Finished progress page - Implemented Auth0 login and signup">
- <created>1585326733562</created>
- <option name="number" value="00013" />
- <option name="presentableId" value="LOCAL-00013" />
- <option name="project" value="LOCAL" />
- <updated>1585326733562</updated>
- </task>
- <option name="localTasksCounter" value="14" />
- <servers />
- </component>
- <component name="Vcs.Log.Tabs.Properties">
- <option name="TAB_STATES">
- <map>
- <entry key="MAIN">
- <value>
- <State>
- <option name="COLUMN_ORDER" />
- </State>
- </value>
- </entry>
- </map>
- </option>
- <option name="RECENT_FILTERS">
- <map>
- <entry key="Branch">
- <value>
- <list />
- </value>
- </entry>
- <entry key="User">
- <value>
- <list />
- </value>
- </entry>
- </map>
- </option>
- </component>
- <component name="VcsManagerConfiguration">
- <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
- <MESSAGE value="Change to v0.0.1" />
- <MESSAGE value="Change to v0.0.2" />
- <MESSAGE value="Daily Commit Changes: - Implemented a button to reset the boxJSONData - Implemented the addition to the boxJSON" />
- <MESSAGE value="Daily Commit Changes: - Implemented Date check for boxes - Introduced localUserData json for local meta data" />
- <MESSAGE value="Daily Commit Changes: - Implemented more of the survey creation page including: 0 A notification section 0 A completed survey layout (with one specific bug, but everything else works great)" />
- <MESSAGE value="Daily Commit Changes: - Created the "template" for all the experiment details that can be manipulated - Have defined a plan for the differences between the layout types and how to move forward" />
- <MESSAGE value="Changes since last commit: - Finished the newBox and ExperimentSurveyCreator pages - Full JSON production is completed so far for the boxes and experiments" />
- <MESSAGE value="Changes since last commit: - Made small changes to code to suppress typos or errors or warnings" />
- <MESSAGE value="Changes since last commit: - Completed the survey response functionality - Started with the notification functionality, have a worked version in testing activity (dev screen)" />
- <MESSAGE value="Changes since last commit: - Fixing local index issue" />
- <MESSAGE value="Changes since last commit: - Colour changes for most pages" />
- <MESSAGE value="Changes since last commit: - Finished progress page - Implemented Auth0 login and signup" />
- <option name="LAST_COMMIT_MESSAGE" value="Changes since last commit: - Finished progress page - Implemented Auth0 login and signup" />
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/workspace-DESKTOP-6HHPPQT.xml b/.idea/workspace-DESKTOP-6HHPPQT.xml
deleted file mode 100644
index 95583b00305f8301965be4a1ed2228aceb52443d..0000000000000000000000000000000000000000
--- a/.idea/workspace-DESKTOP-6HHPPQT.xml
+++ /dev/null
@@ -1,670 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="AndroidLayouts">
- <shared>
- <config />
- </shared>
- </component>
- <component name="AndroidLogFilters">
- <option name="TOOL_WINDOW_LOG_LEVEL" value="verbose" />
- <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="No Filters" />
- </component>
- <component name="BookmarkManager">
- <bookmark url="file://$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/LoginActivity.java" line="41" />
- </component>
- <component name="ChangeListManager">
- <list default="true" id="901156b8-4ed3-48c9-9feb-1fa598856dd4" name="Default Changelist" comment="">
- <change afterPath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/MyNotificationPublisher.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/TestingActivity.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/notification_icon.xml" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_testing.xml" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/src/main/res/layout/content_testing.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/BoxesActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/BoxesActivity.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/ExperimentActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/ExperimentActivity.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/ExperimentSurveyCreatorActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/ExperimentSurveyCreatorActivity.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/MainActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/MainActivity.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/ProgressActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/ProgressActivity.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/content_main.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/content_main.xml" afterDir="false" />
- </list>
- <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
- <option name="SHOW_DIALOG" value="false" />
- <option name="HIGHLIGHT_CONFLICTS" value="true" />
- <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
- <option name="LAST_RESOLUTION" value="IGNORE" />
- </component>
- <component name="CodeInsightWorkspaceSettings">
- <option name="optimizeImportsOnTheFly" value="true" />
- </component>
- <component name="DefaultGradleProjectSettings">
- <option name="isMigrated" value="true" />
- </component>
- <component name="ExecutionTargetManager" SELECTED_TARGET="Pixel_2_API_29" />
- <component name="ExternalProjectsManager">
- <system id="GRADLE">
- <state>
- <projects_view />
- </state>
- </system>
- </component>
- <component name="FileEditorManager">
- <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/MainActivity.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="4692">
- <caret line="309" column="1" selection-start-line="309" selection-start-column="1" selection-end-line="309" selection-end-column="1" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/ExperimentSurveyCreatorActivity.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="430">
- <caret line="170" column="109" selection-start-line="170" selection-start-column="109" selection-end-line="170" selection-end-column="109" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/ProgressActivity.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="153">
- <caret line="16" selection-start-line="16" selection-end-line="16" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- </leaf>
- </component>
- <component name="FileTemplateManagerImpl">
- <option name="RECENT_TEMPLATES">
- <list>
- <option value="valueResourceFile" />
- <option value="resourceFile" />
- <option value="Class" />
- <option value="layoutResourceFile_vertical" />
- </list>
- </option>
- </component>
- <component name="FindInProjectRecents">
- <findStrings>
- <find>testing</find>
- <find>loginButton</find>
- <find>Delete</find>
- <find>CropImage</find>
- <find>TitleList</find>
- <find>experimentTitle</find>
- <find>EditText</find>
- <find>ID</find>
- <find>getid</find>
- <find>groupIndex</find>
- <find>inFiveLayout</find>
- <find>ExperimentIndex</find>
- <find>MEECS</find>
- <find>locked</find>
- <find>DateUntil</find>
- </findStrings>
- </component>
- <component name="Git.Settings">
- <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
- </component>
- <component name="IdeDocumentHistory">
- <option name="CHANGED_PATHS">
- <list>
- <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_experiments_list.xml" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/ArtefactShop.java" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_shop.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_progress.xml" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/NewExperiment.java" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/content_new_activity.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_new_experiment.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/content_new_experiment.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/values/strings.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/drawable/ic_logo.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/values/colors.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_about.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/values/idValues.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/content_about.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/content_boxes.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/content_experiments_list.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/content_login.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/content_progress.xml" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/ExperimentsListActivity.java" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/content_experiment.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/content_shop.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/raw/shop.json" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/CommonFunctions.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/AboutActivity.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/LoginActivity.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/ShopActivity.java" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_experiment_survey_creator_activity.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/content_experiment_survey_creator_.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_experiment_survey_creator.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/content_experiment_survey_creator.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/content_new_box.xml" />
- <option value="$PROJECT_DIR$/app/build.gradle" />
- <option value="$PROJECT_DIR$/app/src/main/res/raw/box.json" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/NewBox.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/FileStoreReader.java" />
- <option value="$PROJECT_DIR$/app/src/main/res/values/arrays.xml" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/ProgressActivity.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/ExperimentActivity.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/BoxesActivity.java" />
- <option value="$USER_HOME$/Documents/AndroidStudio/DeviceExplorer/emulator-5554/data/data/com.yearthreeproject.xbframework/files/localUserData.json" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/content_main.xml" />
- <option value="$PROJECT_DIR$/app/src/main/res/drawable/notification_icon.xml" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/MyNotificationPublisher.java" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/TestingPage.java" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_testing.xml" />
- <option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/MainActivity.java" />
- <option value="$PROJECT_DIR$/app/src/main/res/layout/content_testing.xml" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/TestingActivity.java" />
- <option value="$PROJECT_DIR$/build.gradle" />
- <option value="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/ExperimentSurveyCreatorActivity.java" />
- </list>
- </option>
- </component>
- <component name="ProjectFrameBounds" extendedState="6">
- <option name="x" value="1490" />
- <option name="width" value="1522" />
- <option name="height" value="1932" />
- </component>
- <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
- <component name="ProjectView">
- <navigator proportions="" version="1">
- <foldersAlwaysOnTop value="true" />
- </navigator>
- <panes>
- <pane id="Scope" />
- <pane id="AndroidView">
- <subPane>
- <expand>
- <path>
- <item name="XBFramework" type="1abcf292:AndroidViewProjectNode" />
- <item name="Gradle Scripts" type="ae0cef3a:AndroidBuildScriptsGroupNode" />
- </path>
- </expand>
- <select />
- </subPane>
- </pane>
- <pane id="ProjectPane" />
- <pane id="PackagesPane" />
- </panes>
- </component>
- <component name="PropertiesComponent">
- <property name="DeviceAndSnapshotComboBoxAction.selectedDevice" value="Pixel_2_API_29" />
- <property name="DeviceAndSnapshotComboBoxAction.selectionTime" value="2020-01-02T11:47:03.152Z" />
- <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
- <property name="android.sdk.path" value="$USER_HOME$/AppData/Local/Android/Sdk" />
- <property name="last_opened_file_path" value="$PROJECT_DIR$" />
- <property name="project.structure.last.edited" value="Project" />
- <property name="project.structure.proportion" value="0.17" />
- <property name="project.structure.side.proportion" value="0.0" />
- <property name="settings.editor.selected.configurable" value="AndroidSdkUpdater" />
- </component>
- <component name="RecentsManager">
- <key name="CreateClassDialog.RecentsKey">
- <recent name="com.yearthreeproject.xbframework" />
- </key>
- <key name="MoveFile.RECENT_KEYS">
- <recent name="C:\Users\Eamonn\OneDrive\Documents\Y3Proj\app\src\main\res\raw" />
- </key>
- </component>
- <component name="RunDashboard">
- <option name="ruleStates">
- <list>
- <RuleState>
- <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
- </RuleState>
- <RuleState>
- <option name="name" value="StatusDashboardGroupingRule" />
- </RuleState>
- </list>
- </option>
- </component>
- <component name="RunManager">
- <configuration default="true" type="AndroidJUnit" factoryName="Android JUnit">
- <option name="TEST_OBJECT" value="class" />
- <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
- <method v="2">
- <option name="Android.Gradle.BeforeRunTask" enabled="true" />
- </method>
- </configuration>
- <configuration name="app" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
- <module name="app" />
- <option name="DEPLOY" value="true" />
- <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
- <option name="DEPLOY_AS_INSTANT" value="false" />
- <option name="ARTIFACT_NAME" value="" />
- <option name="PM_INSTALL_OPTIONS" value="" />
- <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
- <option name="ACTIVITY_EXTRA_FLAGS" value="" />
- <option name="MODE" value="default_activity" />
- <option name="CLEAR_LOGCAT" value="false" />
- <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
- <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
- <option name="FORCE_STOP_RUNNING_APP" value="true" />
- <option name="TARGET_SELECTION_MODE" value="DEVICE_AND_SNAPSHOT_COMBO_BOX" />
- <option name="USE_LAST_SELECTED_DEVICE" value="false" />
- <option name="PREFERRED_AVD" value="" />
- <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
- <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
- <option name="DEBUGGER_TYPE" value="Auto" />
- <Auto>
- <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
- <option name="SHOW_STATIC_VARS" value="true" />
- <option name="WORKING_DIR" value="" />
- <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
- <option name="SHOW_OPTIMIZED_WARNING" value="true" />
- </Auto>
- <Hybrid>
- <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
- <option name="SHOW_STATIC_VARS" value="true" />
- <option name="WORKING_DIR" value="" />
- <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
- <option name="SHOW_OPTIMIZED_WARNING" value="true" />
- </Hybrid>
- <Java />
- <Native>
- <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
- <option name="SHOW_STATIC_VARS" value="true" />
- <option name="WORKING_DIR" value="" />
- <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
- <option name="SHOW_OPTIMIZED_WARNING" value="true" />
- </Native>
- <Profilers>
- <option name="ADVANCED_PROFILING_ENABLED" value="false" />
- <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
- <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" />
- </Profilers>
- <option name="DEEP_LINK" value="" />
- <option name="ACTIVITY_CLASS" value="" />
- <method v="2">
- <option name="Android.Gradle.BeforeRunTask" enabled="true" />
- </method>
- </configuration>
- </component>
- <component name="SvnConfiguration">
- <configuration />
- </component>
- <component name="TaskManager">
- <task active="true" id="Default" summary="Default task">
- <changelist id="901156b8-4ed3-48c9-9feb-1fa598856dd4" name="Default Changelist" comment="" />
- <created>1572372213329</created>
- <option name="number" value="Default" />
- <option name="presentableId" value="Default" />
- <updated>1572372213329</updated>
- </task>
- <task id="LOCAL-00001" summary="Change to v0.0.1">
- <created>1573421262618</created>
- <option name="number" value="00001" />
- <option name="presentableId" value="LOCAL-00001" />
- <option name="project" value="LOCAL" />
- <updated>1573421262618</updated>
- </task>
- <task id="LOCAL-00002" summary="Change to v0.0.2">
- <created>1573656911327</created>
- <option name="number" value="00002" />
- <option name="presentableId" value="LOCAL-00002" />
- <option name="project" value="LOCAL" />
- <updated>1573656911327</updated>
- </task>
- <task id="LOCAL-00003" summary="Daily Commit Changes: - Implemented a button to reset the boxJSONData - Implemented the addition to the boxJSON">
- <created>1580408186131</created>
- <option name="number" value="00003" />
- <option name="presentableId" value="LOCAL-00003" />
- <option name="project" value="LOCAL" />
- <updated>1580408186131</updated>
- </task>
- <task id="LOCAL-00004" summary="Daily Commit Changes: - Implemented Date check for boxes - Introduced localUserData json for local meta data">
- <created>1580491517972</created>
- <option name="number" value="00004" />
- <option name="presentableId" value="LOCAL-00004" />
- <option name="project" value="LOCAL" />
- <updated>1580491517972</updated>
- </task>
- <option name="localTasksCounter" value="5" />
- <servers />
- </component>
- <component name="TodoView">
- <todo-panel id="selected-file">
- <is-autoscroll-to-source value="true" />
- </todo-panel>
- <todo-panel id="all">
- <are-packages-shown value="true" />
- <is-autoscroll-to-source value="true" />
- </todo-panel>
- </component>
- <component name="ToolWindowManager">
- <frame x="-6" y="-6" width="1513" height="973" extended-state="6" />
- <editor active="true" />
- <layout>
- <window_info id="Captures" order="0" side_tool="true" weight="0.25" />
- <window_info id="Structure" order="1" side_tool="true" />
- <window_info id="Favorites" order="2" side_tool="true" />
- <window_info id="Build Variants" order="3" side_tool="true" />
- <window_info id="Image Layers" order="4" />
- <window_info id="Designer" order="5" />
- <window_info content_ui="combo" id="Project" order="6" visible="true" weight="0.096219935" />
- <window_info id="Resources Explorer" order="7" weight="0.32928804" />
- <window_info id="Capture Tool" order="8" />
- <window_info anchor="bottom" id="Messages" order="0" sideWeight="0.49960256" weight="0.32936078" />
- <window_info anchor="bottom" id="Run" order="1" sideWeight="0.49920508" weight="0.3262159" />
- <window_info anchor="bottom" id="Logcat" order="2" sideWeight="0.49513775" weight="0.32977462" />
- <window_info anchor="bottom" id="TODO" order="3" sideWeight="0.49960256" weight="0.3261105" />
- <window_info anchor="bottom" id="Debug" order="4" />
- <window_info anchor="bottom" id="Terminal" order="5" sideWeight="0.49960256" weight="0.32827735" />
- <window_info anchor="bottom" id="Event Log" order="6" sideWeight="0.50486225" side_tool="true" weight="0.33369803" />
- <window_info anchor="bottom" id="Version Control" order="7" sideWeight="0.49920508" weight="0.32827735" />
- <window_info anchor="bottom" id="Build" order="8" sideWeight="0.49270666" weight="0.19810201" />
- <window_info anchor="bottom" id="Android Profiler" order="9" />
- <window_info anchor="bottom" id="Find" order="10" sideWeight="0.4972178" weight="0.32936078" />
- <window_info anchor="right" id="Device File Explorer" order="0" side_tool="true" visible="true" weight="0.1395189" />
- <window_info anchor="right" id="Capture Analysis" order="1" />
- <window_info anchor="right" id="Gradle" order="2" />
- <window_info anchor="right" id="Theme Preview" order="3" />
- <window_info anchor="right" id="Preview" order="4" weight="0.35601375" />
- <window_info anchor="right" id="Palette	" order="5" />
- <window_info anchor="right" id="Assistant" order="6" weight="0.32942432" />
- </layout>
- </component>
- <component name="VcsManagerConfiguration">
- <MESSAGE value="Change to v0.0.1" />
- <MESSAGE value="Change to v0.0.2" />
- <MESSAGE value="Daily Commit Changes: - Implemented a button to reset the boxJSONData - Implemented the addition to the boxJSON" />
- <MESSAGE value="Daily Commit Changes: - Implemented Date check for boxes - Introduced localUserData json for local meta data" />
- <option name="LAST_COMMIT_MESSAGE" value="Daily Commit Changes: - Implemented Date check for boxes - Introduced localUserData json for local meta data" />
- </component>
- <component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="187">
- <caret line="11" column="41" selection-start-line="11" selection-start-column="41" selection-end-line="11" selection-end-column="41" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/values/idValues.xml" />
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_about.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="238">
- <caret line="14" column="37" selection-start-line="14" selection-start-column="37" selection-end-line="14" selection-end-column="37" />
- </state>
- </provider>
- <provider editor-type-id="android-designer2" />
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_boxes.xml">
- <provider selected="true" editor-type-id="text-editor" />
- <provider editor-type-id="android-designer2" />
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_login.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="323">
- <caret line="19" column="36" lean-forward="true" selection-start-line="19" selection-start-column="36" selection-end-line="19" selection-end-column="36" />
- </state>
- </provider>
- <provider editor-type-id="android-designer2" />
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="323">
- <caret line="19" column="67" lean-forward="true" selection-start-line="19" selection-start-column="67" selection-end-line="19" selection-end-column="67" />
- </state>
- </provider>
- <provider editor-type-id="android-designer2" />
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_new_box.xml">
- <provider selected="true" editor-type-id="text-editor" />
- <provider editor-type-id="android-designer2" />
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_boxes.xml">
- <provider editor-type-id="text-editor">
- <state relative-caret-position="493">
- <caret line="29" column="45" lean-forward="true" selection-start-line="29" selection-start-column="45" selection-end-line="29" selection-end-column="45" />
- </state>
- </provider>
- <provider selected="true" editor-type-id="android-designer2" />
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_about.xml">
- <provider editor-type-id="text-editor">
- <state relative-caret-position="629">
- <caret line="37" column="11" lean-forward="true" selection-start-line="37" selection-start-column="11" selection-end-line="37" selection-end-column="11" />
- </state>
- </provider>
- <provider selected="true" editor-type-id="android-designer2" />
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_login.xml">
- <provider editor-type-id="text-editor">
- <state relative-caret-position="170">
- <caret line="10" column="64" selection-start-line="10" selection-start-column="64" selection-end-line="10" selection-end-column="64" />
- </state>
- </provider>
- <provider selected="true" editor-type-id="android-designer2" />
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/mipmap-xhdpi/ic_launcher.png">
- <provider selected="true" editor-type-id="images" />
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/mipmap-hdpi/ic_launcher.png">
- <provider selected="true" editor-type-id="images" />
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_shop.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="646">
- <caret line="38" column="15" selection-start-line="38" selection-start-column="15" selection-end-line="38" selection-end-column="15" />
- </state>
- </provider>
- <provider editor-type-id="android-designer2" />
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/raw/shop.json" />
- <entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/ic_launcher_background.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state>
- <caret selection-end-column="2" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/drawable-v24/ic_launcher_foreground.xml">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/menu/menu_main.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="170">
- <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
- </state>
- </provider>
- <provider editor-type-id="android-designer2" />
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/CommonFunctions.java" />
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/AboutActivity.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="408">
- <caret line="24" column="61" selection-start-line="24" selection-start-column="61" selection-end-line="24" selection-end-column="61" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/LoginActivity.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="442">
- <caret line="26" column="61" selection-start-line="26" selection-start-column="61" selection-end-line="26" selection-end-column="61" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_experiment.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="476">
- <caret line="28" column="54" lean-forward="true" selection-end-line="28" selection-end-column="54" />
- </state>
- </provider>
- <provider editor-type-id="android-designer2" />
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_experiment.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="17">
- <caret line="1" column="62" selection-end-line="51" selection-end-column="15" />
- </state>
- </provider>
- <provider editor-type-id="android-designer2" />
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_experiment_survey_creator.xml" />
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_experiment_survey_creator.xml" />
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_new_box.xml">
- <provider editor-type-id="text-editor">
- <state relative-caret-position="3162">
- <caret line="186" column="27" selection-start-line="186" selection-start-column="27" selection-end-line="186" selection-end-column="27" />
- </state>
- </provider>
- <provider selected="true" editor-type-id="android-designer2" />
- </entry>
- <entry file="file://$PROJECT_DIR$/app/build.gradle">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="374">
- <caret line="22" column="60" selection-start-line="22" selection-start-column="60" selection-end-line="22" selection-end-column="60" />
- </state>
- </provider>
- </entry>
- <entry file="file://$USER_HOME$/Documents/AndroidStudio/DeviceExplorer/Pixel_2_API_29 [emulator-5554]/data/data/com.yearthreeproject.xbframework/files/boxData.json" />
- <entry file="file://$PROJECT_DIR$/app/src/main/res/values/arrays.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="187">
- <caret line="11" column="12" lean-forward="true" selection-start-line="11" selection-start-column="12" selection-end-line="11" selection-end-column="12" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/FileStoreReader.java" />
- <entry file="file://$PROJECT_DIR$/app/src/main/res/raw/box.json">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="230">
- <caret line="51" column="24" selection-start-line="51" selection-start-column="24" selection-end-line="51" selection-end-column="24" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/ShopActivity.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="678">
- <caret line="149" column="49" lean-forward="true" selection-start-line="149" selection-start-column="49" selection-end-line="149" selection-end-column="49" />
- </state>
- </provider>
- </entry>
- <entry file="file://$USER_HOME$/Documents/AndroidStudio/DeviceExplorer/emulator-5554/data/data/com.yearthreeproject.xbframework/files/boxData.json" />
- <entry file="file://$USER_HOME$/Documents/AndroidStudio/DeviceExplorer/emulator-5554/data/data/com.yearthreeproject.xbframework/files/localUserData.json" />
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_main.xml">
- <provider editor-type-id="text-editor">
- <state relative-caret-position="374">
- <caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
- </state>
- </provider>
- <provider selected="true" editor-type-id="android-designer2" />
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/BoxesActivity.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="2023">
- <caret line="147" column="88" selection-start-line="147" selection-start-column="88" selection-end-line="147" selection-end-column="88" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/notification_icon.xml" />
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_shop.xml">
- <provider editor-type-id="text-editor" />
- <provider selected="true" editor-type-id="android-designer2" />
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_progress.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state>
- <caret selection-end-line="27" selection-end-column="15" />
- </state>
- </provider>
- <provider editor-type-id="android-designer2" />
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
- <provider editor-type-id="android-manifest" />
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="442">
- <caret line="35" column="34" selection-start-line="35" selection-start-column="34" selection-end-line="35" selection-end-column="34" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_testing.xml" />
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_progress.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="561">
- <caret line="33" lean-forward="true" selection-end-line="40" selection-end-column="15" />
- </state>
- </provider>
- <provider editor-type-id="android-designer2" />
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/ExperimentActivity.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="726">
- <caret line="126" column="52" lean-forward="true" selection-start-line="126" selection-start-column="52" selection-end-line="126" selection-end-column="52" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/TestingActivity.java" />
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/MyNotificationPublisher.java" />
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_testing.xml" />
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/NewBox.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="3179">
- <caret line="358" selection-start-line="358" selection-end-line="358" />
- <folding>
- <element signature="method#submitNewBoxFunction#0;class#NewBox#0" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/MainActivity.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="4692">
- <caret line="309" column="1" selection-start-line="309" selection-start-column="1" selection-end-line="309" selection-end-column="1" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/ProgressActivity.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="153">
- <caret line="16" selection-start-line="16" selection-end-line="16" />
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/build.gradle">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="340">
- <caret line="20" column="8" lean-forward="true" selection-start-line="20" selection-start-column="8" selection-end-line="20" selection-end-column="8" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/ExperimentSurveyCreatorActivity.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="430">
- <caret line="170" column="109" selection-start-line="170" selection-start-column="109" selection-end-line="170" selection-end-column="109" />
- </state>
- </provider>
- </entry>
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/workspace-DESKTOP-FQUKLHE.xml b/.idea/workspace-DESKTOP-FQUKLHE.xml
deleted file mode 100644
index 67b0b63c9503f58ae0c63aa09337cf91c715b748..0000000000000000000000000000000000000000
--- a/.idea/workspace-DESKTOP-FQUKLHE.xml
+++ /dev/null
@@ -1,318 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="AndroidLayouts">
- <shared>
- <config />
- </shared>
- </component>
- <component name="AndroidLogFilters">
- <option name="TOOL_WINDOW_CUSTOM_FILTER" value="com.yearthreeproject.xbframework" />
- <option name="TOOL_WINDOW_LOG_LEVEL" value="verbose" />
- <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="No Filters" />
- </component>
- <component name="ChangeListManager">
- <list default="true" id="901156b8-4ed3-48c9-9feb-1fa598856dd4" name="Default Changelist" comment="Changes since last commit: - Finished progress page - Implemented Auth0 login and signup">
- <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/LoginActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/LoginActivity.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/MainActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/yearthreeproject/xbframework/MainActivity.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterDir="false" />
- </list>
- <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
- <option name="SHOW_DIALOG" value="false" />
- <option name="HIGHLIGHT_CONFLICTS" value="true" />
- <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
- <option name="LAST_RESOLUTION" value="IGNORE" />
- </component>
- <component name="CodeInsightWorkspaceSettings">
- <option name="optimizeImportsOnTheFly" value="true" />
- </component>
- <component name="ExecutionTargetManager" SELECTED_TARGET="Pixel_2_API_29" />
- <component name="ExternalProjectsData">
- <projectState path="$PROJECT_DIR$">
- <ProjectState />
- </projectState>
- </component>
- <component name="ExternalProjectsManager">
- <system id="GRADLE">
- <state>
- <task path="$PROJECT_DIR$">
- <activation />
- </task>
- <task path="$PROJECT_DIR$/app">
- <activation />
- </task>
- <projects_view>
- <tree_state>
- <expand />
- <select />
- </tree_state>
- </projects_view>
- </state>
- </system>
- </component>
- <component name="FileTemplateManagerImpl">
- <option name="RECENT_TEMPLATES">
- <list>
- <option value="layoutResourceFile_vertical" />
- <option value="Class" />
- <option value="resourceFile" />
- <option value="valueResourceFile" />
- </list>
- </option>
- </component>
- <component name="Git.Settings">
- <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
- </component>
- <component name="ProjectId" id="1YGdFr4LLCXPCzaKdUL32gvMs2q" />
- <component name="ProjectLevelVcsManager" settingsEditedManually="true">
- <ConfirmationsSetting value="2" id="Add" />
- </component>
- <component name="PropertiesComponent">
- <property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
- <property name="DeviceAndSnapshotComboBoxAction.selectedDevice" value="Pixel_2_API_29" />
- <property name="DeviceAndSnapshotComboBoxAction.selectionTime" value="2020-02-11T20:50:41.427Z" />
- <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
- <property name="android.sdk.path" value="$USER_HOME$/AppData/Local/Android/Sdk" />
- <property name="last_opened_file_path" value="$PROJECT_DIR$" />
- <property name="project.structure.last.edited" value="Modules" />
- <property name="project.structure.proportion" value="0.17578948" />
- <property name="project.structure.side.proportion" value="0.2" />
- <property name="run.code.analysis.last.selected.profile" value="pProject Default" />
- <property name="settings.editor.selected.configurable" value="settings.github" />
- </component>
- <component name="PsdUISettings">
- <option name="MODULE_TAB" value="Default Config" />
- </component>
- <component name="RecentsManager">
- <key name="MoveFile.RECENT_KEYS">
- <recent name="C:\Users\Eamonn\OneDrive\Documents\Y3Proj\app\src\main\res\" />
- <recent name="C:\Users\Eamonn\OneDrive\Documents\Y3Proj\app\src\main\res\drawable-xxhdpi" />
- <recent name="C:\Users\Eamonn\OneDrive\Documents\Y3Proj\app\src\main\res\raw" />
- </key>
- <key name="CreateClassDialog.RecentsKey">
- <recent name="com.yearthreeproject.xbframework" />
- </key>
- </component>
- <component name="RunDashboard">
- <option name="ruleStates">
- <list>
- <RuleState>
- <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
- </RuleState>
- <RuleState>
- <option name="name" value="StatusDashboardGroupingRule" />
- </RuleState>
- </list>
- </option>
- </component>
- <component name="RunManager">
- <configuration default="true" type="AndroidJUnit" factoryName="Android JUnit">
- <option name="TEST_OBJECT" value="class" />
- <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
- <method v="2">
- <option name="Android.Gradle.BeforeRunTask" enabled="true" />
- </method>
- </configuration>
- <configuration name="app" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
- <module name="app" />
- <option name="DEPLOY" value="true" />
- <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
- <option name="DEPLOY_AS_INSTANT" value="false" />
- <option name="ARTIFACT_NAME" value="" />
- <option name="PM_INSTALL_OPTIONS" value="" />
- <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
- <option name="ACTIVITY_EXTRA_FLAGS" value="" />
- <option name="MODE" value="default_activity" />
- <option name="CLEAR_LOGCAT" value="false" />
- <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
- <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
- <option name="FORCE_STOP_RUNNING_APP" value="true" />
- <option name="TARGET_SELECTION_MODE" value="DEVICE_AND_SNAPSHOT_COMBO_BOX" />
- <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
- <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
- <option name="DEBUGGER_TYPE" value="Auto" />
- <Auto>
- <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
- <option name="SHOW_STATIC_VARS" value="true" />
- <option name="WORKING_DIR" value="" />
- <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
- <option name="SHOW_OPTIMIZED_WARNING" value="true" />
- </Auto>
- <Hybrid>
- <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
- <option name="SHOW_STATIC_VARS" value="true" />
- <option name="WORKING_DIR" value="" />
- <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
- <option name="SHOW_OPTIMIZED_WARNING" value="true" />
- </Hybrid>
- <Java />
- <Native>
- <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
- <option name="SHOW_STATIC_VARS" value="true" />
- <option name="WORKING_DIR" value="" />
- <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
- <option name="SHOW_OPTIMIZED_WARNING" value="true" />
- </Native>
- <Profilers>
- <option name="ADVANCED_PROFILING_ENABLED" value="false" />
- <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
- <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" />
- </Profilers>
- <option name="DEEP_LINK" value="" />
- <option name="ACTIVITY_CLASS" value="" />
- <method v="2">
- <option name="Android.Gradle.BeforeRunTask" enabled="true" />
- </method>
- </configuration>
- </component>
- <component name="SvnConfiguration">
- <configuration />
- </component>
- <component name="TaskManager">
- <task active="true" id="Default" summary="Default task">
- <changelist id="901156b8-4ed3-48c9-9feb-1fa598856dd4" name="Default Changelist" comment="" />
- <created>1572372213329</created>
- <option name="number" value="Default" />
- <option name="presentableId" value="Default" />
- <updated>1572372213329</updated>
- </task>
- <task id="LOCAL-00001" summary="Change to v0.0.1">
- <created>1573421262618</created>
- <option name="number" value="00001" />
- <option name="presentableId" value="LOCAL-00001" />
- <option name="project" value="LOCAL" />
- <updated>1573421262618</updated>
- </task>
- <task id="LOCAL-00002" summary="Change to v0.0.2">
- <created>1573656911327</created>
- <option name="number" value="00002" />
- <option name="presentableId" value="LOCAL-00002" />
- <option name="project" value="LOCAL" />
- <updated>1573656911327</updated>
- </task>
- <task id="LOCAL-00003" summary="Daily Commit Changes: - Implemented a button to reset the boxJSONData - Implemented the addition to the boxJSON">
- <created>1580408186131</created>
- <option name="number" value="00003" />
- <option name="presentableId" value="LOCAL-00003" />
- <option name="project" value="LOCAL" />
- <updated>1580408186131</updated>
- </task>
- <task id="LOCAL-00004" summary="Daily Commit Changes: - Implemented Date check for boxes - Introduced localUserData json for local meta data">
- <created>1580491517972</created>
- <option name="number" value="00004" />
- <option name="presentableId" value="LOCAL-00004" />
- <option name="project" value="LOCAL" />
- <updated>1580491517972</updated>
- </task>
- <task id="LOCAL-00005" summary="Daily Commit Changes: - Implemented more of the survey creation page including: 0 A notification section 0 A completed survey layout (with one specific bug, but everything else works great)">
- <created>1581454623609</created>
- <option name="number" value="00005" />
- <option name="presentableId" value="LOCAL-00005" />
- <option name="project" value="LOCAL" />
- <updated>1581454623609</updated>
- </task>
- <task id="LOCAL-00006" summary="Daily Commit Changes: - Created the "template" for all the experiment details that can be manipulated - Have defined a plan for the differences between the layout types and how to move forward">
- <created>1581509178069</created>
- <option name="number" value="00006" />
- <option name="presentableId" value="LOCAL-00006" />
- <option name="project" value="LOCAL" />
- <updated>1581509178069</updated>
- </task>
- <task id="LOCAL-00007" summary="Changes since last commit: - Made small changes to code to suppress typos or errors or warnings">
- <created>1582048181350</created>
- <option name="number" value="00007" />
- <option name="presentableId" value="LOCAL-00007" />
- <option name="project" value="LOCAL" />
- <updated>1582048181350</updated>
- </task>
- <task id="LOCAL-00008" summary="Changes since last commit: - Completed the survey response functionality - Started with the notification functionality, have a worked version in testing activity (dev screen)">
- <created>1582668852049</created>
- <option name="number" value="00008" />
- <option name="presentableId" value="LOCAL-00008" />
- <option name="project" value="LOCAL" />
- <updated>1582668852050</updated>
- </task>
- <task id="LOCAL-00009" summary="Changes since last commit: - Fixing local index issue">
- <created>1582903224886</created>
- <option name="number" value="00009" />
- <option name="presentableId" value="LOCAL-00009" />
- <option name="project" value="LOCAL" />
- <updated>1582903224887</updated>
- </task>
- <task id="LOCAL-00010" summary="Changes since last commit: - Fixing local index issue">
- <created>1582905521139</created>
- <option name="number" value="00010" />
- <option name="presentableId" value="LOCAL-00010" />
- <option name="project" value="LOCAL" />
- <updated>1582905521139</updated>
- </task>
- <task id="LOCAL-00011" summary="Changes since last commit: - Fixing local index issue">
- <created>1583319473806</created>
- <option name="number" value="00011" />
- <option name="presentableId" value="LOCAL-00011" />
- <option name="project" value="LOCAL" />
- <updated>1583319473806</updated>
- </task>
- <task id="LOCAL-00012" summary="Changes since last commit: - Colour changes for most pages">
- <created>1584458255083</created>
- <option name="number" value="00012" />
- <option name="presentableId" value="LOCAL-00012" />
- <option name="project" value="LOCAL" />
- <updated>1584458255083</updated>
- </task>
- <task id="LOCAL-00013" summary="Changes since last commit: - Finished progress page - Implemented Auth0 login and signup">
- <created>1585326733562</created>
- <option name="number" value="00013" />
- <option name="presentableId" value="LOCAL-00013" />
- <option name="project" value="LOCAL" />
- <updated>1585326733562</updated>
- </task>
- <option name="localTasksCounter" value="14" />
- <servers />
- </component>
- <component name="Vcs.Log.Tabs.Properties">
- <option name="TAB_STATES">
- <map>
- <entry key="MAIN">
- <value>
- <State>
- <option name="COLUMN_ORDER" />
- </State>
- </value>
- </entry>
- </map>
- </option>
- <option name="RECENT_FILTERS">
- <map>
- <entry key="Branch">
- <value>
- <list />
- </value>
- </entry>
- <entry key="User">
- <value>
- <list />
- </value>
- </entry>
- </map>
- </option>
- </component>
- <component name="VcsManagerConfiguration">
- <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
- <MESSAGE value="Change to v0.0.1" />
- <MESSAGE value="Change to v0.0.2" />
- <MESSAGE value="Daily Commit Changes: - Implemented a button to reset the boxJSONData - Implemented the addition to the boxJSON" />
- <MESSAGE value="Daily Commit Changes: - Implemented Date check for boxes - Introduced localUserData json for local meta data" />
- <MESSAGE value="Daily Commit Changes: - Implemented more of the survey creation page including: 0 A notification section 0 A completed survey layout (with one specific bug, but everything else works great)" />
- <MESSAGE value="Daily Commit Changes: - Created the "template" for all the experiment details that can be manipulated - Have defined a plan for the differences between the layout types and how to move forward" />
- <MESSAGE value="Changes since last commit: - Finished the newBox and ExperimentSurveyCreator pages - Full JSON production is completed so far for the boxes and experiments" />
- <MESSAGE value="Changes since last commit: - Made small changes to code to suppress typos or errors or warnings" />
- <MESSAGE value="Changes since last commit: - Completed the survey response functionality - Started with the notification functionality, have a worked version in testing activity (dev screen)" />
- <MESSAGE value="Changes since last commit: - Fixing local index issue" />
- <MESSAGE value="Changes since last commit: - Colour changes for most pages" />
- <MESSAGE value="Changes since last commit: - Finished progress page - Implemented Auth0 login and signup" />
- <option name="LAST_COMMIT_MESSAGE" value="Changes since last commit: - Finished progress page - Implemented Auth0 login and signup" />
- </component>
-</project>
\ No newline at end of file
diff --git a/.vscode/launch.json b/.vscode/launch.json
deleted file mode 100644
index 27ac209b0e736a8dd533fbdc289ae41e7315dca6..0000000000000000000000000000000000000000
--- a/.vscode/launch.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- // Use IntelliSense to learn about possible attributes.
- // Hover to view descriptions of existing attributes.
- // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
- "version": "0.2.0",
- "configurations": [{
- "type": "android",
- "request": "launch",
- "name": "Launch App",
- "appSrcRoot": "${workspaceRoot}/app/src/main",
- "apkFile": "${workspaceRoot}/app/build/outputs/apk/app-debug.apk",
- "adbPort": 5037,
- "autoStartADB": true,
- "preLaunchTask": "run gradle"
- }
-
- ]
-}
\ No newline at end of file
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
deleted file mode 100644
index 97378061d471d6fedc600b283ae05a3b1caed360..0000000000000000000000000000000000000000
--- a/.vscode/tasks.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "version": "2.0.0",
- "tasks": [{
- "label": "run gradle",
- "type": "shell",
- "command": "${workspaceFolder}/gradlew",
- "args": [
- "assembleDebug"
- ],
- "presentation": {
- "echo": true,
- "reveal": "always",
- "focus": false,
- "panel": "shared",
- "showReuseMessage": true,
- "clear": false
- },
- "problemMatcher": [],
- "group": {
- "kind": "build",
- "isDefault": true
- }
- }]
-}
\ No newline at end of file
diff --git a/IP.code-workspace b/IP.code-workspace
deleted file mode 100644
index 15c77e18b27b0e8d29f4fc32808437f2d186ba07..0000000000000000000000000000000000000000
--- a/IP.code-workspace
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "folders": [
- {
- "path": "."
- }
- ],
- "settings": {
- "java.configuration.updateBuildConfiguration": "automatic"
- }
-}
\ No newline at end of file
diff --git a/_supplementary_files/Y3 Project/Script For IP Video.docx b/_supplementary_files/Y3 Project/Script For IP Video.docx
new file mode 100644
index 0000000000000000000000000000000000000000..29f0b6ca1b423a0c80da64070741bed54136478e
Binary files /dev/null and b/_supplementary_files/Y3 Project/Script For IP Video.docx differ
diff --git a/Y3Proj File Structure.txt b/_supplementary_files/Y3 Project/Y3Proj File Structure.txt
similarity index 100%
rename from Y3Proj File Structure.txt
rename to _supplementary_files/Y3 Project/Y3Proj File Structure.txt
diff --git a/designs/Design Specification.docx b/_supplementary_files/Y3 Project/designs/Design Specification.docx
similarity index 100%
rename from designs/Design Specification.docx
rename to _supplementary_files/Y3 Project/designs/Design Specification.docx
diff --git a/designs/Logo.png b/_supplementary_files/Y3 Project/designs/Logo.png
similarity index 100%
rename from designs/Logo.png
rename to _supplementary_files/Y3 Project/designs/Logo.png
diff --git a/designs/saltshaker.png b/_supplementary_files/Y3 Project/designs/saltshaker.png
similarity index 100%
rename from designs/saltshaker.png
rename to _supplementary_files/Y3 Project/designs/saltshaker.png
diff --git a/planning/Bill of Materials.xlsx b/_supplementary_files/Y3 Project/planning/Bill of Materials.xlsx
similarity index 100%
rename from planning/Bill of Materials.xlsx
rename to _supplementary_files/Y3 Project/planning/Bill of Materials.xlsx
diff --git a/planning/Daily progress.xlsx b/_supplementary_files/Y3 Project/planning/Daily progress.xlsx
similarity index 100%
rename from planning/Daily progress.xlsx
rename to _supplementary_files/Y3 Project/planning/Daily progress.xlsx
diff --git a/planning/Gantt.xlsx b/_supplementary_files/Y3 Project/planning/Gantt.xlsx
similarity index 100%
rename from planning/Gantt.xlsx
rename to _supplementary_files/Y3 Project/planning/Gantt.xlsx
diff --git a/planning/Logbook.pdf b/_supplementary_files/Y3 Project/planning/Logbook.pdf
similarity index 100%
rename from planning/Logbook.pdf
rename to _supplementary_files/Y3 Project/planning/Logbook.pdf
diff --git a/planning/Risk analysis.xlsx b/_supplementary_files/Y3 Project/planning/Risk analysis.xlsx
similarity index 100%
rename from planning/Risk analysis.xlsx
rename to _supplementary_files/Y3 Project/planning/Risk analysis.xlsx
diff --git a/reports/final/Project Report Body.pdf b/_supplementary_files/Y3 Project/reports/final/Project Report Body.pdf
similarity index 100%
rename from reports/final/Project Report Body.pdf
rename to _supplementary_files/Y3 Project/reports/final/Project Report Body.pdf
diff --git a/reports/final/Project Report.docx b/_supplementary_files/Y3 Project/reports/final/Project Report.docx
similarity index 100%
rename from reports/final/Project Report.docx
rename to _supplementary_files/Y3 Project/reports/final/Project Report.docx
diff --git a/reports/final/Project Report.pdf b/_supplementary_files/Y3 Project/reports/final/Project Report.pdf
similarity index 100%
rename from reports/final/Project Report.pdf
rename to _supplementary_files/Y3 Project/reports/final/Project Report.pdf
diff --git a/reports/progress/Progress Report Body (Plagirsim Check).pdf b/_supplementary_files/Y3 Project/reports/progress/Progress Report Body (Plagirsim Check).pdf
similarity index 100%
rename from reports/progress/Progress Report Body (Plagirsim Check).pdf
rename to _supplementary_files/Y3 Project/reports/progress/Progress Report Body (Plagirsim Check).pdf
diff --git a/reports/progress/Progress Report.docx b/_supplementary_files/Y3 Project/reports/progress/Progress Report.docx
similarity index 100%
rename from reports/progress/Progress Report.docx
rename to _supplementary_files/Y3 Project/reports/progress/Progress Report.docx
diff --git a/reports/progress/Progress Report.pdf b/_supplementary_files/Y3 Project/reports/progress/Progress Report.pdf
similarity index 100%
rename from reports/progress/Progress Report.pdf
rename to _supplementary_files/Y3 Project/reports/progress/Progress Report.pdf
diff --git a/reports/project brief/Eamonn Trim Brief.pdf b/_supplementary_files/Y3 Project/reports/project brief/Eamonn Trim Brief.pdf
similarity index 100%
rename from reports/project brief/Eamonn Trim Brief.pdf
rename to _supplementary_files/Y3 Project/reports/project brief/Eamonn Trim Brief.pdf
diff --git a/_supplementary_files/internship/CodeBase Presentation.pptx b/_supplementary_files/internship/CodeBase Presentation.pptx
new file mode 100644
index 0000000000000000000000000000000000000000..d2ce7621b070a15913b00902b5079a9bd4ecb303
Binary files /dev/null and b/_supplementary_files/internship/CodeBase Presentation.pptx differ
diff --git a/build.gradle b/build.gradle
index 2b22439a39284c57fa0e490143d3e858d0a41535..ed23078e53c9e084e657778c9c1c92c35e7122a6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.6.3'
+ classpath 'com.android.tools.build:gradle:4.0.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0a8a5a61df2cf0c89b8ca14638f497950a10b327..ecf055fd54b2726296a42f8fd8c67ed35b41494d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Feb 24 19:34:05 GMT 2020
+#Wed Jul 08 12:03:41 CEST 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
diff --git a/gradlew.bat b/gradlew.bat
deleted file mode 100644
index f9553162f122c71b34635112e717c3e733b5b212..0000000000000000000000000000000000000000
--- a/gradlew.bat
+++ /dev/null
@@ -1,84 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega