refs #6411 feat:update libraries

.idea/kotlinc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.8.0" />
+    <option name="version" value="1.8.22" />
   </component>
 </project>

app/build.gradle

@@ -3,16 +3,18 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'com.google.gms.google-services'
 apply plugin: 'com.google.firebase.crashlytics'
+apply plugin: 'com.google.devtools.ksp'
+
 
 
 android {
-    compileSdk 33
+    compileSdk 33 //si 34 problemas con AAPT2
 // buildToolsVersion "29.0.3"
 
     defaultConfig {
         applicationId "es.verdnatura"
         minSdkVersion 24 //21
-        targetSdkVersion 33
+        //targetSdkVersion 33
         versionCode 254
         versionName = "24.4Beta" //23.48Beta son la misma
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -29,7 +31,7 @@ android {
 
     }
 
-    flavorDimensions "version"
+    flavorDimensions( "version")
     productFlavors {
         create("beta") {
             applicationIdSuffix = ".sfusion"
@@ -56,72 +58,51 @@ android {
 
 }
 
-
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.google.firebase:firebase-crashlytics-ktx:18.2.9'
+    implementation 'com.google.firebase:firebase-crashlytics-ktx:18.6.1'
-    implementation 'com.google.firebase:firebase-analytics-ktx:20.1.2'
+    implementation 'com.google.firebase:firebase-analytics-ktx:21.5.0'
-    implementation 'com.google.android.gms:play-services-location:19.0.1'
+    implementation 'com.google.android.gms:play-services-location:21.1.0'
-    kapt "androidx.room:room-compiler:2.5.1"
+    kapt "androidx.room:room-compiler:2.5.1" // Problema de string dinámico
-    implementation 'androidx.room:room-ktx:2.5.1'
+    implementation 'androidx.room:room-ktx:2.5.1'//Problema de string dinámico
     debugImplementation fileTree(dir: 'libs/debug', include: ['*.jar'])
     releaseImplementation fileTree(dir: 'libs/release', include: ['*.jar'])
 
     //canvas
     implementation 'com.simplify:ink:1.0.0'
 
-    //navigation
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.3.5'
-    implementation("androidx.drawerlayout:drawerlayout:1.1.1")
-
     // Kotlin  and Android
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'androidx.core:core-ktx:1.10.1'
+    implementation 'androidx.core:core-ktx:1.11.+'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0'//si >2.0 revisar pantalla Ajustes
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1'
+    testImplementation 'junit:junit:4.13.2'
-    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    implementation 'com.google.android.material:material:1.6.0'//hasta la 1.6
-    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'com.squareup.retrofit2:retrofit:2.3.0'
-    implementation 'com.squareup.retrofit2:retrofit:2.0.2'
     implementation 'com.squareup.retrofit2:converter-gson:2.0.2'
     implementation 'com.squareup.retrofit2:converter-scalars:2.3.0'
     implementation "com.airbnb.android:lottie:$lottieVersion"
-    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0'
+    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
-
-    //preferences
-    implementation 'androidx.preference:preference-ktx:1.1.1'
 
     //Fragments
-    implementation("androidx.fragment:fragment-ktx:1.3.6")
+    implementation("androidx.fragment:fragment-ktx:1.5.2") // Problema de inferir event
-
 
     // Architecture components
     implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle"//versión más nueva compileSdk 34 y no infiere el event
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle"
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation "androidx.legacy:legacy-support-v4:1.0.0"
-
 
     //Koin new resolve
-    //kotlin implementation in mavencentral--> jcenter deprecated
-
     implementation "io.insert-koin:koin-core:$koin"
     implementation "io.insert-koin:koin-android:$koin"
     implementation "io.insert-koin:koin-androidx-scope:$koin"
     implementation "io.insert-koin:koin-androidx-viewmodel:$koin"
 
-    // Koin for DI
-    //implementation "org.koin:koin-core:$koin"
-    //implementation "org.koin:koin-android:$koin"
-    //implementation "org.koin:koin-androidx-scope:$koin"
-    //implementation "org.koin:koin-androidx-viewmodel:$koin"
-
-
     // Image libraries
     implementation "io.coil-kt:coil:$coil"
     implementation "com.github.bumptech.glide:glide:$glide"
@@ -129,8 +110,7 @@ dependencies {
     kapt "com.github.bumptech.glide:compiler:$glide"
 
     // Add the Firebase Crashlytics SDK.
-    implementation 'com.google.firebase:firebase-analytics:17.5.0'
+    implementation 'com.google.firebase:firebase-analytics:21.5.0'
-    //implementation 'com.google.firebase:firebase-crashlytics:17.2.1'
 
     //search
     implementation 'com.github.mirrajabi:search-dialog:1.1'

app/src/main/java/es/verdnatura/db/database.kt

@@ -17,7 +17,9 @@ import java.util.Date
 // Clase que representa la base de datos
 @Database(
     entities = [ExpeditionInfoLoadUnload::class, ExpeditionInfoPending::class, SignedTickets::class, RouteInfo::class, ClientTicketSalix::class, RouteLoaded::class],
-    version = 1
+    version = 1,
+    exportSchema = false
+
 )
 @TypeConverters(MapTypeConverter::class)
 abstract class DeliveryDatabase : RoomDatabase() {

app/src/main/java/es/verdnatura/presentation/common/NetworkUtilsApp.kt

@@ -1,3 +1,5 @@
+package es.verdnatura.presentation.common
+
 import android.content.Context
 import android.net.ConnectivityManager
 import android.net.Network
@@ -7,7 +9,7 @@ import es.verdnatura.MobileApplication
 import es.verdnatura.R
 import es.verdnatura.presentation.view.feature.main.activity.MainActivity
 
-class NetworkUtils(context: Context, applicationContext: MobileApplication) {
+class NetworkUtilsApp(context: Context, applicationContext: MobileApplication) {
 
     private val connectivityManager: ConnectivityManager =
         context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager

app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt

@@ -1,6 +1,5 @@
 package es.verdnatura.presentation.view.feature.main.activity
 
-import NetworkUtils
 import PhotosFragment
 import android.content.Intent
 import android.media.MediaPlayer
@@ -13,7 +12,7 @@ import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.MutableLiveData
-import com.google.android.material.bottomnavigation.LabelVisibilityMode.LABEL_VISIBILITY_UNLABELED
+import com.google.android.material.navigation.NavigationBarView
 import es.verdnatura.MobileApplication
 import es.verdnatura.R
 import es.verdnatura.databinding.ActivityMainBinding
@@ -118,7 +117,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
     private var scheduledFuture: ScheduledFuture<*>? = null
     private var scheduledExecutor: ScheduledExecutorService? = null
     private val _renewTokenResponse = MutableLiveData<RenewToken>()
-    private lateinit var networkUtils: NetworkUtils
+    private lateinit var networkUtils: NetworkUtilsApp
     private var myTimeUserInteraction = (System.currentTimeMillis() / 1000 / 3600)
     private var comeFromDelivery: Boolean? = null
     override fun getLayoutId(): Int = R.layout.activity_main
@@ -176,7 +175,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
     }
 
     private fun setRegisterNetwork() {
-        networkUtils = NetworkUtils(this, application as MobileApplication)
+        networkUtils = NetworkUtilsApp(this, application as MobileApplication)
     }
 
     @RequiresApi(Build.VERSION_CODES.O)
@@ -251,7 +250,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
     @DelicateCoroutinesApi
     fun setBottomMenuFragment() {
         val bottomMenu = binding.mainBottomNavigation
-        bottomMenu.labelVisibilityMode = LABEL_VISIBILITY_UNLABELED
+        bottomMenu.labelVisibilityMode = NavigationBarView.LABEL_VISIBILITY_UNLABELED
         bottomMenu.itemIconTintList = null
         GlobalScope.launch(Dispatchers.Main) {
             val bottomMenuItems: ArrayList<ItemMenuVO> = ArrayList()

app/src/main/res/layout/activity_main.xml

@@ -51,16 +51,6 @@
                 app:lottie_speed="2" />
         </LinearLayout>
 
-        <com.google.android.material.bottomnavigation.BottomNavigationView
-            android:id="@+id/main_bottom_navigation_fragment"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/bottom_navigation_height"
-            app:itemBackground="@color/verdnatura_black_3"
-            app:itemTextColor="@color/verdnatura_white"
-            app:labelVisibilityMode="labeled"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 

app/src/main/res/values-es/strings.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <string name="app_name">Gestor Almacén</string>
     <string name="Fecha">Fecha</string>
     <string name="Cliente">Cliente</string>
@@ -570,7 +571,7 @@
     <string name="unloading">Descargando</string>
     <string name="expeditionMarked">Expedición ya marcada</string>
     <string name="errorExpedition">Error al escanear expedición</string>
-    <string name="summaryCount">%d/%d</string>
+    <string name="summaryCount" translatable="false">%d/%d</string>
     <string name="shelvingError">No ha escaneado una matrícula. Escanee matrícula</string>
     <string name="consignatario">Consignatario</string>
     <string name="titleDeliverySummary">Resumen reparto</string>
@@ -695,6 +696,7 @@
     <string name="confirmReserv">Confirmada reserva</string>
     <string name="checkingByUser">Está siendo revisado por %1$s</string>
     <string name="checkedByUser">Ha sido revisado por %1$s</string>
+    <string name="previousText">PREVIA:%1$s</string>
 
 
 </resources>

app/src/main/res/values-fr/strings.xml

@@ -570,7 +570,7 @@
     <string name="unloading">Descargando</string>
     <string name="expeditionMarked">Expedición ya marcada</string>
     <string name="errorExpedition">Error al escanear expedición</string>
-    <string name="summaryCount">%d/%d</string>
+    <string name="summaryCount" translatable="false">%d/%d</string>
     <string name="shelvingError">No ha escaneado una matrícula. Escanee matrícula</string>
     <string name="consignatario">Consignataire</string>
     <string name="titleDeliverySummary">Résumé du chargement</string>
@@ -695,6 +695,7 @@
     <string name="confirmReserv">Confirmada reserva</string>
     <string name="checkingByUser">Está siendo revisado por %1$s</string>
     <string name="checkedByUser">Ha sido revisado por %1$s</string>
+    <string name="previousText">PREVIA:%1$s</string>
 
 
 </resources>

app/src/main/res/values-pt/strings.xml

@@ -570,7 +570,7 @@
     <string name="unloading">Descargando</string>
     <string name="expeditionMarked">Expedición ya marcada</string>
     <string name="errorExpedition">Error al escanear expedición</string>
-    <string name="summaryCount">%d/%d</string>
+    <string name="summaryCount" translatable="false">%d/%d</string>
     <string name="shelvingError">No ha escaneado una matrícula. Escanee matrícula</string>
     <string name="consignatario">Consignatario</string>
     <string name="titleDeliverySummary">Resumen reparto</string>
@@ -695,6 +695,7 @@
     <string name="confirmReserv">Confirmada reserva</string>
     <string name="checkingByUser">Está siendo revisado por %1$s</string>
     <string name="checkedByUser">Ha sido revisado por %1$s</string>
+    <string name="previousText">PREVIA:%1$s</string>
 
 
 </resources>

app/src/main/res/values/strings.xml

@@ -1,4 +1,5 @@
 <resources>
+    <string name="ef_msg_no_camera_permission" translatable="false">Camera needs permission</string>
     <string name="app_name">Warehouse Manager</string>
     <string name="Fecha">Date</string>
     <string name="Cliente">Client</string>
@@ -694,5 +695,6 @@
     <string name="confirmReserv">Confirmada reserva</string>
     <string name="checkingByUser">Ticket on checking by %1$s</string>
     <string name="checkedByUser">ticket checked by %1$s</string>
+    <string name="previousText">PREVIA:%1$s</string>
 
 </resources>

build.gradle

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.8.0'//1.4.20//1.5.31
+    ext.kotlin_version = '1.8.22'//1.4.20//1.5.31
 
     ext {
         // UI components
@@ -28,7 +28,9 @@ buildscript {
         // in the individual module build.gradle files
     }
 }
-
+plugins {
+    id 'com.google.devtools.ksp' version '1.8.21-1.0.11' apply false
+}
 allprojects {
     repositories {
         google()