diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/WebFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/WebFragment.kt index 2ced27a2..2a26ad5a 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/WebFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/WebFragment.kt @@ -21,6 +21,7 @@ import es.verdnatura.presentation.common.OnOptionsSelectedListener import es.verdnatura.presentation.common.ToolBarAdapterTooltip import es.verdnatura.presentation.view.component.CustomDialog import org.json.JSONObject +import kotlin.math.abs @Suppress("UNUSED_ANONYMOUS_PARAMETER") class WebFragment( @@ -53,9 +54,16 @@ class WebFragment( velocityX: Float, velocityY: Float ): Boolean { - if (velocityX > 100 && velocityY < 2000) { - binding.webView.goBack() - return true + val deltaX = (e2.x - e1?.x!!) + val deltaY = (e2.y - e1.y) + val deltaAbsX = abs(deltaX) + val deltaAbsY = abs(deltaY) + if (deltaAbsX > deltaAbsY) { + if (velocityX > 100 && velocityY < 2000) { + binding.webView.goBack() + return true + + } } return false @@ -66,7 +74,7 @@ class WebFragment( super.onViewCreated(view, savedInstanceState) } - @SuppressLint("ClickableViewAccessibility") + @SuppressLint("ClickableViewAccessibility", "SetJavaScriptEnabled") private fun setWeb() { binding.webView.webChromeClient = WebChromeClient() @@ -101,9 +109,9 @@ class WebFragment( binding.mainToolbar.toolbarTitle.text = buildString { - append(getString(R.string.item)) - append(JSONObject(entryPoint).get("entryPoint").toString()) - } + append(getString(R.string.item)) + append(JSONObject(entryPoint).get("entryPoint").toString()) + } val listIcons: ArrayList = ArrayList() val iconPrint = ImageView(context) @@ -143,7 +151,7 @@ class WebFragment( printAdapter, PrintAttributes.Builder().build() ).also { printJob -> - + println("job printed") // Save the job object for later status checking // printJobs += printJob } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/adapter/ItemShelvingLogAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/adapter/ItemShelvingLogAdapter.kt index dd0912a0..928197b1 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/adapter/ItemShelvingLogAdapter.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/adapter/ItemShelvingLogAdapter.kt @@ -28,14 +28,13 @@ class ItemShelvingLogAdapter( holder.bind(items[position]) holder.binding.root.setOnClickListener { - val shelvingFk = items[position].shelvingFk - if (!shelvingFk.isNullOrEmpty()) { + if (items[position].shelvingFk.isNullOrEmpty()) { onPasillerosItemClickListener.onPasillerosItemClickListener( PasillerosItemVO( title = holder.binding.root.context.getString( R.string.titleUbicator ) - ), shelvingFk + ),items[position].shelvingFk!! ) } diff --git a/app/src/main/res/layout/fragment_itemshelvinglog.xml b/app/src/main/res/layout/fragment_itemshelvinglog.xml index 98f31242..607a9eec 100644 --- a/app/src/main/res/layout/fragment_itemshelvinglog.xml +++ b/app/src/main/res/layout/fragment_itemshelvinglog.xml @@ -43,7 +43,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center" - android:text="@string/itemfk" android:textColor="@color/verdnatura_white" android:textSize="@dimen/body2" /> @@ -57,15 +56,6 @@ android:textColor="@color/verdnatura_white" android:textSize="@dimen/body2" /> - + android:layout_weight="0.75" + android:orientation="horizontal" + >