diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java index b4c2e7f5..6d74a8ca 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java @@ -2,7 +2,6 @@ package it.integry.integrywmsnative.gest.contab_doc_interni.edit_form; import androidx.lifecycle.MutableLiveData; -import com.annimon.stream.Optional; import com.annimon.stream.Stream; import org.json.JSONException; @@ -278,27 +277,32 @@ public class DocInterniEditFormViewModel { if (doc == null || fornitori == null || tipoDocDTO == null) return; - List filterFornitori = Stream.of(fornitori).filter(x->x.getCodAnag().equals(doc.getCodAnag())).toList(); + List filterFornitori = Stream.of(fornitori) + .filter(x -> x.getCodAnag().equals(doc.getCodAnag())) + .toList(); List checkFornitoreDTO; - TipoDocDTO tipoDoc = Stream.of(tipoDocDTO).filter(x -> x.getCodDtip().equals(doc.getCodDtipProvv())).findFirst().get(); + TipoDocDTO tipoDoc = Stream.of(tipoDocDTO) + .filter(x -> x.getCodDtip().equals(doc.getCodDtipProvv())) + .findFirst() + .get(); - if (tipoDoc.isFlagChkTracciabilita()){ + if (tipoDoc.isFlagChkTracciabilita()) { this.isCheckPartitaMag = tipoDoc.isFlagChkTracciabilita(); - }else{ + } else { if (filterFornitori.isEmpty()) return; if (doc.getCodVdes() == null) { checkFornitoreDTO = Stream.of(filterFornitori) .filter(x -> x.getCodVdes() == null).findFirst().get().getCheckFornitoreDTO(); - } else{ + } else { checkFornitoreDTO = Stream.of(filterFornitori) .filterNot(x -> x.getCodVdes() == null) .filter(x -> x.getCodVdes().equals(doc.getCodVdes())).findFirst().get().getCheckFornitoreDTO(); } - if (checkFornitoreDTO != null){ + if (checkFornitoreDTO != null) { CheckFornitoreDTO flagCheck = Stream.of(checkFornitoreDTO) .filter(x -> x.getCodDtip().equals(doc.getCodDtipProvv())).findFirstOrElse(null); diff --git a/barcode_base_android_library/build.gradle b/barcode_base_android_library/build.gradle index 2aef0b1c..71604865 100644 --- a/barcode_base_android_library/build.gradle +++ b/barcode_base_android_library/build.gradle @@ -1,12 +1,11 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 33 - + compileSdk 34 defaultConfig { minSdkVersion 21 - targetSdkVersion 33 + targetSdk 34 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles 'consumer-rules.pro' diff --git a/build.gradle b/build.gradle index d900b182..b59726d4 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { ext { kotlin_version = '1.9.0' - agp_version = '8.2.0' + agp_version = '8.2.1' } repositories { diff --git a/honeywellscannerlibrary/build.gradle b/honeywellscannerlibrary/build.gradle index 3f1e9897..56891476 100644 --- a/honeywellscannerlibrary/build.gradle +++ b/honeywellscannerlibrary/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 33 + compileSdk 34 defaultConfig { minSdkVersion 21 - targetSdkVersion 33 + targetSdk 34 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/keyobardemulatorscannerlibrary/build.gradle b/keyobardemulatorscannerlibrary/build.gradle index d3630ab3..6b05d719 100644 --- a/keyobardemulatorscannerlibrary/build.gradle +++ b/keyobardemulatorscannerlibrary/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 33 + compileSdk 34 defaultConfig { minSdkVersion 21 - targetSdkVersion 33 + targetSdk 34 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles 'consumer-rules.pro' diff --git a/pointmobilescannerlibrary/build.gradle b/pointmobilescannerlibrary/build.gradle index 5d56e622..b084ab91 100644 --- a/pointmobilescannerlibrary/build.gradle +++ b/pointmobilescannerlibrary/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 33 + compileSdk 34 defaultConfig { minSdkVersion 21 - targetSdkVersion 33 + targetSdk 34 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/zebrascannerlibrary/build.gradle b/zebrascannerlibrary/build.gradle index 759e7248..7d952295 100644 --- a/zebrascannerlibrary/build.gradle +++ b/zebrascannerlibrary/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 33 + compileSdk 34 defaultConfig { minSdkVersion 21 - targetSdkVersion 33 + targetSdk 34 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" }