diff --git a/app/build.gradle b/app/build.gradle index 740c9d86..7ee189db 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,8 +11,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 545 - def appVersionName = '1.49.01' + def appVersionCode = 546 + def appVersionName = '1.49.02' signingConfigs { release { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/HttpInterceptor.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/HttpInterceptor.java index 891bb9a4..13094d38 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/HttpInterceptor.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/HttpInterceptor.java @@ -30,11 +30,17 @@ public class HttpInterceptor implements Interceptor { HttpUrl url = urlBuilder.build(); final Request.Builder requestBuilder = chain.request().newBuilder(); + Request.Builder builder = requestBuilder .addHeader("Content-Type", "application/json") .addHeader("Accept", "*/*") .addHeader("x-app-token", APP_TOKEN); + if (SettingsManager.i().getUserSession() != null && + SettingsManager.i().getUserSession().getDepo() != null && + !UtilityString.isNullOrEmpty(SettingsManager.i().getUserSession().getDepo().getCodMdep())) + builder.addHeader("codMdep", SettingsManager.i().getUserSession().getDepo().getCodMdep()); + var newRequest = builder .url(url) .build(); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java index d2c786a5..b7387024 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java @@ -4,21 +4,15 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.view.LayoutInflater; -import android.view.View; import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.databinding.DataBindingUtil; -import androidx.databinding.ObservableArrayList; import androidx.recyclerview.widget.LinearLayoutManager; -import com.ravikoradiya.liveadapter.LiveAdapter; - import java.util.List; import javax.inject.Inject; -import it.integry.integrywmsnative.BR; import it.integry.integrywmsnative.MainApplication; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.data_cache.DataCache; @@ -31,8 +25,6 @@ import it.integry.integrywmsnative.databinding.ListaBancaliListItemBinding; import it.integry.integrywmsnative.databinding.ListaBancaliListModelBinding; import it.integry.integrywmsnative.gest.contenuto_bancale.ContenutoBancaleActivity; import it.integry.integrywmsnative.gest.lista_bancali.ui.ListaColliMainListAdapter; -import it.integry.integrywmsnative.ui.SimpleDividerItemDecoration; -import kotlin.Unit; public class ListaBancaliActivity extends BaseActivity implements ListaBancaliViewModel.Listener { diff --git a/app/src/main/res/drawable/circular_background_left.xml b/app/src/main/res/drawable/circular_background_left.xml index e676105c..5d4a4f68 100644 --- a/app/src/main/res/drawable/circular_background_left.xml +++ b/app/src/main/res/drawable/circular_background_left.xml @@ -1,7 +1,7 @@ - + diff --git a/app/src/main/res/layout/activity_contenuto_bancale.xml b/app/src/main/res/layout/activity_contenuto_bancale.xml index ef6cd788..fe23a7d2 100644 --- a/app/src/main/res/layout/activity_contenuto_bancale.xml +++ b/app/src/main/res/layout/activity_contenuto_bancale.xml @@ -7,9 +7,13 @@ + + + + - + app:cardCornerRadius="16dp" + app:cardElevation="0dp"> + android:orientation="vertical" + android:padding="16dp"> - + android:orientation="horizontal"> - + + + + + + android:orientation="horizontal"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + android:paddingEnd="2dp" + tools:listitem="@layout/lista_contenuto_bancale_list_model"> @@ -221,12 +221,12 @@ + app:srcCompat="@drawable/ic_menu_24dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_lista_bancali.xml b/app/src/main/res/layout/activity_lista_bancali.xml index 8d7a59b1..15c94873 100644 --- a/app/src/main/res/layout/activity_lista_bancali.xml +++ b/app/src/main/res/layout/activity_lista_bancali.xml @@ -1,7 +1,8 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools"> @@ -9,8 +10,7 @@ + android:orientation="vertical"> + app:layout_behavior="@string/appbar_scrolling_view_behavior" + tools:listitem="@layout/lista_bancali_list_model" /> diff --git a/app/src/main/res/layout/fragment_main_rettifica_giacenze.xml b/app/src/main/res/layout/fragment_main_rettifica_giacenze.xml index 87fae766..3169922c 100644 --- a/app/src/main/res/layout/fragment_main_rettifica_giacenze.xml +++ b/app/src/main/res/layout/fragment_main_rettifica_giacenze.xml @@ -24,7 +24,6 @@ @@ -40,7 +39,6 @@ + android:text="@string/no_item_text" /> diff --git a/app/src/main/res/layout/fragment_main_versamento_merce.xml b/app/src/main/res/layout/fragment_main_versamento_merce.xml index c30f2775..9d0a3932 100644 --- a/app/src/main/res/layout/fragment_main_versamento_merce.xml +++ b/app/src/main/res/layout/fragment_main_versamento_merce.xml @@ -19,7 +19,6 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/full_white" android:padding="8dp" tools:context=".gest.versamento_merce.VersamentoMerceFragment"> @@ -32,12 +31,11 @@ android:layout_height="wrap_content" android:orientation="vertical"> - - + diff --git a/app/src/main/res/layout/lista_contenuto_bancale_list_model.xml b/app/src/main/res/layout/lista_contenuto_bancale_list_model.xml index 4e408a42..a01b116d 100644 --- a/app/src/main/res/layout/lista_contenuto_bancale_list_model.xml +++ b/app/src/main/res/layout/lista_contenuto_bancale_list_model.xml @@ -63,7 +63,6 @@ android:paddingStart="0dp" android:paddingEnd="8dp" android:text="@{mtbColr.getDescrizione()}" - android:textColor="@android:color/black" android:textSize="16sp" app:layout_constraintEnd_toStartOf="@+id/qta_guideline" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/lista_rettifica_giacenze_model.xml b/app/src/main/res/layout/lista_rettifica_giacenze_model.xml index 969af353..58f668d3 100644 --- a/app/src/main/res/layout/lista_rettifica_giacenze_model.xml +++ b/app/src/main/res/layout/lista_rettifica_giacenze_model.xml @@ -42,24 +42,20 @@ android:layout_height="wrap_content" android:text="@{mtbColr.codMart}" android:textColor="?colorPrimary" - android:textSize="14sp" android:textStyle="bold" - style="@style/AppTheme.NewMaterial.Text" + style="@style/TextAppearance.Material3.BodyMedium" tools:text="COD MART" /> + style="@style/TextAppearance.Material3.BodyMedium" + tools:text="12345" /> @@ -72,9 +68,7 @@ android:ellipsize="end" android:maxLines="2" android:text="@{mtbColr.getDescrizione()}" - android:textColor="@android:color/black" - android:textSize="16sp" - style="@style/AppTheme.NewMaterial.Text" + style="@style/TextAppearance.Material3.BodyMedium" tools:text="Descrizione lunga articolo" />