volkan/Pizzalemon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app publish

Browse Source
This commit is contained in:
cimenmus
2018-10-17 00:24:47 +03:00
parent 051ba8e09b
commit a40c5cc002
7 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/ch/pizzapp/android/activity/LoginActivity.java
View File

@@ -26,16 +26,16 @@ import ch.pizzapp.android.model.CustomerTokenModel;
import ch.pizzapp.android.model.UserModel;
import ch.pizzapp.android.model.cart.CartInfoModel;
import ch.pizzapp.android.view.AppEditText;
import ch.pizzapp.android.view.AppToolbar;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;
public class LoginActivity extends BaseActivity {
@BindView(R.id.emailPizzalinkEditText)
AppEditText emailAppEditText;
@BindView(R.id.passwordPizzalinkEditText)
AppEditText passwordAppEditText;
@BindView(R.id.loginAppToolbar) AppToolbar loginAppToolbar;
@BindView(R.id.emailPizzalinkEditText) AppEditText emailAppEditText;
@BindView(R.id.passwordPizzalinkEditText) AppEditText passwordAppEditText;
@BindView(R.id.loginButton) Button loginButton;
@BindView(R.id.forgotPasswordTextView) TextView forgotPasswordTextView;
@@ -47,12 +47,15 @@ public class LoginActivity extends BaseActivity {
@BindString(R.string.alert_fill_all_fields) String fillAllFieldsText;
@BindString(R.string.alert_invalid_email) String validEmailText;
private boolean showBackIcon;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_login);
ButterKnife.bind(this);
//initViews();
getDataFromIntent();
initViews();
}
@OnClick({R.id.loginButton, R.id.forgotPasswordTextView,
@@ -76,6 +79,14 @@ public class LoginActivity extends BaseActivity {
}
}
private void getDataFromIntent(){
showBackIcon = getIntent().getBooleanExtra("showBackIcon", false);
}
private void initViews(){
loginAppToolbar.setBackIconVisibility(showBackIcon);
}
private boolean checkFields(){
if(emailAppEditText.isEmpty() || passwordAppEditText.isEmpty()){

4
app/src/main/java/ch/pizzapp/android/helper/DialogHelper.java
View File

@@ -200,7 +200,9 @@ public class DialogHelper {
.onPositive(new MaterialDialog.SingleButtonCallback() {
@Override
public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
BaseActivity.currentActivity.startActivity(new Intent(BaseActivity.currentActivity, LoginActivity.class));
Intent loginIntent = new Intent(BaseActivity.currentActivity, LoginActivity.class);
loginIntent.putExtra("showBackIcon", true);
BaseActivity.currentActivity.startActivity(loginIntent);
}
})
.negativeText(R.string.register_text)

10
app/src/main/java/ch/pizzapp/android/view/AppToolbar.java
View File

@@ -112,4 +112,14 @@ public class AppToolbar extends Toolbar {
public ImageView getHamburgerIcon() {
return hamburgerIcon;
}
public void setBackIconVisibility(boolean isVisible){
showBackIcon = isVisible;
if(isVisible){
backIcon.setVisibility(VISIBLE);
}
else {
backIcon.setVisibility(GONE);
}
}
}