Commit 65083371 authored by Muhammad Suryono's avatar Muhammad Suryono

Merge branch 'dashboard'

parents 635bef40 bce8ab35
<component name="ProjectCodeStyleConfiguration"> <component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173"> <code_scheme name="Project" version="173">
<DBN-PSQL>
<case-options enabled="true">
<option name="KEYWORD_CASE" value="lower" />
<option name="FUNCTION_CASE" value="lower" />
<option name="PARAMETER_CASE" value="lower" />
<option name="DATATYPE_CASE" value="lower" />
<option name="OBJECT_CASE" value="preserve" />
</case-options>
<formatting-settings enabled="false" />
</DBN-PSQL>
<DBN-SQL>
<case-options enabled="true">
<option name="KEYWORD_CASE" value="lower" />
<option name="FUNCTION_CASE" value="lower" />
<option name="PARAMETER_CASE" value="lower" />
<option name="DATATYPE_CASE" value="lower" />
<option name="OBJECT_CASE" value="preserve" />
</case-options>
<formatting-settings enabled="false">
<option name="STATEMENT_SPACING" value="one_line" />
<option name="CLAUSE_CHOP_DOWN" value="chop_down_if_statement_long" />
<option name="ITERATION_ELEMENTS_WRAPPING" value="chop_down_if_not_single" />
</formatting-settings>
</DBN-SQL>
<DBN-PSQL> <DBN-PSQL>
<case-options enabled="true"> <case-options enabled="true">
<option name="KEYWORD_CASE" value="lower" /> <option name="KEYWORD_CASE" value="lower" />
......
...@@ -14,6 +14,7 @@ import android.text.TextWatcher; ...@@ -14,6 +14,7 @@ import android.text.TextWatcher;
import android.util.Log; import android.util.Log;
import android.view.View; import android.view.View;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.ProgressBar;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
...@@ -44,6 +45,7 @@ import retrofit2.Response; ...@@ -44,6 +45,7 @@ import retrofit2.Response;
public class RegisterState extends BottomSheetDialogFragment { public class RegisterState extends BottomSheetDialogFragment {
private static final String TAG = "RegisterState"; private static final String TAG = "RegisterState";
private static String DEFAULT_REGISTER = "CREATE ACCOUNT";
BottomSheetBehavior sheetBehavior2; BottomSheetBehavior sheetBehavior2;
BottomSheetDialog sheetDialog2; BottomSheetDialog sheetDialog2;
RelativeLayout registerLayout; RelativeLayout registerLayout;
...@@ -53,10 +55,9 @@ public class RegisterState extends BottomSheetDialogFragment { ...@@ -53,10 +55,9 @@ public class RegisterState extends BottomSheetDialogFragment {
Context context; Context context;
MainViewModels mainViewModels; MainViewModels mainViewModels;
SharedPreferences sharedPreferences; SharedPreferences sharedPreferences;
ProgressBar pbReg;
Utils utils; Utils utils;
String busername,bemail,bpassword,brepassword;
public RegisterState(Context context, MainViewModels mainViewModels) { public RegisterState(Context context, MainViewModels mainViewModels) {
this.context = context; this.context = context;
this.mainViewModels = mainViewModels; this.mainViewModels = mainViewModels;
...@@ -79,6 +80,7 @@ public class RegisterState extends BottomSheetDialogFragment { ...@@ -79,6 +80,7 @@ public class RegisterState extends BottomSheetDialogFragment {
repassword = view.findViewById(R.id.ETRePasswordReg); repassword = view.findViewById(R.id.ETRePasswordReg);
registerButton = view.findViewById(R.id.MBRegister); registerButton = view.findViewById(R.id.MBRegister);
closeBtn = view.findViewById(R.id.ivclose); closeBtn = view.findViewById(R.id.ivclose);
pbReg = view.findViewById(R.id.progressReg);
// create session // create session
sharedPreferences = context.getSharedPreferences(SplashScreen.MY_SHARED_PREFERENCES, Context.MODE_PRIVATE); sharedPreferences = context.getSharedPreferences(SplashScreen.MY_SHARED_PREFERENCES, Context.MODE_PRIVATE);
...@@ -87,6 +89,7 @@ public class RegisterState extends BottomSheetDialogFragment { ...@@ -87,6 +89,7 @@ public class RegisterState extends BottomSheetDialogFragment {
utils = new Utils(); utils = new Utils();
sheetDialog2.setContentView(view); sheetDialog2.setContentView(view);
pbReg.setVisibility(View.GONE);
sheetBehavior2 = BottomSheetBehavior.from((View) (view.getParent())); sheetBehavior2 = BottomSheetBehavior.from((View) (view.getParent()));
...@@ -108,20 +111,20 @@ public class RegisterState extends BottomSheetDialogFragment { ...@@ -108,20 +111,20 @@ public class RegisterState extends BottomSheetDialogFragment {
@Override @Override
public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
if (TextUtils.isEmpty(username.getText().toString()) && if (TextUtils.isEmpty(username.getText().toString()) &&
TextUtils.isEmpty(email.getText().toString()) && TextUtils.isEmpty(password.getText().toString()) && TextUtils.isEmpty(repassword.getText().toString())){ TextUtils.isEmpty(email.getText().toString()) && TextUtils.isEmpty(password.getText().toString()) && TextUtils.isEmpty(repassword.getText().toString())) {
username.setError("This field can't empty"); username.setError("This field can't empty");
email.setError("This field can't empty"); email.setError("This field can't empty");
password.setError("This field can't empty"); password.setError("This field can't empty");
repassword.setError("This field can't empty"); repassword.setError("This field can't empty");
}else if (TextUtils.isEmpty(username.getText().toString())){ } else if (TextUtils.isEmpty(username.getText().toString())) {
username.setError("This field can't empty"); username.setError("This field can't empty");
}else if (TextUtils.isEmpty(email.getText().toString())){ } else if (TextUtils.isEmpty(email.getText().toString())) {
email.setError("This field can't empty"); email.setError("This field can't empty");
}else if (TextUtils.isEmpty(password.getText().toString())){ } else if (TextUtils.isEmpty(password.getText().toString())) {
password.setError("This field can't empty"); password.setError("This field can't empty");
}else if (TextUtils.isEmpty(repassword.getText().toString())){ } else if (TextUtils.isEmpty(repassword.getText().toString())) {
repassword.setError("This field can't empty"); repassword.setError("This field can't empty");
}else if (!utils.isValidEmail(charSequence.toString())){ } else if (!utils.isValidEmail(charSequence.toString())) {
email.setError("Please enter the correct email format"); email.setError("Please enter the correct email format");
} }
...@@ -142,7 +145,14 @@ public class RegisterState extends BottomSheetDialogFragment { ...@@ -142,7 +145,14 @@ public class RegisterState extends BottomSheetDialogFragment {
@Override @Override
public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
if (!utils.isValidPassword(charSequence.toString())){
if (TextUtils.isEmpty(username.getText().toString()) &&
TextUtils.isEmpty(email.getText().toString()) && TextUtils.isEmpty(password.getText().toString()) && TextUtils.isEmpty(repassword.getText().toString())) {
username.setError("This field can't empty");
email.setError("This field can't empty");
password.setError("This field can't empty");
repassword.setError("This field can't empty");
} else if (!utils.isValidPassword(charSequence.toString())) {
password.setError("Password Must Be 8 Character"); password.setError("Password Must Be 8 Character");
} }
} }
...@@ -159,27 +169,25 @@ public class RegisterState extends BottomSheetDialogFragment { ...@@ -159,27 +169,25 @@ public class RegisterState extends BottomSheetDialogFragment {
public void onClick(View view) { public void onClick(View view) {
mainViewModels.postRegis( mainViewModels.postRegis(
new UsersModels(username.getText().toString(), new UsersModels(username.getText().toString(),
email.getText().toString(),password.getText().toString(), email.getText().toString(), password.getText().toString(),
repassword.getText().toString())).observe(lifecycleOwner, new Observer<DataResponse<UsersModels>>() { repassword.getText().toString())).observe(lifecycleOwner, new Observer<DataResponse<UsersModels>>() {
@Override @Override
public void onChanged(DataResponse<UsersModels> usersModelsDataResponse) { public void onChanged(DataResponse<UsersModels> usersModelsDataResponse) {
/** /**
* TAMABHAKN RESPONSE DLUH AGAR ADA PROGRESS DIALOGNYA * RESPONSE AGAR ADA PROGRESS DIALOGNYA
* KETIKA RESPONNYA SUCCESS MAKA PROGRESS DIalog diSMISS * KETIKA RESPONNYA SUCCESS MAKA PROGRESS DIalog diSMISS
* DAN ALERT ACTIVATE MUNCUL * DAN ALERT ACTIVATE MUNCUL
* */ * */
setAllLayoutToFalse();
if (usersModelsDataResponse != null) {
final View customLayout = getLayoutInflater()
.inflate(R.layout.alert_dialog, null);
activateEmail(customLayout);
setAllLayoutToTrue();
}
} }
}); });
/**
* Jika tombol sign up ditekan
*
*
* kembali ke halaman login utama dengan Snackbar Cek Email
*
* Pakai bahasa inggris ya untuk responnya
*
* */
registerButton.setEnabled(false);
} }
}); });
...@@ -193,6 +201,31 @@ public class RegisterState extends BottomSheetDialogFragment { ...@@ -193,6 +201,31 @@ public class RegisterState extends BottomSheetDialogFragment {
return sheetDialog2; return sheetDialog2;
} }
private void
setAllLayoutToTrue() {
pbReg.setVisibility(View.GONE);
registerButton.setText(DEFAULT_REGISTER);
sheetDialog2.setCancelable(true);
username.setEnabled(true);
email.setEnabled(true);
password.setEnabled(true);
repassword.setEnabled(true);
registerButton.setEnabled(true);
closeBtn.setEnabled(true);
}
private void setAllLayoutToFalse() {
pbReg.setVisibility(View.VISIBLE);
registerButton.setText("");
sheetDialog2.setCancelable(false);
username.setEnabled(false);
password.setEnabled(false);
registerButton.setEnabled(false);
closeBtn.setEnabled(false);
}
private void activateEmail(View customLayout) { private void activateEmail(View customLayout) {
utils = new Utils(customLayout); utils = new Utils(customLayout);
...@@ -203,7 +236,10 @@ public class RegisterState extends BottomSheetDialogFragment { ...@@ -203,7 +236,10 @@ public class RegisterState extends BottomSheetDialogFragment {
utils.setListener(new Utils.DialogListener() { utils.setListener(new Utils.DialogListener() {
@Override @Override
public void onClickDisimiss(AlertDialog alertDialog) { public void onClickDisimiss(AlertDialog alertDialog) {
alertDialog.dismiss(); alertDialog.dismiss();
sheetDialog2.dismiss();
} }
@Override @Override
...@@ -216,6 +252,4 @@ public class RegisterState extends BottomSheetDialogFragment { ...@@ -216,6 +252,4 @@ public class RegisterState extends BottomSheetDialogFragment {
} }
}); });
} }
} }
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
android:layout_width="@dimen/logo_w_h" android:layout_width="@dimen/logo_w_h"
android:layout_height="@dimen/logo_w_h" android:layout_height="@dimen/logo_w_h"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:src="@mipmap/ic_launcher" /> android:src="@drawable/ic_messer_primary" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
......
This diff is collapsed.
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