Skip to content

I
InstiLostAndFound
Commit a4af1bef authored by MUDRA SAHU's avatar MUDRA SAHU
Browse files
Options

Merge branch 'master' of https://git.cse.iitb.ac.in/mnavya/InstiLostAndFound

parents bee5f9cd 3307144c
Hide whitespace changes
Inline Side-by-side
Showing with 555 additions and 139 deletions
.gradle/buildOutputCleanup/cache.properties
View file @ a4af1bef
#Mon Oct 28 16:21:31 IST 2019
#Wed Nov 06 11:42:50 IST 2019
gradle.version=5.4.1
.idea/InstiLostAndFound.iml
View file @ a4af1bef
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="InstiLostAndFound" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="java-gradle" name="Java-Gradle">
<configuration>
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
<option name="BUILDABLE" value="false" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
</content>
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
......
.idea/workspace.xml
View file @ a4af1bef
......@@ -9,7 +9,7 @@
<option name="TOOL_WINDOW_CONFIGURED_FILTER" value="Show only selected application" />
</component>
<component name="ChangeListManager">
<list default="true" id="d3ee5bd8-a194-4e5e-99e3-99dd32fc4efe" name="Default Changelist" comment="delete item code added">
<list default="true" id="d3ee5bd8-a194-4e5e-99e3-99dd32fc4efe" name="Default Changelist" comment="Edit bug fix and small UI changes">
<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/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.bin" afterDir="false" />
......@@ -18,11 +18,9 @@
<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/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/FoundItem.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/FoundItem.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ItemDetails.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ItemDetails.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPostsFoundRV.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPostsFoundRV.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/res/layout/activity_found_item.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_found_item.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_redirect_my_posts.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_redirect_my_posts.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_item_details.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_item_details.xml" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
......@@ -51,8 +49,8 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/FoundItem.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="137">
<caret line="155" column="59" selection-start-line="155" selection-start-column="59" selection-end-line="155" selection-end-column="59" />
<state relative-caret-position="284">
<caret line="207" column="55" selection-start-line="207" selection-start-column="55" selection-end-line="207" selection-end-column="55" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#6221#6784#0" expanded="true" />
......@@ -69,8 +67,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_found_item.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-644">
<caret line="17" selection-start-line="17" selection-end-line="17" />
<state relative-caret-position="62">
<caret line="9" column="28" selection-start-line="9" selection-start-column="20" selection-end-line="9" selection-end-column="28" />
</state>
</provider>
<provider editor-type-id="android-designer2" />
......@@ -79,47 +77,47 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_found_item.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="17" column="43" selection-start-line="17" selection-start-column="43" selection-end-line="17" selection-end-column="43" />
<state relative-caret-position="210">
<caret line="14" column="1" selection-start-line="14" selection-start-column="1" selection-end-line="19" selection-end-column="37" />
</state>
</provider>
<provider editor-type-id="android-designer2" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_redirect_my_posts.xml">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ItemDetails.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="390">
<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 relative-caret-position="60">
<caret line="15" column="50" selection-start-line="15" selection-start-column="50" selection-end-line="15" selection-end-column="50" />
</state>
</provider>
<provider editor-type-id="android-designer2" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_my_posts_found_rv.xml">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_item_details.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
<caret line="11" column="45" selection-start-line="11" selection-start-column="45" selection-end-line="11" selection-end-column="45" />
<state relative-caret-position="353">
<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>
</provider>
<provider editor-type-id="android-designer2" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPosts.java">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_navigation.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="233">
<caret line="85" column="58" selection-start-line="85" selection-start-column="58" selection-end-line="85" selection-end-column="58" />
<state relative-caret-position="315">
<caret line="21" column="47" lean-forward="true" selection-start-line="21" selection-start-column="47" selection-end-line="21" selection-end-column="47" />
</state>
</provider>
<provider editor-type-id="android-designer2" />
</entry>
</file>
<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/java/com/example/instilostandfound/Navigation.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
<caret line="18" column="13" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
<state relative-caret-position="248">
<caret line="62" column="38" selection-start-line="62" selection-start-column="38" selection-end-line="62" selection-end-column="38" />
<folding>
<element signature="imports" expanded="true" />
</folding>
......@@ -128,35 +126,31 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPostsAdaptor.java">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPosts.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="127">
<caret line="24" column="25" selection-start-line="24" selection-start-column="11" selection-end-line="24" selection-end-column="25" />
<folding>
<element signature="e#4043#4044#0" expanded="true" />
<element signature="e#4079#4080#0" expanded="true" />
</folding>
<state relative-caret-position="233">
<caret line="85" column="58" selection-start-line="85" selection-start-column="58" selection-end-line="85" selection-end-column="58" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPostsFoundRV.java">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ImageAdapter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="193">
<caret line="122" column="88" selection-start-line="122" selection-start-column="88" selection-end-line="122" selection-end-column="88" />
<state relative-caret-position="170">
<caret line="18" column="13" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/CreateFoundObject.java">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPostsFoundRV.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="69">
<caret line="29" column="8" selection-start-line="29" selection-start-column="8" selection-end-line="29" selection-end-column="8" />
<folding>
<element signature="imports" expanded="true" />
</folding>
<state relative-caret-position="236">
<caret line="86" column="67" selection-start-line="86" selection-start-column="67" selection-end-line="86" selection-end-column="67" />
</state>
</provider>
</entry>
......@@ -174,11 +168,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>test</find>
<find>toolb</find>
<find>android</find>
<find>androidx.constraintlayout.widget.ConstraintLayout</find>
<find>androidx.coordinatorlayout.widget.CoordinatorLayout</find>
<find>filePath</find>
<find>uploadSessionUri</find>
<find>imgView</find>
......@@ -202,8 +191,13 @@
<find>onDeleteClick</find>
<find>image</find>
<find>mcontext</find>
<find>MyPostsAdaptor</find>
<find>no-im</find>
<find>navigation</find>
<find>preferen</find>
<find>category</find>
<find>name_</find>
<find>nameta</find>
<find>MyPostsAdaptor</find>
</findStrings>
<replaceStrings>
<replace />
......@@ -252,10 +246,12 @@
<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/Navigation.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPostsFoundRV.java" />
<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/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/ItemDetails.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_item_details.xml" />
</list>
</option>
</component>
......@@ -589,7 +585,14 @@
<option name="project" value="LOCAL" />
<updated>1572945874013</updated>
</task>
<option name="localTasksCounter" value="13" />
<task id="LOCAL-00013" summary="Edit bug fix and small UI changes">
<created>1572973882487</created>
<option name="number" value="00013" />
<option name="presentableId" value="LOCAL-00013" />
<option name="project" value="LOCAL" />
<updated>1572973882487</updated>
</task>
<option name="localTasksCounter" value="14" />
<servers />
</component>
<component name="ToolWindowManager">
......@@ -608,7 +611,7 @@
<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="TODO" order="2" />
<window_info anchor="bottom" id="Debug" order="3" visible="true" weight="0.064124785" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.064124785" />
<window_info anchor="bottom" id="Terminal" order="4" />
<window_info anchor="bottom" id="Event Log" order="5" sideWeight="0.50121456" side_tool="true" weight="0.25996533" />
<window_info anchor="bottom" id="Version Control" order="6" weight="0.4031008" />
......@@ -623,7 +626,7 @@
<window_info anchor="right" id="Preview" order="4" sideWeight="0.44044322" weight="0.21862349" />
<window_info anchor="right" id="Palette&#9;" order="5" />
<window_info anchor="right" id="Assistant" order="6" sideWeight="0.49861497" weight="0.046153847" />
<window_info anchor="right" id="Device File Explorer" order="7" sideWeight="0.50138503" visible="true" weight="0.02834008" />
<window_info anchor="right" id="Device File Explorer" order="7" sideWeight="0.50138503" visible="true" weight="0.03319838" />
</layout>
<layout-to-restore>
<window_info id="Captures" order="0" side_tool="true" weight="0.25" />
......@@ -679,7 +682,8 @@
<MESSAGE value="Image adapter added with image_item.xml+ gradle changes temporary commit" />
<MESSAGE value="Filter added for FIREBASE db access + network and loading screen" />
<MESSAGE value="delete item code added" />
<option name="LAST_COMMIT_MESSAGE" value="delete item code added" />
<MESSAGE value="Edit bug fix and small UI changes" />
<option name="LAST_COMMIT_MESSAGE" value="Edit bug fix and small UI changes" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_lost_item.xml">
......@@ -765,14 +769,6 @@
</provider>
<provider selected="true" editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_item_details.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
<caret line="1" column="23" selection-start-line="1" selection-start-column="23" selection-end-line="1" selection-end-column="23" />
</state>
</provider>
<provider editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/abrakadabra.java" />
<entry file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml">
<provider selected="true" editor-type-id="text-editor">
......@@ -837,14 +833,6 @@
<provider selected="true" editor-type-id="text-editor" />
<provider editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_navigation.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="360">
<caret line="24" column="37" lean-forward="true" selection-start-line="24" selection-start-column="37" selection-end-line="24" selection-end-column="37" />
</state>
</provider>
<provider editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/image_item.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="304">
......@@ -863,13 +851,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ItemDetails.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-95">
<caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/NetworkConnection.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105">
......@@ -880,16 +861,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/Navigation.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="248">
<caret line="62" column="38" selection-start-line="62" selection-start-column="38" selection-end-line="62" selection-end-column="38" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPostsAdaptor.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="127">
......@@ -911,19 +882,29 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPostsFoundRV.java">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_my_posts_found_rv.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="193">
<caret line="122" column="88" selection-start-line="122" selection-start-column="88" selection-end-line="122" selection-end-column="88" />
<state relative-caret-position="165">
<caret line="11" column="45" selection-start-line="11" selection-start-column="45" selection-end-line="11" selection-end-column="45" />
</state>
</provider>
<provider editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPosts.java">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_redirect_my_posts.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="233">
<caret line="85" column="58" selection-start-line="85" selection-start-column="58" selection-end-line="85" selection-end-column="58" />
<state relative-caret-position="390">
<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>
</provider>
<provider editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_found_item.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="62">
<caret line="9" column="28" selection-start-line="9" selection-start-column="20" selection-end-line="9" selection-end-column="28" />
</state>
</provider>
<provider editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ImageAdapter.java">
<provider selected="true" editor-type-id="text-editor">
......@@ -935,42 +916,65 @@
</state>
</provider>
</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/MyPosts.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
<caret line="11" column="45" selection-start-line="11" selection-start-column="45" selection-end-line="11" selection-end-column="45" />
<state relative-caret-position="233">
<caret line="85" column="58" selection-start-line="85" selection-start-column="58" selection-end-line="85" selection-end-column="58" />
</state>
</provider>
<provider editor-type-id="android-designer2" />
</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_found_item.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-644">
<caret line="17" selection-start-line="17" selection-end-line="17" />
<state relative-caret-position="210">
<caret line="14" column="1" selection-start-line="14" selection-start-column="1" selection-end-line="19" selection-end-column="37" />
</state>
</provider>
<provider editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_found_item.xml">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_navigation.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="17" column="43" selection-start-line="17" selection-start-column="43" selection-end-line="17" selection-end-column="43" />
<state relative-caret-position="315">
<caret line="21" column="47" lean-forward="true" selection-start-line="21" selection-start-column="47" selection-end-line="21" selection-end-column="47" />
</state>
</provider>
<provider editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_redirect_my_posts.xml">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ItemDetails.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="390">
<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 relative-caret-position="60">
<caret line="15" column="50" selection-start-line="15" selection-start-column="50" selection-end-line="15" selection-end-column="50" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_item_details.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="353">
<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>
</provider>
<provider editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPostsFoundRV.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="236">
<caret line="86" column="67" selection-start-line="86" selection-start-column="67" selection-end-line="86" selection-end-column="67" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/Navigation.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="248">
<caret line="62" column="38" selection-start-line="62" selection-start-column="38" selection-end-line="62" selection-end-column="38" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/FoundItem.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="137">
<caret line="155" column="59" selection-start-line="155" selection-start-column="59" selection-end-line="155" selection-end-column="59" />
<state relative-caret-position="284">
<caret line="207" column="55" selection-start-line="207" selection-start-column="55" selection-end-line="207" selection-end-column="55" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#6221#6784#0" expanded="true" />
......
app/build.gradle
View file @ a4af1bef
......@@ -17,7 +17,7 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
debug{
debug {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
......@@ -38,9 +38,9 @@ dependencies {
implementation 'com.google.firebase:firebase-database:19.2.0'
implementation 'com.google.firebase:firebase-storage:19.1.0'
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
}
apply plugin: 'com.google.gms.google-services'
app/src/main/AndroidManifest.xml
View file @ a4af1bef
......@@ -18,8 +18,9 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".NewsFeedFound"></activity>
<activity android:name=".MyPostsFoundRV" />
<activity android:name=".RedirectMyPosts"/>
<activity android:name=".RedirectMyPosts" />
<activity android:name=".ItemDetails" />
<activity android:name=".MyPosts" />
<activity
......
app/src/main/java/com/example/instilostandfound/ItemDetails.java
View file @ a4af1bef
......@@ -8,9 +8,12 @@ import android.os.Bundle;
import android.util.Log;
import android.view.View;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.TextView;
public class ItemDetails extends AppCompatActivity implements View.OnClickListener {
import com.squareup.picasso.Picasso;
public class ItemDetails extends AppCompatActivity {
String category, name, key;
int type;
Bundle details_bundle;
......@@ -19,21 +22,26 @@ Bundle details_bundle;
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_item_details);
Intent intent = getIntent();
details_bundle = intent.getExtras();
CreateFoundObject objectfound = (CreateFoundObject)getIntent().getSerializableExtra("FoundObject");
Log.v("desc",objectfound.getmDescription());
((TextView)findViewById(R.id.category)).setText(details_bundle.getString("category"));
((TextView)findViewById(R.id.name)).setText(details_bundle.getString("name"));
((TextView) findViewById(R.id.place)).setText(details_bundle.getString("place"));
((TextView) findViewById(R.id.description)).setText(details_bundle.getString("description"));
((TextView) findViewById(R.id.date)).setText(details_bundle.getString("date"));
((TextView)findViewById(R.id.categorycontent)).setText(objectfound.getmCategory());
((TextView)findViewById(R.id.namecontent)).setText(objectfound.getmTitle());
((TextView) findViewById(R.id.placecontent)).setText(objectfound.getmLocation());
((TextView) findViewById(R.id.descriptioncontent)).setText(objectfound.getmDescription());
((TextView) findViewById(R.id.datecontent)).setText(objectfound.getDate());
ImageView camera = findViewById(R.id.imagecam);
Picasso.with(ItemDetails.this).load(objectfound.getImageUrl())
.fit()
.centerCrop()
.into(camera);
findViewById(R.id.edit_post).setOnClickListener(this);
findViewById(R.id.resolve_post).setOnClickListener(this);
// findViewById(R.id.edit_post).setOnClickListener(this);
// findViewById(R.id.resolve_post).setOnClickListener(this);
}
@Override
/* @Override
public void onClick(View v) {
switch (v.getId()){
case R.id.edit_post:
......@@ -51,5 +59,5 @@ Bundle details_bundle;
case R.id.resolve_post:
break;
}
}
}*/
}
app/src/main/java/com/example/instilostandfound/MyPostsFoundRV.java
View file @ a4af1bef
......@@ -81,7 +81,14 @@ public class MyPostsFoundRV extends AppCompatActivity implements MyPostsAdaptor.
}
@Override
public void onItemClick(int position) {
Toast.makeText(this, "Normal click at position: " + position, Toast.LENGTH_SHORT).show();
Log.v("position =",String.valueOf(position));
CreateFoundObject selectedItem = mPosts.get(position);
final String selectedKey = selectedItem.getKey();
Intent intent = new Intent(MyPostsFoundRV.this, ItemDetails.class);
intent.putExtra("FoundObject", selectedItem);
intent.putExtra("CallingClass","MyPosts");
intent.putExtra("username",username);
startActivity(intent);
}
@Override
......
app/src/main/java/com/example/instilostandfound/Navigation.java
View file @ a4af1bef
......@@ -10,12 +10,13 @@ import androidx.drawerlayout.widget.DrawerLayout;
import android.content.Intent;
import android.os.Bundle;
import android.view.MenuItem;
import android.view.View;
import android.widget.TextView;
import android.widget.Toast;
import com.google.android.material.navigation.NavigationView;
public class Navigation extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener {
public class Navigation extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener, View.OnClickListener {
private String username = null;
private DrawerLayout drawerLayout;
......@@ -26,6 +27,11 @@ public class Navigation extends AppCompatActivity implements NavigationView.OnNa
username = getIntent().getStringExtra("username");
findViewById(R.id.lost_button_newsfeed).setOnClickListener(this);
findViewById(R.id.found_button_newsfeed).setOnClickListener(this);
NavigationView navigationView = (NavigationView) findViewById(R.id.nav);
navigationView.setNavigationItemSelectedListener(this);
TextView ldapname = (TextView) navigationView.getHeaderView(0).findViewById(R.id.username);
......@@ -84,4 +90,28 @@ public class Navigation extends AppCompatActivity implements NavigationView.OnNa
drawerLayout.closeDrawer(GravityCompat.START);
return true;
}
@Override
public void onClick(View v) {
switch (v.getId()){
case R.id.lost_button_newsfeed:
Intent intent = new Intent(Navigation.this, MyPosts.class);
intent.putExtra("type", "lost");
intent.putExtra("username", username);
startActivity(intent);
break;
case R.id.found_button_newsfeed:
intent = new Intent(Navigation.this, NewsFeedFound.class);
intent.putExtra("username", username);
intent.putExtra("type", "found");
startActivity(intent);
break;
}
}
}
app/src/main/java/com/example/instilostandfound/NewsFeedFound.java 0 → 100644
View file @ a4af1bef
package com.example.instilostandfound;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
import android.widget.Toast;
import com.google.android.gms.tasks.OnSuccessListener;
import com.google.firebase.database.DataSnapshot;
import com.google.firebase.database.DatabaseError;
import com.google.firebase.database.DatabaseReference;
import com.google.firebase.database.FirebaseDatabase;
import com.google.firebase.database.Query;
import com.google.firebase.database.ValueEventListener;
import com.google.firebase.storage.FirebaseStorage;
import com.google.firebase.storage.StorageReference;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
public class NewsFeedFound extends AppCompatActivity implements NewsfeedAdaptor.OnItemClickListener, Serializable {
private RecyclerView mrecyclerView;
private NewsfeedAdaptor mAdaptor;
private DatabaseReference mDatabaseRef;
private FirebaseStorage mStorage;
private List<CreateFoundObject> mPosts;
private String username =null;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_news_feed_found);
username = getIntent().getStringExtra("username");
mrecyclerView = findViewById(R.id.my_posts_rv);
mrecyclerView.setHasFixedSize(true);
mrecyclerView.setLayoutManager(new LinearLayoutManager(this));
mPosts = new ArrayList<>();
mDatabaseRef = FirebaseDatabase.getInstance().getReference("FoundData");
mStorage = FirebaseStorage.getInstance();
//Query usernamequery = mDatabaseRef.orderByChild("ldap").equalTo((username+"@iitb.ac.in").toLowerCase());
//Log.v("query",usernamequery.toString());
mDatabaseRef.addValueEventListener(new ValueEventListener() {
@Override
public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
for(DataSnapshot postSnapShot : dataSnapshot.getChildren()){
CreateFoundObject post = postSnapShot.getValue(CreateFoundObject.class);
post.setKey(postSnapShot.getKey());
mPosts.add(post);
}
mAdaptor = new NewsfeedAdaptor(NewsFeedFound.this, mPosts);
mrecyclerView.setAdapter(mAdaptor);
mAdaptor.setOnItemClickListener(NewsFeedFound.this);
}
@Override
public void onCancelled(@NonNull DatabaseError databaseError) {
Toast.makeText(NewsFeedFound.this, databaseError.getMessage(), Toast.LENGTH_SHORT).show();
}
});
}
@Override
public void onItemClick(int position) {
Toast.makeText(this, "Normal click at position: " + position, Toast.LENGTH_SHORT).show();
}
}
app/src/main/java/com/example/instilostandfound/NewsfeedAdaptor.java 0 → 100644
View file @ a4af1bef
package com.example.instilostandfound;
import android.content.Context;
import android.view.ContextMenu;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import com.squareup.picasso.Picasso;
import java.util.List;
public class NewsfeedAdaptor extends RecyclerView.Adapter<NewsfeedAdaptor.myViewHolder> {
private Context mcontext;
private List<CreateFoundObject> mUploads;
private OnItemClickListener mListener;
public NewsfeedAdaptor(Context context, List<CreateFoundObject> uploads){
mcontext = context;
mUploads=uploads;
}
@NonNull
@Override
public NewsfeedAdaptor.myViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
View v = LayoutInflater.from(mcontext).inflate(R.layout.list_item, parent, false);
return new myViewHolder(v);
}
@Override
public void onBindViewHolder(@NonNull NewsfeedAdaptor.myViewHolder holder, int position) {
CreateFoundObject current_post = mUploads.get(position);
holder.textViewname.setText(current_post.getmTitle());
Picasso.with(mcontext).load(current_post.getImageUrl())
.fit()
.centerCrop()
.into(holder.imageView);
}
@Override
public int getItemCount() {
return mUploads.size();
}
public class myViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener{
public TextView textViewname;
public ImageView imageView;
public myViewHolder(@NonNull View itemView) {
super(itemView);
textViewname = itemView.findViewById(R.id.list_item_textview);
imageView = itemView.findViewById(R.id.list_item_imageview);
itemView.setOnClickListener(this);
}
@Override
public void onClick(View v) {
if (mListener != null) {
int position = getAdapterPosition();
if (position != RecyclerView.NO_POSITION) {
mListener.onItemClick(position);
}
}
}
}
public interface OnItemClickListener {
void onItemClick(int position);
}
public void setOnItemClickListener(OnItemClickListener listener) {
mListener = listener;
}
}
app/src/main/res/layout/activity_item_details.xml
View file @ a4af1bef
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<!--<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
......@@ -13,6 +13,20 @@
android:orientation="vertical"
tools:layout_editor_absoluteX="50dp"
tools:layout_editor_absoluteY="50dp">
<TableRow
android:layout_width="match_parent"
android:layout_height="match_parent"
>
<ImageView
android:id="@+id/imagecam"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@drawable/cameraup"
android:minWidth="80dp"
android:minHeight="100dp"></ImageView>
</TableRow>
<TableRow
android:layout_width="match_parent"
......@@ -134,4 +148,150 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
</androidx.constraintlayout.widget.ConstraintLayout> -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".ItemDetails">
<ImageView
android:id="@+id/imagecam"
android:layout_width="170dp"
android:layout_height="170dp"
android:layout_centerHorizontal="true"
android:layout_margin="20dp"
android:layout_alignParentTop="true"
android:background="@drawable/cameraup"
android:scaleType="centerCrop" />
<ProgressBar
android:id="@+id/progressbar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="90dp"
android:visibility="gone"/>
<TextView
android:id="@+id/category"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/imagecam"
android:layout_marginTop="8dp"
android:layout_marginLeft="8dp"
android:text="Category"
android:textSize="20dp"
android:textStyle="bold" />
<TextView
android:id="@+id/categorycontent"
android:layout_width="270dp"
android:layout_marginTop="8dp"
android:layout_height="wrap_content"
android:layout_toLeftOf="@+id/category"
android:layout_below="@id/imagecam"
android:layout_marginLeft="20dp"
android:layout_toEndOf="@+id/category"
android:fontFamily="sans-serif"
android:textSize="20dp"
android:textStyle="italic"/>
<TextView
android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/category"
android:layout_marginTop="25dp"
android:layout_marginLeft="8dp"
android:text="Title"
android:textSize="20dp"
android:textStyle="bold" />
<TextView
android:id="@+id/namecontent"
android:layout_width="230dp"
android:layout_height="wrap_content"
android:layout_below="@+id/categorycontent"
android:layout_marginLeft="20dp"
android:layout_marginTop="25dp"
android:layout_toEndOf="@+id/name"
android:textSize="20dp"
android:textStyle="italic"
/>
<TextView
android:id="@+id/description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/name"
android:layout_marginTop="25dp"
android:layout_marginLeft="8dp"
android:text="Description"
android:textSize="20dp"
android:textStyle="bold" />
<TextView
android:id="@+id/descriptioncontent"
android:layout_width="230dp"
android:layout_height="wrap_content"
android:layout_below="@+id/namecontent"
android:layout_marginLeft="20dp"
android:layout_marginTop="25dp"
android:layout_toEndOf="@+id/description"
android:textSize="20dp"
android:textStyle="italic"/>
<TextView
android:id="@+id/place"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/description"
android:layout_marginTop="25dp"
android:layout_marginLeft="8dp"
android:text="Place"
android:textSize="20dp"
android:textStyle="bold" />
<TextView
android:id="@+id/placecontent"
android:layout_width="230dp"
android:layout_height="wrap_content"
android:layout_below="@+id/descriptioncontent"
android:layout_marginLeft="20dp"
android:layout_marginTop="25dp"
android:textSize="20dp"
android:textStyle="italic"
android:layout_toEndOf="@+id/place" />
<TextView
android:id="@+id/date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/place"
android:layout_marginTop="25dp"
android:layout_marginLeft="8dp"
android:text="Date"
android:textSize="20dp"
android:textStyle="bold" />
<TextView
android:id="@+id/datecontent"
android:layout_width="230dp"
android:layout_height="wrap_content"
android:layout_below="@+id/placecontent"
android:layout_marginLeft="20dp"
android:layout_marginTop="25dp"
android:textSize="20dp"
android:textStyle="italic"
android:layout_toEndOf="@+id/date" />
</RelativeLayout>
\ No newline at end of file
app/src/main/res/layout/activity_navigation.xml
View file @ a4af1bef
......@@ -27,7 +27,35 @@
<FrameLayout
android:id="@+id/fragment_container"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:layout_height="match_parent"
android:background="@drawable/lostfound">
<Button
android:id="@+id/lost_button_newsfeed"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="150dp"
android:layout_marginTop="400dp"
android:background="@color/colorPrimary"
android:textColor="@color/cardview_light_background"
android:text="Lost"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
<Button
android:id="@+id/found_button_newsfeed"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="150dp"
android:layout_marginTop="450dp"
android:background="@color/colorPrimary"
android:text="Found"
android:textColor="@color/cardview_light_background"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
</FrameLayout>
</LinearLayout>
......
app/src/main/res/layout/activity_news_feed_found.xml 0 → 100644
View file @ a4af1bef
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".NewsFeedFound">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/my_posts_rv"
android:layout_width="match_parent"
android:layout_height="match_parent">
</androidx.recyclerview.widget.RecyclerView>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
local.properties
View file @ a4af1bef
......@@ -6,3 +6,6 @@
# header note.
#Wed Nov 06 11:55:27 IST 2019
sdk.dir=/home/abc/Android/Sdk
=======
#Wed Nov 06 14:00:23 IST 2019
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