diff --git a/app/build.gradle b/app/build.gradle index d14c9cbf..0f80e1a5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -150,10 +150,7 @@ dependencies { //FAB implementation 'com.github.clans:fab:1.6.4' //CUSTOM VIEWS - implementation 'com.github.NaimishTrivedi:FBToast:1.0' implementation 'com.github.cachapa:ExpandableLayout:2.9.2' - implementation 'com.github.frankiesardo:linearlistview:1.0.1@aar' - implementation 'com.github.fede87:StatusBarAlert:1.0.1' implementation 'com.github.zhukic:sectioned-recyclerview:1.2.3' implementation 'com.github.pedromassango:doubleClick:3.0' @@ -181,7 +178,7 @@ dependencies { //Bluetooth device manager - implementation 'com.github.harry1453:android-bluetooth-serial:v1.1' + implementation 'com.github.harry1453:android-bluetooth-serial:v1.1.2' // RxJava is also required. implementation 'io.reactivex.rxjava2:rxjava:2.1.12' diff --git a/app/src/main/java/it/integry/integrywmsnative/core/di/binders/recyclerview/BindingRecyclerViewAdapter.java b/app/src/main/java/it/integry/integrywmsnative/core/di/binders/recyclerview/BindingRecyclerViewAdapter.java index 78996906..3c22110b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/di/binders/recyclerview/BindingRecyclerViewAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/di/binders/recyclerview/BindingRecyclerViewAdapter.java @@ -1,14 +1,15 @@ package it.integry.integrywmsnative.core.di.binders.recyclerview; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.Nullable; import androidx.databinding.DataBindingUtil; import androidx.databinding.ObservableArrayList; import androidx.databinding.ObservableList; import androidx.databinding.ViewDataBinding; -import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; import java.lang.ref.WeakReference; import java.util.Collection; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/ean128/Ean128Service.java b/app/src/main/java/it/integry/integrywmsnative/core/ean128/Ean128Service.java index cf88f57b..c5405de0 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/ean128/Ean128Service.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/ean128/Ean128Service.java @@ -66,19 +66,19 @@ public class Ean128Service { switch (aiModel.AI) { case SSCC -> { - if (!aiValue.isEmpty() && (aiValue.charAt(0) == '0' || aiValue.charAt(0) == '9')) { + if (aiValue.length() > 0 && (aiValue.charAt(0) == '0' || aiValue.charAt(0) == '9')) { aiValue = new StringBuilder(aiValue.substring(1)); } model.Sscc = aiValue.toString(); } case GTIN -> { - if (!aiValue.isEmpty() && (aiValue.charAt(0) == '0' || aiValue.charAt(0) == '9')) { + if (aiValue.length() > 0 && (aiValue.charAt(0) == '0' || aiValue.charAt(0) == '9')) { aiValue = new StringBuilder(aiValue.substring(1)); } model.Gtin = aiValue.toString(); } case CONTENT -> { - if (!aiValue.isEmpty() && (aiValue.charAt(0) == '0' || aiValue.charAt(0) == '9')) { + if (aiValue.length() > 0 && (aiValue.charAt(0) == '0' || aiValue.charAt(0) == '9')) { aiValue = new StringBuilder(aiValue.substring(1)); } model.Content = aiValue.toString(); diff --git a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialog.java b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialog.java index 593338a8..f1473f04 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialog.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseDialog.java @@ -2,15 +2,11 @@ package it.integry.integrywmsnative.core.expansion; import android.app.Dialog; import android.content.Context; -import android.content.DialogInterface; import android.view.KeyEvent; import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.appcompat.app.AppCompatActivity; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; -import it.integry.pointmobilescannerlibrary.PointMobileBarcodeReader; public class BaseDialog extends Dialog { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/FiltroOrdineDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/model/FiltroOrdineDTO.java index 30d23566..fe52267e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/model/FiltroOrdineDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/model/FiltroOrdineDTO.java @@ -1,7 +1,5 @@ package it.integry.integrywmsnative.core.model; -import java.text.ParseException; -import java.text.SimpleDateFormat; import java.util.Date; import it.integry.integrywmsnative.core.utility.UtilityDate; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/StbGestSetup.java b/app/src/main/java/it/integry/integrywmsnative/core/model/StbGestSetup.java index 4ead3ea1..9308d93c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/model/StbGestSetup.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/model/StbGestSetup.java @@ -1,7 +1,5 @@ package it.integry.integrywmsnative.core.model; -import java.util.Date; - public class StbGestSetup extends EntityBase{ private String gestName; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/VtbVetr.java b/app/src/main/java/it/integry/integrywmsnative/core/model/VtbVetr.java index 026ee993..ef893ff0 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/model/VtbVetr.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/model/VtbVetr.java @@ -1,7 +1,5 @@ package it.integry.integrywmsnative.core.model; -import android.os.Parcelable; - import java.math.BigDecimal; public class VtbVetr extends EntityBase { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DocumentiRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DocumentiRESTConsumerService.java index 615efda1..64890b44 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DocumentiRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/DocumentiRESTConsumerService.java @@ -1,6 +1,5 @@ package it.integry.integrywmsnative.core.rest.consumers; -import java.util.Date; import java.util.List; import it.integry.integrywmsnative.core.model.DtbDoct; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GiacenzaRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GiacenzaRESTConsumerService.java index 1a0705f9..cad38fd0 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GiacenzaRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/GiacenzaRESTConsumerService.java @@ -2,9 +2,7 @@ package it.integry.integrywmsnative.core.rest.consumers; import java.util.List; -import it.integry.integrywmsnative.core.model.DtbDoct; import it.integry.integrywmsnative.core.model.MvwSitArtUdcDetInventario; -import it.integry.integrywmsnative.core.rest.model.LoadColliDTO; import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.rest.model.giacenza.InstantItemSituationResponseDto; import it.integry.integrywmsnative.gest.prod_riposizionamento_da_prod.dto.ArtsInGiacenzaDTO; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/deserializer/LocalDateDeserializer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/deserializer/LocalDateDeserializer.java index fdd81603..3c71d603 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/deserializer/LocalDateDeserializer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/deserializer/LocalDateDeserializer.java @@ -9,7 +9,6 @@ import java.lang.reflect.Type; import java.time.LocalDate; import java.time.format.DateTimeFormatter; -import it.integry.integrywmsnative.core.utility.UtilityDate; import it.integry.integrywmsnative.core.utility.UtilityString; public class LocalDateDeserializer implements JsonDeserializer { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/serializer/StatoPartitaMagSerializer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/serializer/StatoPartitaMagSerializer.java index 21e3c210..523714a5 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/serializer/StatoPartitaMagSerializer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/serializer/StatoPartitaMagSerializer.java @@ -6,10 +6,8 @@ import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; import java.lang.reflect.Type; -import java.time.LocalDateTime; import it.integry.integrywmsnative.core.model.secondary.StatoPartitaMag; -import it.integry.integrywmsnative.core.utility.UtilityDate; public class StatoPartitaMagSerializer implements JsonSerializer { @Override diff --git a/app/src/main/java/it/integry/integrywmsnative/core/sound/SoundAlertService.java b/app/src/main/java/it/integry/integrywmsnative/core/sound/SoundAlertService.java index 04cb10d8..ac94e315 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/sound/SoundAlertService.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/sound/SoundAlertService.java @@ -3,11 +3,11 @@ package it.integry.integrywmsnative.core.sound; import android.content.Context; import android.media.MediaPlayer; -import it.integry.integrywmsnative.R; - import javax.inject.Inject; import javax.inject.Singleton; +import it.integry.integrywmsnative.R; + @Singleton public class SoundAlertService { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityFAB.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityFAB.java index ca48ffd7..462aaf0e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityFAB.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityFAB.java @@ -1,10 +1,10 @@ package it.integry.integrywmsnative.core.utility; import android.content.Context; -import com.google.android.material.floatingactionbutton.FloatingActionButton; - import android.view.animation.AnimationUtils; +import com.google.android.material.floatingactionbutton.FloatingActionButton; + import it.integry.integrywmsnative.R; /** diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityToast.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityToast.java index 785dbebd..f2418f2c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityToast.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityToast.java @@ -3,8 +3,6 @@ package it.integry.integrywmsnative.core.utility; import android.content.Context; import android.widget.Toast; -import it.integry.integrywmsnative.MainApplication; - public class UtilityToast { private static Context context; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java index e61ca249..4d222ef8 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/AccettazioneBollaPickingActivity.java @@ -16,7 +16,7 @@ import androidx.preference.PreferenceManager; import com.annimon.stream.ComparatorCompat; import com.annimon.stream.Stream; -import com.tfb.fbtoast.FBToast; +import com.google.android.material.snackbar.Snackbar; import java.math.BigDecimal; import java.time.LocalDate; @@ -487,7 +487,10 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac public void onLUOpened(MtbColt mtbColt) { runOnUiThread(() -> { noLUPresent.set(false); - FBToast.successToast(this, getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT); + + Snackbar.make(mBindings.getRoot(), R.string.data_saved, Snackbar.LENGTH_SHORT) + .setBackgroundTint(getResources().getColor(R.color.colorSuccess)) + .show(); this.mBottomSheetFragmentLUContentViewModel.setMtbColt(mtbColt); }); @@ -506,7 +509,9 @@ public class AccettazioneBollaPickingActivity extends BaseActivity implements Ac @Override public void onRowSaved() { runOnUiThread(() -> { - FBToast.successToast(this, getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT); + Snackbar.make(mBindings.getRoot(), R.string.data_saved, Snackbar.LENGTH_SHORT) + .setBackgroundTint(getResources().getColor(R.color.colorSuccess)) + .show(); }); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/filters/AccettazioneBollaPickingFilterViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/filters/AccettazioneBollaPickingFilterViewModel.java index 6280da7f..52058612 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/filters/AccettazioneBollaPickingFilterViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/filters/AccettazioneBollaPickingFilterViewModel.java @@ -9,7 +9,6 @@ import com.annimon.stream.function.Predicate; import java.util.List; import java.util.Objects; -import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.gest.accettazione_bolla_picking.dto.PickingObjectDTO; public class AccettazioneBollaPickingFilterViewModel { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/ui/AccettazioneBollaPickingListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/ui/AccettazioneBollaPickingListAdapter.java index 8ef41338..594cc38b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/ui/AccettazioneBollaPickingListAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/ui/AccettazioneBollaPickingListAdapter.java @@ -18,10 +18,7 @@ import com.zhukic.sectionedrecyclerview.SectionedRecyclerViewAdapter; import java.util.ArrayList; import java.util.Collections; -import java.util.Comparator; import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.expansion.OnListGeneralChangedCallback; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java index b6ec5a0b..e8c9e98b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java @@ -18,7 +18,7 @@ import androidx.preference.PreferenceManager; import androidx.recyclerview.widget.LinearLayoutManager; import com.annimon.stream.Stream; -import com.tfb.fbtoast.FBToast; +import com.google.android.material.snackbar.Snackbar; import java.math.BigDecimal; import java.time.LocalDate; @@ -780,7 +780,9 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A @Override public void onRowSaved() { runOnUiThread(() -> { - FBToast.successToast(this, getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT); + Snackbar.make(mBindings.getRoot(), R.string.data_saved, Snackbar.LENGTH_SHORT) + .setBackgroundTint(getResources().getColor(R. color. green_500)) + .show(); }); } @@ -825,7 +827,9 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A public void onLUOpened(MtbColt mtbColt) { runOnUiThread(() -> { noLUPresent.set(false); - FBToast.successToast(this, getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT); + Snackbar.make(mBindings.getRoot(), R.string.data_saved, Snackbar.LENGTH_SHORT) + .setBackgroundTint(getResources().getColor(R. color. green_500)) + .show(); this.mBottomSheetFragmentLUContentViewModel.setMtbColt(mtbColt); }); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/ui/AccettazioneOrdiniPickingListModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/ui/AccettazioneOrdiniPickingListModel.java index 1209eef2..0d1aacc7 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/ui/AccettazioneOrdiniPickingListModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/ui/AccettazioneOrdiniPickingListModel.java @@ -3,7 +3,6 @@ package it.integry.integrywmsnative.gest.accettazione_ordini_picking.ui; import org.jetbrains.annotations.NotNull; import java.math.BigDecimal; -import java.util.Date; import it.integry.integrywmsnative.gest.accettazione_ordini_picking.dto.PickingObjectDTO; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/articoli_in_giacenza/ArticoliInGiacenzaModule.java b/app/src/main/java/it/integry/integrywmsnative/gest/articoli_in_giacenza/ArticoliInGiacenzaModule.java index 50602367..3a3ab70c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/articoli_in_giacenza/ArticoliInGiacenzaModule.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/articoli_in_giacenza/ArticoliInGiacenzaModule.java @@ -2,7 +2,6 @@ package it.integry.integrywmsnative.gest.articoli_in_giacenza; import dagger.Module; import dagger.Provides; -import it.integry.integrywmsnative.core.rest.consumers.GiacenzaRESTConsumer; import it.integry.integrywmsnative.core.services.inventario.InventarioService; @Module(subcomponents = ArticoliInGiacenzaComponent.class) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/DocInterniViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/DocInterniViewModel.java index 075a84af..6b8b416a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/DocInterniViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/DocInterniViewModel.java @@ -8,7 +8,6 @@ import java.util.List; import javax.inject.Inject; -import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColt; import it.integry.integrywmsnative.core.data_store.db.repository.MtbColtRepository; import it.integry.integrywmsnative.core.data_store.db.wrappers.DocInternoWrapper; @@ -19,7 +18,6 @@ import it.integry.integrywmsnative.core.rest.consumers.DocumentRESTConsumer; import it.integry.integrywmsnative.core.rest.model.documento.DocumentoArtDTO; import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityDate; -import it.integry.integrywmsnative.core.utility.UtilityResources; import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.DialogSelectDocInfoResponseDTO; import it.integry.integrywmsnative.gest.contab_doc_interni.dto.DocInterniSetupDTO; import it.integry.integrywmsnative.gest.contab_doc_interni.dto.FornitoreDTO; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/ui/DocumentRowsListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/ui/DocumentRowsListAdapter.java index ec51894a..98715f8a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/ui/DocumentRowsListAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/ui/DocumentRowsListAdapter.java @@ -1,7 +1,6 @@ package it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.ui; import android.content.Context; -import android.text.Html; import android.view.LayoutInflater; import android.view.ViewGroup; @@ -12,12 +11,9 @@ import androidx.recyclerview.widget.RecyclerView; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColr; -import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColt; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.expansion.view.ExtendedRecyclerView; -import it.integry.integrywmsnative.core.utility.UtilityDate; import it.integry.integrywmsnative.databinding.ActivityContabDocInternoRowListSingleItemBinding; -import it.integry.integrywmsnative.databinding.DocInterniListModelBinding; public class DocumentRowsListAdapter extends ExtendedRecyclerView { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/rest/DocInterniRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/rest/DocInterniRESTConsumerService.java index 5c2798bd..fda0c079 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/rest/DocInterniRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/rest/DocInterniRESTConsumerService.java @@ -3,7 +3,6 @@ package it.integry.integrywmsnative.gest.contab_doc_interni.rest; import java.util.List; import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; -import it.integry.integrywmsnative.core.rest.model.documento.RetrieveDocumentoArtsResponseDTO; import it.integry.integrywmsnative.gest.contab_doc_interni.dto.DocInterniSetupDTO; import it.integry.integrywmsnative.gest.contab_doc_interni.dto.RetrieveLottiDTO; import retrofit2.Call; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/ui/DocInterniListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/ui/DocInterniListAdapter.java index d766051c..40dfa88a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/ui/DocInterniListAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/ui/DocInterniListAdapter.java @@ -6,14 +6,12 @@ import android.view.LayoutInflater; import android.view.ViewGroup; import androidx.annotation.NonNull; -import androidx.appcompat.app.AppCompatActivity; import androidx.databinding.DataBindingUtil; import androidx.databinding.ObservableArrayList; import androidx.recyclerview.widget.RecyclerView; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColt; -import it.integry.integrywmsnative.core.data_store.db.wrappers.DocInternoWrapper; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.expansion.view.ExtendedRecyclerView; import it.integry.integrywmsnative.core.utility.UtilityDate; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/ui/DocInterniListModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/ui/DocInterniListModel.java index 6ab3fb40..8d8d148f 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/ui/DocInterniListModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/ui/DocInterniListModel.java @@ -1,7 +1,6 @@ package it.integry.integrywmsnative.gest.contab_doc_interni.ui; import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColt; -import it.integry.integrywmsnative.core.data_store.db.wrappers.DocInternoWrapper; public class DocInterniListModel { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java index 4af25784..0c36446b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java @@ -16,7 +16,7 @@ import androidx.databinding.ObservableList; import androidx.fragment.app.Fragment; import androidx.recyclerview.widget.LinearLayoutManager; -import com.tfb.fbtoast.FBToast; +import com.google.android.material.snackbar.Snackbar; import java.math.BigDecimal; import java.time.LocalDate; @@ -256,7 +256,9 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme } }); - FBToast.successToast(getActivity(), getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT); + Snackbar.make(mBindings.getRoot(), R.string.data_saved, Snackbar.LENGTH_SHORT) + .setBackgroundTint(getResources().getColor(R. color. green_500)) + .show(); }); } @@ -381,7 +383,9 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme @Override public void onRowSaved() { requireActivity().runOnUiThread(() -> { - FBToast.successToast(getActivity(), getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT); + Snackbar.make(mBindings.getRoot(), R.string.data_saved, Snackbar.LENGTH_SHORT) + .setBackgroundTint(getResources().getColor(R. color. green_500)) + .show(); }); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java index 186e2915..ed13e91d 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java @@ -11,7 +11,7 @@ import androidx.databinding.ObservableArrayList; import androidx.recyclerview.widget.LinearLayoutManager; import com.annimon.stream.Stream; -import com.tfb.fbtoast.FBToast; +import com.google.android.material.snackbar.Snackbar; import java.math.BigDecimal; import java.time.LocalDate; @@ -363,7 +363,9 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag @Override public void onRowSaved() { - FBToast.successToast(this, getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT); + Snackbar.make(mBindings.getRoot(), R.string.data_saved, Snackbar.LENGTH_SHORT) + .setBackgroundTint(getResources().getColor(R. color. green_500)) + .show(); } @Override @@ -379,7 +381,10 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag @Override public void onLUOpened(MtbColt mtbColt) { noLUPresent.set(false); - FBToast.successToast(this, getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT); + + Snackbar.make(mBindings.getRoot(), R.string.data_saved, Snackbar.LENGTH_SHORT) + .setBackgroundTint(getResources().getColor(R. color. green_500)) + .show(); this.mBottomSheetFragmentLUContentViewModel.setMtbColt(mtbColt); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/rest/ProdFabbisognoLineeProdRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/rest/ProdFabbisognoLineeProdRESTConsumerService.java index 49645361..76d1a0ad 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/rest/ProdFabbisognoLineeProdRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_fabbisogno_linee_prod/rest/ProdFabbisognoLineeProdRESTConsumerService.java @@ -1,11 +1,9 @@ package it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.rest; -import java.util.Date; import java.util.List; import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dto.ProdFabbisognoLineeProdDTO; -import it.integry.integrywmsnative.gest.prod_versamento_materiale.dto.OrdineLavorazioneDTO; import retrofit2.Call; import retrofit2.http.GET; import retrofit2.http.Query; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_riposizionamento_da_prod/ProdRiposizionamentoDaProdFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_riposizionamento_da_prod/ProdRiposizionamentoDaProdFragment.java index 28bf7210..6c6c50ef 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_riposizionamento_da_prod/ProdRiposizionamentoDaProdFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_riposizionamento_da_prod/ProdRiposizionamentoDaProdFragment.java @@ -33,7 +33,6 @@ import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.interfaces.ISearchableFragment; import it.integry.integrywmsnative.core.interfaces.ITitledFragment; import it.integry.integrywmsnative.core.model.MtbDepoPosizione; -import it.integry.integrywmsnative.core.model.MvwSitArtUdcDetInventario; import it.integry.integrywmsnative.core.utility.UtilityExceptions; import it.integry.integrywmsnative.databinding.FragmentProdRiposizionamentoDaProdBinding; import it.integry.integrywmsnative.databinding.ProdRiposizionamentoDaProdListItemBinding; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_riposizionamento_da_prod/ProdRiposizionamentoDaProdModule.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_riposizionamento_da_prod/ProdRiposizionamentoDaProdModule.java index 754a1168..abd21adb 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_riposizionamento_da_prod/ProdRiposizionamentoDaProdModule.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_riposizionamento_da_prod/ProdRiposizionamentoDaProdModule.java @@ -5,8 +5,6 @@ import dagger.Provides; import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer; import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; import it.integry.integrywmsnative.core.rest.consumers.GiacenzaRESTConsumer; -import it.integry.integrywmsnative.core.rest.consumers.MagazzinoAutomaticoRESTConsumer; -import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer; import it.integry.integrywmsnative.core.sound.SoundAlertService; @Module(subcomponents = ProdRiposizionamentoDaProdComponent.class) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java index 51f1c221..4c467954 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java @@ -18,8 +18,8 @@ import androidx.core.content.ContextCompat; import androidx.databinding.ObservableField; import androidx.recyclerview.widget.LinearLayoutManager; +import com.google.android.material.snackbar.Snackbar; import com.google.android.material.textfield.TextInputLayout; -import com.tfb.fbtoast.FBToast; import java.math.BigDecimal; import java.time.LocalDate; @@ -455,7 +455,9 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr @Override public void onRowSaved() { - FBToast.successToast(requireActivity(), getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT); + Snackbar.make(getView(), R.string.data_saved, Snackbar.LENGTH_SHORT) + .setBackgroundTint(getResources().getColor(R. color. green_500)) + .show(); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java index ed0306d6..534b0086 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java @@ -18,7 +18,6 @@ import androidx.recyclerview.widget.LinearLayoutManager; import com.annimon.stream.Stream; import com.google.android.material.snackbar.Snackbar; -import com.tfb.fbtoast.FBToast; import java.math.BigDecimal; import java.time.LocalDate; @@ -789,7 +788,9 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo this.addExtraItemsEnabled.set(SettingsManager.iDB().isFlagCanAddExtraItemSpedizione()); noLUPresent.set(false); - FBToast.successToast(this, getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT); + Snackbar.make(mBindings.getRoot(), R.string.data_saved, Snackbar.LENGTH_SHORT) + .setBackgroundTint(getResources().getColor(R. color. green_500)) + .show(); this.mBottomSheetFragmentLUContentViewModel.setMtbColt(mtbColt); } @@ -1055,7 +1056,9 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo @Override public void onRowSaved() { - FBToast.successToast(this, getResources().getString(R.string.data_saved), FBToast.LENGTH_SHORT); + Snackbar.make(mBindings.getRoot(), R.string.data_saved, Snackbar.LENGTH_SHORT) + .setBackgroundTint(getResources().getColor(R. color. green_500)) + .show(); } @Override diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/model/PickedQuantityDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/model/PickedQuantityDTO.java index 833e4d6e..d41e3ed6 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/model/PickedQuantityDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/model/PickedQuantityDTO.java @@ -2,7 +2,6 @@ package it.integry.integrywmsnative.gest.spedizione.model; import java.math.BigDecimal; import java.time.LocalDate; -import java.util.Date; public class PickedQuantityDTO { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/dialog/DialogUltimiArriviFornitoreFiltroAvanzato.java b/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/dialog/DialogUltimiArriviFornitoreFiltroAvanzato.java index 55756808..824079d7 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/dialog/DialogUltimiArriviFornitoreFiltroAvanzato.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ultimi_arrivi_fornitore/dialog/DialogUltimiArriviFornitoreFiltroAvanzato.java @@ -22,14 +22,10 @@ import java.util.List; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.di.BindableString; import it.integry.integrywmsnative.core.expansion.RunnableArgs; -import it.integry.integrywmsnative.core.expansion.RunnableArgss; import it.integry.integrywmsnative.core.model.GtbAnag; -import it.integry.integrywmsnative.core.rest.model.DocumentoResoDTO; import it.integry.integrywmsnative.core.utility.UtilityDate; import it.integry.integrywmsnative.core.utility.UtilityString; -import it.integry.integrywmsnative.databinding.DialogUltimeConsegneFiltroAvanzatoBinding; import it.integry.integrywmsnative.databinding.DialogUltimiArriviFornitoreFiltroAvanzatoBinding; -import it.integry.integrywmsnative.gest.ultime_consegne_cliente.dialog.DialogUltimeConsegneFiltroAvanzato; public class DialogUltimiArriviFornitoreFiltroAvanzato { diff --git a/app/src/main/java/it/integry/integrywmsnative/ui/CheckBoxThreeStates.java b/app/src/main/java/it/integry/integrywmsnative/ui/CheckBoxThreeStates.java index 62cf64fd..3a1a31d6 100644 --- a/app/src/main/java/it/integry/integrywmsnative/ui/CheckBoxThreeStates.java +++ b/app/src/main/java/it/integry/integrywmsnative/ui/CheckBoxThreeStates.java @@ -1,15 +1,12 @@ package it.integry.integrywmsnative.ui; import android.content.Context; -import android.content.res.TypedArray; import android.util.AttributeSet; import android.view.ViewDebug; import androidx.annotation.ArrayRes; import androidx.appcompat.widget.AppCompatCheckBox; -import it.integry.integrywmsnative.R; - public class CheckBoxThreeStates extends AppCompatCheckBox { diff --git a/app/src/main/java/it/integry/integrywmsnative/ui/StatusBarAlert.java b/app/src/main/java/it/integry/integrywmsnative/ui/StatusBarAlert.java deleted file mode 100644 index 60fb2a74..00000000 --- a/app/src/main/java/it/integry/integrywmsnative/ui/StatusBarAlert.java +++ /dev/null @@ -1,368 +0,0 @@ -package it.integry.integrywmsnative.ui; - -import android.animation.Animator; -import android.app.Activity; -import android.content.ComponentName; -import android.content.Context; -import android.content.res.Resources; -import android.graphics.PorterDuff; -import android.os.Build; -import androidx.core.content.ContextCompat; -import android.view.View; -import android.view.ViewGroup; -import android.view.ViewPropertyAnimator; -import android.view.Window; -import android.view.animation.AccelerateDecelerateInterpolator; -import android.view.animation.AccelerateInterpolator; -import android.widget.LinearLayout; -import android.widget.ProgressBar; -import android.widget.TextView; - -import com.fede987.statusbaralert.utils.ScreenUtils; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -import kotlin.TypeCastException; -import kotlin.jvm.internal.Intrinsics; - -public class StatusBarAlert { - - private static final Map allAlerts = (Map)(new LinkedHashMap()); - private static int statusBarColorOringinal; - private static boolean hasOriginalStatusBarTranslucent; - public static final StatusBarAlert.Companion Companion = new StatusBarAlert.Companion(); - - - public static final class Builder { - private int text; - private String stringText; - private int alertColor; - private boolean showProgress; - private long duration; - private boolean autoHide; - private Activity context; - - @Nullable - public final View build() { - return StatusBarAlert.Companion.addStatusBarTextAndProgress(this.context, this.text, this.stringText, this.alertColor, this.showProgress, this.autoHide, this.duration); - } - - @NotNull - public final StatusBarAlert.Builder withAlertColor(int alertColor) { - this.alertColor = alertColor; - return this; - } - - @NotNull - public final StatusBarAlert.Builder withText(int text) { - this.text = text; - return this; - } - - @NotNull - public final StatusBarAlert.Builder withText(@NotNull String text) { - Intrinsics.checkParameterIsNotNull(text, "text"); - this.stringText = text; - return this; - } - - @NotNull - public final StatusBarAlert.Builder showProgress(boolean showProgress) { - this.showProgress = showProgress; - return this; - } - - @NotNull - public final StatusBarAlert.Builder autoHide(boolean autoHide) { - this.autoHide = autoHide; - return this; - } - - @NotNull - public final StatusBarAlert.Builder withDuration(long millis) { - this.duration = millis; - return this; - } - - public Builder(@NotNull Activity context) { - super(); - Intrinsics.checkParameterIsNotNull(context, "context"); - this.context = context; - this.stringText = ""; - this.duration = 2000L; - this.autoHide = true; - } - } - - public static final class Companion { - @Nullable - public final View addStatusBarTextAndProgress(@NotNull final Activity any, @Nullable Integer text, @Nullable String stringText, int alertColor, boolean showProgress, boolean autoHide, long duration) { - - this.hide(any, null); - Window var10000 = any.getWindow(); - - View var18 = var10000.getDecorView(); - if (var18 == null) { - throw new TypeCastException("null cannot be cast to non-null type android.view.ViewGroup"); - } else { - - ViewGroup decor = (ViewGroup)var18; - final LinearLayout statusBarAlert = new LinearLayout(any); - statusBarAlert.setLayoutParams(new ViewGroup.LayoutParams(-1, ScreenUtils.Companion.getStatusBarHeight(any))); - statusBarAlert.setGravity(1); - - if (alertColor > 0) { - statusBarAlert.setBackgroundColor(ContextCompat.getColor(any, alertColor)); - } - - LinearLayout ll2; - TextView t; - CharSequence var19; - label58: { - ll2 = new LinearLayout(any); - ll2.setOrientation(LinearLayout.HORIZONTAL); - ll2.setGravity(16); - ll2.setLayoutParams(new ViewGroup.LayoutParams(-2, ScreenUtils.Companion.getStatusBarHeight(any))); - t = new TextView(any); - t.setLayoutParams(new ViewGroup.LayoutParams(-2, ScreenUtils.Companion.getStatusBarHeight(any))); - t.setTextSize(12.0F); - t.setTextColor(-1); - t.setGravity(17); - if (text != null) { - if (text == 0) { - var19 = (Intrinsics.areEqual(stringText, "") ^ true ? "" + stringText + ' ' : ""); - break label58; - } - } - - StringBuilder var10001 = new StringBuilder(); - Resources var10002 = any.getResources(); - if (text == null) { - Intrinsics.throwNpe(); - } - - var19 = var10001.append(var10002.getString(text)).append(" ").toString(); - } - - t.setText(var19); - t.setIncludeFontPadding(false); - ll2.addView(t); - if (showProgress) { - ProgressBar p = new ProgressBar(any); - p.setIndeterminate(true); - p.getIndeterminateDrawable().setColorFilter(-1, PorterDuff.Mode.SRC_IN); - p.setLayoutParams(new ViewGroup.LayoutParams(ScreenUtils.Companion.convertDpToPixel(11.0F, any), ScreenUtils.Companion.convertDpToPixel(11.0F, (Context)any))); - ll2.addView(p); - } - - statusBarAlert.addView(ll2); - var10000 = any.getWindow(); - Intrinsics.checkExpressionValueIsNotNull(var10000, "any.window"); - var18 = var10000.getDecorView(); - Intrinsics.checkExpressionValueIsNotNull(var18, "any.window.decorView"); - View decorView = var18.getRootView(); - Intrinsics.checkExpressionValueIsNotNull(decorView, "decorView"); - decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE); - StatusBarAlert.hasOriginalStatusBarTranslucent = this.isTranslucentStatusBar(any); - if (Build.VERSION.SDK_INT >= 21) { - any.getWindow().clearFlags(67108864); - var10000 = any.getWindow(); - Intrinsics.checkExpressionValueIsNotNull(var10000, "any.window"); - StatusBarAlert.statusBarColorOringinal = var10000.getStatusBarColor(); - var10000 = any.getWindow(); - Intrinsics.checkExpressionValueIsNotNull(var10000, "any.window"); - var10000.setStatusBarColor(0); - } - - decor.addView(statusBarAlert); - ll2.setTranslationY(-((float)ScreenUtils.Companion.convertDpToPixel(25.0F, any))); - ViewPropertyAnimator var20 = ll2.animate(); - if (var20 == null) { - Intrinsics.throwNpe(); - } - - var20.translationY(0.0F).setDuration(150L).setStartDelay(350L).setInterpolator((new AccelerateDecelerateInterpolator())).start(); - if (autoHide) { - statusBarAlert.postDelayed((new Runnable() { - public final void run() { - if (!any.isFinishing() && statusBarAlert.getParent() != null) { - StatusBarAlert.Companion.hideInternal(any, statusBarAlert, null); - } - - Map var10000 = StatusBarAlert.allAlerts; - ComponentName var10001 = any.getComponentName(); - Intrinsics.checkExpressionValueIsNotNull(var10001, "any.componentName"); - var10000.remove(var10001.getClassName()); - } - }), duration + (long)500); - } - - Map var21 = StatusBarAlert.allAlerts; - ComponentName var22 = any.getComponentName(); - Intrinsics.checkExpressionValueIsNotNull(var22, "any.componentName"); - if (var21.get(var22.getClassName()) == null) { - Map var14 = StatusBarAlert.allAlerts; - ComponentName var23 = any.getComponentName(); - Intrinsics.checkExpressionValueIsNotNull(var23, "any.componentName"); - String var24 = var23.getClassName(); - Intrinsics.checkExpressionValueIsNotNull(var24, "any.componentName.className"); - String var15 = var24; - List var16 = new ArrayList(); - var14.put(var15, var16); - } - - var21 = StatusBarAlert.allAlerts; - var22 = any.getComponentName(); - Intrinsics.checkExpressionValueIsNotNull(var22, "any.componentName"); - List var25 = (List)var21.get(var22.getClassName()); - if (var25 != null) { - var25.add(statusBarAlert); - } - - return statusBarAlert; - } - } - - public final void hide(@NotNull Activity any, @Nullable Runnable onHidden) { - Map var10000; - ComponentName var10001; - List var9; - label48: { - var10000 = StatusBarAlert.allAlerts; - var10001 = any.getComponentName(); - - if (var10000.get(var10001.getClassName()) != null) { - var10000 = StatusBarAlert.allAlerts; - var10001 = any.getComponentName(); - - var9 = (List)var10000.get(var10001.getClassName()); - if (var9 == null) { - break label48; - } - - if (!var9.isEmpty()) { - break label48; - } - } - - if (onHidden != null) { - onHidden.run(); - } - - return; - } - - var10000 = StatusBarAlert.allAlerts; - var10001 = any.getComponentName(); - var9 = (List)var10000.get(var10001.getClassName()); - if (var9 != null) { - Iterable $receiver$iv = var9; - Iterator var4 = $receiver$iv.iterator(); - - while(var4.hasNext()) { - Object element$iv = var4.next(); - LinearLayout it = (LinearLayout)element$iv; - StatusBarAlert.Companion.hideInternal(any, it, onHidden); - } - } - - var10000 = StatusBarAlert.allAlerts; - var10001 = any.getComponentName(); - var9 = (List)var10000.get(var10001.getClassName()); - if (var9 != null) { - var9.clear(); - } - - } - - private final void hideInternal(Activity any, final LinearLayout it, final Runnable onHidden) { - if (it.getParent() != null) { - Window var10000 = any.getWindow(); - View var5 = var10000.getDecorView(); - var5 = var5.getRootView(); - var5.setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE); - - if (Build.VERSION.SDK_INT >= 21) { - var10000 = any.getWindow(); - var10000.setStatusBarColor(StatusBarAlert.statusBarColorOringinal); - if (StatusBarAlert.hasOriginalStatusBarTranslucent) { - any.getWindow().addFlags(67108864); - } - } - - var10000 = any.getWindow(); - var5 = var10000.getDecorView(); - if (var5 == null) { - throw new TypeCastException("null cannot be cast to non-null type android.view.ViewGroup"); - } - - final ViewGroup decor = (ViewGroup)var5; - ViewPropertyAnimator var6 = it.animate(); - if (var6 != null) { - var6 = var6.translationY(-((float)ScreenUtils.Companion.convertDpToPixel(25.0F, (Context)any))); - if (var6 != null) { - var6 = var6.setDuration(150L); - if (var6 != null) { - var6 = var6.setStartDelay(500L); - if (var6 != null) { - var6 = var6.setInterpolator(new AccelerateInterpolator()); - if (var6 != null) { - var6 = var6.setListener((new Animator.AnimatorListener() { - public void onAnimationRepeat(@Nullable Animator animation) { - } - - public void onAnimationEnd(@Nullable Animator animation) { - decor.removeView((View)it); - Runnable var10000 = onHidden; - if (onHidden != null) { - var10000.run(); - } - - } - - public void onAnimationStart(@Nullable Animator animation) { - } - - public void onAnimationCancel(@Nullable Animator animation) { - } - })); - if (var6 != null) { - var6.start(); - } - } - } - } - } - } - } - - } - - private final boolean isTranslucentStatusBar(Context any) { - if (any == null) { - throw new TypeCastException("null cannot be cast to non-null type android.app.Activity"); - } else { - Window w = ((Activity)any).getWindow(); - android.view.WindowManager.LayoutParams lp = w.getAttributes(); - int flags = lp.flags; - if (Build.VERSION.SDK_INT >= 19) { - return (flags & 67108864) == 67108864; - } else { - return false; - } - } - } - - private Companion() { - } - - } - } - diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1ViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1ViewModel.java index 3e038d83..943e5464 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1ViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/viewmodel/DialogAskCliente_Page1ViewModel.java @@ -2,7 +2,6 @@ package it.integry.integrywmsnative.view.dialogs.ask_cliente.viewmodel; import android.content.Context; import android.widget.AutoCompleteTextView; -import android.widget.Toast; import androidx.databinding.ObservableArrayList; import androidx.databinding.ObservableList; @@ -10,7 +9,6 @@ import androidx.databinding.ViewDataBinding; import com.annimon.stream.Optional; import com.annimon.stream.Stream; -import com.tfb.fbtoast.FBToast; import java.util.ArrayList; import java.util.List; @@ -110,7 +108,11 @@ public class DialogAskCliente_Page1ViewModel implements IDialogAskClienteViewMod refreshCodJcoms(resultCodJcom); mBinding.dropdownCommessa.setText(barcode); } else { - FBToast.errorToast(mContext, "Nessun risultato trovato", Toast.LENGTH_LONG); + +// Snackbar.make(mContext, "Nessun risultato trovato", Snackbar.LENGTH_SHORT) +// .setBackgroundTint(mContext.getResources().getColor(R.color.colorError)) +// .show(); + mBinding.dropdownCliente.setText(""); mBinding.dropdownCommessa.setText(""); } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLUAdapter.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLUAdapter.java index 939ad643..4f60b480 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLUAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLUAdapter.java @@ -1,19 +1,19 @@ package it.integry.integrywmsnative.view.dialogs.ask_position_of_lu; import android.content.Context; -import androidx.annotation.NonNull; -import androidx.viewpager.widget.PagerAdapter; -import it.integry.integrywmsnative.ui.DeactivatableViewPager; - import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.LinearLayout; +import androidx.annotation.NonNull; +import androidx.viewpager.widget.PagerAdapter; import java.util.ArrayList; import java.util.List; +import it.integry.integrywmsnative.ui.DeactivatableViewPager; + public class DialogAskPositionOfLUAdapter extends PagerAdapter { private Context mContext; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/exception/DialogException.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/exception/DialogException.java index abcab3b3..e164bdb7 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/exception/DialogException.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/exception/DialogException.java @@ -4,7 +4,6 @@ import android.content.Context; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.view.LayoutInflater; -import android.view.View; import androidx.appcompat.app.AlertDialog; import androidx.databinding.DataBindingUtil; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_peso_lu/DialogInputPesoLUView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_peso_lu/DialogInputPesoLUView.java index ebbeb88f..c82338ab 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_peso_lu/DialogInputPesoLUView.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_peso_lu/DialogInputPesoLUView.java @@ -9,7 +9,6 @@ import android.widget.ArrayAdapter; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.annimon.stream.Stream; import com.google.android.material.dialog.MaterialAlertDialogBuilder; import java.math.BigDecimal; @@ -28,7 +27,6 @@ import it.integry.integrywmsnative.core.model.MtbTCol; import it.integry.integrywmsnative.core.model.observable.ObservableMtbTcol; import it.integry.integrywmsnative.core.rest.consumers.ImballiRESTConsumer; import it.integry.integrywmsnative.core.settings.SettingsManager; -import it.integry.integrywmsnative.core.utility.UtilityExceptions; import it.integry.integrywmsnative.core.utility.UtilityNumber; import it.integry.integrywmsnative.databinding.DialogInputPesoLuBinding; diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java index 119cbaf9..fe40362f 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java @@ -224,15 +224,15 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia switch (this.mDialogInputQuantityV2DTO.getStatoPartitaMag().getStatoArt()) { case IN_SCADENZA -> { this.mBindings.inputDataScadLayout.setEndIconDrawable(R.drawable.ic_baseline_warning_24); - this.mBindings.inputDataScadLayout.setEndIconTintList(ColorStateList.valueOf(ContextCompat.getColor(requireContext(), com.tfb.fbtoast.R.color.warn_color))); + this.mBindings.inputDataScadLayout.setEndIconTintList(ColorStateList.valueOf(ContextCompat.getColor(requireContext(), R.color.colorWarning))); } case SCADUTO -> { this.mBindings.inputDataScadLayout.setEndIconDrawable(R.drawable.ic_baseline_warning_24); - this.mBindings.inputDataScadLayout.setEndIconTintList(ColorStateList.valueOf(ContextCompat.getColor(requireContext(), com.tfb.fbtoast.R.color.error_color))); + this.mBindings.inputDataScadLayout.setEndIconTintList(ColorStateList.valueOf(ContextCompat.getColor(requireContext(), R.color.colorError))); } case NON_IN_SCADENZA -> { this.mBindings.inputDataScadLayout.setEndIconDrawable(R.drawable.ic_round_check_24); - this.mBindings.inputDataScadLayout.setEndIconTintList(ColorStateList.valueOf(ContextCompat.getColor(requireContext(), com.tfb.fbtoast.R.color.success_color))); + this.mBindings.inputDataScadLayout.setEndIconTintList(ColorStateList.valueOf(ContextCompat.getColor(requireContext(), R.color.colorSuccess))); } } } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java index dc2f3a77..340945da 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java @@ -4,13 +4,10 @@ import androidx.databinding.ObservableField; import java.math.BigDecimal; import java.time.LocalDate; -import java.util.Date; import java.util.List; -import java.util.Locale; import java.util.Optional; import java.util.concurrent.FutureTask; import java.util.concurrent.atomic.AtomicBoolean; -import java.util.stream.Stream; import javax.inject.Inject; diff --git a/app/src/main/res/layout/activity_pv_ordine_acquisto_edit.xml b/app/src/main/res/layout/activity_pv_ordine_acquisto_edit.xml index ba60b704..30319a6b 100644 --- a/app/src/main/res/layout/activity_pv_ordine_acquisto_edit.xml +++ b/app/src/main/res/layout/activity_pv_ordine_acquisto_edit.xml @@ -213,7 +213,7 @@ fab:menu_animationDelayPerItem="50" fab:menu_backgroundColor="@color/white_bg_alpha" fab:menu_buttonSpacing="0dp" - fab:menu_colorNormal="@color/success_color" + fab:menu_colorNormal="@color/colorSuccess" fab:menu_colorPressed="@color/green_400" fab:menu_labels_colorNormal="@color/white" fab:menu_labels_colorPressed="@color/white_pressed" diff --git a/app/src/main/res/layout/fragment_prod_fabbisogno_linee_list_single_item.xml b/app/src/main/res/layout/fragment_prod_fabbisogno_linee_list_single_item.xml index c46922e9..ca819b22 100644 --- a/app/src/main/res/layout/fragment_prod_fabbisogno_linee_list_single_item.xml +++ b/app/src/main/res/layout/fragment_prod_fabbisogno_linee_list_single_item.xml @@ -115,8 +115,7 @@ android:text="@{item.getOrdineLavorazioneDTO().descrizioneProd}" tools:text="BUCATINI P13,5EPA T.60623/24" style="@style/AppTheme.NewMaterial.Text.Small" - android:layout_below="@+id/descrizione" - android:layout_toStartOf="@id/right_sub_descrizione"/> + android:layout_below="@+id/descrizione"/> diff --git a/app/src/main/res/layout/fragment_pv_ordini_acquisto.xml b/app/src/main/res/layout/fragment_pv_ordini_acquisto.xml index 02c81a24..9d6686e4 100644 --- a/app/src/main/res/layout/fragment_pv_ordini_acquisto.xml +++ b/app/src/main/res/layout/fragment_pv_ordini_acquisto.xml @@ -240,7 +240,7 @@ android:src="@drawable/fab_add" android:onClick="@{() -> viewmodel.createNewOrder()}" android:visibility="gone" - fab:fab_colorNormal="@color/success_color" + fab:fab_colorNormal="@color/colorSuccess" fab:fab_colorPressed="@color/green_500" fab:fab_colorRipple="#66FFFFFF" /> diff --git a/app/src/main/res/values/custom_colors.xml b/app/src/main/res/values/custom_colors.xml index 7c03f040..72dab875 100644 --- a/app/src/main/res/values/custom_colors.xml +++ b/app/src/main/res/values/custom_colors.xml @@ -7,7 +7,9 @@ #387ef5 #3f3f51b5 #757575 + @color/green_500 #EED202 + #D92727 @color/green_500 @color/orange_700 diff --git a/gradle.properties b/gradle.properties index 743f49e2..d0ea058a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -33,5 +33,5 @@ org.gradle.parallel=true # Enable simple gradle caching org.gradle.caching=true # Increase memory allotted to JVM -org.gradle.jvmargs=-Xmx4096m +org.gradle.jvmargs=-Xmx4096m -XX:+UseParallelGC org.gradle.unsafe.configuration-cache=true \ No newline at end of file