diff --git a/.idea/appInsightsSettings.xml b/.idea/appInsightsSettings.xml
new file mode 100644
index 00000000..4cbd9b21
--- /dev/null
+++ b/.idea/appInsightsSettings.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 00000000..0c0c3383
--- /dev/null
+++ b/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
new file mode 100644
index 00000000..919d98ad
--- /dev/null
+++ b/.idea/deploymentTargetSelector.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 98163b4d..fb826370 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,6 +1,7 @@
+
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index fdf8d994..6d0ee1c2 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/.idea/other.xml b/.idea/other.xml
new file mode 100644
index 00000000..0d3a1fbb
--- /dev/null
+++ b/.idea/other.xml
@@ -0,0 +1,263 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/studiobot.xml b/.idea/studiobot.xml
new file mode 100644
index 00000000..9298202c
--- /dev/null
+++ b/.idea/studiobot.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 490d6698..f7d69037 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -84,11 +84,21 @@
@style/AppTheme
+
+
+ @style/AppTheme
+
+
@style/AppTheme
+
+
+ @style/AppTheme
+
+
@style/AppTheme
@@ -302,29 +312,24 @@
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
@@ -337,7 +342,7 @@
-
+
@@ -380,7 +385,7 @@
-
+
@@ -429,7 +434,7 @@
@@ -487,49 +492,56 @@
- {
+ "keyToString": {
+ "Android App.app.executor": "Run",
+ "ApkExportedModule": "Gestor_Almacén.app",
+ "ExportApk.ApkPathForGestor_Almacén.app": "C:\\Users\\sergiodt\\AndroidStudioProjects\\vn-warehouseManager\\app",
+ "Gradle.vn-warehouseManager [clean].executor": "Run",
+ "KotlinFunctionFindUsagesOptions.isSearchForTextOccurrences": "true",
+ "PROJECT_TRUSTED_KEY": "true",
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "RunOnceActivity.cidr.known.project.marker": "true",
+ "RunOnceActivity.readMode.enableVisualFormatting": "true",
+ "SHARE_PROJECT_CONFIGURATION_FILES": "true",
+ "ScreenRecorder.SavePath": "C:\\Users\\sergiodt",
+ "android-custom-viewC:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/androidx.recyclerview/recyclerview/1.2.1/f0f93e67af3f7417bdd560d5142f6dec4fe629c3/recyclerview-1.2.1-sources.jar!/androidx/recyclerview/widget/RecyclerView.java_SELECTED": "RecyclerView",
+ "android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-29/android/widget/TextView.java_SELECTED": "TextView",
+ "android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-33/android/view/View.java_SELECTED": "View",
+ "android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-34/android/view/View.java_SELECTED": "View",
+ "android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-34/android/widget/CompoundButton.java_SELECTED": "CompoundButton",
+ "android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-34/android/widget/TextView.java_SELECTED": "TextView",
+ "cf.first.check.clang-format": "false",
+ "cidr.known.project.marker": "true",
+ "com.developerphil.adbidea.selecteddevices": "G65TY9DQN7X4BIE6",
+ "com.google.services.firebase.aqiPopupShown": "true",
+ "git-widget-placeholder": "dev",
+ "ignore.virus.scanning.warn.message": "true",
+ "kotlin-language-version-configured": "true",
+ "last_directory_selection": "C:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable",
+ "last_opened_file_path": "C:/Users/sergiodt/Documents/KEYSTORE/keystore.jks",
+ "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": "preferences.editor"
},
- "keyToStringList": {
- "ExportApk.BuildVariants": [
- "generalRelease"
+ "keyToStringList": {
+ "ExportApk.BuildVariants": [
+ "betaRelease"
],
- "com.android.tools.idea.sqlite.queryhistory": [
- "select * from expedition where routeFk=182933;",
- "select * from expedition;",
- "select * from expeditionPending;",
- "select * from expedition where id = 7753995;\n\n",
- "\nselect * from expedition where id = 7753995;"
+ "com.android.tools.idea.sqlite.queryhistory": [
+ "select * from expedition where routeFk=182933;",
+ "select * from expedition;",
+ "select * from expeditionPending;",
+ "select * from expedition where id = 7753995;\n\n",
+ "\nselect * from expedition where id = 7753995;"
+ ],
+ "kotlin-gradle-user-dirs": [
+ "C:\\Users\\sergiodt\\.gradle"
]
}
-}]]>
+}
@@ -596,7 +608,6 @@
-
@@ -648,6 +659,28 @@
+
+
+
+
+
+
+
+
+
+
+ true
+ true
+ false
+ false
+
+
@@ -683,7 +716,7 @@
-
@@ -1063,6 +1096,7 @@
@@ -1100,6 +1134,11 @@
+
+
+
+
+
@@ -1115,7 +1154,7 @@
-
+
@@ -1165,7 +1204,6 @@
-
@@ -1190,7 +1228,8 @@
-
+
+
diff --git a/app/beta/release/output-metadata.json b/app/beta/release/output-metadata.json
index 027b9744..d25ad14f 100644
--- a/app/beta/release/output-metadata.json
+++ b/app/beta/release/output-metadata.json
@@ -11,10 +11,27 @@
"type": "SINGLE",
"filters": [],
"attributes": [],
- "versionCode": 309,
+ "versionCode": 310,
"versionName": "24.26Beta",
"outputFile": "app-beta-release.apk"
}
],
- "elementType": "File"
+ "elementType": "File",
+ "baselineProfiles": [
+ {
+ "minApi": 28,
+ "maxApi": 30,
+ "baselineProfiles": [
+ "baselineProfiles/1/app-beta-release.dm"
+ ]
+ },
+ {
+ "minApi": 31,
+ "maxApi": 2147483647,
+ "baselineProfiles": [
+ "baselineProfiles/0/app-beta-release.dm"
+ ]
+ }
+ ],
+ "minSdkVersionForDexing": 26
}
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 82c1df13..a34315e0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,7 +13,7 @@ android {
applicationId "es.verdnatura"
minSdkVersion 26
targetSdkVersion 33 // se deja con target si no Play Protect la bloquea
- versionCode 309
+ versionCode 310
versionName = "24.26Beta"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
@@ -61,8 +61,8 @@ android {
}
compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
+ sourceCompatibility JavaVersion.VERSION_17
+ targetCompatibility JavaVersion.VERSION_17
}
}
@@ -84,7 +84,7 @@ dependencies {
// Kotlin and Android
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
- implementation 'androidx.appcompat:appcompat:1.6.1'
+ implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'androidx.core:core-ktx:1.13.1'
implementation 'androidx.constraintlayout:constraintlayout:2.0'
//si >2.0 revisar pantalla (ej:Ajustes)
@@ -94,9 +94,8 @@ dependencies {
//tests
testImplementation 'junit:junit:4.13.2'
- testImplementation 'io.mock:mockk:1.12.2'
- androidTestImplementation 'androidx.test.ext:junit:1.2.0'
- androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.0'
+ androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
implementation 'com.google.android.material:material:1.12.0'
implementation 'com.squareup.retrofit2:retrofit:2.3.0'
implementation 'com.squareup.retrofit2:converter-gson:2.0.2'
@@ -105,11 +104,11 @@ dependencies {
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
//Fragments
- implementation("androidx.fragment:fragment-ktx:1.6.2") // Da problemas al subir versión
+ implementation("androidx.fragment:fragment-ktx:1.8.1")
// Architecture components
- implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle"
- implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle"
+ implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.2"
+ implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.2"
implementation "androidx.legacy:legacy-support-v4:1.0.0"
//Koin new resolve
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 a9386dc3..b51e634a 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
@@ -394,7 +394,8 @@ class MainActivity : BaseActivity(), OnPasillerosItemClickL
}
- bottomMenu.setOnNavigationItemSelectedListener { menuItem ->
+ bottomMenu.setOnItemSelectedListener { menuItem ->
+
// Get selected item from itemList and apply ui changes to menu view
val selectedItemMenu = bottomMenuItems.find { menuItem.itemId == it.id }
menuItem.icon = selectedItemMenu?.selectedImage
@@ -458,7 +459,7 @@ class MainActivity : BaseActivity(), OnPasillerosItemClickL
true
}/* sergio: de esta manera no repinta el icono del menu seleccionado */
- bottomMenu.setOnNavigationItemReselectedListener {
+ bottomMenu.setOnItemReselectedListener {
when (it.title) {
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragmentNew.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragmentNew.kt
index b6826e5c..53da7f49 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragmentNew.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragmentNew.kt
@@ -544,7 +544,8 @@ class UbicadorFragmentNew: BaseFragment
event.getContentIfNotHandled().notNull {
//not always is true
- if (it!=null)checkUbications((it as Long))
+ val response = it as? Long
+ if (response!=null)checkUbications(response)
}
}
diff --git a/build.gradle b/build.gradle
index 7a78743f..bbf9b13b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,49 +1,37 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
- ext.kotlin_version = '1.9.0'
+ ext.kotlin_version = '2.0.0'
ext {
// UI components
lottieVersion = '3.4.0'
- lifecycle = '2.7.0'
koin = '2.1.6'
// Images
glide = '4.11.0'
- coil = '1.4.0'//0.9.5
+ coil = '1.4.0'
}
repositories {
google()
- mavenCentral() //jcenter()
+ mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:7.4.2'
+ classpath 'com.android.tools.build:gradle:8.5.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
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:3.0.2'
}
}
plugins {
- id 'com.google.devtools.ksp' version '1.9.0-1.0.11' apply false
+ id 'com.google.devtools.ksp' version '2.0.0-1.0.21' apply false
}
allprojects {
repositories {
google()
- mavenCentral()//jcenter()//
+ mavenCentral()
maven{url 'https://jitpack.io'}
- /* maven {
- name "linphone.org maven repository"
- url "https://linphone.org/maven_repository/"
- content {
- includeGroup "org.linphone"
- }
- }*/
}
}
-task clean(type: Delete) {
- delete rootProject.buildDir
-}
-
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7cd985f6..2cf0c00f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip