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

add new address button text changed by shipping method

Browse Source
This commit is contained in:
mustafa içmen
2020-01-11 19:54:11 +03:00
parent 3099cb9bc7
commit 39731f2a17
5 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.idea/caches/build_file_checksums.ser generated
View File

Binary file not shown.

BIN
.idea/caches/gradle_models.ser generated
View File

Binary file not shown.

8
app/src/main/java/ch/pizzaleu/android/fragment/createOrder/ShippingAddressFragment.java
View File

@@ -20,6 +20,7 @@ import ch.pizzaleu.android.activity.AddAddressActivity;
import ch.pizzaleu.android.activity.BaseActivity;
import ch.pizzaleu.android.activity.CreateOrderActivity;
import ch.pizzaleu.android.adapter.recycler.ShippingAddressesRecyclerAdapter;
import ch.pizzaleu.android.api.ApiConstants;
import ch.pizzaleu.android.api.ApiErrorUtils;
import ch.pizzaleu.android.api.ApiService;
import ch.pizzaleu.android.api.ResponseArray;
@@ -110,6 +111,13 @@ public class ShippingAddressFragment extends CreateOrderBaseFragment {
private void initViews(){
initRecyclerView();
CreateOrderActivity createOrderActivity = (CreateOrderActivity) BaseActivity.currentActivity;
if(createOrderActivity.getSelectedShippingMethod().getCode().toLowerCase().equals(ApiConstants.SHIPPING_METHOD_CODE_PICK_UP_FROM_STORE)){
addNewAddressButton.setText(R.string.add_new_shipping_address_for_self_pick_up);
}
else {
addNewAddressButton.setText(R.string.add_new_shipping_address_for_free_shipping);
}
}
private void getCustomerShippingAddresses(){

2
app/src/main/res/layout/fragment_shipping_address.xml
View File

@@ -20,7 +20,7 @@
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
style="@style/PizzappGrayButton"
android:text="@string/add_new_shipping_address"
android:text="@string/add_new_shipping_address_for_free_shipping"
android:layout_above="@+id/ordersBottomLayout"/>
<include layout="@layout/layout_orders_bottom"/>

3
app/src/main/res/values/strings.xml
View File

@@ -155,7 +155,8 @@
<!-- ShippingMethodFragment-->
    
<!-- ShippingAddressFragment-->
<string name="add_new_shipping_address">ABWEICHENDE LIEFERADRESSE</string>
<string name="add_new_shipping_address_for_free_shipping">ABWEICHENDE LIEFERADRESSE</string>
<string name="add_new_shipping_address_for_self_pick_up">ABWEICHENDE ADRESSE</string>
<string name="alert_choose_shipping_address">Bitte wählen Sie eine Lieferungsadresse aus oder fügen Sie eine neue Lieferungsadresse hinzu.</string>
<!-- ShippingAddressFragment-->