minimum price label

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);
+        }
 
     }
 

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">
 
         <TextView
+            android:id="@+id/cartTotalLabelTextView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="@color/black"
             fontPath="fonts/Quicksand-Bold.ttf"
             android:layout_gravity="center_horizontal"
             android:text="@string/cart_total"
-            android:padding="16dp"
+            android:textSize="12sp"
-            android:layout_centerVertical="true"/>
+            android:paddingTop="8dp"
+            android:paddingBottom="4dp"
+            android:paddingStart="16dp"
+            android:paddingEnd="16dp"/>
 
         <TextView
             android:id="@+id/cartTotalTextView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="16dp"
+            android:paddingTop="8dp"
-            android:layout_centerVertical="true"
+            android:paddingBottom="4dp"
+            android:paddingStart="16dp"
+            android:paddingEnd="16dp"
+            android:textSize="12sp"
             android:textColor="@color/red"
             android:layout_gravity="center_horizontal"
             android:layout_alignParentRight="true"
             android:layout_alignParentEnd="true"
             fontPath="fonts/Quicksand-Bold.ttf"/>
 
+        <TextView
+            android:id="@+id/minimumPriceLabelTextView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/black"
+            fontPath="fonts/Quicksand-Bold.ttf"
+            android:layout_gravity="center_horizontal"
+            android:text="@string/store_minimum_price"
+            android:paddingTop="4dp"
+            android:paddingBottom="8dp"
+            android:paddingStart="16dp"
+            android:paddingEnd="16dp"
+            android:textSize="12sp"
+            android:layout_below="@+id/cartTotalLabelTextView"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_toLeftOf="@+id/minimumPriceTextView"
+            android:layout_toStartOf="@+id/minimumPriceTextView"/>
+
+        <TextView
+            android:id="@+id/minimumPriceTextView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingTop="4dp"
+            android:paddingBottom="8dp"
+            android:paddingStart="16dp"
+            android:paddingEnd="16dp"
+            android:textColor="@color/red"
+            android:layout_gravity="center_horizontal"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
+            android:textSize="12sp"
+            fontPath="fonts/Quicksand-Bold.ttf"
+            android:layout_below="@+id/cartTotalTextView"/>
+
     </RelativeLayout>
 
     <com.ittianyu.bottomnavigationviewex.BottomNavigationViewEx

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

@@ -86,7 +86,8 @@
     <string name="bottom_nav_menu_item_history">Antécédent de commande</string>    
     <string name="bottom_nav_menu_item_profile">Mon compte</string>    
     <string name="bottom_nav_menu_item_info">Renseignement</string>
-    <string name="cart_total">SOUS-TOTAL</string>
+    <string name="cart_total">Sous-Total</string>
+    <string name="store_minimum_price">Valeur minimale de la commande (uniquement à la livraison)</string>
     <!-- MainAcitivity -->
 
     <!-- ProductPropertiesBottomSheetDialog -->    

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

@@ -86,7 +86,8 @@
     <string name="bottom_nav_menu_item_history">Bestellungshistorie</string>    
     <string name="bottom_nav_menu_item_profile">Mein Konto</string>    
     <string name="bottom_nav_menu_item_info">Info</string>
-    <string name="cart_total">ZWISHENSUMME</string>
+    <string name="cart_total">Zwischensumme</string>
+    <string name="store_minimum_price">Mindestbestellwert (Nur bei der Lieferung)</string>
     <!-- MainAcitivity -->
 
     <!-- ProductPropertiesBottomSheetDialog -->