texts changed

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

@@ -17,7 +17,6 @@ import com.braintreepayments.api.dropin.DropInActivity;
 import com.braintreepayments.api.dropin.DropInRequest;
 import com.braintreepayments.api.dropin.DropInResult;
 import com.google.android.gms.wallet.Cart;
-import com.google.android.gms.wallet.LineItem;
 import com.wdullaer.materialdatetimepicker.date.DatePickerDialog;
 import com.wdullaer.materialdatetimepicker.time.TimePickerDialog;
 import com.wdullaer.materialdatetimepicker.time.Timepoint;
@@ -25,7 +24,6 @@ import com.wdullaer.materialdatetimepicker.time.Timepoint;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.HashMap;
-import java.util.List;
 
 import butterknife.BindString;
 import butterknife.BindView;
@@ -33,7 +31,6 @@ 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.adapter.recycler.OrderPriceRecyclerAdapter;
 import ch.pizzapp.android.api.ApiConstants;
@@ -45,7 +42,6 @@ import ch.pizzapp.android.helper.DialogHelper;
 import ch.pizzapp.android.helper.PriceHelper;
 import ch.pizzapp.android.helper.SessionHelper;
 import ch.pizzapp.android.helper.SharedPrefsHelper;
-import ch.pizzapp.android.model.CampaignModel;
 import ch.pizzapp.android.model.PaymentMethodModel;
 import ch.pizzapp.android.model.StoreShiftModel;
 import ch.pizzapp.android.model.StoreWorkDayModel;
@@ -57,8 +53,6 @@ import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
 
-import static android.app.Activity.RESULT_OK;
-
 /**
  * Created by cimenmus on 17/10/2017.
  */
@@ -74,9 +68,9 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
     @BindView(R.id.orderNotePizzalinkInfoLayout) AppInfoView orderNotePizzalinkInfoLayout;
 
     @BindString(R.string.confirm_order) String confirmOrderText;
-    @BindString(R.string.slice_pizza) String slicePizzaText;
+    @BindString(R.string.slice_pizza_for_store) String slicePizzaForStoreText;
-    @BindString(R.string.yes) String yesText;
+    @BindString(R.string.slice_pizza) String yesText;
-    @BindString(R.string.no) String noText;
+    @BindString(R.string.do_not_slice_pizza) String noText;
     @BindString(R.string.restaurant_out_of_order) String restaurantOutOfOrderText;
     @BindString(R.string.restaurant_out_of_order_on_selected_date) String restaurantOutOfOrderOnSelectedDateText;
     @BindString(R.string.something_went_wrong) String genericErrorText;
@@ -525,19 +519,19 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
         CreateOrderActivity createOrderActivity = (CreateOrderActivity) getActivity();
         StringBuilder stringBuilder = new StringBuilder();
         if(isCartContainsAnyPizza()){
-            stringBuilder.append(slicePizzaText).append(" : ");
+            stringBuilder.append(slicePizzaForStoreText).append(" : ");
             if(createOrderActivity.getSlicePizza()){
                 stringBuilder.append(yesText);
             }
             else {
                 stringBuilder.append(noText);
             }
-            stringBuilder.append("<br/>");
+            stringBuilder.append("\n");
         }
 
         stringBuilder
                 .append(createOrderActivity.getOrderNote())
-                .append("<br/>");
+                .append("\n");
 
         if(dateOfOrderString != null && !dateOfOrderString.isEmpty() &&
                 timeOfOrder != null && !timeOfOrder.isEmpty()){
@@ -553,7 +547,7 @@ public class CreateOrderSummaryFragment extends CreateOrderBaseFragment {
 
         }
 
-        if(stringBuilder.toString().equals("\n<br/>") || stringBuilder.toString().equals("<br/>")){
+        if(stringBuilder.toString().equals("\n") || stringBuilder.toString().equals("\n<br/>") || stringBuilder.toString().equals("<br/>")){
             return "";
         }
         else {

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

@@ -38,7 +38,7 @@
             android:paddingStart="20dp"
             android:paddingRight="20dp"
             android:paddingEnd="20dp"
-            android:text="@string/slice_pizza"/>
+            android:text="@string/slice_pizza_for_customer"/>
 
         <RelativeLayout
             android:id="@+id/yesLayout"
@@ -52,7 +52,7 @@
                 android:id="@+id/yesRadioButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/yes"
+                android:text="@string/slice_pizza"
                 android:clickable="false"
                 android:textColor="@color/black"
                 android:checked="true"
@@ -72,7 +72,7 @@
                 android:id="@+id/noRadioButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/no"
+                android:text="@string/do_not_slice_pizza"
                 android:clickable="false"
                 android:textColor="@color/black"
                 fontPath="fonts/Quicksand-Bold.ttf"/>

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

@@ -123,7 +123,7 @@
     <string name="order_history_order_status">STATUS</string>    
     <string name="order_history_order_shipping_time">VERSANDZEIT</string>    
     <string name="order_history_order_total">ZWISHENSUMME</string>    
-    <string name="order_history_order_payment_method">ZAHLUNGSWEISE</string>    
+    <string name="order_history_order_payment_method">ZAHLUNGSART</string>    
     <string name="order_products">PRODUKTE</string>    
     <string name="order_history_order_fullname">VOLLNAME</string>    
     <string name="order_history_order_shipping_method">LIEFERUNGSART</string>    
@@ -168,18 +168,19 @@
 
     <!-- CreateOrderNoteFragment-->
     <string name="order_note">Was sollen wir beachten?</string>
-    <string name="slice_pizza">Aus Gründen der Qualität empfehlen wir nicht, die Pizza zu schneiden</string>
+    <string name="slice_pizza_for_customer">Aus Gründen der Qualität empfehlen wir nicht, die Pizza zu schneiden</string>
-    <string name="yes">Bitte Pizza Schneiden</string>
+    <string name="slice_pizza">Bitte Pizza Schneiden</string>
-    <string name="no">Nein, danke</string>
+    <string name="do_not_slice_pizza">Nein, bitte Pizza nicht schneiden</string>
     <!-- CreateOrderNoteFragment-->
 
     <!-- CreateOrderSummaryFragment-->    
     <string name="order_person_fullname">AN</string>    
     <string name="order_shipping_method">LIEFERUNGSART</string>    
     <string name="order_shipping_address">LIEFERUNGSADRESSE</string>    
-    <string name="order_payment_method">ZAHLUNGSWEISE</string>    
+    <string name="order_payment_method">ZAHLUNGSART</string>    
     <string name="order_total">KASSE</string>
     <string name="order_notee">BEMERKUNGEN</string>
+    <string name="slice_pizza_for_store">Die Pizza zu schneiden</string>
     <string name="delivery_date">Lieferungsdatum:</string>
     <string name="delivery_time">Lieferungszeit:</string>
     <string name="today">HEUTE</string>