profile update

app/src/main/AndroidManifest.xml

@@ -41,7 +41,8 @@
             android:screenOrientation="portrait" />
         <activity android:name=".activity.MyAddressesActivity" />
         <activity android:name=".activity.UpdatePasswordActivity" />
-        <activity android:name=".activity.AddAddressActivity"></activity>
+        <activity android:name=".activity.AddAddressActivity" />
+        <activity android:name=".activity.UpdateProfileActivity"></activity>
     </application>
 
 </manifest>

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<ResponseObject> call, Response<ResponseObject> 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);

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);
     }

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();
     }
 

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);

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){

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() ||

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<ResponseObject<UserModel>> call = ApiService.apiInterface.updateProfile(
+                ApiEndPoints.API_UPDATE_PROFILE + SessionHelper.getCustomerToken().getToken(),
+                getUpdateProfileParams());
+        call.enqueue(new Callback<ResponseObject<UserModel>>() {
+            @Override
+            public void onResponse(Call<ResponseObject<UserModel>> call, final Response<ResponseObject<UserModel>> 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<ResponseObject<UserModel>> call, Throwable t) {
+                DialogHelper.hideLoadingDialog();
+                DialogHelper.showFailedDialog();
+            }
+        });
+    }
+
+    private HashMap<String, Object> getUpdateProfileParams(){
+        HashMap<String, Object> 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;
+    }
+
+}

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=";
 }

app/src/main/java/ch/pizzalink/android/api/ApiInterface.java

@@ -125,5 +125,8 @@ public interface ApiInterface {
     Call<ResponseObject<DeleteAddressResponseModel>> deleteAddress(@Url String url,
                                                                    @Field("address_id") String addressId);
 
+    @FormUrlEncoded
+    @POST
+    Call<ResponseObject<UserModel>> updateProfile(@Url String url, @FieldMap HashMap<String, Object> body);
 
 }

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());
+        firstnamePizzalinkInfoLayout.setText(userModel.getFirstname());
-        lastnamePizzalinkInfoLayout.setText(user.getLastname());
+        lastnamePizzalinkInfoLayout.setText(userModel.getLastname());
-        emailPizzalinkInfoLayout.setText(user.getEmail());
+        emailPizzalinkInfoLayout.setText(userModel.getEmail());
-        phonePizzalinkInfoLayout.setText(user.getTelephone());
+        phonePizzalinkInfoLayout.setText(userModel.getTelephone());
     }
 
     private void logOutOnWeb(){

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<String> itemList, MaterialDialog.ListCallback listCallback){
         new MaterialDialog.Builder(BaseActivity.currentActivity)
                 .title(R.string.choose)

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;

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;

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;

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;
     }

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

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    tools:context="ch.pizzalink.android.activity.UpdateProfileActivity">
+
+    <ch.pizzalink.android.view.PizzalinkToolbar
+        android:id="@+id/updateProfileToolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:title="@string/activity_title_update_profile"
+        android:background="@color/white"
+        app:showBackIcon="true"
+        app:titleTextColor="@color/black" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_below="@+id/updateProfileToolbar"
+        android:layout_above="@+id/updateProfileButton">
+
+        <ch.pizzalink.android.view.PizzalinkEditText
+            android:id="@+id/firstnamePizzalinkEditText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:inputType="name"
+            app:hint="@string/firstname"/>
+
+        <ch.pizzalink.android.view.PizzalinkEditText
+            android:id="@+id/lasstnamePizzalinkEditText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:inputType="name"
+            app:hint="@string/lastname"/>
+
+        <ch.pizzalink.android.view.PizzalinkEditText
+            android:id="@+id/telephonePizzalinkEditText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:hint="@string/telephone"
+            app:inputType="phone"/>
+
+        <ch.pizzalink.android.view.PizzalinkEditText
+            android:id="@+id/emailPizzalinkEditText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:hint="@string/email"
+            app:inputType="email"/>
+
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/updateProfileButton"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="16dp"
+        style="@style/PizzalinkButton"
+        android:text="@string/update_app"
+        android:layout_alignParentBottom="true" />
+
+
+
+</RelativeLayout>

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

@@ -80,6 +80,44 @@
             android:layout_height="1dp"
             android:background="@drawable/shadow"/>
 
+        <RelativeLayout
+            android:id="@+id/updateProfileLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="16dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/update_profile"
+                android:layout_marginTop="4dp"
+                android:textColor="@color/black"
+                android:layout_centerVertical="true"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
+                android:layout_toLeftOf="@+id/arrow2"
+                android:layout_toStartOf="@+id/arrow2"/>
+
+            <ImageView
+                android:id="@+id/arrow2"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_alignParentRight="true"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:src="@drawable/ic_back"
+                android:tint="@color/venus"
+                android:padding="6dp"
+                android:rotation="180"/>
+
+        </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@drawable/shadow"/>
+
+
         <RelativeLayout
             android:id="@+id/updatePasswordLayout"
             android:layout_width="match_parent"
@@ -95,11 +133,11 @@
                 android:layout_centerVertical="true"
                 android:layout_alignParentLeft="true"
                 android:layout_alignParentStart="true"
-                android:layout_toLeftOf="@+id/arrow2"
+                android:layout_toLeftOf="@+id/arrow3"
-                android:layout_toStartOf="@+id/arrow2"/>
+                android:layout_toStartOf="@+id/arrow3"/>
 
             <ImageView
-                android:id="@+id/arrow2"
+                android:id="@+id/arrow3"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:layout_alignParentRight="true"

app/src/main/res/values/strings.xml

@@ -159,6 +159,7 @@
     <string name="profile_telephone">TELEFON NUMARASI</string>
     <string name="profile_email">EMAIL</string>
     <string name="my_addresses">Adreslerim</string>
+    <string name="update_profile">Profilimi Güncelle</string>
     <string name="update_password">Şifremi Güncelle</string>
     <!-- ProfileFragment-->
 
@@ -166,6 +167,11 @@
     <string name="order_successed">Siparişiniz başarı ile alınmıştır. Siparişinizin detaylarını sipariş geçmişinden görebilir ve siparişinizi takip edebilirsiniz.</string>
     <!-- OrderSummaryFragment-->
 
+    <!-- UpdateProfilectivity-->
+    <string name="activity_title_update_profile">Profilimi Güncelle</string>
+    <string name="profile_updated">Profil bilgileriniz başarı ile güncellenmiştir.</string>
+    <!-- UpdateProfilectivity-->
+
     <!-- UpdatePasswordActivity-->
     <string name="activity_title_update_password">Şifre Güncelle</string>
     <string name="hint_old_password">Eski Şifre</string>