diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser index ffce9ce..e3964a2 100644 Binary files a/.idea/caches/gradle_models.ser and b/.idea/caches/gradle_models.ser differ diff --git a/app/src/main/java/ch/pizzamaxx/android/activity/MainActivity.java b/app/src/main/java/ch/pizzamaxx/android/activity/MainActivity.java index d96d4fd..70069fa 100644 --- a/app/src/main/java/ch/pizzamaxx/android/activity/MainActivity.java +++ b/app/src/main/java/ch/pizzamaxx/android/activity/MainActivity.java @@ -54,6 +54,7 @@ public class MainActivity extends BaseActivity { @BindView(R.id.pizzalinkToolbar) AppToolbar appToolbar; @BindView(R.id.cartTotalRelativeLayout) RelativeLayout cartTotalRelativeLayout; @BindView(R.id.cartTotalTextView) TextView cartTotalTextView; + @BindView(R.id.minimumPriceTextView) TextView minimumPriceTextView; @BindView(R.id.bottomNavigationView) BottomNavigationViewEx bottomNavigationView; @BindView(R.id.badgeLayout) RelativeLayout badgeLayout; @@ -112,7 +113,7 @@ public class MainActivity extends BaseActivity { showStartScreen(); setCartItemCount(); initShoppingCartButton(); - + minimumPriceTextView.setText(PriceHelper.getPriceWithCurreny(SessionHelper.getSelectedStore().getMinimumPrice())); } private void initShoppingCartButton(){ @@ -202,12 +203,16 @@ public class MainActivity extends BaseActivity { return true; } + /* if(!SharedPrefsHelper.getCartTotalPrice().equals("0") && !SharedPrefsHelper.getCartTotalPrice().equals("0.0") && !SharedPrefsHelper.getCartTotalPrice().equals("0.00")){ cartTotalTextView.setText(PriceHelper.getPriceWithCurreny(SharedPrefsHelper.getCartTotalPrice())); cartTotalRelativeLayout.setVisibility(View.VISIBLE); } + */ + + cartTotalRelativeLayout.setVisibility(View.VISIBLE); return true; @@ -482,6 +487,7 @@ public class MainActivity extends BaseActivity { return; } + /* if(SharedPrefsHelper.getCartTotalPrice().equals("0") || SharedPrefsHelper.getCartTotalPrice().equals("0.0") || SharedPrefsHelper.getCartTotalPrice().equals("0.00")){ @@ -491,6 +497,13 @@ public class MainActivity extends BaseActivity { cartTotalTextView.setText(PriceHelper.getPriceWithCurreny(SharedPrefsHelper.getCartTotalPrice())); cartTotalRelativeLayout.setVisibility(View.VISIBLE); } + */ + + cartTotalTextView.setText(PriceHelper.getPriceWithCurreny(SharedPrefsHelper.getCartTotalPrice())); + if(getSupportFragmentManager().findFragmentById(R.id.fragmentContainer) != null && + getSupportFragmentManager().findFragmentById(R.id.fragmentContainer) instanceof MenuFragment){ + cartTotalRelativeLayout.setVisibility(View.VISIBLE); + } } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index f05fab5..cb253e9 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -45,30 +45,74 @@ android:layout_height="wrap_content" android:background="@color/ghost_white" android:layout_above="@+id/bottomNavigationView" - android:visibility="visible"> + android:visibility="visible" + android:paddingTop="12dp" + android:paddingBottom="12dp"> + android:textSize="12sp" + android:paddingTop="8dp" + android:paddingBottom="4dp" + android:paddingStart="16dp" + android:paddingEnd="16dp"/> + + + + Antécédent de commande     Mon compte     Renseignement - SOUS-TOTAL + Sous-Total + Valeur minimale de la commande (uniquement à la livraison)      diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 525f93a..cf9798a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -86,7 +86,8 @@ Bestellungshistorie     Mein Konto     Info - ZWISHENSUMME + Zwischensumme + Mindestbestellwert (Nur bei der Lieferung)