diff --git a/app/build.gradle b/app/build.gradle index b10761a9..2540b9f6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 188 - def appVersionName = '1.16.6' + def appVersionCode = 189 + def appVersionName = '1.16.7' signingConfigs { release { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java index 312fa19e..cb5e2dd7 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java @@ -86,19 +86,14 @@ public class MainAccettazioneFragment extends Fragment implements ISearcableFrag this.mOnPreDestroyList.add(onActionBarPreDestroy); } - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - init(); - } - @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { mBinding = DataBindingUtil.inflate(inflater, R.layout.fragment_main_accettazione, container, false); + init(); + mBinding.setView(this); mBinding.accettazioneMainList.setLayoutManager(new LinearLayoutManager(getActivity())); mBinding.accettazioneMainFab.hide(); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java index 0d24b483..f120be33 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java @@ -11,6 +11,7 @@ import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.widget.AppCompatTextView; +import androidx.core.content.res.ResourcesCompat; import androidx.databinding.DataBindingUtil; import androidx.databinding.ObservableArrayList; import androidx.fragment.app.Fragment; @@ -210,6 +211,14 @@ public class OrdiniUscitaElencoFragment extends Fragment implements ITitledFragm .map(x -> { OrdiniUscitaElencoListModel listModel = new OrdiniUscitaElencoListModel(); + if (x.isFlagEvaso()) { + listModel.setEtichettaColor(ResourcesCompat.getColor(getResources(), R.color.mainGreen, null)); + } else if (x.isExistColloBoolean()) { + listModel.setEtichettaColor(ResourcesCompat.getColor(getResources(), R.color.colorPrimary, null)); + } else { + listModel.setEtichettaColor(ResourcesCompat.getColor(getResources(), android.R.color.transparent, null)); + } + listModel.setGroupTitle(x.getRagSocOrd()); String testataOrdString = String.format(getString(R.string.ord_ven_testata), String.valueOf(x.getNumOrd()), UtilityDate.formatDate(x.getDataOrdD(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/list/OrdiniUscitaElencoAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/list/OrdiniUscitaElencoAdapter.java index ea195cb0..7701ccda 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/list/OrdiniUscitaElencoAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/list/OrdiniUscitaElencoAdapter.java @@ -7,6 +7,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.core.content.res.ResourcesCompat; import androidx.databinding.DataBindingUtil; import androidx.databinding.ObservableArrayList; import androidx.databinding.ObservableList; @@ -127,6 +128,10 @@ public class OrdiniUscitaElencoAdapter extends SectionedRecyclerViewAdapter mOnPreDestroyList = new ArrayList<>(); + private final List mOnPreDestroyList = new ArrayList<>(); private ElevatedToolbar mToolbar; private UltimeConsegneClienteViewModel mViewModel; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArtView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArtView.java index 21548b55..5586b4c4 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArtView.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_art/DialogScanArtView.java @@ -55,17 +55,11 @@ public class DialogScanArtView extends BaseDialogFragment implements DialogScanA mOnItemChoosed = onItemChoosed; } - @Override - public void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - this.initBarcode(); - } - - @Nullable @Override public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { this.mContext = getActivity(); + this.initBarcode(); mBindings = DataBindingUtil.inflate(inflater, R.layout.dialog_scan_art, container, false); diff --git a/app/src/main/res/layout/fragment_main_ordini_uscita__list_group_model.xml b/app/src/main/res/layout/fragment_main_ordini_uscita__list_group_model.xml index 3749f635..bd4973db 100644 --- a/app/src/main/res/layout/fragment_main_ordini_uscita__list_group_model.xml +++ b/app/src/main/res/layout/fragment_main_ordini_uscita__list_group_model.xml @@ -11,14 +11,23 @@ - + android:paddingEnd="4dp" + android:orientation="horizontal"> + + + - + \ No newline at end of file