refs #4679 menus reparto
This commit is contained in:
parent
f1abfc2fe3
commit
83cd10e83d
|
|
@ -19,8 +19,8 @@
|
|||
<option name="values">
|
||||
<map>
|
||||
<entry key="assetSourceType" value="FILE" />
|
||||
<entry key="outputName" value="ic_item" />
|
||||
<entry key="sourceFile" value="Z:\DISEÑO-APP\GENERAL\icomoon\SVG\item.svg" />
|
||||
<entry key="outputName" value="ic_info" />
|
||||
<entry key="sourceFile" value="Z:\DISEÑO-APP\GENERAL\icomoon\SVG\info.svg" />
|
||||
</map>
|
||||
</option>
|
||||
</PersistentState>
|
||||
|
|
|
|||
|
|
@ -276,7 +276,7 @@
|
|||
</option>
|
||||
</component>
|
||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8" project-jdk-type="JavaSDK">
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||
</component>
|
||||
<component name="ProjectType">
|
||||
|
|
|
|||
|
|
@ -83,20 +83,23 @@
|
|||
</select>
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Expandible recycler final">
|
||||
<change afterPath="$PROJECT_DIR$/app/beta/app-beta.apk" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/beta/release/app-beta-release.apk" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/beta/release/output-metadata.json" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/general/release/output-metadata.json" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/general/release/vn-picking.apk" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
|
||||
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="refs #5054. Crashlytics. versionApp: 23.4">
|
||||
<change afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/InfoFragment.kt" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/InfoViewModel.kt" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/model/InfoCompany.kt" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/expedition_find.xml" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/ic_info.xml" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_info.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/assetWizardSettings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/assetWizardSettings.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/beta/output-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/beta/output-metadata.json" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/google-services.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/google-services.json" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/release/output-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/release/output-metadata.json" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/di/viewModelModule.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/di/viewModelModule.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroFragment.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/values-es/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-es/strings.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
|
|
@ -239,26 +242,28 @@
|
|||
<option name="showLibraryContents" value="true" />
|
||||
<option name="showMembers" value="true" />
|
||||
</component>
|
||||
<component name="PropertiesComponent">{
|
||||
"keyToString": {
|
||||
"ApkExportedModule": "Gestor_Almacén.app",
|
||||
"ExportApk.ApkPathForGestor_Almacén.app": "C:\\Users\\sergiodt\\AndroidStudioProjects\\vn-warehouseManager\\app",
|
||||
"RunOnceActivity.cidr.known.project.marker": "true",
|
||||
"cidr.known.project.marker": "true",
|
||||
"com.google.services.firebase.aqiPopupShown": "true",
|
||||
"last_opened_file_path": "C:/Users/sergiodt/proyectos/Rocket.Chat.ReactNative/android/app",
|
||||
"project.structure.last.edited": "Modules",
|
||||
"project.structure.proportion": "0.17",
|
||||
"project.structure.side.proportion": "0.2",
|
||||
"run.code.analysis.last.selected.profile": "pProject Default",
|
||||
"settings.editor.selected.configurable": "reference.settingsdialog.project.gradle"
|
||||
<component name="PropertiesComponent"><![CDATA[{
|
||||
"keyToString": {
|
||||
"ApkExportedModule": "Gestor_Almacén.app",
|
||||
"ExportApk.ApkPathForGestor_Almacén.app": "C:\\Users\\sergiodt\\AndroidStudioProjects\\vn-warehouseManager\\app",
|
||||
"RunOnceActivity.OpenProjectViewOnStart": "true",
|
||||
"RunOnceActivity.ShowReadmeOnStart": "true",
|
||||
"RunOnceActivity.cidr.known.project.marker": "true",
|
||||
"cidr.known.project.marker": "true",
|
||||
"com.google.services.firebase.aqiPopupShown": "true",
|
||||
"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",
|
||||
"run.code.analysis.last.selected.profile": "pProject Default",
|
||||
"settings.editor.selected.configurable": "reference.settingsdialog.project.gradle"
|
||||
},
|
||||
"keyToStringList": {
|
||||
"ExportApk.BuildVariants": [
|
||||
"generalRelease"
|
||||
"keyToStringList": {
|
||||
"ExportApk.BuildVariants": [
|
||||
"generalRelease"
|
||||
]
|
||||
}
|
||||
}</component>
|
||||
}]]></component>
|
||||
<component name="PsdUISettings">
|
||||
<option name="MODULE_TAB" value="Default Config" />
|
||||
<option name="LAST_EDITED_SIGNING_CONFIG" value="debug" />
|
||||
|
|
@ -266,11 +271,11 @@
|
|||
</component>
|
||||
<component name="RecentsManager">
|
||||
<key name="CopyFile.RECENT_KEYS">
|
||||
<recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\res\drawable" />
|
||||
<recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\res\layout" />
|
||||
<recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\java\es\verdnatura\presentation\view\feature\delivery" />
|
||||
<recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\res\drawable" />
|
||||
<recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\res\drawable-v24" />
|
||||
<recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\res\raw" />
|
||||
<recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\java\es\verdnatura\presentation\view\feature" />
|
||||
</key>
|
||||
<key name="MoveFile.RECENT_KEYS">
|
||||
<recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\res\drawable" />
|
||||
|
|
@ -287,6 +292,7 @@
|
|||
<recent name="es.verdnatura.presentation.view.feature.smarttag.register" />
|
||||
</key>
|
||||
<key name="CopyKotlinDeclarationDialog.RECENTS_KEY">
|
||||
<recent name="es.verdnatura.presentation.view.feature.delivery" />
|
||||
<recent name="es.verdnatura.domain" />
|
||||
<recent name="es.verdnatura.presentation.view.feature.packaging.fragment" />
|
||||
<recent name="es.verdnatura.presentation.view.component" />
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
package es.verdnatura.di
|
||||
|
||||
import es.verdnatura.presentation.view.feature.ajustes.fragment.AjustesViewModel
|
||||
import es.verdnatura.presentation.view.feature.articulo.fragment.ItemCardViewModel
|
||||
import es.verdnatura.presentation.view.feature.buffer.fragment.BufferFragmentViewModel
|
||||
|
|
@ -9,6 +10,7 @@ import es.verdnatura.presentation.view.feature.claim.fragment.ClaimViewModel
|
|||
import es.verdnatura.presentation.view.feature.collection.fragment.CollectionViewModel
|
||||
import es.verdnatura.presentation.view.feature.controlador.fragment.ControladorViewModel
|
||||
import es.verdnatura.presentation.view.feature.controlvehiculo.fragment.ControlVehiculoViewModel
|
||||
import es.verdnatura.presentation.view.feature.delivery.InfoViewModel
|
||||
import es.verdnatura.presentation.view.feature.diadeventa.fragment.DayOfSaleViewModel
|
||||
import es.verdnatura.presentation.view.feature.faltas.fragment.FaltasViewModel
|
||||
import es.verdnatura.presentation.view.feature.historicoarticulo.fragment.HistoricoArticuloViewModel
|
||||
|
|
@ -36,9 +38,9 @@ import org.koin.dsl.module
|
|||
val viewModelModule = module {
|
||||
|
||||
|
||||
/* viewModel {
|
||||
WorkermistakeViewModel()
|
||||
}*/
|
||||
/* viewModel {
|
||||
WorkermistakeViewModel()
|
||||
}*/
|
||||
|
||||
// Login
|
||||
viewModel {
|
||||
|
|
@ -199,4 +201,7 @@ val viewModelModule = module {
|
|||
viewModel {
|
||||
PackagingViewModel(androidContext())
|
||||
}
|
||||
viewModel {
|
||||
InfoViewModel(androidContext())
|
||||
}
|
||||
}
|
||||
|
|
@ -12,6 +12,7 @@ import es.verdnatura.presentation.view.feature.buscaritem.model.ItemLocationVO
|
|||
import es.verdnatura.presentation.view.feature.calidad.model.BuyerVO
|
||||
import es.verdnatura.presentation.view.feature.calidad.model.ItemBuyerVO
|
||||
import es.verdnatura.presentation.view.feature.collection.SalesModified
|
||||
import es.verdnatura.presentation.view.feature.delivery.model.DeliveryInfo
|
||||
import es.verdnatura.presentation.view.feature.diadeventa.model.ItemShelvingSaleDate
|
||||
import es.verdnatura.presentation.view.feature.faltas.model.ItemFaltasVO
|
||||
import es.verdnatura.presentation.view.feature.historicoarticulo.model.ItemHistoricoVO
|
||||
|
|
@ -876,4 +877,9 @@ interface VerdnaturaService {
|
|||
):
|
||||
Call<List<ItemSupplier>>
|
||||
|
||||
}
|
||||
@POST("delivery/getInfoCompany")//NO SALIX
|
||||
fun getInfoCompany(
|
||||
@Body vararg params: Any
|
||||
):
|
||||
Call<DeliveryInfo>
|
||||
}
|
||||
|
|
@ -0,0 +1,65 @@
|
|||
package es.verdnatura.presentation.view.feature.delivery
|
||||
|
||||
import android.content.SharedPreferences
|
||||
import android.util.Log.d
|
||||
import android.view.View
|
||||
import es.verdnatura.R
|
||||
import es.verdnatura.databinding.FragmentInfoBinding
|
||||
import es.verdnatura.presentation.base.BaseFragment
|
||||
import es.verdnatura.presentation.view.component.CustomDialog
|
||||
import es.verdnatura.presentation.view.feature.ajustes.adapter.AjustesAdapter
|
||||
import es.verdnatura.presentation.view.feature.ajustes.model.Printers
|
||||
import es.verdnatura.presentation.view.feature.ajustes.model.SectorItemVO
|
||||
import es.verdnatura.presentation.view.feature.ajustes.model.Train
|
||||
import es.verdnatura.presentation.view.feature.articulo.model.ItemPackingType
|
||||
import es.verdnatura.presentation.view.feature.delivery.model.DeliveryInfo
|
||||
|
||||
class InfoFragment(var title: String) :
|
||||
BaseFragment<FragmentInfoBinding, InfoViewModel>(InfoViewModel::class) {
|
||||
|
||||
private lateinit var customDialog: CustomDialog
|
||||
private var sectorListVO: List<SectorItemVO> = listOf()
|
||||
private var printersList: List<Printers> = listOf()
|
||||
private var trainsList: List<Train> = listOf()
|
||||
private var prefs: SharedPreferences? = null
|
||||
private var ajustesAdapter: AjustesAdapter? = null
|
||||
private var isWorkerAllowed: Boolean = false
|
||||
private var itemPackingList: List<ItemPackingType> = listOf()
|
||||
private var messagePrinter: String? = null
|
||||
|
||||
companion object {
|
||||
fun newInstance(title: String) = InfoFragment(title)
|
||||
|
||||
}
|
||||
|
||||
override fun getLayoutId(): Int = R.layout.fragment_info
|
||||
|
||||
override fun init() {
|
||||
|
||||
super.init()
|
||||
|
||||
binding.mainToolbar.toolbarTitle.text = title
|
||||
binding.splashProgress.visibility = View.VISIBLE
|
||||
viewModel.getInfoCompany(getDataInt(USER))
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
override fun observeViewModel() {
|
||||
with(viewModel) {
|
||||
|
||||
|
||||
companyInfo.observe(viewLifecycleOwner) {
|
||||
binding.splashProgress.visibility = View.GONE
|
||||
|
||||
d("VERDNATURA::", "" + it.toString())
|
||||
//saveDataInt(NUMBEROFWAGONS, it.response!!)
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,43 @@
|
|||
package es.verdnatura.presentation.view.feature.delivery
|
||||
|
||||
|
||||
import android.content.Context
|
||||
import androidx.lifecycle.LiveData
|
||||
import androidx.lifecycle.MutableLiveData
|
||||
import es.verdnatura.domain.SilexCallback
|
||||
import es.verdnatura.presentation.base.BaseViewModel
|
||||
import es.verdnatura.presentation.view.feature.delivery.model.DeliveryInfo
|
||||
import retrofit2.Response
|
||||
|
||||
|
||||
class InfoViewModel(val context: Context) : BaseViewModel(context) {
|
||||
|
||||
|
||||
private val _companyInfo by lazy { MutableLiveData<DeliveryInfo>() }
|
||||
val companyInfo: LiveData<DeliveryInfo> = _companyInfo
|
||||
|
||||
fun getInfoCompany(
|
||||
userId:Int
|
||||
) {
|
||||
|
||||
silex.getInfoCompany(userId)
|
||||
.enqueue(object : SilexCallback<DeliveryInfo?>(context) {
|
||||
|
||||
override fun onSuccess(response: Response<DeliveryInfo?>) {
|
||||
|
||||
_companyInfo.value =
|
||||
DeliveryInfo(response.body()!!)
|
||||
|
||||
}
|
||||
|
||||
override fun onError(t: Throwable) {
|
||||
_companyInfo.value =
|
||||
DeliveryInfo()
|
||||
super.onError(t)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
package es.verdnatura.presentation.view.feature.delivery.model
|
||||
|
||||
|
||||
class DeliveryInfo(
|
||||
private val name: DeliveryInfo? = null,
|
||||
private val street: String? = null,
|
||||
private val city: String? = null,
|
||||
private val nif: String? = null,
|
||||
private val postCode: String? = null
|
||||
)
|
||||
|
|
@ -34,6 +34,7 @@ import es.verdnatura.presentation.view.feature.controlador.fragment.ControladorF
|
|||
import es.verdnatura.presentation.view.feature.controlador.fragment.WebFragment
|
||||
import es.verdnatura.presentation.view.feature.controlvehiculo.fragment.ControlVehiculoFragment
|
||||
import es.verdnatura.presentation.view.feature.controlvehiculo.fragment.ControlVehiculoUsuarioFragment
|
||||
import es.verdnatura.presentation.view.feature.delivery.InfoFragment
|
||||
import es.verdnatura.presentation.view.feature.diadeventa.fragment.DayOfSaleFragment
|
||||
import es.verdnatura.presentation.view.feature.faltas.fragment.FaltasFragment
|
||||
import es.verdnatura.presentation.view.feature.historicoarticulo.fragment.HistoricoArticuloFragment
|
||||
|
|
@ -532,7 +533,22 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
|
|||
addFragmentOnTop(PackagingSummaryFragment.newInstance(item.title))
|
||||
}
|
||||
|
||||
getString(R.string.testing) -> {
|
||||
getString(R.string.titleDelivery) -> {
|
||||
addFragmentOnTop(
|
||||
PasilleroFragment.newInstance(
|
||||
getString(R.string.titleDelivery),
|
||||
isInitMenu = false
|
||||
)
|
||||
)
|
||||
}
|
||||
getString(R.string.titleInfo) -> {
|
||||
addFragmentOnTop(
|
||||
InfoFragment.newInstance(item.title))
|
||||
|
||||
}
|
||||
|
||||
|
||||
getString(R.string.testing) -> {
|
||||
addFragmentOnTop(testPrint.newInstance(item.title))
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -81,6 +81,8 @@ class PasilleroFragment(
|
|||
getString(R.string.titleBufferManegement) -> viewModel.inititializeDefaultBuffer()
|
||||
getString(R.string.main) -> viewModel.inititializeDefaultDataInit()
|
||||
getString(R.string.titleClaims) -> viewModel.inititializeDefaultClaim()
|
||||
getString(R.string.titleDelivery) -> viewModel.inititializeDefaultDelivery()
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -510,6 +510,16 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
|
|||
)
|
||||
)
|
||||
|
||||
//#tarea4679
|
||||
_pasillerositem.add(
|
||||
PasillerosItemVO(
|
||||
6,
|
||||
R.drawable.ic_delivery,
|
||||
contextApp.getString(R.string.titleDelivery),
|
||||
R.string.titleDelivery,
|
||||
contextApp.getString(R.string.titleDeliveryDescrip)
|
||||
)
|
||||
)
|
||||
|
||||
//#tarea4021
|
||||
/* _pasillerositem.add(
|
||||
|
|
@ -551,5 +561,32 @@ class PasilleroViewModel(context: Context) : BaseViewModel(context) {
|
|||
)
|
||||
|
||||
|
||||
}
|
||||
fun inititializeDefaultDelivery() {
|
||||
|
||||
_pasillerositem.add(
|
||||
PasillerosItemVO(
|
||||
30,
|
||||
R.drawable.expedition_find,
|
||||
contextApp.getString(R.string.titleLog),
|
||||
R.string.titleLog,
|
||||
contextApp.getString(
|
||||
R.string.titleLogDescrip
|
||||
)
|
||||
)
|
||||
)
|
||||
_pasillerositem.add(
|
||||
PasillerosItemVO(
|
||||
30,
|
||||
R.drawable.ic_info,
|
||||
contextApp.getString(R.string.titleInfo),
|
||||
R.string.titleInfo,
|
||||
contextApp.getString(
|
||||
R.string.titleInfoDescription
|
||||
)
|
||||
)
|
||||
)
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,8 @@
|
|||
<!-- drawable/archive_search_outline.xml -->
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:height="24dp"
|
||||
android:width="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path android:fillColor="#F7931E" android:pathData="M13.04 10C12.64 10.25 12.26 10.55 11.9 10.9C11.57 11.24 11.27 11.61 11.03 12H8V10.5C8 10.22 8.22 10 8.5 10H13.04M20 8H2V2H20V8M18 4H4V6H18V4M5 18V9H3V20H11.82C11.24 19.4 10.8 18.72 10.5 18H5M23.39 21L22 22.39L18.88 19.32C18.19 19.75 17.37 20 16.5 20C14 20 12 18 12 15.5S14 11 16.5 11 21 13 21 15.5C21 16.38 20.75 17.21 20.31 17.9L23.39 21M19 15.5C19 14.12 17.88 13 16.5 13S14 14.12 14 15.5 15.12 18 16.5 18 19 16.88 19 15.5Z" />
|
||||
</vector>
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<vector android:height="24dp"
|
||||
android:viewportHeight="32"
|
||||
android:viewportWidth="32"
|
||||
android:width="24dp"
|
||||
android:tint="#F7931E"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillColor="#FF000000" android:pathData="M16,0c-8.8,0 -16,7.2 -16,16s7.2,16 16,16 16,-7.2 16,-16 -7.2,-16 -16,-16zM17.6,24h-3.2v-9.6h3.2v9.6zM17.6,11.2h-3.2v-3.2h3.2v3.2z"/>
|
||||
</vector>
|
||||
|
|
@ -0,0 +1,195 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layout xmlns:tools="http://schemas.android.com/tools"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
>
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@color/verdnatura_black">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/main_toolbar">
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
<View
|
||||
android:id="@+id/divider"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:background="@color/verdnatura_white"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/main_toolbar"/>
|
||||
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/linearLayout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/divider"
|
||||
android:layout_marginLeft="@dimen/pasilleros_margin_main_menu"
|
||||
android:padding="@dimen/navigation_row_limit_padding"
|
||||
>
|
||||
|
||||
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
>
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginRight="@dimen/default_layout_margin"
|
||||
android:text="@string/Versión"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body1"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_version"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text=""
|
||||
android:layout_marginLeft="@dimen/layout_margin_8"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body1"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/Usuario"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body1"
|
||||
android:textStyle="bold"
|
||||
android:layout_marginRight="@dimen/default_layout_margin"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/user_text"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text=""
|
||||
android:layout_marginLeft="@dimen/layout_margin_8"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body1"/>
|
||||
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/Androidid"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body1"
|
||||
android:textStyle="bold"
|
||||
android:layout_marginRight="@dimen/default_layout_margin"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/androidid_text"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:text=""
|
||||
android:layout_marginLeft="@dimen/layout_margin_6"
|
||||
android:tooltipText="@string/copied"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body1"/>
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:visibility="gone"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginBottom="8dp">
|
||||
|
||||
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Server:"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body1"
|
||||
android:textStyle="bold"
|
||||
android:layout_marginRight="@dimen/default_layout_margin"/>
|
||||
|
||||
<EditText
|
||||
android:id="@+id/txtserver"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:background="@color/verdnatura_white"
|
||||
android:padding="5dp"
|
||||
android:ems="10"
|
||||
android:inputType="text"
|
||||
android:layout_marginTop="4dp"/>
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<include
|
||||
android:id="@+id/main_toolbar"
|
||||
layout="@layout/toolbar_fragment"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/ajustess_items"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginTop="8dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintHorizontal_bias="0.6"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/linearLayout" />
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/splash_progress"
|
||||
android:visibility="invisible"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
android:background="@color/verdnatura_black_8_alpha_6"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
android:gravity="center">
|
||||
|
||||
|
||||
<com.airbnb.lottie.LottieAnimationView
|
||||
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="@dimen/verdnatura_logo_large_height"
|
||||
|
||||
app:lottie_autoPlay="true"
|
||||
app:lottie_loop="true"
|
||||
app:lottie_rawRes="@raw/orange_loading"
|
||||
app:lottie_speed="2" />
|
||||
</LinearLayout>
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
</layout>
|
||||
|
|
@ -193,7 +193,6 @@
|
|||
<string name="speedProblems">Problemas con la velocidad de internet. No se puede usar la voz</string>
|
||||
<string name="allowParking">Permite aparcar ticket/carro</string>
|
||||
<string name="allowTakeoffVehicle">Permite dejar el vehículo</string>
|
||||
|
||||
<string name="newCollection">Genera colección para sacar</string>
|
||||
<string name="showFilter">Ver filtro </string>
|
||||
<string name="showFaults">Ver movimientos de Faltas</string>
|
||||
|
|
@ -530,5 +529,11 @@
|
|||
<string name="selfConsumption">Autoconsumo</string>
|
||||
<string name="titleSelfConsumption">Autoconsumo</string>
|
||||
<string name="titleSelfDescription">Permite consumo de materiales del almacén</string>
|
||||
<string name="titleDelivery">Reparto</string>
|
||||
<string name="titleDeliveryDescrip">Accede a las opciones de reparto</string>
|
||||
<string name="titleLogDescrip">Ver datos expedición</string>
|
||||
<string name="titleInfoDescription">Ver datos empresa</string>
|
||||
<string name="titleInfo">Muestra información empresa</string>
|
||||
<string name="titleLog">Log y ruta de una expedición</string>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -166,6 +166,9 @@
|
|||
<string name="titlePackingMistake">Packing mistake</string>
|
||||
<string name="buscarDepartamento">Find department</string>
|
||||
<string name="titleClaimUbication">Claim Ubication</string>
|
||||
<string name="titleInfoDescription">Show company information</string>
|
||||
<string name="titleInfo">Show company information</string>
|
||||
<string name="titleLog">Show data expedition</string>
|
||||
<string name="claims">Claims</string>
|
||||
<string name="operationSuccess"> done successful</string>
|
||||
<string name="settings">Settings</string>
|
||||
|
|
@ -368,6 +371,7 @@
|
|||
<string name="titleBufferManegement">Buffer management</string>
|
||||
<string name="titleClaims">Claims</string>
|
||||
<string name="titlePackaging">Suppliers</string>
|
||||
<string name="titleDelivery">Delivery</string>
|
||||
<string name="titlePackagingCount">Packaging</string>
|
||||
<string name="titlePackagingObs">Observations</string>
|
||||
<string name="titlePackagingSummary">Summary</string>
|
||||
|
|
@ -471,6 +475,8 @@
|
|||
<string name="titlePalletizDescrip">Access the palletizers menu: palletize, buffer…</string>
|
||||
<string name="titleClaimsDescrip">Access the claims menu</string>
|
||||
<string name="titlePackagingDescrip">Access the packaging menu</string>
|
||||
<string name="titleDeliveryDescrip">Access to the delivery menu</string>
|
||||
<string name="titleLogDescrip">Show log and route from expedition</string>
|
||||
<string name="titleClaimDescrip">Claims Location</string>
|
||||
<string name="collectionErrorBuilding">Error building collection. Error description:</string>
|
||||
<string name="main">Main</string>
|
||||
|
|
|
|||
Loading…
Reference in New Issue