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

kebappass count added

Browse Source
This commit is contained in:
cimenmus
2019-04-03 22:53:36 +03:00
parent bd59a4d1e0
commit f1a4760bd8
6 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/ch/pizzamaxx/android/api/ApiService.java
View File

@@ -50,7 +50,7 @@ public class ApiService {
HttpLoggingInterceptor logging = new HttpLoggingInterceptor(); // set your desired log level
logging.setLevel(HttpLoggingInterceptor.Level.BODY);
//builder.addInterceptor(logging);
builder.addInterceptor(logging);
OkHttpClient client = builder.build();

3
app/src/main/java/ch/pizzamaxx/android/fragment/ProfileFragment.java
View File

@@ -49,6 +49,7 @@ import static android.app.Activity.RESULT_OK;
public class ProfileFragment extends BaseFragment {
@BindView(R.id.pizzapassCountPizzalinkInfoLayout) AppInfoView pizzapassCountPizzalinkInfoLayout;
@BindView(R.id.kebappassCountPizzalinkInfoLayout) AppInfoView kebappassCountPizzalinkInfoLayout;
@BindView(R.id.firstnamePizzalinkInfoLayout) AppInfoView firstnamePizzalinkInfoLayout;
@BindView(R.id.lastnamePizzalinkInfoLayout) AppInfoView lastnamePizzalinkInfoLayout;
@BindView(R.id.emailPizzalinkInfoLayout) AppInfoView emailPizzalinkInfoLayout;
@@ -129,6 +130,7 @@ public class ProfileFragment extends BaseFragment {
resultCode == RESULT_OK){
userModel = SessionHelper.getUser();
pizzapassCountPizzalinkInfoLayout.setText(userModel.getPizzapassCount());
kebappassCountPizzalinkInfoLayout.setText(userModel.getKebappassCount());
firstnamePizzalinkInfoLayout.setText(userModel.getFirstname());
lastnamePizzalinkInfoLayout.setText(userModel.getLastname());
emailPizzalinkInfoLayout.setText(userModel.getEmail());
@@ -252,6 +254,7 @@ public class ProfileFragment extends BaseFragment {
SessionHelper.saveCustomer(userModel);
pizzapassCountPizzalinkInfoLayout.setText(userModel.getPizzapassCount());
kebappassCountPizzalinkInfoLayout.setText(userModel.getKebappassCount());
firstnamePizzalinkInfoLayout.setText(userModel.getFirstname());
lastnamePizzalinkInfoLayout.setText(userModel.getLastname());
emailPizzalinkInfoLayout.setText(userModel.getEmail());

14
app/src/main/java/ch/pizzamaxx/android/model/UserModel.java
View File

@@ -14,6 +14,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;
@Expose @SerializedName("kebap_pass_count") private String kebappassCount;
private String firstname;
private String lastname;
private String email;
@@ -41,7 +42,10 @@ public class UserModel implements Serializable{
telephone = "";
if(pizzapassCount == null)
pizzapassCount = "";
pizzapassCount = "0";
if(kebappassCount == null)
kebappassCount = "0";
if(token != null)
token.checkNull();
@@ -114,4 +118,12 @@ public class UserModel implements Serializable{
public void setPizzapassCount(String pizzapassCount) {
this.pizzapassCount = pizzapassCount;
}
public String getKebappassCount() {
return kebappassCount;
}
public void setKebappassCount(String kebappassCount) {
this.kebappassCount = kebappassCount;
}
}

6
app/src/main/res/layout/fragment_profile.xml
View File

@@ -40,6 +40,12 @@
android:layout_height="wrap_content"
app:description="@string/pizza_pass" />
<ch.pizzamaxx.android.view.AppInfoView
android:id="@+id/kebappassCountPizzalinkInfoLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:description="@string/kebap_pass" />
<ch.pizzamaxx.android.view.AppInfoView
android:id="@+id/firstnamePizzalinkInfoLayout"
android:layout_width="match_parent"

3
app/src/main/res/values-fr/strings.xml
View File

@@ -198,7 +198,8 @@
<!-- CreateOrderSummaryFragment-->
<!-- ProfileFragment-->    
<string name="pizza_pass">PIZZA PASS</string>    
<string name="pizza_pass">PIZZA PASS</string> 
<string name="kebap_pass">KEBAP PASS</string>      
<string name="profile_firstname">PRÉNOM</string>    
<string name="profile_lastname">NOM DE FAMILLE</string>    
<string name="profile_telephone">NATEL</string>    

1
app/src/main/res/values/strings.xml
View File

@@ -199,6 +199,7 @@
<!-- ProfileFragment-->    
<string name="pizza_pass">PIZZA PASS</string>    
<string name="kebap_pass">KEBAP PASS</string>    
<string name="profile_firstname">VORNAME</string>    
<string name="profile_lastname">NACHNAME</string>    
<string name="profile_telephone">NATEL</string>