Commit b3b02262 authored by MUDRA SAHU's avatar MUDRA SAHU

Edit bug fix and small UI changes

parent 151633ba
...@@ -3,6 +3,9 @@ ...@@ -3,6 +3,9 @@
<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"> <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/17b5cdcb3e31a36e8bde86f3754af349/jetified-play-services-basement-17.0.0/jars/classes.jar!/" /> <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="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/17b5cdcb3e31a36e8bde86f3754af349/jetified-play-services-basement-17.0.0/res" /> <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5b44a467ef215ace407b0f6cf221c780/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!/" />
......
...@@ -9,20 +9,34 @@ ...@@ -9,20 +9,34 @@
<option name="TOOL_WINDOW_CONFIGURED_FILTER" value="Show only selected application" /> <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="Show only selected application" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="d3ee5bd8-a194-4e5e-99e3-99dd32fc4efe" name="Default Changelist" comment="email activities bug fixes minor"> <list default="true" id="d3ee5bd8-a194-4e5e-99e3-99dd32fc4efe" name="Default Changelist" comment="Edit bug fix and small UI changes">
<change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle____local_aars____home_abc_AndroidStudioProjects_InstiLostAndFound_app_libs_activation_jar_unspecified_jar.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle____local_aars____home_abc_AndroidStudioProjects_InstiLostAndFound_app_libs_additionnal_jar_unspecified_jar.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.idea/libraries/Gradle____local_aars____home_abc_AndroidStudioProjects_InstiLostAndFound_app_libs_mail_jar_unspecified_jar.xml" 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.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$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" 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" /> <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/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__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/app.iml" beforeDir="false" afterPath="$PROJECT_DIR$/app/app.iml" 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/SendMail.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/SendMail.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/emailFragment.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/emailFragment.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/Navigation.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/Navigation.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/RedirectMyPosts.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/RedirectMyPosts.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_my_posts_found_rv.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_my_posts_found_rv.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" />
...@@ -33,7 +47,7 @@ ...@@ -33,7 +47,7 @@
<component name="DefaultGradleProjectSettings"> <component name="DefaultGradleProjectSettings">
<option name="isMigrated" value="true" /> <option name="isMigrated" value="true" />
</component> </component>
<component name="ExecutionTargetManager" SELECTED_TARGET="7bfee843" /> <component name="ExecutionTargetManager" SELECTED_TARGET="6496cee07d94" />
<component name="ExternalProjectsData"> <component name="ExternalProjectsData">
<projectState path="$PROJECT_DIR$"> <projectState path="$PROJECT_DIR$">
<ProjectState /> <ProjectState />
...@@ -42,17 +56,46 @@ ...@@ -42,17 +56,46 @@
<component name="ExternalProjectsManager"> <component name="ExternalProjectsManager">
<system id="GRADLE"> <system id="GRADLE">
<state> <state>
<projects_view /> <projects_view>
<tree_state>
<expand>
<path>
<item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
<item name="InstiLostAndFound" type="f1a62948:ProjectNode" />
</path>
</expand>
<select />
</tree_state>
</projects_view>
</state> </state>
</system> </system>
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<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/SendMail.java"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_news_feed_lost.xml">
<provider editor-type-id="android-designer2" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="15" column="15" selection-start-line="15" selection-start-column="15" selection-end-line="15" selection-end-column="15" />
</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"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="226"> <state relative-caret-position="615">
<caret line="30" column="26" lean-forward="true" selection-start-line="30" selection-start-column="26" selection-end-line="30" selection-end-column="26" /> <caret line="41" column="9" selection-start-line="41" selection-start-column="9" selection-end-line="41" selection-end-column="9" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPostsLostRV.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="116">
<caret line="36" column="17" lean-forward="true" selection-start-line="36" selection-start-column="17" selection-end-line="36" selection-end-column="17" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
...@@ -60,73 +103,68 @@ ...@@ -60,73 +103,68 @@
</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/res/layout/activity_item_claim.xml"> <entry file="file://$PROJECT_DIR$/app/build.gradle">
<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="297"> <state relative-caret-position="91">
<caret line="158" column="43" selection-start-line="158" selection-start-column="43" selection-end-line="158" selection-end-column="43" /> <caret line="39" column="28" lean-forward="true" selection-start-line="39" selection-start-column="28" selection-end-line="39" selection-end-column="28" />
</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/ItemDetails.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="105"> <state relative-caret-position="3120">
<caret line="18" selection-start-line="18" selection-end-line="18" /> <caret line="272" column="21" selection-start-line="272" selection-start-column="21" selection-end-line="272" selection-end-column="21" />
</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/layout/fragment_email.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/NewsFeedLost.java">
<provider selected="true" editor-type-id="android-designer2" /> <provider selected="true" editor-type-id="text-editor">
<provider editor-type-id="text-editor"> <state relative-caret-position="780">
<state relative-caret-position="281"> <caret line="74" column="11" selection-start-line="74" selection-start-column="11" selection-end-line="74" selection-end-column="11" />
<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>
</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/Config.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"> <provider selected="true" editor-type-id="text-editor">
<state> <state relative-caret-position="255">
<caret column="8" selection-start-column="8" selection-end-column="8" /> <caret line="17" column="53" selection-start-line="17" selection-start-column="53" selection-end-line="17" selection-end-column="53" />
</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/ItemClaim.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">
<state relative-caret-position="343"> <state relative-caret-position="135">
<caret line="56" column="55" selection-start-line="56" selection-start-column="55" selection-end-line="56" selection-end-column="55" /> <caret line="13" selection-start-line="13" selection-end-line="13" />
</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/ImageAdapter.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"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90"> <state relative-caret-position="675">
<caret line="18" column="13" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" /> <caret line="45" column="33" selection-start-line="45" selection-start-column="33" selection-end-line="45" selection-end-column="33" />
<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/emailFragment.java"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_news_feed_found.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="-4"> <state relative-caret-position="195">
<caret line="37" column="29" selection-start-line="37" selection-start-column="29" selection-end-line="37" selection-end-column="29" /> <caret line="13" column="48" selection-start-line="8" selection-start-column="4" selection-end-line="13" selection-end-column="48" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -144,13 +182,6 @@ ...@@ -144,13 +182,6 @@
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>getE</find>
<find>PICK_IMAGE_REQUEST</find>
<find>abra</find>
<find>show</find>
<find>.idea</find>
<find>goog</find>
<find>myposts</find>
<find>my_posts_rv</find> <find>my_posts_rv</find>
<find>doWhatever</find> <find>doWhatever</find>
<find>camera</find> <find>camera</find>
...@@ -159,6 +190,7 @@ ...@@ -159,6 +190,7 @@
<find>getImageUrl</find> <find>getImageUrl</find>
<find>username</find> <find>username</find>
<find>dowhat</find> <find>dowhat</find>
<find>bundle</find>
<find>ItemDetails</find> <find>ItemDetails</find>
<find>onDeleteClick</find> <find>onDeleteClick</find>
<find>image</find> <find>image</find>
...@@ -170,10 +202,16 @@ ...@@ -170,10 +202,16 @@
<find>name_</find> <find>name_</find>
<find>nameta</find> <find>nameta</find>
<find>MyPostsAdaptor</find> <find>MyPostsAdaptor</find>
<find>getactivit</find> <find>normal click</find>
<find>bundle</find> <find>founddata</find>
<find>intent</find> <find>Found</find>
<find>id/</find> <find>adaptor</find>
<find>wallet</find>
<find>value</find>
<find>myposts</find>
<find>found_button</find>
<find>found</find>
<find>my</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace /> <replace />
...@@ -191,7 +229,6 @@ ...@@ -191,7 +229,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/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" />
...@@ -211,7 +248,6 @@ ...@@ -211,7 +248,6 @@
<option value="$PROJECT_DIR$/app/src/main/res/values/strings.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/values/strings.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPosts.java" /> <option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPosts.java" />
<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/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/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" />
...@@ -219,36 +255,65 @@ ...@@ -219,36 +255,65 @@
<option value="$PROJECT_DIR$/app/src/main/res/layout/image_item.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/layout/image_item.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPostsAdaptor.java" /> <option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPostsAdaptor.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/CreateFoundObject.java" /> <option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/CreateFoundObject.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/Navigation.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_found_item.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_found_item.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_redirect_my_posts.xml" /> <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/FoundItem.java" /> <option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/FoundItem.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPostsFoundRV.java" /> <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" /> <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_item_details.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/NewsFeedFound.java" /> <option value="$PROJECT_DIR$/local.properties" />
<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_lost_rv.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPostsLostRV.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ItemDetails.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/RedirectMyPosts.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/Navigation.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_news_feed_lost.xml" />
<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/AndroidManifest.xml" /> <option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_item_claim.xml" /> <option value="$PROJECT_DIR$/app/build.gradle" />
<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" />
</list> </list>
</option> </option>
</component> </component>
<component name="ProjectFrameBounds"> <component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="85" /> <option name="x" value="65" />
<option name="y" value="57" /> <option name="y" value="19" />
<option name="width" value="1281" /> <option name="width" value="1275" />
<option name="height" value="704" /> <option name="height" value="646" />
</component> </component>
<component name="ProjectView"> <component name="ProjectView">
<navigator proportions="" version="1"> <navigator proportions="" version="1">
<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" />
<pane id="AndroidView">
<subPane>
<expand>
<path>
<item name="InstiLostAndFound" type="1abcf292:AndroidViewProjectNode" />
<item name="Gradle Scripts" type="ae0cef3a:AndroidBuildScriptsGroupNode" />
</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>
...@@ -305,91 +370,16 @@ ...@@ -305,91 +370,16 @@
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="AndroidView">
<subPane>
<expand>
<path>
<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" />
<item name="java" type="edd41e36:AndroidSourceTypeNode" />
</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" />
<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="res" type="d4f16f75:AndroidResFolderNode" />
</path>
<path>
<item name="InstiLostAndFound" type="1abcf292:AndroidViewProjectNode" />
<item name="app" type="feadf853:AndroidModuleNode" />
<item name="res" type="d4f16f75:AndroidResFolderNode" />
<item name="layout" type="ddeffd01:AndroidResFolderTypeNode" />
</path>
<path>
<item name="InstiLostAndFound" type="1abcf292:AndroidViewProjectNode" />
<item name="Gradle Scripts" type="ae0cef3a:AndroidBuildScriptsGroupNode" />
</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="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>
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="DEBUGGABLE_DEVICE" value="oneplus-oneplus_a5000-7bfee843" /> <property name="DEBUGGABLE_DEVICE" value="xiaomi-redmi_4-6496cee07d94" />
<property name="DEBUGGABLE_PROCESS" value="com.example.instilostandfound" /> <property name="DEBUGGABLE_PROCESS" value="com.example.instilostandfound" />
<property name="DEBUGGER_ID" value="Auto" /> <property name="DEBUGGER_ID" value="Auto" />
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" /> <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="SHOW_ALL_PROCESSES" value="false" /> <property name="SHOW_ALL_PROCESSES" value="false" />
<property name="android.sdk.path" value="$USER_HOME$/Android/Sdk" /> <property name="android.sdk.path" value="$USER_HOME$/Android/Sdk" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../mini-project" /> <property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="project.structure.last.edited" value="Dependencies" /> <property name="project.structure.last.edited" value="Dependencies" />
<property name="project.structure.proportion" value="0.17" /> <property name="project.structure.proportion" value="0.17" />
<property name="project.structure.side.proportion" value="0.2" /> <property name="project.structure.side.proportion" value="0.2" />
...@@ -407,9 +397,6 @@ ...@@ -407,9 +397,6 @@
<key name="android.template.parentActivityClass"> <key name="android.template.parentActivityClass">
<recent name="" /> <recent name="" />
</key> </key>
<key name="CopyClassDialog.RECENTS_KEY">
<recent name="com.example.instilostandfound" />
</key>
</component> </component>
<component name="RunDashboard"> <component name="RunDashboard">
<option name="ruleStates"> <option name="ruleStates">
...@@ -587,73 +574,61 @@ ...@@ -587,73 +574,61 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1572973882487</updated> <updated>1572973882487</updated>
</task> </task>
<task id="LOCAL-00014" summary="email activities"> <task id="LOCAL-00014" summary="Edit bug fix and small UI changes">
<created>1574426461658</created> <created>1574396461978</created>
<option name="number" value="00014" /> <option name="number" value="00014" />
<option name="presentableId" value="LOCAL-00014" /> <option name="presentableId" value="LOCAL-00014" />
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1574426461658</updated> <updated>1574396461978</updated>
</task>
<task id="LOCAL-00015" summary="email activities email fragment changes">
<created>1574481815784</created>
<option name="number" value="00015" />
<option name="presentableId" value="LOCAL-00015" />
<option name="project" value="LOCAL" />
<updated>1574481815784</updated>
</task> </task>
<task id="LOCAL-00016" summary="email activities working"> <option name="localTasksCounter" value="15" />
<created>1574493516786</created>
<option name="number" value="00016" />
<option name="presentableId" value="LOCAL-00016" />
<option name="project" value="LOCAL" />
<updated>1574493516786</updated>
</task>
<task id="LOCAL-00017" summary="email activities bug fixes minor">
<created>1574500055133</created>
<option name="number" value="00017" />
<option name="presentableId" value="LOCAL-00017" />
<option name="project" value="LOCAL" />
<updated>1574500055133</updated>
</task>
<option name="localTasksCounter" value="18" />
<servers /> <servers />
</component> </component>
<component name="TodoView">
<todo-panel id="selected-file">
<is-autoscroll-to-source value="true" />
</todo-panel>
<todo-panel id="all">
<are-packages-shown value="true" />
<is-autoscroll-to-source value="true" />
</todo-panel>
</component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="85" y="57" width="1281" height="704" extended-state="0" /> <frame x="44" y="-14" width="1323" height="783" extended-state="6" />
<editor active="true" /> <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 active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.2574899" /> <window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.25097734" />
<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" />
<window_info id="Image Layers" order="5" /> <window_info id="Image Layers" order="5" />
<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" />
<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.32928944" />
<window_info anchor="bottom" id="Logcat" order="1" weight="0.32928944" /> <window_info anchor="bottom" id="Logcat" order="1" sideWeight="0.7990618" weight="0.32874617" />
<window_info anchor="bottom" id="TODO" order="2" /> <window_info anchor="bottom" id="TODO" order="2" weight="0.32874617" />
<window_info anchor="bottom" id="Debug" order="3" visible="true" weight="0.112651646" /> <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.49569976" weight="0.5152905" />
<window_info anchor="bottom" id="Terminal" order="4" /> <window_info anchor="bottom" id="Terminal" order="4" sideWeight="0.49960908" weight="0.32874617" />
<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.50430024" side_tool="true" weight="0.04587156" />
<window_info anchor="bottom" id="Version Control" order="6" weight="0.40069085" /> <window_info anchor="bottom" id="Version Control" order="6" weight="0.40214068" />
<window_info anchor="bottom" id="Build" order="7" sideWeight="0.49878544" weight="0.3275563" /> <window_info anchor="bottom" id="Build" order="7" sideWeight="0.49878544" visible="true" weight="0.3792049" />
<window_info anchor="bottom" id="Find" order="8" weight="0.4852713" /> <window_info anchor="bottom" id="Find" order="8" weight="0.48470947" />
<window_info active="true" anchor="bottom" id="Messages" order="9" visible="true" weight="0.19584055" /> <window_info anchor="bottom" id="Messages" order="9" weight="0.19584055" />
<window_info anchor="bottom" id="Android Profiler" order="10" /> <window_info anchor="bottom" id="Android Profiler" order="10" show_stripe_button="false" />
<window_info anchor="right" id="Hierarchy" order="0" weight="0.32955465" /> <window_info anchor="right" id="Hierarchy" order="0" weight="0.32955465" />
<window_info anchor="right" id="Capture Analysis" order="1" /> <window_info anchor="right" id="Capture Analysis" order="1" />
<window_info anchor="right" id="Gradle" order="2" /> <window_info anchor="right" id="Gradle" order="2" />
<window_info anchor="right" id="Theme Preview" order="3" /> <window_info anchor="right" id="Theme Preview" order="3" />
<window_info anchor="right" id="Preview" order="4" sideWeight="0.44044322" weight="0.21862349" /> <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="Palette&#9;" order="5" />
<window_info anchor="right" id="Assistant" order="6" sideWeight="0.49861497" weight="0.046153847" /> <window_info anchor="right" id="Assistant" order="6" sideWeight="0.49861497" weight="0.04456607" />
<window_info anchor="right" id="Device File Explorer" order="7" sideWeight="0.50138503" visible="true" weight="0.10607287" /> <window_info anchor="right" id="Device File Explorer" order="7" sideWeight="0.50138503" weight="0.031274434" />
</layout> </layout>
<layout-to-restore> <layout-to-restore>
<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 active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.29797572" /> <window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.25097734" />
<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" />
...@@ -662,23 +637,24 @@ ...@@ -662,23 +637,24 @@
<window_info id="Resources Explorer" order="7" /> <window_info id="Resources Explorer" order="7" />
<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.32928944" />
<window_info anchor="bottom" id="Logcat" order="1" weight="0.32928944" /> <window_info anchor="bottom" id="Logcat" order="1" weight="0.32874617" />
<window_info anchor="bottom" id="TODO" order="2" /> <window_info anchor="bottom" id="TODO" order="2" weight="0.32874617" />
<window_info anchor="bottom" id="Debug" order="3" visible="true" weight="0.05199307" /> <window_info anchor="bottom" id="Debug" order="3" weight="0.47553515" />
<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.4031008" /> <window_info anchor="bottom" id="Version Control" order="6" weight="0.40214068" />
<window_info anchor="bottom" id="Build" order="7" sideWeight="0.49878544" weight="0.25996533" /> <window_info anchor="bottom" id="Build" order="7" sideWeight="0.49878544" weight="0.19877675" />
<window_info anchor="bottom" id="Find" order="8" weight="0.4852713" /> <window_info anchor="bottom" id="Find" order="8" weight="0.48470947" />
<window_info active="true" anchor="bottom" id="Messages" order="9" visible="true" weight="0.19584055" /> <window_info active="true" anchor="bottom" id="Messages" order="9" visible="true" weight="0.19584055" />
<window_info anchor="bottom" id="Android Profiler" order="10" /> <window_info anchor="bottom" id="Android Profiler" order="10" />
<window_info anchor="right" id="Capture Analysis" order="0" /> <window_info anchor="right" id="Hierarchy" order="0" weight="0.32955465" />
<window_info anchor="right" id="Gradle" order="1" /> <window_info anchor="right" id="Capture Analysis" order="1" />
<window_info anchor="right" id="Theme Preview" order="2" /> <window_info anchor="right" id="Gradle" order="2" />
<window_info anchor="right" id="Preview" order="3" sideWeight="0.44044322" visible="true" weight="0.21862349" /> <window_info anchor="right" id="Theme Preview" order="3" />
<window_info anchor="right" id="Palette&#9;" order="4" /> <window_info anchor="right" id="Preview" order="4" sideWeight="0.44044322" weight="0.21862349" />
<window_info anchor="right" id="Assistant" order="5" sideWeight="0.49861497" weight="0.046153847" /> <window_info anchor="right" id="Palette&#9;" order="5" />
<window_info anchor="right" id="Device File Explorer" order="6" sideWeight="0.50138503" weight="0.026720649" /> <window_info anchor="right" id="Assistant" order="6" sideWeight="0.49861497" weight="0.04456607" />
<window_info anchor="right" id="Device File Explorer" order="7" sideWeight="0.50138503" weight="0.031274434" />
</layout-to-restore> </layout-to-restore>
</component> </component>
<component name="Vcs.Log.History.Properties"> <component name="Vcs.Log.History.Properties">
...@@ -692,22 +668,6 @@ ...@@ -692,22 +668,6 @@
</option> </option>
</component> </component>
<component name="Vcs.Log.Tabs.Properties"> <component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES">
<map>
<entry key="MAIN">
<value>
<State>
<option name="RECENTLY_FILTERED_USER_GROUPS">
<collection />
</option>
<option name="RECENTLY_FILTERED_BRANCH_GROUPS">
<collection />
</option>
</State>
</value>
</entry>
</map>
</option>
<option name="RECENT_FILTERS"> <option name="RECENT_FILTERS">
<map> <map>
<entry key="Branch"> <entry key="Branch">
...@@ -738,13 +698,10 @@ ...@@ -738,13 +698,10 @@
<MESSAGE value="Filter added for FIREBASE db access + network and loading screen" /> <MESSAGE value="Filter added for FIREBASE db access + network and loading screen" />
<MESSAGE value="delete item code added" /> <MESSAGE value="delete item code added" />
<MESSAGE value="Edit bug fix and small UI changes" /> <MESSAGE value="Edit bug fix and small UI changes" />
<MESSAGE value="email activities" /> <option name="LAST_COMMIT_MESSAGE" value="Edit bug fix and small UI changes" />
<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" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/app/build/generated/not_namespaced_r_class_sources/debugAndroidTest/r/com/example/instilostandfound/test/R.java" />
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_test.xml" /> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_test.xml" />
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/test.java" /> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/test.java" />
<entry file="file://$PROJECT_DIR$/app/build/generated/source/buildConfig/androidTest/debug/com/example/instilostandfound/test/BuildConfig.java" /> <entry file="file://$PROJECT_DIR$/app/build/generated/source/buildConfig/androidTest/debug/com/example/instilostandfound/test/BuildConfig.java" />
...@@ -769,34 +726,23 @@ ...@@ -769,34 +726,23 @@
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_lost_item.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_lost_item.xml">
<provider editor-type-id="android-designer2" /> <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="330"> <state relative-caret-position="135">
<caret line="22" column="50" selection-start-line="22" selection-start-column="4" selection-end-line="22" selection-end-column="50" /> <caret line="9" selection-start-line="9" selection-end-line="9" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/list_item.xml"> <entry file="file://$PROJECT_DIR$/build.gradle">
<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="15">
<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="1" selection-start-line="1" selection-end-line="1" />
</state> </state>
</provider> </provider>
</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/list_item.xml">
<provider editor-type-id="android-designer2" /> <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="90">
<caret line="25" column="42" selection-start-line="25" selection-start-column="42" selection-end-line="25" selection-end-column="42" /> <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>
</provider>
</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="-1306">
<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>
</entry> </entry>
...@@ -810,245 +756,287 @@ ...@@ -810,245 +756,287 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_found_item.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_redirect_my_posts.xml">
<provider editor-type-id="android-designer2" /> <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="135"> <state relative-caret-position="390">
<caret line="9" column="28" selection-start-line="9" selection-start-column="28" selection-end-line="9" selection-end-column="28" /> <caret line="33" column="52" lean-forward="true" selection-start-line="33" selection-start-column="52" selection-end-line="33" selection-end-column="52" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/build.gradle"> <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="15"> <state relative-caret-position="1185">
<caret line="1" selection-start-line="1" selection-end-line="1" /> <caret line="79" column="44" selection-end-line="102" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/Navigation.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ImageAdapter.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="810"> <state relative-caret-position="170">
<caret line="68" column="38" selection-start-line="68" selection-start-column="38" selection-end-line="68" selection-end-column="38" /> <caret line="18" column="13" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
<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/src/main/res/layout/activity_found_item.xml"> <entry file="file://$PROJECT_DIR$/local.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="10" selection-start-line="10" selection-end-line="10" />
</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="75">
<caret line="5" column="50" lean-forward="true" selection-start-line="5" selection-start-column="50" selection-end-line="5" selection-end-column="50" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_item_details.xml">
<provider editor-type-id="android-designer2" /> <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="68"> <state relative-caret-position="311">
<caret line="12" column="64" selection-start-line="12" selection-start-column="64" selection-end-line="12" selection-end-column="64" /> <caret line="181" column="44" lean-forward="true" selection-start-line="181" selection-start-column="44" selection-end-line="181" selection-end-column="44" />
</state> </state>
</provider> </provider>
</entry> </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/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/LoginViewModelFactory.java" />
<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" />
<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="-646"> <state relative-caret-position="60">
<caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" /> <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
</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_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="238"> <state relative-caret-position="15">
<caret line="43" column="41" selection-start-line="43" selection-start-column="41" selection-end-line="43" selection-end-column="41" /> <caret line="1" column="47" selection-start-line="1" selection-start-column="47" selection-end-line="1" selection-end-column="47" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_item_details.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_main.xml">
<provider editor-type-id="android-designer2" /> <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="45">
<caret line="146" column="17" lean-forward="true" selection-start-line="1" selection-end-line="146" selection-end-column="17" /> <caret line="3" column="50" selection-start-line="3" selection-start-column="50" selection-end-line="3" selection-end-column="50" />
</state> </state>
</provider> </provider>
</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/image_item.xml">
<provider editor-type-id="android-designer2" /> <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="375">
<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="25" column="42" selection-start-line="25" selection-start-column="42" selection-end-line="25" selection-end-column="42" />
</state> </state>
</provider> </provider>
</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_my_posts_lost.xml" />
<provider editor-type-id="android-designer2" /> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPostsLost.java" />
<provider selected="true" editor-type-id="text-editor" /> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_my_posts.xml">
<provider selected="true" editor-type-id="android-designer2" />
<provider editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="10" column="25" selection-start-line="10" selection-start-column="25" selection-end-line="10" selection-end-column="25" />
</state>
</provider>
</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/java/com/example/instilostandfound/MyPostsAdaptor.java">
<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="283">
<caret line="11" column="45" selection-start-line="11" selection-start-column="45" selection-end-line="11" selection-end-column="45" /> <caret line="44" column="5" lean-forward="true" selection-start-line="44" selection-start-column="5" selection-end-line="44" selection-end-column="5" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_my_posts.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPosts.java">
<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="345">
<caret line="41" lean-forward="true" selection-start-line="41" selection-end-line="41" />
</state>
</provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/RedirectMyPosts.java"> <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="375"> <state relative-caret-position="225">
<caret line="29" column="22" lean-forward="true" selection-start-line="29" selection-start-column="22" selection-end-line="29" selection-end-column="22" /> <caret line="15" column="48" lean-forward="true" selection-start-line="8" selection-start-column="4" selection-end-line="15" selection-end-column="48" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/LostItem.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="182"> <state relative-caret-position="178">
<caret line="33" column="13" selection-start-line="33" selection-start-column="13" selection-end-line="33" selection-end-column="13" /> <caret line="24" column="94" lean-forward="true" selection-start-line="24" selection-start-column="94" selection-end-line="24" selection-end-column="94" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPostsFoundRV.java">
<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="354">
<caret line="21" column="50" selection-start-line="21" selection-start-column="50" selection-end-line="21" selection-end-column="50" /> <caret line="128" column="55" selection-start-line="128" selection-start-column="50" selection-end-line="128" selection-end-column="55" />
</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/MainActivity.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-617"> <state relative-caret-position="15">
<caret line="207" lean-forward="true" selection-start-line="207" selection-end-line="207" /> <caret line="27" column="56" selection-start-line="27" selection-start-column="56" selection-end-line="27" selection-end-column="56" />
<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/src/main/java/com/example/instilostandfound/MyPosts.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/createDemo.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-933"> <state relative-caret-position="225">
<caret line="22" column="46" selection-start-line="22" selection-start-column="29" selection-end-line="22" selection-end-column="46" /> <caret line="19" column="24" selection-start-line="19" selection-start-column="24" selection-end-line="19" selection-end-column="24" />
<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/CreateFoundObject.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/CreateFoundObject.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="388"> <state relative-caret-position="60">
<caret line="29" column="8" selection-start-line="29" selection-start-column="8" selection-end-line="29" selection-end-column="8" /> <caret line="9" column="25" selection-start-line="9" selection-start-column="25" selection-end-line="9" selection-end-column="25" />
<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/src/main/java/com/example/instilostandfound/NewsFeedFound.java"> <entry file="jar://$USER_HOME$/Android/Sdk/platforms/android-28/android.jar!/android/app/Instrumentation.class">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="268"> <state relative-caret-position="97">
<caret line="81" column="64" selection-start-line="81" selection-start-column="64" selection-end-line="81" selection-end-column="64" /> <caret line="101" column="95" selection-start-line="101" selection-start-column="95" selection-end-line="101" selection-end-column="95" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPostsFoundRV.java"> <entry file="jar://$USER_HOME$/Android/Sdk/platforms/android-28/android.jar!/android/os/Handler.class">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="335"> <state relative-caret-position="97">
<caret line="132" column="34" lean-forward="true" selection-start-line="132" selection-start-column="34" selection-end-line="132" selection-end-column="34" /> <caret line="17" column="57" selection-start-line="17" selection-start-column="57" selection-end-line="17" selection-end-column="57" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPostsAdaptor.java"> <entry file="jar://$USER_HOME$/Android/Sdk/platforms/android-28/android.jar!/android/os/Looper.class">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-633"> <state relative-caret-position="52">
<caret line="24" column="25" selection-start-line="24" selection-start-column="11" selection-end-line="24" selection-end-column="25" /> <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_navigation.xml"> <entry file="jar://$USER_HOME$/Android/Sdk/platforms/android-28/android.jar!/android/app/Activity.class">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_my_posts_lost_rv.xml">
<provider editor-type-id="android-designer2" /> <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="105">
<caret line="5" column="35" selection-start-line="5" selection-start-column="35" selection-end-line="5" selection-end-column="35" /> <caret line="7" column="45" selection-start-line="7" selection-start-column="45" selection-end-line="7" selection-end-column="45" />
</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="570">
<caret line="60" column="17" selection-end-line="91" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/Config.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> <state relative-caret-position="270">
<caret column="8" selection-start-column="8" selection-end-column="8" /> <caret line="32" selection-start-line="32" selection-end-line="32" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </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_news_feed_lost.xml">
<provider editor-type-id="android-designer2" /> <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="297"> <state relative-caret-position="225">
<caret line="158" column="43" selection-start-line="158" selection-start-column="43" selection-end-line="158" selection-end-column="43" /> <caret line="15" column="15" selection-start-line="15" selection-start-column="15" selection-end-line="15" selection-end-column="15" />
</state> </state>
</provider> </provider>
</entry> </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/LostItem.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="615">
<caret line="18" selection-start-line="18" selection-end-line="18" /> <caret line="41" column="9" selection-start-line="41" selection-start-column="9" selection-end-line="41" selection-end-column="9" />
</state> </state>
</provider> </provider>
</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/FoundItem.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="343"> <state relative-caret-position="3120">
<caret line="56" column="55" selection-start-line="56" selection-start-column="55" selection-end-line="56" selection-end-column="55" /> <caret line="272" column="21" selection-start-line="272" selection-start-column="21" selection-end-line="272" selection-end-column="21" />
</state> </state>
</provider> </provider>
</entry> </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/NewsFeedLost.java">
<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="780">
<caret line="18" column="13" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" /> <caret line="74" column="11" selection-start-line="74" selection-start-column="11" selection-end-line="74" selection-end-column="11" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/debug/res/values/google_maps_api.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
<provider selected="true" editor-type-id="text-editor" /> <provider editor-type-id="android-manifest" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="17" column="53" selection-start-line="17" selection-start-column="53" selection-end-line="17" selection-end-column="53" />
</state>
</provider>
</entry> </entry>
<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/RedirectMyPosts.java">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
<caret line="13" selection-start-line="13" selection-end-line="13" />
</state>
</provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/emailFragment.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"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-4"> <state relative-caret-position="675">
<caret line="37" column="29" selection-start-line="37" selection-start-column="29" selection-end-line="37" selection-end-column="29" /> <caret line="45" column="33" selection-start-line="45" selection-start-column="33" selection-end-line="45" selection-end-column="33" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</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/activity_news_feed_found.xml">
<provider selected="true" editor-type-id="android-designer2" /> <provider editor-type-id="android-designer2" />
<provider editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="281"> <state relative-caret-position="195">
<caret line="36" column="41" selection-start-line="36" selection-start-column="41" selection-end-line="36" selection-end-column="41" /> <caret line="13" column="48" selection-start-line="8" selection-start-column="4" selection-end-line="13" selection-end-column="48" />
</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/java/com/example/instilostandfound/MyPostsLostRV.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="226"> <state relative-caret-position="116">
<caret line="30" column="26" lean-forward="true" selection-start-line="30" selection-start-column="26" selection-end-line="30" selection-end-column="26" /> <caret line="36" column="17" lean-forward="true" selection-start-line="36" selection-start-column="17" selection-end-line="36" selection-end-column="17" />
<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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="91">
<caret line="39" column="28" lean-forward="true" selection-start-line="39" selection-start-column="28" selection-end-line="39" selection-end-column="28" />
</state>
</provider>
</entry>
</component> </component>
</project> </project>
\ No newline at end of file
...@@ -104,9 +104,9 @@ ...@@ -104,9 +104,9 @@
<orderEntry type="library" scope="TEST" name="Gradle: androidx.test:core:1.2.0@aar" level="project" /> <orderEntry type="library" scope="TEST" name="Gradle: androidx.test:core:1.2.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.test:monitor:1.2.0@aar" level="project" /> <orderEntry type="library" scope="TEST" name="Gradle: androidx.test:monitor:1.2.0@aar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.test.espresso:espresso-idling-resource:3.2.0@aar" level="project" /> <orderEntry type="library" scope="TEST" name="Gradle: androidx.test.espresso:espresso-idling-resource:3.2.0@aar" level="project" />
<orderEntry type="library" name="Gradle: __local_aars__:/home/chikki/AndroidStudioProjects/InstiLostAndFound/app/libs/mail.jar:unspecified@jar" level="project" /> <orderEntry type="library" name="Gradle: __local_aars__:/home/abc/AndroidStudioProjects/InstiLostAndFound/app/libs/activation.jar:unspecified@jar" level="project" />
<orderEntry type="library" name="Gradle: __local_aars__:/home/chikki/AndroidStudioProjects/InstiLostAndFound/app/libs/activation.jar:unspecified@jar" level="project" /> <orderEntry type="library" name="Gradle: __local_aars__:/home/abc/AndroidStudioProjects/InstiLostAndFound/app/libs/additionnal.jar:unspecified@jar" level="project" />
<orderEntry type="library" name="Gradle: __local_aars__:/home/chikki/AndroidStudioProjects/InstiLostAndFound/app/libs/additionnal.jar:unspecified@jar" level="project" /> <orderEntry type="library" name="Gradle: __local_aars__:/home/abc/AndroidStudioProjects/InstiLostAndFound/app/libs/mail.jar:unspecified@jar" level="project" />
<orderEntry type="library" name="Gradle: androidx.collection:collection:1.1.0@jar" level="project" /> <orderEntry type="library" name="Gradle: androidx.collection:collection:1.1.0@jar" level="project" />
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.1.0@jar" level="project" /> <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.1.0@jar" level="project" />
<orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.1.0@jar" level="project" /> <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.1.0@jar" level="project" />
...@@ -123,8 +123,6 @@ ...@@ -123,8 +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: com.google.android.gms:play-services-maps:17.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" />
...@@ -134,7 +132,6 @@ ...@@ -134,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" />
...@@ -148,7 +145,6 @@ ...@@ -148,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" />
......
...@@ -44,7 +44,7 @@ dependencies { ...@@ -44,7 +44,7 @@ dependencies {
testImplementation 'junit:junit:4.12' testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test.ext:junit:1.1.1' androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' 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/activation.jar')
implementation files('libs/additionnal.jar') implementation files('libs/additionnal.jar')
implementation files('libs/mail.jar') implementation files('libs/mail.jar')
......
...@@ -18,8 +18,10 @@ ...@@ -18,8 +18,10 @@
android:roundIcon="@mipmap/ic_launcher_round" android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/AppTheme"> android:theme="@style/AppTheme">
<activity android:name=".ItemClaim"></activity> <activity android:name=".NewsFeedLost"></activity>
<activity android:name=".MyPostsLostRV" />
<activity android:name=".NewsFeedFound" /> <activity android:name=".NewsFeedFound" />
<activity android:name=".ItemClaim"></activity>
<activity android:name=".MyPostsFoundRV" /> <activity android:name=".MyPostsFoundRV" />
<activity android:name=".RedirectMyPosts" /> <activity android:name=".RedirectMyPosts" />
<activity android:name=".ItemDetails" /> <activity android:name=".ItemDetails" />
......
...@@ -2,6 +2,7 @@ package com.example.instilostandfound; ...@@ -2,6 +2,7 @@ package com.example.instilostandfound;
import android.app.DatePickerDialog; import android.app.DatePickerDialog;
import android.app.ProgressDialog; import android.app.ProgressDialog;
import android.content.ContentResolver;
import android.content.Intent; import android.content.Intent;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.ColorDrawable;
...@@ -9,31 +10,42 @@ import android.net.Uri; ...@@ -9,31 +10,42 @@ import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.Bundle; 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.floatingactionbutton.FloatingActionButton;
import com.google.android.material.snackbar.Snackbar; import com.google.android.material.snackbar.Snackbar;
import com.google.firebase.database.DatabaseReference; 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.StorageTask;
import com.google.firebase.storage.UploadTask;
import com.squareup.picasso.Picasso; import com.squareup.picasso.Picasso;
import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi; import androidx.annotation.RequiresApi;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import android.os.Handler;
import android.util.Log; import android.util.Log;
import android.view.View; import android.view.View;
import android.webkit.MimeTypeMap;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.DatePicker; import android.widget.DatePicker;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.Spinner; import android.widget.Spinner;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast;
import java.io.Serializable; import java.io.Serializable;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date;
public class LostItem extends AppCompatActivity implements View.OnClickListener, Serializable { 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 title;
EditText place; EditText place;
EditText desc; EditText desc;
...@@ -55,6 +67,11 @@ public class LostItem extends AppCompatActivity implements View.OnClickListener, ...@@ -55,6 +67,11 @@ public class LostItem extends AppCompatActivity implements View.OnClickListener,
private boolean updatedata; private boolean updatedata;
public String tempUri; 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; DatePickerDialog.OnDateSetListener dateSetListener;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
...@@ -76,19 +93,185 @@ public class LostItem extends AppCompatActivity implements View.OnClickListener, ...@@ -76,19 +93,185 @@ public class LostItem extends AppCompatActivity implements View.OnClickListener,
date.setOnClickListener(this); date.setOnClickListener(this);
/*FloatingActionButton fab = findViewById(R.id.fab);
fab.setOnClickListener(new View.OnClickListener() { if(callingclass.equals("MyPosts"))
@Override {
public void onClick(View view) { CreateFoundObject objectfound = (CreateFoundObject)getIntent().getSerializableExtra("FoundObject");
Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG) Log.v("desc",objectfound.getmDescription());
.setAction("Action", null).show(); 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); findViewById(R.id.submit).setOnClickListener(this);
ArrayAdapter<String> adapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_dropdown_item, items); ArrayAdapter<String> adapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_dropdown_item, items);
category.setAdapter(adapter); 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();
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();
}
})
.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);
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)
{
ContentResolver cr = getContentResolver();
MimeTypeMap mimeTypeMap = MimeTypeMap.getSingleton();
return mimeTypeMap.getExtensionFromMimeType(cr.getType(uri));
}
@RequiresApi(api = Build.VERSION_CODES.N) @RequiresApi(api = Build.VERSION_CODES.N)
public void onClick(View view) public void onClick(View view)
...@@ -96,7 +279,7 @@ public class LostItem extends AppCompatActivity implements View.OnClickListener, ...@@ -96,7 +279,7 @@ public class LostItem extends AppCompatActivity implements View.OnClickListener,
switch (view.getId()) switch (view.getId())
{ {
case R.id.submit: case R.id.submit:
//SubmitFound(); SubmitLost();
break; break;
case R.id.camera: case R.id.camera:
Intent intent = new Intent(); Intent intent = new Intent();
......
...@@ -71,6 +71,7 @@ public class Navigation extends AppCompatActivity implements NavigationView.OnNa ...@@ -71,6 +71,7 @@ public class Navigation extends AppCompatActivity implements NavigationView.OnNa
case R.id.post_lost: case R.id.post_lost:
intent = new Intent(Navigation.this, LostItem.class); intent = new Intent(Navigation.this, LostItem.class);
intent.putExtra("username", username); intent.putExtra("username", username);
intent.putExtra("CallingClass","Navigation");
startActivity(intent); startActivity(intent);
break; break;
case R.id.home: case R.id.home:
...@@ -97,7 +98,7 @@ public class Navigation extends AppCompatActivity implements NavigationView.OnNa ...@@ -97,7 +98,7 @@ public class Navigation extends AppCompatActivity implements NavigationView.OnNa
public void onClick(View v) { public void onClick(View v) {
switch (v.getId()){ switch (v.getId()){
case R.id.lost_button_newsfeed: 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("type", "lost");
intent.putExtra("username", username); intent.putExtra("username", username);
startActivity(intent); startActivity(intent);
......
...@@ -23,7 +23,7 @@ public class RedirectMyPosts extends AppCompatActivity implements View.OnClickLi ...@@ -23,7 +23,7 @@ public class RedirectMyPosts extends AppCompatActivity implements View.OnClickLi
public void onClick(View v) { public void onClick(View v) {
switch (v.getId()){ switch (v.getId()){
case R.id.lost_button: 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("type", "lost");
intent.putExtra("username", username); intent.putExtra("username", username);
startActivity(intent); startActivity(intent);
......
...@@ -9,7 +9,9 @@ ...@@ -9,7 +9,9 @@
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/my_posts_rv" android:id="@+id/my_posts_rv"
android:layout_width="match_parent" 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> </androidx.recyclerview.widget.RecyclerView>
......
...@@ -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.
#Fri Nov 22 12:15:22 IST 2019 #Tue Nov 26 09:55:15 IST 2019
sdk.dir=/home/chikki/Android/Sdk sdk.dir=/home/abc/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