From 9f9274acf527eba1f72d9a5df5e86d456900611f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?mustafa=20ic=CC=A7men?= <mustafaicmen@gmail.com>
Date: Sun, 1 Oct 2017 23:51:59 +0300
Subject: [PATCH] login and register

---
 .idea/misc.xml                                |   2 +-
 .../android/activity/LoginActivity.java       |  96 +++++++++-
 .../android/activity/RegisterActivity.java    | 107 ++++++++++-
 .../android/activity/SplashActivity.java      |   5 +-
 .../recycler/PizzaRecyclerAdapter.java        | 131 +-------------
 .../pizzalink/android/api/ApiEndPoints.java   |   5 +-
 .../pizzalink/android/api/ApiInterface.java   |  21 +++
 .../android/fragment/order/PizzaFragment.java |  11 +-
 .../android/view/PizzalinkButton.java         |   3 +-
 .../android/view/PizzalinkEditText.java       |  17 +-
 .../android/view/PizzalinkToolbar.java        |  12 +-
 app/src/main/res/drawable/ic_back.xml         |   4 +
 app/src/main/res/drawable/pizzalink_logo.png  | Bin 21414 -> 7269 bytes
 app/src/main/res/layout/activity_login.xml    |  75 +++++++-
 app/src/main/res/layout/activity_register.xml |  23 ++-
 app/src/main/res/layout/activity_splash.xml   |   4 +-
 .../res/layout/layout_pizzalink_button.xml    |  12 +-
 .../res/layout/layout_pizzalink_toolbar.xml   |   9 +
 app/src/main/res/layout/row_pizza.xml         | 169 +-----------------
 app/src/main/res/values/attrs.xml             |   1 +
 app/src/main/res/values/colors.xml            |   1 +
 app/src/main/res/values/strings.xml           |  21 ++-
 app/src/main/res/values/styles.xml            |  11 ++
 23 files changed, 411 insertions(+), 329 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_back.xml

diff --git a/.idea/misc.xml b/.idea/misc.xml
index cca2cda..7158618 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/java/ch/pizzalink/android/activity/LoginActivity.java b/app/src/main/java/ch/pizzalink/android/activity/LoginActivity.java
index 4bc1e4a..db549f1 100644
--- a/app/src/main/java/ch/pizzalink/android/activity/LoginActivity.java
+++ b/app/src/main/java/ch/pizzalink/android/activity/LoginActivity.java
@@ -1,17 +1,111 @@
 package ch.pizzalink.android.activity;
 
-import android.support.v7.app.AppCompatActivity;
+import android.content.Intent;
+import android.graphics.Color;
 import android.os.Bundle;
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.style.ForegroundColorSpan;
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
 
+import butterknife.BindString;
+import butterknife.BindView;
 import butterknife.ButterKnife;
+import butterknife.OnClick;
 import ch.pizzalink.android.R;
+import ch.pizzalink.android.api.ApiErrorUtils;
+import ch.pizzalink.android.api.ApiService;
+import ch.pizzalink.android.helper.DialogHelper;
+import ch.pizzalink.android.helper.SharedPrefsHelper;
+import ch.pizzalink.android.model.responseModel.LoginCustomerResponseModel;
+import ch.pizzalink.android.view.PizzalinkButton;
+import ch.pizzalink.android.view.PizzalinkEditText;
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
 
 public class LoginActivity extends BaseActivity {
 
+    @BindView(R.id.emailPizzalinkEditText) PizzalinkEditText emailPizzalinkEditText;
+    @BindView(R.id.passwordPizzalinkEditText) PizzalinkEditText passwordPizzalinkEditText;
+    @BindView(R.id.loginButton) Button loginButton;
+    @BindView(R.id.registerTextView) TextView registerTextView;
+
+    @BindString(R.string.not_have_an_accaount) String notHaveAnAccountText;
+    @BindString(R.string.register_text) String registerText;
+    @BindString(R.string.alert_fill_all_fields) String fillAllFieldsText;
+    @BindString(R.string.alert_valid_email) String validEmailText;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_login);
         ButterKnife.bind(this);
+        initViews();
+    }
+
+    @OnClick({R.id.loginButton, R.id.registerTextView})
+    protected void onClick(View view){
+        switch (view.getId()){
+            case R.id.loginButton:
+                if(checkFields())
+                    login();
+                break;
+            case R.id.registerTextView:
+                startActivity(new Intent(LoginActivity.this, RegisterActivity.class));
+                break;
+        }
+    }
+
+    private void initViews(){
+        initRegisterTextView();
+        emailPizzalinkEditText.getEditText().setText("aytaccici@gmail.com");
+        passwordPizzalinkEditText.getEditText().setText("3522625");
+    }
+
+    private void initRegisterTextView(){
+        Spannable wordtoSpan = new SpannableString(notHaveAnAccountText + " " + registerText);
+        wordtoSpan.setSpan(new ForegroundColorSpan(Color.RED), 16, wordtoSpan.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        registerTextView.setText(wordtoSpan);
+    }
+
+    private boolean checkFields(){
+
+        if(emailPizzalinkEditText.isEmpty() || passwordPizzalinkEditText.isEmpty()){
+            DialogHelper.showAlertDialog(this, fillAllFieldsText);
+            return false;
+        }
+
+        if(!emailPizzalinkEditText.isEmail()){
+            DialogHelper.showAlertDialog(this, validEmailText);
+            return false;
+        }
+
+        return true;
+    }
+
+    private void login(){
+        Call<LoginCustomerResponseModel> call = ApiService.apiInterface.login(
+                emailPizzalinkEditText.getText(), passwordPizzalinkEditText.getText());
+        call.enqueue(new Callback<LoginCustomerResponseModel>() {
+            @Override
+            public void onResponse(Call<LoginCustomerResponseModel> call, Response<LoginCustomerResponseModel> response) {
+                if(response.isSuccessful()){
+                    SharedPrefsHelper.saveUser(response.body().getData());
+                    SharedPrefsHelper.saveCustomerToken(response.body().getData().getToken());
+                    SharedPrefsHelper.setCustomerLoggedIn(true);
+                    startActivity(new Intent(LoginActivity.this, MainActivity.class));
+                }
+                else
+                    ApiErrorUtils.parseError(response);
+            }
+
+            @Override
+            public void onFailure(Call<LoginCustomerResponseModel> call, Throwable t) {
+                DialogHelper.showFailedDialog();
+            }
+        });
     }
 }
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 d265c5b..3225662 100644
--- a/app/src/main/java/ch/pizzalink/android/activity/RegisterActivity.java
+++ b/app/src/main/java/ch/pizzalink/android/activity/RegisterActivity.java
@@ -1,17 +1,122 @@
 package ch.pizzalink.android.activity;
 
-import android.support.v7.app.AppCompatActivity;
+import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
 
+import java.util.List;
+
+import butterknife.BindString;
+import butterknife.BindView;
+import butterknife.BindViews;
 import butterknife.ButterKnife;
+import butterknife.OnClick;
 import ch.pizzalink.android.R;
+import ch.pizzalink.android.api.ApiErrorUtils;
+import ch.pizzalink.android.api.ApiService;
+import ch.pizzalink.android.helper.DialogHelper;
+import ch.pizzalink.android.helper.SharedPrefsHelper;
+import ch.pizzalink.android.model.responseModel.LoginCustomerResponseModel;
+import ch.pizzalink.android.view.PizzalinkButton;
+import ch.pizzalink.android.view.PizzalinkEditText;
+import ch.pizzalink.android.view.PizzalinkToolbar;
+import retrofit2.Call;
+import retrofit2.Callback;
+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,
+            R.id.passwordPizzalinkEditText, R.id.passwordAgainPizzalinkEditText,
+            R.id.address1PizzalinkEditText, R.id.address2PizzalinkEditText,
+            R.id.cityPizzalinkEditText, R.id.postcodePizzalinkEditText,
+            R.id.zonePizzalinkEditText, R.id.countryPizzalinkEditText})
+    List<PizzalinkEditText> pizzalinkEditTextList;
+
+    @BindString(R.string.alert_fill_all_fields) String fillAllFieldsText;
+    @BindString(R.string.alert_valid_email) String validEmailText;
+    @BindString(R.string.alert_passwords_not_matched) String passwordsNotMatchedText;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_register);
         ButterKnife.bind(this);
+        initViews();
+    }
+
+    @OnClick(R.id.registerButton)
+    protected void onClick(){
+        if(checkFields())
+            registerUser();
+    }
+
+    private void initViews(){
+        registerToolbar.setBackIconClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                onBackPressed();
+            }
+        });
+    }
+
+    private boolean checkFields(){
+
+        for(PizzalinkEditText pizzalinkEditText : pizzalinkEditTextList){
+            if(pizzalinkEditText.isEmpty()){
+                DialogHelper.showAlertDialog(this, fillAllFieldsText);
+                return false;
+            }
+        }
+
+        if(!pizzalinkEditTextList.get(3).isEmail()){
+            DialogHelper.showAlertDialog(this, validEmailText);
+            return false;
+        }
+
+        if(pizzalinkEditTextList
+                .get(4)
+                .getText()
+                .toLowerCase()
+                .equals(
+                        pizzalinkEditTextList
+                                .get(5)
+                                .getText()
+                                .toLowerCase())){
+            DialogHelper.showAlertDialog(this, passwordsNotMatchedText);
+            return false;
+        }
+
+        return true;
+    }
+
+    private void registerUser(){
+        Call<LoginCustomerResponseModel> call = ApiService.apiInterface.register(
+                pizzalinkEditTextList.get(0).getText(), pizzalinkEditTextList.get(1).getText(),pizzalinkEditTextList.get(2).getText(),
+                pizzalinkEditTextList.get(3).getText(),pizzalinkEditTextList.get(4).getText(),pizzalinkEditTextList.get(5).getText(),
+                pizzalinkEditTextList.get(6).getText(),pizzalinkEditTextList.get(7).getText(),pizzalinkEditTextList.get(8).getText(),
+                pizzalinkEditTextList.get(9).getText(),pizzalinkEditTextList.get(10).getText(),pizzalinkEditTextList.get(11).getText());
+        call.enqueue(new Callback<LoginCustomerResponseModel>() {
+            @Override
+            public void onResponse(Call<LoginCustomerResponseModel> call, Response<LoginCustomerResponseModel> response) {
+                if(response.isSuccessful()){
+                    SharedPrefsHelper.saveUser(response.body().getData());
+                    SharedPrefsHelper.saveCustomerToken(response.body().getData().getToken());
+                    SharedPrefsHelper.setCustomerLoggedIn(true);
+                    startActivity(new Intent(RegisterActivity.this, MainActivity.class));
+                }
+                else
+                    ApiErrorUtils.parseError(response);
+            }
+
+            @Override
+            public void onFailure(Call<LoginCustomerResponseModel> call, Throwable t) {
+                DialogHelper.showFailedDialog();
+            }
+        });
     }
 }
diff --git a/app/src/main/java/ch/pizzalink/android/activity/SplashActivity.java b/app/src/main/java/ch/pizzalink/android/activity/SplashActivity.java
index 30a3eef..b313009 100644
--- a/app/src/main/java/ch/pizzalink/android/activity/SplashActivity.java
+++ b/app/src/main/java/ch/pizzalink/android/activity/SplashActivity.java
@@ -34,7 +34,7 @@ public class SplashActivity extends BaseActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_splash);
         ButterKnife.bind(this);
-        DisplayHelper.changeStatusColor();
+        //DisplayHelper.changeStatusColor();
         if(NetworkHelper.isNetworkAvailable())
             getCategoryList();
         else
@@ -80,8 +80,7 @@ public class SplashActivity extends BaseActivity {
         handler.postDelayed(new Runnable() {
             @Override
             public void run() {
-                //startActivity(new Intent(SplashActivity.this, cls));
-                startActivity(new Intent(SplashActivity.this, RegisterActivity.class));
+                startActivity(new Intent(SplashActivity.this, cls));
                 finish();
             }
         }, 1000);
diff --git a/app/src/main/java/ch/pizzalink/android/adapter/recycler/PizzaRecyclerAdapter.java b/app/src/main/java/ch/pizzalink/android/adapter/recycler/PizzaRecyclerAdapter.java
index 6d3c77f..6673168 100644
--- a/app/src/main/java/ch/pizzalink/android/adapter/recycler/PizzaRecyclerAdapter.java
+++ b/app/src/main/java/ch/pizzalink/android/adapter/recycler/PizzaRecyclerAdapter.java
@@ -42,90 +42,24 @@ public class PizzaRecyclerAdapter extends RecyclerView.Adapter<RecyclerView.View
 
     private ArrayList<PizzaModel> pizzaList = new ArrayList<>();
     private RecyclerItemClickListener recyclerItemClickListener;
-    private CheckBoxChangedListener checkBoxChangedListener;
 
     public static class PizzaViewHolder extends RecyclerView.ViewHolder {
 
         @BindView(R.id.pizzaNameTextView) TextView pizzaNameTextView;
         @BindView(R.id.pizzaImageView) ImageView pizzaImageView;
         @BindView(R.id.pizzaIngredientsTextView) TextView pizzaIngredientsTextView;
-        @BindView(R.id.pizzaBottomLayout) LinearLayout pizzaBottomLayout;
-        @BindView(R.id.expandBottomLayoutImageView) ImageView expandBottomLayoutImageView;
-        @BindView(R.id.collapseBottomLayoutImageView) ImageView collapseBottomLayoutImageView;
 
-        @BindViews({ R.id.pizzaSize1CheckBox, R.id.pizzaSize2CheckBox, R.id.pizzaSize3CheckBox })
-        List<AppCompatCheckBox> pizzaSizeCheckBoxList;
-
-        @BindView(R.id.pizzaSize1Layout) LinearLayout pizzaSize1Layout;
-        @BindView(R.id.pizzaSize1NameTextView) TextView pizzaSize1NameTextView;
-        @BindView(R.id.pizzaSize1CheckBox) AppCompatCheckBox pizzaSize1CheckBox;
-        @BindView(R.id.pizzaSize1LengthTextView) TextView pizzaSize1LengthTextView;
-
-        @BindView(R.id.pizzaSize2Layout) LinearLayout pizzaSize2Layout;
-        @BindView(R.id.pizzaSize2NameTextView) TextView pizzaSize2NameTextView;
-        @BindView(R.id.pizzaSize2CheckBox) AppCompatCheckBox pizzaSize2CheckBox;
-        @BindView(R.id.pizzaSize2LengthTextView) TextView pizzaSize2LengthTextView;
-
-        @BindView(R.id.pizzaSize3Layout) LinearLayout pizzaSize3Layout;
-        @BindView(R.id.pizzaSize3NameTextView) TextView pizzaSize3NameTextView;
-        @BindView(R.id.pizzaSize3CheckBox) AppCompatCheckBox pizzaSize3CheckBox;
-        @BindView(R.id.pizzaSize3LengthTextView) TextView pizzaSize3LengthTextView;
-
-        @BindView(R.id.increasePizzaCountTextView) ImageView increasePizzaCountTextView;
-        @BindView(R.id.pizzaCountTextView) TextView pizzaCountTextView;
-        @BindView(R.id.deccreasePizzaCountTextView) ImageView deccreasePizzaCountTextView;
-
-        @BindView(R.id.pizzaPriceTextView) TextView pizzaPriceTextView;
-        @BindView(R.id.addPizzaToCartButton) Button addPizzaToCartButton;
-
-
-        public PizzaViewHolder(final View view,
-                               final RecyclerItemClickListener recyclerItemClickListener,
-                               final  CheckBoxChangedListener checkBoxChangedListener) {
+        public PizzaViewHolder(final View view, final RecyclerItemClickListener recyclerItemClickListener) {
             super(view);
             ButterKnife.bind(this, view);
-
             view.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
                     if(recyclerItemClickListener != null)
-                        recyclerItemClickListener.onItemClick(pizzaBottomLayout, getAdapterPosition());
+                        recyclerItemClickListener.onItemClick(view, getAdapterPosition());
                 }
             });
 
-            increasePizzaCountTextView.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View view) {
-                    if(recyclerItemClickListener != null)
-                        recyclerItemClickListener.onItemClick(increasePizzaCountTextView, getAdapterPosition());
-                }
-            });
-
-            deccreasePizzaCountTextView.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View view) {
-                    if(recyclerItemClickListener != null)
-                        recyclerItemClickListener.onItemClick(deccreasePizzaCountTextView, getAdapterPosition());
-                }
-            });
-
-            addPizzaToCartButton.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View view) {
-                    if(recyclerItemClickListener != null)
-                        recyclerItemClickListener.onItemClick(addPizzaToCartButton, getAdapterPosition());
-                }
-            });
-
-            for(final AppCompatCheckBox appCompatCheckBox : pizzaSizeCheckBoxList){
-                appCompatCheckBox.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        if(checkBoxChangedListener != null)
-                            checkBoxChangedListener.onCheckedChanged(appCompatCheckBox, getAdapterPosition());
-                    }
-                });
-            }
         }
     }
 
@@ -145,11 +79,9 @@ public class PizzaRecyclerAdapter extends RecyclerView.Adapter<RecyclerView.View
     }
 
     public PizzaRecyclerAdapter(ArrayList<PizzaModel> pizzaList,
-                                RecyclerItemClickListener recyclerItemClickListener,
-                                CheckBoxChangedListener checkBoxChangedListener){
+                                RecyclerItemClickListener recyclerItemClickListener){
         this.pizzaList = pizzaList;
         this.recyclerItemClickListener = recyclerItemClickListener;
-        this.checkBoxChangedListener = checkBoxChangedListener;
     }
 
     @Override
@@ -162,8 +94,8 @@ public class PizzaRecyclerAdapter extends RecyclerView.Adapter<RecyclerView.View
         switch (viewType){
 
             case HOLDER_PIZZA:
-                view = inflater.inflate(R.layout.row_pizza_2, viewGroup, false);
-                viewHolder = new PizzaViewHolder(view, recyclerItemClickListener, checkBoxChangedListener);
+                view = inflater.inflate(R.layout.row_pizza, viewGroup, false);
+                viewHolder = new PizzaViewHolder(view, recyclerItemClickListener);
                 break;
 
             case HOLDER_SPACE:
@@ -172,8 +104,8 @@ public class PizzaRecyclerAdapter extends RecyclerView.Adapter<RecyclerView.View
                 break;
 
             default:
-                view = inflater.inflate(R.layout.row_pizza_2, viewGroup, false);
-                viewHolder = new PizzaViewHolder(view, recyclerItemClickListener, checkBoxChangedListener);
+                view = inflater.inflate(R.layout.row_pizza, viewGroup, false);
+                viewHolder = new PizzaViewHolder(view, recyclerItemClickListener);
                 break;
         }
 
@@ -185,65 +117,18 @@ public class PizzaRecyclerAdapter extends RecyclerView.Adapter<RecyclerView.View
     public void onBindViewHolder(RecyclerView.ViewHolder holder, final int position) {
 
         switch (holder.getItemViewType()){
-
             case HOLDER_PIZZA :
                 PizzaViewHolder pizzaViewHolder = (PizzaViewHolder) holder;
                 pizzaViewHolder.pizzaNameTextView.setText(pizzaList.get(position).getName());
                 pizzaViewHolder.pizzaIngredientsTextView.setText(pizzaList.get(position).getIngredients());
-                pizzaViewHolder.pizzaCountTextView.setText(String.valueOf(pizzaList.get(position).getCount()));
                 ImageLoadHelper.loadImage(pizzaViewHolder.pizzaImageView, pizzaList.get(position).getImageURL());
-
-                if(pizzaList.get(position).isExpanded()){
-                    pizzaViewHolder.expandBottomLayoutImageView.setVisibility(View.GONE);
-                    pizzaViewHolder.collapseBottomLayoutImageView.setVisibility(View.VISIBLE);
-                    pizzaViewHolder.pizzaBottomLayout.setVisibility(View.VISIBLE);
-                }
-
-                else{
-                    pizzaViewHolder.expandBottomLayoutImageView.setVisibility(View.VISIBLE);
-                    pizzaViewHolder.collapseBottomLayoutImageView.setVisibility(View.GONE);
-                    pizzaViewHolder.pizzaBottomLayout.setVisibility(View.GONE);
-                }
-
-                if(pizzaList.get(position).getPizzaSizeList().size() == 0){
-                    pizzaViewHolder.pizzaSize1Layout.setVisibility(View.GONE);
-                    pizzaViewHolder.pizzaSize2Layout.setVisibility(View.GONE);
-                    pizzaViewHolder.pizzaSize3Layout.setVisibility(View.GONE);
-                }
-
-                else if(pizzaList.get(position).getPizzaSizeList().size() == 1){
-                    pizzaViewHolder.pizzaSize1Layout.setVisibility(View.VISIBLE);
-                    pizzaViewHolder.pizzaSize1NameTextView.setText(pizzaList.get(position).getPizzaSizeList().get(0).getName());
-                    pizzaViewHolder.pizzaSize2Layout.setVisibility(View.GONE);
-                    pizzaViewHolder.pizzaSize3Layout.setVisibility(View.GONE);
-
-
-                }
-
-                else if(pizzaList.get(position).getPizzaSizeList().size() == 2){
-                    pizzaViewHolder.pizzaSize1Layout.setVisibility(View.VISIBLE);
-                    pizzaViewHolder.pizzaSize1NameTextView.setText(pizzaList.get(position).getPizzaSizeList().get(0).getName());
-                    pizzaViewHolder.pizzaSize2Layout.setVisibility(View.VISIBLE);
-                    pizzaViewHolder.pizzaSize2NameTextView.setText(pizzaList.get(position).getPizzaSizeList().get(1).getName());
-                    pizzaViewHolder.pizzaSize3Layout.setVisibility(View.GONE);
-                }
-
-                else if(pizzaList.get(position).getPizzaSizeList().size() <= 3){
-                    pizzaViewHolder.pizzaSize1Layout.setVisibility(View.VISIBLE);
-                    pizzaViewHolder.pizzaSize1NameTextView.setText(pizzaList.get(position).getPizzaSizeList().get(0).getName());
-                    pizzaViewHolder.pizzaSize2Layout.setVisibility(View.VISIBLE);
-                    pizzaViewHolder.pizzaSize2NameTextView.setText(pizzaList.get(position).getPizzaSizeList().get(1).getName());
-                    pizzaViewHolder.pizzaSize3Layout.setVisibility(View.VISIBLE);
-                    pizzaViewHolder.pizzaSize3NameTextView.setText(pizzaList.get(position).getPizzaSizeList().get(2).getName());
-                }
-
                 break;
 
-
             case HOLDER_SPACE :
                 SpaceViewHolder spaceViewHolder = (SpaceViewHolder) holder;
                 break;
         }
+
     }
 
     @Override
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 f4c1317..861f179 100644
--- a/app/src/main/java/ch/pizzalink/android/api/ApiEndPoints.java
+++ b/app/src/main/java/ch/pizzalink/android/api/ApiEndPoints.java
@@ -3,7 +3,10 @@ package ch.pizzalink.android.api;
 public class ApiEndPoints {
 
     private static final String PREFIX = "pizza2/index.php?route=mobile/service/";
+    private static final String SUFFIX = "&is_mobile=1";
 
-    public static final String API_GET_ALL_CATEGORIES = PREFIX + "getAllCategories&is_mobile=1";
+    public static final String API_GET_ALL_CATEGORIES = PREFIX + "getAllCategories" + SUFFIX;
+    public static final String API_REGISTER = PREFIX + "signUp" + SUFFIX;
+    public static final String API_LOGIN = PREFIX + "login" + SUFFIX;
 
 }
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 2fc4aa1..a2b94a2 100644
--- a/app/src/main/java/ch/pizzalink/android/api/ApiInterface.java
+++ b/app/src/main/java/ch/pizzalink/android/api/ApiInterface.java
@@ -1,6 +1,7 @@
 package ch.pizzalink.android.api;
 
 import ch.pizzalink.android.model.responseModel.CategoryResponseModel;
+import ch.pizzalink.android.model.responseModel.LoginCustomerResponseModel;
 import retrofit2.Call;
 import retrofit2.http.Field;
 import retrofit2.http.FormUrlEncoded;
@@ -17,6 +18,26 @@ public interface ApiInterface {
     @GET(ApiEndPoints.API_GET_ALL_CATEGORIES)
     Call<CategoryResponseModel> getAllCategories();
 
+    @FormUrlEncoded
+    @POST(ApiEndPoints.API_REGISTER)
+    Call<LoginCustomerResponseModel> register(@Field("firstname") String firstname,
+                                              @Field("lastname") String lastname,
+                                              @Field("telephone") String telephone,
+                                              @Field("email") String email,
+                                              @Field("passsword") String passsword,
+                                              @Field("passsword1") String passswordRetype,
+                                              @Field("address_1") String addressLine1,
+                                              @Field("address_2") String addressLine2,
+                                              @Field("city") String passswocityrd,
+                                              @Field("postcode") String postcode,
+                                              @Field("country_id") String country_id,
+                                              @Field("zone_id") String zone_id);
+
+    @FormUrlEncoded
+    @POST(ApiEndPoints.API_LOGIN)
+    Call<LoginCustomerResponseModel> login(@Field("email") String email, @Field("password") String password);
+
+
     /*
     @GET(ApiEndPoints.API_GET_ALL_CATEGORIES)
     Call<CategoryListResponseModel> getAllCategories();
diff --git a/app/src/main/java/ch/pizzalink/android/fragment/order/PizzaFragment.java b/app/src/main/java/ch/pizzalink/android/fragment/order/PizzaFragment.java
index 80193b8..1e5cb05 100644
--- a/app/src/main/java/ch/pizzalink/android/fragment/order/PizzaFragment.java
+++ b/app/src/main/java/ch/pizzalink/android/fragment/order/PizzaFragment.java
@@ -66,14 +66,11 @@ public class PizzaFragment extends OrderBaseFragment {
 
     private void initRecyclerView(){
 
-        /*
-        GridLayoutManager layoutManager = new GridLayoutManager(BaseActivity.currentActivity, 2);
-        pizzaRecyclerView.addItemDecoration(new GridSpacesItemDecoration(DisplayHelper.dpToPx(12)));
-        */
 
         RecyclerItemClickListener recyclerItemClickListener = new RecyclerItemClickListener() {
             @Override
             public void onItemClick(View view, int position) {
+                /*
                 switch (view.getId()){
                     case R.id.increasePizzaCountTextView:
                         pizzaList.get(position).setCount(pizzaList.get(position).getCount() + 1);
@@ -96,6 +93,7 @@ public class PizzaFragment extends OrderBaseFragment {
                         pizzaRecyclerView.scrollToPosition(position);
                         break;
                 }
+                */
             }
         };
 
@@ -106,8 +104,9 @@ public class PizzaFragment extends OrderBaseFragment {
             }
         };
 
-        pizzaRecyclerAdapter = new PizzaRecyclerAdapter(pizzaList, recyclerItemClickListener, checkBoxChangedListener);
-        LinearLayoutManager layoutManager = new LinearLayoutManager(BaseActivity.currentActivity);
+        pizzaRecyclerAdapter = new PizzaRecyclerAdapter(pizzaList, recyclerItemClickListener);
+        GridLayoutManager layoutManager = new GridLayoutManager(BaseActivity.currentActivity, 2);
+        pizzaRecyclerView.addItemDecoration(new GridSpacesItemDecoration(DisplayHelper.dpToPx(12)));
         pizzaRecyclerView.setLayoutManager(layoutManager);
         pizzaRecyclerView.setAdapter(pizzaRecyclerAdapter);
     }
diff --git a/app/src/main/java/ch/pizzalink/android/view/PizzalinkButton.java b/app/src/main/java/ch/pizzalink/android/view/PizzalinkButton.java
index b7aaaaf..0ddaf5a 100644
--- a/app/src/main/java/ch/pizzalink/android/view/PizzalinkButton.java
+++ b/app/src/main/java/ch/pizzalink/android/view/PizzalinkButton.java
@@ -6,6 +6,7 @@ import android.support.v4.content.ContextCompat;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.Button;
+import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 
 import ch.pizzalink.android.R;
@@ -14,7 +15,7 @@ import ch.pizzalink.android.R;
  * Created by cimenmus on 28/09/2017.
  */
 
-public class PizzalinkButton extends RelativeLayout {
+public class PizzalinkButton extends LinearLayout {
 
     private View rootView;
     private boolean isEnabled;
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 823ecbf..0552e95 100644
--- a/app/src/main/java/ch/pizzalink/android/view/PizzalinkEditText.java
+++ b/app/src/main/java/ch/pizzalink/android/view/PizzalinkEditText.java
@@ -15,6 +15,7 @@ import android.widget.TextView;
 
 import ch.pizzalink.android.R;
 import ch.pizzalink.android.activity.BaseActivity;
+import ch.pizzalink.android.helper.PasswordHelper;
 
 /**
  * Created by cimenmus on 28/09/2017.
@@ -98,23 +99,33 @@ public class PizzalinkEditText extends LinearLayout implements View.OnClickListe
     }
 
     private void hideShowPassword(){
-
         if(isPasswordHidden)
             editText.setInputType(InputType.TYPE_TEXT_VARIATION_PASSWORD);
         else
             editText.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
-
         isPasswordHidden = !isPasswordHidden;
         editText.setTypeface(typeFace);
     }
 
     private void focusEditText(){
-
         editText.requestFocus();
         InputMethodManager inputMethodManager=(InputMethodManager)BaseActivity.currentActivity.getSystemService(Context.INPUT_METHOD_SERVICE);
         inputMethodManager.toggleSoftInput(InputMethodManager.SHOW_FORCED,0);
     }
 
+    public boolean isEmpty(){
+        return editText.getText().toString().isEmpty();
+    }
+
+    public boolean isEmail(){
+        return PasswordHelper.EMAIL_ADDRESS_PATTERN.matcher(editText.getText()).matches();
+    }
+
+    public String getText(){
+        return editText.getText().toString();
+    }
+
+
     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 8d3fb3f..d916942 100644
--- a/app/src/main/java/ch/pizzalink/android/view/PizzalinkToolbar.java
+++ b/app/src/main/java/ch/pizzalink/android/view/PizzalinkToolbar.java
@@ -21,8 +21,8 @@ public class PizzalinkToolbar extends Toolbar {
 
     private View rootView;
     private TextView toolbarTitleTextView;
-    private ImageView hamburgerIcon;
-    private boolean showHamburgerIcon;
+    private ImageView hamburgerIcon, backIcon;
+    private boolean showHamburgerIcon, showBackIcon;
     private String title;
     private int toolbarBackgroundColor, titleTextColor;
 
@@ -44,6 +44,7 @@ public class PizzalinkToolbar extends Toolbar {
         TypedArray a = context.getTheme().obtainStyledAttributes(attrs, R.styleable.PizzalinkToolbar, 0, 0);
         try {
             showHamburgerIcon = a.getBoolean(R.styleable.PizzalinkToolbar_showHamburgerMenuIcon, false);
+            showBackIcon = a.getBoolean(R.styleable.PizzalinkToolbar_showBackIcon, false);
             title = a.getString(R.styleable.PizzalinkToolbar_title);
             /*
             toolbarBackgroundColor = a.getColor(R.styleable.PizzalinkToolbar_toolbarBackgroundColor,
@@ -66,8 +67,11 @@ public class PizzalinkToolbar extends Toolbar {
         //this.setBackgroundResource(toolbarBackgroundColor);
         //toolbarTitleTextView.setTextColor(titleTextColor);
         hamburgerIcon = (ImageView) rootView.findViewById(R.id.hamburgerIcon);
+        backIcon = (ImageView) rootView.findViewById(R.id.backIcon);
         if(showHamburgerIcon)
             hamburgerIcon.setVisibility(VISIBLE);
+        if(showBackIcon)
+            backIcon.setVisibility(VISIBLE);
         if(title != null) {
             toolbarTitleTextView.setText(title);
             toolbarTitleTextView.setVisibility(VISIBLE);
@@ -91,6 +95,10 @@ 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/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml
new file mode 100644
index 0000000..f2ec6b9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_back.xml
@@ -0,0 +1,4 @@
+<vector android:height="20dp" android:viewportHeight="240.823"
+    android:viewportWidth="240.823" android:width="20dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffff" android:pathData="M57.63,129.01L165.93,237.27c4.75,4.74 12.45,4.74 17.22,0c4.75,-4.74 4.75,-12.44 0,-17.18l-99.71,-99.67l99.69,-99.67c4.75,-4.74 4.75,-12.44 0,-17.19c-4.75,-4.74 -12.46,-4.74 -17.22,0L57.62,111.82C52.94,116.51 52.94,124.33 57.63,129.01z"/>
+</vector>
diff --git a/app/src/main/res/drawable/pizzalink_logo.png b/app/src/main/res/drawable/pizzalink_logo.png
index b995f6d1da13205531ed232b4179e4f01ab3fac3..d4d796d5de885d293ed3b41229236fc0faf3829d 100644
GIT binary patch
literal 7269
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

literal 21414
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
X$6l>5wxv*iwg(^%8|xM7I7a;snkFTJ

diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index c59e4a7..2788890 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -7,8 +7,81 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:background="@color/white"
-    tools:context="ch.pizzalink.android.activity.LoginActivity">
+    tools:context="ch.pizzalink.android.activity.LoginActivity"
+    android:focusable="true"
+    android:focusableInTouchMode="true">
 
+    <ch.pizzalink.android.view.PizzalinkToolbar
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:title="@string/activity_title_login"
+        android:background="@color/white"
+        app:titleTextColor="@color/black" />
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_above="@+id/loginLayout">
+
+            <ImageView
+                android:layout_width="180dp"
+                android:layout_height="wrap_content"
+                android:adjustViewBounds="true"
+                android:scaleType="fitXY"
+                android:layout_centerInParent="true"
+                android:text="Hello World!"
+                android:src="@drawable/pizzalink_logo"/>
+
+        </RelativeLayout>
+
+        <LinearLayout
+            android:id="@+id/loginLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_centerInParent="true">
+
+            <ch.pizzalink.android.view.PizzalinkEditText
+                android:id="@+id/emailPizzalinkEditText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:hint="@string/email"/>
+
+            <ch.pizzalink.android.view.PizzalinkEditText
+                android:id="@+id/passwordPizzalinkEditText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:hint="@string/password"/>
+
+            <android.support.v4.widget.Space
+                android:layout_width="match_parent"
+                android:layout_height="24dp" />
+
+            <Button
+                android:id="@+id/loginButton"
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginBottom="16dp"
+                android:text="@string/button_login"
+                style="@style/PizzalinkButton" />
+
+            <TextView
+                android:id="@+id/registerTextView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/register_text"
+                android:layout_gravity="center_horizontal"
+                android:textColor="@color/black"
+                android:padding="24dp" />
+
+        </LinearLayout>
+
+    </RelativeLayout>
 
 
 
diff --git a/app/src/main/res/layout/activity_register.xml b/app/src/main/res/layout/activity_register.xml
index 8d64756..a86bc41 100644
--- a/app/src/main/res/layout/activity_register.xml
+++ b/app/src/main/res/layout/activity_register.xml
@@ -7,7 +7,9 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:background="@color/white"
-    tools:context="ch.pizzalink.android.activity.RegisterActivity">
+    tools:context="ch.pizzalink.android.activity.RegisterActivity"
+    android:focusable="true"
+    android:focusableInTouchMode="true">
 
     <ch.pizzalink.android.view.PizzalinkToolbar
         android:id="@+id/registerToolbar"
@@ -15,6 +17,7 @@
         android:layout_height="wrap_content"
         app:title="@string/activity_title_register"
         android:background="@color/white"
+        app:showBackIcon="true"
         app:titleTextColor="@color/black" />
 
     <ScrollView
@@ -94,6 +97,18 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 app:hint="@string/postcode"/>
+
+            <ch.pizzalink.android.view.PizzalinkEditText
+                android:id="@+id/zonePizzalinkEditText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:hint="@string/zone"/>
+
+            <ch.pizzalink.android.view.PizzalinkEditText
+                android:id="@+id/countryPizzalinkEditText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:hint="@string/county"/>
             
             <android.support.v4.widget.Space
                 android:layout_width="match_parent"
@@ -103,14 +118,14 @@
 
     </ScrollView>
 
-    <ch.pizzalink.android.view.PizzalinkButton
+    <Button
         android:id="@+id/registerButton"
         android:layout_width="match_parent"
         android:layout_height="48dp"
         android:layout_marginTop="16dp"
         android:layout_marginBottom="16dp"
-        app:isEnabled="false"
-        app:text="@string/activity_title_register"
+        style="@style/PizzalinkButton"
+        android:text="@string/button_register"
         android:layout_alignParentBottom="true" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
index bb7bc34..19dfbbf 100644
--- a/app/src/main/res/layout/activity_splash.xml
+++ b/app/src/main/res/layout/activity_splash.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="ch.pizzalink.android.activity.SplashActivity"
-    android:background="@color/black">
+    android:background="@color/white">
 
     <ImageView
         android:layout_width="match_parent"
@@ -15,7 +15,7 @@
         android:scaleType="fitXY"
         android:layout_centerInParent="true"
         android:text="Hello World!"
-        android:layout_margin="48dp"
+        android:layout_margin="24dp"
         android:src="@drawable/pizzalink_logo"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/layout_pizzalink_button.xml b/app/src/main/res/layout/layout_pizzalink_button.xml
index b00a0f8..f072481 100644
--- a/app/src/main/res/layout/layout_pizzalink_button.xml
+++ b/app/src/main/res/layout/layout_pizzalink_button.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="match_parent"
@@ -10,11 +10,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:textSize="12sp"
-        android:layout_marginLeft="12dp"
-        android:layout_marginStart="12dp"
-        android:layout_marginRight="12dp"
-        android:layout_marginEnd="12dp"
+        android:layout_marginLeft="24dp"
+        android:layout_marginStart="24dp"
+        android:layout_marginRight="24dp"
+        android:layout_marginEnd="24dp"
         android:textColor="@color/white"
         android:background="@drawable/background_button_enabled"/>
 
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_pizzalink_toolbar.xml b/app/src/main/res/layout/layout_pizzalink_toolbar.xml
index e05d505..ca936f8 100644
--- a/app/src/main/res/layout/layout_pizzalink_toolbar.xml
+++ b/app/src/main/res/layout/layout_pizzalink_toolbar.xml
@@ -30,6 +30,15 @@
             android:src="@drawable/ic_hamburger_menu"
             android:visibility="gone"/>
 
+        <ImageView
+            android:id="@+id/backIcon"
+            android:layout_width="?attr/actionBarSize"
+            android:layout_height="?attr/actionBarSize"
+            android:padding="20dp"
+            android:layout_centerVertical="true"
+            android:src="@drawable/ic_back"
+            android:visibility="gone"/>
+
         <TextView
             android:id="@+id/toolbarTitleTextView"
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/row_pizza.xml b/app/src/main/res/layout/row_pizza.xml
index 5768375..4f06520 100644
--- a/app/src/main/res/layout/row_pizza.xml
+++ b/app/src/main/res/layout/row_pizza.xml
@@ -44,183 +44,16 @@
             android:gravity="center"
             android:text="Mozzarella, Artischocken, Pilze, Peperoni, Oliven, Oregano"/>
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:layout_margin="12dp">
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:layout_marginRight="4dp"
-                android:layout_marginEnd="4dp"
-                android:layout_weight="1">
-
-                <ImageView
-                    android:id="@+id/increasePizzaCountTextView"
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:paddingLeft="4dp"
-                    android:paddingStart="4dp"
-                    android:paddingRight="4dp"
-                    android:paddingEnd="4dp"
-                    android:layout_gravity="center_horizontal"
-                    android:src="@drawable/ic_up_black" />
-
-                <TextView
-                    android:id="@+id/pizzaCountTextView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="1"
-                    android:textStyle="bold"
-                    android:textSize="12sp"
-                    android:layout_marginTop="4dp"
-                    android:layout_gravity="center_horizontal"
-                    android:textColor="@color/black"/>
-
-                <ImageView
-                    android:id="@+id/deccreasePizzaCountTextView"
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:padding="4dp"
-                    android:layout_margin="4dp"
-                    android:layout_gravity="center_horizontal"
-                    android:src="@drawable/ic_down_black"/>
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:layout_marginRight="4dp"
-                android:layout_marginEnd="4dp"
-                android:layout_weight="1">
-
-                <TextView
-                    android:id="@+id/pizzaSize1NameTextView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="Klein"
-                    android:textSize="10sp"
-                    android:layout_gravity="center_horizontal"
-                    android:textColor="@color/black"/>
-
-                <android.support.v7.widget.AppCompatCheckBox
-                    android:id="@+id/pizzaSize1CheckBox"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginTop="4dp"
-                    />
-
-                <TextView
-                    android:id="@+id/pizzaSize1LengthTextView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="26cm"
-                    android:textSize="12sp"
-                    android:layout_marginTop="4dp"
-                    android:layout_gravity="center_horizontal"
-                    android:textColor="@color/black"/>
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:layout_marginRight="4dp"
-                android:layout_marginEnd="4dp"
-                android:layout_weight="1">
-
-                <TextView
-                    android:id="@+id/pizzaSize2NameTextView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="Normal"
-                    android:textSize="10sp"
-                    android:layout_gravity="center_horizontal"
-                    android:textColor="@color/black"/>
-
-                <android.support.v7.widget.AppCompatCheckBox
-                    android:id="@+id/pizzaSize2CheckBox"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginTop="4dp"
-                    />
-
-                <TextView
-                    android:id="@+id/pizzaSize2LengthTextView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="32cm"
-                    android:textSize="12sp"
-                    android:layout_marginTop="4dp"
-                    android:layout_gravity="center_horizontal"
-                    android:textColor="@color/black"/>
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:layout_marginRight="4dp"
-                android:layout_marginEnd="4dp"
-                android:layout_weight="1">
-
-                <TextView
-                    android:id="@+id/pizzaSize3NameTextView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="Gross"
-                    android:textSize="10sp"
-                    android:layout_gravity="center_horizontal"
-                    android:textColor="@color/black"/>
-
-                <android.support.v7.widget.AppCompatCheckBox
-                    android:id="@+id/pizzaSize3CheckBox"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginTop="4dp"
-                    />
-
-                <TextView
-                    android:id="@+id/pizzaSize3LengthTextView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="50cm"
-                    android:textSize="12sp"
-                    android:layout_marginTop="4dp"
-                    android:layout_gravity="center_horizontal"
-                    android:textColor="@color/black"/>
-
-            </LinearLayout>
-
-        </LinearLayout>
-
         <TextView
             android:id="@+id/pizzaPriceTextView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="@android:color/black"
             android:text="CHF 25.00"
+            android:padding="16dp"
             android:textStyle="bold"
             android:layout_gravity="center_horizontal" />
 
-        <Button
-            android:id="@+id/addPizzaToCartTextView"
-            android:layout_width="match_parent"
-            android:layout_height="36dp"
-            android:layout_margin="12dp"
-            style="@style/AddCartButton"
-            android:text="Add to Cart"/>
-
     </LinearLayout>
 
 </android.support.v7.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index edf0313..fe61be9 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -3,6 +3,7 @@
 
     <declare-styleable name="PizzalinkToolbar">
         <attr name="showHamburgerMenuIcon" format="boolean" />
+        <attr name="showBackIcon" format="boolean" />
         <attr name="title" format="string" />
         <attr name="toolbarBackgroundColor" format="reference" />
         <attr name="toolbarTitleTextColor" format="reference" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 980e0d7..e45b0e2 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -23,5 +23,6 @@
     <color name="quartz">#DCDCDD</color>
     <color name="venus">#7F797C</color>
 
+    <color name="background_splash">#F4F4F4</color>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 01bff12..7259a23 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -44,8 +44,8 @@
     <string name="fragment_title_item_beer_drinks">Beer</string>
     <string name="fragment_title_dessert">Dessert</string>
 
-    <!-- LoginActivity-->
-    <string name="activity_title_login">Giriş Yap</string>
+    <!-- RegisterActivity-->
+    <string name="activity_title_register">Kayıt Ol</string>
     <string name="firstname">Ad</string>
     <string name="lastname">Soyad</string>
     <string name="telephone">Telefon Numarası</string>
@@ -56,11 +56,20 @@
     <string name="addres_line_2">Adres 2</string>
     <string name="city">Şehir</string>
     <string name="postcode">Posta Kodu</string>
-    <!-- LoginActivity-->
+    <string name="county">Ülke</string>
+    <string name="zone">Bölge</string>
+    <string name="alert_fill_all_fields">Lütfen istenen tüm bigileri doldurunuz.</string>
+    <string name="alert_valid_email">Lütfen geçerli bir mail adresi giriniz.</string>
+    <string name="alert_passwords_not_matched">Şifreler uyuşmuyor..</string>
+    <string name="button_register">KAYIT OL</string>
+    <!-- RegisterActivity-->
 
-    <!-- RegisterActivity-->
-    <string name="activity_title_register">Kayıt Ol</string>
-    <!-- RegisterActivity-->
+    <!-- LoginActivity-->
+    <string name="activity_title_login">Giriş Yap</string>
+    <string name="button_login">GİRİŞ YAP</string>
+    <string name="not_have_an_accaount">Hesabın yok mu?</string>
+    <string name="register_text">KAYIT OL</string>
+    <!-- LoginActivity-->
 
     <string name="alert">Uyarı</string>
     <string name="error_message">Bir hata oluştu.</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index e929440..ecec561 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -21,4 +21,15 @@
         <item name="android:textAllCaps">false</item>
     </style>
 
+    <style name="PizzalinkButton">
+        <item name="android:background">@drawable/background_button_enabled</item>
+        <item name="android:textColor">@color/red</item>
+        <item name="android:layout_marginLeft">24dp</item>
+        <item name="android:layout_marginStart">24dp</item>
+        <item name="android:layout_marginRight">24dp</item>
+        <item name="android:layout_marginEnd">24dp</item>
+        <item name="android:textSize">12sp</item>
+        <item name="android:textAllCaps">false</item>
+    </style>
+
 </resources>