refs #3520 feat:silex→salix
This commit is contained in:
parent
e5446589e8
commit
01ca48a51c
|
@ -10,7 +10,6 @@ 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
|
||||
import es.verdnatura.domain.toast
|
||||
import es.verdnatura.presentation.common.InteceptorListener
|
||||
import es.verdnatura.presentation.common.LoginListener
|
||||
|
@ -40,7 +39,7 @@ class MobileApplication : Application(), InteceptorListener {
|
|||
signListener = listener
|
||||
}
|
||||
|
||||
lateinit var silex: VerdnaturaService
|
||||
// lateinit var silex: VerdnaturaService
|
||||
lateinit var salix: SalixService
|
||||
var userId: Int? = null
|
||||
var userName: String? = null
|
||||
|
@ -68,11 +67,14 @@ class MobileApplication : Application(), InteceptorListener {
|
|||
}
|
||||
|
||||
|
||||
runBlocking { dataStoreApp.editDataStoreKey(ConstAndValues.BASEURLSALIX,ConstAndValues.BASE_URL_SALIX) }
|
||||
runBlocking {
|
||||
dataStoreApp.editDataStoreKey(
|
||||
ConstAndValues.BASEURLSALIX,
|
||||
ConstAndValues.BASE_URL_SALIX
|
||||
)
|
||||
}
|
||||
val restClient = RestClient(this, this)
|
||||
salix = restClient.salixClient
|
||||
silex = restClient.restClient
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -118,7 +118,6 @@ class SacadorFragment(
|
|||
when (item) {
|
||||
|
||||
iconAdd.drawable -> {
|
||||
binding.splashProgress.visibility = View.VISIBLE
|
||||
if (type == "PREPARED") {
|
||||
viewModel.collection_assign(
|
||||
)
|
||||
|
@ -198,13 +197,11 @@ class SacadorFragment(
|
|||
with(viewModel) {
|
||||
|
||||
collectionList.observe(viewLifecycleOwner, Observer {
|
||||
if (!goBack2) binding.splashProgress.visibility = View.GONE
|
||||
createCollectionList(it.list)
|
||||
goBack2 = false
|
||||
})
|
||||
|
||||
response.observe(viewLifecycleOwner, Observer {
|
||||
binding.splashProgress.visibility = View.GONE
|
||||
if (goBack) {
|
||||
if (!it.response.isNullOrBlank()) addCollectionToList(it.response.toInt())
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue