select new created address as deliver address on order page

This commit is contained in:
2020-03-17 22:12:37 +03:00
parent 359654e076
commit a805fafa89
2 changed files with 29 additions and 22 deletions

Binary file not shown.

View File

@@ -10,6 +10,8 @@ import android.view.ViewGroup;
import android.widget.Button;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import butterknife.BindString;
import butterknife.BindView;
@@ -155,13 +157,21 @@ public class ShippingAddressFragment extends CreateOrderBaseFragment {
if(addressList.size() != 0){
if(!newAddressId.isEmpty()){
sortAddresses();
}
sortAddresses();
CreateOrderActivity createOrderActivity = (CreateOrderActivity) BaseActivity.currentActivity;
if(createOrderActivity.getSelectedShippingAddress() == null){
if(!newAddressId.isEmpty()){
for(AddressModel addressModel : addressModels){
if(addressModel.getId().equals(newAddressId)){
addressModel.setSelected(true);
selectedAddress = addressModel;
createOrderActivity.setSelectedShippingAddress(addressModel);
break;
}
}
}
else if(createOrderActivity.getSelectedShippingAddress() == null){
addressList.get(0).setSelected(true);
selectedAddress = addressList.get(0);
}
@@ -197,23 +207,20 @@ public class ShippingAddressFragment extends CreateOrderBaseFragment {
}
private void sortAddresses(){
ArrayList<AddressModel> tempAddressList = new ArrayList<>();
for(AddressModel addressModel : addressList){
if(addressModel.getId().equals(newAddressId)){
tempAddressList.add(addressModel);
break;
}
}
for(AddressModel addressModel : addressList){
if(!addressModel.getId().equals(newAddressId)){
tempAddressList.add(addressModel);
}
}
addressList.clear();
addressList.addAll(tempAddressList);
Collections.sort(
addressList,
new Comparator<AddressModel>() {
@Override
public int compare(AddressModel a1, AddressModel a2) {
try {
int id1 = Integer.parseInt(a1.getId());
int id2 = Integer.parseInt(a2.getId());
return id2 - id1;
}catch (Exception e){
return a2.getId().compareTo(a1.getId());
}
}
}
);
}
}