order note text changed
This commit is contained in:
BIN
.idea/caches/build_file_checksums.ser
generated
BIN
.idea/caches/build_file_checksums.ser
generated
Binary file not shown.
@@ -15,6 +15,7 @@ import butterknife.OnClick;
|
|||||||
import ch.pizzaleu.android.R;
|
import ch.pizzaleu.android.R;
|
||||||
import ch.pizzaleu.android.activity.BaseActivity;
|
import ch.pizzaleu.android.activity.BaseActivity;
|
||||||
import ch.pizzaleu.android.activity.CreateOrderActivity;
|
import ch.pizzaleu.android.activity.CreateOrderActivity;
|
||||||
|
import ch.pizzaleu.android.api.ApiConstants;
|
||||||
import ch.pizzaleu.android.helper.SharedPrefsHelper;
|
import ch.pizzaleu.android.helper.SharedPrefsHelper;
|
||||||
import ch.pizzaleu.android.model.cart.CartProductModel;
|
import ch.pizzaleu.android.model.cart.CartProductModel;
|
||||||
import ch.pizzaleu.android.view.AppEditText;
|
import ch.pizzaleu.android.view.AppEditText;
|
||||||
@@ -102,6 +103,12 @@ public class CreateOrderNoteFragment extends CreateOrderBaseFragment {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
|
int hintResId = R.string.order_note_title_for_free_shipping;
|
||||||
|
if(createOrderActivity.getSelectedShippingMethod().getCode().equals(ApiConstants.SHIPPING_METHOD_CODE_PICK_UP_FROM_STORE)){
|
||||||
|
hintResId = R.string.order_note_title_for_self_pickup;
|
||||||
|
}
|
||||||
|
orderNoteAppEditText.setHint(hintResId);
|
||||||
|
|
||||||
if(createOrderActivity.getOrderNote() != null){
|
if(createOrderActivity.getOrderNote() != null){
|
||||||
orderNoteAppEditText.setText(createOrderActivity.getOrderNote());
|
orderNoteAppEditText.setText(createOrderActivity.getOrderNote());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -156,6 +156,10 @@ public class AppEditText extends LinearLayout implements View.OnClickListener {
|
|||||||
inputMethodManager.toggleSoftInput(InputMethodManager.SHOW_FORCED,0);
|
inputMethodManager.toggleSoftInput(InputMethodManager.SHOW_FORCED,0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setHint(int hintResId){
|
||||||
|
hintTextView.setText(hintResId);
|
||||||
|
}
|
||||||
|
|
||||||
private void goNextLineWhenEndOfLine(){
|
private void goNextLineWhenEndOfLine(){
|
||||||
editText.addTextChangedListener(new TextWatcher() {
|
editText.addTextChangedListener(new TextWatcher() {
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -16,7 +16,6 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
app:edittextTheme="navy"
|
app:edittextTheme="navy"
|
||||||
app:hint="@string/order_note"
|
|
||||||
app:characterCount="160"
|
app:characterCount="160"
|
||||||
app:inputType="multiline"/>
|
app:inputType="multiline"/>
|
||||||
|
|
||||||
|
|||||||
@@ -171,7 +171,8 @@
|
|||||||
<!-- PaymentMethodFragment-->
|
<!-- PaymentMethodFragment-->
|
||||||
|
|
||||||
<!-- CreateOrderNoteFragment-->
|
<!-- CreateOrderNoteFragment-->
|
||||||
<string name="order_note">Was sollen wir beachten? (geben Sie Ihr Stockwerk ein)</string>
|
<string name="order_note_title_for_free_shipping">Was sollen wir beachten? (geben Sie Ihr Stockwerk ein)</string>
|
||||||
|
<string name="order_note_title_for_self_pickup">Was sollen wir beachten?</string>
|
||||||
<string name="slice_pizza_for_customer">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="slice_pizza">Bitte Pizza Schneiden</string>
|
<string name="slice_pizza">Bitte Pizza Schneiden</string>
|
||||||
<string name="do_not_slice_pizza">Nein, bitte Pizza nicht schneiden</string>
|
<string name="do_not_slice_pizza">Nein, bitte Pizza nicht schneiden</string>
|
||||||
|
|||||||
Reference in New Issue
Block a user