|
|
@@ -6,7 +6,10 @@
|
|
|
</shared>
|
|
|
</component>
|
|
|
<component name="ChangeListManager">
|
|
|
- <list default="true" readonly="true" id="c78b40ed-ebdd-4e48-bbc0-b120c3ce2158" name="Default" comment="Fixed import and commented out annotations temporarily.">
|
|
|
+ <list default="true" readonly="true" id="c78b40ed-ebdd-4e48-bbc0-b120c3ce2158" name="Default" comment="Added skeleton for details screen; will expand on this further.">
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/yiupang/freefoodfinder/EventDetailsScreen.java" />
|
|
|
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/res/layout/event_details_screen.xml" />
|
|
|
+ <change type="DELETED" beforePath="$PROJECT_DIR$/trunk.iml" afterPath="" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts/fileHashes.bin" afterPath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts/fileHashes.bin" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts/fileSnapshots.bin" afterPath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts/fileSnapshots.bin" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts/taskArtifacts.bin" afterPath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts/taskArtifacts.bin" />
|
|
|
@@ -14,7 +17,6 @@
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/animated_vector_drawable_25_3_1.xml" afterPath="$PROJECT_DIR$/.idea/libraries/animated_vector_drawable_25_3_1.xml" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/appcompat_v7_25_3_1.xml" afterPath="$PROJECT_DIR$/.idea/libraries/appcompat_v7_25_3_1.xml" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/constraint_layout_1_0_2.xml" afterPath="$PROJECT_DIR$/.idea/libraries/constraint_layout_1_0_2.xml" />
|
|
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/constraint_layout_solver_1_0_2.xml" afterPath="$PROJECT_DIR$/.idea/libraries/constraint_layout_solver_1_0_2.xml" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/design_25_3_1.xml" afterPath="$PROJECT_DIR$/.idea/libraries/design_25_3_1.xml" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/espresso_core_2_2_2.xml" afterPath="$PROJECT_DIR$/.idea/libraries/espresso_core_2_2_2.xml" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/espresso_idling_resource_2_2_2.xml" afterPath="$PROJECT_DIR$/.idea/libraries/espresso_idling_resource_2_2_2.xml" />
|
|
|
@@ -22,7 +24,6 @@
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/recyclerview_v7_25_3_1.xml" afterPath="$PROJECT_DIR$/.idea/libraries/recyclerview_v7_25_3_1.xml" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/rules_0_5.xml" afterPath="$PROJECT_DIR$/.idea/libraries/rules_0_5.xml" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/runner_0_5.xml" afterPath="$PROJECT_DIR$/.idea/libraries/runner_0_5.xml" />
|
|
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/support_annotations_25_3_1.xml" afterPath="$PROJECT_DIR$/.idea/libraries/support_annotations_25_3_1.xml" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/support_compat_25_3_1.xml" afterPath="$PROJECT_DIR$/.idea/libraries/support_compat_25_3_1.xml" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/support_core_ui_25_3_1.xml" afterPath="$PROJECT_DIR$/.idea/libraries/support_core_ui_25_3_1.xml" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/support_core_utils_25_3_1.xml" afterPath="$PROJECT_DIR$/.idea/libraries/support_core_utils_25_3_1.xml" />
|
|
|
@@ -31,11 +32,10 @@
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/support_v4_25_3_1.xml" afterPath="$PROJECT_DIR$/.idea/libraries/support_v4_25_3_1.xml" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/support_vector_drawable_25_3_1.xml" afterPath="$PROJECT_DIR$/.idea/libraries/support_vector_drawable_25_3_1.xml" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/transition_25_3_1.xml" afterPath="$PROJECT_DIR$/.idea/libraries/transition_25_3_1.xml" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/modules.xml" afterPath="$PROJECT_DIR$/.idea/modules.xml" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/vcs.xml" afterPath="$PROJECT_DIR$/.idea/vcs.xml" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/app.iml" afterPath="$PROJECT_DIR$/app/app.iml" />
|
|
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/build.gradle" afterPath="$PROJECT_DIR$/app/build.gradle" />
|
|
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/com/example/yiupang/freefoodfinder/AboutUsScreen.java" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/yiupang/freefoodfinder/AboutUsScreen.java" />
|
|
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/local.properties" afterPath="$PROJECT_DIR$/local.properties" />
|
|
|
</list>
|
|
|
<list id="4f3bd985-9864-4813-aba5-262aa5a7ccfd" name="Rejected commit: Default" comment="Fixed import and commented out annotations temporarily." />
|
|
|
@@ -84,29 +84,92 @@
|
|
|
</component>
|
|
|
<component name="FileEditorManager">
|
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
|
|
|
- <file leaf-file-name="AboutUsScreen.java" pinned="false" current-in-tab="true">
|
|
|
+ <file leaf-file-name="AboutUsScreen.java" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/yiupang/freefoodfinder/AboutUsScreen.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="330">
|
|
|
- <caret line="22" column="0" selection-start-line="22" selection-start-column="0" selection-end-line="22" selection-end-column="0" />
|
|
|
+ <state relative-caret-position="435">
|
|
|
+ <caret line="49" column="8" selection-start-line="49" selection-start-column="8" selection-end-line="49" selection-end-column="8" />
|
|
|
<folding>
|
|
|
- <element signature="e#2377#2407#0" expanded="true" />
|
|
|
+ <element signature="imports" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
+ <file leaf-file-name="EventsScreen.java" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/yiupang/freefoodfinder/EventsScreen.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="449">
|
|
|
+ <caret line="35" column="78" selection-start-line="35" selection-start-column="78" selection-end-line="35" selection-end-column="78" />
|
|
|
+ <folding>
|
|
|
+ <element signature="imports" expanded="true" />
|
|
|
+ </folding>
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file leaf-file-name="EventArrayAdapter.java" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/yiupang/freefoodfinder/EventArrayAdapter.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="-310">
|
|
|
+ <caret line="28" column="5" selection-start-line="28" selection-start-column="5" selection-end-line="28" selection-end-column="5" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file leaf-file-name="MyEventScreen.java" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/yiupang/freefoodfinder/MyEventScreen.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="420">
|
|
|
+ <caret line="37" column="46" selection-start-line="37" selection-start-column="46" selection-end-line="37" selection-end-column="46" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file leaf-file-name="EventDetailsScreen.java" pinned="false" current-in-tab="true">
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/yiupang/freefoodfinder/EventDetailsScreen.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="290">
|
|
|
+ <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
|
|
|
+ <folding>
|
|
|
+ <element signature="imports" expanded="true" />
|
|
|
+ <element signature="e#958#959#0" expanded="true" />
|
|
|
+ <element signature="e#981#982#0" expanded="true" />
|
|
|
+ </folding>
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file leaf-file-name="event_details_screen.xml" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/event_details_screen.xml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="486">
|
|
|
+ <caret line="108" column="7" selection-start-line="108" selection-start-column="7" selection-end-line="108" selection-end-column="7" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ <provider editor-type-id="android-designer2">
|
|
|
+ <state />
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
</leaf>
|
|
|
</component>
|
|
|
<component name="FileTemplateManagerImpl">
|
|
|
<option name="RECENT_TEMPLATES">
|
|
|
<list>
|
|
|
+ <option value="layoutResourceFile" />
|
|
|
<option value="Class" />
|
|
|
<option value="layoutResourceFile_vertical" />
|
|
|
- <option value="layoutResourceFile" />
|
|
|
+ <option value="valueResourceFile" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
|
+ <component name="Git.Settings">
|
|
|
+ <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
|
+ </component>
|
|
|
<component name="GradleLocalSettings">
|
|
|
<option name="myGradleHomes">
|
|
|
<map>
|
|
|
@@ -123,14 +186,14 @@
|
|
|
<entry>
|
|
|
<key>
|
|
|
<ExternalProjectPojo>
|
|
|
- <option name="name" value="trunk" />
|
|
|
+ <option name="name" value="FreeFoodFinder" />
|
|
|
<option name="path" value="$PROJECT_DIR$" />
|
|
|
</ExternalProjectPojo>
|
|
|
</key>
|
|
|
<value>
|
|
|
<list>
|
|
|
<ExternalProjectPojo>
|
|
|
- <option name="name" value="trunk" />
|
|
|
+ <option name="name" value="FreeFoodFinder" />
|
|
|
<option name="path" value="$PROJECT_DIR$" />
|
|
|
</ExternalProjectPojo>
|
|
|
<ExternalProjectPojo>
|
|
|
@@ -148,7 +211,7 @@
|
|
|
<value>
|
|
|
<list>
|
|
|
<ExternalTaskPojo>
|
|
|
- <option name="description" value="Displays the sub-projects of root project 'trunk'." />
|
|
|
+ <option name="description" value="Displays the sub-projects of root project 'FreeFoodFinder'." />
|
|
|
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
|
|
|
<option name="name" value="projects" />
|
|
|
</ExternalTaskPojo>
|
|
|
@@ -187,7 +250,7 @@
|
|
|
<option name="name" value="assembleDebugUnitTest" />
|
|
|
</ExternalTaskPojo>
|
|
|
<ExternalTaskPojo>
|
|
|
- <option name="description" value="Displays the configuration model of root project 'trunk'. [incubating]" />
|
|
|
+ <option name="description" value="Displays the configuration model of root project 'FreeFoodFinder'. [incubating]" />
|
|
|
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
|
|
|
<option name="name" value="model" />
|
|
|
</ExternalTaskPojo>
|
|
|
@@ -202,7 +265,7 @@
|
|
|
<option name="name" value="prepareComAndroidSupportAppcompatV72531Library" />
|
|
|
</ExternalTaskPojo>
|
|
|
<ExternalTaskPojo>
|
|
|
- <option name="description" value="Displays the tasks runnable from root project 'trunk' (some of the displayed tasks may belong to subprojects)." />
|
|
|
+ <option name="description" value="Displays the tasks runnable from root project 'FreeFoodFinder' (some of the displayed tasks may belong to subprojects)." />
|
|
|
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
|
|
|
<option name="name" value="tasks" />
|
|
|
</ExternalTaskPojo>
|
|
|
@@ -239,7 +302,7 @@
|
|
|
<option name="name" value="deviceCheck" />
|
|
|
</ExternalTaskPojo>
|
|
|
<ExternalTaskPojo>
|
|
|
- <option name="description" value="Displays all dependencies declared in root project 'trunk'." />
|
|
|
+ <option name="description" value="Displays all dependencies declared in root project 'FreeFoodFinder'." />
|
|
|
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
|
|
|
<option name="name" value="dependencies" />
|
|
|
</ExternalTaskPojo>
|
|
|
@@ -308,7 +371,7 @@
|
|
|
<option name="name" value="compileDebugAndroidTestJavaWithJavac" />
|
|
|
</ExternalTaskPojo>
|
|
|
<ExternalTaskPojo>
|
|
|
- <option name="description" value="Displays the components produced by root project 'trunk'. [incubating]" />
|
|
|
+ <option name="description" value="Displays the components produced by root project 'FreeFoodFinder'. [incubating]" />
|
|
|
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
|
|
|
<option name="name" value="components" />
|
|
|
</ExternalTaskPojo>
|
|
|
@@ -460,7 +523,7 @@
|
|
|
<option name="name" value="uninstallDebugAndroidTest" />
|
|
|
</ExternalTaskPojo>
|
|
|
<ExternalTaskPojo>
|
|
|
- <option name="description" value="Displays the insight into a specific dependency in root project 'trunk'." />
|
|
|
+ <option name="description" value="Displays the insight into a specific dependency in root project 'FreeFoodFinder'." />
|
|
|
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
|
|
|
<option name="name" value="dependencyInsight" />
|
|
|
</ExternalTaskPojo>
|
|
|
@@ -794,12 +857,12 @@
|
|
|
<option name="name" value="generateDebugAssets" />
|
|
|
</ExternalTaskPojo>
|
|
|
<ExternalTaskPojo>
|
|
|
- <option name="description" value="Displays the dependent components of components in root project 'trunk'. [incubating]" />
|
|
|
+ <option name="description" value="Displays the dependent components of components in root project 'FreeFoodFinder'. [incubating]" />
|
|
|
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
|
|
|
<option name="name" value="dependentComponents" />
|
|
|
</ExternalTaskPojo>
|
|
|
<ExternalTaskPojo>
|
|
|
- <option name="description" value="Displays all buildscript dependencies declared in root project 'trunk'." />
|
|
|
+ <option name="description" value="Displays all buildscript dependencies declared in root project 'FreeFoodFinder'." />
|
|
|
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
|
|
|
<option name="name" value="buildEnvironment" />
|
|
|
</ExternalTaskPojo>
|
|
|
@@ -940,7 +1003,7 @@
|
|
|
<option name="name" value="generateReleaseResValues" />
|
|
|
</ExternalTaskPojo>
|
|
|
<ExternalTaskPojo>
|
|
|
- <option name="description" value="Displays the properties of root project 'trunk'." />
|
|
|
+ <option name="description" value="Displays the properties of root project 'FreeFoodFinder'." />
|
|
|
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
|
|
|
<option name="name" value="properties" />
|
|
|
</ExternalTaskPojo>
|
|
|
@@ -1753,11 +1816,6 @@
|
|
|
</entry>
|
|
|
</map>
|
|
|
</option>
|
|
|
- <option name="modificationStamps">
|
|
|
- <map>
|
|
|
- <entry key="$PROJECT_DIR$" value="4484451818000" />
|
|
|
- </map>
|
|
|
- </option>
|
|
|
<option name="projectBuildClasspath">
|
|
|
<map>
|
|
|
<entry key="$PROJECT_DIR$">
|
|
|
@@ -1905,7 +1963,7 @@
|
|
|
</entry>
|
|
|
</map>
|
|
|
</option>
|
|
|
- <option name="name" value="trunk" />
|
|
|
+ <option name="name" value="FreeFoodFinder" />
|
|
|
<option name="projectBuildClasspath">
|
|
|
<list>
|
|
|
<option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/announce" />
|
|
|
@@ -2069,7 +2127,6 @@
|
|
|
<option value="$PROJECT_DIR$/app/src/main/res/layout/map_screen.xml" />
|
|
|
<option value="$PROJECT_DIR$/app/src/main/java/com/example/yiupang/freefoodfinder/EventScreen.java" />
|
|
|
<option value="$PROJECT_DIR$/app/src/main/res/menu/menu_main.xml" />
|
|
|
- <option value="$PROJECT_DIR$/app/src/main/java/com/example/yiupang/freefoodfinder/EventsScreen.java" />
|
|
|
<option value="$PROJECT_DIR$/app/src/main/java/com/example/yiupang/freefoodfinder/MapScreen.java" />
|
|
|
<option value="$PROJECT_DIR$/app/src/main/res/values/styles.xml" />
|
|
|
<option value="$PROJECT_DIR$/app/build/intermediates/res/merged/debug/layout/tool_bar.xml" />
|
|
|
@@ -2082,14 +2139,16 @@
|
|
|
<option value="$PROJECT_DIR$/app/src/main/java/com/example/yiupang/freefoodfinder/AboutUsScreen.java" />
|
|
|
<option value="$PROJECT_DIR$/app/build.gradle" />
|
|
|
<option value="$PROJECT_DIR$/app/src/main/res/values/strings.xml" />
|
|
|
+ <option value="$PROJECT_DIR$/app/src/main/java/com/example/yiupang/freefoodfinder/EventsScreen.java" />
|
|
|
+ <option value="$PROJECT_DIR$/app/src/main/res/layout/event_details_screen.xml" />
|
|
|
+ <option value="$PROJECT_DIR$/app/src/main/java/com/example/yiupang/freefoodfinder/EventDetailsScreen.java" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
|
<component name="ProjectFrameBounds">
|
|
|
- <option name="x" value="95" />
|
|
|
- <option name="y" value="45" />
|
|
|
- <option name="width" value="1298" />
|
|
|
- <option name="height" value="790" />
|
|
|
+ <option name="y" value="23" />
|
|
|
+ <option name="width" value="1280" />
|
|
|
+ <option name="height" value="773" />
|
|
|
</component>
|
|
|
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
|
|
|
<OptionsSetting value="true" id="Add" />
|
|
|
@@ -2116,7 +2175,6 @@
|
|
|
<foldersAlwaysOnTop value="true" />
|
|
|
</navigator>
|
|
|
<panes>
|
|
|
- <pane id="PackagesPane" />
|
|
|
<pane id="AndroidView">
|
|
|
<subPane>
|
|
|
<PATH>
|
|
|
@@ -2178,111 +2236,41 @@
|
|
|
<subPane>
|
|
|
<PATH>
|
|
|
<PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="trunk" />
|
|
|
+ <option name="myItemId" value="FreeFoodFinder" />
|
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
|
|
</PATH_ELEMENT>
|
|
|
</PATH>
|
|
|
<PATH>
|
|
|
<PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="trunk" />
|
|
|
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
|
|
- </PATH_ELEMENT>
|
|
|
- <PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="trunk" />
|
|
|
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
|
- </PATH_ELEMENT>
|
|
|
- </PATH>
|
|
|
- <PATH>
|
|
|
- <PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="trunk" />
|
|
|
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
|
|
- </PATH_ELEMENT>
|
|
|
- <PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="trunk" />
|
|
|
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
|
- </PATH_ELEMENT>
|
|
|
- <PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="app" />
|
|
|
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
|
- </PATH_ELEMENT>
|
|
|
- </PATH>
|
|
|
- <PATH>
|
|
|
- <PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="trunk" />
|
|
|
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
|
|
- </PATH_ELEMENT>
|
|
|
- <PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="trunk" />
|
|
|
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
|
- </PATH_ELEMENT>
|
|
|
- <PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="app" />
|
|
|
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
|
- </PATH_ELEMENT>
|
|
|
- <PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="src" />
|
|
|
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
|
- </PATH_ELEMENT>
|
|
|
- </PATH>
|
|
|
- <PATH>
|
|
|
- <PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="trunk" />
|
|
|
+ <option name="myItemId" value="FreeFoodFinder" />
|
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
|
|
</PATH_ELEMENT>
|
|
|
<PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="trunk" />
|
|
|
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
|
- </PATH_ELEMENT>
|
|
|
- <PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="app" />
|
|
|
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
|
- </PATH_ELEMENT>
|
|
|
- <PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="src" />
|
|
|
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
|
- </PATH_ELEMENT>
|
|
|
- <PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="main" />
|
|
|
+ <option name="myItemId" value="FreeFoodFinder" />
|
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
|
</PATH_ELEMENT>
|
|
|
</PATH>
|
|
|
<PATH>
|
|
|
<PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="trunk" />
|
|
|
+ <option name="myItemId" value="FreeFoodFinder" />
|
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
|
|
</PATH_ELEMENT>
|
|
|
<PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="trunk" />
|
|
|
+ <option name="myItemId" value="FreeFoodFinder" />
|
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
|
</PATH_ELEMENT>
|
|
|
<PATH_ELEMENT>
|
|
|
<option name="myItemId" value="app" />
|
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
|
</PATH_ELEMENT>
|
|
|
- <PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="src" />
|
|
|
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
|
- </PATH_ELEMENT>
|
|
|
- <PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="main" />
|
|
|
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
|
- </PATH_ELEMENT>
|
|
|
- <PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="res" />
|
|
|
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
|
- </PATH_ELEMENT>
|
|
|
- <PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="values" />
|
|
|
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
|
- </PATH_ELEMENT>
|
|
|
</PATH>
|
|
|
<PATH>
|
|
|
<PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="trunk" />
|
|
|
+ <option name="myItemId" value="FreeFoodFinder" />
|
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
|
|
</PATH_ELEMENT>
|
|
|
<PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="trunk" />
|
|
|
+ <option name="myItemId" value="FreeFoodFinder" />
|
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
|
</PATH_ELEMENT>
|
|
|
<PATH_ELEMENT>
|
|
|
@@ -2293,22 +2281,14 @@
|
|
|
<option name="myItemId" value="src" />
|
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
|
</PATH_ELEMENT>
|
|
|
- <PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="main" />
|
|
|
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
|
- </PATH_ELEMENT>
|
|
|
- <PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="res" />
|
|
|
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
|
- </PATH_ELEMENT>
|
|
|
</PATH>
|
|
|
<PATH>
|
|
|
<PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="trunk" />
|
|
|
+ <option name="myItemId" value="FreeFoodFinder" />
|
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
|
|
</PATH_ELEMENT>
|
|
|
<PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="trunk" />
|
|
|
+ <option name="myItemId" value="FreeFoodFinder" />
|
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
|
</PATH_ELEMENT>
|
|
|
<PATH_ELEMENT>
|
|
|
@@ -2323,22 +2303,14 @@
|
|
|
<option name="myItemId" value="main" />
|
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
|
</PATH_ELEMENT>
|
|
|
- <PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="res" />
|
|
|
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
|
- </PATH_ELEMENT>
|
|
|
- <PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="drawable-nodpi" />
|
|
|
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
|
- </PATH_ELEMENT>
|
|
|
</PATH>
|
|
|
<PATH>
|
|
|
<PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="trunk" />
|
|
|
+ <option name="myItemId" value="FreeFoodFinder" />
|
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
|
|
</PATH_ELEMENT>
|
|
|
<PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="trunk" />
|
|
|
+ <option name="myItemId" value="FreeFoodFinder" />
|
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
|
</PATH_ELEMENT>
|
|
|
<PATH_ELEMENT>
|
|
|
@@ -2364,6 +2336,7 @@
|
|
|
</PATH>
|
|
|
</subPane>
|
|
|
</pane>
|
|
|
+ <pane id="PackagesPane" />
|
|
|
<pane id="Scope" />
|
|
|
</panes>
|
|
|
</component>
|
|
|
@@ -2692,32 +2665,6 @@
|
|
|
<configuration>$USER_HOME$/.subversion</configuration>
|
|
|
<supportedVersion>125</supportedVersion>
|
|
|
</component>
|
|
|
- <component name="SvnFileUrlMappingImpl">
|
|
|
- <option name="myMappingRoots">
|
|
|
- <list>
|
|
|
- <SvnCopyRootSimple>
|
|
|
- <option name="myVcsRoot" value="$PROJECT_DIR$" />
|
|
|
- <option name="myCopyRoot" value="$PROJECT_DIR$" />
|
|
|
- </SvnCopyRootSimple>
|
|
|
- <SvnCopyRootSimple>
|
|
|
- <option name="myVcsRoot" value="$PROJECT_DIR$/.idea" />
|
|
|
- <option name="myCopyRoot" value="$PROJECT_DIR$/.idea" />
|
|
|
- </SvnCopyRootSimple>
|
|
|
- <SvnCopyRootSimple>
|
|
|
- <option name="myVcsRoot" value="$PROJECT_DIR$/app" />
|
|
|
- <option name="myCopyRoot" value="$PROJECT_DIR$/app" />
|
|
|
- </SvnCopyRootSimple>
|
|
|
- </list>
|
|
|
- </option>
|
|
|
- <option name="myMoreRealMappingRoots">
|
|
|
- <list>
|
|
|
- <SvnCopyRootSimple>
|
|
|
- <option name="myVcsRoot" value="$PROJECT_DIR$" />
|
|
|
- <option name="myCopyRoot" value="$PROJECT_DIR$" />
|
|
|
- </SvnCopyRootSimple>
|
|
|
- </list>
|
|
|
- </option>
|
|
|
- </component>
|
|
|
<component name="TaskManager">
|
|
|
<task active="true" id="Default" summary="Default task">
|
|
|
<changelist id="c78b40ed-ebdd-4e48-bbc0-b120c3ce2158" name="Default" comment="" />
|
|
|
@@ -2737,30 +2684,30 @@
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
- <frame x="95" y="45" width="1298" height="790" extended-state="0" />
|
|
|
- <editor active="true" />
|
|
|
+ <frame x="0" y="23" width="1280" height="773" extended-state="6" />
|
|
|
+ <editor active="false" />
|
|
|
<layout>
|
|
|
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
|
|
- <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32683983" sideWeight="0.49786553" order="12" side_tool="false" content_ui="tabs" />
|
|
|
+ <window_info id="Messages" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.325723" sideWeight="0.49786553" order="12" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
|
|
|
<window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
|
|
|
<window_info id="Android Monitor" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
|
|
|
- <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
|
|
+ <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32956383" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.8474026" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
|
|
- <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
|
|
|
+ <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Captures" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Gradle Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32683983" sideWeight="0.50213444" order="11" side_tool="true" content_ui="tabs" />
|
|
|
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25238854" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
|
|
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25201938" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
|
|
<window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Android Model" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
|
|
|
<window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
|
|
- <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
|
|
|
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
|
|
+ <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
|
|
|
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
|
|
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
|
|
@@ -2814,21 +2761,16 @@
|
|
|
<component name="VcsManagerConfiguration">
|
|
|
<MESSAGE value="Add buttomBar for navigation and the header" />
|
|
|
<MESSAGE value="Fixed import and commented out annotations temporarily." />
|
|
|
- <option name="LAST_COMMIT_MESSAGE" value="Fixed import and commented out annotations temporarily." />
|
|
|
+ <MESSAGE value="Added skeleton for details screen; will expand on this further." />
|
|
|
+ <option name="LAST_COMMIT_MESSAGE" value="Added skeleton for details screen; will expand on this further." />
|
|
|
</component>
|
|
|
<component name="XDebuggerManager">
|
|
|
- <breakpoint-manager />
|
|
|
+ <breakpoint-manager>
|
|
|
+ <option name="time" value="2" />
|
|
|
+ </breakpoint-manager>
|
|
|
<watches-manager />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/yiupang/freefoodfinder/Event.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="0">
|
|
|
- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/yiupang/freefoodfinder/Event.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="0">
|
|
|
@@ -2838,15 +2780,15 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/myevent_screen.xml">
|
|
|
- <provider editor-type-id="android-designer2">
|
|
|
- <state />
|
|
|
- </provider>
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="252">
|
|
|
<caret line="14" column="9" selection-start-line="14" selection-start-column="9" selection-end-line="14" selection-end-column="9" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
+ <provider editor-type-id="android-designer2">
|
|
|
+ <state />
|
|
|
+ </provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/yiupang/freefoodfinder/MyEventScreen.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
@@ -2865,15 +2807,15 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/myevent_screen.xml">
|
|
|
- <provider editor-type-id="android-designer2">
|
|
|
- <state />
|
|
|
- </provider>
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="252">
|
|
|
<caret line="14" column="9" selection-start-line="14" selection-start-column="9" selection-end-line="14" selection-end-column="9" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
+ <provider editor-type-id="android-designer2">
|
|
|
+ <state />
|
|
|
+ </provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/yiupang/freefoodfinder/MyEventScreen.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
@@ -2915,24 +2857,24 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
|
|
|
- <provider editor-type-id="android-designer2">
|
|
|
- <state />
|
|
|
- </provider>
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="126">
|
|
|
<caret line="7" column="32" selection-start-line="7" selection-start-column="24" selection-end-line="7" selection-end-column="32" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/tool_bar.xml">
|
|
|
<provider editor-type-id="android-designer2">
|
|
|
<state />
|
|
|
</provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/tool_bar.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="72">
|
|
|
<caret line="4" column="31" selection-start-line="4" selection-start-column="31" selection-end-line="4" selection-end-column="31" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
+ <provider editor-type-id="android-designer2">
|
|
|
+ <state />
|
|
|
+ </provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/values/styles.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
@@ -2968,69 +2910,45 @@
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_main.xml" />
|
|
|
<entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.roughike/bottom-bar/1.3.3/c90f76539be3067cf69714ff812bf6dedc91fa21/bottom-bar-1.3.3-sources.jar!/com/roughike/bottombar/BottomBar.java" />
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/menu/menu_main.xml">
|
|
|
- <provider editor-type-id="android-designer2">
|
|
|
- <state />
|
|
|
- </provider>
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="88">
|
|
|
<caret line="4" column="14" selection-start-line="4" selection-start-column="14" selection-end-line="4" selection-end-column="14" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/yiupang/freefoodfinder/EventsScreen.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="374">
|
|
|
- <caret line="17" column="28" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="28" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/yiupang/freefoodfinder/MapScreen.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="352">
|
|
|
- <caret line="16" column="5" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/app/build/intermediates/res/merged/debug/layout/tool_bar.xml" />
|
|
|
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/aboutus_screen.xml">
|
|
|
<provider editor-type-id="android-designer2">
|
|
|
<state />
|
|
|
</provider>
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="154">
|
|
|
- <caret line="7" column="30" selection-start-line="7" selection-start-column="30" selection-end-line="7" selection-end-column="30" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
</entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/build/intermediates/res/merged/debug/layout/tool_bar.xml" />
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/map_screen.xml">
|
|
|
- <provider editor-type-id="android-designer2">
|
|
|
- <state />
|
|
|
- </provider>
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="154">
|
|
|
<caret line="7" column="25" selection-start-line="7" selection-start-column="25" selection-end-line="7" selection-end-column="25" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
|
|
|
<provider editor-type-id="android-designer2">
|
|
|
<state />
|
|
|
</provider>
|
|
|
+ </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="126">
|
|
|
<caret line="7" column="32" selection-start-line="7" selection-start-column="24" selection-end-line="7" selection-end-column="32" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/tool_bar.xml">
|
|
|
<provider editor-type-id="android-designer2">
|
|
|
<state />
|
|
|
</provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/tool_bar.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="72">
|
|
|
<caret line="4" column="31" selection-start-line="4" selection-start-column="31" selection-end-line="4" selection-end-column="31" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
+ <provider editor-type-id="android-designer2">
|
|
|
+ <state />
|
|
|
+ </provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/values/styles.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
@@ -3051,98 +2969,203 @@
|
|
|
<state />
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/yiupang/freefoodfinder/MainActivity.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/gradle.properties">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-55">
|
|
|
+ <state relative-caret-position="0">
|
|
|
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/gradle.properties">
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/proguard-rules.pro">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="0">
|
|
|
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/app/proguard-rules.pro">
|
|
|
+ <entry file="file://$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="0">
|
|
|
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties">
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/src/main/res/drawable-nodpi/dummy_image2.png" />
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/yiupang/freefoodfinder/MainActivity.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="90">
|
|
|
+ <caret line="33" column="13" selection-start-line="33" selection-start-column="13" selection-end-line="33" selection-end-column="13" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/yiupang/freefoodfinder/Event.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="-330">
|
|
|
+ <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/Documentation/US/McGuffin-US.txt">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="0">
|
|
|
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/events_screen.xml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Documentation/FR/McGuffin-FR.txt">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="0">
|
|
|
+ <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/aboutus_screen.xml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="105">
|
|
|
+ <caret line="7" column="30" selection-start-line="7" selection-start-column="30" selection-end-line="7" selection-end-column="30" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
<provider editor-type-id="android-designer2">
|
|
|
<state />
|
|
|
</provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/myevent_screen.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="342">
|
|
|
- <caret line="19" column="15" selection-start-line="19" selection-start-column="15" selection-end-line="19" selection-end-column="15" />
|
|
|
+ <state relative-caret-position="420">
|
|
|
+ <caret line="28" column="15" selection-start-line="28" selection-start-column="15" selection-end-line="28" selection-end-column="15" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ <provider editor-type-id="android-designer2">
|
|
|
+ <state />
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/src/main/res/drawable-hdpi/aboutus2.png">
|
|
|
+ <provider selected="true" editor-type-id="images">
|
|
|
+ <state />
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/src/main/res/drawable-hdpi/map.png">
|
|
|
+ <provider selected="true" editor-type-id="images">
|
|
|
+ <state />
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/src/main/res/drawable-hdpi/myevent.png">
|
|
|
+ <provider selected="true" editor-type-id="images">
|
|
|
+ <state />
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/src/main/res/values/ids.xml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="0">
|
|
|
+ <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="180">
|
|
|
+ <caret line="12" column="0" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/app/build.gradle">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="406">
|
|
|
+ <state relative-caret-position="374">
|
|
|
<caret line="30" column="55" selection-start-line="30" selection-start-column="55" selection-end-line="30" selection-end-column="55" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/yiupang/freefoodfinder/MyEventScreen.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/build/generated/source/r/debug/com/example/yiupang/freefoodfinder/R.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="420">
|
|
|
- <caret line="37" column="46" selection-start-line="37" selection-start-column="46" selection-end-line="37" selection-end-column="46" />
|
|
|
+ <state relative-caret-position="210">
|
|
|
+ <caret line="3883" column="40" selection-start-line="3883" selection-start-column="34" selection-end-line="3883" selection-end-column="40" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/myevent_screen.xml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/events_screen.xml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="285">
|
|
|
+ <caret line="19" column="15" selection-start-line="19" selection-start-column="15" selection-end-line="19" selection-end-column="15" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
<provider editor-type-id="android-designer2">
|
|
|
<state />
|
|
|
</provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/event_details_screen.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="60">
|
|
|
- <caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
|
|
|
+ <state relative-caret-position="486">
|
|
|
+ <caret line="108" column="7" selection-start-line="108" selection-start-column="7" selection-end-line="108" selection-end-column="7" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
+ <provider editor-type-id="android-designer2">
|
|
|
+ <state />
|
|
|
+ </provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/yiupang/freefoodfinder/Event.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/yiupang/freefoodfinder/AboutUsScreen.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="0">
|
|
|
- <caret line="0" column="43" selection-start-line="0" selection-start-column="43" selection-end-line="0" selection-end-column="43" />
|
|
|
+ <state relative-caret-position="435">
|
|
|
+ <caret line="49" column="8" selection-start-line="49" selection-start-column="8" selection-end-line="49" selection-end-column="8" />
|
|
|
+ <folding>
|
|
|
+ <element signature="imports" expanded="true" />
|
|
|
+ </folding>
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/yiupang/freefoodfinder/MapScreen.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="-55">
|
|
|
+ <caret line="16" column="5" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/app/src/main/res/drawable-nodpi/dummy_image2.png">
|
|
|
- <provider selected="true" editor-type-id="images">
|
|
|
- <state />
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/yiupang/freefoodfinder/MyEventScreen.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="420">
|
|
|
+ <caret line="37" column="46" selection-start-line="37" selection-start-column="46" selection-end-line="37" selection-end-column="46" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/yiupang/freefoodfinder/EventArrayAdapter.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="180">
|
|
|
- <caret line="12" column="0" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
|
|
|
+ <state relative-caret-position="-310">
|
|
|
+ <caret line="28" column="5" selection-start-line="28" selection-start-column="5" selection-end-line="28" selection-end-column="5" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/yiupang/freefoodfinder/AboutUsScreen.java">
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/yiupang/freefoodfinder/EventsScreen.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="449">
|
|
|
+ <caret line="35" column="78" selection-start-line="35" selection-start-column="78" selection-end-line="35" selection-end-column="78" />
|
|
|
+ <folding>
|
|
|
+ <element signature="imports" expanded="true" />
|
|
|
+ </folding>
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/yiupang/freefoodfinder/EventDetailsScreen.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="330">
|
|
|
- <caret line="22" column="0" selection-start-line="22" selection-start-column="0" selection-end-line="22" selection-end-column="0" />
|
|
|
+ <state relative-caret-position="290">
|
|
|
+ <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
|
|
|
<folding>
|
|
|
- <element signature="e#2377#2407#0" expanded="true" />
|
|
|
+ <element signature="imports" expanded="true" />
|
|
|
+ <element signature="e#958#959#0" expanded="true" />
|
|
|
+ <element signature="e#981#982#0" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|