diff --git a/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/login/LoginActivity.java b/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/login/LoginActivity.java index ffd44d3..e01a47b 100644 --- a/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/login/LoginActivity.java +++ b/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/login/LoginActivity.java @@ -163,7 +163,6 @@ public class LoginActivity extends BaseActivity { register.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - Toast.makeText(getApplicationContext(), "Successful register click", Toast.LENGTH_SHORT).show(); Intent intent = new Intent(LoginActivity.this, RegisterActivity.class); startActivity(intent); diff --git a/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/login/LoginActivityNew.java b/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/login/LoginActivityNew.java index 4bb24f2..c9462ef 100644 --- a/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/login/LoginActivityNew.java +++ b/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/login/LoginActivityNew.java @@ -641,15 +641,29 @@ public class LoginActivityNew extends AppCompatActivity { editor.putString("Employeeid",_employeeid); editor.commit(); - Toast.makeText(LoginActivityNew.this, "Login successful", Toast.LENGTH_SHORT).show(); - Intent intent=new Intent(LoginActivityNew.this,RegisterActivity.class); - startActivity(intent); - finish(); + new SweetAlertDialog(LoginActivityNew.this, SweetAlertDialog.SUCCESS_TYPE) + .setTitleText("Login successful") + .setConfirmClickListener(new SweetAlertDialog.OnSweetClickListener() { + @Override + public void onClick(SweetAlertDialog sDialog) { + Intent intent=new Intent(LoginActivityNew.this,RegisterActivity.class); + startActivity(intent); + finish(); + } + }).show(); + } else { // we have to show alert - Toast.makeText(LoginActivityNew.this, "Username/password is not matching!", Toast.LENGTH_SHORT).show(); + new SweetAlertDialog(LoginActivityNew.this, SweetAlertDialog.WARNING_TYPE) + .setTitleText("Username/password is not matching!") + .setConfirmClickListener(new SweetAlertDialog.OnSweetClickListener() { + @Override + public void onClick(SweetAlertDialog sDialog) { + sDialog.dismissWithAnimation(); + } + }).show(); } } catch (JSONException e) { diff --git a/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/register/RegisterActivity.java b/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/register/RegisterActivity.java index 7ba035e..a8e0325 100644 --- a/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/register/RegisterActivity.java +++ b/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/register/RegisterActivity.java @@ -527,8 +527,7 @@ public class RegisterActivity extends ToolbarActivity implements RegisterFragmen .subscribe(granted -> { if (granted) { SaveBitmapToGallery(bitmap); - - Toast.makeText(this, R.string.photo_saved_to_gallery, Toast.LENGTH_SHORT).show(); + // Toast.makeText(this, R.string.photo_saved_to_gallery, Toast.LENGTH_SHORT).show(); } else { Toast.makeText(this, R.string.permission_need_for_write_external, Toast.LENGTH_SHORT).show(); } @@ -545,12 +544,17 @@ public class RegisterActivity extends ToolbarActivity implements RegisterFragmen private void finishRegistration() { - //preferences.setUsername(registrationModel.login); + new SweetAlertDialog(RegisterActivity.this, SweetAlertDialog.SUCCESS_TYPE) + .setTitleText("Face registration successfully") + .setConfirmClickListener(new SweetAlertDialog.OnSweetClickListener() { + @Override + public void onClick(SweetAlertDialog sDialog) { + Intent intent = new Intent(RegisterActivity.this, LoginActivityNew.class); + startActivity(intent); + finish(); + } + }).show(); - // preferences.setPin(registrationModel.password); - Intent intent = new Intent(RegisterActivity.this, LoginActivityNew.class); - startActivity(intent); - finish(); } @Override diff --git a/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/register/RegisterFragment.java b/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/register/RegisterFragment.java index a872b76..276c070 100644 --- a/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/register/RegisterFragment.java +++ b/examples/example_bestshot/example/app/src/main/java/ru/visionlab/femdemo/register/RegisterFragment.java @@ -43,6 +43,7 @@ import butterknife.ButterKnife; import butterknife.OnClick; import butterknife.OnFocusChange; import butterknife.OnTextChanged; +import cn.pedant.SweetAlert.SweetAlertDialog; import ru.visionlab.femdemo.App; import ru.visionlab.femdemo.BuildConfig; import ru.visionlab.femdemo.Config; @@ -197,14 +198,27 @@ public class RegisterFragment extends BaseFragment { editor.putString("Employeeid",_employeeid); editor.commit(); - Toast.makeText(getContext(), "Success Registration", Toast.LENGTH_SHORT).show(); - Intent intent=new Intent(getContext(),RegisterActivity.class); - startActivity(intent); + new SweetAlertDialog(getContext(), SweetAlertDialog.SUCCESS_TYPE) + .setTitleText("Success Registration") + .setConfirmClickListener(new SweetAlertDialog.OnSweetClickListener() { + @Override + public void onClick(SweetAlertDialog sDialog) { + Intent intent=new Intent(getContext(),RegisterActivity.class); + startActivity(intent); + } + }).show(); } else { // we have to show alert - Toast.makeText(getContext(), "Username/password is not matching!", Toast.LENGTH_SHORT).show(); + new SweetAlertDialog(getContext(), SweetAlertDialog.WARNING_TYPE) + .setTitleText("Username/password is not matching!") + .setConfirmClickListener(new SweetAlertDialog.OnSweetClickListener() { + @Override + public void onClick(SweetAlertDialog sDialog) { + sDialog.dismissWithAnimation(); + } + }).show(); } } catch (JSONException e) {