Skip to content

I
InstiLostAndFound
You need to sign in or sign up before continuing.
Commit f384ab89 authored by ankitasingh's avatar ankitasingh
Browse files
Options

Filter added for FIREBASE db access + network and loading screen

parent fb07495c
Show whitespace changes
Inline Side-by-side
Showing with 313 additions and 136 deletions
.idea/gradle.xml
View file @ f384ab89
...@@ -3,9 +3,6 @@ ...@@ -3,9 +3,6 @@
<component name="GradleSettings"> <component name="GradleSettings">
<option name="linkedExternalProjectsSettings"> <option name="linkedExternalProjectsSettings">
<GradleProjectSettings> <GradleProjectSettings>
<compositeConfiguration>
<compositeBuild compositeDefinitionSource="SCRIPT" />
</compositeConfiguration>
<option name="distributionType" value="DEFAULT_WRAPPED" /> <option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="modules"> <option name="modules">
......
.idea/libraries/Gradle__com_google_android_gms_play_services_basement_17_0_0_aar.xml
View file @ f384ab89
<component name="libraryTable"> <component name="libraryTable">
<library name="Gradle: com.google.android.gms:play-services-basement:17.0.0@aar"> <library name="Gradle: com.google.android.gms:play-services-basement:17.0.0@aar">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c6427a8ac8f5d4f4b4a137757b98ec96/jetified-play-services-basement-17.0.0/jars/classes.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/17b5cdcb3e31a36e8bde86f3754af349/jetified-play-services-basement-17.0.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c6427a8ac8f5d4f4b4a137757b98ec96/jetified-play-services-basement-17.0.0/res" /> <root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/17b5cdcb3e31a36e8bde86f3754af349/jetified-play-services-basement-17.0.0/res" />
</CLASSES> </CLASSES>
<JAVADOC> <JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.android.gms/play-services-basement/17.0.0/4faccf8c10bad282388a4067b8ef53d8476bbbc8/play-services-basement-17.0.0-javadoc.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.android.gms/play-services-basement/17.0.0/4faccf8c10bad282388a4067b8ef53d8476bbbc8/play-services-basement-17.0.0-javadoc.jar!/" />
......
.idea/workspace.xml
View file @ f384ab89
...@@ -9,7 +9,31 @@ ...@@ -9,7 +9,31 @@
<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="">
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/NetworkConnection.java" 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/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/resourceHashesCache.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/resourceHashesCache.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/classAnalysis.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/classAnalysis.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/javaCompile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/javaCompile.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/taskHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/taskHistory.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_17_0_0_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_android_gms_play_services_basement_17_0_0_aar.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/app.iml" beforeDir="false" afterPath="$PROJECT_DIR$/app/app.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" 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/MainActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MainActivity.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/content_found_item.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/content_found_item.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/list_item.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/list_item.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/local.properties" beforeDir="false" afterPath="$PROJECT_DIR$/local.properties" afterDir="false" />
</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" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
...@@ -19,6 +43,7 @@ ...@@ -19,6 +43,7 @@
<component name="DefaultGradleProjectSettings"> <component name="DefaultGradleProjectSettings">
<option name="isMigrated" value="true" /> <option name="isMigrated" value="true" />
</component> </component>
<component name="ExecutionTargetManager" SELECTED_TARGET="7bfee843" />
<component name="ExternalProjectsData"> <component name="ExternalProjectsData">
<projectState path="$PROJECT_DIR$"> <projectState path="$PROJECT_DIR$">
<ProjectState /> <ProjectState />
...@@ -36,8 +61,8 @@ ...@@ -36,8 +61,8 @@
<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/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="420"> <state relative-caret-position="60">
<caret line="83" column="87" selection-start-line="83" selection-start-column="4" selection-end-line="83" selection-end-column="87" /> <caret line="69" column="80" selection-start-line="69" selection-start-column="80" selection-end-line="69" selection-end-column="80" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
...@@ -45,20 +70,20 @@ ...@@ -45,20 +70,20 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPosts.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="1140"> <state relative-caret-position="379">
<caret line="94" column="55" selection-start-line="94" selection-start-column="55" selection-end-line="94" selection-end-column="55" /> <caret line="55" column="51" lean-forward="true" selection-start-line="55" selection-start-column="51" selection-end-line="55" selection-end-column="51" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ImageAdapter.java"> <entry file="file://$PROJECT_DIR$/app/src/main/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="75"> <state relative-caret-position="343">
<caret line="17" selection-start-line="17" selection-end-line="17" /> <caret line="26" column="8" selection-start-line="26" selection-start-column="8" selection-end-line="26" selection-end-column="58" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
...@@ -67,50 +92,47 @@ ...@@ -67,50 +92,47 @@
</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/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="435"> <state relative-caret-position="164">
<caret line="29" column="37" selection-start-line="29" selection-start-column="37" selection-end-line="29" selection-end-column="37" /> <caret line="44" column="44" selection-start-line="44" selection-start-column="44" selection-end-line="44" selection-end-column="44" />
<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$/build.gradle"> <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="15"> <state relative-caret-position="60">
<caret line="1" selection-start-line="1" selection-end-line="1" /> <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ItemDetails.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="60"> <state relative-caret-position="120">
<caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" /> <caret line="8" column="4" selection-start-line="8" selection-start-column="4" selection-end-line="8" selection-end-column="4" />
</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/CreateFoundObject.java"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_my_posts.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor" />
<state relative-caret-position="540"> <provider editor-type-id="android-designer2" />
<caret line="40" column="21" selection-start-line="40" selection-start-column="21" selection-end-line="40" selection-end-column="21" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</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/MainActivity.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="480"> <state relative-caret-position="75">
<caret line="45" column="5" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" /> <caret line="92" column="75" selection-start-line="92" selection-start-column="62" selection-end-line="92" selection-end-column="75" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
...@@ -118,22 +140,24 @@ ...@@ -118,22 +140,24 @@
</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/build.gradle"> <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="240"> <state relative-caret-position="210">
<caret line="16" column="103" lean-forward="true" selection-start-line="16" selection-start-column="103" selection-end-line="16" selection-end-column="103" /> <caret line="14" column="46" selection-start-line="14" selection-start-column="46" selection-end-line="14" selection-end-column="46" />
</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/LostItem.java"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/list_item.xml">
<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="90">
<caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" /> <caret line="6" column="34" lean-forward="true" selection-start-line="6" selection-start-column="34" selection-end-line="6" selection-end-column="34" />
</state> </state>
</provider> </provider>
<provider editor-type-id="android-designer2" />
</entry> </entry>
</file> </file>
</leaf> </leaf>
...@@ -142,16 +166,13 @@ ...@@ -142,16 +166,13 @@
<option name="RECENT_TEMPLATES"> <option name="RECENT_TEMPLATES">
<list> <list>
<option value="resourceFile" /> <option value="resourceFile" />
<option value="Class" />
<option value="layoutResourceFile_vertical" /> <option value="layoutResourceFile_vertical" />
<option value="Class" />
</list> </list>
</option> </option>
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>sdk</find>
<find>fab</find>
<find>floatingactionbutton</find>
<find>com.google.android.material.floatingactionbutton</find> <find>com.google.android.material.floatingactionbutton</find>
<find>com.google.android.material.floatingactionbutton.FloatingActionButt</find> <find>com.google.android.material.floatingactionbutton.FloatingActionButt</find>
<find>FEATURE_SUPPORT_ACTION_BAR</find> <find>FEATURE_SUPPORT_ACTION_BAR</find>
...@@ -179,6 +200,9 @@ ...@@ -179,6 +200,9 @@
<find>PICK_IMAGE_REQUEST</find> <find>PICK_IMAGE_REQUEST</find>
<find>abra</find> <find>abra</find>
<find>show</find> <find>show</find>
<find>.idea</find>
<find>goog</find>
<find>myposts</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace /> <replace />
...@@ -199,7 +223,6 @@ ...@@ -199,7 +223,6 @@
<option value="$PROJECT_DIR$/app/src/main/res/layout/content_lost_item.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/layout/content_lost_item.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_lost_item.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_lost_item.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MainActivity.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/nav_headerlayout.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/layout/nav_headerlayout.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/menu/menu_navigation.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/menu/menu_navigation.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/values/styles.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/values/styles.xml" />
...@@ -212,18 +235,23 @@ ...@@ -212,18 +235,23 @@
<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/content_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_found_item.xml" />
<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/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" />
<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/FoundItem.java" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPosts.java" /> <option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPosts.java" />
<option value="$PROJECT_DIR$/app/build.gradle" />
<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/ImageAdapter.java" /> <option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ImageAdapter.java" />
<option value="$PROJECT_DIR$/app/build.gradle" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_my_posts_found_rv.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/NetworkConnection.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/content_found_item.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/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/MyPostsFoundRV.java" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/list_item.xml" />
</list> </list>
</option> </option>
</component> </component>
...@@ -254,7 +282,17 @@ ...@@ -254,7 +282,17 @@
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="ProjectPane" /> <pane id="ProjectPane">
<subPane>
<expand>
<path>
<item name="InstiLostAndFound" type="b2602c69:ProjectViewProjectNode" />
<item name="InstiLostAndFound" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope"> <pane id="Scope">
<subPane subId="Scope 'Project Source Files'; set:Project Source Files; class com.jetbrains.cidr.lang.search.scopes.ProjectSourcesScopeProvider$SourceFilesScope"> <subPane subId="Scope 'Project Source Files'; set:Project Source Files; class com.jetbrains.cidr.lang.search.scopes.ProjectSourcesScopeProvider$SourceFilesScope">
<expand> <expand>
...@@ -323,6 +361,12 @@ ...@@ -323,6 +361,12 @@
<item name="app" type="feadf853:AndroidModuleNode" /> <item name="app" type="feadf853:AndroidModuleNode" />
<item name="java" type="edd41e36:AndroidSourceTypeNode" /> <item name="java" type="edd41e36:AndroidSourceTypeNode" />
</path> </path>
<path>
<item name="InstiLostAndFound" type="1abcf292:AndroidViewProjectNode" />
<item name="app" type="feadf853:AndroidModuleNode" />
<item name="java" type="edd41e36:AndroidSourceTypeNode" />
<item name="instilostandfound" type="cbb59c9e:AndroidPsiDirectoryNode" />
</path>
<path> <path>
<item name="InstiLostAndFound" type="1abcf292:AndroidViewProjectNode" /> <item name="InstiLostAndFound" type="1abcf292:AndroidViewProjectNode" />
<item name="app" type="feadf853:AndroidModuleNode" /> <item name="app" type="feadf853:AndroidModuleNode" />
...@@ -520,10 +564,9 @@ ...@@ -520,10 +564,9 @@
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="65" y="24" width="1281" height="704" extended-state="0" /> <frame x="65" y="24" width="1281" height="704" extended-state="0" />
<editor active="true" />
<layout> <layout>
<window_info id="Captures" order="0" side_tool="true" weight="0.25" /> <window_info id="Captures" order="0" side_tool="true" weight="0.25" />
<window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.25182188" /> <window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.29797572" />
<window_info id="Structure" order="2" side_tool="true" /> <window_info id="Structure" order="2" side_tool="true" />
<window_info id="Favorites" order="3" side_tool="true" /> <window_info id="Favorites" order="3" side_tool="true" />
<window_info id="Build Variants" order="4" side_tool="true" /> <window_info id="Build Variants" order="4" side_tool="true" />
...@@ -534,14 +577,14 @@ ...@@ -534,14 +577,14 @@
<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" weight="0.3830156" /> <window_info anchor="bottom" id="Debug" order="3" visible="true" weight="0.05199307" />
<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" />
<window_info anchor="bottom" id="Build" order="7" sideWeight="0.49878544" visible="true" weight="0.25996533" /> <window_info anchor="bottom" id="Build" order="7" sideWeight="0.49878544" weight="0.25996533" />
<window_info anchor="bottom" id="Find" order="8" weight="0.4852713" /> <window_info anchor="bottom" id="Find" order="8" weight="0.4852713" />
<window_info active="true" anchor="bottom" id="Messages" order="9" visible="true" weight="0.19584055" /> <window_info active="true" anchor="bottom" id="Messages" order="9" visible="true" weight="0.19584055" />
<window_info anchor="bottom" id="Android Profiler" order="10" show_stripe_button="false" /> <window_info anchor="bottom" id="Android Profiler" order="10" />
<window_info anchor="right" id="Capture Analysis" order="0" /> <window_info anchor="right" id="Capture Analysis" order="0" />
<window_info anchor="right" id="Gradle" order="1" /> <window_info anchor="right" id="Gradle" order="1" />
<window_info anchor="right" id="Theme Preview" order="2" /> <window_info anchor="right" id="Theme Preview" order="2" />
...@@ -662,16 +705,6 @@ ...@@ -662,16 +705,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MainActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1200">
<caret line="95" column="54" selection-start-line="95" selection-start-column="54" selection-end-line="95" selection-end-column="54" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_main.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/content_main.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330"> <state relative-caret-position="330">
...@@ -714,14 +747,6 @@ ...@@ -714,14 +747,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/AndroidManifest.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="22" column="8" selection-start-line="22" selection-start-column="8" selection-end-line="22" selection-end-column="8" />
</state>
</provider>
<provider editor-type-id="android-manifest" />
</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">
...@@ -730,90 +755,159 @@ ...@@ -730,90 +755,159 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_found_item.xml"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_lost_item.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210"> <state relative-caret-position="330">
<caret line="14" column="46" selection-start-line="14" selection-start-column="46" selection-end-line="14" selection-end-column="46" /> <caret line="22" column="50" selection-start-line="22" selection-start-column="4" selection-end-line="22" selection-end-column="50" />
</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/RedirectMyPosts.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450"> <state relative-caret-position="60">
<caret line="30" column="12" selection-start-line="30" selection-start-column="12" selection-end-line="30" selection-end-column="12" /> <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
</state> </state>
</provider> </provider>
<provider editor-type-id="android-designer2" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_lost_item.xml"> <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="330"> <state relative-caret-position="75">
<caret line="22" column="50" selection-start-line="22" selection-start-column="4" selection-end-line="22" selection-end-column="50" /> <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/res/layout/image_item.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="435">
<caret line="29" column="37" selection-start-line="29" selection-start-column="37" selection-end-line="29" 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/java/com/example/instilostandfound/RedirectMyPosts.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ItemDetails.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60"> <state relative-caret-position="60">
<caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" /> <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
</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/CreateFoundObject.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420"> <state relative-caret-position="540">
<caret line="83" column="87" selection-start-line="83" selection-start-column="4" selection-end-line="83" selection-end-column="87" /> <caret line="40" column="21" selection-start-line="40" selection-start-column="21" selection-end-line="40" selection-end-column="21" />
<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/LostItem.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285">
<caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
<caret line="1" selection-start-line="1" selection-end-line="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="268">
<caret line="22" column="9" selection-start-line="22" selection-start-column="9" selection-end-line="22" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPosts.java"> <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPosts.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1140"> <state relative-caret-position="1056">
<caret line="94" column="55" selection-start-line="94" selection-start-column="55" selection-end-line="94" selection-end-column="55" /> <caret line="94" column="55" selection-start-line="94" selection-start-column="55" selection-end-line="94" selection-end-column="55" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ImageAdapter.java"> <entry file="file://$PROJECT_DIR$/app/src/main/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="75"> <state relative-caret-position="255">
<caret line="17" selection-start-line="17" selection-end-line="17" /> <caret line="17" selection-start-line="17" selection-end-line="17" />
</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="60">
<caret line="69" column="80" selection-start-line="69" selection-start-column="80" selection-end-line="69" selection-end-column="80" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/image_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="435"> <state relative-caret-position="60">
<caret line="29" column="37" selection-start-line="29" selection-start-column="37" selection-end-line="29" selection-end-column="37" /> <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="173">
<caret line="20" column="33" selection-start-line="20" selection-start-column="33" selection-end-line="20" selection-end-column="33" />
</state>
</provider>
<provider editor-type-id="android-manifest" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MainActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="92" column="75" selection-start-line="92" selection-start-column="62" selection-end-line="92" selection-end-column="75" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</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="120">
<caret line="8" column="4" selection-start-line="8" selection-start-column="4" selection-end-line="8" selection-end-column="4" />
</state> </state>
</provider> </provider>
<provider editor-type-id="android-designer2" /> <provider editor-type-id="android-designer2" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/build.gradle"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_my_posts.xml">
<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_found_item.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15"> <state relative-caret-position="210">
<caret line="1" selection-start-line="1" selection-end-line="1" /> <caret line="14" column="46" selection-start-line="14" selection-start-column="46" selection-end-line="14" selection-end-column="46" />
</state> </state>
</provider> </provider>
<provider editor-type-id="android-designer2" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/ItemDetails.java"> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/list_item.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60"> <state relative-caret-position="90">
<caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" /> <caret line="6" column="34" lean-forward="true" selection-start-line="6" selection-start-column="34" selection-end-line="6" selection-end-column="34" />
</state> </state>
</provider> </provider>
<provider editor-type-id="android-designer2" />
</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/NetworkConnection.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="540"> <state relative-caret-position="164">
<caret line="40" column="21" selection-start-line="40" selection-start-column="21" selection-end-line="40" selection-end-column="21" /> <caret line="44" column="44" selection-start-line="44" selection-start-column="44" selection-end-line="44" selection-end-column="44" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
...@@ -822,25 +916,18 @@ ...@@ -822,25 +916,18 @@
</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="480"> <state relative-caret-position="343">
<caret line="45" column="5" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" /> <caret line="26" column="8" selection-start-line="26" selection-start-column="8" selection-end-line="26" selection-end-column="58" />
<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/LostItem.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="285">
<caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/build.gradle">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240"> <state relative-caret-position="379">
<caret line="16" column="103" lean-forward="true" selection-start-line="16" selection-start-column="103" selection-end-line="16" selection-end-column="103" /> <caret line="55" column="51" lean-forward="true" selection-start-line="55" selection-start-column="51" selection-end-line="55" selection-end-column="51" />
</state> </state>
</provider> </provider>
</entry> </entry>
......
app/app.iml
View file @ f384ab89
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<option name="ALLOW_USER_CONFIGURATION" value="false" /> <option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" /> <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" /> <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/google-services/debug;file://$MODULE_DIR$/build/generated/res/resValues/debug" /> <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/google-services/debug" />
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" /> <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" /> <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
</configuration> </configuration>
......
app/build.gradle
View file @ f384ab89
...@@ -16,6 +16,11 @@ android { ...@@ -16,6 +16,11 @@ android {
minifyEnabled false minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
} }
debug{
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
} }
} }
......
app/src/main/java/com/example/instilostandfound/FoundItem.java
View file @ f384ab89
...@@ -67,7 +67,7 @@ public class FoundItem extends AppCompatActivity implements View.OnClickListener ...@@ -67,7 +67,7 @@ public class FoundItem extends AppCompatActivity implements View.OnClickListener
Spinner category; Spinner category;
String username; String username;
ImageView camera; ImageView camera;
String[] items = new String[]{"Others","Electronic", "2", "three"}; String[] items = new String[]{"Others","Electronics", "Documents", "Clothes"};
private static final int CAMERA_REQUEST = 1888; private static final int CAMERA_REQUEST = 1888;
private ImageView imageView; private ImageView imageView;
private static final int MY_CAMERA_PERMISSION_CODE = 100; private static final int MY_CAMERA_PERMISSION_CODE = 100;
......
app/src/main/java/com/example/instilostandfound/MainActivity.java
View file @ f384ab89
package com.example.instilostandfound; package com.example.instilostandfound;
import android.app.ProgressDialog;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
...@@ -21,6 +22,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe ...@@ -21,6 +22,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
EditText ldap_id; EditText ldap_id;
EditText ldap_password; EditText ldap_password;
public static final String ID = "com.example.instilostandfound.id"; public static final String ID = "com.example.instilostandfound.id";
ProgressDialog pd;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
...@@ -36,6 +38,8 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe ...@@ -36,6 +38,8 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
ldap_password = findViewById(R.id.LDAP_PASSWORD); ldap_password = findViewById(R.id.LDAP_PASSWORD);
setSupportActionBar(toolbar); setSupportActionBar(toolbar);
findViewById(R.id.login_btn).setOnClickListener(this); findViewById(R.id.login_btn).setOnClickListener(this);
pd = new ProgressDialog(this);
pd.setMessage("Signing in...");
/*FloatingActionButton fab = findViewById(R.id.fab); /*FloatingActionButton fab = findViewById(R.id.fab);
fab.setOnClickListener(new View.OnClickListener() { fab.setOnClickListener(new View.OnClickListener() {
...@@ -47,6 +51,20 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe ...@@ -47,6 +51,20 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
});*/ });*/
} }
@Override
public void onStart() {
super.onStart();
NetworkConnection networkConnection = new NetworkConnection();
if (networkConnection.isConnectedToInternet(MainActivity.this)
|| networkConnection.isConnectedToMobileNetwork(MainActivity.this)
|| networkConnection.isConnectedToWifi(MainActivity.this)) {
} else {
networkConnection.showNoInternetAvailableErrorDialog(MainActivity.this);
return;
}
}
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
// Inflate the menu; this adds items to the action bar if it is present. // Inflate the menu; this adds items to the action bar if it is present.
...@@ -86,19 +104,23 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe ...@@ -86,19 +104,23 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
ldap_password.requestFocus(); ldap_password.requestFocus();
return; return;
} }
pd.show();
mAuth.signInWithEmailAndPassword(id,password).addOnCompleteListener(new OnCompleteListener<AuthResult>() { mAuth.signInWithEmailAndPassword(id,password).addOnCompleteListener(new OnCompleteListener<AuthResult>() {
@Override @Override
public void onComplete(Task<AuthResult> task) { public void onComplete(Task<AuthResult> task) {
if(task.isSuccessful()) if(task.isSuccessful())
{ {
pd.dismiss();
Toast.makeText(MainActivity.this,"LOGIN SUCCESSFUL",Toast.LENGTH_LONG).show(); Toast.makeText(MainActivity.this,"LOGIN SUCCESSFUL",Toast.LENGTH_LONG).show();
Intent intent = new Intent(MainActivity.this, Navigation.class); Intent intent = new Intent(MainActivity.this, Navigation.class);
intent.putExtra("username", ldap); intent.putExtra("username", ldap);
startActivity(intent); startActivity(intent);
} }
else else
{ {
pd.dismiss();
ldap_password.setText(""); ldap_password.setText("");
Toast.makeText(MainActivity.this,"INVALID CREDENTIALS",Toast.LENGTH_LONG).show(); Toast.makeText(MainActivity.this,"INVALID CREDENTIALS",Toast.LENGTH_LONG).show();
} }
......
app/src/main/java/com/example/instilostandfound/MyPostsFoundRV.java
View file @ f384ab89
...@@ -6,12 +6,15 @@ import androidx.recyclerview.widget.LinearLayoutManager; ...@@ -6,12 +6,15 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log;
import android.widget.Toast; import android.widget.Toast;
import com.google.firebase.database.ChildEventListener;
import com.google.firebase.database.DataSnapshot; import com.google.firebase.database.DataSnapshot;
import com.google.firebase.database.DatabaseError; import com.google.firebase.database.DatabaseError;
import com.google.firebase.database.DatabaseReference; import com.google.firebase.database.DatabaseReference;
import com.google.firebase.database.FirebaseDatabase; import com.google.firebase.database.FirebaseDatabase;
import com.google.firebase.database.Query;
import com.google.firebase.database.ValueEventListener; import com.google.firebase.database.ValueEventListener;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -23,12 +26,14 @@ public class MyPostsFoundRV extends AppCompatActivity { ...@@ -23,12 +26,14 @@ public class MyPostsFoundRV extends AppCompatActivity {
private DatabaseReference mDatabaseRef; private DatabaseReference mDatabaseRef;
private List<CreateFoundObject> mPosts; private List<CreateFoundObject> mPosts;
private String username =null;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_my_posts_found_rv); setContentView(R.layout.activity_my_posts_found_rv);
username = getIntent().getStringExtra("username");
mrecyclerView = findViewById(R.id.my_posts_rv); mrecyclerView = findViewById(R.id.my_posts_rv);
mrecyclerView.setHasFixedSize(true); mrecyclerView.setHasFixedSize(true);
mrecyclerView.setLayoutManager(new LinearLayoutManager(this)); mrecyclerView.setLayoutManager(new LinearLayoutManager(this));
...@@ -36,7 +41,10 @@ public class MyPostsFoundRV extends AppCompatActivity { ...@@ -36,7 +41,10 @@ public class MyPostsFoundRV extends AppCompatActivity {
mPosts = new ArrayList<>(); mPosts = new ArrayList<>();
mDatabaseRef = FirebaseDatabase.getInstance().getReference("FoundData"); mDatabaseRef = FirebaseDatabase.getInstance().getReference("FoundData");
mDatabaseRef.addValueEventListener(new ValueEventListener() { Query usernamequery = mDatabaseRef.orderByChild("ldap").equalTo((username+"@iitb.ac.in").toLowerCase());
Log.v("query",usernamequery.toString());
usernamequery.addValueEventListener(new ValueEventListener() {
@Override @Override
public void onDataChange(@NonNull DataSnapshot dataSnapshot) { public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
for(DataSnapshot postSnapShot : dataSnapshot.getChildren()){ for(DataSnapshot postSnapShot : dataSnapshot.getChildren()){
......
app/src/main/java/com/example/instilostandfound/NetworkConnection.java 0 → 100644
View file @ f384ab89
package com.example.instilostandfound;
import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.provider.Settings;
public class NetworkConnection {
public static final String ERR_DIALOG_TITLE = "No internet connection detected !";
private static final String ERR_DIALOG_MSG = "Please check your device's network settings.";
private static final String ERR_DIALOG_POSITIVE_BTN = "Settings";
private static final String ERR_DIALOG_NEGATIVE_BTN = "Dismiss";
public static boolean isConnectedToInternet(Context context) {
ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
NetworkInfo networkInfo = connectivityManager.getActiveNetworkInfo();
return networkInfo != null && networkInfo.isConnectedOrConnecting();
}
public static boolean isConnectedToWifi(Context context) {
ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
NetworkInfo networkInfo = connectivityManager.getActiveNetworkInfo();
return networkInfo != null &&
networkInfo.isConnectedOrConnecting() &&
networkInfo.getType() == ConnectivityManager.TYPE_WIFI;
}
public static boolean isConnectedToMobileNetwork(Context context) {
ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
NetworkInfo networkInfo = connectivityManager.getActiveNetworkInfo();
return networkInfo != null &&
networkInfo.isConnectedOrConnecting() &&
networkInfo.getType() == ConnectivityManager.TYPE_MOBILE;
}
public static void showNoInternetAvailableErrorDialog(final Context context) {
new AlertDialog.Builder(context)
.setTitle(ERR_DIALOG_TITLE)
.setMessage(ERR_DIALOG_MSG)
.setIcon(R.drawable.internet)
.setPositiveButton(ERR_DIALOG_POSITIVE_BTN, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
dialogInterface.dismiss();
Intent intent = new Intent(Settings.ACTION_WIFI_SETTINGS);
context.startActivity(intent);
}
})
.setNegativeButton(ERR_DIALOG_NEGATIVE_BTN, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
dialogInterface.dismiss();
if (isConnectedToInternet(context)
|| isConnectedToMobileNetwork(context)
|| isConnectedToWifi(context)) {
} else {
showNoInternetAvailableErrorDialog(context);
return;
}
}
})
.show();
}
}
app/src/main/res/layout/content_found_item.xml
View file @ f384ab89
...@@ -16,18 +16,6 @@ ...@@ -16,18 +16,6 @@
> >
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/camera"
android:src="@drawable/camera"
android:minWidth="80dp"
android:minHeight="80dp"
android:layout_marginTop = "30dp"
android:layout_marginLeft="30dp"
/>
<Spinner <Spinner
android:id="@+id/category" android:id="@+id/category"
android:layout_width="match_parent" android:layout_width="match_parent"
......
app/src/main/res/layout/list_item.xml
View file @ f384ab89
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
android:id="@+id/list_item_cardview" android:id="@+id/list_item_cardview"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="300dp">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
......
local.properties
View file @ f384ab89
...@@ -4,5 +4,5 @@ ...@@ -4,5 +4,5 @@
# Location of the SDK. This is only used by Gradle. # Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the # For customization when using a Version Control System, please read the
# header note. # header note.
#Mon Nov 04 22:52:49 IST 2019 #Tue Nov 05 08:12:27 IST 2019
sdk.dir=/home/navya/Android/Sdk sdk.dir=/home/chikki/Android/Sdk
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment