Merge branch 'cart'

app/src/main/java/com/yono/messeripos/LoginActivity.java

 package com.yono.messeripos;
 
+import android.app.AlertDialog;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -40,6 +41,10 @@ public class LoginActivity extends AppCompatActivity {
 
     MaterialButton btnSignin;
     MaterialButton btnSignup, btnSignIn;
+    public static View invalidUser;
+    public static View activateEmail;
+
+    Utils utils;
 
     private String TAG = "MainActivity";
 
@@ -97,6 +102,7 @@ public class LoginActivity extends AppCompatActivity {
             @Override
             public void onClick(View v) {
                 loginState = new LoginState(LoginActivity.this, mainViewModels);
+                loginState.setCancelable(false);
                 loginState.show(getSupportFragmentManager(), loginState.getTag());
             }
         });
@@ -105,6 +111,7 @@ public class LoginActivity extends AppCompatActivity {
             @Override
             public void onClick(View view) {
                 registerState = new RegisterState(LoginActivity.this,mainViewModels);
+                registerState.setCancelable(false);
                 registerState.show(getSupportFragmentManager(),registerState.getTag());
             }
         });

app/src/main/java/com/yono/messeripos/LoginState.java

@@ -10,6 +10,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.os.Bundle;
+import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.KeyEvent;
@@ -52,8 +53,7 @@ public class LoginState extends BottomSheetDialogFragment {
     SharedPreferences sharedPreferences;
     Utils utils;
     ProgressBar bar;
-    AlertDialog.Builder builder;
-
+    View view;
     ProgressDialog dialog;
 
     public LoginState(Context context, MainViewModels mainViewModels) {
@@ -70,7 +70,7 @@ public class LoginState extends BottomSheetDialogFragment {
         dialog = new ProgressDialog(context);
 
 //        inflating layout
-        View view = View.inflate(getContext(), R.layout.login_form, null);
+        view = View.inflate(getContext(), R.layout.login_form, null);
 
 //        bindUI
         loginLayout = view.findViewById(R.id.LoginLayout);
@@ -112,6 +112,7 @@ public class LoginState extends BottomSheetDialogFragment {
     }
 
     private void loginAuth(View v) {
+
         if (TextUtils.isEmpty(username.getText().toString()) &&
                 TextUtils.isEmpty(password.getText().toString())){
             username.setError("This field can't empty");
@@ -121,79 +122,47 @@ public class LoginState extends BottomSheetDialogFragment {
             username.setError("This field can't empty");
         }else if (TextUtils.isEmpty(password.getText().toString())){
             password.setError("This field can't empty");
-        }else
-            {
-            /**
-             * Jika tombol sign in ditekan
-             *
-            * nonaktifkan semua form */
-            bar.setVisibility(View.VISIBLE);
-            loginButton.setText("");
-            sheetDialog.setCancelable(false);
-
-            username.setEnabled(false);
-            password.setEnabled(false);
-            loginButton.setEnabled(false);
-            closeBtn.setEnabled(false);
+        }else {
+
+            setAllLayoutToFalse();
 
 //            buat checking login
             mainViewModels.checkLogin(new UsersModels(username.getText().toString(),
                     password.getText().toString()))
                     .observe((LifecycleOwner) context, usersModelsDataResponse -> {
 
-
                         if (usersModelsDataResponse != null) {
-                            /**
-                             * Jika response atau data ada dan cocok
-                             */
-                            if (usersModelsDataResponse.getStatusData()) {
-                                SharedPreferences.Editor editor = sharedPreferences.edit();
-                                editor.putBoolean(SplashScreen.SESSION, true);
-                                if(editor.commit()){
-                                    startActivity(new Intent(context, MainActivity.class));
-                                }
-    //                            redirect ke home
-
+                            final View customLayout = getLayoutInflater()
+                                    .inflate(R.layout.alert_dialog, null);
 
-    //                            set progress bar jadi nonaktif
-                                bar.setVisibility(View.GONE);
-    //                            munculkan tulisan default di button sign in
-                                loginButton.setText(DEFAULT_LOGIN_NAME);
+                            switch (usersModelsDataResponse.getMessageData().toLowerCase()) {
 
-    //                            ubah sheet dialog jadi tidak bisa di slide atau cancel
-                                sheetDialog.setCancelable(true);
+                                case "invalid username or password":
+                                    setAllLayoutToTrue();
+                                    errUserPass(customLayout);
+                                    break;
 
-    //                            set form jadi enable
-                                username.setEnabled(true);
-                                password.setEnabled(true);
-                                loginButton.setEnabled(true);
-                                closeBtn.setEnabled(true);
+                                case "please activate your email first":
+                                    setAllLayoutToTrue();
+                                    activateEmail(customLayout);
 
-                            } else {
-                                /**
-                                 * Jika response atau data tidak cocok
-                                 */
+                                default:
+                                    break;
+                            }
 
-                                bar.setVisibility(View.GONE);
-                                loginButton.setText(DEFAULT_LOGIN_NAME);
+                            if (usersModelsDataResponse.getStatusData()) {
 
-                                sheetDialog.setCancelable(true);
+                                SharedPreferences.Editor editor = sharedPreferences.edit();
+                                editor.putBoolean(SplashScreen.SESSION, true);
 
-                                final View customLayout = getLayoutInflater()
-                                        .inflate(R.layout.alert_dialog, null);
+                                sheetDialog.dismiss();
+                                if(editor.commit()){
+                                    startActivity(new Intent(context, MainActivity.class));
+                                    getActivity().finish();
+                                }
 
-    //                            tampilkan alert dialog
-                                utils = new Utils(customLayout);
-                                utils.dialog(context, false, customLayout, "Wrong Username or Password",
-                                        "The username or password is incorrect. Please try again!",
-                                        "Try Again")
-                                        .show();
-                                utils.setListener(Dialog::dismiss);
+                                setAllLayoutToTrue();
 
-                                username.setEnabled(true);
-                                password.setEnabled(true);
-                                loginButton.setEnabled(true);
-                                closeBtn.setEnabled(true);
                             }
                         } else {
                             bar.setVisibility(View.VISIBLE);
@@ -204,4 +173,69 @@ public class LoginState extends BottomSheetDialogFragment {
         }
         loginButton.setText(DEFAULT_LOGIN_NAME);
     }
+
+    private void setAllLayoutToTrue() {
+        bar.setVisibility(View.GONE);
+        loginButton.setText(DEFAULT_LOGIN_NAME);
+        sheetDialog.setCancelable(true);
+        username.setEnabled(true);
+        password.setEnabled(true);
+        loginButton.setEnabled(true);
+        closeBtn.setEnabled(true);
+    }
+
+    private void setAllLayoutToFalse() {
+        bar.setVisibility(View.VISIBLE);
+        loginButton.setText("");
+        sheetDialog.setCancelable(false);
+        username.setEnabled(false);
+        password.setEnabled(false);
+        loginButton.setEnabled(false);
+        closeBtn.setEnabled(false);
+    }
+
+    private void activateEmail(View customLayout) {
+
+        utils = new Utils(customLayout);
+        utils.dialog(context, false, customLayout, "Please Verifiy Email",
+                "Please verify your email before login",
+                "close", "verify")
+                .show();
+        utils.setListener(new Utils.DialogListener() {
+            @Override
+            public void onClickDisimiss(AlertDialog alertDialog) {
+                alertDialog.dismiss();
+            }
+
+            @Override
+            public void onClickLink(AlertDialog alertDialog) {
+               Intent pm = getActivity().getPackageManager().getLaunchIntentForPackage("com.google.android.gm");
+               if (pm != null) {
+                   startActivity(pm);
+                   getActivity().finish();
+               }
+            }
+        });
+    }
+
+    private void errUserPass(View customLayout) {
+
+        utils = new Utils(customLayout);
+        utils.dialog(context, false, customLayout, "Wrong Username or Password",
+                "The username or password is incorrect. Please try again!",
+                "Try Again")
+                .show();
+        utils.setListener(new Utils.DialogListener() {
+            @Override
+            public void onClickDisimiss(AlertDialog alertDialog) {
+                alertDialog.dismiss();
+            }
+
+            @Override
+            public void onClickLink(AlertDialog alertDialog) {
+
+            }
+        });
+
+    }
 }

app/src/main/java/com/yono/messeripos/MainActivity.java

@@ -550,4 +550,10 @@ public class MainActivity extends AppCompatActivity {
             binding.pbLoading.setVisibility(View.GONE);
         }
     }
+
+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+        finish();
+    }
 }
\ No newline at end of file

app/src/main/java/com/yono/messeripos/utils/Utils.java

@@ -46,6 +46,7 @@ public class Utils {
 
     public interface DialogListener {
         void onClickDisimiss(AlertDialog alertDialog);
+        void onClickLink(AlertDialog alertDialog);
     }
 
     private DialogListener listener;
@@ -274,12 +275,63 @@ public class Utils {
         return dialog;
     }
 
-    public AlertDialog dialog(Context context, Boolean cancelable, View view, @Nullable String titles, @Nullable String messages, @Nullable String buttons) {
+    public AlertDialog dialog(Context context,
+                              Boolean cancelable,
+                              View view,
+                              @Nullable String titles,
+                              @Nullable String messages,
+                              @Nullable String dismiss) {
+
+        TextView title = view.findViewById(R.id.alertTitles);
+        TextView message = view.findViewById(R.id.alertBody);
+        TextView button2 = view.findViewById(R.id.tvTextBtn2);
+        CardView btnCard2 = view.findViewById(R.id.cvAlertOnClick2);
+
+//        set title and message
+        if (titles != null){
+            title.setText(titles);
+        }
+
+        if (message != null){
+            message.setText(messages);
+        }
+
+        if (button2 != null){
+            btnCard2.setVisibility(View.VISIBLE);
+            button2.setText(dismiss);
+        }
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(context)
+                .setCancelable(cancelable)
+                .setView(view);
+
+        AlertDialog dialog = builder.create();
+        dialog.getWindow().getAttributes().windowAnimations = R.style.DialogAnimation;
+        btnCard2.setOnClickListener(view1 -> listener.onClickDisimiss(dialog));
+        return dialog;
+
+    }
+
+
+    public AlertDialog dialog(Context context,
+                              Boolean cancelable,
+                              View view,
+                              @Nullable String titles,
+                              @Nullable String messages,
+                              @Nullable String dismiss,
+                              @Nullable String link) {
+
+        /**
+         * Button1 untuk dismiss
+         * Button2 untuk link
+         */
 
         TextView title = view.findViewById(R.id.alertTitles);
         TextView message = view.findViewById(R.id.alertBody);
         TextView button = view.findViewById(R.id.tvTextBtn);
+        TextView button2 = view.findViewById(R.id.tvTextBtn2);
         CardView btnCard = view.findViewById(R.id.cvAlertOnClick);
+        CardView btnCard2 = view.findViewById(R.id.cvAlertOnClick2);
 
 //        set title and message
         if (titles != null){
@@ -291,7 +343,13 @@ public class Utils {
         }
 
         if (button != null){
-            button.setText(buttons);
+            btnCard.setVisibility(View.VISIBLE);
+            button.setText(link);
+        }
+
+        if (button2 != null) {
+            btnCard2.setVisibility(View.VISIBLE);
+            button2.setText(dismiss);
         }
 
         AlertDialog.Builder builder = new AlertDialog.Builder(context)
@@ -300,7 +358,14 @@ public class Utils {
 
         AlertDialog dialog = builder.create();
         dialog.getWindow().getAttributes().windowAnimations = R.style.DialogAnimation;
-        btnCard.setOnClickListener(view1 -> listener.onClickDisimiss(dialog));
+
+        btnCard.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                listener.onClickLink(dialog);
+            }
+        });
+        btnCard2.setOnClickListener(view1 -> listener.onClickDisimiss(dialog));
         return dialog;
 
     }

app/src/main/res/layout/alert_dialog.xml

@@ -15,7 +15,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/divider"
+        app:layout_constraintBottom_toTopOf="@id/cvAlertDialog"
         >
 
         <LinearLayout
@@ -45,22 +45,27 @@
 
     </com.google.android.material.card.MaterialCardView>
 
-    <View
-        android:id="@+id/divider"
-        android:layout_marginTop="10dp"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="1dp"
-        style="@style/Divider.Horizontal"
-        app:layout_constraintTop_toBottomOf="@id/cvAlertDialog"/>
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintTop_toBottomOf="@id/cvAlertDialog">
 
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/cvAlertOnClick"
         app:cardCornerRadius="0dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:visibility="gone"
         android:clickable="true"
-        android:focusable="true"
-        app:layout_constraintTop_toBottomOf="@id/divider">
+        android:focusable="true">
+
+        <View
+            android:id="@+id/divider"
+            android:layout_marginTop="10dp"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            style="@style/Divider.Horizontal"/>
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/tvTextBtn"
@@ -68,9 +73,39 @@
             android:layout_height="wrap_content"
             android:text="Coba Lagi"
             android:textSize="18sp"
+            android:textColor="#3949AB"
+            android:textFontWeight="600"
+            android:paddingVertical="15dp"
+            android:gravity="center"/>
+
+    </com.google.android.material.card.MaterialCardView>
+
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/cvAlertOnClick2"
+        app:cardCornerRadius="0dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:clickable="true"
+        android:visibility="gone"
+        android:focusable="true">
+
+        <View
+            android:id="@+id/divider2"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            style="@style/Divider.Horizontal"/>
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/tvTextBtn2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Coba Lagi"
+            android:textSize="18sp"
+            android:textFontWeight="600"
             android:paddingVertical="15dp"
             android:gravity="center"/>
 
     </com.google.android.material.card.MaterialCardView>
+    </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

app/src/main/res/layout/dashboard_login.xml

@@ -20,6 +20,7 @@
             android:layout_marginTop="50dp"/>
 
         <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/descMesser"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="messer"
@@ -30,6 +31,14 @@
             android:layout_below="@id/messerLogoDashboardLogin"
             android:layout_centerHorizontal="true"/>
 
+        <com.google.android.material.textview.MaterialTextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="messer is a digital cashier application"
+            android:textColor="@color/colorWhite"
+            android:layout_below="@id/descMesser"
+            android:layout_centerHorizontal="true"/>
+
         <com.google.android.material.button.MaterialButton
             android:id="@+id/signUpButtonDashboardLogin"
             android:layout_width="match_parent"