diff --git a/app/build.gradle b/app/build.gradle index cac794bc..51ee3869 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,14 +14,11 @@ android { minSdkVersion 21 //21 targetSdkVersion 30 versionCode 133 - versionName = "9.2Beta" - //versionName = "9.1Beta" versionCode 132 - //versionName = "9Beta"// versionCode 131 - //versionName = "8.9" versionCode 130 - //versionName = "8.9Beta" versionCode 129 - //versionName = "8.8Beta" versioncode 128 - //versionName = "8.7Beta" versionCode 127 - //versionName = "8.8Beta" + versionName = "9" + //versionName = "9.2Beta" versionCode 133 + //versionName = "9" versionCode 133 + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index c0126070..b991e3b1 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -12,7 +12,7 @@ "filters": [], "attributes": [], "versionCode": 133, - "versionName": "9.2Beta", + "versionName": "9", "outputFile": "app-release.apk" } ], diff --git a/app/release/vn-pickingBeta.apk b/app/release/vn-picking.apk similarity index 65% rename from app/release/vn-pickingBeta.apk rename to app/release/vn-picking.apk index 0c32e68e..b16dd402 100644 Binary files a/app/release/vn-pickingBeta.apk and b/app/release/vn-picking.apk differ diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt index 7f01114a..79908ca0 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt @@ -152,7 +152,7 @@ class CollectionFragment( override fun onResume() { if (type==CONTROLADOR && storedBackPosition!=0){ - setListPosition(storedBackPosition, true)} + setListPosition(storedBackPosition, false)} super.onResume() scanRequest() } @@ -783,7 +783,7 @@ class CollectionFragment( } else { saleAdapter!!.notifyDataSetChanged() - setListPosition(storedPosition, false) + goBack = false } @@ -1365,6 +1365,7 @@ class CollectionFragment( //saleTrackingReplace(position,newType) }else{ saleTrackingReplace(position,newType) + setListPosition(position, false) } isMarking = true setTotalLines() diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt index 866b6046..ea87d1ad 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt @@ -7,7 +7,6 @@ import android.content.Intent import android.content.SharedPreferences import android.content.pm.PackageInfo import android.content.pm.PackageManager -import android.icu.text.Transliterator import android.net.Uri import android.provider.Settings import android.view.KeyEvent @@ -122,7 +121,7 @@ class LoginFragment : BaseFragment(LoginVi } binding.edittextServer.setOnClickListener { - // showWorkingForms() + // showWorkingForms() } } @@ -138,7 +137,6 @@ class LoginFragment : BaseFragment(LoginVi private fun showWorkingForms() { - /*Log.d("VERDNATURA::", "click")*/ val listForms: ArrayList = ArrayList() listForms.add( @@ -155,12 +153,22 @@ class LoginFragment : BaseFragment(LoginVi "https://test-salix.verdnatura.es" ) ) + + listForms.add( + workForms( + "Sergio", + "https://test-app.verdnatura.es", + "https://test-salix.verdnatura.es", + true + ) + ) + listForms.add(workForms("AƱadir otra forma", " ", " ")) val array = arrayOfNulls(listForms.size) var showList: ArrayList = ArrayList() - for (l in listForms){ + for (l in listForms) { showList.add(l.name) } @@ -174,7 +182,8 @@ class LoginFragment : BaseFragment(LoginVi binding.edittextServer.setText(it) saveData( "base_urlSalix", - it) + it + ) return@forEach } @@ -548,4 +557,4 @@ class LoginFragment : BaseFragment(LoginVi } -data class workForms(val name: String, val urlSilex: String, val urlSalix: String) +data class workForms(val name: String, val urlSilex: String, val urlSalix: String,val isShowDelete:Boolean=false)