From a4a9b1aa18dacdf5717c5af1a87d5763d978a85b Mon Sep 17 00:00:00 2001
From: Sergio De la torre <sergiodt@verdnatura.es>
Date: Thu, 12 Dec 2024 17:09:14 +0100
Subject: [PATCH] version 24.51
---
.idea/workspace.xml | 26 +++++++-------------------
CHANGELOG.md | 31 +++++++++++++++++++++++++++++++
app/build.gradle.kts | 8 ++++++--
3 files changed, 44 insertions(+), 21 deletions(-)
create mode 100644 CHANGELOG.md
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 567d8fc9..24a6a185 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -493,24 +493,12 @@
</select>
</component>
<component name="ChangeListManager">
- <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="feat: refs #7920 itemShelvingGet">
- <change afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/UbicadorAdapter6869.kt" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment6869.kt" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_ubication_row_6869.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/appInsightsSettings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/appInsightsSettings.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/kotlinc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/kotlinc.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+ <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="feat: refs#6845 userInterface">
+ <change afterPath="$PROJECT_DIR$/CHANGELOG.md" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/changeLog.sh" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build.gradle.kts" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle.kts" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/common/PrinterDialogManager.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/common/PrinterDialogManager.kt" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerPreviousNew.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerPreviousNew.kt" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/TicketsFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/TicketsFragment.kt" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/model/ItemUbicadorVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/model/ItemUbicadorVO.kt" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/gradle/libs.versions.toml" beforeDir="false" afterPath="$PROJECT_DIR$/gradle/libs.versions.toml" afterDir="false" />
</list>
<list id="7b98f93d-6980-4bf1-8e61-c7afd10e56f2" name="Change_category" comment="Change_category" />
<option name="SHOW_DIALOG" value="false" />
@@ -1277,7 +1265,7 @@
<option name="project" value="LOCAL" />
<updated>1709725795643</updated>
</task>
- <option name="localTasksCounter" value="372" />
+ <option name="localTasksCounter" value="373" />
<servers />
</component>
<component name="Vcs.Log.History.Properties">
@@ -1436,13 +1424,13 @@
<MESSAGE value="feat: refs #8176 refactorSearchDialog" />
<MESSAGE value="feat: refs #8182 zoneClickable" />
<MESSAGE value="feat: refs#8213 reservas" />
- <MESSAGE value="feat: refs#6845 userInterface" />
<MESSAGE value="feat: refs #8022 kotlin versionCatalog" />
<MESSAGE value="feat: refs #8085 restaurantActivity" />
<MESSAGE value="feat: refs #5443 collectionFragmentChecker" />
<MESSAGE value="feat: refs #7922 scanOrder" />
<MESSAGE value="feat: refs #7920 itemShelvingGet" />
- <option name="LAST_COMMIT_MESSAGE" value="feat: refs #7920 itemShelvingGet" />
+ <MESSAGE value="feat: refs#6845 userInterface" />
+ <option name="LAST_COMMIT_MESSAGE" value="feat: refs#6845 userInterface" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 00000000..de9e44ca
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,31 @@
+# Version XX.XX - XXXX-XX-XX
+
+### Added 🆕
+
+- feat: refs #5443 collectionFragmentChecker by:Sergio De la torre
+- feat: refs#6845 userInterface by:Sergio De la torre
+- feat: refs #6845 userIterface by:Sergio De la torre
+- feat: refs #6861 reservas by:Sergio De la torre
+- feat: refs #6869 itemShelvings (warehouse/dev_6078, warehouse/dev, dev_6078) by:Sergio De la
+ torre
+- feat: refs #7266 printItem by:Sergio De la torre
+- feat: refs #7922 scanOrder by:Sergio De la torre
+- feat: refs #8020 controlVehiculos by:Sergio De la torre
+- feat: refs #8022 kotlin versionCatalog by:Sergio De la torre
+- feat: refs #8082 ticketPickup by:Sergio De la torre
+- feat: refs #8099 addSalarySupplement by:Sergio De la torre
+- feat: refs #8150 moveExpedition by:Sergio De la torre
+- feat: refs #8150 moveExpeditions by:Sergio De la torre
+- feat: refs #8175 crashlyticsAndUpdate by:Sergio De la torre
+- feat: refs #8175 refactorCode by:Sergio De la torre
+- feat: refs #8176 refactorSearchDialog by:Sergio De la torre
+- feat: refs #8182 zoneClickable by:Sergio De la torre
+- feat: refs#8213 reservas by:Sergio De la torre
+
+### Changed 📦
+
+- feat: refs #8175 refactorCode by:Sergio De la torre
+- feat: refs #8176 refactorSearchDialog by:Sergio De la torre
+
+### Fixed 🛠️
+
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 76d1e0a1..19d7372c 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -15,8 +15,8 @@ android {
applicationId = "es.verdnatura"
minSdk = 26
targetSdk = 33 // se deja con target si no Play Protect la bloquea
- versionCode = 361
- versionName = "24.46"
+ versionCode = 374
+ versionName = "24.51"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
@@ -30,6 +30,10 @@ android {
getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
)
}
+ getByName("debug") {
+ isMinifyEnabled = false
+
+ }
}
//package de la app general = "package_name": "es.verdnatura"
//package de la app beta = "package_name": "es.verdnatura.sfusion"