diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 7dded68b..921e1813 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -16,8 +16,8 @@ android { applicationId = "es.verdnatura" minSdk = 26 targetSdk = 33 // se deja con target si no Play Protect la bloquea - versionCode = 397 //JAF 393 en informatica - versionName = "25.6" + versionCode = 405 + versionName = "25.12" // REvisor para reservas testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } @@ -149,36 +149,30 @@ android { //implementation(libs.koin.androidx.compose) // Compose - dependencies { - val composeBom = platform("androidx.compose:compose-bom:2024.10.01") - implementation(composeBom) - androidTestImplementation(composeBom) - - // Choose one of the following: - // Material Design 3 - implementation(libs.androidx.material3) - implementation(libs.androidx.ui) - // Android Studio Preview support - implementation(libs.androidx.ui.tooling.preview) - debugImplementation(libs.androidx.ui.tooling) - // UI Tests - androidTestImplementation(libs.androidx.ui.test.junit4) - debugImplementation(libs.androidx.ui.test.manifest) - // custom design system based on Foundation) - //implementation(libs.androidx.material.icons.core) - // Optional - Add full set of material icons - implementation(libs.androidx.material.icons.extended) - // Optional - Add window size utils - implementation(libs.androidx.adaptive) - implementation(libs.androidx.activity.compose) - implementation(libs.androidx.lifecycle.viewmodel.compose) - implementation(libs.lottie.compose) - - } + val composeBom = platform("androidx.compose:compose-bom:2024.10.01") + implementation(composeBom) + androidTestImplementation(composeBom) + // Choose one of the following: + // Material Design 3 + implementation(libs.androidx.material3) + implementation(libs.androidx.ui) + // Android Studio Preview support + implementation(libs.androidx.ui.tooling.preview) + debugImplementation(libs.androidx.ui.tooling) + // UI Tests + androidTestImplementation(libs.androidx.ui.test.junit4) + debugImplementation(libs.androidx.ui.test.manifest) + // custom design system based on Foundation) + //implementation(libs.androidx.material.icons.core) + // Optional - Add full set of material icons + implementation(libs.androidx.material.icons.extended) + // Optional - Add window size utils + implementation(libs.androidx.adaptive) + implementation(libs.androidx.activity.compose) + implementation(libs.androidx.lifecycle.viewmodel.compose) + implementation(libs.lottie.compose) + testImplementation(libs.junit) } } -dependencies { - testImplementation(libs.junit) -} diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt index 4289e0b5..fcf5b92b 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt @@ -56,7 +56,7 @@ import es.verdnatura.presentation.view.feature.articulo.fragment.ItemProposalFra import es.verdnatura.presentation.view.feature.boxPicking.BoxPickingFragment import es.verdnatura.presentation.view.feature.buffer.fragment.BufferFragment import es.verdnatura.presentation.view.feature.buffer.fragment.BufferLoadFragment -import es.verdnatura.presentation.view.feature.buscaritem.fragment.BuscarItemFragment +import es.verdnatura.presentation.view.feature.buscaritem.fragment.BuscarItemFragmentCompose import es.verdnatura.presentation.view.feature.category.ChangeCategoryFragment import es.verdnatura.presentation.view.feature.claim.fragment.reubication.fragment.ReubicationCollectionFragment import es.verdnatura.presentation.view.feature.claim.fragment.reubication.fragment.ReubicationFragment @@ -79,7 +79,7 @@ import es.verdnatura.presentation.view.feature.delivery.fragments.SalaryCompleme import es.verdnatura.presentation.view.feature.delivery.fragments.SummaryFragment import es.verdnatura.presentation.view.feature.delivery.fragments.TicketsFragment import es.verdnatura.presentation.view.feature.delivery.model.ClientTicketSalix -import es.verdnatura.presentation.view.feature.diadeventa.fragment.DayOfSaleFragment +import es.verdnatura.presentation.view.feature.diadeventa.fragment.DayOfSaleFragmentCompose import es.verdnatura.presentation.view.feature.historicoarticulo.fragment.HistoricoArticuloFragment import es.verdnatura.presentation.view.feature.historicoshelvinglog.fragment.ShelvingLogFragment import es.verdnatura.presentation.view.feature.historicoshelvinglog.model.LogType @@ -99,7 +99,7 @@ import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionPa import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionPalletFragment import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionPreparedStateFragment import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionScanFragment -import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionScanSorterFragment +import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionScanSorterFragmentCompose import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionStateFragment import es.verdnatura.presentation.view.feature.paletizador.fragment.ExpeditionTruckListFragment import es.verdnatura.presentation.view.feature.paletizador.fragment.PalletScanFragment @@ -133,7 +133,7 @@ import es.verdnatura.presentation.view.feature.ticket.fragment.TicketAdvanceFrag import es.verdnatura.presentation.view.feature.ubicador.fragment.AutomaticAddItemFragment import es.verdnatura.presentation.view.feature.ubicador.fragment.UbicadorFragment import es.verdnatura.presentation.view.feature.workermistake.fragment.PackingMistakeFragment -import es.verdnatura.presentation.view.feature.workermistake.fragment.WorkermistakeFragment +import es.verdnatura.presentation.view.feature.workermistake.fragment.WorkermistakeFragmentCompose import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope @@ -575,7 +575,8 @@ class MainActivity : BaseActivity(), OnPasillerosItemClickL } getString(R.string.titleScanExpedition) -> { - addFragmentOnTop(ExpeditionScanSorterFragment.newInstance(itemTitle)) + //addFragmentOnTop(ExpeditionScanSorterFragment.newInstance(itemTitle)) + addFragmentOnTop(ExpeditionScanSorterFragmentCompose.newInstance(itemTitle)) } getString(R.string.titleBufferManegement) -> { @@ -605,7 +606,8 @@ class MainActivity : BaseActivity(), OnPasillerosItemClickL } getString(R.string.titleDayOfSale) -> { - addFragmentOnTop(DayOfSaleFragment(itemTitle)) + //addFragmentOnTop(DayOfSaleFragment(itemTitle)) + addFragmentOnTop(DayOfSaleFragmentCompose(itemTitle)) } getString(R.string.titleShowTicket) -> { @@ -627,18 +629,8 @@ class MainActivity : BaseActivity(), OnPasillerosItemClickL getString(R.string.titleItemSearch) -> { //JETPACKCOMPOSE - /* addFragmentOnTop( - BuscarItemFragmentCompose.newInstance( - if (entryPoint == "") { - null - } else { - entryPoint.toInt() - } - ) - )*/ - addFragmentOnTop( - BuscarItemFragment.newInstance( + BuscarItemFragmentCompose.newInstance( if (entryPoint == "") { null } else { @@ -646,6 +638,16 @@ class MainActivity : BaseActivity(), OnPasillerosItemClickL } ) ) + + /* addFragmentOnTop( + BuscarItemFragment.newInstance( + if (entryPoint == "") { + null + } else { + entryPoint.toInt() + } + ) + )*/ } getString(R.string.titleHistorical) -> { @@ -757,7 +759,8 @@ class MainActivity : BaseActivity(), OnPasillerosItemClickL } getString(R.string.titleWorkerMistake) -> { - addFragmentOnTop(WorkermistakeFragment.newInstance(itemTitle)) + //addFragmentOnTop(WorkermistakeFragment.newInstance(itemTitle)) + addFragmentOnTop(WorkermistakeFragmentCompose.newInstance(itemTitle)) } getString(R.string.deleteExpedition) -> { diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt index d6330a15..102fe886 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt @@ -289,13 +289,13 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) { ) ) - //a quitar - _pasillerositem.add( - PasillerosItemVO( - R.drawable.ic_picker_ui, R.string.titlePickers, R.string.titlePickersDescrip + //solo para hacer pruebas en los dos sistemas + /* _pasillerositem.add( + PasillerosItemVO( + R.drawable.ic_picker_ui, R.string.titlePickers, R.string.titlePickersDescrip - ) - ) + ) + )*/ } else { _pasillerositem.add( diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragment.kt index 5f4ffa1a..cb4a9229 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragment.kt @@ -161,15 +161,14 @@ class AutomaticAddItemFragment( customDialogList.setDescription( getString(R.string.scanShelvingsLocate) ).setOkButton(getString(R.string.locate)) { - listItems.clear() listShelvings.forEach { viewModel.itemShelvingMakeMulti( it.code!!, ArrayList(listItems), mobileApplication.dataStoreApp.readDataStoreKey(WAREHOUSEFK) ) - } + listItems.clear() customDialogList.dismiss() }.setKoButton(getString(R.string.cancel)) {