verdnatura/vn-warehouse
verdnatura
/
vn-warehouse
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat: refs#8300 crashlyticsReview

This commit is contained in:
Sergio De la torre 2025-02-07 16:39:56 +01:00
parent 568c3e687b
commit 1943296492
6 changed files with 50 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/es/verdnatura/domain/Extensions.kt
View File

@ -4,7 +4,6 @@ import android.app.Activity
import android.content.Context import android.content.Context
import android.graphics.Color import android.graphics.Color
import android.graphics.drawable.GradientDrawable import android.graphics.drawable.GradientDrawable
import android.os.Build
import android.text.Html import android.text.Html
import android.view.Gravity import android.view.Gravity
import android.view.ViewGroup import android.view.ViewGroup
@ -12,7 +11,6 @@ import android.widget.EditText
import android.widget.FrameLayout import android.widget.FrameLayout
import android.widget.TextView import android.widget.TextView
import android.widget.Toast import android.widget.Toast
import androidx.annotation.RequiresApi
import es.verdnatura.R import es.verdnatura.R
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.time.ZonedDateTime import java.time.ZonedDateTime
@ -32,7 +30,6 @@ fun List<Any?>.formatWithQuotes(): String {
} + "]" } + "]"
} }
@RequiresApi(Build.VERSION_CODES.N)
fun Any.toast( fun Any.toast(
context: Context?, context: Context?,
duration: Int = Toast.LENGTH_SHORT, duration: Int = Toast.LENGTH_SHORT,
@ -104,7 +101,6 @@ fun toDateString(date: Date): String {
return format.format(date) return format.format(date)
} }
@RequiresApi(Build.VERSION_CODES.O)
fun String?.isoToString(returnOnlyDate: Boolean = false): String { fun String?.isoToString(returnOnlyDate: Boolean = false): String {
return if (!this.isNullOrEmpty() && this.contains("T")) { return if (!this.isNullOrEmpty() && this.contains("T")) {

65
app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapter.kt
View File

@ -7,6 +7,7 @@ import android.graphics.drawable.Drawable
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.View.GONE import android.view.View.GONE
import android.view.View.INVISIBLE
import android.view.View.VISIBLE import android.view.View.VISIBLE
import android.view.ViewGroup import android.view.ViewGroup
import androidx.core.content.ContextCompat.getColor import androidx.core.content.ContextCompat.getColor
@ -132,7 +133,7 @@ class SaleAdapter(
//ERROR //ERROR
if (sale.originalQuantity != sale.quantity) { if (sale.originalQuantity != sale.quantity) {
layoutError.visibility = View.VISIBLE layoutError.visibility = VISIBLE
txtError.text = txtError.text =
binding.root.context.getString(R.string.originalQuantity) + sale.originalQuantity binding.root.context.getString(R.string.originalQuantity) + sale.originalQuantity
@ -145,7 +146,7 @@ class SaleAdapter(
// d("VERDNATURA::","La quantity de ${sale.saleFk} es ${sale.pickedQuantity} y está ${sale.isPrepared}") // d("VERDNATURA::","La quantity de ${sale.saleFk} es ${sale.pickedQuantity} y está ${sale.isPrepared}")
if (sale.isNew) { if (sale.isNew) {
layoutError.visibility = View.VISIBLE layoutError.visibility = VISIBLE
txtError.text = binding.root.context.getString(R.string.newItem) txtError.text = binding.root.context.getString(R.string.newItem)
} }
@ -157,7 +158,7 @@ class SaleAdapter(
val backgroundDrawableCon: Drawable = binding.itemArticleRowSemaforoCon.background val backgroundDrawableCon: Drawable = binding.itemArticleRowSemaforoCon.background
if (!sale.isNew && sale.originalQuantity == sale.quantity) { if (!sale.isNew && sale.originalQuantity == sale.quantity) {
layoutError.visibility = View.GONE layoutError.visibility = GONE
} }
//SEMAFORO //SEMAFORO
@ -308,53 +309,53 @@ class SaleAdapter(
} }
if (isExpanded) { if (isExpanded) {
itemArticlePlacements.visibility = View.VISIBLE itemArticlePlacements.visibility = VISIBLE
ivArrow.setImageResource(R.drawable.ic_arrow_down) ivArrow.setImageResource(R.drawable.ic_arrow_down)
} else { } else {
itemArticlePlacements.visibility = View.GONE itemArticlePlacements.visibility = GONE
ivArrow.setImageResource(R.drawable.ic_arrow_up) ivArrow.setImageResource(R.drawable.ic_arrow_up)
} }
itemArticlePlacements.visibility = if (isExpanded) View.VISIBLE else { itemArticlePlacements.visibility = if (isExpanded) VISIBLE else {
View.GONE GONE
} }
if (sale.isParent) { if (sale.isParent) {
itemArticleItemFk.visibility = View.INVISIBLE itemArticleItemFk.visibility = INVISIBLE
//itemPackingText.visibility = View.INVISIBLE //itemPackingText.visibility = View.INVISIBLE
//itemPackingItemFk.visibility = View.INVISIBLE //itemPackingItemFk.visibility = View.INVISIBLE
itemArticleCel1.visibility = View.INVISIBLE itemArticleCel1.visibility = INVISIBLE
itemArticleCel2.visibility = View.INVISIBLE itemArticleCel2.visibility = INVISIBLE
itemArticleCel3.visibility = View.INVISIBLE itemArticleCel3.visibility = INVISIBLE
itemArticleQuantity.visibility = View.INVISIBLE itemArticleQuantity.visibility = INVISIBLE
txtdeNew.visibility = View.INVISIBLE txtdeNew.visibility = INVISIBLE
itemArticleQuantityPicked.visibility = View.INVISIBLE itemArticleQuantityPicked.visibility = INVISIBLE
itemArticleQuantityLine3.visibility = View.VISIBLE itemArticleQuantityLine3.visibility = VISIBLE
imageErrorMessage.visibility = View.INVISIBLE imageErrorMessage.visibility = INVISIBLE
ivArrow.visibility = View.VISIBLE ivArrow.visibility = VISIBLE
} else { } else {
itemArticleItemFk.visibility = View.VISIBLE itemArticleItemFk.visibility = VISIBLE
//itemPackingText.visibility = View.VISIBLE //itemPackingText.visibility = View.VISIBLE
//itemPackingItemFk.visibility = View.VISIBLE //itemPackingItemFk.visibility = View.VISIBLE
itemArticleCel1.visibility = View.VISIBLE itemArticleCel1.visibility = VISIBLE
itemArticleCel2.visibility = View.VISIBLE itemArticleCel2.visibility = VISIBLE
itemArticleCel3.visibility = View.VISIBLE itemArticleCel3.visibility = VISIBLE
itemArticleQuantity.visibility = View.VISIBLE itemArticleQuantity.visibility = VISIBLE
txtdeNew.visibility = View.VISIBLE txtdeNew.visibility = VISIBLE
itemArticleQuantityPicked.visibility = View.VISIBLE itemArticleQuantityPicked.visibility = VISIBLE
itemArticleQuantityLine3.visibility = View.VISIBLE itemArticleQuantityLine3.visibility = VISIBLE
if (type != SACADOR) { if (type != SACADOR) {
val colorRes = val colorRes =
if (sale.hasMistake == true || sale.hasMistake == 1) R.color.verdnatura_red_salix else R.color.verdnatura_black if (sale.hasMistake == true || sale.hasMistake == 1) R.color.verdnatura_red_salix else R.color.verdnatura_black
imageErrorMessage.imageTintList = imageErrorMessage.imageTintList =
ColorStateList.valueOf(getColor(context!!, colorRes)) ColorStateList.valueOf(getColor(context!!, colorRes))
imageErrorMessage.visibility = View.VISIBLE imageErrorMessage.visibility = VISIBLE
} else { } else {
imageErrorMessage.visibility = View.INVISIBLE imageErrorMessage.visibility = INVISIBLE
} }
ivArrow.visibility = View.INVISIBLE ivArrow.visibility = INVISIBLE
} }
if (!sale.sonSales.isNullOrEmpty()) { if (!sale.sonSales.isNullOrEmpty()) {
@ -372,7 +373,7 @@ class SaleAdapter(
} else { } else {
//revisar porque incosistencia //revisar porque incosistencia
itemArticlePlacements.visibility = View.VISIBLE itemArticlePlacements.visibility = VISIBLE
} }
/* rvHeadlines.adapter=SaleAdapter(sale.sonSales,onPasillerosItemClickListener,onQuantityClick,onSaleClickListener,onMistakeClickListener,onPackingClick) /* rvHeadlines.adapter=SaleAdapter(sale.sonSales,onPasillerosItemClickListener,onQuantityClick,onSaleClickListener,onMistakeClickListener,onPackingClick)
@ -383,11 +384,11 @@ class SaleAdapter(
if (isExpanded) { if (isExpanded) {
ivArrow.setImageResource(R.drawable.ic_arrow_up) ivArrow.setImageResource(R.drawable.ic_arrow_up)
itemArticlePlacements.visibility = View.GONE itemArticlePlacements.visibility = GONE
} else { } else {
ivArrow.setImageResource(R.drawable.ic_arrow_down) ivArrow.setImageResource(R.drawable.ic_arrow_down)
itemArticlePlacements.visibility = View.VISIBLE itemArticlePlacements.visibility = VISIBLE
} }
isExpanded = !isExpanded isExpanded = !isExpanded
@ -395,7 +396,7 @@ class SaleAdapter(
} }
//Tarea 6607 //Tarea 6607
itemArticleCel2Count.visibility = View.GONE itemArticleCel2Count.visibility = GONE
/*itemArticleCel2Count.visibility = if (type == CONTROLADOR) { /*itemArticleCel2Count.visibility = if (type == CONTROLADOR) {
View.VISIBLE View.VISIBLE
} else { } else {

54
app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPreChecker.kt
View File

@ -2104,49 +2104,19 @@ class CollectionFragmentPreChecker(
private fun showQuantityDialog(position: Int) { private fun showQuantityDialog(position: Int) {
customDialogThreeButtons.setDescription(getString(R.string.itemSaleQuantity)) customDialogThreeButtons.setDescription(getString(R.string.itemSaleQuantity))
.setValue("") .setValue("")
//Tarea4495
// if (type != SACADOR) {
/* customDialogThreeButtons.setOkButton(getString(R.string.titleFaults)) {
checkAndCall(
position,
customDialogThreeButtons.getValue(),
getString(R.string.titleFaults)
)
}.setOkButtonTwo(getString(R.string.BasuraRechazar)) {
checkAndCall(
position,
customDialogThreeButtons.getValue(),
getString(R.string.BasuraRechazar)
)
}
// }
customDialogThreeButtons.setOkButtonThree(getString(R.string.Reject)) {
checkAndCall(
position,
customDialogThreeButtons.getValue(),
getString(R.string.Reject)
)
}.setOkButtonFour(getString(R.string.Split)) {
checkAndCall(
position,
customDialogThreeButtons.getValue(),
getString(R.string.Split)
)*/
.setOkButtonAdd(getString(R.string.Agregar)) { .setOkButtonAdd(getString(R.string.Agregar)) {
/* checkAndCall( if (customDialogThreeButtons.getValue().isNotEmpty()) {
position, increaseQuantity(position, customDialogThreeButtons.getValue().toInt())
customDialogThreeButtons.getValue(), scanRequest()
getString(R.string.Agregar) customDialogThreeButtons.dismiss()
)*/ } else {
increaseQuantity(position, customDialogThreeButtons.getValue().toInt()) ma.messageWithSound(
scanRequest() getString(R.string.errorInputQuantity),
customDialogThreeButtons.dismiss() isError = true,
isPlayed = true,
isToasted = true
)
}
}.setKoButton(getString(R.string.cancel)) { }.setKoButton(getString(R.string.cancel)) {
scanRequest() scanRequest()

2
app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/LoadUnloadFragment.kt
View File

@ -595,7 +595,7 @@ class LoadUnloadFragment(
override fun onBackPressedHandled(): Boolean { override fun onBackPressedHandled(): Boolean {
if (scanned) { if (scanned) {
var customDialog = CustomDialog(requireContext()) val customDialog = CustomDialog(requireContext())
customDialog.setTitle(getString(R.string.packagesNotScanned)) customDialog.setTitle(getString(R.string.packagesNotScanned))
.setDescription(getString(R.string.savePackages)) .setDescription(getString(R.string.savePackages))
.setOkButton(getString(R.string.yes)) { .setOkButton(getString(R.string.yes)) {

10
app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt
View File

@ -701,14 +701,13 @@ class EndSacadorFragment(
) )
} }
@RequiresApi(Build.VERSION_CODES.O)
private fun printShelvingResult(placementSupplyListVO: PlacementSupplyListVO) { private fun printShelvingResult(placementSupplyListVO: PlacementSupplyListVO) {
var shelving = "" var shelving = ""
var item = "" var item = ""
var longName = "" var longName = ""
var total = "0" var total = "0"
var itemShelvingFk = 0 var itemShelvingFk = 0
if (!placementSupplyListVO.list.isEmpty()) { if (placementSupplyListVO.list.isNotEmpty()) {
val placement = placementSupplyListVO.list[0] val placement = placementSupplyListVO.list[0]
shelving = placement.shelving shelving = placement.shelving
item = placement.itemFk item = placement.itemFk
@ -926,11 +925,8 @@ class EndSacadorFragment(
val iconEraser = ImageView(context) val iconEraser = ImageView(context)
iconEraser.setImageResource(R.drawable.previous_delete) iconEraser.setImageResource(R.drawable.previous_delete)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { iconParking.tooltipText = getTooltip(R.drawable.ic_local_parking_black_24dp)
iconParking.tooltipText = getTooltip(R.drawable.ic_local_parking_black_24dp) iconEraser.tooltipText = getTooltip(R.drawable.previous_delete)
iconEraser.tooltipText = getTooltip(R.drawable.previous_delete)
}
//listIcons.add(iconEraser) //listIcons.add(iconEraser)
listIcons.add(iconParking) listIcons.add(iconParking)

11
gradle/libs.versions.toml
View File

@ -10,9 +10,7 @@ datastorePreferences = "1.1.2"
firebaseAnalyticsKtx = "22.2.0" firebaseAnalyticsKtx = "22.2.0"
firebaseCrashlyticsKtx = "19.4.0" firebaseCrashlyticsKtx = "19.4.0"
fragmentKtx = "1.8.5" fragmentKtx = "1.8.5"
geckoviewVersion = "133.0.20241209150345"
glide = "4.16.0" glide = "4.16.0"
googleWebrtc = "1.0.32006"
ink = "1.0.0" ink = "1.0.0"
koin = "2.1.6" koin = "2.1.6"
kotlinStdlibJdk7 = "2.0.0" kotlinStdlibJdk7 = "2.0.0"
@ -23,7 +21,6 @@ lottieVersion = "3.4.0"
material = "1.12.0" material = "1.12.0"
navigationFragmentKtx = "2.8.6" navigationFragmentKtx = "2.8.6"
navigationUiKtx = "2.8.6" navigationUiKtx = "2.8.6"
pjsipAndroid = "2.12.1"
playServicesLocation = "21.3.0" playServicesLocation = "21.3.0"
recyclerview = "1.4.0" recyclerview = "1.4.0"
retrofit = "2.3.0" retrofit = "2.3.0"
@ -35,10 +32,7 @@ googleDevtoolsKsp = "2.0.20-1.0.25"
androidGradlePlugin = "8.7.3" androidGradlePlugin = "8.7.3"
kotlin = "2.0.20" kotlin = "2.0.20"
googleServices = "4.4.2" googleServices = "4.4.2"
firebaseCrashlytics = "3.0.2" firebaseCrashlytics = "3.0.3"
protoliteWellKnownTypes = "18.0.0"
junit = "4.12"
material3Android = "1.3.1"
[libraries] [libraries]
#pickerImage #pickerImage
@ -98,9 +92,6 @@ androidGradlePlugin = { module = "com.android.tools.build:gradle", version.ref =
kotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } kotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
googleServices = { module = "com.google.gms:google-services", version.ref = "googleServices" } googleServices = { module = "com.google.gms:google-services", version.ref = "googleServices" }
firebaseCrashlyticsGradle = { module = "com.google.firebase:firebase-crashlytics-gradle", version.ref = "firebaseCrashlytics" } firebaseCrashlyticsGradle = { module = "com.google.firebase:firebase-crashlytics-gradle", version.ref = "firebaseCrashlytics" }
protolite-well-known-types = { group = "com.google.firebase", name = "protolite-well-known-types", version.ref = "protoliteWellKnownTypes" }
junit = { group = "junit", name = "junit", version.ref = "junit" }
androidx-material3-android = { group = "androidx.compose.material3", name = "material3-android", version.ref = "material3Android" }
[plugins] [plugins]
google-devtools-ksp = { id = "com.google.devtools.ksp", version.ref = "googleDevtoolsKsp" } google-devtools-ksp = { id = "com.google.devtools.ksp", version.ref = "googleDevtoolsKsp" }