diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 24a6a185..7458e311 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -34,6 +34,7 @@
+
es
false
android-27
@@ -285,6 +286,11 @@
@style/AppTheme
+
+
+ @style/AppTheme
+
+
@style/AppTheme
@@ -431,6 +437,11 @@
@style/AppTheme
+
+
+ @style/AppTheme
+
+
@style/AppTheme
@@ -493,12 +504,24 @@
-
-
-
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
@@ -513,7 +536,7 @@
-
+
@@ -603,7 +626,7 @@
@@ -664,60 +687,60 @@
- {
- "keyToString": {
- "Android App.app.executor": "Run",
- "ApkExportedModule": "Gestor_Almacén.app",
- "DEBUGGABLE_DEVICE": "zebra_technologies-tc21-21114523025303",
- "DEBUGGABLE_PROCESS": "es.verdnatura.sfusion",
- "DEBUGGER_ID": "Auto",
- "ExportApk.ApkPathForGestor_Almacén.app": "C:\\Users\\sergiodt\\AndroidStudioProjects\\vn-warehouseManager\\app",
- "Gradle.vn-warehouseManager [clean].executor": "Run",
- "Gradle.vn-warehouseManager.executor": "Run",
- "KotlinFunctionFindUsagesOptions.isSearchForTextOccurrences": "true",
- "PROJECT_TRUSTED_KEY": "true",
- "RunOnceActivity.OpenProjectViewOnStart": "true",
- "RunOnceActivity.ShowReadmeOnStart": "true",
- "RunOnceActivity.cidr.known.project.marker": "true",
- "RunOnceActivity.readMode.enableVisualFormatting": "true",
- "SHARE_PROJECT_CONFIGURATION_FILES": "true",
- "SHOW_ALL_PROCESSES": "false",
- "ScreenRecorder.SavePath": "C:\\Users\\sergiodt",
- "android-custom-viewC:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/androidx.recyclerview/recyclerview/1.2.1/f0f93e67af3f7417bdd560d5142f6dec4fe629c3/recyclerview-1.2.1-sources.jar!/androidx/recyclerview/widget/RecyclerView.java_SELECTED": "RecyclerView",
- "android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-29/android/widget/TextView.java_SELECTED": "TextView",
- "android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-33/android/view/View.java_SELECTED": "View",
- "android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-34/android/view/View.java_SELECTED": "View",
- "android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-34/android/widget/CompoundButton.java_SELECTED": "CompoundButton",
- "android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-34/android/widget/TextView.java_SELECTED": "TextView",
- "cf.first.check.clang-format": "false",
- "cidr.known.project.marker": "true",
- "com.developerphil.adbidea.selecteddevices": "G65TY9DQN7X4BIE6",
- "com.google.services.firebase.aqiPopupShown": "true",
- "git-widget-placeholder": "dev",
- "ignore.virus.scanning.warn.message": "true",
- "kotlin-language-version-configured": "true",
- "last_directory_selection": "C:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/drawable",
- "last_opened_file_path": "C:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout",
- "project.structure.last.edited": "Modules",
- "project.structure.proportion": "0.17",
- "project.structure.side.proportion": "0.2",
- "rearrange.code.on.save": "true",
- "run.code.analysis.last.selected.profile": "pProject Default",
- "settings.editor.selected.configurable": "preferences.pluginManager"
+
+}]]>
@@ -1265,7 +1288,7 @@
1709725795643
-
+
@@ -1405,10 +1428,6 @@
-
-
-
-
@@ -1430,7 +1449,11 @@
-
+
+
+
+
+
@@ -1443,6 +1466,14 @@
+
+ file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerPreviousNew.kt
+ 764
+
+
+
+
+
file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SalixCallback.kt
86
@@ -1458,6 +1489,11 @@
87
+
+ file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/TicketsFragment.kt
+ 450
+
+
diff --git a/app/src/main/java/es/verdnatura/presentation/view/commom/WebFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/commom/WebFragment.kt
index 549d5c09..e2c40e58 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/commom/WebFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/commom/WebFragment.kt
@@ -30,6 +30,10 @@ import es.verdnatura.presentation.common.ToolBarAdapterTooltip
import es.verdnatura.presentation.view.component.CustomDialog
import es.verdnatura.presentation.view.feature.main.activity.MainActivity
import org.json.JSONObject
+import org.mozilla.geckoview.GeckoRuntime
+import org.mozilla.geckoview.GeckoSession
+import org.mozilla.geckoview.GeckoSession.ContentDelegate
+import org.mozilla.geckoview.GeckoView
import kotlin.math.abs
@Suppress("UNUSED_ANONYMOUS_PARAMETER")
@@ -41,6 +45,8 @@ class WebFragment(
private lateinit var customDialog: CustomDialog
private lateinit var backDispatcher: OnBackPressedDispatcher
private lateinit var binding: FragmentWebBinding
+ private var sRuntime: GeckoRuntime? = null
+ private var session: GeckoSession? = null
companion object {
fun newInstance(entryPoint: String) = WebFragment(entryPoint)
@@ -101,6 +107,15 @@ class WebFragment(
super.onViewCreated(view, savedInstanceState)
}
+ override fun onCreate(savedInstanceState: Bundle?) {
+ session = GeckoSession()
+ session!!.contentDelegate = object : ContentDelegate {}
+ // Usa el gestor para obtener la instancia única de GeckoRuntime
+ sRuntime = GeckoManager.getRuntime(requireContext())
+ session!!.open(sRuntime!!)
+ super.onCreate(savedInstanceState)
+ }
+
@SuppressLint("ClickableViewAccessibility", "SetJavaScriptEnabled")
private fun setWeb() {
@@ -131,11 +146,11 @@ class WebFragment(
}
val dataScanned = JSONObject(entryPoint)
+ if (dataScanned.toString().contains("Cmrs")) {
+ val view: GeckoView = binding.geckoView
+ view.setSession(session!!)
+ session!!.loadUri("${dataScanned.get("web")}")
- if (dataScanned.toString().contains("cmr?")) {
- val pdfUrl = "${dataScanned.get("web")}"
- val googleDocsViewerUrl = "https://docs.google.com/gview?embedded=true&url=$pdfUrl"
- binding.webView.loadUrl(googleDocsViewerUrl)
} else {
binding.webView.loadUrl(dataScanned.get("web").toString())
}
@@ -205,3 +220,14 @@ class WebFragment(
}
+object GeckoManager {
+ private var runtime: GeckoRuntime? = null
+
+ fun getRuntime(context: Context): GeckoRuntime {
+ if (runtime == null) {
+ runtime = GeckoRuntime.create(context)
+ }
+ return runtime!!
+ }
+}
+
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/TicketsFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/TicketsFragment.kt
index fa982b5b..3393304a 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/TicketsFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/TicketsFragment.kt
@@ -436,7 +436,7 @@ class TicketsFragment : BaseFragment(
mutableMapOf(
"entryPoint" to route.id,
"web" to "${
- mobileApplication.dataStoreApp.getServerSalix()
+ mobileApplication.dataStoreApp.getServerLilium()
}/api/Cmrs/${item.cmrFk}/print?access_token=${
mobileApplication.dataStoreApp.readDataStoreKey(
TOKEN
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/PackingMistakeFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/PackingMistakeFragment.kt
index ebced247..9526fa32 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/PackingMistakeFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/PackingMistakeFragment.kt
@@ -12,7 +12,7 @@ import es.verdnatura.presentation.base.BaseFragment
import es.verdnatura.presentation.common.GeneralAdapter
import es.verdnatura.presentation.common.GeneralItem
import es.verdnatura.presentation.common.OnCollectionSelectedListener
-import es.verdnatura.presentation.common.OnGeneralItemRowClickListener
+import es.verdnatura.presentation.common.OnGeneralRowClickListener
import es.verdnatura.presentation.view.component.CustomDialogList
import es.verdnatura.presentation.view.feature.inventario.fragment.InventaryViewModel
import es.verdnatura.presentation.view.feature.workermistake.model.MistakeType
@@ -118,9 +118,11 @@ class PackingMistakeFragment(var menuOrigin: String) :
listMistakesAdapter =
- GeneralAdapter(listMistakes, object : OnGeneralItemRowClickListener {
- override fun onGeneralItemRowClickListener(item: GeneralItem) {
+ GeneralAdapter(listMistakes, onRowClickListener = object : OnGeneralRowClickListener {
+
+ override fun onRowClickListener(item: GeneralItem) {
list.forEach {
+
if (it.description == item.text) {
try {
@@ -140,11 +142,12 @@ class PackingMistakeFragment(var menuOrigin: String) :
customDialogList.dismiss()
}
}
-
}
})
+
+
customDialogList.getRecyclerView().adapter = listMistakesAdapter
customDialogList.getRecyclerView().layoutManager =
LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)