version 24.8beta

.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.22" />
+    <option name="version" value="1.9.0" />
   </component>
 </project>

app/build.gradle

@@ -11,9 +11,9 @@ android {
 
     defaultConfig {
         applicationId "es.verdnatura"
-        minSdkVersion 24
+        minSdkVersion 26
         targetSdkVersion 33 // se deja con target si no Play Protect la bloquea
-        versionCode 258
+        versionCode 260
         versionName = "24.8Beta" //23.48Beta son la misma
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -44,7 +44,21 @@ android {
 
     buildFeatures {
         viewBinding = true
+
     }
+    /*kotlinOptions {
+        jvmTarget = "1.8"
+    }
+    buildFeatures {
+        compose = true
+    }
+    kotlin {
+        jvmToolchain(8)
+    }
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.4.3"
+    }
+    */
     dataBinding {
         enabled = true
     }
@@ -73,7 +87,8 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.12.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0'//si >2.0 revisar pantalla (ej:Ajustes)
+    implementation 'androidx.constraintlayout:constraintlayout:2.0'
+//si >2.0 revisar pantalla (ej:Ajustes)
 
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
@@ -126,4 +141,13 @@ dependencies {
     //linphone
     // implementation 'org.linphone:linphone-sdk-android:5.1.0+'
     //implementation 'androidx.media:media:1.6.0'
+
+    // Compose
+  /*  implementation(platform("androidx.compose:compose-bom:2024.02.01"))
+    implementation("androidx.compose.ui:ui")
+    implementation("androidx.compose.material:material")
+    implementation("androidx.compose.runtime:runtime")
+    implementation("androidx.activity:activity-compose:1.8.2")
+    implementation("androidx.compose.ui:ui-graphics")
+    implementation("androidx.compose.ui:ui-tooling-preview")*/
 }

app/src/main/AndroidManifest.xml

@@ -36,8 +36,7 @@
        android:supportsRtl="true"
        android:theme="@style/AppTheme"
        android:usesCleartextTraffic="true">
-       <activity android:name=".presentation.view.feature.imageview.activity.ImageViewActivity" android:configChanges="orientation"
-           android:screenOrientation="portrait"/>
+
        <activity
            android:name=".presentation.view.feature.main.activity.MainActivity"
            android:windowSoftInputMode="stateHidden|adjustResize"

app/src/main/java/es/verdnatura/domain/RestClient.kt

@@ -8,7 +8,8 @@ open class RestClient(context: Context, myObserver: InteceptorListener? = null)
     var salixClient: SalixService
 
     init {
-        restClient = ApiUtils.getApiService(context, myObserver)
         salixClient = ApiSalixUtils.getApiService(context, myObserver)
+        restClient = ApiUtils.getApiService(context, myObserver)
+
     }
 }

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

@@ -95,7 +95,7 @@
 
     <!--Pasilleros-->
     <dimen name="inventory_item">10dp</dimen>
-    <dimen name="pasilleros_margin_main_menu">15dp</dimen>
+    <dimen name="pasilleros_margin_main_menu">12dp</dimen>
     <dimen name="packaging_margin_main_menu">5dp</dimen>
 
     <dimen name="itemcard_image_height">300dp</dimen>