Finish v1.16.7(189)

app/build.gradle

@@ -7,8 +7,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 188
+    def appVersionCode = 189
-    def appVersionName = '1.16.6'
+    def appVersionName = '1.16.7'
 
     signingConfigs {
         release {

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();

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));

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<Ordi
 
         listModel.getSelectedObservable().resetOnPropertyChangedCallback();
 
+        if(listModel.getEtichettaColor() != null)
+            holder.mBinding.emptyView.setBackgroundColor(listModel.getEtichettaColor());
+        else holder.mBinding.emptyView.setBackgroundColor(ResourcesCompat.getColor(mContext.getResources(), android.R.color.transparent, null));
+
         if(!UtilityString.isNullOrEmpty(listModel.getDescription()))
             holder.mBinding.descrizione.setText(Html.fromHtml(listModel.getDescription()));
 

app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/list/OrdiniUscitaElencoListModel.java

@@ -1,5 +1,7 @@
 package it.integry.integrywmsnative.gest.ordini_uscita_elenco.list;
 
+import androidx.annotation.ColorInt;
+
 import it.integry.integrywmsnative.core.di.BindableBoolean;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.OrdiniUscitaElencoDTO;
 
@@ -11,6 +13,8 @@ public class OrdiniUscitaElencoListModel implements Cloneable {
     private String rightDescription;
     private String rightSubDescription;
 
+    private @ColorInt Integer etichettaColor;
+
     private boolean hidden;
     private BindableBoolean selected = new BindableBoolean();
 
@@ -63,6 +67,15 @@ public class OrdiniUscitaElencoListModel implements Cloneable {
         return this;
     }
 
+    public @ColorInt Integer getEtichettaColor() {
+        return etichettaColor;
+    }
+
+    public OrdiniUscitaElencoListModel setEtichettaColor(@ColorInt Integer etichettaColor) {
+        this.etichettaColor = etichettaColor;
+        return this;
+    }
+
     public boolean isHidden() {
         return hidden;
     }

app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/UltimeConsegneClienteFragment.java

@@ -24,7 +24,7 @@ import it.integry.integrywmsnative.ui.ElevatedToolbar;
 
 public class UltimeConsegneClienteFragment extends Fragment implements ITitledFragment, IScrollableFragment, IFilterableFragment {
 
-    private List<Runnable> mOnPreDestroyList = new ArrayList<>();
+    private final List<Runnable> mOnPreDestroyList = new ArrayList<>();
     private ElevatedToolbar mToolbar;
 
     private UltimeConsegneClienteViewModel mViewModel;

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);
 

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

@@ -11,14 +11,23 @@
 
     </data>
 
-    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingStart="2dp"
-        android:paddingEnd="4dp">
+        android:paddingEnd="4dp"
+        android:orientation="horizontal">
 
 
+
+        <View
+            android:id="@+id/empty_view"
+            android:layout_width="8dp"
+            android:layout_height="match_parent"
+            android:layout_marginTop="2dp"
+            android:layout_marginBottom="2dp" />
+
         <RelativeLayout
             android:id="@+id/ordine_lavorazione_main_list_group_item_container_root"
             android:layout_width="match_parent"
@@ -89,7 +98,7 @@
             </RelativeLayout>
         </RelativeLayout>
 
-    </RelativeLayout>
+    </androidx.appcompat.widget.LinearLayoutCompat>
 
 
 </layout>