From 60978167c2f96b3d46c6507095595c13c7d416fa Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Fri, 5 Aug 2022 17:34:43 +0200 Subject: [PATCH] Miglioramento UI di recupero materiale --- app/build.gradle | 4 +- .../core/utility/UtilityDate.java | 16 +- .../core/utility/UtilityNumber.java | 1 + .../ProdDettaglioLineaActivity.java | 2 +- .../ProdRecuperoMaterialeFragment.java | 6 +- .../ProdRecuperMaterialeRESTConsumer.java | 1 + .../fragment_prod_recupero_materiale.xml | 16 +- .../prod_recupero_materiale_list_header.xml | 34 +-- .../prod_recupero_materiale_list_item.xml | 203 ++++++++---------- 9 files changed, 136 insertions(+), 147 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c5138b8b..37393b5c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -31,12 +31,12 @@ android { } } - compileSdkVersion 31 + compileSdkVersion 32 defaultConfig { applicationId "it.integry.integrywmsnative" minSdkVersion 21 - targetSdkVersion 31 + targetSdkVersion 32 versionCode appVersionCode versionName appVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDate.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDate.java index 8958745e..3897532f 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDate.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDate.java @@ -99,7 +99,21 @@ public class UtilityDate { public static Date getDateInstance() { - return getCalendarInstance().getTime(); + return getDateInstance(false); + } + + + public static Date getDateInstance(boolean removeTime) { + var calendar = getCalendarInstance(); + + if(removeTime) { + calendar.set(Calendar.HOUR_OF_DAY, 0); + calendar.set(Calendar.MINUTE, 0); + calendar.set(Calendar.SECOND, 0); + calendar.set(Calendar.MILLISECOND, 0); + } + + return calendar.getTime(); } public static Calendar getCalendarInstance() { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityNumber.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityNumber.java index 085b1a09..f3ec20ca 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityNumber.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityNumber.java @@ -35,6 +35,7 @@ public class UtilityNumber { decimalFormat.setMaximumFractionDigits(decimal); decimalFormat.setDecimalFormatSymbols(otherSymbols); decimalFormat.setGroupingUsed(false); + decimalFormat.setMinimumFractionDigits(2); return decimalFormat.format(floatValue); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_dettaglio_linea/ProdDettaglioLineaActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_dettaglio_linea/ProdDettaglioLineaActivity.java index 53076e0e..157e0091 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_dettaglio_linea/ProdDettaglioLineaActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_dettaglio_linea/ProdDettaglioLineaActivity.java @@ -277,7 +277,7 @@ public class ProdDettaglioLineaActivity extends BaseActivity implements ProdDett getSupportFragmentManager() .beginTransaction() .add(R.id.frame_layout_container, - ProdRecuperoMaterialeFragment.newInstance(mViewModel.getLineaProd().getCodJfas(), DATA_KEY_FRAGMENT_LISTENER)) + ProdRecuperoMaterialeFragment.newInstance(null, DATA_KEY_FRAGMENT_LISTENER)) .addToBackStack("ProdRecuperoMaterialeFragment") .commit(); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeFragment.java index 5be7785c..508c4d2a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeFragment.java @@ -9,10 +9,8 @@ import android.view.View; import android.view.ViewGroup; import androidx.appcompat.widget.AppCompatTextView; -import androidx.databinding.DataBindingUtil; import androidx.databinding.ObservableArrayList; import androidx.fragment.app.Fragment; -import androidx.recyclerview.widget.LinearLayoutManager; import com.annimon.stream.Stream; @@ -88,7 +86,7 @@ public class ProdRecuperoMaterialeFragment extends BaseFragment implements ITitl @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - mBinding = DataBindingUtil.inflate(inflater, R.layout.fragment_prod_recupero_materiale, container, false); + mBinding = FragmentProdRecuperoMaterialeBinding.inflate(inflater, container, false); MainApplication.appComponent .prodRecuperoMaterialeComponent() @@ -168,8 +166,6 @@ public class ProdRecuperoMaterialeFragment extends BaseFragment implements ITitl private void initRecyclerView() { this.mViewModel.getOrderList().observe(getViewLifecycleOwner(), this::refreshList); - mBinding.prodRecuperoMaterialeMainList.setLayoutManager(new LinearLayoutManager(getActivity())); - HistoryULsListAdapter adapter = new HistoryULsListAdapter(getActivity(), mHistoryULMutableData) .setOnItemClicked(data -> this.mViewModel.dispatchItem(data.getOriginalModel(), null)); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperMaterialeRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperMaterialeRESTConsumer.java index 18276dc9..c465c62f 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperMaterialeRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperMaterialeRESTConsumer.java @@ -247,6 +247,7 @@ public class ProdRecuperMaterialeRESTConsumer extends _BaseRESTConsumer { .setCodCol(restDTO.getCodCol()) .setCodTagl(restDTO.getCodTagl()) .setCodJfas(restDTO.getCodJfas()) + .setDescrizioneArt(restDTO.getDescrizioneArt()) .setDescrizioneFase(restDTO.getDescrizioneFase()) .setQtaCol(qtaColTot) .setNumCnf(numCnfColTot) diff --git a/app/src/main/res/layout/fragment_prod_recupero_materiale.xml b/app/src/main/res/layout/fragment_prod_recupero_materiale.xml index 41d9485b..1dce94ef 100644 --- a/app/src/main/res/layout/fragment_prod_recupero_materiale.xml +++ b/app/src/main/res/layout/fragment_prod_recupero_materiale.xml @@ -22,7 +22,9 @@ android:background="@android:color/white" android:id="@+id/prod_recupero_materiale_main_list" android:layout_width="match_parent" - android:layout_height="match_parent" /> + android:layout_height="match_parent" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" + tools:listitem="@layout/prod_recupero_materiale_list_item"/> + android:adjustViewBounds="true" + android:src="@drawable/ic_playlist_add_check_24dp" /> + android:textSize="18sp" /> diff --git a/app/src/main/res/layout/prod_recupero_materiale_list_header.xml b/app/src/main/res/layout/prod_recupero_materiale_list_header.xml index b673fa1e..93825056 100644 --- a/app/src/main/res/layout/prod_recupero_materiale_list_header.xml +++ b/app/src/main/res/layout/prod_recupero_materiale_list_header.xml @@ -2,29 +2,17 @@ - - + - - - - diff --git a/app/src/main/res/layout/prod_recupero_materiale_list_item.xml b/app/src/main/res/layout/prod_recupero_materiale_list_item.xml index aa35556a..8611989c 100644 --- a/app/src/main/res/layout/prod_recupero_materiale_list_item.xml +++ b/app/src/main/res/layout/prod_recupero_materiale_list_item.xml @@ -1,129 +1,116 @@ - + android:orientation="horizontal" + android:paddingVertical="8dp" + android:paddingEnd="8dp"> + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" + android:orientation="vertical"> - + android:layout_gravity="center_horizontal" + android:layout_marginBottom="-8dp" + android:text="@string/logistic_unit" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:layout_gravity="center_vertical" + android:textColor="@android:color/black" + android:textSize="22sp" + android:textStyle="bold" + tools:text="22" /> + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file