You need to sign in or sign up before continuing.
Commit 40ef7cb4 authored by ankitasingh's avatar ankitasingh

filter activity complete changes merged with latest changes and date text size change

parent 10ca7250
...@@ -3,9 +3,6 @@ ...@@ -3,9 +3,6 @@
<component name="GradleSettings"> <component name="GradleSettings">
<option name="linkedExternalProjectsSettings"> <option name="linkedExternalProjectsSettings">
<GradleProjectSettings> <GradleProjectSettings>
<compositeConfiguration>
<compositeBuild compositeDefinitionSource="SCRIPT" />
</compositeConfiguration>
<option name="distributionType" value="DEFAULT_WRAPPED" /> <option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="modules"> <option name="modules">
......
<component name="libraryTable">
<library name="Gradle: __local_aars__:/home/abc/AndroidStudioProjects/InstiLostAndFound/app/libs/activation.jar:unspecified@jar">
<CLASSES>
<root url="jar://$PROJECT_DIR$/app/libs/activation.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Gradle: __local_aars__:/home/abc/AndroidStudioProjects/InstiLostAndFound/app/libs/additionnal.jar:unspecified@jar">
<CLASSES>
<root url="jar://$PROJECT_DIR$/app/libs/additionnal.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Gradle: __local_aars__:/home/abc/AndroidStudioProjects/InstiLostAndFound/app/libs/mail.jar:unspecified@jar">
<CLASSES>
<root url="jar://$PROJECT_DIR$/app/libs/mail.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Gradle: android.arch.navigation:navigation-common:1.0.0-alpha09@aar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e702918fd63b12377441df0cbcb50d14/jetified-navigation-common-1.0.0-alpha09/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/e702918fd63b12377441df0cbcb50d14/jetified-navigation-common-1.0.0-alpha09/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.navigation/navigation-common/1.0.0-alpha09/508bbb0b8d9d0fba3ff06612e3b6acbfce1b558a/navigation-common-1.0.0-alpha09-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Gradle: android.arch.navigation:navigation-fragment:1.0.0-alpha09@aar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4b64d3555a8e03492fa77449773e0d68/jetified-navigation-fragment-1.0.0-alpha09/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/4b64d3555a8e03492fa77449773e0d68/jetified-navigation-fragment-1.0.0-alpha09/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.navigation/navigation-fragment/1.0.0-alpha09/69c74f9052a94467bde44f6271ff338a1d72ad5a/navigation-fragment-1.0.0-alpha09-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
<component name="libraryTable">
<library name="Gradle: android.arch.navigation:navigation-runtime:1.0.0-alpha09@aar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/db77559690e1884c27fdc3f5c732becd/jetified-navigation-runtime-1.0.0-alpha09/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/db77559690e1884c27fdc3f5c732becd/jetified-navigation-runtime-1.0.0-alpha09/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/android.arch.navigation/navigation-runtime/1.0.0-alpha09/485e3761b29d82502678387344a93f95ab758ec/navigation-runtime-1.0.0-alpha09-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
<component name="libraryTable"> <component name="libraryTable">
<library name="Gradle: com.google.android.gms:play-services-basement:17.0.0@aar"> <library name="Gradle: com.google.android.gms:play-services-basement:17.0.0@aar">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5b44a467ef215ace407b0f6cf221c780/jetified-play-services-basement-17.0.0/jars/classes.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/17b5cdcb3e31a36e8bde86f3754af349/jetified-play-services-basement-17.0.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5b44a467ef215ace407b0f6cf221c780/jetified-play-services-basement-17.0.0/res" /> <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/17b5cdcb3e31a36e8bde86f3754af349/jetified-play-services-basement-17.0.0/res" />
</CLASSES> </CLASSES>
<JAVADOC> <JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.android.gms/play-services-basement/17.0.0/4faccf8c10bad282388a4067b8ef53d8476bbbc8/play-services-basement-17.0.0-javadoc.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.android.gms/play-services-basement/17.0.0/4faccf8c10bad282388a4067b8ef53d8476bbbc8/play-services-basement-17.0.0-javadoc.jar!/" />
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="JavadocGenerationManager">
<option name="OUTPUT_DIRECTORY" value="$USER_HOME$" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK" /> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
</project> </project>
\ No newline at end of file
...@@ -12,13 +12,32 @@ ...@@ -12,13 +12,32 @@
<list default="true" id="d3ee5bd8-a194-4e5e-99e3-99dd32fc4efe" name="Default Changelist" comment=""> <list default="true" id="d3ee5bd8-a194-4e5e-99e3-99dd32fc4efe" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.bin" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.lock" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/fileContent/fileContent.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/fileContent/fileContent.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.bin" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.lock" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/resourceHashesCache.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/resourceHashesCache.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/classAnalysis.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/classAnalysis.bin" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/classAnalysis.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/classAnalysis.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/javaCompile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/javaCompile.lock" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/javaCompile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/javaCompile.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/taskHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/taskHistory.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle____local_aars____home_abc_AndroidStudioProjects_InstiLostAndFound_app_libs_activation_jar_unspecified_jar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle____local_aars____home_abc_AndroidStudioProjects_InstiLostAndFound_app_libs_additionnal_jar_unspecified_jar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle____local_aars____home_abc_AndroidStudioProjects_InstiLostAndFound_app_libs_mail_jar_unspecified_jar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_navigation_navigation_common_1_0_0_alpha09_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_navigation_navigation_fragment_1_0_0_alpha09_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_navigation_navigation_runtime_1_0_0_alpha09_aar.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_17_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_17_0_0_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/NewsFeedFound.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/NewsFeedFound.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/app.iml" beforeDir="false" afterPath="$PROJECT_DIR$/app/app.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/FoundItem.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/FoundItem.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/LostItem.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/LostItem.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/NewsFeedLost.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/NewsFeedLost.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/content_found_item.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/content_found_item.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/content_lost_item.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/content_lost_item.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/local.properties" beforeDir="false" afterPath="$PROJECT_DIR$/local.properties" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
...@@ -47,8 +66,8 @@ ...@@ -47,8 +66,8 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/FoundItem.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/FoundItem.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="260"> <state relative-caret-position="310">
<caret line="79" column="121" selection-start-line="79" selection-start-column="47" selection-end-line="79" selection-end-column="121" /> <caret line="347" lean-forward="true" selection-start-line="347" selection-end-line="347" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
...@@ -56,23 +75,24 @@ ...@@ -56,23 +75,24 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/emailFragment.java"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_found_item.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300"> <state relative-caret-position="80">
<caret line="37" column="29" selection-start-line="37" selection-start-column="29" selection-end-line="37" selection-end-column="29" /> <caret line="89" column="30" selection-start-line="89" selection-start-column="30" selection-end-line="89" selection-end-column="30" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="e#3682#3696#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/CreateFoundObject.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/LostItem.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="219"> <state relative-caret-position="-1144">
<caret line="22" selection-start-line="22" selection-end-line="22" /> <caret line="215" column="58" lean-forward="true" selection-start-line="215" selection-start-column="58" selection-end-line="215" selection-end-column="58" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
...@@ -80,74 +100,74 @@ ...@@ -80,74 +100,74 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/NewsFeedFound.java"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_lost_item.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="12"> <state relative-caret-position="251">
<caret line="143" selection-start-line="143" selection-end-line="143" /> <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#7265#8738#0" expanded="true" />
<element signature="e#8737#8738#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/SendMail.java"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_found_item.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="382"> <state relative-caret-position="68">
<caret line="85" selection-start-line="85" selection-end-line="85" /> <caret line="12" column="64" selection-start-line="12" selection-start-column="64" selection-end-line="12" selection-end-column="64" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPosts.java"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_lost_item.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60"> <state relative-caret-position="263">
<caret line="22" column="46" selection-start-line="22" selection-start-column="29" selection-end-line="22" selection-end-column="46" /> <caret line="100" column="39" lean-forward="true" selection-start-line="100" selection-start-column="39" selection-end-line="100" selection-end-column="39" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPostsFoundRV.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/NewsFeedLost.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="103"> <state relative-caret-position="2175">
<caret line="50" column="35" selection-start-line="50" selection-start-column="35" selection-end-line="50" selection-end-column="35" /> <caret line="178" selection-start-line="178" selection-end-line="178" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/menu/menu.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MainActivity.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135"> <state relative-caret-position="15">
<caret line="9" column="56" selection-start-line="9" selection-start-column="56" selection-end-line="9" selection-end-column="56" /> <caret line="27" column="56" lean-forward="true" selection-start-line="27" selection-start-column="56" selection-end-line="27" selection-end-column="56" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
<provider editor-type-id="android-designer2" />
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/build.gradle"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/NewsFeedFound.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-363"> <state relative-caret-position="412">
<caret line="8" column="27" selection-start-line="8" selection-start-column="27" selection-end-line="8" selection-end-column="27" /> <caret line="180" lean-forward="true" selection-start-line="180" selection-end-line="180" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/NewsfeedAdaptor.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/Navigation.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="960"> <state relative-caret-position="120">
<caret line="83" column="5" selection-start-line="83" selection-start-column="5" selection-end-line="83" selection-end-column="5" /> <caret line="9" column="17" lean-forward="true" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -212,8 +232,6 @@ ...@@ -212,8 +232,6 @@
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/build.gradle" /> <option value="$PROJECT_DIR$/build.gradle" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/LostItem.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/content_lost_item.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_lost_item.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_lost_item.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/nav_headerlayout.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/layout/nav_headerlayout.xml" />
...@@ -234,7 +252,6 @@ ...@@ -234,7 +252,6 @@
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ImageAdapter.java" /> <option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ImageAdapter.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_my_posts_found_rv.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_my_posts_found_rv.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/NetworkConnection.java" /> <option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/NetworkConnection.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/content_found_item.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MainActivity.java" /> <option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MainActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/list_item.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/layout/list_item.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/image_item.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/layout/image_item.xml" />
...@@ -255,14 +272,18 @@ ...@@ -255,14 +272,18 @@
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/SendMail.java" /> <option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/SendMail.java" />
<option value="$PROJECT_DIR$/app/build.gradle" /> <option value="$PROJECT_DIR$/app/build.gradle" />
<option value="$PROJECT_DIR$/app/src/main/res/menu/menu.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/menu/menu.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/FoundItem.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/NewsFeedFound.java" /> <option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/NewsFeedFound.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/NewsFeedLost.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/LostItem.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/FoundItem.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/content_lost_item.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/content_found_item.xml" />
</list> </list>
</option> </option>
</component> </component>
<component name="ProjectFrameBounds" extendedState="6"> <component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="65" /> <option name="x" value="66" />
<option name="y" value="64" /> <option name="y" value="24" />
<option name="width" value="1281" /> <option name="width" value="1281" />
<option name="height" value="704" /> <option name="height" value="704" />
</component> </component>
...@@ -271,6 +292,33 @@ ...@@ -271,6 +292,33 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="PackagesPane">
<subPane>
<expand>
<path>
<item name="InstiLostAndFound" type="58d84e3e:PackageViewProjectNode" />
<item name="app" type="616d4139:PackageViewModuleNode" />
</path>
<path>
<item name="InstiLostAndFound" type="58d84e3e:PackageViewProjectNode" />
<item name="app" type="616d4139:PackageViewModuleNode" />
<item name="layout" type="1f31426a:PackageElementNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="ProjectPane">
<subPane>
<expand>
<path>
<item name="InstiLostAndFound" type="b2602c69:ProjectViewProjectNode" />
<item name="InstiLostAndFound" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope"> <pane id="Scope">
<subPane subId="Scope 'Project Source Files'; set:Project Source Files; class com.jetbrains.cidr.lang.search.scopes.ProjectSourcesScopeProvider$SourceFilesScope"> <subPane subId="Scope 'Project Source Files'; set:Project Source Files; class com.jetbrains.cidr.lang.search.scopes.ProjectSourcesScopeProvider$SourceFilesScope">
<expand> <expand>
...@@ -327,44 +375,34 @@ ...@@ -327,44 +375,34 @@
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="ProjectPane"> <pane id="AndroidView">
<subPane> <subPane>
<expand> <expand>
<path> <path>
<item name="InstiLostAndFound" type="b2602c69:ProjectViewProjectNode" /> <item name="InstiLostAndFound" type="1abcf292:AndroidViewProjectNode" />
<item name="InstiLostAndFound" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" /> <item name="app" type="feadf853:AndroidModuleNode" />
</path> </path>
</expand>
<select />
</subPane>
</pane>
<pane id="PackagesPane">
<subPane>
<expand>
<path> <path>
<item name="InstiLostAndFound" type="58d84e3e:PackageViewProjectNode" /> <item name="InstiLostAndFound" type="1abcf292:AndroidViewProjectNode" />
<item name="app" type="616d4139:PackageViewModuleNode" /> <item name="app" type="feadf853:AndroidModuleNode" />
<item name="java" type="edd41e36:AndroidSourceTypeNode" />
</path> </path>
<path> <path>
<item name="InstiLostAndFound" type="58d84e3e:PackageViewProjectNode" /> <item name="InstiLostAndFound" type="1abcf292:AndroidViewProjectNode" />
<item name="app" type="616d4139:PackageViewModuleNode" /> <item name="app" type="feadf853:AndroidModuleNode" />
<item name="layout" type="1f31426a:PackageElementNode" /> <item name="java" type="edd41e36:AndroidSourceTypeNode" />
<item name="instilostandfound" type="cbb59c9e:AndroidPsiDirectoryNode" />
</path> </path>
</expand>
<select />
</subPane>
</pane>
<pane id="AndroidView">
<subPane>
<expand>
<path> <path>
<item name="InstiLostAndFound" type="1abcf292:AndroidViewProjectNode" /> <item name="InstiLostAndFound" type="1abcf292:AndroidViewProjectNode" />
<item name="app" type="feadf853:AndroidModuleNode" /> <item name="app" type="feadf853:AndroidModuleNode" />
<item name="res" type="d4f16f75:AndroidResFolderNode" />
</path> </path>
<path> <path>
<item name="InstiLostAndFound" type="1abcf292:AndroidViewProjectNode" /> <item name="InstiLostAndFound" type="1abcf292:AndroidViewProjectNode" />
<item name="app" type="feadf853:AndroidModuleNode" /> <item name="app" type="feadf853:AndroidModuleNode" />
<item name="java" type="edd41e36:AndroidSourceTypeNode" /> <item name="res" type="d4f16f75:AndroidResFolderNode" />
<item name="layout" type="ddeffd01:AndroidResFolderTypeNode" />
</path> </path>
<path> <path>
<item name="InstiLostAndFound" type="1abcf292:AndroidViewProjectNode" /> <item name="InstiLostAndFound" type="1abcf292:AndroidViewProjectNode" />
...@@ -623,14 +661,22 @@ ...@@ -623,14 +661,22 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1574745835977</updated> <updated>1574745835977</updated>
</task> </task>
<option name="localTasksCounter" value="20" /> <task id="LOCAL-00020" summary="filter activity complete changes">
<created>1574749433839</created>
<option name="number" value="00020" />
<option name="presentableId" value="LOCAL-00020" />
<option name="project" value="LOCAL" />
<updated>1574749433839</updated>
</task>
<option name="localTasksCounter" value="21" />
<servers /> <servers />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="65" y="-4" width="1301" height="772" extended-state="6" /> <frame x="65" y="-4" width="1301" height="772" extended-state="6" />
<editor active="true" />
<layout> <layout>
<window_info id="Captures" order="0" side_tool="true" weight="0.25" /> <window_info id="Captures" order="0" side_tool="true" weight="0.25" />
<window_info content_ui="combo" id="Project" order="1" visible="true" weight="0.25338647" /> <window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.25338647" />
<window_info id="Structure" order="2" side_tool="true" /> <window_info id="Structure" order="2" side_tool="true" />
<window_info id="Favorites" order="3" side_tool="true" /> <window_info id="Favorites" order="3" side_tool="true" />
<window_info id="Build Variants" order="4" side_tool="true" /> <window_info id="Build Variants" order="4" side_tool="true" />
...@@ -638,14 +684,14 @@ ...@@ -638,14 +684,14 @@
<window_info id="Designer" order="6" /> <window_info id="Designer" order="6" />
<window_info id="Resources Explorer" order="7" weight="0.32955465" /> <window_info id="Resources Explorer" order="7" weight="0.32955465" />
<window_info id="Capture Tool" order="8" /> <window_info id="Capture Tool" order="8" />
<window_info anchor="bottom" id="Run" order="0" weight="0.32928944" /> <window_info anchor="bottom" id="Run" order="0" weight="0.3658915" />
<window_info anchor="bottom" id="Logcat" order="1" weight="0.06908463" /> <window_info anchor="bottom" id="Logcat" order="1" weight="0.06908463" />
<window_info anchor="bottom" id="TODO" order="2" /> <window_info anchor="bottom" id="TODO" order="2" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.33448875" /> <window_info anchor="bottom" id="Debug" order="3" weight="0.33448875" />
<window_info anchor="bottom" id="Terminal" order="4" /> <window_info anchor="bottom" id="Terminal" order="4" />
<window_info anchor="bottom" id="Event Log" order="5" sideWeight="0.50121456" side_tool="true" weight="0.25996533" /> <window_info anchor="bottom" id="Event Log" order="5" sideWeight="0.50121456" side_tool="true" weight="0.25996533" />
<window_info anchor="bottom" id="Version Control" order="6" weight="0.40069085" /> <window_info anchor="bottom" id="Version Control" order="6" weight="0.40069085" />
<window_info anchor="bottom" id="Build" order="7" sideWeight="0.49878544" weight="0.37088388" /> <window_info anchor="bottom" id="Build" order="7" sideWeight="0.49878544" visible="true" weight="0.30697674" />
<window_info anchor="bottom" id="Find" order="8" weight="0.4852713" /> <window_info anchor="bottom" id="Find" order="8" weight="0.4852713" />
<window_info active="true" anchor="bottom" id="Messages" order="9" visible="true" weight="0.13953489" /> <window_info active="true" anchor="bottom" id="Messages" order="9" visible="true" weight="0.13953489" />
<window_info anchor="bottom" id="Android Profiler" order="10" /> <window_info anchor="bottom" id="Android Profiler" order="10" />
...@@ -751,18 +797,18 @@ ...@@ -751,18 +797,18 @@
<MESSAGE value="email activities bug fixes minor" /> <MESSAGE value="email activities bug fixes minor" />
<MESSAGE value="email activities changes" /> <MESSAGE value="email activities changes" />
<MESSAGE value="filter activity partial changes" /> <MESSAGE value="filter activity partial changes" />
<option name="LAST_COMMIT_MESSAGE" value="filter activity partial changes" /> <MESSAGE value="filter activity complete changes" />
<MESSAGE value="filter activity complete changes merged with latest changes and date text size change" />
<option name="LAST_COMMIT_MESSAGE" value="filter activity complete changes merged with latest changes and date text size change" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_abrakadabra.xml" />
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_abrakadabra.xml" />
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
<provider selected="true" editor-type-id="android-designer2" />
<provider editor-type-id="text-editor"> <provider editor-type-id="text-editor">
<state relative-caret-position="495"> <state relative-caret-position="495">
<caret line="33" selection-start-line="33" selection-end-line="33" /> <caret line="33" selection-start-line="33" selection-end-line="33" />
</state> </state>
</provider> </provider>
<provider selected="true" editor-type-id="android-designer2" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/abrakadabra.java" /> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/abrakadabra.java" />
<entry file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml">
...@@ -772,29 +818,21 @@ ...@@ -772,29 +818,21 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_lost_item.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="22" column="50" selection-start-line="22" selection-start-column="4" selection-end-line="22" selection-end-column="50" />
</state>
</provider>
<provider editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/list_item.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/list_item.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90"> <state relative-caret-position="90">
<caret line="6" column="34" lean-forward="true" selection-start-line="6" selection-start-column="34" selection-end-line="6" selection-end-column="34" /> <caret line="6" column="34" lean-forward="true" selection-start-line="6" selection-start-column="34" selection-end-line="6" selection-end-column="34" />
</state> </state>
</provider> </provider>
<provider editor-type-id="android-designer2" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/image_item.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/image_item.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="304"> <state relative-caret-position="304">
<caret line="25" column="42" selection-start-line="25" selection-start-column="42" selection-end-line="25" selection-end-column="42" /> <caret line="25" column="42" selection-start-line="25" selection-start-column="42" selection-end-line="25" selection-end-column="42" />
</state> </state>
</provider> </provider>
<provider editor-type-id="android-designer2" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/NetworkConnection.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/NetworkConnection.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
...@@ -806,14 +844,6 @@ ...@@ -806,14 +844,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_found_item.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
<caret line="9" column="28" selection-start-line="9" selection-start-column="28" selection-end-line="9" selection-end-column="28" />
</state>
</provider>
<provider editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/build.gradle"> <entry file="file://$PROJECT_DIR$/build.gradle">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15"> <state relative-caret-position="15">
...@@ -821,14 +851,6 @@ ...@@ -821,14 +851,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_found_item.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="68">
<caret line="12" column="64" selection-start-line="12" selection-start-column="64" selection-end-line="12" selection-end-column="64" />
</state>
</provider>
<provider editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/data/LoginDataSource.java" /> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/data/LoginDataSource.java" />
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ui/login/LoginResult.java" /> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ui/login/LoginResult.java" />
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ui/login/LoginViewModel.java" /> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ui/login/LoginViewModel.java" />
...@@ -837,36 +859,36 @@ ...@@ -837,36 +859,36 @@
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ui/login/LoginActivity.java" /> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ui/login/LoginActivity.java" />
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_login.xml" /> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_login.xml" />
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_item_details.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_item_details.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="465"> <state relative-caret-position="465">
<caret line="146" column="17" lean-forward="true" selection-start-line="1" selection-end-line="146" selection-end-column="17" /> <caret line="146" column="17" lean-forward="true" selection-start-line="1" selection-end-line="146" selection-end-column="17" />
</state> </state>
</provider> </provider>
<provider editor-type-id="android-designer2" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_redirect_my_posts.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_redirect_my_posts.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="371"> <state relative-caret-position="371">
<caret line="30" column="60" lean-forward="true" selection-start-line="30" selection-start-column="60" selection-end-line="30" selection-end-column="60" /> <caret line="30" column="60" lean-forward="true" selection-start-line="30" selection-start-column="60" selection-end-line="30" selection-end-column="60" />
</state> </state>
</provider> </provider>
<provider editor-type-id="android-designer2" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_news_feed_found.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_news_feed_found.xml">
<provider selected="true" editor-type-id="text-editor" />
<provider editor-type-id="android-designer2" /> <provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_my_posts_found_rv.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_my_posts_found_rv.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165"> <state relative-caret-position="165">
<caret line="11" column="45" selection-start-line="11" selection-start-column="45" selection-end-line="11" selection-end-column="45" /> <caret line="11" column="45" selection-start-line="11" selection-start-column="45" selection-end-line="11" selection-end-column="45" />
</state> </state>
</provider> </provider>
<provider editor-type-id="android-designer2" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_my_posts.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_my_posts.xml">
<provider selected="true" editor-type-id="text-editor" />
<provider editor-type-id="android-designer2" /> <provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/RedirectMyPosts.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/RedirectMyPosts.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
...@@ -876,48 +898,38 @@ ...@@ -876,48 +898,38 @@
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
<provider editor-type-id="android-manifest" />
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="59"> <state relative-caret-position="59">
<caret line="21" column="50" selection-start-line="21" selection-start-column="50" selection-end-line="21" selection-end-column="50" /> <caret line="21" column="50" selection-start-line="21" selection-start-column="50" selection-end-line="21" selection-end-column="50" />
</state> </state>
</provider> </provider>
<provider editor-type-id="android-manifest" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_navigation.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_navigation.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-8"> <state relative-caret-position="-8">
<caret line="5" column="35" selection-start-line="5" selection-start-column="35" selection-end-line="5" selection-end-column="35" /> <caret line="5" column="35" selection-start-line="5" selection-start-column="35" selection-end-line="5" selection-end-column="35" />
</state> </state>
</provider> </provider>
<provider editor-type-id="android-designer2" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/debug/res/values/google_maps_api.xml" /> <entry file="file://$PROJECT_DIR$/app/src/debug/res/values/google_maps_api.xml" />
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MapsActivity.java" /> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MapsActivity.java" />
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/Navigation.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="810">
<caret line="68" column="38" selection-start-line="68" selection-start-column="38" selection-end-line="68" selection-end-column="38" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_item_claim.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_item_claim.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2370"> <state relative-caret-position="2370">
<caret line="158" column="43" selection-start-line="158" selection-start-column="43" selection-end-line="158" selection-end-column="43" /> <caret line="158" column="43" selection-start-line="158" selection-start-column="43" selection-end-line="158" selection-end-column="43" />
</state> </state>
</provider> </provider>
<provider editor-type-id="android-designer2" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_email.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_email.xml">
<provider selected="true" editor-type-id="android-designer2" />
<provider editor-type-id="text-editor"> <provider editor-type-id="text-editor">
<state relative-caret-position="540"> <state relative-caret-position="540">
<caret line="36" column="41" selection-start-line="36" selection-start-column="41" selection-end-line="36" selection-end-column="41" /> <caret line="36" column="41" selection-start-line="36" selection-start-column="41" selection-end-line="36" selection-end-column="41" />
</state> </state>
</provider> </provider>
<provider selected="true" editor-type-id="android-designer2" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ItemClaim.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ItemClaim.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
...@@ -943,16 +955,6 @@ ...@@ -943,16 +955,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MainActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1190">
<caret line="27" column="56" lean-forward="true" selection-start-line="27" selection-start-column="56" selection-end-line="27" selection-end-column="56" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ItemDetails.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ItemDetails.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105"> <state relative-caret-position="105">
...@@ -967,16 +969,24 @@ ...@@ -967,16 +969,24 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/LostItem.java"> <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.appcompat/appcompat/1.1.0/9865019bbd2d95e41dede3d8ebf964aa93f97766/appcompat-1.1.0-sources.jar!/androidx/appcompat/app/AlertController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60"> <state relative-caret-position="112">
<caret line="33" column="13" selection-start-line="33" selection-start-column="13" selection-end-line="33" selection-end-column="13" /> <caret line="1071" selection-start-line="1071" selection-end-line="1071" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="e#41105#41506#0" expanded="true" />
<element signature="e#41505#41506#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="jar://$USER_HOME$/Android/Sdk/platforms/android-28/android.jar!/android/widget/AdapterView.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="67">
<caret line="25" column="84" selection-start-line="25" selection-start-column="84" selection-end-line="25" selection-end-column="84" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/emailFragment.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/emailFragment.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300"> <state relative-caret-position="300">
...@@ -987,6 +997,45 @@ ...@@ -987,6 +997,45 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/SendMail.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1065">
<caret line="85" selection-start-line="85" selection-end-line="85" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPosts.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
<caret line="22" column="46" selection-start-line="22" selection-start-column="29" selection-end-line="22" selection-end-column="46" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPostsFoundRV.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="50" column="35" selection-start-line="50" selection-start-column="35" selection-end-line="50" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/menu/menu.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
<caret line="9" column="56" selection-start-line="9" selection-start-column="56" selection-end-line="9" selection-end-column="56" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="8" column="27" selection-start-line="8" selection-start-column="27" selection-end-line="8" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/NewsfeedAdaptor.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/NewsfeedAdaptor.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="960"> <state relative-caret-position="960">
...@@ -1004,81 +1053,91 @@ ...@@ -1004,81 +1053,91 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.appcompat/appcompat/1.1.0/9865019bbd2d95e41dede3d8ebf964aa93f97766/appcompat-1.1.0-sources.jar!/androidx/appcompat/app/AlertController.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/Navigation.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="112"> <state relative-caret-position="120">
<caret line="1071" selection-start-line="1071" selection-end-line="1071" /> <caret line="9" column="17" lean-forward="true" selection-start-line="9" selection-start-column="17" selection-end-line="9" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/NewsFeedFound.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="412">
<caret line="180" lean-forward="true" selection-start-line="180" selection-end-line="180" />
<folding> <folding>
<element signature="e#41105#41506#0" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#41505#41506#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="jar://$USER_HOME$/Android/Sdk/platforms/android-28/android.jar!/android/widget/AdapterView.class"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/NewsFeedLost.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="67"> <state relative-caret-position="2175">
<caret line="25" column="84" selection-start-line="25" selection-start-column="84" selection-end-line="25" selection-end-column="84" /> <caret line="178" selection-start-line="178" selection-end-line="178" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/menu/menu.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MainActivity.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135"> <state relative-caret-position="15">
<caret line="9" column="56" selection-start-line="9" selection-start-column="56" selection-end-line="9" selection-end-column="56" /> <caret line="27" column="56" lean-forward="true" selection-start-line="27" selection-start-column="56" selection-end-line="27" selection-end-column="56" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
<provider editor-type-id="android-designer2" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPostsFoundRV.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/FoundItem.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="103"> <state relative-caret-position="310">
<caret line="50" column="35" selection-start-line="50" selection-start-column="35" selection-end-line="50" selection-end-column="35" /> <caret line="347" lean-forward="true" selection-start-line="347" selection-end-line="347" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/FoundItem.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/LostItem.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="260"> <state relative-caret-position="-1144">
<caret line="79" column="121" selection-start-line="79" selection-start-column="47" selection-end-line="79" selection-end-column="121" /> <caret line="215" column="58" lean-forward="true" selection-start-line="215" selection-start-column="58" selection-end-line="215" selection-end-column="58" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/build.gradle"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_lost_item.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-363"> <state relative-caret-position="251">
<caret line="8" column="27" selection-start-line="8" selection-start-column="27" selection-end-line="8" selection-end-column="27" /> <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/SendMail.java"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_found_item.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="382"> <state relative-caret-position="68">
<caret line="85" selection-start-line="85" selection-end-line="85" /> <caret line="12" column="64" selection-start-line="12" selection-start-column="64" selection-end-line="12" selection-end-column="64" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPosts.java"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_lost_item.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60"> <state relative-caret-position="263">
<caret line="22" column="46" selection-start-line="22" selection-start-column="29" selection-end-line="22" selection-end-column="46" /> <caret line="100" column="39" lean-forward="true" selection-start-line="100" selection-start-column="39" selection-end-line="100" selection-end-column="39" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/NewsFeedFound.java"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_found_item.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="12"> <state relative-caret-position="80">
<caret line="143" selection-start-line="143" selection-end-line="143" /> <caret line="89" column="30" selection-start-line="89" selection-start-column="30" selection-end-line="89" selection-end-column="30" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="e#3682#3696#0" expanded="true" />
<element signature="e#7265#8738#0" expanded="true" />
<element signature="e#8737#8738#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
......
...@@ -123,7 +123,6 @@ ...@@ -123,7 +123,6 @@
<orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-v4:1.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-v4:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-auth:19.1.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.google.firebase:firebase-auth:19.1.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-extensions:2.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-extensions:2.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: android.arch.navigation:navigation-fragment:1.0.0-alpha09@aar" level="project" />
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-auth-interop:18.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.google.firebase:firebase-auth-interop:18.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-base:17.1.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-base:17.1.0@aar" level="project" />
<orderEntry type="library" name="Gradle: com.google.firebase:firebase-common:19.2.0@aar" level="project" /> <orderEntry type="library" name="Gradle: com.google.firebase:firebase-common:19.2.0@aar" level="project" />
...@@ -133,7 +132,6 @@ ...@@ -133,7 +132,6 @@
<orderEntry type="library" name="Gradle: androidx.appcompat:appcompat-resources:1.1.0@aar" level="project" /> <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat-resources:1.1.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-ui:1.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-ui:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: androidx.drawerlayout:drawerlayout:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: android.arch.navigation:navigation-runtime:1.0.0-alpha09@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-core-utils:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.transition:transition:1.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: androidx.transition:transition:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.media:media:1.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: androidx.media:media:1.0.0@aar" level="project" />
...@@ -147,7 +145,6 @@ ...@@ -147,7 +145,6 @@
<orderEntry type="library" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: androidx.customview:customview:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.swiperefreshlayout:swiperefreshlayout:1.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: androidx.swiperefreshlayout:swiperefreshlayout:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.asynclayoutinflater:asynclayoutinflater:1.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: androidx.asynclayoutinflater:asynclayoutinflater:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: android.arch.navigation:navigation-common:1.0.0-alpha09@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.core:core:1.1.0@aar" level="project" /> <orderEntry type="library" name="Gradle: androidx.core:core:1.1.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" /> <orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.0@aar" level="project" /> <orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.0@aar" level="project" />
......
...@@ -234,6 +234,11 @@ public class FoundItem extends AppCompatActivity implements View.OnClickListener ...@@ -234,6 +234,11 @@ public class FoundItem extends AppCompatActivity implements View.OnClickListener
date.setText(""); date.setText("");
pd.dismiss(); pd.dismiss();
Toast.makeText(FoundItem.this,"SUBMIT SUCCESSFUL",Toast.LENGTH_LONG).show(); Toast.makeText(FoundItem.this,"SUBMIT SUCCESSFUL",Toast.LENGTH_LONG).show();
Intent intent = new Intent(FoundItem.this, MyPostsFoundRV.class);
intent.putExtra("username", username);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
startActivity(intent);
finish();
} }
...@@ -340,11 +345,7 @@ public class FoundItem extends AppCompatActivity implements View.OnClickListener ...@@ -340,11 +345,7 @@ public class FoundItem extends AppCompatActivity implements View.OnClickListener
mImageUri = data.getData(); mImageUri = data.getData();
try { try {
//getting image from gallery
//Bitmap bitmap = MediaStore.Images.Media.getBitmap(getContentResolver(), mImageUri);
//Setting image to ImageView
//camera.setImageBitmap(bitmap);
Picasso.with(FoundItem.this).load(mImageUri) Picasso.with(FoundItem.this).load(mImageUri)
.fit() .fit()
.centerCrop() .centerCrop()
......
...@@ -52,7 +52,7 @@ public class LostItem extends AppCompatActivity implements View.OnClickListener, ...@@ -52,7 +52,7 @@ public class LostItem extends AppCompatActivity implements View.OnClickListener,
Spinner category; Spinner category;
String username; String username;
ImageView camera; ImageView camera;
String[] items = new String[]{"Others","Electronics", "Documents", "Clothes"}; String[] items = new String[]{"Others","Electronics", "Documents", "Clothes","Furniture","Accessories"};
private static final int CAMERA_REQUEST = 1888; private static final int CAMERA_REQUEST = 1888;
private ImageView imageView; private ImageView imageView;
private static final int MY_CAMERA_PERMISSION_CODE = 100; private static final int MY_CAMERA_PERMISSION_CODE = 100;
...@@ -121,7 +121,7 @@ public class LostItem extends AppCompatActivity implements View.OnClickListener, ...@@ -121,7 +121,7 @@ public class LostItem extends AppCompatActivity implements View.OnClickListener,
final String Place = place.getText().toString().trim(); final String Place = place.getText().toString().trim();
final String Desc = desc.getText().toString().trim(); final String Desc = desc.getText().toString().trim();
final String Date = date.getText().toString().trim(); final String Date = date.getText().toString().trim();
final String Category = category.getSelectedItem().toString();
updatedata = false; updatedata = false;
if (title.getText().toString().trim().isEmpty()) { if (title.getText().toString().trim().isEmpty()) {
title.setError("Please enter title"); title.setError("Please enter title");
...@@ -195,11 +195,11 @@ public class LostItem extends AppCompatActivity implements View.OnClickListener, ...@@ -195,11 +195,11 @@ public class LostItem extends AppCompatActivity implements View.OnClickListener,
if(updatedata) if(updatedata)
{ {
upload = new CreateFoundObject(username,Title ,tempUri,Place, Desc, upload = new CreateFoundObject(username,Title ,tempUri,Place, Desc,
"category", Date,"lost"); Category, Date,"lost");
} }
else { else {
upload = new CreateFoundObject(username, Title, uri.toString(), Place, Desc, upload = new CreateFoundObject(username, Title, uri.toString(), Place, Desc,
"category",Date, "lost"); Category,Date, "lost");
} }
String uploadId = myRef.push().getKey(); String uploadId = myRef.push().getKey();
Log.v("UploadID", uploadId); Log.v("UploadID", uploadId);
...@@ -210,6 +210,11 @@ public class LostItem extends AppCompatActivity implements View.OnClickListener, ...@@ -210,6 +210,11 @@ public class LostItem extends AppCompatActivity implements View.OnClickListener,
date.setText(""); date.setText("");
pd.dismiss(); pd.dismiss();
Toast.makeText(LostItem.this,"SUBMIT SUCCESSFUL",Toast.LENGTH_LONG).show(); Toast.makeText(LostItem.this,"SUBMIT SUCCESSFUL",Toast.LENGTH_LONG).show();
Intent intent = new Intent(LostItem.this, MyPostsLostRV.class);
intent.putExtra("username", username);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
startActivity(intent);
finish();
} }
...@@ -236,7 +241,7 @@ public class LostItem extends AppCompatActivity implements View.OnClickListener, ...@@ -236,7 +241,7 @@ public class LostItem extends AppCompatActivity implements View.OnClickListener,
Date datef = new Date(); Date datef = new Date();
Toast.makeText(LostItem.this, "No file selected", Toast.LENGTH_SHORT).show(); Toast.makeText(LostItem.this, "No file selected", Toast.LENGTH_SHORT).show();
CreateFoundObject upload = new CreateFoundObject(username,Title ,"NO-IMAGE","location", Desc, CreateFoundObject upload = new CreateFoundObject(username,Title ,"NO-IMAGE","location", Desc,
"category", Date,"lost"); Category, Date,"lost");
String uploadId = myRef.push().getKey(); String uploadId = myRef.push().getKey();
Log.v("UploadID", uploadId); Log.v("UploadID", uploadId);
myRef.child(uploadId).setValue(upload); myRef.child(uploadId).setValue(upload);
......
package com.example.instilostandfound; package com.example.instilostandfound;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.core.view.MenuItemCompat;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log; import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
import android.widget.SearchView;
import android.widget.Toast; import android.widget.Toast;
import com.google.android.gms.tasks.OnSuccessListener; import com.google.android.gms.tasks.OnSuccessListener;
...@@ -27,8 +35,9 @@ import java.util.List; ...@@ -27,8 +35,9 @@ import java.util.List;
public class NewsFeedLost extends AppCompatActivity implements NewsfeedAdaptor.OnItemClickListener, Serializable { public class NewsFeedLost extends AppCompatActivity implements NewsfeedAdaptor.OnItemClickListener, Serializable {
private RecyclerView mrecyclerView; private RecyclerView mrecyclerView;
private NewsfeedAdaptor mAdaptor; private NewsfeedAdaptor mAdaptor;
SharedPreferences mSharedPref;
private DatabaseReference mDatabaseRef; private DatabaseReference mDatabaseRef;
LinearLayoutManager mLayoutManager;
private FirebaseStorage mStorage; private FirebaseStorage mStorage;
private List<CreateFoundObject> mPosts; private List<CreateFoundObject> mPosts;
private String username =null; private String username =null;
...@@ -50,10 +59,15 @@ public class NewsFeedLost extends AppCompatActivity implements NewsfeedAdaptor.O ...@@ -50,10 +59,15 @@ public class NewsFeedLost extends AppCompatActivity implements NewsfeedAdaptor.O
//Query usernamequery = mDatabaseRef.orderByChild("ldap").equalTo((username+"@iitb.ac.in").toLowerCase()); //Query usernamequery = mDatabaseRef.orderByChild("ldap").equalTo((username+"@iitb.ac.in").toLowerCase());
//Log.v("query",usernamequery.toString()); //Log.v("query",usernamequery.toString());
mDatabaseRef.addValueEventListener(new ValueEventListener() { ActionBar actionBar = getSupportActionBar();
//set title
mSharedPref = getSharedPreferences("SortSettings", MODE_PRIVATE);
String mSorting = mSharedPref.getString("Sort", "Others");//where if no settingsis selected newest will be default
//if (mSorting.equals("newest")) {
mDatabaseRef.orderByChild("mCategory").equalTo(mSorting).addValueEventListener(new ValueEventListener() {
@Override @Override
public void onDataChange(@NonNull DataSnapshot dataSnapshot) { public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
for(DataSnapshot postSnapShot : dataSnapshot.getChildren()){ for (DataSnapshot postSnapShot : dataSnapshot.getChildren()) {
CreateFoundObject post = postSnapShot.getValue(CreateFoundObject.class); CreateFoundObject post = postSnapShot.getValue(CreateFoundObject.class);
post.setKey(postSnapShot.getKey()); post.setKey(postSnapShot.getKey());
...@@ -73,6 +87,11 @@ public class NewsFeedLost extends AppCompatActivity implements NewsfeedAdaptor.O ...@@ -73,6 +87,11 @@ public class NewsFeedLost extends AppCompatActivity implements NewsfeedAdaptor.O
Toast.makeText(NewsFeedLost.this, databaseError.getMessage(), Toast.LENGTH_SHORT).show(); Toast.makeText(NewsFeedLost.this, databaseError.getMessage(), Toast.LENGTH_SHORT).show();
} }
}); });
mLayoutManager = new LinearLayoutManager(this);
//this will load the items from bottom means newest first
mLayoutManager.setReverseLayout(true);
mLayoutManager.setStackFromEnd(true);
} }
@Override @Override
public void onItemClick(int position) { public void onItemClick(int position) {
...@@ -86,6 +105,79 @@ public class NewsFeedLost extends AppCompatActivity implements NewsfeedAdaptor.O ...@@ -86,6 +105,79 @@ public class NewsFeedLost extends AppCompatActivity implements NewsfeedAdaptor.O
startActivity(intent); startActivity(intent);
} }
@Override
public boolean onCreateOptionsMenu(Menu menu) {
//inflate the menu; this adds items to the action bar if it present
getMenuInflater().inflate(R.menu.menu, menu);
MenuItem item = menu.findItem(R.id.action_search);
SearchView searchView = (SearchView) MenuItemCompat.getActionView(item);
searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
@Override
public boolean onQueryTextSubmit(String query) {
//firebaseSearch(query);
return false;
}
@Override
public boolean onQueryTextChange(String newText) {
//Filter as you type
//firebaseSearch(newText);
return false;
}
});
return super.onCreateOptionsMenu(menu);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
int id = item.getItemId();
//handle other action bar item clicks here
if (id == R.id.action_sort) {
//display alert dialog to choose sorting
showSortDialog();
return true;
}
return super.onOptionsItemSelected(item);
}
private void showSortDialog() {
//options to display in dialog
final String[] sortOptions = {"Others","Electronics", "Documents", "Clothes","Furniture","Accessories"};
//create alert dialog
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle("Sort by") //set title
.setIcon(R.drawable.filter) //set icon
.setItems(sortOptions, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
// The 'which' argument contains the index position of the selected item
// 0 means "Newest" and 1 means "oldest"
if (which == 0) {
//sort by newest
//Edit our shared preferences
SharedPreferences.Editor editor = mSharedPref.edit();
editor.putString("Sort", sortOptions[which]); //where 'Sort' is key & 'newest' is value
editor.apply(); // apply/save the value in our shared preferences
recreate(); //restart activity to take effect
} else {
{
//sort by oldest
//Edit our shared preferences
SharedPreferences.Editor editor = mSharedPref.edit();
editor.putString("Sort", sortOptions[which]); //where 'Sort' is key & 'oldest' is value
editor.apply(); // apply/save the value in our shared preferences
recreate(); //restart activity to take effect
}
}
}
});
builder.show();
}
} }
...@@ -86,13 +86,18 @@ ...@@ -86,13 +86,18 @@
/> />
<TextView <TextView
android:gravity="start|top"
android:id="@+id/date" android:id="@+id/date"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:inputType="date" android:inputType="date"
android:hint = "@string/date" android:hint = "@string/date"
android:textColorHighlight = "#ff7eff15"
android:textColorHint = "@color/hint_color"
android:layout_below = "@+id/desc" android:layout_below = "@+id/desc"
android:layout_marginTop = "15dp" android:layout_marginTop = "15dp"
android:layout_marginLeft="5dp"
android:textSize="20dp"
android:layout_alignParentLeft = "true" android:layout_alignParentLeft = "true"
android:layout_alignParentStart = "true" android:layout_alignParentStart = "true"
android:layout_alignParentRight = "true" android:layout_alignParentRight = "true"
......
...@@ -86,13 +86,18 @@ ...@@ -86,13 +86,18 @@
/> />
<TextView <TextView
android:gravity="start|top"
android:id="@+id/date" android:id="@+id/date"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:inputType="date" android:inputType="date"
android:hint = "@string/date" android:hint = "@string/date"
android:textColorHighlight = "#ff7eff15"
android:textColorHint = "@color/hint_color"
android:layout_below = "@+id/desc" android:layout_below = "@+id/desc"
android:layout_marginTop = "15dp" android:layout_marginTop = "15dp"
android:layout_marginLeft="5dp"
android:textSize="20dp"
android:layout_alignParentLeft = "true" android:layout_alignParentLeft = "true"
android:layout_alignParentStart = "true" android:layout_alignParentStart = "true"
android:layout_alignParentRight = "true" android:layout_alignParentRight = "true"
......
...@@ -4,5 +4,5 @@ ...@@ -4,5 +4,5 @@
# Location of the SDK. This is only used by Gradle. # Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the # For customization when using a Version Control System, please read the
# header note. # header note.
#Tue Nov 26 09:55:15 IST 2019 #Tue Nov 26 11:55:37 IST 2019
sdk.dir=/home/abc/Android/Sdk sdk.dir=/home/chikki/Android/Sdk
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment