diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6f656965..6d9ceddb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -83,21 +83,12 @@
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
+
+
+
+
@@ -110,7 +101,7 @@
-
+
@@ -242,28 +233,28 @@
- {
+ "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"
]
}
-}]]>
+}
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/InfoFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/InfoFragment.kt
index ccacda33..2295ce68 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/InfoFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/InfoFragment.kt
@@ -49,11 +49,11 @@ class InfoFragment(var title: String) :
override fun observeViewModel() {
with(viewModel) {
-
companyInfo.observe(viewLifecycleOwner) {
binding.splashProgress.visibility = View.GONE
- d("VERDNATURA::", "" + it.toString())
+ d("VERDNATURA::", "" + it.name)
+
//saveDataInt(NUMBEROFWAGONS, it.response!!)
}
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/InfoViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/InfoViewModel.kt
index 370730f1..ae8b41b9 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/InfoViewModel.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/InfoViewModel.kt
@@ -14,7 +14,8 @@ class InfoViewModel(val context: Context) : BaseViewModel(context) {
private val _companyInfo by lazy { MutableLiveData() }
- val companyInfo: LiveData = _companyInfo
+ val companyInfo: LiveData
+ get() = _companyInfo
fun getInfoCompany(
userId:Int
@@ -26,7 +27,7 @@ class InfoViewModel(val context: Context) : BaseViewModel(context) {
override fun onSuccess(response: Response) {
_companyInfo.value =
- DeliveryInfo(response.body()!!)
+ response.body()!!
}
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/model/InfoCompany.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/model/InfoCompany.kt
index b240055a..76000e1d 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/model/InfoCompany.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/model/InfoCompany.kt
@@ -2,9 +2,9 @@ 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
+ var name: String = "",
+ var street: String = "",
+ var city: String = "",
+ var nif: String = "",
+ var postCode: String = ""
)
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_info.xml b/app/src/main/res/layout/fragment_info.xml
index 007814c5..0b696317 100644
--- a/app/src/main/res/layout/fragment_info.xml
+++ b/app/src/main/res/layout/fragment_info.xml
@@ -3,19 +3,18 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
>
+
+
+
-
-
-
+ android:textSize="@dimen/body1"
+ tools:text="@string/company"
+ />
@@ -70,45 +71,47 @@
android:orientation="horizontal">
+ android:textSize="@dimen/body1"
+ tools:text="@string/nif"/>
+ android:textSize="@dimen/body1"
+ tools:text="@string/adress"/>
-
Ver datos empresa
Muestra información empresa
Log y ruta de una expedición
+ NIF
+ Dirección
+ Empresa
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e6b142a1..c37c2e01 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -30,6 +30,8 @@
Remember username and password
Foults
Version
+ Company
+ NIF
User
Scan label
Filter
@@ -507,7 +509,7 @@
Give a name and urls of the servers
Server Silex
Server Salix
- Name
+ Company
Delete work form
¿Do you remove definitely?
Not assigned
@@ -534,5 +536,6 @@
Insert the amount correctly
Operación realizada correctamente
Self-consumption
+ Address