Skip to content

I
InstiLostAndFound
Commit f384ab89 authored by ankitasingh's avatar ankitasingh
Browse files
Options

Filter added for FIREBASE db access + network and loading screen

parent fb07495c
Expand all Show whitespace changes
Inline Side-by-side
Showing with 313 additions and 136 deletions
.idea/gradle.xml
View file @ f384ab89
......@@ -3,9 +3,6 @@
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<compositeConfiguration>
<compositeBuild compositeDefinitionSource="SCRIPT" />
</compositeConfiguration>
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="modules">
......
.idea/libraries/Gradle__com_google_android_gms_play_services_basement_17_0_0_aar.xml
View file @ f384ab89
<component name="libraryTable">
<library name="Gradle: com.google.android.gms:play-services-basement:17.0.0@aar">
<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="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/c6427a8ac8f5d4f4b4a137757b98ec96/jetified-play-services-basement-17.0.0/res" />
<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/17b5cdcb3e31a36e8bde86f3754af349/jetified-play-services-basement-17.0.0/res" />
</CLASSES>
<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!/" />
......
.idea/workspace.xml
View file @ f384ab89
This diff is collapsed.
app/app.iml
View file @ f384ab89
......@@ -19,7 +19,7 @@
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
<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="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
</configuration>
......
app/build.gradle
View file @ f384ab89
......@@ -16,6 +16,11 @@ android {
minifyEnabled false
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
Spinner category;
String username;
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 ImageView imageView;
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;
import android.app.ProgressDialog;
import android.content.Intent;
import android.os.Bundle;
......@@ -21,6 +22,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
EditText ldap_id;
EditText ldap_password;
public static final String ID = "com.example.instilostandfound.id";
ProgressDialog pd;
@Override
protected void onCreate(Bundle savedInstanceState) {
......@@ -36,6 +38,8 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
ldap_password = findViewById(R.id.LDAP_PASSWORD);
setSupportActionBar(toolbar);
findViewById(R.id.login_btn).setOnClickListener(this);
pd = new ProgressDialog(this);
pd.setMessage("Signing in...");
/*FloatingActionButton fab = findViewById(R.id.fab);
fab.setOnClickListener(new View.OnClickListener() {
......@@ -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
public boolean onCreateOptionsMenu(Menu menu) {
// 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
ldap_password.requestFocus();
return;
}
pd.show();
mAuth.signInWithEmailAndPassword(id,password).addOnCompleteListener(new OnCompleteListener<AuthResult>() {
@Override
public void onComplete(Task<AuthResult> task) {
if(task.isSuccessful())
{
pd.dismiss();
Toast.makeText(MainActivity.this,"LOGIN SUCCESSFUL",Toast.LENGTH_LONG).show();
Intent intent = new Intent(MainActivity.this, Navigation.class);
intent.putExtra("username", ldap);
startActivity(intent);
}
else
{
pd.dismiss();
ldap_password.setText("");
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;
import androidx.recyclerview.widget.RecyclerView;
import android.os.Bundle;
import android.util.Log;
import android.widget.Toast;
import com.google.firebase.database.ChildEventListener;
import com.google.firebase.database.DataSnapshot;
import com.google.firebase.database.DatabaseError;
import com.google.firebase.database.DatabaseReference;
import com.google.firebase.database.FirebaseDatabase;
import com.google.firebase.database.Query;
import com.google.firebase.database.ValueEventListener;
import java.util.ArrayList;
......@@ -23,12 +26,14 @@ public class MyPostsFoundRV extends AppCompatActivity {
private DatabaseReference mDatabaseRef;
private List<CreateFoundObject> mPosts;
private String username =null;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_my_posts_found_rv);
username = getIntent().getStringExtra("username");
mrecyclerView = findViewById(R.id.my_posts_rv);
mrecyclerView.setHasFixedSize(true);
mrecyclerView.setLayoutManager(new LinearLayoutManager(this));
......@@ -36,7 +41,10 @@ public class MyPostsFoundRV extends AppCompatActivity {
mPosts = new ArrayList<>();
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
public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
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 @@
>
<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
android:id="@+id/category"
android:layout_width="match_parent"
......
app/src/main/res/layout/list_item.xml
View file @ f384ab89
......@@ -4,7 +4,7 @@
android:id="@+id/list_item_cardview"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="300dp">
<LinearLayout
android:layout_width="match_parent"
......
local.properties
View file @ f384ab89
......@@ -4,5 +4,5 @@
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
#Mon Nov 04 22:52:49 IST 2019
sdk.dir=/home/navya/Android/Sdk
#Tue Nov 05 08:12:27 IST 2019
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