|
|
@@ -6,31 +6,107 @@
|
|
|
</shared>
|
|
|
</component>
|
|
|
<component name="ChangeListManager">
|
|
|
- <list default="true" readonly="true" id="c78b40ed-ebdd-4e48-bbc0-b120c3ce2158" name="Default" comment="">
|
|
|
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/yiupang/freefoodfinder/AboutUsScreen.java" />
|
|
|
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/yiupang/freefoodfinder/EventsScreen.java" />
|
|
|
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/yiupang/freefoodfinder/MapScreen.java" />
|
|
|
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/yiupang/freefoodfinder/MyEventScreen.java" />
|
|
|
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/res/layout/aboutus_screen.xml" />
|
|
|
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/res/layout/events_screen.xml" />
|
|
|
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/res/layout/map_screen.xml" />
|
|
|
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/res/layout/myevent_screen.xml" />
|
|
|
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/res/layout/tool_bar.xml" />
|
|
|
- <change type="DELETED" beforePath="$PROJECT_DIR$/app/src/main/res/layout/content_main.xml" afterPath="" />
|
|
|
+ <list default="true" readonly="true" id="c78b40ed-ebdd-4e48-bbc0-b120c3ce2158" name="Default" comment="Fixed import and commented out annotations temporarily.">
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$" afterPath="$PROJECT_DIR$" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3" afterPath="$PROJECT_DIR$/.gradle/3.3" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts" afterPath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts" />
|
|
|
<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" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts/taskArtifacts.lock" afterPath="$PROJECT_DIR$/.gradle/3.3/taskArtifacts/taskArtifacts.lock" />
|
|
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/generated/mockable-android-25.jar" afterPath="$PROJECT_DIR$/build/generated/mockable-android-25.jar" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea" afterPath="$PROJECT_DIR$/.idea" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/copyright" afterPath="$PROJECT_DIR$/.idea/copyright" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries" afterPath="$PROJECT_DIR$/.idea/libraries" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Documentation" afterPath="$PROJECT_DIR$/Documentation" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Documentation/FR" afterPath="$PROJECT_DIR$/Documentation/FR" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Documentation/US" afterPath="$PROJECT_DIR$/Documentation/US" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app" afterPath="$PROJECT_DIR$/app" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src" afterPath="$PROJECT_DIR$/app/src" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/androidTest" afterPath="$PROJECT_DIR$/app/src/androidTest" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/androidTest/java" afterPath="$PROJECT_DIR$/app/src/androidTest/java" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/androidTest/java/com" afterPath="$PROJECT_DIR$/app/src/androidTest/java/com" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/androidTest/java/com/example" afterPath="$PROJECT_DIR$/app/src/androidTest/java/com/example" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/androidTest/java/com/example/yiupang" afterPath="$PROJECT_DIR$/app/src/androidTest/java/com/example/yiupang" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/androidTest/java/com/example/yiupang/freefoodfinder" afterPath="$PROJECT_DIR$/app/src/androidTest/java/com/example/yiupang/freefoodfinder" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main" afterPath="$PROJECT_DIR$/app/src/main" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java" afterPath="$PROJECT_DIR$/app/src/main/java" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/com" afterPath="$PROJECT_DIR$/app/src/main/java/com" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/com/example" afterPath="$PROJECT_DIR$/app/src/main/java/com/example" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/com/example/yiupang" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/yiupang" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/com/example/yiupang/freefoodfinder" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/yiupang/freefoodfinder" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res" afterPath="$PROJECT_DIR$/app/src/main/res" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/layout" afterPath="$PROJECT_DIR$/app/src/main/res/layout" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/menu" afterPath="$PROJECT_DIR$/app/src/main/res/menu" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/mipmap-hdpi" afterPath="$PROJECT_DIR$/app/src/main/res/mipmap-hdpi" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/mipmap-mdpi" afterPath="$PROJECT_DIR$/app/src/main/res/mipmap-mdpi" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/mipmap-xhdpi" afterPath="$PROJECT_DIR$/app/src/main/res/mipmap-xhdpi" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/mipmap-xxhdpi" afterPath="$PROJECT_DIR$/app/src/main/res/mipmap-xxhdpi" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/mipmap-xxxhdpi" afterPath="$PROJECT_DIR$/app/src/main/res/mipmap-xxxhdpi" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/values" afterPath="$PROJECT_DIR$/app/src/main/res/values" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/test" afterPath="$PROJECT_DIR$/app/src/test" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/test/java" afterPath="$PROJECT_DIR$/app/src/test/java" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/test/java/com" afterPath="$PROJECT_DIR$/app/src/test/java/com" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/test/java/com/example" afterPath="$PROJECT_DIR$/app/src/test/java/com/example" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/test/java/com/example/yiupang" afterPath="$PROJECT_DIR$/app/src/test/java/com/example/yiupang" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/test/java/com/example/yiupang/freefoodfinder" afterPath="$PROJECT_DIR$/app/src/test/java/com/example/yiupang/freefoodfinder" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build" afterPath="$PROJECT_DIR$/build" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/android-profile" afterPath="$PROJECT_DIR$/build/android-profile" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/generated" afterPath="$PROJECT_DIR$/build/generated" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gradle" afterPath="$PROJECT_DIR$/gradle" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gradle/wrapper" afterPath="$PROJECT_DIR$/gradle/wrapper" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/server" afterPath="$PROJECT_DIR$/server" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/server/app" afterPath="$PROJECT_DIR$/server/app" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/server/app/controllers" afterPath="$PROJECT_DIR$/server/app/controllers" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/server/app/filters" afterPath="$PROJECT_DIR$/server/app/filters" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/server/app/models" afterPath="$PROJECT_DIR$/server/app/models" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/server/app/services" afterPath="$PROJECT_DIR$/server/app/services" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/server/app/views" afterPath="$PROJECT_DIR$/server/app/views" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/server/conf" afterPath="$PROJECT_DIR$/server/conf" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/server/project" afterPath="$PROJECT_DIR$/server/project" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/server/public" afterPath="$PROJECT_DIR$/server/public" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/server/public/images" afterPath="$PROJECT_DIR$/server/public/images" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/server/public/javascripts" afterPath="$PROJECT_DIR$/server/public/javascripts" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/server/public/stylesheets" afterPath="$PROJECT_DIR$/server/public/stylesheets" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/server/test" afterPath="$PROJECT_DIR$/server/test" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle" afterPath="$PROJECT_DIR$/.gradle" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/gradle.xml" afterPath="$PROJECT_DIR$/.idea/gradle.xml" />
|
|
|
+ <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" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/exposed_instrumentation_api_publish_0_5.xml" afterPath="$PROJECT_DIR$/.idea/libraries/exposed_instrumentation_api_publish_0_5.xml" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/hamcrest_core_1_3.xml" afterPath="$PROJECT_DIR$/.idea/libraries/hamcrest_core_1_3.xml" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/hamcrest_integration_1_3.xml" afterPath="$PROJECT_DIR$/.idea/libraries/hamcrest_integration_1_3.xml" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/hamcrest_library_1_3.xml" afterPath="$PROJECT_DIR$/.idea/libraries/hamcrest_library_1_3.xml" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/javawriter_2_1_1.xml" afterPath="$PROJECT_DIR$/.idea/libraries/javawriter_2_1_1.xml" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/javax_annotation_api_1_2.xml" afterPath="$PROJECT_DIR$/.idea/libraries/javax_annotation_api_1_2.xml" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/javax_inject_1.xml" afterPath="$PROJECT_DIR$/.idea/libraries/javax_inject_1.xml" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/jsr305_2_0_1.xml" afterPath="$PROJECT_DIR$/.idea/libraries/jsr305_2_0_1.xml" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/junit_4_12.xml" afterPath="$PROJECT_DIR$/.idea/libraries/junit_4_12.xml" />
|
|
|
+ <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" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/support_fragment_25_3_1.xml" afterPath="$PROJECT_DIR$/.idea/libraries/support_fragment_25_3_1.xml" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/support_media_compat_25_3_1.xml" afterPath="$PROJECT_DIR$/.idea/libraries/support_media_compat_25_3_1.xml" />
|
|
|
+ <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/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.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/MainActivity.java" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/yiupang/freefoodfinder/MainActivity.java" />
|
|
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" />
|
|
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/menu/menu_main.xml" afterPath="$PROJECT_DIR$/app/src/main/res/menu/menu_main.xml" />
|
|
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/values/styles.xml" afterPath="$PROJECT_DIR$/app/src/main/res/values/styles.xml" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/com/example/yiupang/freefoodfinder/Event.java" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/yiupang/freefoodfinder/Event.java" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/local.properties" afterPath="$PROJECT_DIR$/local.properties" />
|
|
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/server/app/controllers/EventsController.java" afterPath="$PROJECT_DIR$/server/app/controllers/EventsController.java" />
|
|
|
</list>
|
|
|
+ <list id="4f3bd985-9864-4813-aba5-262aa5a7ccfd" name="Rejected commit: Default" comment="Fixed import and commented out annotations temporarily." />
|
|
|
<ignored path="FreeFoodFinder.iws" />
|
|
|
<ignored path=".idea/workspace.xml" />
|
|
|
<ignored path="gradle/" />
|
|
|
@@ -76,75 +152,22 @@
|
|
|
</component>
|
|
|
<component name="FileEditorManager">
|
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
|
|
|
- <file leaf-file-name="MainActivity.java" pinned="false" current-in-tab="true">
|
|
|
- <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="176">
|
|
|
- <caret line="20" column="24" selection-start-line="20" selection-start-column="24" selection-end-line="20" selection-end-column="24" />
|
|
|
- <folding>
|
|
|
- <element signature="imports" expanded="true" />
|
|
|
- </folding>
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file leaf-file-name="activity_main.xml" pinned="false" current-in-tab="false">
|
|
|
- <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="154">
|
|
|
- <caret line="7" column="32" selection-start-line="7" selection-start-column="24" selection-end-line="7" selection-end-column="32" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file leaf-file-name="tool_bar.xml" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/tool_bar.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="31" selection-start-line="4" selection-start-column="31" selection-end-line="4" selection-end-column="31" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file leaf-file-name="styles.xml" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/app/src/main/res/values/styles.xml">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="66">
|
|
|
- <caret line="3" column="68" selection-start-line="3" selection-start-column="68" selection-end-line="3" selection-end-column="68" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file leaf-file-name="AndroidManifest.xml" pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
|
|
|
+ <file leaf-file-name="Event.java" pinned="false" current-in-tab="true">
|
|
|
+ <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" />
|
|
|
+ <caret line="0" column="43" selection-start-line="0" selection-start-column="43" selection-end-line="0" selection-end-column="43" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
- <provider editor-type-id="android-manifest">
|
|
|
- <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">
|
|
|
+ <file leaf-file-name="build.gradle" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/build.gradle">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="374">
|
|
|
- <caret line="17" column="5" selection-start-line="17" selection-start-column="5" selection-end-line="17" selection-end-column="5" />
|
|
|
- <folding>
|
|
|
- <element signature="imports" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <state relative-caret-position="522">
|
|
|
+ <caret line="29" column="43" selection-start-line="29" selection-start-column="43" selection-end-line="29" selection-end-column="43" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
@@ -163,7 +186,7 @@
|
|
|
<component name="GradleLocalSettings">
|
|
|
<option name="myGradleHomes">
|
|
|
<map>
|
|
|
- <entry key="$PROJECT_DIR$" value="C:\Users\yiupang\.gradle\wrapper\dists\gradle-3.3-all\55gk2rcmfc6p2dg9u9ohc3hw9\gradle-3.3" />
|
|
|
+ <entry key="$PROJECT_DIR$" value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3" />
|
|
|
</map>
|
|
|
</option>
|
|
|
<option name="myGradleVersions">
|
|
|
@@ -1678,6 +1701,11 @@
|
|
|
</entry>
|
|
|
</map>
|
|
|
</option>
|
|
|
+ <option name="modificationStamps">
|
|
|
+ <map>
|
|
|
+ <entry key="$PROJECT_DIR$" value="4483025454591" />
|
|
|
+ </map>
|
|
|
+ </option>
|
|
|
<option name="projectBuildClasspath">
|
|
|
<map>
|
|
|
<entry key="$PROJECT_DIR$">
|
|
|
@@ -1828,6 +1856,141 @@
|
|
|
<option name="name" value="trunk" />
|
|
|
<option name="projectBuildClasspath">
|
|
|
<list>
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/process-services" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/wrapper" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/model-groovy" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/base-services" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/internal-testing" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/testing-native" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/testing-base" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/ivy" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/cli" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/plugin-use" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/publish" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/installation-beacon" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/build-init" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/logging" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/platform-native" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/platform-jvm" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/platform-play" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/jetty" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/launcher" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/signing" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/diagnostics" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/plugin-development" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/ear" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/composite-builds" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/dependency-management" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/language-groovy" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/jvm-services" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/testing-jvm" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/language-scala" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/internal-android-performance-testing" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/internal-integ-testing" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/maven" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/reporting" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/internal-performance-testing" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/base-services-groovy" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/language-jvm" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/javascript" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/language-java" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/messaging" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/open-api" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/platform-base" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/plugins" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/build-comparison" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/osgi" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/core" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/tooling-api" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/code-quality" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/scala" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/resources-sftp" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/build-cache-http" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/model-core" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/ide-play" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/resources" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/language-native" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/resources-s3" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/jacoco" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/workers" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/announce" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/ide-native" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/native" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/test-kit" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/antlr" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/tooling-api-builders" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/resources-http" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/ide" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/src/ui" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/gradle-base-services-groovy-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/gradle-installation-beacon-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/gradle-model-core-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/gradle-jvm-services-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/gradle-process-services-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/gradle-tooling-api-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/ant-launcher-1.9.6.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/gradle-resources-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/gradle-docs-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/gradle-ui-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/gradle-base-services-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/gradle-launcher-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/gradle-messaging-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/gradle-logging-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/groovy-all-2.4.7.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/gradle-wrapper-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/gradle-cli-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/ant-1.9.6.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/gradle-version-info-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/gradle-open-api-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/gradle-model-groovy-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/gradle-native-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/gradle-core-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/gradle-script-kotlin-0.5.1.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-maven-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-resources-http-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-language-native-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-build-cache-http-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-build-comparison-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-code-quality-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-jacoco-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-resources-s3-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-testing-jvm-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-plugin-development-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-ide-play-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-build-init-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-platform-jvm-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-ivy-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-language-jvm-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-ear-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-plugin-use-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-workers-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-ide-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-signing-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-testing-native-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-test-kit-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-language-groovy-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-ide-native-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/ivy-2.2.0.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-announce-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-platform-play-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-language-java-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-platform-base-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-testing-base-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-scala-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-publish-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-antlr-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-tooling-api-builders-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-dependency-management-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-jetty-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-language-scala-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-composite-builds-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-platform-native-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-diagnostics-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-javascript-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-osgi-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-reporting-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-plugins-3.3.jar" />
|
|
|
+ <option value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.3-all/55gk2rcmfc6p2dg9u9ohc3hw9/gradle-3.3/lib/plugins/gradle-resources-sftp-3.3.jar" />
|
|
|
<option value="$PROJECT_DIR$/buildSrc/src/main/java" />
|
|
|
<option value="$PROJECT_DIR$/buildSrc/src/main/groovy" />
|
|
|
</list>
|
|
|
@@ -1853,7 +2016,6 @@
|
|
|
<option value="$PROJECT_DIR$/app/src/main/res/layout/aboutus_screen.xml" />
|
|
|
<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/build.gradle" />
|
|
|
<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/MyEventScreen.java" />
|
|
|
@@ -1864,14 +2026,14 @@
|
|
|
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" />
|
|
|
<option value="$PROJECT_DIR$/app/src/main/res/layout/tool_bar.xml" />
|
|
|
<option value="$PROJECT_DIR$/app/src/main/java/com/example/yiupang/freefoodfinder/MainActivity.java" />
|
|
|
+ <option value="$PROJECT_DIR$/app/build.gradle" />
|
|
|
+ <option value="$PROJECT_DIR$/app/src/main/java/com/example/yiupang/freefoodfinder/Event.java" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
|
<component name="ProjectFrameBounds">
|
|
|
- <option name="x" value="-9" />
|
|
|
- <option name="y" value="-9" />
|
|
|
- <option name="width" value="1938" />
|
|
|
- <option name="height" value="1048" />
|
|
|
+ <option name="width" value="1920" />
|
|
|
+ <option name="height" value="1063" />
|
|
|
</component>
|
|
|
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
|
|
|
<OptionsSetting value="true" id="Add" />
|
|
|
@@ -1898,89 +2060,21 @@
|
|
|
<foldersAlwaysOnTop value="true" />
|
|
|
</navigator>
|
|
|
<panes>
|
|
|
- <pane id="Scope" />
|
|
|
+ <pane id="ProjectPane" />
|
|
|
<pane id="Scratches" />
|
|
|
+ <pane id="Scope" />
|
|
|
<pane id="PackagesPane" />
|
|
|
- <pane id="ProjectPane" />
|
|
|
<pane id="AndroidView">
|
|
|
<subPane>
|
|
|
<PATH>
|
|
|
<PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="FreeFoodFinder" />
|
|
|
+ <option name="myItemId" value="trunk" />
|
|
|
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
|
|
|
</PATH_ELEMENT>
|
|
|
- <PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="Gradle Scripts" />
|
|
|
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidBuildScriptsGroupNode" />
|
|
|
- </PATH_ELEMENT>
|
|
|
</PATH>
|
|
|
<PATH>
|
|
|
<PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="FreeFoodFinder" />
|
|
|
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
|
|
|
- </PATH_ELEMENT>
|
|
|
- <PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="app" />
|
|
|
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
|
|
|
- </PATH_ELEMENT>
|
|
|
- <PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="res" />
|
|
|
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderNode" />
|
|
|
- </PATH_ELEMENT>
|
|
|
- </PATH>
|
|
|
- <PATH>
|
|
|
- <PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="FreeFoodFinder" />
|
|
|
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
|
|
|
- </PATH_ELEMENT>
|
|
|
- <PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="app" />
|
|
|
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
|
|
|
- </PATH_ELEMENT>
|
|
|
- <PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="res" />
|
|
|
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderNode" />
|
|
|
- </PATH_ELEMENT>
|
|
|
- <PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="layout" />
|
|
|
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderTypeNode" />
|
|
|
- </PATH_ELEMENT>
|
|
|
- </PATH>
|
|
|
- <PATH>
|
|
|
- <PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="FreeFoodFinder" />
|
|
|
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
|
|
|
- </PATH_ELEMENT>
|
|
|
- <PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="app" />
|
|
|
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
|
|
|
- </PATH_ELEMENT>
|
|
|
- <PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="java" />
|
|
|
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidSourceTypeNode" />
|
|
|
- </PATH_ELEMENT>
|
|
|
- </PATH>
|
|
|
- <PATH>
|
|
|
- <PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="FreeFoodFinder" />
|
|
|
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
|
|
|
- </PATH_ELEMENT>
|
|
|
- <PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="app" />
|
|
|
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
|
|
|
- </PATH_ELEMENT>
|
|
|
- <PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="java" />
|
|
|
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidSourceTypeNode" />
|
|
|
- </PATH_ELEMENT>
|
|
|
- <PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="freefoodfinder" />
|
|
|
- <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidPsiDirectoryNode" />
|
|
|
- </PATH_ELEMENT>
|
|
|
- </PATH>
|
|
|
- <PATH>
|
|
|
- <PATH_ELEMENT>
|
|
|
- <option name="myItemId" value="FreeFoodFinder" />
|
|
|
+ <option name="myItemId" value="trunk" />
|
|
|
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
|
|
|
</PATH_ELEMENT>
|
|
|
<PATH_ELEMENT>
|
|
|
@@ -1998,7 +2092,7 @@
|
|
|
<property name="settings.editor.selected.configurable" value="preferences.updates" />
|
|
|
<property name="android.sdk.path" value="$USER_HOME$/AppData/Local/Android/Sdk" />
|
|
|
<property name="settings.editor.splitter.proportion" value="0.2" />
|
|
|
- <property name="last_opened_file_path" value="$PROJECT_DIR$/.gradle" />
|
|
|
+ <property name="last_opened_file_path" value="$PROJECT_DIR$" />
|
|
|
<property name="device.picker.selection" value="Nexus_5X_API_18" />
|
|
|
</component>
|
|
|
<component name="RunManager" selected="Android App.app">
|
|
|
@@ -2314,31 +2408,31 @@
|
|
|
<option name="remove_strategy" value="false" />
|
|
|
</component>
|
|
|
<component name="SvnConfiguration" cleanupOnStartRun="true">
|
|
|
- <configuration>C:\Users\yiupang\AppData\Roaming\Subversion</configuration>
|
|
|
+ <configuration>$USER_HOME$/.subversion</configuration>
|
|
|
<supportedVersion>125</supportedVersion>
|
|
|
</component>
|
|
|
<component name="SvnFileUrlMappingImpl">
|
|
|
<option name="myMappingRoots">
|
|
|
<list>
|
|
|
<SvnCopyRootSimple>
|
|
|
- <option name="myVcsRoot" value="C:\Users\yiupang\Documents\FreeFoodFinder\trunk" />
|
|
|
- <option name="myCopyRoot" value="C:\Users\yiupang\Documents\FreeFoodFinder\trunk" />
|
|
|
+ <option name="myVcsRoot" value="$PROJECT_DIR$" />
|
|
|
+ <option name="myCopyRoot" value="$PROJECT_DIR$" />
|
|
|
</SvnCopyRootSimple>
|
|
|
<SvnCopyRootSimple>
|
|
|
- <option name="myVcsRoot" value="C:\Users\yiupang\Documents\FreeFoodFinder\trunk\.idea" />
|
|
|
- <option name="myCopyRoot" value="C:\Users\yiupang\Documents\FreeFoodFinder\trunk\.idea" />
|
|
|
+ <option name="myVcsRoot" value="$PROJECT_DIR$/.idea" />
|
|
|
+ <option name="myCopyRoot" value="$PROJECT_DIR$/.idea" />
|
|
|
</SvnCopyRootSimple>
|
|
|
<SvnCopyRootSimple>
|
|
|
- <option name="myVcsRoot" value="C:\Users\yiupang\Documents\FreeFoodFinder\trunk\app" />
|
|
|
- <option name="myCopyRoot" value="C:\Users\yiupang\Documents\FreeFoodFinder\trunk\app" />
|
|
|
+ <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="C:\Users\yiupang\Documents\FreeFoodFinder\trunk" />
|
|
|
- <option name="myCopyRoot" value="C:\Users\yiupang\Documents\FreeFoodFinder\trunk" />
|
|
|
+ <option name="myVcsRoot" value="$PROJECT_DIR$" />
|
|
|
+ <option name="myCopyRoot" value="$PROJECT_DIR$" />
|
|
|
</SvnCopyRootSimple>
|
|
|
</list>
|
|
|
</option>
|
|
|
@@ -2351,71 +2445,49 @@
|
|
|
<option name="presentableId" value="Default" />
|
|
|
<updated>1494045677764</updated>
|
|
|
</task>
|
|
|
+ <task id="LOCAL-00001" summary="Fixed import and commented out annotations temporarily.">
|
|
|
+ <created>1494288086172</created>
|
|
|
+ <option name="number" value="00001" />
|
|
|
+ <option name="presentableId" value="LOCAL-00001" />
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
+ <updated>1494288086172</updated>
|
|
|
+ </task>
|
|
|
+ <option name="localTasksCounter" value="2" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
- <frame x="-9" y="-9" width="1938" height="1048" extended-state="6" />
|
|
|
- <editor active="false" />
|
|
|
+ <frame x="0" y="0" width="1920" height="1063" extended-state="0" />
|
|
|
+ <editor active="true" />
|
|
|
<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.32705882" sideWeight="0.5" order="7" 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="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="3" 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="3" side_tool="false" 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="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.33" sideWeight="0.5" order="-1" side_tool="false" 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="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="Version Control" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.8482353" sideWeight="0.5" order="7" 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="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="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="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="3" 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.33" sideWeight="0.5" order="7" 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.19226637" 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="3" 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.22251868" 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="3" side_tool="false" 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="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="3" side_tool="true" 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" />
|
|
|
<window_info id="Hierarchy" active="false" anchor="right" 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="combo" />
|
|
|
<window_info id="Ant Build" active="false" anchor="right" 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="Inspection" 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="5" 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="Find" 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="1" side_tool="false" content_ui="tabs" />
|
|
|
</layout>
|
|
|
- <layout-to-restore>
|
|
|
- <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="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="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="1" 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="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="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
|
|
|
- <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="Ant Build" active="false" anchor="right" 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="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="4" 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="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.33" sideWeight="0.5" order="9" side_tool="false" 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="5" 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="5" side_tool="false" content_ui="tabs" />
|
|
|
- <window_info id="Inspection" 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="5" 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="0" 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="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32960895" 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.33" sideWeight="0.5" order="11" 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="Gradle Console" 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="12" 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.36507937" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
|
|
|
- <window_info id="Find" 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="1" side_tool="false" content_ui="tabs" />
|
|
|
- <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="6" side_tool="false" 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="7" 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="6" side_tool="true" content_ui="tabs" />
|
|
|
- </layout-to-restore>
|
|
|
</component>
|
|
|
<component name="Vcs.Log.UiProperties">
|
|
|
<option name="RECENTLY_FILTERED_USER_GROUPS">
|
|
|
@@ -2430,53 +2502,82 @@
|
|
|
</component>
|
|
|
<component name="VcsManagerConfiguration">
|
|
|
<MESSAGE value="Add buttomBar for navigation and the header" />
|
|
|
- <option name="LAST_COMMIT_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." />
|
|
|
</component>
|
|
|
<component name="XDebuggerManager">
|
|
|
<breakpoint-manager />
|
|
|
<watches-manager />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
- <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/yiupang/freefoodfinder/MainActivity.java">
|
|
|
+ <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>
|
|
|
- <element signature="imports" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_main.xml">
|
|
|
- <provider selected="true" editor-type-id="android-designer2">
|
|
|
+ <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="108">
|
|
|
+ <caret line="20" column="24" selection-start-line="20" selection-start-column="24" selection-end-line="20" selection-end-column="24" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
|
|
|
+ <provider editor-type-id="android-designer2">
|
|
|
<state />
|
|
|
</provider>
|
|
|
- <provider 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 />
|
|
|
+ <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/content_main.xml">
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/tool_bar.xml">
|
|
|
<provider editor-type-id="android-designer2">
|
|
|
<state />
|
|
|
</provider>
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="22">
|
|
|
- <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="17" selection-end-column="52" />
|
|
|
+ <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>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/src/main/res/values/styles.xml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="54">
|
|
|
+ <caret line="3" column="68" selection-start-line="3" selection-start-column="68" selection-end-line="3" selection-end-column="68" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <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/AndroidManifest.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="487">
|
|
|
- <caret line="519" column="9" selection-start-line="519" selection-start-column="9" selection-end-line="519" selection-end-column="9" />
|
|
|
+ <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/MyEventScreen.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="216">
|
|
|
+ <caret line="17" column="5" selection-start-line="17" selection-start-column="5" selection-end-line="17" selection-end-column="5" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <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="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/src/main/res/layout/content_main.xml" />
|
|
|
+ <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 />
|
|
|
@@ -2488,23 +2589,10 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <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="352">
|
|
|
- <caret line="16" column="5" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
|
|
|
- <folding>
|
|
|
- <element signature="imports" expanded="true" />
|
|
|
- </folding>
|
|
|
- </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" />
|
|
|
- <folding>
|
|
|
- <element signature="imports" expanded="true" />
|
|
|
- </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
@@ -2512,38 +2600,13 @@
|
|
|
<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" />
|
|
|
- <folding>
|
|
|
- <element signature="imports" expanded="true" />
|
|
|
- </folding>
|
|
|
</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">
|
|
|
- <state relative-caret-position="374">
|
|
|
+ <state relative-caret-position="216">
|
|
|
<caret line="17" column="5" selection-start-line="17" selection-start-column="5" selection-end-line="17" selection-end-column="5" />
|
|
|
- <folding>
|
|
|
- <element signature="imports" expanded="true" />
|
|
|
- </folding>
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.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>
|
|
|
- <provider editor-type-id="android-manifest">
|
|
|
- <state />
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/app/build.gradle">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="619">
|
|
|
- <caret line="29" column="42" selection-start-line="29" selection-start-column="42" selection-end-line="29" selection-end-column="42" />
|
|
|
- <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
@@ -2554,18 +2617,10 @@
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="308">
|
|
|
<caret line="14" column="15" selection-start-line="14" selection-start-column="15" selection-end-line="14" selection-end-column="15" />
|
|
|
- <folding />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/app/build/intermediates/res/merged/debug/layout/tool_bar.xml">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="22">
|
|
|
- <caret line="1" column="34" selection-start-line="1" selection-start-column="34" selection-end-line="1" selection-end-column="34" />
|
|
|
- <folding />
|
|
|
</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 />
|
|
|
@@ -2573,7 +2628,6 @@
|
|
|
<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" />
|
|
|
- <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
@@ -2584,7 +2638,6 @@
|
|
|
<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" />
|
|
|
- <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
@@ -2595,15 +2648,6 @@
|
|
|
<provider 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/styles.xml">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="66">
|
|
|
- <caret line="3" column="68" selection-start-line="3" selection-start-column="68" selection-end-line="3" selection-end-column="68" />
|
|
|
- <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
@@ -2612,9 +2656,8 @@
|
|
|
<state />
|
|
|
</provider>
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="154">
|
|
|
+ <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" />
|
|
|
- <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
@@ -2623,19 +2666,81 @@
|
|
|
<state />
|
|
|
</provider>
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="88">
|
|
|
+ <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>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/src/main/res/values/styles.xml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="54">
|
|
|
+ <caret line="3" column="68" selection-start-line="3" selection-start-column="68" selection-end-line="3" selection-end-column="68" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.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>
|
|
|
+ <provider editor-type-id="android-manifest">
|
|
|
+ <state />
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
<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="176">
|
|
|
- <caret line="20" column="24" selection-start-line="20" selection-start-column="24" selection-end-line="20" selection-end-column="24" />
|
|
|
- <folding>
|
|
|
- <element signature="imports" expanded="true" />
|
|
|
- </folding>
|
|
|
+ <state relative-caret-position="-55">
|
|
|
+ <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/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="11" selection-start-line="0" selection-start-column="11" selection-end-line="0" selection-end-column="43" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/gradle.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" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <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" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <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" />
|
|
|
+ <folding />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/build.gradle">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="522">
|
|
|
+ <caret line="29" column="43" selection-start-line="29" selection-start-column="43" selection-end-line="29" selection-end-column="43" />
|
|
|
+ <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">
|
|
|
+ <caret line="0" column="43" selection-start-line="0" selection-start-column="43" selection-end-line="0" selection-end-column="43" />
|
|
|
+ <folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
Thomas Flucke