bug fixes

app/build.gradle

@@ -12,8 +12,8 @@ android {
         applicationId "ch.pizzapp.capri"
         minSdkVersion 16
         targetSdkVersion 27
-        versionCode 11  // play store'daki version --> canlı: 8 - dahili test: 10
+        versionCode 12  // play store'daki version --> canlı: 8 - dahili test: 11
-        versionName "2.13"   // play store'daki version --> canlı: 2.1 -  dahili test: 2.12
+        versionName "2.14"   // play store'daki version --> canlı: 2.1 -  dahili test: 2.13
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }

app/release/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":10,"versionName":"2.12","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":11,"versionName":"2.13","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

app/src/main/java/ch/pizzapp/android/activity/SplashActivity.java

@@ -12,6 +12,10 @@ import android.util.Log;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
 
 import com.afollestad.materialdialogs.MaterialDialog;
 
@@ -20,7 +24,10 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 
+import butterknife.BindString;
+import butterknife.BindView;
 import butterknife.ButterKnife;
+import butterknife.OnClick;
 import ch.pizzapp.android.R;
 import ch.pizzapp.android.api.ApiConstants;
 import ch.pizzapp.android.api.ApiEndPoints;
@@ -44,11 +51,22 @@ import retrofit2.Response;
 
 public class SplashActivity extends BaseActivity {
 
+    @BindView(R.id.campaign1ImageView) ImageView campaign1ImageView;
+    @BindView(R.id.campaign2ImageView) ImageView campaign2ImageView;
+    @BindView(R.id.pizzappSplashLogoImageView) ImageView pizzappSplashLogoImageView;
+    @BindView(R.id.postCodeTextView) TextView postCodeTextView;
+
+    @BindString(R.string.alert_invalid_post_code) String choosePostCodeAlert;
+
+    private ArrayList<StoreModel> storeList = new ArrayList<>();
+    private StoreModel selectedStoreModel;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_splash);
         ButterKnife.bind(this);
+        initViews();
         //DisplayHelper.changeStatusColor();
         if(NetworkHelper.isNetworkAvailable()){
             getStoreList();
@@ -58,15 +76,57 @@ public class SplashActivity extends BaseActivity {
         }
     }
 
+    @OnClick({R.id.choosePostCodeLayout, R.id.choosePostCodeButton})
+    protected void onClick(View view){
+        switch (view.getId()){
+            case R.id.choosePostCodeLayout:
+                showStoreListDialog();
+                break;
+            case R.id.choosePostCodeButton:
+                if(selectedStoreModel == null){
+                    DialogHelper.showAlertDialog(BaseActivity.currentActivity, choosePostCodeAlert);
+                }
+                else {
+                    checkVersion();
+                }
+                break;
+        }
+    }
+
+    private void initViews(){
+
+        int imageViewWidth =  DisplayHelper.getScreenWidthInPixel() - DisplayHelper.dpToPx(32);
+        int campaign1ImageViewHeight =  imageViewWidth * 150 / 400;
+        int campaign2ImageViewHeight =  imageViewWidth * 150 / 400;
+        int pizzapassLogoImageViewHeight =  imageViewWidth * 409 / 910;
+
+        LinearLayout.LayoutParams campaign1ImageViewLayoutParams = (LinearLayout.LayoutParams) campaign1ImageView.getLayoutParams();
+        campaign1ImageViewLayoutParams.width = imageViewWidth;
+        campaign1ImageViewLayoutParams.height = campaign1ImageViewHeight;
+        campaign1ImageView.setLayoutParams(campaign1ImageViewLayoutParams);
+
+        LinearLayout.LayoutParams campaign2ImageViewLayoutParams = (LinearLayout.LayoutParams) campaign2ImageView.getLayoutParams();
+        campaign2ImageViewLayoutParams.width = imageViewWidth;
+        campaign2ImageViewLayoutParams.height = campaign2ImageViewHeight;
+        campaign2ImageView.setLayoutParams(campaign2ImageViewLayoutParams);
+
+        LinearLayout.LayoutParams pizzappSplashLogoImageViewLayoutParams = (LinearLayout.LayoutParams) pizzappSplashLogoImageView.getLayoutParams();
+        pizzappSplashLogoImageViewLayoutParams.width = imageViewWidth;
+        pizzappSplashLogoImageViewLayoutParams.height = pizzapassLogoImageViewHeight;
+        pizzappSplashLogoImageView.setLayoutParams(pizzappSplashLogoImageViewLayoutParams);
+    }
+
     private void getStoreList(){
+        DialogHelper.showLoadingDialog();
         Call<ResponseArray<StoreModel>> call = ApiService.apiInterface.getStoreList();
         call.enqueue(new Callback<ResponseArray<StoreModel>>() {
             @Override
             public void onResponse(Call<ResponseArray<StoreModel>> call, Response<ResponseArray<StoreModel>> response) {
+                DialogHelper.hideLoadingDialog();
                 if(response.isSuccessful() &&
                         response.body().getData() != null &&
                         response.body().isSuccess() && !response.body().getData().isEmpty()){
-                    showStoreListDialog(response.body().getData());
+                    storeList.addAll(response.body().getData());
                 }
                 else {
                     ApiErrorUtils.parseError(response);
@@ -75,12 +135,13 @@ public class SplashActivity extends BaseActivity {
 
             @Override
             public void onFailure(Call<ResponseArray<StoreModel>> call, Throwable t) {
+                DialogHelper.hideLoadingDialog();
                 DialogHelper.showFailedDialog();
             }
         });
     }
 
-    private void showStoreListDialog(final ArrayList<StoreModel> storeList){
+    private void showStoreListDialog(){
 
         Collections.sort(storeList, new Comparator<StoreModel>() {
             @Override
@@ -98,15 +159,17 @@ public class SplashActivity extends BaseActivity {
         DialogHelper.showStoreListDialog(postCodeList, new MaterialDialog.ListCallback() {
             @Override
             public void onSelection(MaterialDialog dialog, View itemView, int position, CharSequence text) {
-                StoreModel selectedStoreModel = storeList.get(position);
+                selectedStoreModel = storeList.get(position);
+                postCodeTextView.setText(selectedStoreModel.getPostCode());
                 SessionHelper.setSelectedStore(selectedStoreModel);
                 ApiService.getInstance().reset();
-                checkVersion();
+
             }
         });
     }
 
     private void checkVersion(){
+        DialogHelper.showLoadingDialog();
         Call<ResponseObject<AppVersionModel>> call = ApiService.apiInterface.checkUpdate(
                 SessionHelper.getSelectedStore().getStoreName(),
                 getCheckUpdateParams());
@@ -118,16 +181,19 @@ public class SplashActivity extends BaseActivity {
                         getCategoryList();
                     }
                     else{
+                        DialogHelper.hideLoadingDialog();
                         DialogHelper.showUpdateAppDialog(SplashActivity.this);
                     }
                 }
                 else{
+                    DialogHelper.hideLoadingDialog();
                     ApiErrorUtils.parseError(response);
                 }
             }
 
             @Override
             public void onFailure(Call<ResponseObject<AppVersionModel>> call, Throwable t) {
+                DialogHelper.hideLoadingDialog();
                 DialogHelper.showFailedDialog();
             }
         });
@@ -163,12 +229,15 @@ public class SplashActivity extends BaseActivity {
                     SharedPrefsHelper.saveCategoryList(response.body().getData());
                     getPizzaCategoryIds();
                 }
-                else
+                else {
+                    DialogHelper.hideLoadingDialog();
                     ApiErrorUtils.parseError(response);
+                }
             }
 
             @Override
             public void onFailure(Call<ResponseArray<CategoryModel>> call, Throwable t) {
+                DialogHelper.hideLoadingDialog();
                 DialogHelper.showFailedDialog();
             }
         });
@@ -186,12 +255,14 @@ public class SplashActivity extends BaseActivity {
                     getIgnoredCategoryIds();
                 }
                 else {
+                    DialogHelper.hideLoadingDialog();
                     ApiErrorUtils.parseError(response);
                 }
             }
 
             @Override
             public void onFailure(Call<ResponseArray<Integer>> call, Throwable t) {
+                DialogHelper.hideLoadingDialog();
                 DialogHelper.showFailedDialog();
             }
         });
@@ -209,12 +280,14 @@ public class SplashActivity extends BaseActivity {
                     checkCustomerToken();
                 }
                 else {
+                    DialogHelper.hideLoadingDialog();
                     ApiErrorUtils.parseError(response);
                 }
             }
 
             @Override
             public void onFailure(Call<ResponseArray<Integer>> call, Throwable t) {
+                DialogHelper.hideLoadingDialog();
                 DialogHelper.showFailedDialog();
             }
         });
@@ -249,6 +322,7 @@ public class SplashActivity extends BaseActivity {
             @Override
             public void run() {
                 startActivity(new Intent(SplashActivity.this, cls));
+                DialogHelper.hideLoadingDialog();
                 finish();
             }
         }, 1000);
@@ -268,12 +342,15 @@ public class SplashActivity extends BaseActivity {
                     getCartItemCount();
                 }
 
-                else
+                else{
+                DialogHelper.hideLoadingDialog();
                     DialogHelper.showAlertDialog(BaseActivity.currentActivity, "Bir hata oluştu. Lütfen daha sonra tekrar deneyin.");
+                    }
             }
 
             @Override
             public void onFailure(Call<RefreshTokenResponseModel> call, Throwable t) {
+                DialogHelper.hideLoadingDialog();
                 ApiService.getInstance().reset();
                 DialogHelper.showAlertDialog(BaseActivity.currentActivity, "Bir hata oluştu. Lütfen daha sonra tekrar deneyin.");
             }
@@ -295,13 +372,16 @@ public class SplashActivity extends BaseActivity {
                     openActivity(MainActivity.class);
 
                 }
-                else
+                else {
+                    DialogHelper.hideLoadingDialog();
                     //response.body().getErrorCode()
                     ApiErrorUtils.parseError(response);
+                }
             }
 
             @Override
             public void onFailure(Call<ResponseObject<CartInfoModel>> call, Throwable t) {
+                DialogHelper.hideLoadingDialog();
                 DialogHelper.showFailedDialog();
             }
         });

app/src/main/java/ch/pizzapp/android/fragment/CartFragment.java

@@ -1,10 +1,12 @@
 package ch.pizzapp.android.fragment;
 
+import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -31,6 +33,7 @@ import butterknife.ButterKnife;
 import butterknife.OnClick;
 import ch.pizzapp.android.R;
 import ch.pizzapp.android.activity.BaseActivity;
+import ch.pizzapp.android.activity.CampaignProductListActivity;
 import ch.pizzapp.android.activity.CreateOrderActivity;
 import ch.pizzapp.android.activity.MainActivity;
 import ch.pizzapp.android.adapter.recycler.CartRecyclerAdapter;
@@ -43,6 +46,7 @@ import ch.pizzapp.android.helper.PriceHelper;
 import ch.pizzapp.android.helper.SessionHelper;
 import ch.pizzapp.android.helper.SharedPrefsHelper;
 import ch.pizzapp.android.interfaces.RecyclerItemClickListener;
+import ch.pizzapp.android.model.CampaignModel;
 import ch.pizzapp.android.model.RemoveProductFromCartResponseModel;
 import ch.pizzapp.android.model.cart.CartInfoModel;
 import ch.pizzapp.android.model.cart.CartProductModel;
@@ -50,6 +54,8 @@ import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
 
+import static android.app.Activity.RESULT_OK;
+
 /**
  * Created by cimenmus on 18/09/2017.
  */
@@ -71,11 +77,13 @@ public class CartFragment extends BaseFragment {
     @BindString(R.string.alert_clear_cart) String clearCartAlertText;
     @BindString(R.string.minimum_order_price_alert_part_1) String minimumOrderPriceAlertPart1Text;
     @BindString(R.string.minimum_order_price_alert_part_2) String minimumOrderPriceAlertPart2Text;
+    @BindString(R.string.something_went_wrong) String genericErrorText;
 
     @BindColor(R.color.actvity_default_background_color_1) int grayColor;
     @BindColor(R.color.white) int whiteColor;
 
     public static final java.lang.String FRAGMENT_NAME = "cartFragment";
+    private int REQUEST_CODE_CAMPAIGN_PRODUCT_LIST = 7847;
 
     private CartInfoModel cartInfoModel;
     private ArrayList<CartProductModel> cartProductList = new ArrayList<>();
@@ -106,6 +114,17 @@ public class CartFragment extends BaseFragment {
         getCartProducts();
     }
 
+    /*
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if(requestCode == REQUEST_CODE_CAMPAIGN_PRODUCT_LIST && resultCode == RESULT_OK){
+            BaseActivity.setCurrentActivity(createOrderActivity);
+            getCartProducts();
+        }
+    }
+    */
+
     @OnClick({R.id.clearCartButton, R.id.continueCartButton})
     protected void onClick(View view){
         switch (view.getId()){
@@ -165,7 +184,6 @@ public class CartFragment extends BaseFragment {
         call.enqueue(new Callback<ResponseObject<CartInfoModel>>() {
             @Override
             public void onResponse(Call<ResponseObject<CartInfoModel>> call, Response<ResponseObject<CartInfoModel>> response) {
-                DialogHelper.hideLoadingDialog();
                 if(response.isSuccessful() &&
                         response.body().getData() != null &&
                         response.body().isSuccess()){
@@ -178,9 +196,12 @@ public class CartFragment extends BaseFragment {
                     mainActivity.setCartTotalLayoutVisibility(false);
                     setCartTotalFields();
                     fillAndNotifyAdapter();
+                    checkPizzapassCampaign();
                 }
-                else
+                else {
+                    DialogHelper.hideLoadingDialog();
                     ApiErrorUtils.parseError(response);
+                }
             }
 
             @Override
@@ -395,4 +416,187 @@ public class CartFragment extends BaseFragment {
         cartProductList.addAll(tempCartProductList);
 
     }
+
+
+
+
+
+
+
+
+
+
+
+
+    private void checkPizzapassCampaign(){
+        ApiService
+                .apiInterface
+                .checkPizzapassCampaign(
+                        SessionHelper.getSelectedStore().getStoreName(),
+                        SessionHelper.getCustomerToken().getToken())
+                .enqueue(new Callback<ResponseObject<CampaignModel>>() {
+                    @Override
+                    public void onResponse(Call<ResponseObject<CampaignModel>> call, Response<ResponseObject<CampaignModel>> response) {
+                        if(response.isSuccessful() &&
+                                response.body() != null){
+
+                            if(response.body().isSuccess() &&
+                                    !SessionHelper.isUserUsedPizzapassCampaign()){
+                                DialogHelper.hideLoadingDialog();
+                                if(response.body().getData() == null){
+                                    DialogHelper.showAlertDialog(BaseActivity.currentActivity, genericErrorText);
+                                }
+                                else {
+                                    response.body().getData().checkNull();
+                                    showPizzapassCampaignDialog(response.body().getData());
+                                }
+                            }
+                            else {
+                                checkChampagneCampaign();
+                                /*
+                                // dummy //
+                                CampaignModel campaignModel = new CampaignModel();
+                                campaignModel.setCategoryId("71");
+                                campaignModel.setName("Pizzapass");
+                                campaignModel.setCode("PIZZAPASS");
+                                campaignModel.setDescription("10 pizza alana 11. pizza bizden!");
+                                if(!SessionHelper.isUserUsedPizzapassCampaign()){
+                                    showPizzapassCampaignDialog(campaignModel);
+                                }
+                                else {
+                                    checkChampagneCampaign();
+                                }
+                                */
+                            }
+                        }
+                        else{
+                            DialogHelper.hideLoadingDialog();
+                            ApiErrorUtils.parseError(response);
+                        }
+                    }
+
+                    @Override
+                    public void onFailure(Call<ResponseObject<CampaignModel>> call, Throwable t) {
+                        DialogHelper.hideLoadingDialog();
+                        DialogHelper.showFailedDialog();
+
+                        /*
+                        // dummy //
+                        CampaignModel campaignModel = new CampaignModel();
+                        campaignModel.setCategoryId("71");
+                        campaignModel.setName("Pizzapass");
+                        campaignModel.setCode("PIZZAPASS");
+                        campaignModel.setDescription("10 pizza alana 11. pizza bizden!");
+                        if(!SessionHelper.isUserUsedPizzapassCampaign()){
+                            showPizzapassCampaignDialog(campaignModel);
+                        }
+                        else {
+                            checkChampagneCampaign();
+                        }
+                        */
+
+
+                    }
+                });
+    }
+
+    private void showPizzapassCampaignDialog(final CampaignModel campaignModel){
+        DialogHelper.showTwoButtonsDialog(
+                campaignModel.getName(),
+                campaignModel.getDescription(),
+                R.string.accept_campaign,
+                new MaterialDialog.SingleButtonCallback() {
+                    @Override
+                    public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
+                        Intent campaignIntent = new Intent(BaseActivity.currentActivity, CampaignProductListActivity.class);
+                        campaignIntent.putExtra("campaignModel", campaignModel);
+                        startActivityForResult(campaignIntent, REQUEST_CODE_CAMPAIGN_PRODUCT_LIST);
+                    }
+                },
+                R.string.decline_campaign,
+                new MaterialDialog.SingleButtonCallback() {
+                    @Override
+                    public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
+                        DialogHelper.showLoadingDialog();
+                        checkChampagneCampaign();
+                    }
+                }
+        );
+    }
+
+    private void checkChampagneCampaign(){
+        ApiService
+                .apiInterface
+                .checkChampagneCampaign(
+                        SessionHelper.getSelectedStore().getStoreName(),
+                        SessionHelper.getCustomerToken().getToken())
+                .enqueue(new Callback<ResponseObject<CampaignModel>>() {
+                    @Override
+                    public void onResponse(Call<ResponseObject<CampaignModel>> call, Response<ResponseObject<CampaignModel>> response) {
+                        DialogHelper.hideLoadingDialog();
+                        if(response.isSuccessful() &&
+                                response.body() != null){
+
+                            if(response.body().isSuccess() && !SessionHelper.isUserUsedChampagneCampaign()){
+                                if(response.body().getData() == null){
+                                    DialogHelper.showAlertDialog(BaseActivity.currentActivity, genericErrorText);
+                                }
+                                else {
+                                    response.body().getData().checkNull();
+                                    showChampagneCampaignDialog(response.body().getData());
+                                }
+                            }
+
+                        }
+                        else{
+                            ApiErrorUtils.parseError(response);
+                        }
+                    }
+
+                    @Override
+                    public void onFailure(Call<ResponseObject<CampaignModel>> call, Throwable t) {
+                        DialogHelper.hideLoadingDialog();
+                        DialogHelper.showFailedDialog();
+
+                        /*
+                        // dummy //
+                        CampaignModel campaignModel = new CampaignModel();
+                        campaignModel.setCategoryId("72");
+                        //campaignModel.setCategoryId("71");
+                        campaignModel.setName("Champagne Campaign");
+                        campaignModel.setCode("CHAMPAGNE");
+                        campaignModel.setDescription("40 CHF ve üzeri alişverişlerde 5ML şampanya hediye!");
+                        if(!SessionHelper.isUserUsedChampagneCampaign()){
+                            showChampagneCampaignDialog(campaignModel);
+                        }
+                        else {
+                            checkDeliveryTime();
+                        }
+                        */
+                    }
+                });
+    }
+
+    private void showChampagneCampaignDialog(final CampaignModel campaignModel){
+        DialogHelper.showTwoButtonsDialog(
+                campaignModel.getName(),
+                campaignModel.getDescription(),
+                R.string.accept_campaign,
+                new MaterialDialog.SingleButtonCallback() {
+                    @Override
+                    public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
+                        Intent campaignIntent = new Intent(BaseActivity.currentActivity, CampaignProductListActivity.class);
+                        campaignIntent.putExtra("campaignModel", campaignModel);
+                        startActivityForResult(campaignIntent, REQUEST_CODE_CAMPAIGN_PRODUCT_LIST);
+                    }
+                },
+                R.string.decline_campaign,
+                new MaterialDialog.SingleButtonCallback() {
+                    @Override
+                    public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
+
+                    }
+                }
+        );
+    }
 }

app/src/main/java/ch/pizzapp/android/fragment/ProfileFragment.java

@@ -47,10 +47,6 @@ public class ProfileFragment extends BaseFragment {
     @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;
-    @BindView(R.id.logoutLayout) RelativeLayout logoutLayout;
 
     @BindString(R.string.bottom_nav_menu_item_profile) String fragmentTitle;
     @BindString(R.string.alert_logout) String logoutAlertText;
@@ -81,7 +77,8 @@ public class ProfileFragment extends BaseFragment {
     }
 
     @OnClick({R.id.myAddressesLayout, R.id.updatePasswordLayout,
-            R.id.updateProfileLayout, R.id.logoutLayout})
+            R.id.updateProfileLayout, R.id.changePostCodeLayout,
+            R.id.logoutLayout})
     public void onClick(View view){
         switch (view.getId()){
             case R.id.myAddressesLayout:
@@ -95,6 +92,10 @@ public class ProfileFragment extends BaseFragment {
             case R.id.updatePasswordLayout:
                 startActivity(new Intent(BaseActivity.currentActivity, UpdatePasswordActivity.class));
                 break;
+            case R.id.changePostCodeLayout:
+                BaseActivity.currentActivity.startActivity(new Intent(BaseActivity.currentActivity, SplashActivity.class));
+                BaseActivity.currentActivity.finishAffinity();
+                break;
             case R.id.logoutLayout:
                 DialogHelper.showTwoButtonsDialog(BaseActivity.currentActivity, logoutAlertText,
                         new MaterialDialog.SingleButtonCallback() {

app/src/main/java/ch/pizzapp/android/fragment/createOrder/CreateOrderSummaryFragment.java

@@ -89,7 +89,6 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
     @BindString(R.string.delivery_time) String deliveryTimeText;
 
     public static final java.lang.String FRAGMENT_NAME = "orderSummaryFragment";
-    private int REQUEST_CODE_CAMPAIGN_PRODUCT_LIST = 7847;
     private final int REQUEST_CODE_BRAINTREE_PAYMENT = 3784;
     private CreateOrderActivity createOrderActivity;
     private String dateOfOrderString, timeOfOrder;
@@ -121,11 +120,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        if(requestCode == REQUEST_CODE_CAMPAIGN_PRODUCT_LIST && resultCode == RESULT_OK){
+        if (requestCode == REQUEST_CODE_BRAINTREE_PAYMENT) {
-            BaseActivity.setCurrentActivity(createOrderActivity);
-            getCartProducts();
-        }
-        else if (requestCode == REQUEST_CODE_BRAINTREE_PAYMENT) {
             if (resultCode == Activity.RESULT_OK) {
                 DropInResult result = data.getParcelableExtra(DropInResult.EXTRA_DROP_IN_RESULT);
                 createOrderActivity.setSelectedPaymentMethod(result.getPaymentMethodType());
@@ -151,7 +146,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
                 createOrderActivity.onPreviousClicked(FRAGMENT_NAME);
                 break;
             case R.id.nextTextView:
-                checkPizzapassCampaign();
+                checkDeliveryTime();
                 break;
         }
     }
@@ -183,185 +178,6 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
         orderPriceRecyclerView.setAdapter(orderPriceRecyclerAdapter);
     }
 
-    private void checkPizzapassCampaign(){
-        DialogHelper.showLoadingDialog();
-        ApiService
-                .apiInterface
-                .checkPizzapassCampaign(
-                        SessionHelper.getSelectedStore().getStoreName(),
-                        SessionHelper.getCustomerToken().getToken())
-                .enqueue(new Callback<ResponseObject<CampaignModel>>() {
-                    @Override
-                    public void onResponse(Call<ResponseObject<CampaignModel>> call, Response<ResponseObject<CampaignModel>> response) {
-                        if(response.isSuccessful() &&
-                                response.body() != null){
-
-                            if(response.body().isSuccess() &&
-                                    !SessionHelper.isUserUsedPizzapassCampaign()){
-                                DialogHelper.hideLoadingDialog();
-                                if(response.body().getData() == null){
-                                    DialogHelper.showAlertDialog(BaseActivity.currentActivity, genericErrorText);
-                                }
-                                else {
-                                    response.body().getData().checkNull();
-                                    showPizzapassCampaignDialog(response.body().getData());
-                                }
-                            }
-                            else {
-                                checkChampagneCampaign();
-                                /*
-                                // dummy //
-                                CampaignModel campaignModel = new CampaignModel();
-                                campaignModel.setCategoryId("71");
-                                campaignModel.setName("Pizzapass");
-                                campaignModel.setCode("PIZZAPASS");
-                                campaignModel.setDescription("10 pizza alana 11. pizza bizden!");
-                                if(!SessionHelper.isUserUsedPizzapassCampaign()){
-                                    showPizzapassCampaignDialog(campaignModel);
-                                }
-                                else {
-                                    checkChampagneCampaign();
-                                }
-                                */
-                            }
-                        }
-                        else{
-                            DialogHelper.hideLoadingDialog();
-                            ApiErrorUtils.parseError(response);
-                        }
-                    }
-
-                    @Override
-                    public void onFailure(Call<ResponseObject<CampaignModel>> call, Throwable t) {
-                        DialogHelper.hideLoadingDialog();
-                        DialogHelper.showFailedDialog();
-
-                        /*
-                        // dummy //
-                        CampaignModel campaignModel = new CampaignModel();
-                        campaignModel.setCategoryId("71");
-                        campaignModel.setName("Pizzapass");
-                        campaignModel.setCode("PIZZAPASS");
-                        campaignModel.setDescription("10 pizza alana 11. pizza bizden!");
-                        if(!SessionHelper.isUserUsedPizzapassCampaign()){
-                            showPizzapassCampaignDialog(campaignModel);
-                        }
-                        else {
-                            checkChampagneCampaign();
-                        }
-                        */
-
-
-                    }
-                });
-    }
-
-    private void showPizzapassCampaignDialog(final CampaignModel campaignModel){
-        DialogHelper.showTwoButtonsDialog(
-                campaignModel.getName(),
-                campaignModel.getDescription(),
-                R.string.accept_campaign,
-                new MaterialDialog.SingleButtonCallback() {
-                    @Override
-                    public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
-                        Intent campaignIntent = new Intent(BaseActivity.currentActivity, CampaignProductListActivity.class);
-                        campaignIntent.putExtra("campaignModel", campaignModel);
-                        startActivityForResult(campaignIntent, REQUEST_CODE_CAMPAIGN_PRODUCT_LIST);
-                    }
-                },
-                R.string.decline_campaign,
-                new MaterialDialog.SingleButtonCallback() {
-                    @Override
-                    public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
-                        DialogHelper.showLoadingDialog();
-                        checkChampagneCampaign();
-                    }
-                }
-        );
-    }
-
-    private void checkChampagneCampaign(){
-        ApiService
-                .apiInterface
-                .checkChampagneCampaign(
-                        SessionHelper.getSelectedStore().getStoreName(),
-                        SessionHelper.getCustomerToken().getToken())
-                .enqueue(new Callback<ResponseObject<CampaignModel>>() {
-                    @Override
-                    public void onResponse(Call<ResponseObject<CampaignModel>> call, Response<ResponseObject<CampaignModel>> response) {
-                        if(response.isSuccessful() &&
-                                response.body() != null){
-
-                            if(response.body().isSuccess() && !SessionHelper.isUserUsedChampagneCampaign()){
-                                DialogHelper.hideLoadingDialog();
-                                if(response.body().getData() == null){
-                                    DialogHelper.showAlertDialog(BaseActivity.currentActivity, genericErrorText);
-                                }
-                                else {
-                                    response.body().getData().checkNull();
-                                    showChampagneCampaignDialog(response.body().getData());
-                                }
-
-                            }
-                            else {
-                                checkDeliveryTime();
-                            }
-
-                        }
-                        else{
-                            DialogHelper.hideLoadingDialog();
-                            ApiErrorUtils.parseError(response);
-                        }
-                    }
-
-                    @Override
-                    public void onFailure(Call<ResponseObject<CampaignModel>> call, Throwable t) {
-                        DialogHelper.hideLoadingDialog();
-                        DialogHelper.showFailedDialog();
-
-                        /*
-                        // dummy //
-                        CampaignModel campaignModel = new CampaignModel();
-                        campaignModel.setCategoryId("72");
-                        //campaignModel.setCategoryId("71");
-                        campaignModel.setName("Champagne Campaign");
-                        campaignModel.setCode("CHAMPAGNE");
-                        campaignModel.setDescription("40 CHF ve üzeri alişverişlerde 5ML şampanya hediye!");
-                        if(!SessionHelper.isUserUsedChampagneCampaign()){
-                            showChampagneCampaignDialog(campaignModel);
-                        }
-                        else {
-                            checkDeliveryTime();
-                        }
-                        */
-                    }
-                });
-    }
-
-    private void showChampagneCampaignDialog(final CampaignModel campaignModel){
-        DialogHelper.showTwoButtonsDialog(
-                campaignModel.getName(),
-                campaignModel.getDescription(),
-                R.string.accept_campaign,
-                new MaterialDialog.SingleButtonCallback() {
-                    @Override
-                    public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
-                        Intent campaignIntent = new Intent(BaseActivity.currentActivity, CampaignProductListActivity.class);
-                        campaignIntent.putExtra("campaignModel", campaignModel);
-                        startActivityForResult(campaignIntent, REQUEST_CODE_CAMPAIGN_PRODUCT_LIST);
-                    }
-                },
-                R.string.decline_campaign,
-                new MaterialDialog.SingleButtonCallback() {
-                    @Override
-                    public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
-                        DialogHelper.showLoadingDialog();
-                        checkDeliveryTime();
-                    }
-                }
-        );
-    }
-
     private void checkDeliveryTime(){
         ApiService
                 .apiInterface

app/src/main/java/ch/pizzapp/android/helper/DialogHelper.java

@@ -297,7 +297,6 @@ public class DialogHelper {
                 .titleColorRes(R.color.red)
                 .contentColorRes(R.color.black)
                 .items(itemList)
-                .cancelable(false)
                 .itemsCallback(listCallback)
                 .typeface("Quicksand-Medium.ttf", "Quicksand-Regular.ttf")
                 .show();

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

@@ -1,4 +1,111 @@
 <?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"
+    tools:context="ch.pizzapp.android.activity.SplashActivity"
+    android:background="@color/white">
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="centerCrop"
+        android:src="@drawable/background_wood"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:layout_margin="8dp">
+
+        <ImageView
+            android:id="@+id/campaign1ImageView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:src="@drawable/angebot1"
+            android:adjustViewBounds="true"
+            android:layout_gravity="center_horizontal"
+            android:scaleType="fitXY" />
+
+        <ImageView
+            android:id="@+id/campaign2ImageView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:adjustViewBounds="true"
+            android:scaleType="fitXY"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="8dp"
+            android:src="@drawable/angebot2"/>
+
+        <ImageView
+            android:id="@+id/pizzappSplashLogoImageView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:src="@drawable/pizzapp_splash_logo"
+            android:adjustViewBounds="true"
+            android:layout_marginTop="8dp"
+            android:scaleType="fitXY" />
+
+        <RelativeLayout
+            android:id="@+id/choosePostCodeLayout"
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginEnd="8dp"
+            android:background="@drawable/background_button_add_cart">
+
+            <TextView
+                android:id="@+id/postCodeTextView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/choose_post_code"
+                android:layout_centerInParent="true"
+                android:textSize="12sp"
+                android:textColor="@color/white"/>
+
+            <ImageView
+                android:layout_width="12dp"
+                android:layout_height="12dp"
+                android:layout_alignParentRight="true"
+                android:layout_alignParentEnd="true"
+                android:src="@drawable/ic_down_black"
+                android:tint="@color/white"
+                android:layout_marginRight="8dp"
+                android:layout_marginEnd="8dp"
+                android:layout_centerVertical="true"/>
+
+        </RelativeLayout>
+
+        <Button
+            android:id="@+id/choosePostCodeButton"
+            android:background="@drawable/background_button_pizzapp_gray"
+            android:textColor="@color/white"
+            android:textSize="12sp"
+            android:textAllCaps="false"
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginEnd="8dp"
+            android:text="@string/choose_post_code_button" />
+
+    </LinearLayout>
+
+</RelativeLayout>
+
+
+
+
+<!--
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -25,3 +132,4 @@
         android:src="@drawable/splash_logo"/>
 
 </RelativeLayout>
+-->

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

@@ -187,6 +187,33 @@
 
                 </RelativeLayout>
 
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginRight="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:background="@color/black"/>
+
+                <RelativeLayout
+                    android:id="@+id/changePostCodeLayout"
+                    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/change_post_code"
+                        fontPath="fonts/Quicksand-Bold.ttf"
+                        android:layout_marginTop="4dp"
+                        android:textColor="@color/black"
+                        android:layout_centerVertical="true" />
+
+                </RelativeLayout>
+
+
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="1dp"

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

@@ -35,6 +35,8 @@
     <string name="alert_update_app">Sie müssen die Pizzalink-Applikation aktualisieren, um sie zu verwenden.</string>
     <string name="update_app">AKTUALISIEREN</string>
     <string name="choose_store">Wählen Sie Postleitzahl</string>
+    <string name="choose_post_code">Ihre PLZ</string>
+    <string name="choose_post_code_button">GO!</string>
     <!-- SplashActivity -->
 
     <!-- LoginActivity-->
@@ -201,6 +203,7 @@
     <string name="update_profile">Profil Aktualisieren</string>    
     <string name="update_password">Passwort Aktualisieren</string>    
     <string name="button_logout">Abmelden</string>    
+    <string name="change_post_code">Postleitzahl Ändern</string>    
     <string name="alert_logout">Möchten Sie sich abmelden?</string>
     <!-- ProfileFragment-->