From Api branchto test

app/build.gradle

@@ -34,6 +34,7 @@ dependencies {
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'com.google.android.material:material:1.1.0'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'com.google.android.gms:play-services-maps:17.0.0'
     testImplementation 'junit:junit:4.13'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
@@ -91,10 +92,15 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.aar', '*.jar'], exclude: [])
     implementation 'com.squareup.picasso:picasso:2.71828'
     implementation 'com.facebook.shimmer:shimmer:0.5.0'
-
+    implementation 'com.squareup.okhttp3:okhttp:4.8.0'
     implementation 'com.hbb20:ccp:2.4.0'
+
+    implementation 'com.android.volley:volley:1.1.1'
+    implementation 'com.squareup.picasso:picasso:2.71828'
+    implementation 'com.google.code.gson:gson:2.8.6'
 
     //image loader
     implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
+
 }
 

app/src/main/AndroidManifest.xml

@@ -8,6 +8,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
+        android:usesCleartextTraffic="true"
         android:theme="@style/AppTheme">
         <activity android:name=".FindHotelDetails"></activity>
         <activity

app/src/main/java/com/michael/afrivac/LoginActivity.java

@@ -4,10 +4,11 @@
 import androidx.appcompat.app.AppCompatActivity;
 import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
+import android.os.AsyncTask;
 import android.os.Bundle;
-import android.text.TextUtils;
 import android.util.Log;
 import android.util.Patterns;
 import android.view.View;
@@ -23,15 +24,13 @@
 import com.facebook.FacebookCallback;
 import com.facebook.FacebookException;
 import com.facebook.FacebookSdk;
-import com.facebook.appevents.AppEventsLogger;
+import com.facebook.login.Login;
 import com.facebook.login.LoginResult;
 import com.facebook.login.widget.LoginButton;
-import com.github.aakira.compoundicontextview.CompoundIconTextView;
 import com.google.android.gms.auth.api.signin.GoogleSignIn;
 import com.google.android.gms.auth.api.signin.GoogleSignInAccount;
 import com.google.android.gms.auth.api.signin.GoogleSignInClient;
 import com.google.android.gms.auth.api.signin.GoogleSignInOptions;
-import com.google.android.gms.common.SignInButton;
 import com.google.android.gms.common.api.ApiException;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.OnFailureListener;
@@ -41,30 +40,38 @@
 import com.google.firebase.auth.FacebookAuthProvider;
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseUser;
-import com.google.firebase.database.FirebaseDatabase;
 import com.michael.afrivac.Auth.AuthViewModel;
 import com.michael.afrivac.Util.Helper;
 
+import org.json.JSONObject;
+
 import java.util.Arrays;
 
+import okhttp3.FormBody;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+
 public class LoginActivity extends AppCompatActivity implements View.OnClickListener {
 
     int RC_SIGN_IN = 0;
     GoogleSignInClient mGoogleSignInClient;
 
     private EditText email, password;
     private String Email, Password;
-    private TextView sign_in, signUp, forgotPassword, resend_email_ver;
+    private TextView  signUp, forgotPassword, resend_email_ver;
     private FirebaseAuth mAuth;
     private FirebaseUser user;
     private AuthViewModel authViewModel;
     private Helper helper;
-    private Button googleSignIn;
+    private Button googleSignIn,sign_in;
     private Animation animation;
     private FirebaseAuth.AuthStateListener mAuthStateListener;
     private CallbackManager callbackManager;
     private LoginButton loginButton;
     private static final String EMAIL = "email";
+    private  final String signIn_URL ="https://piscine-mandarine-32869.herokuapp.com/api/v1/auth/login";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -80,8 +87,6 @@ protected void onCreate(Bundle savedInstanceState) {
         signUp = findViewById(R.id.singin_goto_signup);
         forgotPassword = findViewById(R.id.signin_forgot_password);
 
-        final String Email = email.getText().toString().trim();
-        final String Password = password.getText().toString().trim();
 
         FacebookSdk.sdkInitialize(getApplicationContext());
         loginButton = findViewById(R.id.signin_with_facebook);
@@ -134,13 +139,24 @@ public void onClick(View v) {
             public void onClick(final View v) {
                 animation = AnimationUtils.loadAnimation(getApplicationContext(), R.anim.button_anim);
                 sign_in.startAnimation(animation);
+                final String Email = email.getText().toString().trim();
+                final String Password = password.getText().toString().trim();
+                new LoginUser().execute(Email,Password);
                 animation.setAnimationListener(new Animation.AnimationListener() {
                     @Override
                     public void onAnimationStart(Animation animation) {}
 
                     @Override
                     public void onAnimationEnd(Animation animation) {
-                        if(!isEmpty(email.getText().toString()) && !isEmpty(password.getText().toString())){
+
+                        String Email = email.getText().toString();
+                        String Password = password.getText().toString();
+
+                        LoginUser userLogin = new LoginUser();
+                        userLogin.execute(Email, Password);
+
+
+                        /*if(!isEmpty(email.getText().toString()) && !isEmpty(password.getText().toString())){
                             helper.progressDialogStart("Login to User Account", "Please wait while we log-in into your account");
                             FirebaseAuth.getInstance().signInWithEmailAndPassword(email.getText().toString(), password.getText().toString())
                                     .addOnCompleteListener(new OnCompleteListener<AuthResult>() {
@@ -163,7 +179,7 @@ public void onFailure(@NonNull Exception e) {
                             Toast.makeText(LoginActivity.this, "Please enter password", Toast.LENGTH_SHORT).show();
                         } else if(!Patterns.EMAIL_ADDRESS.matcher(email.getText().toString()).matches()){
                             Toast.makeText(LoginActivity.this, "Please enter valid email", Toast.LENGTH_SHORT).show();
-                        }
+                        }*/
                     }
 
                     @Override
@@ -172,6 +188,18 @@ public void onAnimationRepeat(Animation animation) {}
             }
         });
 
+        //This Sign in button works for Api authentication
+
+//        sign_in.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                final String Email = email.getText().toString().trim();
+//                final String Password = password.getText().toString().trim();
+//                new LoginUser().execute(Email,Password);
+//
+//            }
+//        });
+
         googleSignIn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -371,6 +399,70 @@ private boolean isEmpty(String string) {
         return string.equals("");
     }
 
+    //code to login user with inputed email and password
+    public class LoginUser extends AsyncTask<String,Void ,String>{
+
+        @Override
+        protected String doInBackground(String... strings) {
+            String email = strings[0];
+            String password = strings[1];
+            OkHttpClient okHttpClient = new OkHttpClient();
+            RequestBody formBody = new FormBody.Builder()
+                    .add("email", email)
+                    .add("password",password).build();
+            Request request = new Request.Builder()
+                    .url(signIn_URL)
+                    .post(formBody)
+                    .build();
+
+            //sends the email and Password to the db
+
+            try{
+                Response response = okHttpClient.newCall(request).execute();    //gets a response from the server
+                if(response.isSuccessful()){
+                    showToast("Successful Login");
+                    startActivity(new Intent(getApplicationContext(), MainActivity.class));
+                    finish();
+                    String result = response.body().string();
+                    Log.i("loginResponse", "yes");
+                    Log.i("responseBody", result);
+                    //Log.i("resultResponsee", result);
+
+                    JSONObject jsonObject = new JSONObject(result);
+                    String resultData = jsonObject.getString("data");    //gets the data array in string format from the response body
+
+                    JSONObject jsonObject1 = new JSONObject(resultData);
+                    String resultToken = jsonObject1.getString("token");  //gets the token string from the data array
+                    helper.token(resultToken);   //sends token to the helper class to be used through out the app
+
+                    SharedPreferences sharedPreferences = getSharedPreferences("TOKEN", Context.MODE_PRIVATE);
+                    SharedPreferences.Editor editor = sharedPreferences.edit();
+                    editor.putString("token", resultToken);
+                    editor.apply();
+
+                    Log.d("TOKEN", resultToken);
+
+                    if(!response.isSuccessful()){
+
+                        Toast.makeText(LoginActivity.this,"Email or Password Mismatch",Toast.LENGTH_SHORT).show();
+                    }
+                }else{
+                    Log.i("loginResponse", "Unsuccessful");
+                }
+            }catch (Exception e){
+                e.printStackTrace();
+            }
+            return null;
+        }
+    }
+    public void showToast(final String Text){
+        this.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                Toast.makeText(LoginActivity.this,Text,Toast.LENGTH_SHORT).show();
+            }
+        });
+    }
 
 }
 

app/src/main/java/com/michael/afrivac/MainActivity.java

@@ -16,6 +16,7 @@
 import com.michael.afrivac.ui.account.AccountFragment;
 import com.michael.afrivac.ui.findHotel.FindHotelFragment;
 import com.michael.afrivac.ui.home.HomeFragment;
+import com.michael.afrivac.ui.memories.MemoriesFragment;
 import com.michael.afrivac.ui.popular_destination.PopularDestinationFragment;
 import com.michael.afrivac.ui.support.SupportFragment;
 import com.google.firebase.auth.FirebaseAuth;
@@ -61,7 +62,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
     private AppBarConfiguration mAppBarConfiguration;
     private ActionBarDrawerToggle toggle;
     private Helper helper;
-    FirebaseAuth mAuth;
+    //FirebaseAuth mAuth;
     Toolbar toolbar;
 
     @Override
@@ -94,7 +95,7 @@ protected void onCreate(Bundle savedInstanceState) {
 //            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
 //        }
 
-        mAuth = FirebaseAuth.getInstance();
+        //mAuth = FirebaseAuth.getInstance();
 
 //        FloatingActionButton fab = findViewById(R.id.fab);
 //        fab.setOnClickListener(new View.OnClickListener() {
@@ -147,9 +148,9 @@ protected void onCreate(Bundle savedInstanceState) {
 
 
     private void logout() {
-        FirebaseAuth.getInstance().signOut();
-        helper.gotoLoginAcitivity(this);
-        finish();
+       // FirebaseAuth.getInstance().signOut();
+       // helper.gotoLoginAcitivity(this);
+       // finish();
     }
 
     @Override
@@ -219,10 +220,10 @@ public void reLoadMainActivity(){
     @Override
     protected void onStart() {
         super.onStart();
-        FirebaseUser currentUser = mAuth.getCurrentUser();
+       /* FirebaseUser currentUser = mAuth.getCurrentUser();
         if(currentUser == null){
             helper.gotoLoginAcitivity(this);
-        }
+        }    */
 
     }
 
@@ -268,6 +269,10 @@ private void displaySelectedScreen(int itemId) {
                 fragment = new SupportFragment();
                 fragment_tag = "SupportFragment";
                 break;
+            case R.id.nav_memories:
+                fragment = new MemoriesFragment();
+                fragment_tag = "MemoriesFragment";
+                break;
             case R.id.nav_logout:
                 logout();
                 break;