diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
index 546605cd..48e7532e 100644
--- a/.idea/assetWizardSettings.xml
+++ b/.idea/assetWizardSettings.xml
@@ -19,8 +19,8 @@
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 00000000..76e58a0c
--- /dev/null
+++ b/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/migrations.xml b/.idea/migrations.xml
new file mode 100644
index 00000000..f8051a6f
--- /dev/null
+++ b/.idea/migrations.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a419f43b..1b54e406 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -127,19 +127,23 @@
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
@@ -153,7 +157,7 @@
-
+
@@ -296,19 +300,20 @@
"PROJECT_TRUSTED_KEY": "true",
"RunOnceActivity.ShowReadmeOnStart": "true",
"RunOnceActivity.cidr.known.project.marker": "true",
+ "SHARE_PROJECT_CONFIGURATION_FILES": "true",
"cidr.known.project.marker": "true",
"com.google.services.firebase.aqiPopupShown": "true",
"git-widget-placeholder": "dev",
- "last_opened_file_path": "C:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout",
+ "last_opened_file_path": "C:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable",
"project.structure.last.edited": "Modules",
"project.structure.proportion": "0.17",
"project.structure.side.proportion": "0.2",
"run.code.analysis.last.selected.profile": "pProject Default",
- "settings.editor.selected.configurable": "AndroidSdkUpdater"
+ "settings.editor.selected.configurable": "preferences.rainbow.brackets.disable.when"
},
"keyToStringList": {
"ExportApk.BuildVariants": [
- "generalRelease"
+ "betaRelease"
]
}
}]]>
@@ -319,8 +324,8 @@
-
+
@@ -478,41 +483,6 @@
1618825571576
-
- 1685541821392
-
-
-
- 1685541821392
-
-
- 1685629659021
-
-
-
- 1685629659022
-
-
- 1685683001351
-
-
-
- 1685683001351
-
-
- 1685703249696
-
-
-
- 1685703249696
-
-
- 1685710226077
-
-
-
- 1685710226077
-
1685710258945
@@ -821,7 +791,42 @@
1696925283229
-
+
+ 1697009125050
+
+
+
+ 1697009125050
+
+
+ 1697009179197
+
+
+
+ 1697009179197
+
+
+ 1697441140629
+
+
+
+ 1697441140630
+
+
+ 1697442811651
+
+
+
+ 1697442811651
+
+
+ 1697531313482
+
+
+
+ 1697531313482
+
+
@@ -922,11 +927,6 @@
-
-
-
-
-
@@ -947,7 +947,12 @@
-
+
+
+
+
+
+
@@ -974,38 +979,23 @@
file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerNew.kt
- 2153
+ 2134
file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerNew.kt
- 964
-
-
-
- file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerNew.kt
- 1813
+ 1789
file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerNew.kt
- 1809
-
+ 1241
+
file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerNew.kt
- 1749
-
-
-
- file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerNew.kt
- 577
-
-
-
- file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerNew.kt
- 583
-
+ 1475
+
jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.3.0/76f3c69879d3e01c082f49d8661c5590838148e1/retrofit-2.3.0-sources.jar!/retrofit2/Response.java
diff --git a/app/beta/release/output-metadata.json b/app/beta/release/output-metadata.json
index f9768ef9..5c35c764 100644
--- a/app/beta/release/output-metadata.json
+++ b/app/beta/release/output-metadata.json
@@ -11,7 +11,7 @@
"type": "SINGLE",
"filters": [],
"attributes": [],
- "versionCode": 229,
+ "versionCode": 230,
"versionName": "23.40Beta",
"outputFile": "app-beta-release.apk"
}
diff --git a/app/build.gradle b/app/build.gradle
index 09a1a4b1..bd3bd2ce 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
applicationId "es.verdnatura"
minSdkVersion 24 //21
targetSdkVersion 33
- versionCode 229
- versionName = "23.40"
+ versionCode 230
+ versionName = "23.40Beta"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt
index 366cfcf0..6c0fc0b6 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt
@@ -364,10 +364,10 @@ class UbicadorFragment(
)
shelvingFk = customDialogInput.getValue()
binding.mainToolbar.toolbarTitle.text =
- shelvingFk.uppercase() + getString(R.string.pUppercase) + parking + getString(
+ shelvingFk.uppercase() + getString(R.string.pUppercase) + getString(
R.string.label
) + etiquetas
- if (mpok != null) mpok!!.start()
+ // if (mpok != null) mpok!!.start()
customDialogInput.dismiss()
}.setKoButton(getString(R.string.cancel)) {
customDialogInput.dismiss()
@@ -384,10 +384,10 @@ class UbicadorFragment(
)
shelvingFk = customDialogInput.getValue()
binding.mainToolbar.toolbarTitle.text =
- shelvingFk.uppercase() + getString(R.string.pUppercase) + parking + getString(
+ shelvingFk.uppercase() + getString(
R.string.label
) + etiquetas
- if (mpok != null) mpok!!.start()
+ // if (mpok != null) mpok!!.start()
customDialogInput.dismiss()
return@setOnEditorActionListener true
}
@@ -481,7 +481,11 @@ class UbicadorFragment(
it.list.forEach { item ->
try {
contEtiquetas += item.stickers.toInt()
- parking = item.code.uppercase()
+ parking = if (!item.code.isNullOrEmpty()) {
+ ""
+ } else {
+ item.code.uppercase()
+ }
} catch (e: Exception) {
}
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 2ae69fe6..d3a3fff6 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -51,6 +51,7 @@
16sp
14sp
+ 18sp
16sp
14sp
15sp