Integry/WMS_Native
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/RefactoringGestioneColli

Browse Source 
# Conflicts:
#	app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java
#	app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/filters/OrdiniUscitaElencoFiltroViewModel.java
#	app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentListAdapter.java
#	app/src/main/res/layout/dialog_choose_batch_lot.xml
#	app/src/main/res/layout/dialog_choose_batch_lot_item_model.xml
#	app/src/main/res/layout/fragment_main_ordini_uscita.xml
#	app/src/main/res/layout/fragment_main_ordini_uscita__list_group_model.xml
#	app/src/main/res/values/attr.xml
This commit is contained in:
Giuseppe Scorrano
2025-10-08 19:33:03 +02:00
parent f2bab2f510 dc342c1fee
commit 2bae112d80
26 changed files with 108 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@@ -11,8 +11,8 @@ apply plugin: 'com.google.gms.google-services'
android {
def appVersionCode = 534
def appVersionName = '1.47.21'
def appVersionCode = 535
def appVersionName = '1.47.22'
signingConfigs {
release {

15
app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java
View File

@@ -48,6 +48,7 @@ import java.util.Locale;
import it.integry.integrywmsnative.MainApplication;
import it.integry.integrywmsnative.R;
import it.integry.integrywmsnative.core.expansion.RunnableArgs;
import it.integry.integrywmsnative.core.utility.LocaleDecimalKeyListener;
import it.integry.integrywmsnative.core.helper.ContextHelper;
import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
import it.integry.integrywmsnative.core.utility.UtilityDate;
@@ -1246,4 +1247,16 @@ public class Converters {
view.setText(date.format(formatter));
}
}
/**
* BindingAdapter che applica automaticamente il KeyListener localizzato
* ai campi con inputType numberDecimal, permettendo l'uso della virgola
* come separatore decimale in base al locale del dispositivo.
*/
@BindingAdapter("useLocaleDecimalInput")
public static void setLocaleDecimalInput(EditText view, boolean useLocaleInput) {
if (useLocaleInput) {
view.setKeyListener(LocaleDecimalKeyListener.getInstance());
}
}
}

1
app/src/main/java/it/integry/integrywmsnative/core/utility/DecimalInputFilter.java Normal file
View File

@@ -0,0 +1 @@

29
app/src/main/java/it/integry/integrywmsnative/core/utility/LocaleDecimalKeyListener.java Normal file
View File

@@ -0,0 +1,29 @@
package it.integry.integrywmsnative.core.utility;
import android.text.method.DigitsKeyListener;
import java.text.DecimalFormatSymbols;
import java.util.Locale;
/**
* KeyListener personalizzato che accetta numeri decimali
* usando il separatore decimale del locale corrente (virgola per italiano)
*/
public class LocaleDecimalKeyListener {
/**
* Ottiene un'istanza del KeyListener per il locale corrente
*/
public static DigitsKeyListener getInstance() {
return getInstance(Locale.getDefault());
}
/**
* Ottiene un'istanza del KeyListener per un locale specifico
*/
public static DigitsKeyListener getInstance(Locale locale) {
DecimalFormatSymbols symbols = new DecimalFormatSymbols(locale);
char decimalSeparator = symbols.getDecimalSeparator();
return DigitsKeyListener.getInstance("0123456789" + decimalSeparator);
}
}

2
app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/ui/AccettazioneBollaPickingListAdapter.java
View File

@@ -114,7 +114,7 @@ public class AccettazioneBollaPickingListAdapter extends SectionedRecyclerViewAd
} else if (position % 2 == 1) {
holder.mBinding.getRoot().setBackgroundColor(Color.WHITE);
} else {
holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBG));
holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBGLight));
}
holder.mBinding.deactivatedOverBg.setVisibility(!pickingObjectDTO.isActive() ? View.VISIBLE : View.GONE);

2
app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/ui/AccettazioneOrdiniPickingListAdapter.java
View File

@@ -114,7 +114,7 @@ public class AccettazioneOrdiniPickingListAdapter extends SectionedRecyclerViewA
} else if (position % 2 == 1) {
holder.mBinding.getRoot().setBackgroundColor(Color.WHITE);
} else {
holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBG));
holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBGLight));
}
holder.mBinding.deactivatedOverBg.setVisibility(!pickingObjectDTO.isActive() ? View.VISIBLE : View.GONE);

3
app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/filters/OrdiniUscitaElencoFiltroViewModel.java
View File

@@ -282,6 +282,9 @@ public class OrdiniUscitaElencoFiltroViewModel {
.filter(Objects::nonNull)
.collect(Collectors.toList());
if(codMdeps.isEmpty())
return new ArrayList<>();
return Objects.requireNonNull(availableDepos).stream()
.filter(x -> codMdeps.contains(x.getCodMdep()))
.distinct()

2
app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/ui/PickingResiListAdapter.java
View File

@@ -103,7 +103,7 @@ public class PickingResiListAdapter extends SectionedRecyclerViewAdapter<Picking
} else if (position % 2 == 1) {
holder.mBinding.getRoot().setBackgroundColor(Color.WHITE);
} else {
holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBG));
holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBGLight));
}
holder.mBinding.deactivatedOverBg.setVisibility(!pickingResiListModel.isActive() ? View.VISIBLE : View.GONE);

10
app/src/main/java/it/integry/integrywmsnative/gest/spedizione/ui/SpedizioneListAdapter.java
View File

@@ -126,9 +126,9 @@ public class SpedizioneListAdapter extends SectionedRecyclerViewAdapter<Spedizio
} else if (pickingObjectDTO.getQtaEvasa().floatValue() > 0) {
holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.orange_600_with_alpha));
} else if (position % 2 == 1) {
holder.mBinding.getRoot().setBackgroundColor(Color.WHITE);
holder.mBinding.getRoot().setBackgroundColor(0);
} else {
holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBG));
holder.mBinding.getRoot().setBackgroundColor(UtilityResources.getColorResourceFromAttr(mContext, R.attr.colorLetturaFacilitataSurface));
}
holder.mBinding.deactivatedOverBg.setVisibility(!pickingObjectDTO.isActive() ? View.VISIBLE : View.GONE);
@@ -146,8 +146,10 @@ public class SpedizioneListAdapter extends SectionedRecyclerViewAdapter<Spedizio
holder.mBinding.qtaEvasa.setTextColor(ResourcesCompat.getColor(mContext.getResources(), !pickingObjectDTO.isActive() ? R.color.gray_600 : R.color.green_700, null));
holder.mBinding.descrizione.setText(pickingObjectDTO.getDescrizione());
holder.mBinding.descrizione.setTextColor(pickingObjectDTO.isDescrizionePresente() ? Color.BLACK : Color.GRAY);
if(pickingObjectDTO.isDescrizionePresente())
holder.mBinding.descrizione.setTextColor(UtilityResources.getColorResourceFromAttr(mContext, android.R.attr.colorForeground));
else
holder.mBinding.descrizione.setTextColor(Color.GRAY);
holder.mBinding.badge1.setText(pickingObjectDTO.getBadge1());
holder.mBinding.badge2.setText(pickingObjectDTO.getBadge2());

2
app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java
View File

@@ -208,6 +208,8 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
}
});
}
return mBindings.getRoot();
}

3
app/src/main/res/layout-land-hdpi/dialog_input_lu_prod.xml
View File

@@ -218,7 +218,8 @@
android:imeOptions="actionDone"
android:inputType="numberDecimal"
android:textColor="@{ContextCompat.getColor(context, view.enabledQtaCnf ? android.R.color.black : R.color.gray_400)}"
app:binding="@{view.currentPesoCollo}" />
app:binding="@{view.currentPesoCollo}"
app:useLocaleDecimalInput="@{true}" />
</com.google.android.material.textfield.TextInputLayout>

15
app/src/main/res/layout-land-hdpi/dialog_input_quantity_v2.xml
View File

@@ -798,7 +798,8 @@
android:hint="@string/qty_x_pck"
android:imeOptions="actionDone"
android:inputType="numberDecimal"
app:binding="@{view.currentQtaCnf}" />
app:binding="@{view.currentQtaCnf}"
app:useLocaleDecimalInput="@{true}" />
</com.google.android.material.textfield.TextInputLayout>
@@ -821,7 +822,8 @@
android:digits="0123456789"
android:hint="@string/tot_qty"
android:inputType="number"
app:binding="@{view.currentQtaTot}" />
app:binding="@{view.currentQtaTot}"
app:useLocaleDecimalInput="@{true}" />
</com.google.android.material.textfield.TextInputLayout>
@@ -856,7 +858,8 @@
android:hint="@string/tare_art"
android:inputType="number"
android:textColor="@color/gray_400"
app:binding="@{view.currentTaraArticolo}" />
app:binding="@{view.currentTaraArticolo}"
app:useLocaleDecimalInput="@{true}" />
</com.google.android.material.textfield.TextInputLayout>
@@ -880,7 +883,8 @@
android:imeOptions="actionDone"
android:inputType="numberDecimal"
android:textColor="@color/gray_400"
app:binding="@{view.currentTaraTot}" />
app:binding="@{view.currentTaraTot}"
app:useLocaleDecimalInput="@{true}" />
</com.google.android.material.textfield.TextInputLayout>
@@ -903,7 +907,8 @@
android:hint="@string/LU_weight"
android:inputType="number"
android:visibility="@{view.enabledNotes ? View.VISIBLE : View.GONE }"
app:binding="@{view.currentPesoLordo}" />
app:binding="@{view.currentPesoLordo}"
app:useLocaleDecimalInput="@{true}" />
</com.google.android.material.textfield.TextInputLayout>

4
app/src/main/res/layout/activity_spedizione.xml
View File

@@ -20,7 +20,6 @@
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/full_white"
android:fitsSystemWindows="false"
tools:context=".gest.spedizione.SpedizioneActivity">
@@ -44,7 +43,6 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/full_white"
android:minHeight="?attr/actionBarSize">
<androidx.appcompat.widget.Toolbar
@@ -200,6 +198,7 @@
android:layout_width="72dp"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:tint="?attr/colorControlNormal"
android:src="@drawable/ic_playlist_add_check_24dp" />
<androidx.appcompat.widget.AppCompatTextView
@@ -207,7 +206,6 @@
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text="@string/no_item_to_pick_text"
android:textColor="@android:color/black"
android:textSize="18sp" />
</androidx.appcompat.widget.LinearLayoutCompat>

1
app/src/main/res/layout/dialog_choose_batch_lot.xml
View File

@@ -41,6 +41,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:gravity="center_horizontal"
android:maxLines="2"
android:text="@string/select_batch_lot_dialog_title" />
<androidx.recyclerview.widget.RecyclerView

1
app/src/main/res/layout/dialog_choose_batch_lot_item_model.xml
View File

@@ -76,7 +76,6 @@
android:layout_height="wrap_content"
android:ellipsize="end"
android:text="@{UtilityString.isNull(inputData.descrizione, &quot;Nessuna descrizione&quot;)}"
android:textColor="@android:color/black"
style="@style/TextAppearance.Material3.BodyLarge"
app:layout_constraintTop_toBottomOf="@id/data_scad_label"
app:layout_constraintStart_toStartOf="parent"

3
app/src/main/res/layout/dialog_create_new_art.xml
View File

@@ -258,7 +258,8 @@
android:inputType="numberDecimal"
android:nextFocusDown="@id/input_default_pos_text"
android:singleLine="true"
app:binding="@{viewmodel.qtaCnf}" />
app:binding="@{viewmodel.qtaCnf}"
app:useLocaleDecimalInput="@{true}" />
</com.google.android.material.textfield.TextInputLayout>

3
app/src/main/res/layout/dialog_input_lu_prod.xml
View File

@@ -203,7 +203,8 @@
android:hint="@string/kg_x_pck"
android:imeOptions="actionDone"
android:inputType="numberDecimal"
app:binding="@{view.currentPesoCollo}" />
app:binding="@{view.currentPesoCollo}"
app:useLocaleDecimalInput="@{true}" />
</com.google.android.material.textfield.TextInputLayout>

16
app/src/main/res/layout/dialog_input_quantity_v2.xml
View File

@@ -623,6 +623,7 @@
android:layout_gravity="center"
android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatTextView
style="@style/TextAppearance.Material3.BodyLarge"
android:layout_width="wrap_content"
@@ -814,7 +815,8 @@
android:inputType="numberDecimal"
android:nextFocusForward="@+id/input_qta_tot_text"
android:selectAllOnFocus="true"
app:binding="@{view.currentQtaCnf}" />
app:binding="@{view.currentQtaCnf}"
app:useLocaleDecimalInput="@{true}" />
</com.google.android.material.textfield.TextInputLayout>
@@ -838,7 +840,8 @@
android:imeOptions="actionDone"
android:inputType="number"
android:selectAllOnFocus="true"
app:binding="@{view.currentQtaTot}" />
app:binding="@{view.currentQtaTot}"
app:useLocaleDecimalInput="@{true}" />
</com.google.android.material.textfield.TextInputLayout>
@@ -873,7 +876,8 @@
android:hint="@string/tare_art"
android:inputType="number"
android:textColor="@color/gray_400"
app:binding="@{view.currentTaraArticolo}" />
app:binding="@{view.currentTaraArticolo}"
app:useLocaleDecimalInput="@{true}" />
</com.google.android.material.textfield.TextInputLayout>
@@ -897,7 +901,8 @@
android:imeOptions="actionDone"
android:inputType="numberDecimal"
android:textColor="@color/gray_400"
app:binding="@{view.currentTaraTot}" />
app:binding="@{view.currentTaraTot}"
app:useLocaleDecimalInput="@{true}" />
</com.google.android.material.textfield.TextInputLayout>
@@ -920,7 +925,8 @@
android:layout_height="wrap_content"
android:hint="@string/LU_weight"
android:inputType="number"
app:binding="@{view.currentPesoLordo}" />
app:binding="@{view.currentPesoLordo}"
app:useLocaleDecimalInput="@{true}" />
</com.google.android.material.textfield.TextInputLayout>

4
app/src/main/res/layout/dialog_pv_edit_articolo.xml
View File

@@ -534,6 +534,7 @@
android:layout_gravity="center"
android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatTextView
style="@style/TextAppearance.Material3.BodyLarge"
android:layout_width="wrap_content"
@@ -665,7 +666,8 @@
android:hint="@string/qty_x_pck"
android:imeOptions="actionDone"
android:inputType="numberDecimal"
app:binding="@{view.currentQtaCnf}" />
app:binding="@{view.currentQtaCnf}"
app:useLocaleDecimalInput="@{true}" />
</com.google.android.material.textfield.TextInputLayout>

7
app/src/main/res/layout/fragment_main_ordini_uscita.xml
View File

@@ -49,7 +49,8 @@
android:scrollbars="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
tools:listitem="@layout/fragment_main_ordini_uscita__list_group_model"/>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/ordini_vendita_empty_view"
@@ -91,14 +92,14 @@
android:layout_width="72dp"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:src="@drawable/ic_playlist_add_check_24dp" />
android:src="@drawable/ic_playlist_add_check_24dp"
android:tint="?attr/colorControlNormal" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text="@string/no_orders_found_message"
android:textColor="@android:color/black"
android:textSize="18sp" />
</androidx.appcompat.widget.LinearLayoutCompat>

1
app/src/main/res/layout/fragment_main_ordini_uscita__list_group_model.xml
View File

@@ -54,7 +54,6 @@
tools:text="Ord. Ven. 39 del 27 ott 2017"
android:ellipsize="end"
android:maxLines="1"
android:textColor="#000"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:text="@{Html.fromHtml(@string/ord_ven_testata(String.valueOf(item.numOrd), UtilityDate.formatDate(item.dataOrd, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)))}"

14
app/src/main/res/layout/spedizione_main_list__group_item.xml
View File

@@ -5,8 +5,7 @@
<RelativeLayout 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:background="@color/full_white">
android:layout_height="wrap_content">
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/content_view_child"
@@ -56,7 +55,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textStyle="bold"
android:textColor="@android:color/black"
style="@android:style/TextAppearance.Medium"
android:text=" / " />
@@ -65,7 +63,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textStyle="bold"
android:textColor="@android:color/black"
style="@style/TextAppearance.Material3.BodyLarge"
tools:text="QTA" />
@@ -74,7 +71,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textStyle="bold"
android:textColor="@android:color/black"
android:layout_marginStart="4dp"
android:textAllCaps="true"
android:layout_gravity="center_vertical"
@@ -102,9 +98,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:textSize="16sp"
android:textColor="@android:color/black"
style="@style/TextAppearance.Material3.BodyMedium"
style="@style/TextAppearance.Material3.BodyLarge"
tools:text="DESCRIZIONE" />
<RelativeLayout
@@ -122,7 +116,6 @@
android:id="@+id/subdescrizione1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="14sp"
style="@style/TextAppearance.Material3.BodyMedium"
tools:text="SUB DESCRIZIONE" />
@@ -131,7 +124,6 @@
android:id="@+id/subdescrizione2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="14sp"
style="@style/TextAppearance.Material3.BodyMedium"
tools:text="SUB DESCRIZIONE" />
@@ -174,7 +166,7 @@
android:layout_alignTop="@id/content_view_child"
android:layout_alignBottom="@id/content_view_child"
android:alpha="0.15"
android:background="@android:color/black" />
android:background="?attr/colorDisabledSurface" />
</RelativeLayout>
</layout>

2
app/src/main/res/values-night/themes.xml
View File

@@ -35,5 +35,7 @@
<item name="colorOnSurfaceInverse">@color/md_theme_dark_inverseOnSurface</item>
<item name="colorSurfaceInverse">@color/md_theme_dark_inverseSurface</item>
<item name="colorPrimaryInverse">@color/md_theme_dark_inversePrimary</item>
<item name="colorDisabledSurface">@android:color/white</item>
<item name="colorLetturaFacilitataSurface">@color/letturaFacilitataBGDark</item>
</style>
</resources>

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

@@ -37,4 +37,7 @@
<attr name="colorWarningContainer" format="color" />
<attr name="colorOnWarning" format="color" />
<attr name="colorOnWarningContainer" format="color" />
<attr name="colorDisabledSurface" format="color" />
<attr name="colorLetturaFacilitataSurface" format="color" />
</resources>

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

@@ -13,7 +13,8 @@
<color name="mainGreen">@color/green_500</color>
<color name="mainOrange">@color/orange_700</color>
<color name="letturaFacilitataBG">#eeeeee</color>
<color name="letturaFacilitataBGLight">#eeeeee</color>
<color name="letturaFacilitataBGDark">#111111</color>
<!-- FAB DEFINITIONS -->
<color name="black_semi_transparent">#B2000000</color>

2
app/src/main/res/values/themes.xml
View File

@@ -35,6 +35,8 @@
<item name="colorOnSurfaceInverse">@color/md_theme_light_inverseOnSurface</item>
<item name="colorSurfaceInverse">@color/md_theme_light_inverseSurface</item>
<item name="colorPrimaryInverse">@color/md_theme_light_inversePrimary</item>
<item name="colorDisabledSurface">@android:color/black</item>
<item name="colorLetturaFacilitataSurface">@color/letturaFacilitataBGLight</item>
<item name="android:fontFamily">@font/google_sans_regular</item>