Commit a0366559 authored by ankitasingh's avatar ankitasingh

Item details screen change

parent 4cb4265b
...@@ -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="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.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,11 +18,9 @@ ...@@ -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/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/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/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_item_details.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_item_details.xml" 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" />
...@@ -51,8 +49,8 @@ ...@@ -51,8 +49,8 @@
<file pinned="false" current-in-tab="true"> <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="137"> <state relative-caret-position="284">
<caret line="155" column="59" selection-start-line="155" selection-start-column="59" selection-end-line="155" selection-end-column="59" /> <caret line="207" column="55" selection-start-line="207" selection-start-column="55" selection-end-line="207" selection-end-column="55" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#6221#6784#0" expanded="true" /> <element signature="e#6221#6784#0" expanded="true" />
...@@ -69,8 +67,8 @@ ...@@ -69,8 +67,8 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_found_item.xml"> <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="-644"> <state relative-caret-position="62">
<caret line="17" selection-start-line="17" selection-end-line="17" /> <caret line="9" column="28" selection-start-line="9" selection-start-column="20" selection-end-line="9" selection-end-column="28" />
</state> </state>
</provider> </provider>
<provider editor-type-id="android-designer2" /> <provider editor-type-id="android-designer2" />
...@@ -79,47 +77,47 @@ ...@@ -79,47 +77,47 @@
<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/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="255"> <state relative-caret-position="210">
<caret line="17" column="43" selection-start-line="17" selection-start-column="43" selection-end-line="17" selection-end-column="43" /> <caret line="14" column="1" selection-start-line="14" selection-start-column="1" selection-end-line="19" selection-end-column="37" />
</state> </state>
</provider> </provider>
<provider editor-type-id="android-designer2" /> <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/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"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="390"> <state relative-caret-position="60">
<caret line="33" column="52" lean-forward="true" selection-start-line="33" selection-start-column="52" selection-end-line="33" selection-end-column="52" /> <caret line="15" column="50" selection-start-line="15" selection-start-column="50" selection-end-line="15" selection-end-column="50" />
</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/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"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165"> <state relative-caret-position="353">
<caret line="11" column="45" selection-start-line="11" selection-start-column="45" selection-end-line="11" selection-end-column="45" /> <caret line="181" column="44" lean-forward="true" selection-start-line="181" selection-start-column="44" selection-end-line="181" selection-end-column="44" />
</state> </state>
</provider> </provider>
<provider editor-type-id="android-designer2" /> <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/MyPosts.java"> <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="233"> <state relative-caret-position="315">
<caret line="85" column="58" selection-start-line="85" selection-start-column="58" selection-end-line="85" selection-end-column="58" /> <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> </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/ImageAdapter.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="170"> <state relative-caret-position="248">
<caret line="18" column="13" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" /> <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>
...@@ -128,35 +126,31 @@ ...@@ -128,35 +126,31 @@
</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/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="127"> <state relative-caret-position="233">
<caret line="24" column="25" selection-start-line="24" selection-start-column="11" selection-end-line="24" selection-end-column="25" /> <caret line="85" column="58" selection-start-line="85" selection-start-column="58" selection-end-line="85" selection-end-column="58" />
<folding>
<element signature="e#4043#4044#0" expanded="true" />
<element signature="e#4079#4080#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPostsFoundRV.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="193"> <state relative-caret-position="170">
<caret line="122" column="88" selection-start-line="122" selection-start-column="88" selection-end-line="122" selection-end-column="88" /> <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> </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/MyPostsFoundRV.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="69"> <state relative-caret-position="236">
<caret line="29" column="8" selection-start-line="29" selection-start-column="8" selection-end-line="29" selection-end-column="8" /> <caret line="86" column="67" selection-start-line="86" selection-start-column="67" selection-end-line="86" selection-end-column="67" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -174,11 +168,6 @@ ...@@ -174,11 +168,6 @@
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <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>filePath</find>
<find>uploadSessionUri</find> <find>uploadSessionUri</find>
<find>imgView</find> <find>imgView</find>
...@@ -202,8 +191,13 @@ ...@@ -202,8 +191,13 @@
<find>onDeleteClick</find> <find>onDeleteClick</find>
<find>image</find> <find>image</find>
<find>mcontext</find> <find>mcontext</find>
<find>MyPostsAdaptor</find>
<find>no-im</find> <find>no-im</find>
<find>navigation</find>
<find>preferen</find>
<find>category</find>
<find>name_</find>
<find>nameta</find>
<find>MyPostsAdaptor</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace /> <replace />
...@@ -252,10 +246,12 @@ ...@@ -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/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/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_found_item.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_redirect_my_posts.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_redirect_my_posts.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/FoundItem.java" /> <option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/FoundItem.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPostsFoundRV.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ItemDetails.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_item_details.xml" />
</list> </list>
</option> </option>
</component> </component>
...@@ -589,7 +585,14 @@ ...@@ -589,7 +585,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1572945874013</updated> <updated>1572945874013</updated>
</task> </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 /> <servers />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
...@@ -608,7 +611,7 @@ ...@@ -608,7 +611,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.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="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" />
...@@ -623,7 +626,7 @@ ...@@ -623,7 +626,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.02834008" /> <window_info anchor="right" id="Device File Explorer" order="7" sideWeight="0.50138503" visible="true" weight="0.03319838" />
</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" />
...@@ -679,7 +682,8 @@ ...@@ -679,7 +682,8 @@
<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" />
<MESSAGE value="delete item code added" /> <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>
<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">
...@@ -765,14 +769,6 @@ ...@@ -765,14 +769,6 @@
</provider> </provider>
<provider selected="true" editor-type-id="android-designer2" /> <provider selected="true" editor-type-id="android-designer2" />
</entry> </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/java/com/example/instilostandfound/abrakadabra.java" />
<entry file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
...@@ -837,14 +833,6 @@ ...@@ -837,14 +833,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_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"> <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="304"> <state relative-caret-position="304">
...@@ -863,13 +851,6 @@ ...@@ -863,13 +851,6 @@
</state> </state>
</provider> </provider>
</entry> </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"> <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="105"> <state relative-caret-position="105">
...@@ -880,16 +861,6 @@ ...@@ -880,16 +861,6 @@
</state> </state>
</provider> </provider>
</entry> </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"> <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="127"> <state relative-caret-position="127">
...@@ -911,19 +882,29 @@ ...@@ -911,19 +882,29 @@
</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/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="193"> <state relative-caret-position="165">
<caret line="122" column="88" selection-start-line="122" selection-start-column="88" selection-end-line="122" selection-end-column="88" /> <caret line="11" column="45" selection-start-line="11" selection-start-column="45" selection-end-line="11" selection-end-column="45" />
</state> </state>
</provider> </provider>
<provider editor-type-id="android-designer2" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/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"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="233"> <state relative-caret-position="390">
<caret line="85" column="58" selection-start-line="85" selection-start-column="58" selection-end-line="85" selection-end-column="58" /> <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> </state>
</provider> </provider>
<provider editor-type-id="android-designer2" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ImageAdapter.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ImageAdapter.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
...@@ -935,42 +916,65 @@ ...@@ -935,42 +916,65 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_my_posts_found_rv.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPosts.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165"> <state relative-caret-position="233">
<caret line="11" column="45" selection-start-line="11" selection-start-column="45" selection-end-line="11" selection-end-column="45" /> <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>
<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/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="-644"> <state relative-caret-position="210">
<caret line="17" selection-start-line="17" selection-end-line="17" /> <caret line="14" column="1" selection-start-line="14" selection-start-column="1" selection-end-line="19" selection-end-column="37" />
</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/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"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255"> <state relative-caret-position="315">
<caret line="17" column="43" selection-start-line="17" selection-start-column="43" selection-end-line="17" selection-end-column="43" /> <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> </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/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"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="390"> <state relative-caret-position="60">
<caret line="33" column="52" lean-forward="true" selection-start-line="33" selection-start-column="52" selection-end-line="33" selection-end-column="52" /> <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> </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/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"> <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="137"> <state relative-caret-position="284">
<caret line="155" column="59" selection-start-line="155" selection-start-column="59" selection-end-line="155" selection-end-column="59" /> <caret line="207" column="55" selection-start-line="207" selection-start-column="55" selection-end-line="207" selection-end-column="55" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#6221#6784#0" expanded="true" /> <element signature="e#6221#6784#0" expanded="true" />
......
...@@ -8,9 +8,12 @@ import android.os.Bundle; ...@@ -8,9 +8,12 @@ import android.os.Bundle;
import android.util.Log; import android.util.Log;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;
import android.widget.ImageView;
import android.widget.TextView; 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; String category, name, key;
int type; int type;
Bundle details_bundle; Bundle details_bundle;
...@@ -19,21 +22,26 @@ Bundle details_bundle; ...@@ -19,21 +22,26 @@ Bundle details_bundle;
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_item_details); setContentView(R.layout.activity_item_details);
Intent intent = getIntent(); CreateFoundObject objectfound = (CreateFoundObject)getIntent().getSerializableExtra("FoundObject");
details_bundle = intent.getExtras(); Log.v("desc",objectfound.getmDescription());
((TextView)findViewById(R.id.category)).setText(details_bundle.getString("category")); ((TextView)findViewById(R.id.categorycontent)).setText(objectfound.getmCategory());
((TextView)findViewById(R.id.name)).setText(details_bundle.getString("name")); ((TextView)findViewById(R.id.namecontent)).setText(objectfound.getmTitle());
((TextView) findViewById(R.id.place)).setText(details_bundle.getString("place")); ((TextView) findViewById(R.id.placecontent)).setText(objectfound.getmLocation());
((TextView) findViewById(R.id.description)).setText(details_bundle.getString("description")); ((TextView) findViewById(R.id.descriptioncontent)).setText(objectfound.getmDescription());
((TextView) findViewById(R.id.date)).setText(details_bundle.getString("date")); ((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.edit_post).setOnClickListener(this);
findViewById(R.id.resolve_post).setOnClickListener(this); // findViewById(R.id.resolve_post).setOnClickListener(this);
} }
@Override /* @Override
public void onClick(View v) { public void onClick(View v) {
switch (v.getId()){ switch (v.getId()){
case R.id.edit_post: case R.id.edit_post:
...@@ -51,5 +59,5 @@ Bundle details_bundle; ...@@ -51,5 +59,5 @@ Bundle details_bundle;
case R.id.resolve_post: case R.id.resolve_post:
break; break;
} }
} }*/
} }
...@@ -81,7 +81,14 @@ public class MyPostsFoundRV extends AppCompatActivity implements MyPostsAdaptor. ...@@ -81,7 +81,14 @@ public class MyPostsFoundRV extends AppCompatActivity implements MyPostsAdaptor.
} }
@Override @Override
public void onItemClick(int position) { 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 @Override
......
<?xml version="1.0" encoding="utf-8"?> <?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:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -13,6 +13,20 @@ ...@@ -13,6 +13,20 @@
android:orientation="vertical" android:orientation="vertical"
tools:layout_editor_absoluteX="50dp" tools:layout_editor_absoluteX="50dp"
tools:layout_editor_absoluteY="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 <TableRow
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -134,4 +148,150 @@ ...@@ -134,4 +148,150 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" /> app:layout_constraintEnd_toEndOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout> -->
\ No newline at end of file <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
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