diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
index fb90749..b962824 100644
--- a/.idea/assetWizardSettings.xml
+++ b/.idea/assetWizardSettings.xml
@@ -55,7 +55,25 @@
-
+
+
+
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 99202cc..c0f68ed 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -25,7 +25,7 @@
-
+
diff --git a/app/src/main/java/ch/pizzapp/android/fragment/ProfileFragment.java b/app/src/main/java/ch/pizzapp/android/fragment/ProfileFragment.java
index fba9812..eff358f 100644
--- a/app/src/main/java/ch/pizzapp/android/fragment/ProfileFragment.java
+++ b/app/src/main/java/ch/pizzapp/android/fragment/ProfileFragment.java
@@ -41,14 +41,11 @@ import static android.app.Activity.RESULT_OK;
public class ProfileFragment extends BaseFragment {
- @BindView(R.id.firstnamePizzalinkInfoLayout)
- AppInfoView firstnamePizzalinkInfoLayout;
- @BindView(R.id.lastnamePizzalinkInfoLayout)
- AppInfoView lastnamePizzalinkInfoLayout;
- @BindView(R.id.emailPizzalinkInfoLayout)
- AppInfoView emailPizzalinkInfoLayout;
- @BindView(R.id.phonePizzalinkInfoLayout)
- AppInfoView phonePizzalinkInfoLayout;
+ @BindView(R.id.pizzapassCountPizzalinkInfoLayout) AppInfoView pizzapassCountPizzalinkInfoLayout;
+ @BindView(R.id.firstnamePizzalinkInfoLayout) AppInfoView firstnamePizzalinkInfoLayout;
+ @BindView(R.id.lastnamePizzalinkInfoLayout) AppInfoView lastnamePizzalinkInfoLayout;
+ @BindView(R.id.emailPizzalinkInfoLayout) AppInfoView emailPizzalinkInfoLayout;
+ @BindView(R.id.phonePizzalinkInfoLayout) AppInfoView phonePizzalinkInfoLayout;
@BindView(R.id.myAddressesLayout) RelativeLayout myAddressesLayout;
@BindView(R.id.updateProfileLayout) RelativeLayout updateProfileLayout;
@BindView(R.id.updatePasswordLayout) RelativeLayout updatePasswordLayout;
@@ -120,6 +117,7 @@ public class ProfileFragment extends BaseFragment {
if(requestCode == REQUEST_CODE_UPDATE_PROFILE &&
resultCode == RESULT_OK){
userModel = SessionHelper.getUser();
+ pizzapassCountPizzalinkInfoLayout.setText(userModel.getPizzapassCount());
firstnamePizzalinkInfoLayout.setText(userModel.getFirstname());
lastnamePizzalinkInfoLayout.setText(userModel.getLastname());
emailPizzalinkInfoLayout.setText(userModel.getEmail());
@@ -163,6 +161,7 @@ public class ProfileFragment extends BaseFragment {
userModel = user;
SessionHelper.saveCustomer(userModel);
+ pizzapassCountPizzalinkInfoLayout.setText(userModel.getPizzapassCount());
firstnamePizzalinkInfoLayout.setText(userModel.getFirstname());
lastnamePizzalinkInfoLayout.setText(userModel.getLastname());
emailPizzalinkInfoLayout.setText(userModel.getEmail());
diff --git a/app/src/main/java/ch/pizzapp/android/model/UserModel.java b/app/src/main/java/ch/pizzapp/android/model/UserModel.java
index 3760b5a..113ef31 100644
--- a/app/src/main/java/ch/pizzapp/android/model/UserModel.java
+++ b/app/src/main/java/ch/pizzapp/android/model/UserModel.java
@@ -13,6 +13,7 @@ public class UserModel implements Serializable{
@Expose @SerializedName("customer_id") private String id;
@Expose @SerializedName("address_id") private String addressId;
+ @Expose @SerializedName("pizza_pass_count") private String pizzapassCount;
private String firstname;
private String lastname;
private String email;
@@ -39,6 +40,9 @@ public class UserModel implements Serializable{
if(telephone == null)
telephone = "";
+ if(pizzapassCount == null)
+ pizzapassCount = "";
+
if(token != null)
token.checkNull();
}
@@ -102,4 +106,12 @@ public class UserModel implements Serializable{
public void setToken(CustomerTokenModel token) {
this.token = token;
}
+
+ public String getPizzapassCount() {
+ return pizzapassCount;
+ }
+
+ public void setPizzapassCount(String pizzapassCount) {
+ this.pizzapassCount = pizzapassCount;
+ }
}
diff --git a/app/src/main/res/drawable/ic_diamond.xml b/app/src/main/res/drawable/ic_diamond.xml
new file mode 100644
index 0000000..a53ad97
--- /dev/null
+++ b/app/src/main/res/drawable/ic_diamond.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
index 6736310..71ace17 100644
--- a/app/src/main/res/layout/fragment_profile.xml
+++ b/app/src/main/res/layout/fragment_profile.xml
@@ -34,6 +34,12 @@
android:layout_height="wrap_content"
android:orientation="vertical">
+
+
+ PIZZA PASS
VORNAME
NACHNAME
TELEFONNUMMER