Commit 4cb4265b authored by ankitasingh's avatar ankitasingh

Edit bug fix and small UI changes

parent a3575408
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<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=""> <list default="true" id="d3ee5bd8-a194-4e5e-99e3-99dd32fc4efe" name="Default Changelist" comment="delete item code added">
<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/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" />
...@@ -18,10 +18,11 @@ ...@@ -18,10 +18,11 @@
<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/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/CreateFoundObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/CreateFoundObject.java" 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/MyPostsAdaptor.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPostsAdaptor.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/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/res/layout/image_item.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/image_item.xml" 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" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
...@@ -47,78 +48,78 @@ ...@@ -47,78 +48,78 @@
</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="false"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/FoundItem.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/FoundItem.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="67"> <state relative-caret-position="137">
<caret line="84" column="45" selection-start-line="84" selection-start-column="45" selection-end-line="84" selection-end-column="45" /> <caret line="155" column="59" selection-start-line="155" selection-start-column="59" selection-end-line="155" selection-end-column="59" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#6221#6784#0" expanded="true" />
<element signature="e#6783#6784#0" expanded="true" />
<element signature="e#7277#10031#0" expanded="true" />
<element signature="e#8003#9559#0" expanded="true" />
<element signature="e#9558#9559#0" expanded="true" />
<element signature="e#10030#10031#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPosts.java"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_found_item.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="233"> <state relative-caret-position="-644">
<caret line="85" column="58" selection-start-line="85" selection-start-column="58" selection-end-line="85" selection-end-column="58" /> <caret line="17" selection-start-line="17" selection-end-line="17" />
</state> </state>
</provider> </provider>
<provider editor-type-id="android-designer2" />
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/NetworkConnection.java"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_found_item.xml">
<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="255">
<caret line="44" column="45" lean-forward="true" selection-start-line="44" selection-start-column="45" selection-end-line="44" selection-end-column="45" /> <caret line="17" column="43" selection-start-line="17" selection-start-column="43" selection-end-line="17" selection-end-column="43" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
<provider editor-type-id="android-designer2" />
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPostsAdaptor.java"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_redirect_my_posts.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="569"> <state relative-caret-position="390">
<caret line="113" column="25" selection-start-line="113" selection-start-column="25" selection-end-line="113" selection-end-column="25" /> <caret line="33" column="52" lean-forward="true" selection-start-line="33" selection-start-column="52" selection-end-line="33" selection-end-column="52" />
<folding>
<element signature="e#4043#4044#0" expanded="true" />
<element signature="e#4079#4080#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
<provider editor-type-id="android-designer2" />
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/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"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="249"> <state relative-caret-position="165">
<caret line="91" column="65" selection-start-line="91" selection-start-column="65" selection-end-line="91" selection-end-column="65" /> <caret line="11" column="45" selection-start-line="11" selection-start-column="45" selection-end-line="11" selection-end-column="45" />
</state> </state>
</provider> </provider>
<provider editor-type-id="android-designer2" />
</entry> </entry>
</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/MainActivity.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPosts.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1306"> <state relative-caret-position="233">
<caret line="27" column="56" lean-forward="true" selection-start-line="27" selection-start-column="56" selection-end-line="27" selection-end-column="56" /> <caret line="85" column="58" selection-start-line="85" selection-start-column="58" selection-end-line="85" selection-end-column="58" />
<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/CreateFoundObject.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="120"> <state relative-caret-position="170">
<caret line="9" column="45" selection-start-line="9" selection-start-column="45" selection-end-line="9" selection-end-column="45" /> <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>
...@@ -127,29 +128,32 @@ ...@@ -127,29 +128,32 @@
</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/activity_found_item.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPostsAdaptor.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255"> <state relative-caret-position="127">
<caret line="17" column="42" lean-forward="true" selection-start-line="17" selection-start-column="42" selection-end-line="17" selection-end-column="42" /> <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> </state>
</provider> </provider>
<provider editor-type-id="android-designer2" />
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ItemDetails.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPostsFoundRV.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-95"> <state relative-caret-position="193">
<caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" /> <caret line="122" column="88" selection-start-line="122" selection-start-column="88" selection-end-line="122" selection-end-column="88" />
</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/Navigation.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="252"> <state relative-caret-position="69">
<caret line="74" column="16" selection-start-line="74" selection-start-column="16" selection-end-line="74" selection-end-column="53" /> <caret line="29" column="8" selection-start-line="29" selection-start-column="8" selection-end-line="29" selection-end-column="8" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
...@@ -170,10 +174,6 @@ ...@@ -170,10 +174,6 @@
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>fileUploader</find>
<find>google</find>
<find>CAMERA_REQUEST</find>
<find>com.example.instilostandfound.test</find>
<find>test</find> <find>test</find>
<find>toolb</find> <find>toolb</find>
<find>android</find> <find>android</find>
...@@ -200,6 +200,10 @@ ...@@ -200,6 +200,10 @@
<find>bundle</find> <find>bundle</find>
<find>ItemDetails</find> <find>ItemDetails</find>
<find>onDeleteClick</find> <find>onDeleteClick</find>
<find>image</find>
<find>mcontext</find>
<find>MyPostsAdaptor</find>
<find>no-im</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace /> <replace />
...@@ -233,8 +237,6 @@ ...@@ -233,8 +237,6 @@
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/test.java" /> <option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/test.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/abrakadabra.java" /> <option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/abrakadabra.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_abrakadabra.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_abrakadabra.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_found_item.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/Navigation.java" />
<option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" /> <option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
<option value="$PROJECT_DIR$/app/app.iml" /> <option value="$PROJECT_DIR$/app/app.iml" />
<option value="$PROJECT_DIR$/app/src/main/res/values/strings.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/values/strings.xml" />
...@@ -244,13 +246,16 @@ ...@@ -244,13 +246,16 @@
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_my_posts_found_rv.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_my_posts_found_rv.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/NetworkConnection.java" /> <option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/NetworkConnection.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/content_found_item.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/layout/content_found_item.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/MainActivity.java" /> <option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MainActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/list_item.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/layout/list_item.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/image_item.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/layout/image_item.xml" />
<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/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/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" />
</list> </list>
</option> </option>
</component> </component>
...@@ -577,7 +582,14 @@ ...@@ -577,7 +582,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1572926737476</updated> <updated>1572926737476</updated>
</task> </task>
<option name="localTasksCounter" value="12" /> <task id="LOCAL-00012" summary="delete item code added">
<created>1572945874013</created>
<option name="number" value="00012" />
<option name="presentableId" value="LOCAL-00012" />
<option name="project" value="LOCAL" />
<updated>1572945874013</updated>
</task>
<option name="localTasksCounter" value="13" />
<servers /> <servers />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
...@@ -596,7 +608,7 @@ ...@@ -596,7 +608,7 @@
<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.32928944" />
<window_info anchor="bottom" id="TODO" order="2" /> <window_info anchor="bottom" id="TODO" order="2" />
<window_info anchor="bottom" id="Debug" order="3" visible="true" weight="0.081455804" /> <window_info anchor="bottom" id="Debug" order="3" visible="true" weight="0.064124785" />
<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.4031008" />
...@@ -611,7 +623,7 @@ ...@@ -611,7 +623,7 @@
<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.046153847" />
<window_info anchor="right" id="Device File Explorer" order="7" sideWeight="0.50138503" visible="true" weight="0.029149797" /> <window_info anchor="right" id="Device File Explorer" order="7" sideWeight="0.50138503" visible="true" weight="0.02834008" />
</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" />
...@@ -666,7 +678,8 @@ ...@@ -666,7 +678,8 @@
<MESSAGE value="Image adapter added with image_item.xml+ gradle changes" /> <MESSAGE value="Image adapter added with image_item.xml+ gradle changes" />
<MESSAGE value="Image adapter added with image_item.xml+ gradle changes temporary commit" /> <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="Filter added for FIREBASE db access + network and loading screen" />
<option name="LAST_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" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_lost_item.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_lost_item.xml">
...@@ -776,16 +789,6 @@ ...@@ -776,16 +789,6 @@
</provider> </provider>
<provider editor-type-id="android-designer2" /> <provider editor-type-id="android-designer2" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ImageAdapter.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="17" selection-start-line="17" selection-end-line="17" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</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/LostItem.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285"> <state relative-caret-position="285">
...@@ -834,14 +837,6 @@ ...@@ -834,14 +837,6 @@
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
<provider editor-type-id="android-designer2" /> <provider editor-type-id="android-designer2" />
</entry> </entry>
<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="165">
<caret line="11" column="45" lean-forward="true" 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/res/layout/activity_navigation.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_navigation.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="360"> <state relative-caret-position="360">
...@@ -850,117 +845,141 @@ ...@@ -850,117 +845,141 @@
</provider> </provider>
<provider editor-type-id="android-designer2" /> <provider editor-type-id="android-designer2" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_redirect_my_posts.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/image_item.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120"> <state relative-caret-position="304">
<caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" /> <caret line="25" column="42" selection-start-line="25" selection-start-column="42" selection-end-line="25" selection-end-column="42" />
</state> </state>
</provider> </provider>
<provider editor-type-id="android-designer2" /> <provider editor-type-id="android-designer2" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_found_item.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MainActivity.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255"> <state relative-caret-position="-1306">
<caret line="17" selection-start-line="17" selection-end-line="17" /> <caret line="27" column="56" lean-forward="true" selection-start-line="27" selection-start-column="56" selection-end-line="27" selection-end-column="56" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
<provider editor-type-id="android-designer2" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_found_item.xml"> <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="255"> <state relative-caret-position="-95">
<caret line="17" column="42" lean-forward="true" selection-start-line="17" selection-start-column="42" selection-end-line="17" selection-end-column="42" /> <caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" />
</state> </state>
</provider> </provider>
<provider editor-type-id="android-designer2" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/image_item.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/NetworkConnection.java">
<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="105">
<caret line="25" column="42" selection-start-line="25" selection-start-column="42" selection-end-line="25" selection-end-column="42" /> <caret line="44" column="45" lean-forward="true" selection-start-line="44" selection-start-column="45" selection-end-line="44" selection-end-column="45" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
<provider editor-type-id="android-designer2" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/Navigation.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/Navigation.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="252"> <state relative-caret-position="248">
<caret line="74" column="16" selection-start-line="74" selection-start-column="16" selection-end-line="74" selection-end-column="53" /> <caret line="62" column="38" selection-start-line="62" selection-start-column="38" selection-end-line="62" selection-end-column="38" />
<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/MainActivity.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPostsAdaptor.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1306"> <state relative-caret-position="127">
<caret line="27" column="56" lean-forward="true" selection-start-line="27" selection-start-column="56" selection-end-line="27" selection-end-column="56" /> <caret line="24" column="25" selection-start-line="24" selection-start-column="11" selection-end-line="24" selection-end-column="25" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="e#4043#4044#0" expanded="true" />
<element signature="e#4079#4080#0" expanded="true" />
</folding> </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="120"> <state relative-caret-position="69">
<caret line="9" column="45" selection-start-line="9" selection-start-column="45" selection-end-line="9" selection-end-column="45" /> <caret line="29" column="8" selection-start-line="29" selection-start-column="8" selection-end-line="29" selection-end-column="8" />
<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/ItemDetails.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPostsFoundRV.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-95"> <state relative-caret-position="193">
<caret line="23" lean-forward="true" selection-start-line="23" selection-end-line="23" /> <caret line="122" column="88" selection-start-line="122" selection-start-column="88" selection-end-line="122" selection-end-column="88" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPostsFoundRV.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPosts.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="249"> <state relative-caret-position="233">
<caret line="91" column="65" selection-start-line="91" selection-start-column="65" selection-end-line="91" selection-end-column="65" /> <caret line="85" column="58" selection-start-line="85" selection-start-column="58" selection-end-line="85" selection-end-column="58" />
</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/ImageAdapter.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="67"> <state relative-caret-position="170">
<caret line="84" column="45" selection-start-line="84" selection-start-column="45" selection-end-line="84" selection-end-column="45" /> <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/java/com/example/instilostandfound/MyPostsAdaptor.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"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="569"> <state relative-caret-position="165">
<caret line="113" column="25" selection-start-line="113" selection-start-column="25" selection-end-line="113" selection-end-column="25" /> <caret line="11" column="45" selection-start-line="11" selection-start-column="45" selection-end-line="11" selection-end-column="45" />
<folding>
<element signature="e#4043#4044#0" expanded="true" />
<element signature="e#4079#4080#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
<provider editor-type-id="android-designer2" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/NetworkConnection.java"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_found_item.xml">
<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="-644">
<caret line="44" column="45" lean-forward="true" selection-start-line="44" selection-start-column="45" selection-end-line="44" selection-end-column="45" /> <caret line="17" selection-start-line="17" selection-end-line="17" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
<provider editor-type-id="android-designer2" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPosts.java"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_found_item.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="233"> <state relative-caret-position="255">
<caret line="85" column="58" selection-start-line="85" selection-start-column="58" selection-end-line="85" selection-end-column="58" /> <caret line="17" column="43" selection-start-line="17" selection-start-column="43" selection-end-line="17" selection-end-column="43" />
</state>
</provider>
<provider editor-type-id="android-designer2" />
</entry>
<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="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/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" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#6221#6784#0" expanded="true" />
<element signature="e#6783#6784#0" expanded="true" />
<element signature="e#7277#10031#0" expanded="true" />
<element signature="e#8003#9559#0" expanded="true" />
<element signature="e#9558#9559#0" expanded="true" />
<element signature="e#10030#10031#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
......
...@@ -28,6 +28,7 @@ import android.os.Bundle; ...@@ -28,6 +28,7 @@ import android.os.Bundle;
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.auth.FirebaseAuth; import com.google.firebase.auth.FirebaseAuth;
import com.squareup.picasso.Picasso;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi; import androidx.annotation.RequiresApi;
...@@ -51,6 +52,7 @@ import java.io.ByteArrayOutputStream; ...@@ -51,6 +52,7 @@ import java.io.ByteArrayOutputStream;
import java.io.File; import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.Serializable;
import java.net.URI; import java.net.URI;
import java.net.URL; import java.net.URL;
import java.util.Date; import java.util.Date;
...@@ -58,7 +60,7 @@ import java.util.Random; ...@@ -58,7 +60,7 @@ import java.util.Random;
//import static android.app.Activity.RESULT_OK; //import static android.app.Activity.RESULT_OK;
//import com.squareup.picasso.Picasso; //import com.squareup.picasso.Picasso;
public class FoundItem extends AppCompatActivity implements View.OnClickListener{ public class FoundItem extends AppCompatActivity implements View.OnClickListener, Serializable {
//private FirebaseAuth mAuth; //private FirebaseAuth mAuth;
EditText title; EditText title;
EditText place; EditText place;
...@@ -75,14 +77,18 @@ public class FoundItem extends AppCompatActivity implements View.OnClickListener ...@@ -75,14 +77,18 @@ public class FoundItem extends AppCompatActivity implements View.OnClickListener
public Uri mImageUri; public Uri mImageUri;
public Uri uploadSessionUri; public Uri uploadSessionUri;
int PICK_IMAGE_REQUEST = 111; int PICK_IMAGE_REQUEST = 111;
public String callingclass;
ProgressDialog pd; ProgressDialog pd;
private StorageTask mUploadTask; private StorageTask mUploadTask;
private boolean updatedata;
public String tempUri;
// ... // ...
FirebaseDatabase database = FirebaseDatabase.getInstance(); FirebaseDatabase database = FirebaseDatabase.getInstance();
DatabaseReference myRef = FirebaseDatabase.getInstance().getReference("FoundData"); DatabaseReference myRef = FirebaseDatabase.getInstance().getReference("FoundData");
StorageReference mStorage = FirebaseStorage.getInstance().getReference("Images"); StorageReference mStorage = FirebaseStorage.getInstance().getReference("Images");
FirebaseStorage mStorageRef = FirebaseStorage.getInstance();
@Override @Override
...@@ -92,6 +98,7 @@ public class FoundItem extends AppCompatActivity implements View.OnClickListener ...@@ -92,6 +98,7 @@ public class FoundItem extends AppCompatActivity implements View.OnClickListener
Toolbar toolbar = findViewById(R.id.toolbar); Toolbar toolbar = findViewById(R.id.toolbar);
setSupportActionBar(toolbar); setSupportActionBar(toolbar);
username = getIntent().getStringExtra("username"); username = getIntent().getStringExtra("username");
callingclass = getIntent().getStringExtra("CallingClass");
title = findViewById(R.id.title); title = findViewById(R.id.title);
place = findViewById(R.id.place); place = findViewById(R.id.place);
desc = findViewById(R.id.desc); desc = findViewById(R.id.desc);
...@@ -102,6 +109,19 @@ public class FoundItem extends AppCompatActivity implements View.OnClickListener ...@@ -102,6 +109,19 @@ public class FoundItem extends AppCompatActivity implements View.OnClickListener
pd = new ProgressDialog(this); pd = new ProgressDialog(this);
pd.setMessage("Uploading...."); pd.setMessage("Uploading....");
if(callingclass.equals("MyPosts"))
{
CreateFoundObject objectfound = (CreateFoundObject)getIntent().getSerializableExtra("FoundObject");
Log.v("desc",objectfound.getmDescription());
title.setText(objectfound.getmTitle());
place.setText(objectfound.getmLocation());
desc.setText(objectfound.getmDescription());
date.setText(objectfound.getDate());
Picasso.with(FoundItem.this).load(objectfound.getImageUrl())
.fit()
.centerCrop()
.into(camera);
}
findViewById(R.id.submit).setOnClickListener(this); findViewById(R.id.submit).setOnClickListener(this);
...@@ -116,6 +136,7 @@ public class FoundItem extends AppCompatActivity implements View.OnClickListener ...@@ -116,6 +136,7 @@ public class FoundItem extends AppCompatActivity implements View.OnClickListener
final String Desc = desc.getText().toString().trim(); final String Desc = desc.getText().toString().trim();
final String Date = date.getText().toString().trim(); final String Date = date.getText().toString().trim();
updatedata = false;
if (title.getText().toString().trim().isEmpty()) { if (title.getText().toString().trim().isEmpty()) {
title.setError("Please enter title"); title.setError("Please enter title");
title.requestFocus(); title.requestFocus();
...@@ -127,7 +148,40 @@ public class FoundItem extends AppCompatActivity implements View.OnClickListener ...@@ -127,7 +148,40 @@ public class FoundItem extends AppCompatActivity implements View.OnClickListener
place.requestFocus(); place.requestFocus();
return; return;
} }
if (mImageUri != null) {
if(callingclass.equals("MyPosts"))
{
final CreateFoundObject objectfound = (CreateFoundObject)getIntent().getSerializableExtra("FoundObject");
if(objectfound.getImageUrl().equals("NO-IMAGE"))
{
myRef.child(objectfound.getKey()).removeValue();
Toast.makeText(FoundItem.this, "Item Updated", Toast.LENGTH_SHORT).show();
Intent intent = new Intent(FoundItem.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(FoundItem.this, "Item Updated", Toast.LENGTH_SHORT).show();
Intent intent = new Intent(FoundItem.this, MyPostsFoundRV.class);
intent.putExtra("username", username);
startActivity(intent);
finish();
}
});
}
}
if (mImageUri != null ) {
pd.show(); pd.show();
final StorageReference fileReference = mStorage.child(System.currentTimeMillis() final StorageReference fileReference = mStorage.child(System.currentTimeMillis()
+ "." + getExtension(mImageUri)); + "." + getExtension(mImageUri));
...@@ -150,10 +204,17 @@ public class FoundItem extends AppCompatActivity implements View.OnClickListener ...@@ -150,10 +204,17 @@ public class FoundItem extends AppCompatActivity implements View.OnClickListener
@Override @Override
public void onSuccess(Uri uri) { public void onSuccess(Uri uri) {
uploadSessionUri = uri; uploadSessionUri = uri;
CreateFoundObject upload;
Date datef = new Date(); Date datef = new Date();
CreateFoundObject upload = new CreateFoundObject(username,Title ,uri.toString(),"location", Desc, if(updatedata)
"category", datef,"found"); {
upload = new CreateFoundObject(username,Title ,tempUri,"location", Desc,
"category", datef,"found");
}
else {
upload = new CreateFoundObject(username, Title, uri.toString(), "location", Desc,
"category", datef, "found");
}
String uploadId = myRef.push().getKey(); String uploadId = myRef.push().getKey();
Log.v("UploadID", uploadId); Log.v("UploadID", uploadId);
myRef.child(uploadId).setValue(upload); myRef.child(uploadId).setValue(upload);
...@@ -185,6 +246,7 @@ public class FoundItem extends AppCompatActivity implements View.OnClickListener ...@@ -185,6 +246,7 @@ public class FoundItem extends AppCompatActivity implements View.OnClickListener
}); });
} else { } else {
Date datef = new Date(); Date datef = new Date();
Toast.makeText(FoundItem.this, "No file selected", Toast.LENGTH_SHORT).show(); Toast.makeText(FoundItem.this, "No file selected", Toast.LENGTH_SHORT).show();
CreateFoundObject upload = new CreateFoundObject(username,Title ,"NO-IMAGE","location", Desc, CreateFoundObject upload = new CreateFoundObject(username,Title ,"NO-IMAGE","location", Desc,
...@@ -197,7 +259,10 @@ public class FoundItem extends AppCompatActivity implements View.OnClickListener ...@@ -197,7 +259,10 @@ public class FoundItem extends AppCompatActivity implements View.OnClickListener
desc.setText(""); desc.setText("");
date.setText(""); date.setText("");
Toast.makeText(FoundItem.this,"SUBMIT SUCCESSFUL -NO IMAGE UPLOADED!",Toast.LENGTH_LONG).show(); Toast.makeText(FoundItem.this,"SUBMIT SUCCESSFUL -NO IMAGE UPLOADED!",Toast.LENGTH_LONG).show();
Intent intent = new Intent(FoundItem.this, MyPostsFoundRV.class);
intent.putExtra("username", username);
startActivity(intent);
finish();
} }
...@@ -251,10 +316,14 @@ public class FoundItem extends AppCompatActivity implements View.OnClickListener ...@@ -251,10 +316,14 @@ public class FoundItem extends AppCompatActivity implements View.OnClickListener
try { try {
//getting image from gallery //getting image from gallery
Bitmap bitmap = MediaStore.Images.Media.getBitmap(getContentResolver(), mImageUri); //Bitmap bitmap = MediaStore.Images.Media.getBitmap(getContentResolver(), mImageUri);
//Setting image to ImageView //Setting image to ImageView
camera.setImageBitmap(bitmap); //camera.setImageBitmap(bitmap);
Picasso.with(FoundItem.this).load(mImageUri)
.fit()
.centerCrop()
.into(camera);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
......
...@@ -27,7 +27,7 @@ import java.io.Serializable; ...@@ -27,7 +27,7 @@ import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
public class MyPostsFoundRV extends AppCompatActivity implements MyPostsAdaptor.OnItemClickListener { public class MyPostsFoundRV extends AppCompatActivity implements MyPostsAdaptor.OnItemClickListener,Serializable {
private RecyclerView mrecyclerView; private RecyclerView mrecyclerView;
private MyPostsAdaptor mAdaptor; private MyPostsAdaptor mAdaptor;
...@@ -91,8 +91,9 @@ public class MyPostsFoundRV extends AppCompatActivity implements MyPostsAdaptor. ...@@ -91,8 +91,9 @@ public class MyPostsFoundRV extends AppCompatActivity implements MyPostsAdaptor.
final String selectedKey = selectedItem.getKey(); final String selectedKey = selectedItem.getKey();
Intent intent = new Intent(MyPostsFoundRV.this, FoundItem.class); Intent intent = new Intent(MyPostsFoundRV.this, FoundItem.class);
intent.putExtra("FoundObject", selectedItem); intent.putExtra("FoundObject", selectedItem);
intent.putExtra("CallingClass","MyPosts");
intent.putExtra("username",username);
startActivity(intent); startActivity(intent);
Toast.makeText(this, "Whatever click at position: " + position, Toast.LENGTH_SHORT).show();
} }
@Override @Override
......
...@@ -59,6 +59,7 @@ public class Navigation extends AppCompatActivity implements NavigationView.OnNa ...@@ -59,6 +59,7 @@ public class Navigation extends AppCompatActivity implements NavigationView.OnNa
case R.id.post_found: case R.id.post_found:
Intent intent = new Intent(Navigation.this, FoundItem.class); Intent intent = new Intent(Navigation.this, FoundItem.class);
intent.putExtra("username", username); intent.putExtra("username", username);
intent.putExtra("CallingClass","Navigation");
startActivity(intent); startActivity(intent);
break; break;
case R.id.post_lost: case R.id.post_lost:
......
...@@ -15,11 +15,9 @@ ...@@ -15,11 +15,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:id="@+id/camera" android:id="@+id/camera"
android:src="@drawable/camera" android:src="@drawable/cameraup"
android:minWidth="80dp" android:minWidth="80dp"
android:minHeight="80dp" android:minHeight="100dp"
android:layout_marginTop = "30dp"
android:layout_marginLeft="30dp"
/> />
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
android:id="@+id/found_button" android:id="@+id/found_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="140dp" android:layout_marginHorizontal="150dp"
android:layout_marginBottom="24dp" android:layout_marginBottom="24dp"
android:text="Found" android:text="Found"
android:background="@color/colorPrimary" android:background="@color/colorPrimary"
......
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