diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 71e97e7..0ba28c4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -41,7 +41,8 @@ android:screenOrientation="portrait" /> - + + \ No newline at end of file diff --git a/app/src/main/java/ch/pizzalink/android/activity/ForgotPasswordActivity.java b/app/src/main/java/ch/pizzalink/android/activity/ForgotPasswordActivity.java index bb3c9b3..04d016e 100644 --- a/app/src/main/java/ch/pizzalink/android/activity/ForgotPasswordActivity.java +++ b/app/src/main/java/ch/pizzalink/android/activity/ForgotPasswordActivity.java @@ -1,10 +1,15 @@ package ch.pizzalink.android.activity; +import android.content.Intent; +import android.support.annotation.NonNull; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; import android.view.View; import android.widget.Button; +import com.afollestad.materialdialogs.DialogAction; +import com.afollestad.materialdialogs.MaterialDialog; + import butterknife.BindString; import butterknife.BindView; import butterknife.ButterKnife; @@ -23,19 +28,18 @@ import retrofit2.Response; public class ForgotPasswordActivity extends BaseActivity { - @BindView(R.id.forgotPasswordPizzalinkToolbar) PizzalinkToolbar forgotPasswordPizzalinkToolbar; @BindView(R.id.forgotPasswordEmailPizzalinkEditText) PizzalinkEditText forgotPasswordEmailPizzalinkEditText; @BindView(R.id.resetPasswordButton) Button resetPasswordButton; @BindString(R.string.alert_fill_all_fields) String fillAllFieldsText; @BindString(R.string.alert_invalid_email) String validEmailText; + @BindString(R.string.password_reset) String passwordResetText; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_forgot_password); ButterKnife.bind(this); - initViews(); } @OnClick(R.id.resetPasswordButton) @@ -46,15 +50,6 @@ public class ForgotPasswordActivity extends BaseActivity { } } - private void initViews(){ - forgotPasswordPizzalinkToolbar.setBackIconClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - onBackPressed(); - } - }); - } - private boolean checkFields(){ if(forgotPasswordEmailPizzalinkEditText.isEmpty()){ @@ -79,7 +74,14 @@ public class ForgotPasswordActivity extends BaseActivity { public void onResponse(Call call, Response response) { DialogHelper.hideLoadingDialog(); if(response.isSuccessful() && response.body().isSuccess()){ - DialogHelper.showPasswordResetDialog(ForgotPasswordActivity.this); + DialogHelper.showOneButtonDialogWithCallback(passwordResetText, new MaterialDialog.SingleButtonCallback() { + @Override + public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) { + Intent intent = new Intent(BaseActivity.currentActivity, LoginActivity.class); + BaseActivity.currentActivity.startActivity(intent); + BaseActivity.currentActivity.finishAffinity(); + } + }); } else{ ApiErrorUtils.parseError(response); diff --git a/app/src/main/java/ch/pizzalink/android/activity/MainActivity.java b/app/src/main/java/ch/pizzalink/android/activity/MainActivity.java index 20c6f96..12ae25d 100644 --- a/app/src/main/java/ch/pizzalink/android/activity/MainActivity.java +++ b/app/src/main/java/ch/pizzalink/android/activity/MainActivity.java @@ -1,5 +1,6 @@ package ch.pizzalink.android.activity; +import android.content.Intent; import android.support.annotation.NonNull; import android.support.design.widget.BottomNavigationView; import android.support.v4.app.FragmentManager; @@ -68,6 +69,11 @@ public class MainActivity extends BaseActivity { initViews(); } + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + super.onActivityResult(requestCode, resultCode, data); + } + private void getDataFromIntent(){ isStartWithOrderHistory = getIntent().getBooleanExtra("isStartWithOrderHistory", false); } diff --git a/app/src/main/java/ch/pizzalink/android/activity/MyAddressesActivity.java b/app/src/main/java/ch/pizzalink/android/activity/MyAddressesActivity.java index ebd3d36..abcb403 100644 --- a/app/src/main/java/ch/pizzalink/android/activity/MyAddressesActivity.java +++ b/app/src/main/java/ch/pizzalink/android/activity/MyAddressesActivity.java @@ -37,7 +37,6 @@ import retrofit2.Response; public class MyAddressesActivity extends BaseActivity { - @BindView(R.id.myAddressesToolbar) PizzalinkToolbar myAddressesToolbar; @BindView(R.id.myAddressesRecyclerView) RecyclerView myAddressesRecyclerView; @BindView(R.id.addNewAddressButton) Button addNewAddressButton; @@ -62,14 +61,6 @@ public class MyAddressesActivity extends BaseActivity { } private void initViews(){ - - myAddressesToolbar.setBackIconClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - onBackPressed(); - } - }); - initRecyclerView(); } diff --git a/app/src/main/java/ch/pizzalink/android/activity/OrderActivity.java b/app/src/main/java/ch/pizzalink/android/activity/OrderActivity.java index f9a2d2a..e667321 100644 --- a/app/src/main/java/ch/pizzalink/android/activity/OrderActivity.java +++ b/app/src/main/java/ch/pizzalink/android/activity/OrderActivity.java @@ -29,7 +29,6 @@ import ch.pizzalink.android.view.PizzalinkToolbar; public class OrderActivity extends BaseActivity { - @BindView(R.id.orderToolbar) PizzalinkToolbar orderToolbar; @BindView(R.id.stepperIndicator) StepperIndicator stepperIndicator; private FragmentManager fragmentManager; @@ -53,12 +52,6 @@ public class OrderActivity extends BaseActivity { } private void initViews(){ - orderToolbar.setBackIconClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - onBackPressed(); - } - }); fragmentManager = getSupportFragmentManager(); initStepIndicator(); openFragment(0); diff --git a/app/src/main/java/ch/pizzalink/android/activity/RegisterActivity.java b/app/src/main/java/ch/pizzalink/android/activity/RegisterActivity.java index cd8851a..477a0a7 100644 --- a/app/src/main/java/ch/pizzalink/android/activity/RegisterActivity.java +++ b/app/src/main/java/ch/pizzalink/android/activity/RegisterActivity.java @@ -39,7 +39,6 @@ import retrofit2.Response; public class RegisterActivity extends BaseActivity { - @BindView(R.id.registerToolbar) PizzalinkToolbar registerToolbar; @BindView(R.id.registerButton) Button registerButton; @BindViews({ R.id.firstnamePizzalinkEditText, R.id.lasstnamePizzalinkEditText, R.id.telephonePizzalinkEditText, R.id.emailPizzalinkEditText, @@ -69,7 +68,6 @@ public class RegisterActivity extends BaseActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_register); ButterKnife.bind(this); - initViews(); getZoneList(); getCountryList(); //setTestFields(); @@ -82,15 +80,6 @@ public class RegisterActivity extends BaseActivity { registerUser(); } - private void initViews(){ - registerToolbar.setBackIconClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - onBackPressed(); - } - }); - } - private boolean checkFields(){ for(PizzalinkEditText pizzalinkEditText : pizzalinkEditTextList){ diff --git a/app/src/main/java/ch/pizzalink/android/activity/UpdatePasswordActivity.java b/app/src/main/java/ch/pizzalink/android/activity/UpdatePasswordActivity.java index e320520..cf526a4 100644 --- a/app/src/main/java/ch/pizzalink/android/activity/UpdatePasswordActivity.java +++ b/app/src/main/java/ch/pizzalink/android/activity/UpdatePasswordActivity.java @@ -27,7 +27,6 @@ import retrofit2.Response; public class UpdatePasswordActivity extends BaseActivity { - @BindView(R.id.updatePasswordToolbar) PizzalinkToolbar updatePasswordToolbar; @BindView(R.id.oldPasswordPizzalinkEditText) PizzalinkEditText oldPasswordPizzalinkEditText; @BindView(R.id.newPasswordPizzalinkEditText) PizzalinkEditText newPasswordPizzalinkEditText; @BindView(R.id.confirmNewPasswordPizzalinkEditText) PizzalinkEditText confirmNewPasswordPizzalinkEditText; @@ -42,7 +41,6 @@ public class UpdatePasswordActivity extends BaseActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_update_password); ButterKnife.bind(this); - initViews(); } @OnClick(R.id.updatePasswordButton) @@ -52,15 +50,6 @@ public class UpdatePasswordActivity extends BaseActivity { updatePassword(); } - private void initViews(){ - updatePasswordToolbar.setBackIconClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - onBackPressed(); - } - }); - } - private boolean checkFields(){ if(oldPasswordPizzalinkEditText.isEmpty() || diff --git a/app/src/main/java/ch/pizzalink/android/activity/UpdateProfileActivity.java b/app/src/main/java/ch/pizzalink/android/activity/UpdateProfileActivity.java new file mode 100644 index 0000000..53159f6 --- /dev/null +++ b/app/src/main/java/ch/pizzalink/android/activity/UpdateProfileActivity.java @@ -0,0 +1,132 @@ +package ch.pizzalink.android.activity; + +import android.content.Intent; +import android.support.annotation.NonNull; +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.widget.Button; + +import com.afollestad.materialdialogs.DialogAction; +import com.afollestad.materialdialogs.MaterialDialog; + +import java.util.HashMap; + +import butterknife.BindString; +import butterknife.BindView; +import butterknife.ButterKnife; +import butterknife.OnClick; +import ch.pizzalink.android.R; +import ch.pizzalink.android.api.ApiEndPoints; +import ch.pizzalink.android.api.ApiErrorUtils; +import ch.pizzalink.android.api.ApiService; +import ch.pizzalink.android.api.ResponseObject; +import ch.pizzalink.android.helper.DialogHelper; +import ch.pizzalink.android.helper.SessionHelper; +import ch.pizzalink.android.model.UserModel; +import ch.pizzalink.android.view.PizzalinkEditText; +import retrofit2.Call; +import retrofit2.Callback; +import retrofit2.Response; + +public class UpdateProfileActivity extends BaseActivity { + + @BindView(R.id.firstnamePizzalinkEditText) PizzalinkEditText firstnamePizzalinkEditText; + @BindView(R.id.lasstnamePizzalinkEditText) PizzalinkEditText lasstnamePizzalinkEditText; + @BindView(R.id.telephonePizzalinkEditText) PizzalinkEditText telephonePizzalinkEditText; + @BindView(R.id.emailPizzalinkEditText) PizzalinkEditText emailPizzalinkEditText; + @BindView(R.id.updateProfileButton) Button updateProfileButton; + + @BindString(R.string.alert_fill_all_fields) String fillAllFieldsText; + @BindString(R.string.alert_invalid_email) String validEmailText; + @BindString(R.string.profile_updated) String profileUpdatedText; + + private UserModel userModel; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_update_profile); + ButterKnife.bind(this); + getDataFromIntent(); + setFields(); + } + + @OnClick(R.id.updateProfileButton) + public void onClick(){ + if(checkFields()) + updateProfile(); + } + + private void getDataFromIntent(){ + userModel = (UserModel) getIntent().getSerializableExtra("userModel"); + } + + private void setFields(){ + firstnamePizzalinkEditText.setText(userModel.getFirstname()); + lasstnamePizzalinkEditText.setText(userModel.getLastname()); + telephonePizzalinkEditText.setText(userModel.getTelephone()); + emailPizzalinkEditText.setText(userModel.getEmail()); + } + + private void updateProfile(){ + DialogHelper.showLoadingDialog(); + Call> call = ApiService.apiInterface.updateProfile( + ApiEndPoints.API_UPDATE_PROFILE + SessionHelper.getCustomerToken().getToken(), + getUpdateProfileParams()); + call.enqueue(new Callback>() { + @Override + public void onResponse(Call> call, final Response> response) { + DialogHelper.hideLoadingDialog(); + if(response.isSuccessful() && + response.body() != null && + response.body().isSuccess()){ + SessionHelper.saveCustomer(response.body().getData()); + DialogHelper.showOneButtonDialogWithCallback(profileUpdatedText, new MaterialDialog.SingleButtonCallback() { + @Override + public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) { + setResult(RESULT_OK); + finish(); + } + }); + } + else { + ApiErrorUtils.parseError(response); + } + } + + @Override + public void onFailure(Call> call, Throwable t) { + DialogHelper.hideLoadingDialog(); + DialogHelper.showFailedDialog(); + } + }); + } + + private HashMap getUpdateProfileParams(){ + HashMap params = new HashMap<>(); + params.put("firstname", firstnamePizzalinkEditText.getText()); + params.put("lastname", lasstnamePizzalinkEditText.getText()); + params.put("email", emailPizzalinkEditText.getText()); + params.put("telephone", telephonePizzalinkEditText.getText()); + return params; + } + + private boolean checkFields(){ + + if(firstnamePizzalinkEditText.isEmpty() || + lasstnamePizzalinkEditText.isEmpty() || + telephonePizzalinkEditText.isEmpty() || + emailPizzalinkEditText.isEmpty()){ + DialogHelper.showAlertDialog(BaseActivity.currentActivity, fillAllFieldsText); + return false; + } + + if(!emailPizzalinkEditText.isEmail()){ + DialogHelper.showAlertDialog(BaseActivity.currentActivity, validEmailText); + return false; + } + + return true; + } + +} diff --git a/app/src/main/java/ch/pizzalink/android/api/ApiEndPoints.java b/app/src/main/java/ch/pizzalink/android/api/ApiEndPoints.java index f6d3249..466104d 100644 --- a/app/src/main/java/ch/pizzalink/android/api/ApiEndPoints.java +++ b/app/src/main/java/ch/pizzalink/android/api/ApiEndPoints.java @@ -26,4 +26,5 @@ public class ApiEndPoints { public static final String API_GET_CUSTOMER_PROFILE = PREFIX + "getCustomerInfo" + SUFFIX; public static final String API_UPDATE_PASSWORD = PREFIX + "passwordUpdate" + SUFFIX + "&token="; public static final String API_DELETE_ADDRESS = PREFIX + "deleteAddress" + SUFFIX + "&token="; + public static final String API_UPDATE_PROFILE = PREFIX + "updateCustomerInfo" + SUFFIX + "&token="; } diff --git a/app/src/main/java/ch/pizzalink/android/api/ApiInterface.java b/app/src/main/java/ch/pizzalink/android/api/ApiInterface.java index 53d8279..661eca5 100644 --- a/app/src/main/java/ch/pizzalink/android/api/ApiInterface.java +++ b/app/src/main/java/ch/pizzalink/android/api/ApiInterface.java @@ -125,5 +125,8 @@ public interface ApiInterface { Call> deleteAddress(@Url String url, @Field("address_id") String addressId); + @FormUrlEncoded + @POST + Call> updateProfile(@Url String url, @FieldMap HashMap body); } diff --git a/app/src/main/java/ch/pizzalink/android/fragment/ProfileFragment.java b/app/src/main/java/ch/pizzalink/android/fragment/ProfileFragment.java index b5c3d82..d8daf01 100644 --- a/app/src/main/java/ch/pizzalink/android/fragment/ProfileFragment.java +++ b/app/src/main/java/ch/pizzalink/android/fragment/ProfileFragment.java @@ -21,6 +21,7 @@ import ch.pizzalink.android.activity.BaseActivity; import ch.pizzalink.android.activity.LoginActivity; import ch.pizzalink.android.activity.MyAddressesActivity; import ch.pizzalink.android.activity.UpdatePasswordActivity; +import ch.pizzalink.android.activity.UpdateProfileActivity; import ch.pizzalink.android.api.ApiErrorUtils; import ch.pizzalink.android.api.ApiService; import ch.pizzalink.android.api.ResponseObject; @@ -33,6 +34,8 @@ import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; +import static android.app.Activity.RESULT_OK; + /** * Created by cimenmus on 18/09/2017. */ @@ -44,6 +47,7 @@ public class ProfileFragment extends BaseFragment { @BindView(R.id.emailPizzalinkInfoLayout) PizzalinkInfoView emailPizzalinkInfoLayout; @BindView(R.id.phonePizzalinkInfoLayout) PizzalinkInfoView phonePizzalinkInfoLayout; @BindView(R.id.myAddressesLayout) RelativeLayout myAddressesLayout; + @BindView(R.id.updateProfileLayout) RelativeLayout updateProfileLayout; @BindView(R.id.updatePasswordLayout) RelativeLayout updatePasswordLayout; @BindView(R.id.logoutLayout) RelativeLayout logoutLayout; @@ -51,6 +55,9 @@ public class ProfileFragment extends BaseFragment { @BindString(R.string.alert_logout) String logoutAlertText; public static final java.lang.String FRAGMENT_NAME = "profileFragment"; + private int REQUEST_CODE_UPDATE_PROFILE = 2563; + + private UserModel userModel; public ProfileFragment() {} @@ -72,12 +79,18 @@ public class ProfileFragment extends BaseFragment { return view; } - @OnClick({R.id.myAddressesLayout, R.id.updatePasswordLayout, R.id.logoutLayout}) + @OnClick({R.id.myAddressesLayout, R.id.updatePasswordLayout, + R.id.updateProfileLayout, R.id.logoutLayout}) public void onClick(View view){ switch (view.getId()){ case R.id.myAddressesLayout: startActivity(new Intent(BaseActivity.currentActivity, MyAddressesActivity.class)); break; + case R.id.updateProfileLayout: + Intent updateProfileIntent = new Intent(BaseActivity.currentActivity, UpdateProfileActivity.class); + updateProfileIntent.putExtra("userModel", userModel); + startActivityForResult(updateProfileIntent, REQUEST_CODE_UPDATE_PROFILE); + break; case R.id.updatePasswordLayout: startActivity(new Intent(BaseActivity.currentActivity, UpdatePasswordActivity.class)); break; @@ -98,6 +111,19 @@ public class ProfileFragment extends BaseFragment { } } + @Override + public void onActivityResult(int requestCode, int resultCode, Intent data) { + super.onActivityResult(requestCode, resultCode, data); + if(requestCode == REQUEST_CODE_UPDATE_PROFILE && + resultCode == RESULT_OK){ + userModel = SessionHelper.getUser(); + firstnamePizzalinkInfoLayout.setText(userModel.getFirstname()); + lastnamePizzalinkInfoLayout.setText(userModel.getLastname()); + emailPizzalinkInfoLayout.setText(userModel.getEmail()); + phonePizzalinkInfoLayout.setText(userModel.getTelephone()); + } + } + private void initViews(){ setPizzalinkToolbarFields(false, fragmentTitle); } @@ -131,12 +157,13 @@ public class ProfileFragment extends BaseFragment { private void setFields(UserModel user){ user.checkNull(); - SessionHelper.saveCustomer(user); + userModel = user; + SessionHelper.saveCustomer(userModel); - firstnamePizzalinkInfoLayout.setText(user.getFirstname()); - lastnamePizzalinkInfoLayout.setText(user.getLastname()); - emailPizzalinkInfoLayout.setText(user.getEmail()); - phonePizzalinkInfoLayout.setText(user.getTelephone()); + firstnamePizzalinkInfoLayout.setText(userModel.getFirstname()); + lastnamePizzalinkInfoLayout.setText(userModel.getLastname()); + emailPizzalinkInfoLayout.setText(userModel.getEmail()); + phonePizzalinkInfoLayout.setText(userModel.getTelephone()); } private void logOutOnWeb(){ diff --git a/app/src/main/java/ch/pizzalink/android/helper/DialogHelper.java b/app/src/main/java/ch/pizzalink/android/helper/DialogHelper.java index eef9596..cf1325d 100644 --- a/app/src/main/java/ch/pizzalink/android/helper/DialogHelper.java +++ b/app/src/main/java/ch/pizzalink/android/helper/DialogHelper.java @@ -134,6 +134,18 @@ public class DialogHelper { .show(); } + public static void showOneButtonDialogWithCallback(String message, + MaterialDialog.SingleButtonCallback singleButtonCallback){ + new MaterialDialog.Builder(BaseActivity.currentActivity) + .title(R.string.app_name) + .content(message) + .positiveText(R.string.ok) + .onPositive(singleButtonCallback) + .show(); + } + + + /* public static void showPasswordResetDialog(final Context context) { new MaterialDialog.Builder(context) @@ -154,6 +166,18 @@ public class DialogHelper { } + + public static void showProfileUpdatedDialog(MaterialDialog.SingleButtonCallback singleButtonCallback) { + new MaterialDialog.Builder(BaseActivity.currentActivity) + .title(R.string.app_name) + .content(R.string.profile_updated) + .positiveText(R.string.ok) + .cancelable(false) + .onPositive(singleButtonCallback) + .show(); + } + */ + public static void showListDialog(ArrayList itemList, MaterialDialog.ListCallback listCallback){ new MaterialDialog.Builder(BaseActivity.currentActivity) .title(R.string.choose) diff --git a/app/src/main/java/ch/pizzalink/android/model/CustomerTokenModel.java b/app/src/main/java/ch/pizzalink/android/model/CustomerTokenModel.java index 1b34f11..99d81b3 100644 --- a/app/src/main/java/ch/pizzalink/android/model/CustomerTokenModel.java +++ b/app/src/main/java/ch/pizzalink/android/model/CustomerTokenModel.java @@ -3,6 +3,7 @@ package ch.pizzalink.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; +import java.io.Serializable; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Calendar; @@ -14,7 +15,7 @@ import ch.pizzalink.android.helper.DateTimeHelper; * Created by cimenmus on 26/09/2017. */ -public class CustomerTokenModel { +public class CustomerTokenModel implements Serializable { @Expose @SerializedName("customer_token") private String token; @Expose @SerializedName("token_death_time") private String expiresIn; diff --git a/app/src/main/java/ch/pizzalink/android/model/UserModel.java b/app/src/main/java/ch/pizzalink/android/model/UserModel.java index 3fcedb1..7dda978 100644 --- a/app/src/main/java/ch/pizzalink/android/model/UserModel.java +++ b/app/src/main/java/ch/pizzalink/android/model/UserModel.java @@ -3,11 +3,13 @@ package ch.pizzalink.android.model; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; +import java.io.Serializable; + /** * Created by cimenmus on 26/09/2017. */ -public class UserModel { +public class UserModel implements Serializable{ @Expose @SerializedName("customer_id") private String id; @Expose @SerializedName("address_id") private String addressId; diff --git a/app/src/main/java/ch/pizzalink/android/view/PizzalinkEditText.java b/app/src/main/java/ch/pizzalink/android/view/PizzalinkEditText.java index 51d1b39..1806798 100644 --- a/app/src/main/java/ch/pizzalink/android/view/PizzalinkEditText.java +++ b/app/src/main/java/ch/pizzalink/android/view/PizzalinkEditText.java @@ -153,6 +153,9 @@ public class PizzalinkEditText extends LinearLayout implements View.OnClickListe return editText.getText().toString(); } + public void setText(String text){ + editText.setText(text); + } public TextView getHintTextView() { return hintTextView; diff --git a/app/src/main/java/ch/pizzalink/android/view/PizzalinkToolbar.java b/app/src/main/java/ch/pizzalink/android/view/PizzalinkToolbar.java index d916942..b686648 100644 --- a/app/src/main/java/ch/pizzalink/android/view/PizzalinkToolbar.java +++ b/app/src/main/java/ch/pizzalink/android/view/PizzalinkToolbar.java @@ -72,6 +72,12 @@ public class PizzalinkToolbar extends Toolbar { hamburgerIcon.setVisibility(VISIBLE); if(showBackIcon) backIcon.setVisibility(VISIBLE); + backIcon.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + BaseActivity.currentActivity.onBackPressed(); + } + }); if(title != null) { toolbarTitleTextView.setText(title); toolbarTitleTextView.setVisibility(VISIBLE); @@ -95,10 +101,6 @@ public class PizzalinkToolbar extends Toolbar { hamburgerIcon.setVisibility(GONE); } - public void setBackIconClickListener(OnClickListener onClickListener){ - backIcon.setOnClickListener(onClickListener); - } - public ImageView getHamburgerIcon() { return hamburgerIcon; } diff --git a/app/src/main/res/layout/activity_update_profile.xml b/app/src/main/res/layout/activity_update_profile.xml new file mode 100644 index 0000000..61de096 --- /dev/null +++ b/app/src/main/res/layout/activity_update_profile.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + +