Merge branch 'master' of https://git.mdd.co.id:44195/abimulya/your-cashier into wahyu

app/src/main/java/com/example/yourcashiertest/activities/LoginActivity.java

@@ -76,6 +76,9 @@ public class LoginActivity extends AppCompatActivity {
                                 .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP));
                         prefManager.setDataUser(response.body().getData().getFullName());
                         finish();
+                    } else if (response.code() == 302){
+                        Toast.makeText(getApplicationContext(), "Please verify your account!", Toast.LENGTH_LONG).show();
+                        binding.setLoading(false);
                     }else{
                         Toast.makeText(getApplicationContext(), response.body().getMessages(), Toast.LENGTH_LONG).show();
                         binding.setLoading(false);

app/src/main/java/com/example/yourcashiertest/activities/RegisterActivity.java

@@ -48,7 +48,8 @@ public class RegisterActivity extends AppCompatActivity {
                 user.setPassword(binding.etPassword.getText().toString());
                 user.setPhoneNumber(binding.etPhoneNumber.getText().toString());
                 viewModel.registrasi(user);
-                Toast.makeText(getApplicationContext(), "Register Was Successful", Toast.LENGTH_LONG).show();
+
+                Toast.makeText(getApplicationContext(), viewModel.getMessages(), Toast.LENGTH_LONG).show();
                 startActivity(new Intent(getApplicationContext(), LoginActivity.class));
                 finish();
             }

app/src/main/java/com/example/yourcashiertest/models/User.java

@@ -22,6 +22,13 @@ public class User implements Parcelable {
 	@SerializedName("email")
 	private String email;
 
+	@SerializedName("token")
+	private String token;
+
+	@SerializedName("status")
+	private int status;
+
+
 	public User(Parcel in) {
 		id = in.readInt();
 		password = in.readString();
@@ -86,6 +93,22 @@ public class User implements Parcelable {
 		return email;
 	}
 	
+	public String getToken() {
+		return token;
+	}
+
+	public void setToken(String token) {
+		this.token = token;
+	}
+
+	public int getStatus() {
+		return status;
+	}
+
+	public void setStatus(int status) {
+		this.status = status;
+	}
+
 	@Override
 	public int describeContents() {
 		return 0;

app/src/main/java/com/example/yourcashiertest/viewmodels/UserViewModel.java

 package com.example.yourcashiertest.viewmodels;
 
 import android.util.Log;
+import android.widget.Toast;
 
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
 
+import com.example.yourcashiertest.activities.RegisterActivity;
 import com.example.yourcashiertest.clients.ApiClient;
 import com.example.yourcashiertest.models.Login;
 import com.example.yourcashiertest.models.Password;
@@ -12,6 +14,7 @@ import com.example.yourcashiertest.models.ResponseUser;
 import com.example.yourcashiertest.models.User;
 import com.example.yourcashiertest.services.UserService;
 
+import java.util.Collections;
 import java.util.List;
 
 import retrofit2.Call;
@@ -27,13 +30,11 @@ public class UserViewModel extends ViewModel {
     public MutableLiveData<List<User>> getListUser(){
         return this.listUser;
     }
-
     public void registrasi(User user){
         ApiClient.client(UserService.class, BASE_URL).registerUser(user)
                 .enqueue(new Callback<User>() {
             @Override
             public void onResponse(Call<User> call, Response<User> response) {
-
             }
 
             @Override
@@ -43,6 +44,7 @@ public class UserViewModel extends ViewModel {
         });
     }
 
+
     public void setListUser(){
         ApiClient.client(UserService.class, BASE_URL).getAllUser().enqueue(new Callback<ResponseUser>() {
             @Override