refs #6284 feat:update and review xml

app/src/main/java/es/verdnatura/MobileApplication.kt

@@ -7,6 +7,7 @@ import android.os.Handler
 import android.os.Looper
 import es.verdnatura.dataStore.DataStoreLocal
 import es.verdnatura.di.viewModelModule
+import es.verdnatura.domain.ConstAndValues
 import es.verdnatura.domain.RestClient
 import es.verdnatura.domain.SalixService
 import es.verdnatura.domain.VerdnaturaService
@@ -16,6 +17,7 @@ import es.verdnatura.presentation.common.LoginListener
 import es.verdnatura.presentation.common.MainActivityListener
 import es.verdnatura.presentation.common.SignListener
 import es.verdnatura.presentation.view.component.CustomDialogMainActivity
+import kotlinx.coroutines.runBlocking
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.context.loadKoinModules
 import org.koin.core.context.startKoin
@@ -65,9 +67,12 @@ class MobileApplication : Application(), InteceptorListener {
             loadKoinModules(moduleList)
         }
 
-        var restClient = RestClient(this, this)
+
-        silex = restClient.restClient
+        runBlocking { dataStoreApp.editDataStoreKey(ConstAndValues.BASEURLSALIX,ConstAndValues.BASE_URL_SALIX) }
+        val restClient = RestClient(this, this)
         salix = restClient.salixClient
+        silex = restClient.restClient
+
 
     }
 
@@ -77,7 +82,6 @@ class MobileApplication : Application(), InteceptorListener {
 
     fun messageToast(isError: Boolean, message: String) {
         val playSound = when (isError) {
-            null -> null
             false -> mpok
             true -> mperror
         }
@@ -111,11 +115,6 @@ class MobileApplication : Application(), InteceptorListener {
 
     fun getLanguage(): String {
         val settings = this.resources.configuration
-        return if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
+        return settings.locales.get(0).language
-            settings.locales.get(0).language
-        } else {
-            @Suppress("DEPRECATION")
-            settings.locale.language
-        }
     }
 }

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

@@ -34,6 +34,7 @@
             app:layout_constraintTop_toBottomOf="@id/divider"
             android:layout_marginLeft="@dimen/pasilleros_margin_main_menu"
             android:padding="@dimen/navigation_row_min_padding"
+            android:visibility="gone"
             >
 
 
@@ -179,7 +180,7 @@
             app:layout_constraintTop_toTopOf="parent" />
 
         <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/ajustess_items"
+            android:id="@+id/setttings_items"
             android:layout_width="0dp"
             android:layout_height="0dp"
             app:layout_constraintBottom_toBottomOf="parent"

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

@@ -31,7 +31,8 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:textColorHint="@android:color/darker_gray"
-                    android:visibility="gone"></com.google.android.material.textfield.TextInputLayout>
+                    android:visibility="gone">
+                </com.google.android.material.textfield.TextInputLayout>
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/edit_matricula"

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

@@ -196,7 +196,7 @@
                             android:layout_height="wrap_content"
                             android:clipToPadding="false"
                             tools:listitem="@layout/item_card_row" />
-                    </RelativeLayout>>
+                    </RelativeLayout>
 
                 </LinearLayout>
 

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

@@ -39,7 +39,8 @@
                 android:layout_marginTop="0dp"
                 android:textColorHint="@android:color/darker_gray"
                 app:layout_constraintStart_toStartOf="@id/textview_welcome"
-                app:layout_constraintTop_toBottomOf="@id/textview_welcome">
+                app:layout_constraintTop_toBottomOf="@id/textview_welcome"
+                android:visibility="gone">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/edittext_server"
@@ -55,7 +56,6 @@
                     android:lines="1"
                     android:maxLines="1"
                     android:textColor="@color/verdnatura_white"
-
                     android:textColorHint="@android:color/darker_gray" />
 
 

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

@@ -23,7 +23,7 @@
             tool:listitem="@layout/item_pasilleros_main_menu"
             android:paddingTop="@dimen/toolbar_height"/>
 
-      ' <include
+       <include
             android:id="@+id/main_toolbar"
             layout="@layout/toolbar_fragment"
             app:layout_constraintEnd_toEndOf="parent"

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

@@ -31,7 +31,6 @@
             android:layout_height="0dp"
             android:foregroundGravity="fill_horizontal|center_horizontal"
             android:isScrollContainer="false"
-            android:paddingTop="@dimen/toolbar_height"
             android:splitMotionEvents="false"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -40,6 +39,7 @@
             app:layout_constraintTop_toTopOf="parent"
             app:stackFromEnd="false"
             tool:listitem="@layout/item_pasilleros_main_menu"/>
+        <!-- android:paddingTop="@dimen/toolbar_height" -->
 
         <include
             android:id="@+id/main_toolbar_design"

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:tools="http://schemas.android.com/tools"
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -9,7 +9,6 @@
         android:background="@color/verdnatura_black">
 
 
-
         <EditText
             android:id="@+id/scan_input"
             style="@style/ScanLineTextSearch"
@@ -26,7 +25,6 @@
             app:layout_constraintTop_toTopOf="@+id/main_toolbar" />
 
 
-
         <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
             android:id="@+id/collection_swipe"
             android:layout_width="0dp"
@@ -45,8 +43,7 @@
                 tools:listitem="@layout/item_article_row_presacador" />
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-
+        <include
-      ' <include
             android:id="@+id/main_toolbar"
             layout="@layout/toolbar_fragment"
             app:layout_constraintEnd_toEndOf="parent"
@@ -55,16 +52,16 @@
 
         <LinearLayout
             android:id="@+id/splash_progress"
-            android:visibility="visible"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical"
             android:background="@color/verdnatura_black_8_alpha_6"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:visibility="visible"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
-            android:gravity="center">
 
             <com.airbnb.lottie.LottieAnimationView
                 android:layout_width="wrap_content"