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

feat issues refs #7636

This commit is contained in:
Sergio De la torre 2024-06-28 10:16:19 +02:00
parent 8a070607c8
commit 56b8f97039
11 changed files with 35 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/build.gradle
View File

@ -7,14 +7,14 @@ apply plugin: 'com.google.devtools.ksp'
android { android {
namespace = "es.verdnatura"
compileSdk 34 compileSdk 34
defaultConfig { defaultConfig {
applicationId "es.verdnatura" applicationId "es.verdnatura"
minSdkVersion 26 minSdkVersion 26
targetSdkVersion 33 // se deja con target si no Play Protect la bloquea targetSdkVersion 33 // se deja con target si no Play Protect la bloquea
versionCode 309 versionCode 309
versionName = "24.26" versionName = "24.26Beta"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }
@ -69,9 +69,9 @@ android {
dependencies { dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.google.firebase:firebase-crashlytics-ktx:18.6.1' implementation 'com.google.firebase:firebase-crashlytics-ktx:19.0.2'
implementation 'com.google.firebase:firebase-analytics-ktx:21.5.0' implementation 'com.google.firebase:firebase-analytics-ktx:22.0.2'
implementation 'com.google.android.gms:play-services-location:21.1.0' implementation 'com.google.android.gms:play-services-location:21.3.0'
implementation 'androidx.navigation:navigation-fragment-ktx:2.7.7' implementation 'androidx.navigation:navigation-fragment-ktx:2.7.7'
implementation 'androidx.navigation:navigation-ui-ktx:2.7.7' implementation 'androidx.navigation:navigation-ui-ktx:2.7.7'
kapt "androidx.room:room-compiler:2.6.1" kapt "androidx.room:room-compiler:2.6.1"
@ -85,7 +85,7 @@ dependencies {
// Kotlin and Android // Kotlin and Android
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.core:core-ktx:1.12.0' implementation 'androidx.core:core-ktx:1.13.1'
implementation 'androidx.constraintlayout:constraintlayout:2.0' implementation 'androidx.constraintlayout:constraintlayout:2.0'
//si >2.0 revisar pantalla (ej:Ajustes) //si >2.0 revisar pantalla (ej:Ajustes)
@ -95,9 +95,9 @@ dependencies {
//tests //tests
testImplementation 'junit:junit:4.13.2' testImplementation 'junit:junit:4.13.2'
testImplementation 'io.mock:mockk:1.12.2' testImplementation 'io.mock:mockk:1.12.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation 'androidx.test.ext:junit:1.2.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.0'
implementation 'com.google.android.material:material:1.11.0' implementation 'com.google.android.material:material:1.12.0'
implementation 'com.squareup.retrofit2:retrofit:2.3.0' implementation 'com.squareup.retrofit2:retrofit:2.3.0'
implementation 'com.squareup.retrofit2:converter-gson:2.0.2' implementation 'com.squareup.retrofit2:converter-gson:2.0.2'
implementation 'com.squareup.retrofit2:converter-scalars:2.3.0' implementation 'com.squareup.retrofit2:converter-scalars:2.3.0'
@ -105,7 +105,7 @@ dependencies {
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
//Fragments //Fragments
implementation("androidx.fragment:fragment-ktx:1.6.2") implementation("androidx.fragment:fragment-ktx:1.6.2") // Da problemas al subir versión
// Architecture components // Architecture components
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle"
@ -125,7 +125,7 @@ dependencies {
kapt "com.github.bumptech.glide:compiler:$glide" kapt "com.github.bumptech.glide:compiler:$glide"
// Add the Firebase Crashlytics SDK. // Add the Firebase Crashlytics SDK.
implementation 'com.google.firebase:firebase-analytics:21.5.0' implementation 'com.google.firebase:firebase-analytics:22.0.2'
//search //search
implementation 'com.github.mirrajabi:search-dialog:1.1' implementation 'com.github.mirrajabi:search-dialog:1.1'
@ -137,12 +137,9 @@ dependencies {
implementation 'com.github.esafirm:android-image-picker:3.0.0-beta5' implementation 'com.github.esafirm:android-image-picker:3.0.0-beta5'
//preferences //preferences
implementation("androidx.datastore:datastore-preferences:1.0.0") implementation("androidx.datastore:datastore-preferences:1.1.1")
implementation 'androidx.datastore:datastore-core:1.0.0' implementation 'androidx.datastore:datastore-core:1.1.1'
//linphone
// implementation 'org.linphone:linphone-sdk-android:5.1.0+'
//implementation 'androidx.media:media:1.6.0'
// Compose // Compose
/* implementation(platform("androidx.compose:compose-bom:2024.02.01")) /* implementation(platform("androidx.compose:compose-bom:2024.02.01"))

4
app/src/main/AndroidManifest.xml
View File

@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android">
xmlns:tools="http://schemas.android.com/tools"
package="es.verdnatura">
<uses-feature <uses-feature
android:name="android.hardware.telephony" android:name="android.hardware.telephony"

2
app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt
View File

@ -448,7 +448,7 @@ class AjustesFragment :
customWarningPrinter.setTitle(getString(R.string.confirm)) customWarningPrinter.setTitle(getString(R.string.confirm))
.setDescription( .setDescription(
"La impresora seleccionada es solo para emergencias. ¿Estás seguro?" getString(R.string.selectPrinterEmergency)
) )
.setOkButton(getString(R.string.yes)) { .setOkButton(getString(R.string.yes)) {

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

@ -123,7 +123,6 @@ class SaleAdapter(
imageErrorMessage.setOnClickListener { imageErrorMessage.setOnClickListener {
onMistakeClickListener.onMistakeClickListener(sale) onMistakeClickListener.onMistakeClickListener(sale)
false
} }
//ERROR //ERROR

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

@ -136,7 +136,6 @@ class SaleAdapterNew(
imageErrorMessage.setOnClickListener { imageErrorMessage.setOnClickListener {
// onMistakeClickListener.onMistakeClickListener(sale) // onMistakeClickListener.onMistakeClickListener(sale)
false
} }
//ERROR //ERROR

25
app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt
View File

@ -70,16 +70,16 @@ class LoginFragment(private var imageUri: Uri?) :
) )
//Tarea 6868 //Tarea 6868
/* viewModel.loginApp( /* viewModel.loginApp(
LoginApp( LoginApp(
user = binding.edittextUsername.text.toString(), user = binding.edittextUsername.text.toString(),
password = binding.edittextPassword.text.toString(), password = binding.edittextPassword.text.toString(),
deviceId = getDevicePDA(), deviceId = getDevicePDA(),
androidId = mobileApplication.dataStoreApp.readDataStoreKey(ANDROID_ID), androidId = mobileApplication.dataStoreApp.readDataStoreKey(ANDROID_ID),
versionApp = getInfoVersionNameApp(), versionApp = getInfoVersionNameApp(),
nameApp = getString(R.string.nameApp), nameApp = getString(R.string.nameApp),
) )
)*/ )*/
} }
if (mobileApplication.dataStoreApp.readDataStoreKey<String>(TOKEN) if (mobileApplication.dataStoreApp.readDataStoreKey<String>(TOKEN)
@ -331,11 +331,12 @@ class LoginFragment(private var imageUri: Uri?) :
customDialog.dismiss() customDialog.dismiss()
}.show() }.show()
} else { } else {
if (it.version == getInfoVersionNameApp()) { if (it.version == getInfoVersionNameApp()) {
goToMain() goToMain()
} else { } else {
mobileApplication.clearApplicationData() if (binding.edittextServer.text.toString() == "Producción") {
mobileApplication.clearApplicationData()
}
customDialog.setTitle(getString(R.string.Actualizar)) customDialog.setTitle(getString(R.string.Actualizar))
.setDescription(getString(R.string.updatemng)).setOkButton( .setDescription(getString(R.string.updatemng)).setOkButton(
getString( getString(

1
app/src/main/res/values-es/strings.xml
View File

@ -835,5 +835,6 @@
<string name="pendingAmount">Hoy quedan por salir %1$x unidades</string> <string name="pendingAmount">Hoy quedan por salir %1$x unidades</string>
<string name="errorInputQuantity">Error al introducir cantidad</string> <string name="errorInputQuantity">Error al introducir cantidad</string>
<string name="txtName">%1$s %2$s</string> <string name="txtName">%1$s %2$s</string>
<string name="selectPrinterEmergency">La impresora seleccionada es solo para emergencias.¿Estás seguro?</string>
</resources> </resources>

1
app/src/main/res/values-fr/strings.xml
View File

@ -835,5 +835,6 @@
<string name="pendingAmount">Hoy quedan por salir %1$x unidades</string> <string name="pendingAmount">Hoy quedan por salir %1$x unidades</string>
<string name="errorInputQuantity">Error al introducir cantidad</string> <string name="errorInputQuantity">Error al introducir cantidad</string>
<string name="txtName">%1$s %2$s</string> <string name="txtName">%1$s %2$s</string>
<string name="selectPrinterEmergency">La impresora seleccionada es solo para emergencias.¿Estás seguro?</string>
</resources> </resources>

1
app/src/main/res/values-pt/strings.xml
View File

@ -835,5 +835,6 @@
<string name="pendingAmount">Hoy quedan por salir %1$x unidades</string> <string name="pendingAmount">Hoy quedan por salir %1$x unidades</string>
<string name="errorInputQuantity">Error al introducir cantidad</string> <string name="errorInputQuantity">Error al introducir cantidad</string>
<string name="txtName">%1$s %2$s</string> <string name="txtName">%1$s %2$s</string>
<string name="selectPrinterEmergency">La impresora seleccionada es solo para emergencias.¿Estás seguro?</string>
</resources> </resources>

5
app/src/main/res/values/strings.xml
View File

@ -772,7 +772,7 @@
<string name="changeQuantity">Cambio de cantidad a %1$d del artículo %2$d</string> <string name="changeQuantity">Cambio de cantidad a %1$d del artículo %2$d</string>
<string name="errorQuantityShelving">No puedes seleccionar menos cantidad habiendo en el carro</string> <string name="errorQuantityShelving">No puedes seleccionar menos cantidad habiendo en el carro</string>
<string name="questionItemShelving">¿Quedan unidades del artículo %1$d en el carro escaneado?</string> <string name="questionItemShelving">¿Quedan unidades del artículo %1$d en el carro escaneado?</string>
<string name="totals">%1$d/total</string> <string name="totals">%1$s/total</string>
<string name="totalsPicker">%1$d/%2$d</string> <string name="totalsPicker">%1$d/%2$d</string>
<string name="unmarkError">No es posible desmarcar. Hablar con responsable almacén</string> <string name="unmarkError">No es posible desmarcar. Hablar con responsable almacén</string>
<string name="linesSaelGroup">Líneas : %1$d</string> <string name="linesSaelGroup">Líneas : %1$d</string>
@ -834,8 +834,9 @@
<string name="errorParking">No se ha encontrado parking</string> <string name="errorParking">No se ha encontrado parking</string>
<string name="scanParkingTxt">Escanea parking</string> <string name="scanParkingTxt">Escanea parking</string>
<string name="reviewBoxPicking">Revisar sacado por cajas</string> <string name="reviewBoxPicking">Revisar sacado por cajas</string>
<string name="pendingAmount">Hoy quedan por salir %1$x unidades</string> <string name="pendingAmount">Hoy quedan por salir %1$x unidad/es</string>
<string name="errorInputQuantity">Error al introducir cantidad</string> <string name="errorInputQuantity">Error al introducir cantidad</string>
<string name="txtName">%1$s %2$s</string> <string name="txtName">%1$s %2$s</string>
<string name="selectPrinterEmergency">La impresora seleccionada es solo para emergencias.¿Estás seguro?</string>
</resources> </resources>

2
build.gradle
View File

@ -20,7 +20,7 @@ buildscript {
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:7.4.2' classpath 'com.android.tools.build:gradle:7.4.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.google.gms:google-services:4.4.1' classpath 'com.google.gms:google-services:4.4.2'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9' classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
} }