diff --git a/app/src/main/java/com/mapps/seproject/LoginActivity.java b/app/src/main/java/com/mapps/seproject/LoginActivity.java index b27d606842993b7fe3d0157310a2b2882e6d7e9d..fa3131bf090e9f64f7008f0877f7424c0685a904 100644 --- a/app/src/main/java/com/mapps/seproject/LoginActivity.java +++ b/app/src/main/java/com/mapps/seproject/LoginActivity.java @@ -90,6 +90,7 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickLis @Override public void onComplete(@NonNull Task<AuthResult> task) { + if (task.isSuccessful()) { // Successful Log In @@ -102,7 +103,7 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickLis progressDialog.hide(); // Unsuccessful Log In - Toast.makeText(LoginActivity.this, "Incorrect Details", Toast.LENGTH_SHORT).show(); + Toast.makeText(LoginActivity.this, task.getException().toString(), Toast.LENGTH_SHORT).show(); return; @@ -113,15 +114,15 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickLis }); } - catch (Exception e) { e.printStackTrace(); - Log.i("Login Fail: ",e.toString()); + Toast.makeText(this, e.getMessage(), Toast.LENGTH_SHORT).show(); } + } diff --git a/app/src/main/java/com/mapps/seproject/UserActivity.java b/app/src/main/java/com/mapps/seproject/UserActivity.java index 7cb77fccb293d533949dbb3f277b233ab6394375..9ecd79f88970f0e243c8f2248a6f5ddf093c1996 100644 --- a/app/src/main/java/com/mapps/seproject/UserActivity.java +++ b/app/src/main/java/com/mapps/seproject/UserActivity.java @@ -1,7 +1,9 @@ package com.mapps.seproject; import android.content.Intent; +import android.media.Image; import android.net.Uri; +import android.provider.MediaStore; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; import android.util.Log; @@ -9,6 +11,7 @@ import android.view.View; import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.Button; +import android.widget.ImageView; import android.widget.Spinner; import android.widget.TextView; import android.widget.Toast; @@ -25,8 +28,10 @@ public class UserActivity extends AppCompatActivity implements View.OnClickListe Spinner dropdown; TextView emailText; int flag =0; + Button bAddImage; + Uri imageUri; - + private static int RESULT_LOAD_IMAGE = 1; @Override protected void onCreate(Bundle savedInstanceState) { @@ -39,6 +44,7 @@ public class UserActivity extends AppCompatActivity implements View.OnClickListe bSignOut = (Button) findViewById(R.id.bSignOut); bComposeMail = (Button) findViewById(R.id.bComposeMail); emailText = (TextView) findViewById(R.id.tvEmailMessage); + bAddImage = (Button) findViewById(R.id.bAddImage); firebaseAuth = FirebaseAuth.getInstance(); @@ -63,7 +69,7 @@ public class UserActivity extends AppCompatActivity implements View.OnClickListe - + bAddImage.setOnClickListener(this); bSignOut.setOnClickListener(this); // Start listener on Button bComposeMail.setOnClickListener(this); dropdown.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { @@ -129,6 +135,8 @@ public class UserActivity extends AppCompatActivity implements View.OnClickListe } emailIntent.putExtra(Intent.EXTRA_TEXT,mailText); + emailIntent.setType("application/image"); + emailIntent.putExtra(Intent.EXTRA_STREAM,imageUri); try { @@ -153,10 +161,20 @@ public class UserActivity extends AppCompatActivity implements View.OnClickListe } + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + super.onActivityResult(requestCode, resultCode, data); + + if(requestCode == RESULT_LOAD_IMAGE && resultCode == RESULT_OK && data!=null) { + + imageUri = data.getData(); + + } + } @Override public void onClick(View v) { @@ -178,6 +196,13 @@ public class UserActivity extends AppCompatActivity implements View.OnClickListe } + if(v == bAddImage) { + + Intent cameraIntent = new Intent(Intent.ACTION_PICK, MediaStore.Images.Media.INTERNAL_CONTENT_URI); + startActivityForResult(cameraIntent,RESULT_LOAD_IMAGE); + + } + diff --git a/app/src/main/res/layout/activity_user.xml b/app/src/main/res/layout/activity_user.xml index b7617f1014b88775ffbc6936b458f5dd928fe9a5..710493b4cd28b37cefc36182718ade72880b7641 100644 --- a/app/src/main/res/layout/activity_user.xml +++ b/app/src/main/res/layout/activity_user.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <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:id="@+id/activity_user" android:layout_width="match_parent" @@ -59,6 +60,7 @@ android:layout_centerVertical="true" android:layout_centerHorizontal="true" android:id="@+id/tvEmailMessage" - android:hint="Enter your complaint here" /> + android:hint="Enter your complaint here" + android:visibility="visible" /> </RelativeLayout>