Skip to content

I
InstiLostAndFound
Commit 1494d5c3 authored by MUTTINENI NAVYA's avatar MUTTINENI NAVYA
Browse files
Options

merge conflicts

parents ebb66088 40ef7cb4
Hide whitespace changes
Inline Side-by-side
Showing with 1160 additions and 193 deletions
.idea/misc.xml
View file @ 1494d5c3
<?xml version="1.0" encoding="UTF-8"?>
<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" />
</project>
\ No newline at end of file
.idea/workspace.xml
View file @ 1494d5c3
......@@ -9,21 +9,30 @@
<option name="TOOL_WINDOW_CONFIGURED_FILTER" value="Show only selected application" />
</component>
<component name="ChangeListManager">
<<<<<<< HEAD
<list default="true" id="d3ee5bd8-a194-4e5e-99e3-99dd32fc4efe" name="Default Changelist" comment="email activities bug fixes minor">
<change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle____local_aars____home_navya_AndroidStudioProjects_InstiLostAndFound_app_libs_activation_jar_unspecified_jar.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle____local_aars____home_navya_AndroidStudioProjects_InstiLostAndFound_app_libs_additionnal_jar_unspecified_jar.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle____local_aars____home_navya_AndroidStudioProjects_InstiLostAndFound_app_libs_mail_jar_unspecified_jar.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_maps_16_1_0_aar.xml" afterDir="false" />
=======
<list default="true" id="d3ee5bd8-a194-4e5e-99e3-99dd32fc4efe" name="Default Changelist" comment="">
>>>>>>> 40ef7cb43268ee9aba41e6b65fc6421a7e8fc10e
<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/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.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" />
<<<<<<< HEAD
=======
<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" />
>>>>>>> 40ef7cb43268ee9aba41e6b65fc6421a7e8fc10e
<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/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" 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" />
<<<<<<< HEAD
<change beforePath="$PROJECT_DIR$/.idea/caches/gradle_models.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/gradle_models.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__android_arch_navigation_navigation_common_1_0_0_alpha09_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_navigation_navigation_common_1_0_0_alpha09_aar.xml" afterDir="false" />
......@@ -35,6 +44,24 @@
<change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" 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$/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" />
>>>>>>> 40ef7cb43268ee9aba41e6b65fc6421a7e8fc10e
<change beforePath="$PROJECT_DIR$/local.properties" beforeDir="false" afterPath="$PROJECT_DIR$/local.properties" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
......@@ -61,51 +88,150 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<<<<<<< HEAD
=======
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/FoundItem.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="310">
<caret line="347" lean-forward="true" selection-start-line="347" selection-end-line="347" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
>>>>>>> 40ef7cb43268ee9aba41e6b65fc6421a7e8fc10e
<file pinned="false" current-in-tab="true">
<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">
<<<<<<< HEAD
<state relative-caret-position="225">
<caret line="15" column="5" lean-forward="true" selection-start-line="15" selection-start-column="5" selection-end-line="15" selection-end-column="5" />
=======
<state relative-caret-position="80">
<caret line="89" column="30" selection-start-line="89" selection-start-column="30" selection-end-line="89" selection-end-column="30" />
<folding>
<element signature="e#3682#3696#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/LostItem.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1144">
<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>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_lost_item.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="251">
<caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<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">
<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" />
>>>>>>> 40ef7cb43268ee9aba41e6b65fc6421a7e8fc10e
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<<<<<<< HEAD
<entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
<provider editor-type-id="android-manifest" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="112">
<caret line="9" column="79" selection-start-line="9" selection-start-column="79" selection-end-line="9" selection-end-column="79" />
=======
<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">
<state relative-caret-position="263">
<caret line="100" column="39" lean-forward="true" selection-start-line="100" selection-start-column="39" selection-end-line="100" selection-end-column="39" />
>>>>>>> 40ef7cb43268ee9aba41e6b65fc6421a7e8fc10e
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<<<<<<< HEAD
<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">
<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" />
=======
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/NewsFeedLost.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2175">
<caret line="178" selection-start-line="178" selection-end-line="178" />
>>>>>>> 40ef7cb43268ee9aba41e6b65fc6421a7e8fc10e
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<<<<<<< HEAD
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_location.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
<caret line="11" column="10" selection-start-line="11" selection-start-column="10" selection-end-line="11" selection-end-column="10" />
=======
<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="15">
<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>
>>>>>>> 40ef7cb43268ee9aba41e6b65fc6421a7e8fc10e
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<<<<<<< HEAD
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/LocationFragment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="50" column="36" lean-forward="true" selection-start-line="50" selection-start-column="36" selection-end-line="50" selection-end-column="36" />
=======
<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>
<element signature="imports" expanded="true" />
</folding>
>>>>>>> 40ef7cb43268ee9aba41e6b65fc6421a7e8fc10e
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<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="120">
<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>
......@@ -115,14 +241,22 @@
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="resourceFile" />
<option value="layoutResourceFile_vertical" />
<option value="Class" />
<option value="resourceFile" />
</list>
</option>
</component>
<component name="FindInProjectRecents">
<findStrings>
<<<<<<< HEAD
=======
<find>abra</find>
<find>show</find>
<find>.idea</find>
<find>goog</find>
<find>myposts</find>
>>>>>>> 40ef7cb43268ee9aba41e6b65fc6421a7e8fc10e
<find>my_posts_rv</find>
<find>doWhatever</find>
<find>camera</find>
......@@ -146,6 +280,7 @@
<find>bundle</find>
<find>intent</find>
<find>id/</find>
<<<<<<< HEAD
<find>location</find>
<find>google_maps_api</find>
<find>app.gradle</find>
......@@ -153,6 +288,10 @@
<find>compile</find>
<find>uses-fea</find>
<find>access</find>
=======
<find>c_action_search</find>
<find>mDatabaseRef</find>
>>>>>>> 40ef7cb43268ee9aba41e6b65fc6421a7e8fc10e
</findStrings>
<replaceStrings>
<replace />
......@@ -171,8 +310,6 @@
<option name="CHANGED_PATHS">
<list>
<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_main.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/nav_headerlayout.xml" />
......@@ -193,7 +330,6 @@
<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/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/res/layout/list_item.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/image_item.xml" />
......@@ -204,34 +340,56 @@
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_redirect_my_posts.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPostsFoundRV.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ItemDetails.java" />
<option value="$PROJECT_DIR$/app/build.gradle" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_item_details.xml" />
<<<<<<< HEAD
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/NewsFeedFound.java" />
=======
<option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
>>>>>>> 40ef7cb43268ee9aba41e6b65fc6421a7e8fc10e
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_item_claim.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/fragment_email.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ItemClaim.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/Config.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/emailFragment.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/SendMail.java" />
<<<<<<< HEAD
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/FoundItem.java" />
<option value="$PROJECT_DIR$/app/src/debug/res/values/google_maps_api.xml" />
<option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/fragment_location.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/LocationFragment.java" />
=======
<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/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" />
>>>>>>> 40ef7cb43268ee9aba41e6b65fc6421a7e8fc10e
</list>
</option>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<<<<<<< HEAD
<option name="x" value="67" />
<option name="y" value="27" />
<option name="width" value="1161" />
<option name="height" value="641" />
=======
<option name="x" value="66" />
<option name="y" value="24" />
<option name="width" value="1281" />
<option name="height" value="704" />
>>>>>>> 40ef7cb43268ee9aba41e6b65fc6421a7e8fc10e
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<<<<<<< HEAD
<pane id="ProjectPane">
<subPane>
<expand>
......@@ -290,6 +448,30 @@
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="res" type="462c0819:PsiDirectoryNode" />
<item name="layout" type="462c0819:PsiDirectoryNode" />
=======
<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" />
>>>>>>> 40ef7cb43268ee9aba41e6b65fc6421a7e8fc10e
</path>
</expand>
<select />
......@@ -358,11 +540,6 @@
<item name="InstiLostAndFound" type="1abcf292:AndroidViewProjectNode" />
<item name="app" type="feadf853:AndroidModuleNode" />
</path>
<path>
<item name="InstiLostAndFound" type="1abcf292:AndroidViewProjectNode" />
<item name="app" type="feadf853:AndroidModuleNode" />
<item name="manifests" type="f94875db:AndroidManifestsGroupNode" />
</path>
<path>
<item name="InstiLostAndFound" type="1abcf292:AndroidViewProjectNode" />
<item name="app" type="feadf853:AndroidModuleNode" />
......@@ -374,12 +551,6 @@
<item name="java" type="edd41e36:AndroidSourceTypeNode" />
<item name="instilostandfound" type="cbb59c9e:AndroidPsiDirectoryNode" />
</path>
<path>
<item name="InstiLostAndFound" type="1abcf292:AndroidViewProjectNode" />
<item name="app" type="feadf853:AndroidModuleNode" />
<item name="java" type="edd41e36:AndroidSourceTypeNode" />
<item name="instilostandfound" type="cbb59c9e:AndroidPsiDirectoryNode" />
</path>
<path>
<item name="InstiLostAndFound" type="1abcf292:AndroidViewProjectNode" />
<item name="app" type="feadf853:AndroidModuleNode" />
......@@ -399,6 +570,7 @@
<select />
</subPane>
</pane>
<<<<<<< HEAD
<pane id="PackagesPane">
<subPane>
<expand>
......@@ -415,6 +587,8 @@
<select />
</subPane>
</pane>
=======
>>>>>>> 40ef7cb43268ee9aba41e6b65fc6421a7e8fc10e
</panes>
</component>
<component name="PropertiesComponent">
......@@ -650,15 +824,44 @@
<option name="project" value="LOCAL" />
<updated>1574500055133</updated>
</task>
<option name="localTasksCounter" value="18" />
<task id="LOCAL-00018" summary="email activities changes">
<created>1574500932506</created>
<option name="number" value="00018" />
<option name="presentableId" value="LOCAL-00018" />
<option name="project" value="LOCAL" />
<updated>1574500932506</updated>
</task>
<task id="LOCAL-00019" summary="filter activity partial changes">
<created>1574745835977</created>
<option name="number" value="00019" />
<option name="presentableId" value="LOCAL-00019" />
<option name="project" value="LOCAL" />
<updated>1574745835977</updated>
</task>
<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 />
</component>
<component name="ToolWindowManager">
<<<<<<< HEAD
<frame x="67" y="25" width="1299" height="743" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="Captures" order="0" side_tool="true" weight="0.25" />
<window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.29289705" />
=======
<frame x="65" y="-4" width="1301" height="772" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="Captures" order="0" side_tool="true" weight="0.25" />
<window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.25338647" />
>>>>>>> 40ef7cb43268ee9aba41e6b65fc6421a7e8fc10e
<window_info id="Structure" order="2" side_tool="true" />
<window_info id="Favorites" order="3" side_tool="true" />
<window_info id="Build Variants" order="4" side_tool="true" />
......@@ -666,9 +869,10 @@
<window_info id="Designer" order="6" />
<window_info id="Resources Explorer" order="7" weight="0.32955465" />
<window_info id="Capture Tool" order="8" />
<window_info anchor="bottom" id="Run" order="0" weight="0.32928944" />
<window_info anchor="bottom" id="Logcat" order="1" 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="TODO" order="2" />
<<<<<<< HEAD
<window_info anchor="bottom" id="Debug" order="3" weight="0.40553746" />
<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" />
......@@ -676,6 +880,15 @@
<window_info anchor="bottom" id="Build" order="7" sideWeight="0.49878544" visible="true" weight="0.27198696" />
<window_info anchor="bottom" id="Find" order="8" weight="0.48371336" />
<window_info active="true" anchor="bottom" id="Messages" order="9" visible="true" weight="0.19584055" />
=======
<window_info anchor="bottom" id="Debug" order="3" weight="0.33448875" />
<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="Version Control" order="6" weight="0.40069085" />
<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 active="true" anchor="bottom" id="Messages" order="9" visible="true" weight="0.13953489" />
>>>>>>> 40ef7cb43268ee9aba41e6b65fc6421a7e8fc10e
<window_info anchor="bottom" id="Android Profiler" order="10" />
<window_info anchor="right" id="Hierarchy" order="0" weight="0.32955465" />
<window_info anchor="right" id="Capture Analysis" order="1" />
......@@ -684,7 +897,11 @@
<window_info anchor="right" id="Preview" order="4" sideWeight="0.44044322" weight="0.21862349" />
<window_info anchor="right" id="Palette&#9;" order="5" />
<window_info anchor="right" id="Assistant" order="6" sideWeight="0.49861497" weight="0.046153847" />
<<<<<<< HEAD
<window_info anchor="right" id="Device File Explorer" order="7" sideWeight="0.50138503" visible="true" weight="0.0311253" />
=======
<window_info anchor="right" id="Device File Explorer" order="7" sideWeight="0.50138503" visible="true" weight="0.088446215" />
>>>>>>> 40ef7cb43268ee9aba41e6b65fc6421a7e8fc10e
</layout>
<layout-to-restore>
<window_info id="Captures" order="0" side_tool="true" weight="0.25" />
......@@ -777,9 +994,24 @@
<MESSAGE value="email activities email fragment changes" />
<MESSAGE value="email activities working" />
<MESSAGE value="email activities bug fixes minor" />
<option name="LAST_COMMIT_MESSAGE" value="email activities bug fixes minor" />
<MESSAGE value="email activities changes" />
<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 name="editorHistoryManager">
<<<<<<< HEAD
=======
<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">
<state relative-caret-position="495">
<caret line="33" selection-start-line="33" selection-end-line="33" />
</state>
</provider>
</entry>
>>>>>>> 40ef7cb43268ee9aba41e6b65fc6421a7e8fc10e
<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">
<provider selected="true" editor-type-id="text-editor">
......@@ -788,6 +1020,7 @@
</state>
</provider>
</entry>
<<<<<<< HEAD
<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">
......@@ -796,6 +1029,8 @@
</state>
</provider>
</entry>
=======
>>>>>>> 40ef7cb43268ee9aba41e6b65fc6421a7e8fc10e
<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">
......@@ -804,6 +1039,7 @@
</state>
</provider>
</entry>
<<<<<<< HEAD
<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="-1306">
......@@ -811,6 +1047,13 @@
<folding>
<element signature="imports" expanded="true" />
</folding>
=======
<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">
<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" />
>>>>>>> 40ef7cb43268ee9aba41e6b65fc6421a7e8fc10e
</state>
</provider>
</entry>
......@@ -831,6 +1074,7 @@
</state>
</provider>
</entry>
<<<<<<< HEAD
<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">
......@@ -841,6 +1085,8 @@
</state>
</provider>
</entry>
=======
>>>>>>> 40ef7cb43268ee9aba41e6b65fc6421a7e8fc10e
<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/LoginViewModel.java" />
......@@ -848,6 +1094,7 @@
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ui/login/LoggedInUserView.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" />
<<<<<<< HEAD
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/NewsfeedAdaptor.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-646">
......@@ -855,6 +1102,8 @@
</state>
</provider>
</entry>
=======
>>>>>>> 40ef7cb43268ee9aba41e6b65fc6421a7e8fc10e
<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">
......@@ -894,109 +1143,229 @@
</state>
</provider>
</entry>
<<<<<<< HEAD
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPosts.java">
=======
<entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
<provider editor-type-id="android-manifest" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-933">
<caret line="22" column="46" selection-start-line="22" selection-start-column="29" selection-end-line="22" selection-end-column="46" />
<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" />
</state>
</provider>
</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/activity_navigation.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="268">
<caret line="81" column="64" selection-start-line="81" selection-start-column="64" selection-end-line="81" selection-end-column="64" />
<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" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPostsFoundRV.java">
<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/res/layout/activity_item_claim.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="335">
<caret line="132" column="34" lean-forward="true" selection-start-line="132" selection-start-column="34" selection-end-line="132" selection-end-column="34" />
<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" />
</state>
</provider>
</entry>
<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">
<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" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ItemClaim.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="645">
<caret line="56" column="55" selection-start-line="56" selection-start-column="55" selection-end-line="56" selection-end-column="55" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ImageAdapter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90">
<caret line="18" column="13" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPostsAdaptor.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-633">
<state relative-caret-position="125">
<caret line="24" column="25" selection-start-line="24" selection-start-column="11" selection-end-line="24" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_navigation.xml">
<provider editor-type-id="android-designer2" />
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ItemDetails.java">
<provider selected="true" editor-type-id="text-editor">
<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" />
<state relative-caret-position="105">
<caret line="18" selection-start-line="18" selection-end-line="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/Config.java">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="8" selection-start-column="8" selection-end-column="8" />
<state relative-caret-position="30">
<caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_item_claim.xml">
<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">
<state relative-caret-position="112">
<caret line="1071" selection-start-line="1071" selection-end-line="1071" />
<folding>
<element signature="e#41105#41506#0" expanded="true" />
<element signature="e#41505#41506#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="jar://$USER_HOME$/Android/Sdk/platforms/android-28/android.jar!/android/widget/AdapterView.class">
>>>>>>> 40ef7cb43268ee9aba41e6b65fc6421a7e8fc10e
<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>
<<<<<<< HEAD
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/NewsFeedFound.java">
=======
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/emailFragment.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="37" column="29" selection-start-line="37" selection-start-column="29" selection-end-line="37" selection-end-column="29" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/SendMail.java">
>>>>>>> 40ef7cb43268ee9aba41e6b65fc6421a7e8fc10e
<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="297">
<caret line="158" column="43" selection-start-line="158" selection-start-column="43" selection-end-line="158" selection-end-column="43" />
<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/src/main/java/com/example/instilostandfound/ItemDetails.java">
<entry file="file://$PROJECT_DIR$/app/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105">
<caret line="18" selection-start-line="18" selection-end-line="18" />
<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/ItemClaim.java">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/NewsfeedAdaptor.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="343">
<caret line="56" column="55" selection-start-line="56" selection-start-column="55" selection-end-line="56" selection-end-column="55" />
<state relative-caret-position="960">
<caret line="83" column="5" selection-start-line="83" selection-start-column="5" selection-end-line="83" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ImageAdapter.java">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/CreateFoundObject.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90">
<caret line="18" column="13" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
<state relative-caret-position="219">
<caret line="22" selection-start-line="22" selection-end-line="22" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<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="120">
<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>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<<<<<<< HEAD
<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/NewsFeedLost.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-4">
<caret line="37" column="29" selection-start-line="37" selection-start-column="29" selection-end-line="37" selection-end-column="29" />
<state relative-caret-position="2175">
<caret line="178" selection-start-line="178" selection-end-line="178" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MainActivity.java">
>>>>>>> 40ef7cb43268ee9aba41e6b65fc6421a7e8fc10e
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
<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/res/layout/fragment_email.xml">
<provider selected="true" editor-type-id="android-designer2" />
<provider editor-type-id="text-editor">
<state relative-caret-position="281">
<caret line="36" column="41" selection-start-line="36" selection-start-column="41" selection-end-line="36" selection-end-column="41" />
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/FoundItem.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="310">
<caret line="347" lean-forward="true" selection-start-line="347" selection-end-line="347" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/SendMail.java">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/LostItem.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="226">
<caret line="30" column="26" lean-forward="true" selection-start-line="30" selection-start-column="26" selection-end-line="30" selection-end-column="26" />
<state relative-caret-position="-1144">
<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>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<<<<<<< HEAD
<entry file="file://$PROJECT_DIR$/local.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105">
......@@ -1066,12 +1435,20 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="8" column="36" selection-start-line="8" selection-start-column="36" selection-end-line="8" selection-end-column="36" />
=======
<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">
<state relative-caret-position="251">
<caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
>>>>>>> 40ef7cb43268ee9aba41e6b65fc6421a7e8fc10e
</state>
</provider>
</entry>
<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">
<<<<<<< HEAD
<state relative-caret-position="335">
<caret line="35" column="54" selection-start-line="35" selection-start-column="54" selection-end-line="35" selection-end-column="54" />
</state>
......@@ -1112,14 +1489,34 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="50" column="36" lean-forward="true" selection-start-line="50" selection-start-column="36" selection-end-line="50" selection-end-column="36" />
=======
<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>
</entry>
<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">
<state relative-caret-position="263">
<caret line="100" column="39" lean-forward="true" selection-start-line="100" selection-start-column="39" selection-end-line="100" selection-end-column="39" />
>>>>>>> 40ef7cb43268ee9aba41e6b65fc6421a7e8fc10e
</state>
</provider>
</entry>
<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">
<<<<<<< HEAD
<state relative-caret-position="225">
<caret line="15" column="5" lean-forward="true" selection-start-line="15" selection-start-column="5" selection-end-line="15" selection-end-column="5" />
=======
<state relative-caret-position="80">
<caret line="89" column="30" selection-start-line="89" selection-start-column="30" selection-end-line="89" selection-end-column="30" />
<folding>
<element signature="e#3682#3696#0" expanded="true" />
</folding>
>>>>>>> 40ef7cb43268ee9aba41e6b65fc6421a7e8fc10e
</state>
</provider>
</entry>
......
app/app.iml
View file @ 1494d5c3
......@@ -123,8 +123,11 @@
<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: androidx.lifecycle:lifecycle-extensions:2.0.0@aar" level="project" />
<<<<<<< HEAD
<orderEntry type="library" name="Gradle: android.arch.navigation:navigation-fragment:1.0.0-alpha09@aar" level="project" />
<orderEntry type="library" name="Gradle: com.google.android.gms:play-services-maps:16.1.0@aar" level="project" />
=======
>>>>>>> 40ef7cb43268ee9aba41e6b65fc6421a7e8fc10e
<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.firebase:firebase-common:19.2.0@aar" level="project" />
......@@ -134,7 +137,6 @@
<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.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.transition:transition:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.media:media:1.0.0@aar" level="project" />
......@@ -148,7 +150,6 @@
<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.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.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
<orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.0@aar" level="project" />
......
app/build.gradle
View file @ 1494d5c3
......@@ -45,7 +45,7 @@ dependencies {
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
implementation 'android.arch.navigation:navigation-fragment:1.0.0-alpha09'
// implementation 'android.arch.navigation:navigation-fragment:1.0.0-alpha09'
implementation files('libs/activation.jar')
implementation files('libs/additionnal.jar')
implementation files('libs/mail.jar')
......
app/src/main/AndroidManifest.xml
View file @ 1494d5c3
......@@ -46,6 +46,8 @@
android:name=".MapsActivity"
android:label="@string/title_activity_maps"></activity>
<activity android:name=".ItemClaim" />
<activity android:name=".NewsFeedLost"></activity>
<activity android:name=".MyPostsLostRV" />
<activity android:name=".NewsFeedFound" />
<activity android:name=".MyPostsFoundRV" />
<activity android:name=".RedirectMyPosts" />
......
app/src/main/java/com/example/instilostandfound/FoundItem.java
View file @ 1494d5c3
......@@ -77,7 +77,7 @@ public class FoundItem extends AppCompatActivity implements View.OnClickListener
Spinner category;
String username;
ImageView camera;
String[] items = new String[]{"Others","Electronics", "Documents", "Clothes"};
public static String[] items = new String[]{"Others","Electronics", "Documents", "Clothes","Furniture","Accessories"};
private static final int CAMERA_REQUEST = 1888;
private ImageView imageView;
private static final int MY_CAMERA_PERMISSION_CODE = 100;
......@@ -144,6 +144,7 @@ public class FoundItem extends AppCompatActivity implements View.OnClickListener
final String Place = place.getText().toString().trim();
final String Desc = desc.getText().toString().trim();
final String Date = date.getText().toString().trim();
final String Category = category.getSelectedItem().toString();
updatedata = false;
if (title.getText().toString().trim().isEmpty()) {
......@@ -218,11 +219,11 @@ public class FoundItem extends AppCompatActivity implements View.OnClickListener
if(updatedata)
{
upload = new CreateFoundObject(username,Title ,tempUri,Place, Desc,
"category", Date,"found");
Category, Date,"found");
}
else {
upload = new CreateFoundObject(username, Title, uri.toString(), Place, Desc,
"category",Date, "found");
Category,Date, "found");
}
String uploadId = myRef.push().getKey();
Log.v("UploadID", uploadId);
......@@ -233,6 +234,11 @@ public class FoundItem extends AppCompatActivity implements View.OnClickListener
date.setText("");
pd.dismiss();
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();
}
......@@ -259,7 +265,7 @@ public class FoundItem extends AppCompatActivity implements View.OnClickListener
Date datef = new Date();
Toast.makeText(FoundItem.this, "No file selected", Toast.LENGTH_SHORT).show();
CreateFoundObject upload = new CreateFoundObject(username,Title ,"NO-IMAGE","location", Desc,
"category", Date,"found");
Category, Date,"found");
String uploadId = myRef.push().getKey();
Log.v("UploadID", uploadId);
myRef.child(uploadId).setValue(upload);
......@@ -270,23 +276,13 @@ public class FoundItem extends AppCompatActivity implements View.OnClickListener
Toast.makeText(FoundItem.this,"SUBMIT SUCCESSFUL -NO IMAGE UPLOADED!",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();
}
// String uploadurl = uploadSessionUri.toString();
// Log.v("Upload url",uploadurl);
/* createDemo upload = new createDemo(username,
Title, Desc, Place, Date);
String uploadId = myRef.push().getKey();
Log.v("UploadID", uploadId);
myRef.child(uploadId).setValue(upload);
title.setText("");
place.setText("");
desc.setText("");
Toast.makeText(FoundItem.this,"SUBMIT SUCCESSFUL",Toast.LENGTH_LONG).show();*/
}
private String getExtension(Uri uri)
......@@ -349,11 +345,7 @@ public class FoundItem extends AppCompatActivity implements View.OnClickListener
mImageUri = data.getData();
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)
.fit()
.centerCrop()
......
app/src/main/java/com/example/instilostandfound/LostItem.java
View file @ 1494d5c3
......@@ -2,38 +2,49 @@ package com.example.instilostandfound;
import android.app.DatePickerDialog;
import android.app.ProgressDialog;
import android.content.ContentResolver;
import android.content.Intent;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import com.google.android.gms.tasks.OnFailureListener;
import com.google.android.gms.tasks.OnSuccessListener;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.google.android.material.snackbar.Snackbar;
import com.google.firebase.database.DatabaseReference;
import com.google.firebase.database.FirebaseDatabase;
import com.google.firebase.storage.FirebaseStorage;
import com.google.firebase.storage.StorageReference;
import com.google.firebase.storage.StorageTask;
import com.google.firebase.storage.UploadTask;
import com.squareup.picasso.Picasso;
import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import android.os.Handler;
import android.util.Log;
import android.view.View;
import android.webkit.MimeTypeMap;
import android.widget.ArrayAdapter;
import android.widget.DatePicker;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.Spinner;
import android.widget.TextView;
import android.widget.Toast;
import java.io.Serializable;
import java.util.Calendar;
import java.util.Date;
public class LostItem extends AppCompatActivity implements View.OnClickListener, Serializable {
private static final String TAG = FoundItem.class.getSimpleName(); ;
private static final String TAG = LostItem.class.getSimpleName(); ;
EditText title;
EditText place;
EditText desc;
......@@ -41,7 +52,7 @@ public class LostItem extends AppCompatActivity implements View.OnClickListener,
Spinner category;
String username;
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 ImageView imageView;
private static final int MY_CAMERA_PERMISSION_CODE = 100;
......@@ -55,6 +66,11 @@ public class LostItem extends AppCompatActivity implements View.OnClickListener,
private boolean updatedata;
public String tempUri;
FirebaseDatabase database = FirebaseDatabase.getInstance();
DatabaseReference myRef = FirebaseDatabase.getInstance().getReference("LostData");
StorageReference mStorage = FirebaseStorage.getInstance().getReference("Images");
FirebaseStorage mStorageRef = FirebaseStorage.getInstance();
DatePickerDialog.OnDateSetListener dateSetListener;
@Override
protected void onCreate(Bundle savedInstanceState) {
......@@ -76,27 +92,198 @@ public class LostItem extends AppCompatActivity implements View.OnClickListener,
date.setOnClickListener(this);
/*FloatingActionButton fab = findViewById(R.id.fab);
fab.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
.setAction("Action", null).show();
}
});*/
if(callingclass.equals("MyPosts"))
{
CreateFoundObject objectfound = (CreateFoundObject)getIntent().getSerializableExtra("FoundObject");
Log.v("desc",objectfound.getmDescription());
title.setText(objectfound.getmTitle());
place.setText(objectfound.getmLocation());
desc.setText(objectfound.getmDescription());
date.setText(objectfound.getmDateFound());
Picasso.with(LostItem.this).load(objectfound.getImageUrl())
.fit()
.centerCrop()
.into(camera);
}
findViewById(R.id.submit).setOnClickListener(this);
ArrayAdapter<String> adapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_dropdown_item, items);
category.setAdapter(adapter);
}
/**
*
*/
private void SubmitLost() {
final String Title = title.getText().toString().trim();
final String Place = place.getText().toString().trim();
final String Desc = desc.getText().toString().trim();
final String Date = date.getText().toString().trim();
final String Category = category.getSelectedItem().toString();
updatedata = false;
if (title.getText().toString().trim().isEmpty()) {
title.setError("Please enter title");
title.requestFocus();
return;
}
if (place.toString().trim().isEmpty()) {
place.setError("Please enter location");
place.requestFocus();
return;
}
if(callingclass.equals("MyPosts"))
{
final CreateFoundObject objectfound = (CreateFoundObject)getIntent().getSerializableExtra("LostObject");
if(objectfound.getImageUrl().equals("NO-IMAGE"))
{
myRef.child(objectfound.getKey()).removeValue();
Toast.makeText(LostItem.this, "Item Updated", Toast.LENGTH_SHORT).show();
Intent intent = new Intent(LostItem.this, MyPostsFoundRV.class);
intent.putExtra("username", username);
startActivity(intent);
finish();
}
else
{
StorageReference imageRef = mStorageRef.getReferenceFromUrl(objectfound.getImageUrl());
tempUri = objectfound.getImageUrl();
updatedata = true;
imageRef.delete().addOnSuccessListener(new OnSuccessListener<Void>() {
@Override
public void onSuccess(Void aVoid) {
myRef.child(objectfound.getKey()).removeValue();
Toast.makeText(LostItem.this, "Item Updated", Toast.LENGTH_SHORT).show();
Intent intent = new Intent(LostItem.this, MyPostsFoundRV.class);
intent.putExtra("username", username);
startActivity(intent);
finish();
}
});
}
}
if (mImageUri != null ) {
pd.show();
final StorageReference fileReference = mStorage.child(System.currentTimeMillis()
+ "." + getExtension(mImageUri));
mUploadTask = fileReference.putFile(mImageUri)
.addOnSuccessListener(new OnSuccessListener<UploadTask.TaskSnapshot>() {
@Override
public void onSuccess(UploadTask.TaskSnapshot taskSnapshot) {
Handler handler = new Handler();
handler.postDelayed(new Runnable() {
@Override
public void run() {
}
}, 500);
mImageUri = null;
Toast.makeText(LostItem.this, "Upload successful", Toast.LENGTH_LONG).show();
taskSnapshot.getMetadata().getReference().getDownloadUrl().addOnSuccessListener(new OnSuccessListener<Uri>() {
@Override
public void onSuccess(Uri uri) {
uploadSessionUri = uri;
CreateFoundObject upload;
java.util.Date datef = new Date();
if(updatedata)
{
upload = new CreateFoundObject(username,Title ,tempUri,Place, Desc,
Category, Date,"lost");
}
else {
upload = new CreateFoundObject(username, Title, uri.toString(), Place, Desc,
Category,Date, "lost");
}
String uploadId = myRef.push().getKey();
Log.v("UploadID", uploadId);
myRef.child(uploadId).setValue(upload);
title.setText("");
place.setText("");
desc.setText("");
date.setText("");
pd.dismiss();
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();
}
})
.addOnFailureListener(new OnFailureListener() {
@Override
public void onFailure(@NonNull Exception e) {
Toast.makeText(LostItem.this, e.getMessage(), Toast.LENGTH_SHORT).show();
}
});
}
})
.addOnFailureListener(new OnFailureListener() {
@Override
public void onFailure(@NonNull Exception e) {
Toast.makeText(LostItem.this, e.getMessage(), Toast.LENGTH_SHORT).show();
}
});
} else {
Date datef = new Date();
Toast.makeText(LostItem.this, "No file selected", Toast.LENGTH_SHORT).show();
CreateFoundObject upload = new CreateFoundObject(username,Title ,"NO-IMAGE","location", Desc,
Category, Date,"lost");
String uploadId = myRef.push().getKey();
Log.v("UploadID", uploadId);
myRef.child(uploadId).setValue(upload);
title.setText("");
place.setText("");
desc.setText("");
date.setText("");
Toast.makeText(LostItem.this,"SUBMIT SUCCESSFUL -NO IMAGE UPLOADED!",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();
}
}
/**
*
* @param uri
* @return
*/
private String getExtension(Uri uri)
{
ContentResolver cr = getContentResolver();
MimeTypeMap mimeTypeMap = MimeTypeMap.getSingleton();
return mimeTypeMap.getExtensionFromMimeType(cr.getType(uri));
}
@RequiresApi(api = Build.VERSION_CODES.N)
public void onClick(View view)
{
switch (view.getId())
{
case R.id.submit:
//SubmitFound();
SubmitLost();
break;
case R.id.camera:
Intent intent = new Intent();
......
app/src/main/java/com/example/instilostandfound/MyPostsLostRV.java 0 → 100644
View file @ 1494d5c3
package com.example.instilostandfound;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
import android.widget.AdapterView;
import android.widget.Toast;
import com.google.android.gms.tasks.OnSuccessListener;
import com.google.firebase.database.ChildEventListener;
import com.google.firebase.database.DataSnapshot;
import com.google.firebase.database.DatabaseError;
import com.google.firebase.database.DatabaseReference;
import com.google.firebase.database.FirebaseDatabase;
import com.google.firebase.database.Query;
import com.google.firebase.database.ValueEventListener;
import com.google.firebase.storage.FirebaseStorage;
import com.google.firebase.storage.StorageReference;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
public class MyPostsLostRV extends AppCompatActivity implements MyPostsAdaptor.OnItemClickListener,Serializable {
private RecyclerView mrecyclerView;
private MyPostsAdaptor mAdaptor;
private DatabaseReference mDatabaseRef;
private FirebaseStorage mStorage;
private List<CreateFoundObject> mPosts;
private String username =null;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_my_posts_lost_rv);
username = getIntent().getStringExtra("username");
mrecyclerView = findViewById(R.id.my_posts_rv);
mrecyclerView.setHasFixedSize(true);
mrecyclerView.setLayoutManager(new LinearLayoutManager(this));
mPosts = new ArrayList<>();
mDatabaseRef = FirebaseDatabase.getInstance().getReference("LostData");
mStorage = FirebaseStorage.getInstance();
Query usernamequery = mDatabaseRef.orderByChild("ldap").equalTo((username+"@iitb.ac.in").toLowerCase());
Log.v("query",usernamequery.toString());
usernamequery.addValueEventListener(new ValueEventListener() {
@Override
public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
for(DataSnapshot postSnapShot : dataSnapshot.getChildren()){
CreateFoundObject post = postSnapShot.getValue(CreateFoundObject.class);
post.setKey(postSnapShot.getKey());
mPosts.add(post);
}
mAdaptor = new MyPostsAdaptor(MyPostsLostRV.this, mPosts);
mrecyclerView.setAdapter(mAdaptor);
mAdaptor.setOnItemClickListener(MyPostsLostRV.this);
}
@Override
public void onCancelled(@NonNull DatabaseError databaseError) {
Toast.makeText(MyPostsLostRV.this, databaseError.getMessage(), Toast.LENGTH_SHORT).show();
}
});
}
@Override
public void onItemClick(int position) {
Log.v("position =",String.valueOf(position));
CreateFoundObject selectedItem = mPosts.get(position);
final String selectedKey = selectedItem.getKey();
Intent intent = new Intent(MyPostsLostRV.this, ItemDetails.class);
intent.putExtra("FoundObject", selectedItem);
intent.putExtra("CallingClass","MyPosts");
intent.putExtra("username",username);
startActivity(intent);
}
@Override
public void oneditClick(int position) {
Log.v("position =",String.valueOf(position));
CreateFoundObject selectedItem = mPosts.get(position);
final String selectedKey = selectedItem.getKey();
Intent intent = new Intent(MyPostsLostRV.this, LostItem.class);
intent.putExtra("FoundObject", selectedItem);
intent.putExtra("CallingClass","MyPosts");
intent.putExtra("username",username);
startActivity(intent);
}
@Override
public void onDeleteClick(int position) {
Log.v("position =",String.valueOf(position));
CreateFoundObject selectedItem = mPosts.get(position);
final String selectedKey = selectedItem.getKey();
Log.v("selected key =",selectedKey);
Log.v("url of image =",selectedItem.getImageUrl());
if(selectedItem.getImageUrl()=="NO-IMAGE") {
StorageReference imageRef = mStorage.getReferenceFromUrl(selectedItem.getImageUrl());
imageRef.delete().addOnSuccessListener(new OnSuccessListener<Void>() {
@Override
public void onSuccess(Void aVoid) {
mDatabaseRef.child(selectedKey).removeValue();
Toast.makeText(MyPostsLostRV.this, "Item deleted", Toast.LENGTH_SHORT).show();
Intent intent = new Intent(MyPostsLostRV.this, MyPostsLostRV.class);
intent.putExtra("username", username);
startActivity(intent);
finish();
}
});
}
else
{
mDatabaseRef.child(selectedKey).removeValue();
Toast.makeText(MyPostsLostRV.this, "Item deleted", Toast.LENGTH_SHORT).show();
Intent intent = new Intent(MyPostsLostRV.this, MyPostsLostRV.class);
intent.putExtra("username", username);
startActivity(intent);
finish();
}
}
}
app/src/main/java/com/example/instilostandfound/Navigation.java
View file @ 1494d5c3
......@@ -71,6 +71,7 @@ public class Navigation extends AppCompatActivity implements NavigationView.OnNa
case R.id.post_lost:
intent = new Intent(Navigation.this, LostItem.class);
intent.putExtra("username", username);
intent.putExtra("CallingClass","Navigation");
startActivity(intent);
break;
case R.id.home:
......@@ -97,7 +98,7 @@ public class Navigation extends AppCompatActivity implements NavigationView.OnNa
public void onClick(View v) {
switch (v.getId()){
case R.id.lost_button_newsfeed:
Intent intent = new Intent(Navigation.this, MyPosts.class);
Intent intent = new Intent(Navigation.this, NewsFeedLost.class);
intent.putExtra("type", "lost");
intent.putExtra("username", username);
startActivity(intent);
......
app/src/main/java/com/example/instilostandfound/NewsFeedFound.java
View file @ 1494d5c3
package com.example.instilostandfound;
import androidx.annotation.NonNull;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity;
import androidx.core.view.MenuItemCompat;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
import android.widget.SearchView;
import android.widget.Toast;
import com.google.android.gms.tasks.OnSuccessListener;
......@@ -27,7 +35,8 @@ import java.util.List;
public class NewsFeedFound extends AppCompatActivity implements NewsfeedAdaptor.OnItemClickListener, Serializable {
private RecyclerView mrecyclerView;
private NewsfeedAdaptor mAdaptor;
LinearLayoutManager mLayoutManager; //for sorting
SharedPreferences mSharedPref; //for saving sort settings
private DatabaseReference mDatabaseRef;
private FirebaseStorage mStorage;
private List<CreateFoundObject> mPosts;
......@@ -47,13 +56,17 @@ public class NewsFeedFound extends AppCompatActivity implements NewsfeedAdaptor.
mDatabaseRef = FirebaseDatabase.getInstance().getReference("FoundData");
mStorage = FirebaseStorage.getInstance();
//Query usernamequery = mDatabaseRef.orderByChild("ldap").equalTo((username+"@iitb.ac.in").toLowerCase());
//Log.v("query",usernamequery.toString());
mDatabaseRef.addValueEventListener(new ValueEventListener() {
//Actionbar
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
public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
for(DataSnapshot postSnapShot : dataSnapshot.getChildren()){
for (DataSnapshot postSnapShot : dataSnapshot.getChildren()) {
CreateFoundObject post = postSnapShot.getValue(CreateFoundObject.class);
post.setKey(postSnapShot.getKey());
......@@ -73,7 +86,13 @@ public class NewsFeedFound extends AppCompatActivity implements NewsfeedAdaptor.
Toast.makeText(NewsFeedFound.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
public void onItemClick(int position) {
Log.v("position =",String.valueOf(position));
......@@ -86,6 +105,81 @@ public class NewsFeedFound extends AppCompatActivity implements NewsfeedAdaptor.
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();
}
}
app/src/main/java/com/example/instilostandfound/NewsFeedLost.java 0 → 100644
View file @ 1494d5c3
package com.example.instilostandfound;
import androidx.annotation.NonNull;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity;
import androidx.core.view.MenuItemCompat;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
import android.widget.SearchView;
import android.widget.Toast;
import com.google.android.gms.tasks.OnSuccessListener;
import com.google.firebase.database.DataSnapshot;
import com.google.firebase.database.DatabaseError;
import com.google.firebase.database.DatabaseReference;
import com.google.firebase.database.FirebaseDatabase;
import com.google.firebase.database.Query;
import com.google.firebase.database.ValueEventListener;
import com.google.firebase.storage.FirebaseStorage;
import com.google.firebase.storage.StorageReference;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
public class NewsFeedLost extends AppCompatActivity implements NewsfeedAdaptor.OnItemClickListener, Serializable {
private RecyclerView mrecyclerView;
private NewsfeedAdaptor mAdaptor;
SharedPreferences mSharedPref;
private DatabaseReference mDatabaseRef;
LinearLayoutManager mLayoutManager;
private FirebaseStorage mStorage;
private List<CreateFoundObject> mPosts;
private String username =null;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_news_feed_lost);
username = getIntent().getStringExtra("username");
mrecyclerView = findViewById(R.id.my_posts_rv);
mrecyclerView.setHasFixedSize(true);
mrecyclerView.setLayoutManager(new LinearLayoutManager(this));
mPosts = new ArrayList<>();
mDatabaseRef = FirebaseDatabase.getInstance().getReference("LostData");
mStorage = FirebaseStorage.getInstance();
//Query usernamequery = mDatabaseRef.orderByChild("ldap").equalTo((username+"@iitb.ac.in").toLowerCase());
//Log.v("query",usernamequery.toString());
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
public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
for (DataSnapshot postSnapShot : dataSnapshot.getChildren()) {
CreateFoundObject post = postSnapShot.getValue(CreateFoundObject.class);
post.setKey(postSnapShot.getKey());
mPosts.add(post);
}
mAdaptor = new NewsfeedAdaptor(NewsFeedLost.this, mPosts);
mrecyclerView.setAdapter(mAdaptor);
mAdaptor.setOnItemClickListener(NewsFeedLost.this);
}
@Override
public void onCancelled(@NonNull DatabaseError databaseError) {
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
public void onItemClick(int position) {
Log.v("position =",String.valueOf(position));
CreateFoundObject selectedItem = mPosts.get(position);
final String selectedKey = selectedItem.getKey();
Intent intent = new Intent(NewsFeedLost.this, ItemClaim.class);
intent.putExtra("FoundObject", selectedItem);
intent.putExtra("CallingClass","MyPosts");
intent.putExtra("username",username);
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();
}
}
app/src/main/java/com/example/instilostandfound/RedirectMyPosts.java
View file @ 1494d5c3
......@@ -23,7 +23,7 @@ public class RedirectMyPosts extends AppCompatActivity implements View.OnClickLi
public void onClick(View v) {
switch (v.getId()){
case R.id.lost_button:
Intent intent = new Intent(RedirectMyPosts.this, MyPosts.class);
Intent intent = new Intent(RedirectMyPosts.this, MyPostsLostRV.class);
intent.putExtra("type", "lost");
intent.putExtra("username", username);
startActivity(intent);
......
app/src/main/java/com/example/instilostandfound/createDemo.java deleted 100644 → 0
View file @ ebb66088
package com.example.instilostandfound;
import com.google.firebase.auth.FirebaseAuth;
import com.google.firebase.database.Exclude;
import java.text.SimpleDateFormat;
import java.util.Date;
public class createDemo {
//private String mImageUrl;
private String mKey;
private String mTitle;
private String mDate;
private String mLDAP;
private String mDescription;
private String mLocation;
// private String mCategory;
private String mDateFound;
public createDemo() {
}
public createDemo(String LDAPID,String title , String desc,String location,
String datefound) {
if (LDAPID.trim().equals("")) {
mLDAP = "No Name";
}
//mLDAPID = LDAPID;
//mImageUrl = imageUrl;
mLDAP = LDAPID;
mDescription = desc;
mLocation = location;
mDateFound = datefound;
//mCategory = category;
mTitle = title;
SimpleDateFormat df = new SimpleDateFormat("dd-MMM-yyyy");
Date date = new Date();
mDate = df.format(date);
}
public String getLDAP() {
return mLDAP;
}
public void setLDAP(String LDAP) { mLDAP= LDAP; }
public String getmTitle() {
return mTitle;
}
public void setmTitle(String mTitle) {
this.mTitle = mTitle;
}
public String getmDateFound()
{ return mDateFound; }
public void setmDateFound(String dateFound)
{ mDateFound = dateFound; }
public String getmDescription()
{ return mDescription; }
public void setmDescription(String desc)
{ mDescription = desc; }
public String getmLocation()
{return mLocation;}
public void setmLocation(String location)
{ mLocation = location;}
@Exclude
public String getKey()
{
return mKey;
}
@Exclude
public void setKey(String key)
{
mKey = key;
}
public String getDate()
{ return mDate; }
public void setDate(String date)
{ mDate = date; }
}
app/src/main/res/layout/activity_my_posts_found_rv.xml
View file @ 1494d5c3
......@@ -9,7 +9,9 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/my_posts_rv"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true">
</androidx.recyclerview.widget.RecyclerView>
......
app/src/main/res/layout/activity_my_posts_lost_rv.xml 0 → 100644
View file @ 1494d5c3
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".MyPostsLostRV">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/my_posts_rv"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true">
</androidx.recyclerview.widget.RecyclerView>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/activity_news_feed_lost.xml 0 → 100644
View file @ 1494d5c3
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".NewsFeedLost">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/my_posts_rv"
android:layout_width="match_parent"
android:layout_height="match_parent">
</androidx.recyclerview.widget.RecyclerView>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/content_found_item.xml
View file @ 1494d5c3
......@@ -86,13 +86,18 @@
/>
<TextView
android:gravity="start|top"
android:id="@+id/date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:inputType="date"
android:hint = "@string/date"
android:textColorHighlight = "#ff7eff15"
android:textColorHint = "@color/hint_color"
android:layout_below = "@+id/desc"
android:layout_marginTop = "15dp"
android:layout_marginLeft="5dp"
android:textSize="20dp"
android:layout_alignParentLeft = "true"
android:layout_alignParentStart = "true"
android:layout_alignParentRight = "true"
......
app/src/main/res/layout/content_lost_item.xml
View file @ 1494d5c3
......@@ -86,13 +86,18 @@
/>
<TextView
android:gravity="start|top"
android:id="@+id/date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:inputType="date"
android:hint = "@string/date"
android:textColorHighlight = "#ff7eff15"
android:textColorHint = "@color/hint_color"
android:layout_below = "@+id/desc"
android:layout_marginTop = "15dp"
android:layout_marginLeft="5dp"
android:textSize="20dp"
android:layout_alignParentLeft = "true"
android:layout_alignParentStart = "true"
android:layout_alignParentRight = "true"
......
app/src/main/res/menu/menu.xml 0 → 100644
View file @ 1494d5c3
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_search"
android:icon="@drawable/common_google_signin_btn_icon_dark_focused"
android:title="Search"
app:actionViewClass="android.widget.SearchView"
app:showAsAction="always" />
<item
android:id="@+id/action_sort"
android:title="Sort"
app:showAsAction="never" />
</menu>
\ No newline at end of file
local.properties
View file @ 1494d5c3
......@@ -4,5 +4,5 @@
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
#Tue Nov 26 09:55:26 IST 2019
sdk.dir=/home/navya/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