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

auto close feature of "product added to cart" dialog disabled on product details

Browse Source
This commit is contained in:
mustafa içmen
2019-12-12 22:24:53 +03:00
parent d9a42d24c0
commit 5017203fa3
3 changed files with 40 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/ch/pizzaleu/android/activity/CampaignProductDetailsActivity.java
View File

@@ -1,6 +1,7 @@
package ch.pizzaleu.android.activity; package ch.pizzaleu.android.activity;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v7.widget.GridLayoutManager; import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.view.View; import android.view.View;
@@ -8,6 +9,9 @@ import android.widget.Button;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import com.afollestad.materialdialogs.DialogAction;
import com.afollestad.materialdialogs.MaterialDialog;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
@@ -325,8 +329,7 @@ public class CampaignProductDetailsActivity extends BaseActivity {
DialogHelper.hideLoadingDialog(); DialogHelper.hideLoadingDialog();
if(response.isSuccessful() && response.body().getData() != null){ if(response.isSuccessful() && response.body().getData() != null){
if(response.body().isSuccess()){ if(response.body().isSuccess()){
DialogHelper.showDialogWithPositiveButton(BaseActivity.currentActivity, response.body().getData().getSuccessMessage()); getCartItemCount(response.body().getData().getSuccessMessage());
getCartItemCount();
} }
else else
DialogHelper.showDialogWithPositiveButton(BaseActivity.currentActivity, response.body().getData().getErrorMessage()); DialogHelper.showDialogWithPositiveButton(BaseActivity.currentActivity, response.body().getData().getErrorMessage());
@@ -375,7 +378,7 @@ public class CampaignProductDetailsActivity extends BaseActivity {
} }
private void getCartItemCount(){ private void getCartItemCount(final String dialogMessage){
/* /*
@@ -403,14 +406,16 @@ public class CampaignProductDetailsActivity extends BaseActivity {
SharedPrefsHelper.setCartItemCount(response.body().getData().getProducts().size()); SharedPrefsHelper.setCartItemCount(response.body().getData().getProducts().size());
SharedPrefsHelper.setCartTotalPrice(PriceHelper.removeCurrencyFromPrice(response.body().getData().getCartTotalModel().getText())); SharedPrefsHelper.setCartTotalPrice(PriceHelper.removeCurrencyFromPrice(response.body().getData().getCartTotalModel().getText()));
/* DialogHelper.showOneButtonDialogWithCallback(
MainActivity mainActivity = (MainActivity) BaseActivity.currentActivity; dialogMessage,
mainActivity.setCartItemCount(); new MaterialDialog.SingleButtonCallback() {
*/ @Override
setResult(RESULT_OK); public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
setResult(RESULT_OK);
finish(); finish();
}
},
false);
} }
} }

27
app/src/main/java/ch/pizzaleu/android/activity/ProductDetailsActivity.java
View File

@@ -1,6 +1,7 @@
package ch.pizzaleu.android.activity; package ch.pizzaleu.android.activity;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v7.widget.GridLayoutManager; import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.view.View; import android.view.View;
@@ -8,6 +9,9 @@ import android.widget.Button;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import com.afollestad.materialdialogs.DialogAction;
import com.afollestad.materialdialogs.MaterialDialog;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
@@ -326,8 +330,7 @@ public class ProductDetailsActivity extends BaseActivity {
DialogHelper.hideLoadingDialog(); DialogHelper.hideLoadingDialog();
if(response.isSuccessful() && response.body().getData() != null){ if(response.isSuccessful() && response.body().getData() != null){
if(response.body().isSuccess()){ if(response.body().isSuccess()){
DialogHelper.showDialogWithPositiveButton(BaseActivity.currentActivity, response.body().getData().getSuccessMessage()); getCartItemCount(response.body().getData().getSuccessMessage());
getCartItemCount();
} }
else else
DialogHelper.showDialogWithPositiveButton(BaseActivity.currentActivity, response.body().getData().getErrorMessage()); DialogHelper.showDialogWithPositiveButton(BaseActivity.currentActivity, response.body().getData().getErrorMessage());
@@ -376,7 +379,7 @@ public class ProductDetailsActivity extends BaseActivity {
} }
private void getCartItemCount(){ private void getCartItemCount(final String dialogMessage){
/* /*
Call<ResponseObject<CartInfoModel>> call = ApiService.apiInterface.getCartProducts( Call<ResponseObject<CartInfoModel>> call = ApiService.apiInterface.getCartProducts(
"/" + SessionHelper.getSelectedStore().getStoreName() + ApiEndPoints.API_GET_CART_PRODUCTS + SessionHelper.getCustomerToken().getToken()); "/" + SessionHelper.getSelectedStore().getStoreName() + ApiEndPoints.API_GET_CART_PRODUCTS + SessionHelper.getCustomerToken().getToken());
@@ -401,14 +404,16 @@ public class ProductDetailsActivity extends BaseActivity {
SharedPrefsHelper.setCartItemCount(response.body().getData().getProducts().size()); SharedPrefsHelper.setCartItemCount(response.body().getData().getProducts().size());
SharedPrefsHelper.setCartTotalPrice(PriceHelper.removeCurrencyFromPrice(response.body().getData().getCartTotalModel().getText())); SharedPrefsHelper.setCartTotalPrice(PriceHelper.removeCurrencyFromPrice(response.body().getData().getCartTotalModel().getText()));
/* DialogHelper.showOneButtonDialogWithCallback(
MainActivity mainActivity = (MainActivity) BaseActivity.currentActivity; dialogMessage,
mainActivity.setCartItemCount(); new MaterialDialog.SingleButtonCallback() {
*/ @Override
setResult(RESULT_OK); public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
setResult(RESULT_OK);
finish(); finish();
}
},
false);
} }
} }

8
app/src/main/java/ch/pizzaleu/android/helper/DialogHelper.java
View File

@@ -247,6 +247,13 @@ public class DialogHelper {
public static void showOneButtonDialogWithCallback(String message, public static void showOneButtonDialogWithCallback(String message,
MaterialDialog.SingleButtonCallback singleButtonCallback){ MaterialDialog.SingleButtonCallback singleButtonCallback){
showOneButtonDialogWithCallback(message, singleButtonCallback, true);
}
public static void showOneButtonDialogWithCallback(String message,
MaterialDialog.SingleButtonCallback singleButtonCallback,
boolean cancelable){
new MaterialDialog.Builder(BaseActivity.currentActivity) new MaterialDialog.Builder(BaseActivity.currentActivity)
.title(R.string.app_name) .title(R.string.app_name)
.content(message) .content(message)
@@ -254,6 +261,7 @@ public class DialogHelper {
.contentColorRes(R.color.black) .contentColorRes(R.color.black)
.positiveText(R.string.ok) .positiveText(R.string.ok)
.onPositive(singleButtonCallback) .onPositive(singleButtonCallback)
.cancelable(cancelable)
.typeface("Quicksand-Medium.ttf", "Quicksand-Regular.ttf") .typeface("Quicksand-Medium.ttf", "Quicksand-Regular.ttf")
.show(); .show();
} }