diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c1aaca80..d992ad3f 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -116,42 +116,112 @@ - + + - - + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -973,7 +1043,6 @@ diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesViewModel.kt index 780cb08c..96c2938f 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesViewModel.kt @@ -186,6 +186,17 @@ class AjustesViewModel(val context: Context) : BaseViewModel(context) { true ) ) + _ajustesitem.add( + AjustesItemVO( + 9, + "Iniciar parada", + selected = "", + 0, + 0, + 0, "", + false + ) + ) _ajustesitem.add( AjustesItemVO( 5, diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/adapters/TicketAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/adapters/TicketAdapter.kt index 0e9872e4..7ff73474 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/adapters/TicketAdapter.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/adapters/TicketAdapter.kt @@ -20,27 +20,15 @@ class TicketAdapter( ) : RecyclerView.Adapter() { - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemHolder { - // items = setHeaders(items) return ItemHolder( ItemTicketRowBinding.inflate( - LayoutInflater.from(parent.context), - parent, - false + LayoutInflater.from(parent.context), parent, false ) ) } fun setHeaders(list: MutableList): MutableList { - - /* var prevCreated = "" - for (route in list) { - if (route.created.toString() != prevCreated) { - route.header = true - prevCreated = route.created.toString() - } - }*/ return list } @@ -52,13 +40,8 @@ class TicketAdapter( override fun getItemCount() = items.size override fun onBindViewHolder(holder: ItemHolder, position: Int) { - // items = setHeaders(items) + holder.bind(items[position]) - - /* holder.binding.root.setOnClickListener { - //onAddressRowClickListener.onAddressRowClickListener(items[position]) - }*/ - val viewTickets = holder.itemView.findViewById(R.id.layoutTickets) viewTickets.removeAllViews() @@ -94,46 +77,39 @@ class TicketAdapter( if (!item.ticketObservation.isNullOrEmpty()) { note.setColorFilter( ContextCompat.getColor( - note.context, - R.color.verdnatura_dark_sky_blue + note.context, R.color.verdnatura_dark_sky_blue ) ) } else { note.setColorFilter( ContextCompat.getColor( - note.context, - R.color.verdnatura_white + note.context, R.color.verdnatura_white ) ) } note.setOnClickListener { onItemButtonTicketRowClickListener.onItemButtonTicketRowClickListener( - item, - "note" + item, "note" ) } addNote.setOnClickListener { onItemButtonTicketRowClickListener.onItemButtonTicketRowClickListener( - item, - "addNote" + item, "addNote" ) } phone.setOnClickListener { onItemButtonTicketRowClickListener.onItemButtonTicketRowClickListener( - item, - "call" + item, "call" ) } map.setOnClickListener { onItemButtonTicketRowClickListener.onItemButtonTicketRowClickListener( - item, - "map" + item, "map" ) } unload.setOnClickListener { onItemButtonTicketRowClickListener.onItemButtonTicketRowClickListener( - item, - "unload" + item, "unload" ) } 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 6a403b5b..b1c6ac5e 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 @@ -8,11 +8,9 @@ import android.content.Intent import android.content.pm.PackageManager import android.graphics.drawable.Drawable import android.net.Uri -import android.os.Build import android.view.View import android.widget.ImageView import android.widget.TextView -import androidx.annotation.RequiresApi import androidx.core.app.ActivityCompat import androidx.core.content.ContextCompat import androidx.core.view.isVisible @@ -27,7 +25,17 @@ import es.verdnatura.domain.notNull import es.verdnatura.domain.toast import es.verdnatura.presentation.base.BaseFragment import es.verdnatura.presentation.base.database -import es.verdnatura.presentation.common.* +import es.verdnatura.presentation.common.GeneralAdapter +import es.verdnatura.presentation.common.GeneralItem +import es.verdnatura.presentation.common.ItemDescorationCustomized +import es.verdnatura.presentation.common.OnGeneralItemRowClickListener +import es.verdnatura.presentation.common.OnItemButtonCMRRowClickListener +import es.verdnatura.presentation.common.OnItemButtonTicketRowClickListener +import es.verdnatura.presentation.common.OnOptionsSelectedListener +import es.verdnatura.presentation.common.OnPasillerosItemClickListener +import es.verdnatura.presentation.common.ToolBarAdapterTooltip +import es.verdnatura.presentation.common.addDateToTime +import es.verdnatura.presentation.common.getHourDay import es.verdnatura.presentation.view.component.CustomDialogInputNotes import es.verdnatura.presentation.view.component.CustomDialogList import es.verdnatura.presentation.view.feature.delivery.adapters.TicketAdapter @@ -67,7 +75,6 @@ class TicketsFragment( override fun getLayoutId(): Int = R.layout.fragment_tickets - @RequiresApi(Build.VERSION_CODES.O) override fun init() { super.init() setEvents() @@ -88,7 +95,6 @@ class TicketsFragment( customDialogList = CustomDialogList(requireContext()) } - @RequiresApi(Build.VERSION_CODES.O) private fun setToolBar() { ma.hideBottomNavigation(View.GONE) binding.mainToolbar.toolbarSubtitle.setTextColor(requireContext().getColor((R.color.verdnatura_pumpkin_orange))) @@ -107,13 +113,11 @@ class TicketsFragment( iconSigned.setImageResource(R.drawable.ic_sign_ticket) iconSend.setImageResource(R.drawable.ic_send) - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - iconSettings.tooltipText = getTooltip(R.drawable.ic_setting_ui) - iconSort.tooltipText = getTooltip(R.drawable.ic_sort) - iconSigned.tooltipText = getTooltip(R.drawable.ic_sign_ticket) - iconSend.tooltipText = getTooltip(R.drawable.ic_send) + iconSettings.tooltipText = getTooltip(R.drawable.ic_setting_ui) + iconSort.tooltipText = getTooltip(R.drawable.ic_sort) + iconSigned.tooltipText = getTooltip(R.drawable.ic_sign_ticket) + iconSend.tooltipText = getTooltip(R.drawable.ic_send) - } listIcons.add(iconSigned) listIcons.add(iconSend) listIcons.add(iconSettings) @@ -246,7 +250,6 @@ class TicketsFragment( } } - @RequiresApi(Build.VERSION_CODES.O) override fun observeViewModel() { with(viewModel) { loadRouteList.observe(viewLifecycleOwner) { event -> @@ -421,7 +424,7 @@ class TicketsFragment( private fun addNotes(itemClient: ClientTicketSalix) { val customDialogInput = CustomDialogInputNotes(requireContext()) - customDialogInput.setTitle("Notas") + customDialogInput.setTitle(getString(R.string.notes)) val adapter: GeneralAdapter val itemsNotes: List = listOf( @@ -570,7 +573,10 @@ class TicketsFragment( val minute = mcurrentTime[Calendar.MINUTE] val mTimePicker = TimePickerDialog( requireContext(), - { _, selectedHour, selectedMinute -> textV.text = "$selectedHour:$selectedMinute" }, + { _, selectedHour, selectedMinute -> + textV.text = + getString(R.string.hourMinute, selectedHour, selectedMinute) + }, hour, minute, true diff --git a/app/src/main/res/layout/activity_imageview.xml b/app/src/main/res/layout/activity_imageview.xml index 76730f34..9b1828e2 100644 --- a/app/src/main/res/layout/activity_imageview.xml +++ b/app/src/main/res/layout/activity_imageview.xml @@ -15,10 +15,12 @@ android:layout_width="0dp" android:layout_height="0dp" android:src="@drawable/loadphoto" + android:contentDescription="@string/selectImage" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" + /> - - - - + android:paddingStart="@dimen/layout_margin_min" + android:paddingEnd="@dimen/layout_margin_min"> @@ -47,7 +40,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:gravity="left" + android:gravity="start" android:text="@string/tickets" android:textColor="@color/verdnatura_white" android:textSize="@dimen/body2" /> @@ -57,7 +50,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:gravity="left" + android:gravity="start" android:text="@string/Entrada" android:textColor="@color/verdnatura_pumpkin_orange" android:textSize="@dimen/body1" /> @@ -66,7 +59,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:gravity="left" + android:gravity="start" android:text="@string/packages" android:textColor="@color/verdnatura_white" android:textSize="@dimen/body2" /> @@ -76,7 +69,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:gravity="left" + android:gravity="start" android:text="@string/packages" android:textColor="@color/verdnatura_pumpkin_orange" android:textSize="@dimen/body1" /> @@ -91,7 +84,7 @@ + android:textSize="16sp" /> diff --git a/app/src/main/res/layout/component_custom_dynamic_dialog.xml b/app/src/main/res/layout/component_custom_dynamic_dialog.xml index 32a94fa0..7dc0b051 100644 --- a/app/src/main/res/layout/component_custom_dynamic_dialog.xml +++ b/app/src/main/res/layout/component_custom_dynamic_dialog.xml @@ -40,13 +40,12 @@ tools:visibility="visible" /> - - + diff --git a/app/src/main/res/layout/component_custom_hour.xml b/app/src/main/res/layout/component_custom_hour.xml index 2ed1db83..cbe7d70d 100644 --- a/app/src/main/res/layout/component_custom_hour.xml +++ b/app/src/main/res/layout/component_custom_hour.xml @@ -46,7 +46,7 @@ diff --git a/app/src/main/res/layout/component_custom_ubicador_dialog.xml b/app/src/main/res/layout/component_custom_ubicador_dialog.xml index 8822e67f..1f37448d 100644 --- a/app/src/main/res/layout/component_custom_ubicador_dialog.xml +++ b/app/src/main/res/layout/component_custom_ubicador_dialog.xml @@ -41,7 +41,7 @@ style="@style/InputLineTextSearch" android:layout_width="match_parent" android:backgroundTint="@android:color/white" - android:hint="ItemFk" + android:hint="@string/itemfk" android:lines="1" android:maxLines="1" android:textColor="@color/verdnatura_white" @@ -51,7 +51,8 @@ + android:orientation="horizontal" + android:baselineAligned="false"> + android:orientation="horizontal" + android:baselineAligned="false"> + android:orientation="horizontal" + android:baselineAligned="false"> + android:orientation="horizontal" + android:baselineAligned="false"> - @@ -9,13 +9,7 @@ android:layout_height="match_parent" android:background="@color/verdnatura_black"> - - - @@ -48,7 +42,7 @@ @@ -77,14 +71,14 @@ android:textColor="@color/verdnatura_white" android:textSize="@dimen/body1" android:textStyle="bold" - android:layout_marginRight="@dimen/default_layout_margin"/> + android:layout_marginEnd="@dimen/default_layout_margin"/> @@ -99,14 +93,14 @@ android:textColor="@color/verdnatura_white" android:textSize="@dimen/body1" android:textStyle="bold" - android:layout_marginRight="@dimen/default_layout_margin"/> + android:layout_marginEnd="@dimen/default_layout_margin"/> @@ -120,7 +114,7 @@ android:id="@+id/serial_text" android:layout_width="120dp" android:layout_height="match_parent" - android:layout_marginRight="@dimen/default_layout_margin" + android:layout_marginEnd="@dimen/default_layout_margin" android:text="@string/serialNumber" android:textColor="@color/verdnatura_white" android:textSize="@dimen/body1" @@ -131,7 +125,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:text="" - android:layout_marginLeft="@dimen/layout_margin_4" + android:layout_marginStart="@dimen/layout_margin_4" android:textColor="@color/verdnatura_white" android:textSize="@dimen/body1"/> @@ -148,21 +142,23 @@ + android:layout_marginEnd="@dimen/default_layout_margin"/> diff --git a/app/src/main/res/layout/fragment_buscar_item.xml b/app/src/main/res/layout/fragment_buscar_item.xml index c6c413b3..25e6c325 100644 --- a/app/src/main/res/layout/fragment_buscar_item.xml +++ b/app/src/main/res/layout/fragment_buscar_item.xml @@ -33,15 +33,15 @@ android:layout_marginTop="@dimen/layout_margin_min" android:layout_marginBottom="@dimen/layout_margin_1" android:orientation="horizontal" - android:paddingLeft="@dimen/layout_margin_min" - android:paddingRight="@dimen/layout_margin_min"> + android:paddingStart="@dimen/layout_margin_min" + android:paddingEnd="@dimen/layout_margin_min"> @@ -68,7 +68,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:gravity="center" - android:text="Prioridad" + android:text="@string/priority" android:textColor="@color/verdnatura_white" android:textSize="@dimen/body2" /> diff --git a/app/src/main/res/layout/fragment_collection.xml b/app/src/main/res/layout/fragment_collection.xml index 73f26176..2693acaa 100644 --- a/app/src/main/res/layout/fragment_collection.xml +++ b/app/src/main/res/layout/fragment_collection.xml @@ -26,7 +26,8 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/main_toolbar" - android:paddingLeft="@dimen/default_layout_margin"/> + android:paddingStart="@dimen/default_layout_margin" + android:autofillHints="name"/> + android:paddingStart="@dimen/default_layout_margin"/> @@ -46,7 +46,6 @@ android:layout_height="wrap_content" android:layout_weight="1" android:gravity="start" - android:paddingStart="@dimen/layout_margin_min" android:text="@string/expedition" android:textColor="@color/verdnatura_white" android:textSize="@dimen/body1" /> diff --git a/app/src/main/res/layout/fragment_expedition_log_delivery.xml b/app/src/main/res/layout/fragment_expedition_log_delivery.xml index c957a3fd..2d4747ce 100644 --- a/app/src/main/res/layout/fragment_expedition_log_delivery.xml +++ b/app/src/main/res/layout/fragment_expedition_log_delivery.xml @@ -38,8 +38,8 @@ android:layout_marginBottom="@dimen/layout_margin_1" android:background="@color/verdnatura_pumpkin_orange" android:orientation="horizontal" - android:paddingLeft="@dimen/layout_margin_1" - android:paddingRight="@dimen/layout_margin_1" + android:paddingStart="@dimen/layout_margin_1" + android:paddingEnd="@dimen/layout_margin_1" android:visibility="gone" tools:visibility="visible"> @@ -48,8 +48,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1.25" - android:gravity="left" - android:paddingLeft="@dimen/layout_margin_min" + android:gravity="start" android:text="@string/Ruta" android:textColor="@color/verdnatura_white" android:textSize="@dimen/body1" /> @@ -59,7 +58,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1.25" - android:gravity="left" + android:gravity="start" android:text="@string/zone" android:textColor="@color/verdnatura_white" android:textSize="@dimen/body2" /> @@ -69,7 +68,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1.25" - android:gravity="right" + android:gravity="end" android:text="@string/Fecha" android:textColor="@color/verdnatura_white" android:textSize="@dimen/body2" /> @@ -82,15 +81,14 @@ android:layout_marginTop="@dimen/layout_margin_min" android:layout_marginBottom="@dimen/layout_margin_1" android:orientation="horizontal" - android:paddingLeft="@dimen/layout_margin_1" - android:paddingRight="@dimen/layout_margin_1"> + android:paddingStart="@dimen/layout_margin_1" + android:paddingEnd="@dimen/layout_margin_1"> @@ -99,7 +97,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1.25" - android:gravity="left" + android:gravity="start" android:text="@string/Worker" android:textColor="@color/verdnatura_white" android:textSize="@dimen/body2" /> @@ -109,7 +107,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1.25" - android:gravity="right" + android:gravity="end" android:text="@string/state" android:textColor="@color/verdnatura_white" android:textSize="@dimen/body2" /> @@ -123,12 +121,6 @@ android:orientation="vertical" android:padding="10dp" tools:ignore="ExtraText"> - - - - diff --git a/app/src/main/res/layout/fragment_expedition_pallet.xml b/app/src/main/res/layout/fragment_expedition_pallet.xml index 3d6a6f0e..b5dab040 100644 --- a/app/src/main/res/layout/fragment_expedition_pallet.xml +++ b/app/src/main/res/layout/fragment_expedition_pallet.xml @@ -14,8 +14,8 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:orientation="horizontal" - android:paddingLeft="@dimen/layout_margin_min" - android:paddingRight="@dimen/layout_margin_min" + android:paddingStart="@dimen/layout_margin_min" + android:paddingEnd="@dimen/layout_margin_min" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/main_toolbar"> @@ -43,7 +43,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:gravity="center" - android:text="Eti" + android:text="@string/eti" android:textColor="@color/verdnatura_white" android:textSize="@dimen/body2" /> diff --git a/app/src/main/res/layout/fragment_expedition_pallet_detail.xml b/app/src/main/res/layout/fragment_expedition_pallet_detail.xml index d8b54fde..9290bd36 100644 --- a/app/src/main/res/layout/fragment_expedition_pallet_detail.xml +++ b/app/src/main/res/layout/fragment_expedition_pallet_detail.xml @@ -15,8 +15,8 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:orientation="horizontal" - android:paddingLeft="@dimen/layout_margin_min" - android:paddingRight="@dimen/layout_margin_min" + android:paddingStart="@dimen/layout_margin_min" + android:paddingEnd="@dimen/layout_margin_min" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/main_toolbar"> @@ -37,8 +37,8 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:orientation="horizontal" - android:paddingLeft="@dimen/layout_margin_min" - android:paddingRight="@dimen/layout_margin_min" + android:paddingStart="@dimen/layout_margin_min" + android:paddingEnd="@dimen/layout_margin_min" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/linearLayout"> @@ -94,7 +94,7 @@ android:layout_marginEnd="16dp" android:layout_marginBottom="16dp" android:background="@drawable/btn_orange" - android:text="Ok" + android:text="@string/ok" android:textColor="@color/verdnatura_white" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/fragment_expedition_scan.xml b/app/src/main/res/layout/fragment_expedition_scan.xml index db83832b..66ec8887 100644 --- a/app/src/main/res/layout/fragment_expedition_scan.xml +++ b/app/src/main/res/layout/fragment_expedition_scan.xml @@ -15,8 +15,8 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:orientation="horizontal" - android:paddingLeft="@dimen/layout_margin_min" - android:paddingRight="@dimen/layout_margin_min" + android:paddingStart="@dimen/layout_margin_min" + android:paddingEnd="@dimen/layout_margin_min" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/main_toolbar"> @@ -26,7 +26,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" - android:text="Pallet: " + android:text="@string/palletExpScan" android:textColor="@color/verdnatura_pumpkin_orange" android:textSize="@dimen/h6" /> @@ -37,8 +37,8 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:orientation="horizontal" - android:paddingLeft="@dimen/layout_margin_min" - android:paddingRight="@dimen/layout_margin_min" + android:paddingStart="@dimen/layout_margin_min" + android:paddingEnd="@dimen/layout_margin_min" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/linearLayout"> diff --git a/app/src/main/res/layout/fragment_expedition_summary.xml b/app/src/main/res/layout/fragment_expedition_summary.xml index c2461214..490b1b05 100644 --- a/app/src/main/res/layout/fragment_expedition_summary.xml +++ b/app/src/main/res/layout/fragment_expedition_summary.xml @@ -36,7 +36,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1" - android:text="Consign" + android:text="@string/consign" android:textColor="@color/verdnatura_white" android:textSize="18sp" android:textStyle="bold" /> @@ -124,12 +124,9 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/divider" - tools:ignore="ExtraText"> + tools:ignore="ExtraText" + android:descendantFocusability="blocksDescendants"> - - + @@ -25,7 +25,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:gravity="center" - android:text="ETD" + android:text="@string/etd" android:textColor="@color/verdnatura_white" android:textSize="@dimen/body2" /> diff --git a/app/src/main/res/layout/fragment_expeditionscan_sorter.xml b/app/src/main/res/layout/fragment_expeditionscan_sorter.xml index 8db34f78..c2b26bbb 100644 --- a/app/src/main/res/layout/fragment_expeditionscan_sorter.xml +++ b/app/src/main/res/layout/fragment_expeditionscan_sorter.xml @@ -83,7 +83,7 @@ android:layout_gravity="center" android:layout_marginTop="0dp" android:background="@drawable/btn_orange" - android:text="ESCANEAR CARROS" + android:text="@string/scanWagoons" android:textColor="@color/verdnatura_white" android:visibility="gone" tools:visibility="gone" /> diff --git a/app/src/main/res/layout/fragment_general_black.xml b/app/src/main/res/layout/fragment_general_black.xml index 4115f07f..7b89766d 100644 --- a/app/src/main/res/layout/fragment_general_black.xml +++ b/app/src/main/res/layout/fragment_general_black.xml @@ -1,5 +1,5 @@ - diff --git a/app/src/main/res/layout/fragment_historico.xml b/app/src/main/res/layout/fragment_historico.xml index f29da327..16ff8b56 100644 --- a/app/src/main/res/layout/fragment_historico.xml +++ b/app/src/main/res/layout/fragment_historico.xml @@ -27,7 +27,7 @@ - - + android:paddingStart="@dimen/layout_margin_min" + android:paddingEnd="@dimen/layout_margin_min"> + android:paddingStart="@dimen/layout_margin_min" + android:paddingEnd="@dimen/layout_margin_min"> @@ -39,7 +39,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:gravity="left" + android:gravity="start" android:text="@string/InTimed" android:textColor="@color/verdnatura_white" android:textSize="@dimen/body2" /> diff --git a/app/src/main/res/layout/fragment_info_delivery.xml b/app/src/main/res/layout/fragment_info_delivery.xml index 7dc6f991..67a0dba4 100644 --- a/app/src/main/res/layout/fragment_info_delivery.xml +++ b/app/src/main/res/layout/fragment_info_delivery.xml @@ -21,8 +21,8 @@ android:id="@+id/linearLayout" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/pasilleros_margin_main_menu" - android:layout_marginRight="@dimen/pasilleros_margin_main_menu" + android:layout_marginStart="@dimen/pasilleros_margin_main_menu" + android:layout_marginEnd="@dimen/pasilleros_margin_main_menu" android:orientation="vertical" android:padding="@dimen/navigation_row_limit_padding" app:layout_constraintEnd_toEndOf="parent" @@ -125,8 +125,8 @@ android:id="@+id/linearInfoFreelance" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/pasilleros_margin_main_menu" - android:layout_marginRight="@dimen/pasilleros_margin_main_menu" + android:layout_marginStart="@dimen/pasilleros_margin_main_menu" + android:layout_marginEnd="@dimen/pasilleros_margin_main_menu" android:orientation="vertical" android:padding="@dimen/navigation_row_limit_padding" android:visibility="gone" @@ -221,8 +221,8 @@ diff --git a/app/src/main/res/layout/fragment_inventary.xml b/app/src/main/res/layout/fragment_inventary.xml index 33ca7084..7339e6b2 100644 --- a/app/src/main/res/layout/fragment_inventary.xml +++ b/app/src/main/res/layout/fragment_inventary.xml @@ -49,7 +49,6 @@ android:layout_width="match_parent" android:layout_weight="1" android:backgroundTint="@android:color/white" - android:drawableEnd="@drawable/ic_arrow_drop_down_black_24dp" android:focusable="false" android:hint="@string/buscarcomprador" android:lines="1" @@ -58,7 +57,8 @@ android:textColor="@color/verdnatura_pumpkin_orange" android:textColorHint="#78909C" android:visibility="visible" - tools:ignore="TextContrastCheck" /> + tools:ignore="TextContrastCheck" + app:drawableEndCompat="@drawable/ic_arrow_drop_down_black_24dp" /> @@ -70,8 +70,8 @@ android:layout_marginTop="@dimen/layout_margin_min" android:layout_marginBottom="@dimen/layout_margin_1" android:orientation="horizontal" - android:paddingLeft="@dimen/layout_margin_min" - android:paddingRight="@dimen/layout_margin_min"> + android:paddingStart="@dimen/layout_margin_min" + android:paddingEnd="@dimen/layout_margin_min"> @@ -81,6 +82,7 @@ android:layout_width="@dimen/options_image_width" android:layout_height="match_parent" android:padding="@dimen/options_image_padding" + android:contentDescription="@string/selectAction" android:src="@drawable/ic_mode_edit_black_24dp" android:visibility="gone" /> @@ -89,6 +91,7 @@ android:layout_width="@dimen/options_image_width" android:layout_height="match_parent" android:padding="@dimen/options_image_padding" + android:contentDescription="@string/selectAction" android:src="@drawable/ic_local_parking_black_24dp" android:visibility="gone" /> @@ -97,6 +100,7 @@ android:layout_width="@dimen/options_image_width" android:layout_height="match_parent" android:padding="@dimen/options_image_padding" + android:contentDescription="@string/selectAction" android:src="@drawable/ic_flash_auto_black_24dp" android:visibility="gone" /> diff --git a/app/src/main/res/layout/fragment_item_card.xml b/app/src/main/res/layout/fragment_item_card.xml index 84a1f320..03ec858a 100644 --- a/app/src/main/res/layout/fragment_item_card.xml +++ b/app/src/main/res/layout/fragment_item_card.xml @@ -47,6 +47,7 @@ android:layout_width="match_parent" android:layout_height="@dimen/itemcard_image_height" android:scaleType="centerCrop" + android:contentDescription="@string/selectImage" android:src="@drawable/loadphoto" /> - + @@ -200,7 +198,6 @@ - + android:paddingStart="@dimen/layout_margin_min" + android:paddingEnd="@dimen/layout_margin_min"> @@ -55,8 +55,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:gravity="left" - android:text="Nombre" + android:gravity="start" + android:text="@string/name" android:textColor="@color/verdnatura_white" android:textSize="@dimen/body2" /> @@ -66,7 +66,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:gravity="center" - android:text="Fecha" + android:text="@string/Fecha" android:textColor="@color/verdnatura_white" android:textSize="@dimen/body2" /> @@ -75,7 +75,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:gravity="center" - android:text="Ubicado" + android:text="@string/ubicado" android:textColor="@color/verdnatura_white" android:textSize="@dimen/body2" /> @@ -84,20 +84,12 @@ android:layout_height="wrap_content" android:layout_weight="1" android:gravity="center" - android:text="Stock" + android:text="@string/stock" android:textColor="@color/verdnatura_white" android:textSize="@dimen/body2" /> - - - + + android:paddingStart="@dimen/layout_margin_min" + android:paddingEnd="@dimen/layout_margin_min"> + android:paddingStart="@dimen/layout_margin_min" + android:paddingEnd="@dimen/layout_margin_min"> @@ -53,7 +53,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:gravity="center" - android:text="Nombre" + android:text="@string/name" android:textColor="@color/verdnatura_white" android:textSize="@dimen/body2" /> @@ -61,8 +61,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1.25" - android:gravity="right" - android:text="Parking" + android:gravity="end" + android:text="@string/parking" android:textColor="@color/verdnatura_white" android:textSize="@dimen/body2" android:visibility="gone" /> @@ -72,35 +72,25 @@ android:layout_height="wrap_content" android:layout_weight="2" android:gravity="center" - android:text="Carro" + android:text="@string/wagoon" android:textColor="@color/verdnatura_white" android:textSize="@dimen/body2" /> - - - - diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml index 95401d91..3b03d71c 100644 --- a/app/src/main/res/layout/fragment_login.xml +++ b/app/src/main/res/layout/fragment_login.xml @@ -26,7 +26,7 @@ android:layout_marginTop="16dp" android:text="@string/Bienvenido" android:textColor="@android:color/white" - android:textSize="14dp" + android:textSize="14sp" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -49,8 +49,8 @@ android:layout_margin="8dp" android:backgroundTint="@android:color/white" android:clickable="true" - android:drawableRight="@drawable/ic_chevron_right_black_24dp" - android:hint="Server:" + android:drawableEnd="@drawable/ic_chevron_right_black_24dp" + android:hint="@string/server" android:inputType="text" android:lines="1" android:maxLines="1" @@ -102,7 +102,7 @@ android:layout_margin="8dp" android:backgroundTint="@android:color/white" android:gravity="center_vertical" - android:hint="Password" + android:hint="@string/password" android:inputType="textPassword" android:lines="1" android:maxLines="1" @@ -125,7 +125,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/textinputlayout_password" /> - + android:visibility="visible" + app:drawableEndCompat="@drawable/ic_arrow_drop_down_black_24dp" /> diff --git a/app/src/main/res/layout/fragment_packaging_count.xml b/app/src/main/res/layout/fragment_packaging_count.xml index 26d1a1fe..1957d63b 100644 --- a/app/src/main/res/layout/fragment_packaging_count.xml +++ b/app/src/main/res/layout/fragment_packaging_count.xml @@ -36,7 +36,7 @@ android:layout_width="match_parent" android:layout_weight="1.5" android:backgroundTint="@android:color/white" - android:hint="Nombre o apellido" + android:hint="@string/nameSurname" android:inputType="text" android:lines="1" android:maxLines="1" @@ -51,16 +51,15 @@ android:layout_width="match_parent" android:layout_weight="1" android:backgroundTint="@android:color/white" - android:drawableEnd="@drawable/ic_arrow_drop_down_black_24dp" android:focusable="false" - android:hint="Embalajes" - android:inputType="text" + android:hint="@string/packages" android:lines="1" android:maxLines="1" android:textAlignment="center" android:textColor="@color/verdnatura_pumpkin_orange" android:textColorHint="@android:color/darker_gray" - android:visibility="gone" /> + android:visibility="gone" + app:drawableEndCompat="@drawable/ic_arrow_drop_down_black_24dp"/> @@ -71,14 +70,14 @@ android:layout_marginTop="@dimen/layout_margin_min" android:layout_marginBottom="@dimen/layout_margin_1" android:orientation="horizontal" - android:paddingLeft="@dimen/layout_margin_min" - android:paddingRight="@dimen/layout_margin_min"> + android:paddingStart="@dimen/layout_margin_min" + android:paddingEnd="@dimen/layout_margin_min"> @@ -98,7 +97,7 @@ android:layout_height="wrap_content" android:layout_weight="0.75" android:paddingStart="@dimen/layout_margin_3" - android:text="Total" + android:text="@string/total" android:textAlignment="textStart" android:textColor="@color/verdnatura_white" android:textSize="@dimen/body2" /> diff --git a/app/src/main/res/layout/fragment_packaging_obs.xml b/app/src/main/res/layout/fragment_packaging_obs.xml index 8e134b3f..dcbbd726 100644 --- a/app/src/main/res/layout/fragment_packaging_obs.xml +++ b/app/src/main/res/layout/fragment_packaging_obs.xml @@ -12,9 +12,9 @@ android:id="@+id/textObs" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="Observaciones : " + android:text="@string/observations" android:textColor="#FFF" - android:textSize="18dp" + android:textSize="18sp" app:layout_constraintStart_toEndOf="@+id/main_toolbar" app:layout_constraintTop_toBottomOf="@+id/main_toolbar" /> @@ -23,7 +23,7 @@ android:layout_width="match_parent" android:layout_height="100dp" android:gravity="center" - android:hint="Observaciones" + android:hint="@string/observations" android:inputType="textCapSentences|textMultiLine" android:textColor="@color/verdnatura_white" android:textColorHint="@android:color/tertiary_text_light" @@ -35,9 +35,9 @@ android:id="@+id/textImage" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="Imágenes : " + android:text="@string/images" android:textColor="#FFF" - android:textSize="18dp" + android:textSize="18sp" app:layout_constraintStart_toEndOf="@+id/observations" app:layout_constraintTop_toBottomOf="@+id/observations" /> @@ -48,18 +48,18 @@ android:layout_marginTop="@dimen/layout_margin_min" android:layout_marginBottom="@dimen/layout_margin_1" android:orientation="horizontal" - android:paddingLeft="@dimen/layout_margin_min" - android:paddingRight="@dimen/layout_margin_min" + android:paddingStart="@dimen/layout_margin_min" + android:paddingEnd="@dimen/layout_margin_min" app:layout_constraintStart_toEndOf="@+id/textImage" app:layout_constraintTop_toBottomOf="@+id/textImage"> diff --git a/app/src/main/res/layout/fragment_packaging_summary.xml b/app/src/main/res/layout/fragment_packaging_summary.xml index 19af7249..1a1efc6d 100644 --- a/app/src/main/res/layout/fragment_packaging_summary.xml +++ b/app/src/main/res/layout/fragment_packaging_summary.xml @@ -36,15 +36,15 @@ android:layout_marginTop="@dimen/layout_margin_min" android:layout_marginBottom="@dimen/layout_margin_1" android:orientation="horizontal" - android:paddingLeft="@dimen/layout_margin_min" - android:paddingRight="@dimen/layout_margin_min"> + android:paddingStart="@dimen/layout_margin_min" + android:paddingEnd="@dimen/layout_margin_min"> @@ -54,7 +54,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:gravity="center" - android:text="Total" + android:text="@string/total" android:textColor="@color/verdnatura_white" android:textSize="@dimen/body2" /> @@ -66,17 +66,17 @@ android:layout_marginTop="@dimen/layout_margin_min" android:layout_marginBottom="@dimen/layout_margin_1" android:orientation="horizontal" - android:paddingLeft="@dimen/layout_margin_min" - android:paddingRight="@dimen/layout_margin_min"> + android:paddingStart="@dimen/layout_margin_min" + android:paddingEnd="@dimen/layout_margin_min"> + android:textSize="@dimen/body2" + tools:text="CC ROJO"/> + android:textSize="@dimen/body2" + tools:text="220"/> - + android:background="@drawable/ic_delete_black_24dp" + android:contentDescription="@string/trash"/> - + android:paddingStart="@dimen/layout_margin_min" + android:paddingEnd="@dimen/layout_margin_min"> + android:textSize="@dimen/body2" + tools:text="DC"/> + android:textSize="@dimen/body2" + tools:text="30"/> + android:background="@drawable/ic_delete_black_24dp" + android:contentDescription="@string/trash"/> - + android:paddingStart="@dimen/layout_margin_min" + android:paddingEnd="@dimen/layout_margin_min"> @@ -172,16 +157,16 @@ android:id="@+id/totalImages" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="0" android:textColor="@color/verdnatura_white" android:textSize="@dimen/body2" - android:textStyle="bold" /> + android:textStyle="bold" + tools:text="0"/> @@ -193,16 +178,15 @@ android:layout_marginTop="@dimen/layout_margin_min" android:layout_marginBottom="@dimen/layout_margin_1" android:orientation="horizontal" - android:paddingLeft="@dimen/layout_margin_min" - android:paddingRight="@dimen/layout_margin_min"> + android:paddingStart="@dimen/layout_margin_min" + android:paddingEnd="@dimen/layout_margin_min"> + android:paddingStart="@dimen/layout_margin_min" + android:paddingEnd="@dimen/layout_margin_min"> @@ -238,8 +222,8 @@ android:layout_marginTop="@dimen/layout_margin_min" android:layout_marginBottom="@dimen/layout_margin_1" android:orientation="horizontal" - android:paddingLeft="@dimen/layout_margin_min" - android:paddingRight="@dimen/layout_margin_min"> + android:paddingStart="@dimen/layout_margin_min" + android:paddingEnd="@dimen/layout_margin_min"> diff --git a/app/src/main/res/layout/fragment_pre_sacador.xml b/app/src/main/res/layout/fragment_pre_sacador.xml index ec3cb074..fa284e12 100644 --- a/app/src/main/res/layout/fragment_pre_sacador.xml +++ b/app/src/main/res/layout/fragment_pre_sacador.xml @@ -19,7 +19,7 @@ android:lines="1" android:maxLines="1" android:textColor="@color/verdnatura_white" - + android:autofillHints="text" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/main_toolbar" /> diff --git a/app/src/main/res/layout/fragment_route.xml b/app/src/main/res/layout/fragment_route.xml index 2067b776..d7bad99a 100644 --- a/app/src/main/res/layout/fragment_route.xml +++ b/app/src/main/res/layout/fragment_route.xml @@ -43,21 +43,15 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/txtDescriptions" /> - - - + - @@ -81,9 +81,11 @@ android:layout_weight="1" android:background="@color/verdnatura_white" android:ems="10" + android:autofillHints="phone" android:inputType="number" android:padding="5dp" - android:text="0" + android:text="@string/zero" + android:hint="@string/zero" android:imeOptions="actionDone" android:maxLines="1"/> @@ -97,6 +99,7 @@ android:layout_marginTop="8dp" android:layout_marginEnd="8dp" android:orientation="horizontal" + android:inputType="number" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" @@ -119,10 +122,10 @@ android:layout_weight="1" android:background="@color/verdnatura_white" android:ems="10" - + android:autofillHints="phone" android:inputType="number" android:padding="5dp" - android:text="0" + android:text="@string/zero" android:imeOptions="actionDone" android:maxLines="1"/> @@ -170,9 +173,10 @@ android:layout_weight="1" android:background="@color/verdnatura_white" android:ems="10" - android:padding="5dp" - android:text="00:00" + android:inputType="text" + android:autofillHints="text" + android:text="@string/zeroHour" android:imeOptions="actionDone" android:maxLines="1" android:focusable="false"/> @@ -206,8 +210,10 @@ android:background="@color/verdnatura_white" android:ems="10" android:padding="5dp" - android:text="00:00" + android:text="@string/zeroHour" android:imeOptions="actionDone" + android:inputType="text" + android:autofillHints="text" android:maxLines="1" android:focusable="false"/> diff --git a/app/src/main/res/layout/fragment_shelvinglog.xml b/app/src/main/res/layout/fragment_shelvinglog.xml index eca6b80d..72f90027 100644 --- a/app/src/main/res/layout/fragment_shelvinglog.xml +++ b/app/src/main/res/layout/fragment_shelvinglog.xml @@ -39,20 +39,19 @@ android:layout_marginTop="@dimen/layout_margin_min" android:layout_marginBottom="@dimen/layout_margin_1" android:orientation="horizontal" - android:paddingLeft="@dimen/layout_margin_min" - android:paddingRight="@dimen/layout_margin_min"> + android:paddingStart="@dimen/layout_margin_min" + android:paddingEnd="@dimen/layout_margin_min"> - - - + diff --git a/app/src/main/res/layout/fragment_tickets.xml b/app/src/main/res/layout/fragment_tickets.xml index 8bdc9506..72118a25 100644 --- a/app/src/main/res/layout/fragment_tickets.xml +++ b/app/src/main/res/layout/fragment_tickets.xml @@ -89,7 +89,9 @@ android:inputType="number" android:maxLines="1" android:padding="5dp" - android:text="0" /> + android:autofillHints="phone" + android:hint="@string/zero" + android:text="@string/zero" /> @@ -127,7 +129,8 @@ android:inputType="number" android:maxLines="1" android:padding="5dp" - android:text="0" /> + android:text="@string/zero" + android:autofillHints="phone"/> @@ -190,7 +193,9 @@ android:imeOptions="actionDone" android:maxLines="1" android:padding="5dp" - android:text="00:00" /> + android:inputType="number" + android:text="@string/zeroHour" + android:autofillHints="phone"/> @@ -225,7 +230,9 @@ android:imeOptions="actionDone" android:maxLines="1" android:padding="5dp" - android:text="00:00" /> + android:inputType="number" + android:text="@string/zeroHour" + android:autofillHints="phone"/> - - - + android:orientation="horizontal" + android:baselineAligned="false"> + android:src="@drawable/ic_delete_forever_black_24dp" + android:contentDescription="@string/trash"/> + android:src="@drawable/ic_mode_edit_black_24dp" + android:contentDescription="@string/transfer"/> - + android:src="@drawable/ic_local_parking_black_24dp" + android:contentDescription="@string/parking" + /> + android:src="@drawable/ic_flash_auto_black_24dp" + android:contentDescription="@string/addItem"/> diff --git a/app/src/main/res/layout/fragment_vehiclecontrol_user.xml b/app/src/main/res/layout/fragment_vehiclecontrol_user.xml index 0268868d..9627cf6c 100644 --- a/app/src/main/res/layout/fragment_vehiclecontrol_user.xml +++ b/app/src/main/res/layout/fragment_vehiclecontrol_user.xml @@ -22,11 +22,7 @@ android:layout_height="wrap_content" android:orientation="vertical"> - + @@ -45,7 +41,8 @@ android:layout_height="@dimen/itemcard_image_height" android:layout_margin="10dp" android:scaleType="centerCrop" - android:src="@drawable/loadphoto" /> + android:src="@drawable/loadphoto" + android:contentDescription="@string/workerImage"/> @@ -80,7 +77,6 @@ android:id="@+id/registered_vehiclecontrol" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="v-10" android:textColor="@color/verdnatura_white" android:textSize="@dimen/h7" android:textStyle="bold" /> @@ -104,7 +100,6 @@ android:id="@+id/deviceName" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="v-10" android:textColor="@color/verdnatura_white" android:textSize="@dimen/h7" android:textStyle="bold" /> @@ -113,14 +108,8 @@ - - - - - + + android:paddingStart="@dimen/layout_margin_min" + android:paddingEnd="@dimen/layout_margin_min"> + android:layout_marginStart="@dimen/pasilleros_margin_main_menu"/> + android:src="@drawable/ic_chevron_right_black_24dp" + android:contentDescription="@string/selectImage"/> + android:layout_marginEnd="@dimen/layout_margin_min"/> + android:layout_marginEnd="@dimen/layout_margin_min"/> + android:layout_marginEnd="@dimen/layout_margin_min"/> + android:layout_alignParentEnd="true" + app:srcCompat="@drawable/emoticon_error" + android:contentDescription="@string/error"/> @@ -100,7 +101,7 @@ tool:text="MRW" android:textStyle="bold" android:textSize="@dimen/h8" - android:layout_marginRight="@dimen/layout_margin_min" + android:layout_marginEnd="@dimen/layout_margin_min" android:visibility="gone"/> @@ -197,8 +198,8 @@ tool:text="10" android:textColor="@color/verdnatura_white" android:textSize="@dimen/h6" - android:paddingLeft="10dp" - android:paddingRight="10dp" + android:paddingStart="10dp" + android:paddingEnd="10dp" android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" diff --git a/app/src/main/res/layout/item_article_row_fragment.xml b/app/src/main/res/layout/item_article_row_fragment.xml index 3c3869b6..15ec5091 100644 --- a/app/src/main/res/layout/item_article_row_fragment.xml +++ b/app/src/main/res/layout/item_article_row_fragment.xml @@ -37,7 +37,6 @@ android:id="@+id/rvHeadlines" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_below="@id/content_layout" android:layout_marginTop="6dp" android:visibility="visible" /> @@ -61,7 +60,7 @@ @@ -70,7 +69,7 @@ android:id="@+id/level" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="@dimen/layout_margin_min" + android:layout_marginEnd="@dimen/layout_margin_min" android:text="@{sale.level}" android:textColor="@color/verdnatura_black" android:textSize="@dimen/h8" @@ -80,7 +79,7 @@ @@ -106,22 +105,24 @@ android:layout_width="48dp" android:layout_height="48dp" android:rotation="180" - android:layout_alignParentRight="true" - android:layout_marginRight="20dp" - android:src="@drawable/ic_arrow_down" /> + android:layout_alignParentEnd="true" + android:layout_marginEnd="20dp" + android:src="@drawable/ic_arrow_down" + android:contentDescription="@string/selectAction"/> + android:layout_alignParentEnd="true" + app:srcCompat="@drawable/emoticon_error_fragment" + android:contentDescription="@string/error"/> @@ -130,7 +131,7 @@ android:layout_width="@dimen/semaforo_next_to_ticket" android:layout_height="@dimen/semaforo_next_to_ticket" android:layout_centerVertical="true" - android:layout_marginLeft="20dp" + android:layout_marginStart="20dp" android:background="@drawable/background_and_round_collection_fragment" /> @@ -155,7 +156,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="@dimen/layout_margin_min" + android:layout_marginEnd="@dimen/layout_margin_min" android:text="@{sale.agencyName}" android:textSize="@dimen/h8" android:textStyle="bold" @@ -236,8 +237,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="22dp" - android:paddingLeft="10dp" - android:paddingRight="10dp" + android:paddingStart="10dp" + android:paddingEnd="10dp" android:visibility="gone" android:text="@{Integer.toString(sale.quantity)}" @@ -254,7 +255,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="22dp" - android:paddingLeft="10dp" + android:paddingStart="10dp" android:text="@{sale.cel2}" android:textColor="@color/verdnatura_white" android:textSize="@dimen/body1" @@ -353,7 +354,7 @@ android:layout_height="wrap_content" android:paddingTop="@dimen/layout_margin_minest" android:paddingBottom="@dimen/default_layout_margin" - android:paddingLeft="@dimen/layout_collection_quantity" + android:paddingStart="@dimen/layout_collection_quantity" android:text="@{Integer.toString(sale.quantity)}" android:textColor="@color/verdnatura_white" android:textSize="@dimen/body3" @@ -430,7 +431,7 @@ + android:background="@color/verdnatura_white" /> + android:layout_marginEnd="@dimen/layout_margin_min"/> + android:layout_marginEnd="@dimen/layout_margin_min"/> + android:layout_marginEnd="@dimen/layout_margin_min"/> + android:layout_marginEnd="@dimen/layout_margin_min"/> + android:layout_marginEnd="@dimen/layout_margin_min"/> + android:layout_marginEnd="@dimen/layout_margin_min"/> @@ -101,7 +101,7 @@ tool:text="MRW" android:textStyle="bold" android:textSize="@dimen/h8" - android:layout_marginRight="@dimen/layout_margin_min"/> + android:layout_marginEnd="@dimen/layout_margin_min"/> @@ -195,8 +195,8 @@ tool:text="10" android:textColor="@color/verdnatura_white" android:textSize="@dimen/h6" - android:paddingLeft="10dp" - android:paddingRight="10dp" + android:paddingStart="10dp" + android:paddingEnd="10dp" android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/item_article_row_reubication_fragment.xml b/app/src/main/res/layout/item_article_row_reubication_fragment.xml index 73ebc9e8..7e0b51d6 100644 --- a/app/src/main/res/layout/item_article_row_reubication_fragment.xml +++ b/app/src/main/res/layout/item_article_row_reubication_fragment.xml @@ -24,68 +24,43 @@ > + + - - > - - + android:textSize="@dimen/h8" /> - + - - - - - - - - - - - + @@ -119,8 +94,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="@dimen/layout_margin_min" - android:paddingLeft="10dp" - android:paddingRight="10dp" + android:paddingStart="10dp" + android:paddingEnd="10dp" android:text="@{String.valueOf(reubication.quantity)}" android:textColor="@color/verdnatura_white" android:textSize="@dimen/body1" @@ -173,7 +148,7 @@ + android:background="@color/verdnatura_white" /> + android:src="@drawable/ic_delete_black_24dp" + android:contentDescription="@string/trash"/> + android:layout_marginStart="@dimen/pasilleros_margin_main_menu"/> + android:src="@drawable/ic_chevron_right_black_24dp" + android:contentDescription="@string/selectAction"/> + android:layout_marginStart="@dimen/pasilleros_margin_main_menu"/> + android:layout_marginStart="@dimen/packaging_margin_main_menu"/> + android:src="@drawable/ic_chevron_right_black_24dp" + android:contentDescription="@string/selectAction"/> + android:layout_marginStart="@dimen/pasilleros_margin_main_menu"/> + android:layout_marginStart="@dimen/packaging_margin_main_menu"/> + android:src="@drawable/ic_chevron_right_black_24dp" + android:contentDescription="@string/selectAction"/> + + - + + tool:text="45532" /> - - + android:contentDescription="@string/trash" + android:src="@drawable/ic_delete_black_24dp" /> + + android:background="@color/verdnatura_black_9" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_expedition_loadunload_row.xml b/app/src/main/res/layout/item_expedition_loadunload_row.xml index 5145120b..80e787af 100644 --- a/app/src/main/res/layout/item_expedition_loadunload_row.xml +++ b/app/src/main/res/layout/item_expedition_loadunload_row.xml @@ -36,7 +36,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_weight="1" - android:gravity="left" + android:gravity="start" android:text="@{Integer.toString(item.id)}" android:textColor="@color/verdnatura_white" android:textSize="@dimen/delivery_body_2" /> @@ -45,7 +45,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_weight="1.5" - android:gravity="left" + android:gravity="start" android:singleLine="true" android:text="@{item.itemPackingTypeConcat}" android:textColor="@color/verdnatura_white" @@ -55,7 +55,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_weight="1" - android:gravity="right" + android:gravity="end" android:singleLine="true" android:text="@{Integer.toString(item.addressFk)}" android:textColor="@color/verdnatura_white" @@ -73,10 +73,10 @@ - - - - + + + + + android:paddingBottom="2dp"> - - + - + - - - - - + - + - + + + + + + + diff --git a/app/src/main/res/layout/item_expedition_view_row.xml b/app/src/main/res/layout/item_expedition_view_row.xml index 880eb2a9..bf70a47a 100644 --- a/app/src/main/res/layout/item_expedition_view_row.xml +++ b/app/src/main/res/layout/item_expedition_view_row.xml @@ -17,8 +17,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@color/verdnatura_black_5" - android:paddingLeft="@dimen/layout_margin_min" - android:paddingRight="@dimen/layout_margin_min" + android:paddingStart="@dimen/layout_margin_min" + android:paddingEnd="@dimen/layout_margin_min" android:paddingTop="@dimen/pasilleros_margin_main_menu" android:paddingBottom="@dimen/pasilleros_margin_main_menu"> diff --git a/app/src/main/res/layout/item_expeditionlog_row.xml b/app/src/main/res/layout/item_expeditionlog_row.xml index 0723e58f..5b7184e3 100644 --- a/app/src/main/res/layout/item_expeditionlog_row.xml +++ b/app/src/main/res/layout/item_expeditionlog_row.xml @@ -31,7 +31,7 @@ android:textSize="@dimen/body2" android:textColor="@color/verdnatura_white" android:layout_weight="1" - android:gravity="left" + android:gravity="start" /> + android:gravity="start"/> + android:gravity="end"/> diff --git a/app/src/main/res/layout/item_expeditionpallet_row.xml b/app/src/main/res/layout/item_expeditionpallet_row.xml index f4f70d1d..aca8ae5f 100644 --- a/app/src/main/res/layout/item_expeditionpallet_row.xml +++ b/app/src/main/res/layout/item_expeditionpallet_row.xml @@ -18,8 +18,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@color/verdnatura_black_5" - android:paddingLeft="@dimen/layout_margin_min" - android:paddingRight="@dimen/layout_margin_min" + android:paddingStart="@dimen/layout_margin_min" + android:paddingEnd="@dimen/layout_margin_min" android:paddingTop="@dimen/pasilleros_margin_main_menu" android:paddingBottom="@dimen/pasilleros_margin_main_menu"> diff --git a/app/src/main/res/layout/item_expeditionscan_row.xml b/app/src/main/res/layout/item_expeditionscan_row.xml index a3541ea2..8d2e374e 100644 --- a/app/src/main/res/layout/item_expeditionscan_row.xml +++ b/app/src/main/res/layout/item_expeditionscan_row.xml @@ -18,8 +18,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@color/verdnatura_black_5" - android:paddingLeft="@dimen/layout_margin_min" - android:paddingRight="@dimen/layout_margin_min" + android:paddingStart="@dimen/layout_margin_min" + android:paddingEnd="@dimen/layout_margin_min" android:paddingTop="@dimen/pasilleros_margin_main_menu" android:paddingBottom="@dimen/pasilleros_margin_main_menu"> diff --git a/app/src/main/res/layout/item_expeditionstate_row.xml b/app/src/main/res/layout/item_expeditionstate_row.xml index c742d865..4f677735 100644 --- a/app/src/main/res/layout/item_expeditionstate_row.xml +++ b/app/src/main/res/layout/item_expeditionstate_row.xml @@ -30,7 +30,7 @@ android:textColor="@color/verdnatura_white" android:textSize="@dimen/h8" android:gravity="center_vertical" - android:layout_marginLeft="@dimen/pasilleros_margin_main_menu" + android:layout_marginStart="@dimen/pasilleros_margin_main_menu" android:textStyle="bold"/> + android:layout_marginStart="@dimen/pasilleros_margin_main_menu"/> diff --git a/app/src/main/res/layout/item_expeditiontruck_row.xml b/app/src/main/res/layout/item_expeditiontruck_row.xml index 052c01bf..9c991e77 100644 --- a/app/src/main/res/layout/item_expeditiontruck_row.xml +++ b/app/src/main/res/layout/item_expeditiontruck_row.xml @@ -18,8 +18,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@color/verdnatura_black_5" - android:paddingLeft="@dimen/layout_margin_min" - android:paddingRight="@dimen/layout_margin_min" + android:paddingStart="@dimen/layout_margin_min" + android:paddingEnd="@dimen/layout_margin_min" android:paddingTop="@dimen/pasilleros_margin_main_menu" android:paddingBottom="@dimen/pasilleros_margin_main_menu"> diff --git a/app/src/main/res/layout/item_general_row.xml b/app/src/main/res/layout/item_general_row.xml index bfa3ac02..5398dc59 100644 --- a/app/src/main/res/layout/item_general_row.xml +++ b/app/src/main/res/layout/item_general_row.xml @@ -30,7 +30,7 @@ android:textSize="@dimen/h7" android:gravity="center_vertical" android:visibility="visible" - android:layout_marginLeft="@dimen/pasilleros_margin_main_menu" + android:layout_marginStart="@dimen/pasilleros_margin_main_menu" android:textStyle="bold"/> + android:src="@drawable/ic_delete_black_24dp" + android:contentDescription="@string/trash"/> @@ -27,7 +26,8 @@ android:layout_width="48dp" android:layout_height="48dp" android:layout_weight="1" - tools:srcCompat="@tools:sample/avatars" /> + tools:srcCompat="@tools:sample/avatars" + android:contentDescription="@string/images"/> + android:src="@drawable/ic_delete_black_24dp" + android:contentDescription="@string/trash"/> diff --git a/app/src/main/res/layout/item_historico_row.xml b/app/src/main/res/layout/item_historico_row.xml index ffe22bee..d5c16d5c 100644 --- a/app/src/main/res/layout/item_historico_row.xml +++ b/app/src/main/res/layout/item_historico_row.xml @@ -19,17 +19,17 @@ android:layout_height="wrap_content" android:background="@color/verdnatura_black_5" android:orientation="horizontal" - android:paddingLeft="@dimen/layout_margin_min" + android:paddingStart="@dimen/layout_margin_min" android:paddingTop="@dimen/pasilleros_margin_main_menu" - android:paddingRight="@dimen/layout_margin_min" + android:paddingEnd="@dimen/layout_margin_min" android:paddingBottom="@dimen/pasilleros_margin_main_menu"> @@ -38,7 +38,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_weight="1" - android:gravity="left" + android:gravity="start" android:text="@{item.name}" android:textColor="@color/verdnatura_white" android:textSize="@dimen/body2" /> diff --git a/app/src/main/res/layout/item_historicovehiculo_row.xml b/app/src/main/res/layout/item_historicovehiculo_row.xml index 947ce7cd..3b9b849b 100644 --- a/app/src/main/res/layout/item_historicovehiculo_row.xml +++ b/app/src/main/res/layout/item_historicovehiculo_row.xml @@ -18,8 +18,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@color/verdnatura_black_5" - android:paddingLeft="@dimen/layout_margin_min" - android:paddingRight="@dimen/layout_margin_min" + android:paddingStart="@dimen/layout_margin_min" + android:paddingEnd="@dimen/layout_margin_min" android:paddingTop="@dimen/pasilleros_margin_main_menu" android:paddingBottom="@dimen/pasilleros_margin_main_menu"> @@ -32,7 +32,7 @@ android:textSize="@dimen/body2" android:textColor="@color/verdnatura_white" android:gravity="center" - android:layout_marginRight="@dimen/layout_margin_min"/> + android:layout_marginEnd="@dimen/layout_margin_min"/> @@ -27,7 +26,8 @@ android:layout_width="48dp" android:layout_height="48dp" android:layout_weight="1" - tools:srcCompat="@tools:sample/avatars" /> + tools:srcCompat="@tools:sample/avatars" + android:contentDescription="@string/images"/> + android:src="@drawable/ic_history_black_24dp" + android:contentDescription="@string/update"/> + android:src="@drawable/ic_delete_black_24dp" + android:contentDescription="@string/trash"/> diff --git a/app/src/main/res/layout/item_inventary_row.xml b/app/src/main/res/layout/item_inventary_row.xml index 16152184..51e04e6e 100644 --- a/app/src/main/res/layout/item_inventary_row.xml +++ b/app/src/main/res/layout/item_inventary_row.xml @@ -18,17 +18,17 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@color/verdnatura_black_5" - android:paddingLeft="@dimen/pasilleros_margin_main_menu" - android:paddingRight="@dimen/pasilleros_margin_main_menu" + android:paddingStart="@dimen/pasilleros_margin_main_menu" + android:paddingEnd="@dimen/pasilleros_margin_main_menu" android:paddingTop="@dimen/pasilleros_margin_main_menu"> + android:paddingStart="@dimen/pasilleros_margin_main_menu" + android:paddingEnd="@dimen/pasilleros_margin_main_menu"> @@ -62,19 +62,19 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@color/verdnatura_black_5" - android:paddingLeft="@dimen/pasilleros_margin_main_menu" - android:paddingRight="@dimen/pasilleros_margin_main_menu"> + android:paddingStart="@dimen/pasilleros_margin_main_menu" + android:paddingEnd="@dimen/pasilleros_margin_main_menu"> + android:paddingStart="@dimen/pasilleros_margin_main_menu" + android:paddingEnd="@dimen/pasilleros_margin_main_menu"> @@ -103,21 +103,21 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@color/verdnatura_black_5" - android:paddingLeft="@dimen/pasilleros_margin_main_menu" - android:paddingRight="@dimen/pasilleros_margin_main_menu" + android:paddingStart="@dimen/pasilleros_margin_main_menu" + android:paddingEnd="@dimen/pasilleros_margin_main_menu" android:paddingBottom="@dimen/pasilleros_margin_main_menu"> @@ -128,8 +128,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@color/verdnatura_black_5" - android:paddingLeft="@dimen/pasilleros_margin_main_menu" - android:paddingRight="@dimen/pasilleros_margin_main_menu" + android:paddingStart="@dimen/pasilleros_margin_main_menu" + android:paddingEnd="@dimen/pasilleros_margin_main_menu" android:paddingBottom="@dimen/pasilleros_margin_main_menu"> diff --git a/app/src/main/res/layout/item_inventory_parking_row.xml b/app/src/main/res/layout/item_inventory_parking_row.xml index 5567adab..6be1eb99 100644 --- a/app/src/main/res/layout/item_inventory_parking_row.xml +++ b/app/src/main/res/layout/item_inventory_parking_row.xml @@ -3,7 +3,6 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> - @@ -13,10 +12,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> - + + android:paddingEnd="@dimen/inventory_item" + android:paddingBottom="@dimen/inventory_item" + android:baselineAligned="false"> @@ -40,13 +37,14 @@ + android:layout_height="match_parent" + android:contentDescription="@string/item"/> + android:visibility="gone" + android:contentDescription="@string/options"/> + + - - - diff --git a/app/src/main/res/layout/item_itemsupplier_row.xml b/app/src/main/res/layout/item_itemsupplier_row.xml index 226c6f69..4d428059 100644 --- a/app/src/main/res/layout/item_itemsupplier_row.xml +++ b/app/src/main/res/layout/item_itemsupplier_row.xml @@ -31,7 +31,7 @@ android:gravity="center_vertical" android:visibility="gone" android:layout_gravity="center" - android:layout_marginLeft="@dimen/pasilleros_margin_main_menu" + android:layout_marginStart="@dimen/pasilleros_margin_main_menu" tools:text="1" /> + android:src="@drawable/ic_history_black_24dp" + android:contentDescription="@string/selectAction"/> + android:src="@drawable/ic_delete_black_24dp" + android:contentDescription="@string/trash"/> + android:layout_marginStart="@dimen/pasilleros_margin_main_menu"/> diff --git a/app/src/main/res/layout/item_main_menu.xml b/app/src/main/res/layout/item_main_menu.xml index d8c4cfcb..569310e3 100644 --- a/app/src/main/res/layout/item_main_menu.xml +++ b/app/src/main/res/layout/item_main_menu.xml @@ -3,7 +3,6 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> - @@ -14,20 +13,12 @@ - - + android:layout_marginStart="@dimen/pasilleros_margin_main_menu" + android:layout_marginEnd="@dimen/pasilleros_margin_main_menu" + android:background="@drawable/background_round_square" + android:foreground="@drawable/custom_ripple"> + android:layout_gravity="center" + android:contentDescription="@string/selectAction" + android:layout_marginStart="@dimen/pasilleros_margin_main_menu"/> - /> - - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/item_pasilleros_main_menu.xml b/app/src/main/res/layout/item_pasilleros_main_menu.xml index d1ea0b6d..247fcfe6 100644 --- a/app/src/main/res/layout/item_pasilleros_main_menu.xml +++ b/app/src/main/res/layout/item_pasilleros_main_menu.xml @@ -30,7 +30,8 @@ android:id="@+id/item_image" android:layout_width="30dp" android:layout_height="30dp" - android:scaleType="centerCrop"/> + android:scaleType="centerCrop" + android:contentDescription="@string/selectAction"/> + android:layout_marginStart="@dimen/pasilleros_margin_main_menu"/> + android:layout_marginEnd="@dimen/layout_margin_min" /> + + + android:orientation="horizontal" + android:paddingStart="@dimen/pasilleros_margin_main_menu" + android:paddingTop="@dimen/pasilleros_margin_main_menu" + android:paddingEnd="@dimen/pasilleros_margin_main_menu"> - - - - - - - - - - - - - - + tool:text="31100" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:background="@color/verdnatura_black_9" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_route_row.xml b/app/src/main/res/layout/item_route_row.xml index f1c6c45a..7447e50d 100644 --- a/app/src/main/res/layout/item_route_row.xml +++ b/app/src/main/res/layout/item_route_row.xml @@ -1,7 +1,6 @@ + xmlns:android="http://schemas.android.com/apk/res/android"> @@ -62,8 +61,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:paddingTop="1dp" - android:paddingLeft="5dp" - android:paddingRight="5dp" + android:paddingStart="5dp" + android:paddingEnd="5dp" android:layout_marginBottom="5dp" > @@ -143,13 +142,13 @@ android:id="@+id/textPalletNumber" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="5dp" + android:layout_marginEnd="5dp" android:text="@string/namePallet" android:textColor="@color/verdnatura_brown_grey" /> - - + app:srcCompat="@drawable/camion" + android:contentDescription="@string/loadRoute"/> - - + + - - diff --git a/app/src/main/res/layout/item_shelvingdayofsale_row.xml b/app/src/main/res/layout/item_shelvingdayofsale_row.xml index 2c527b14..a704f432 100644 --- a/app/src/main/res/layout/item_shelvingdayofsale_row.xml +++ b/app/src/main/res/layout/item_shelvingdayofsale_row.xml @@ -19,8 +19,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@color/verdnatura_black_5" - android:paddingLeft="@dimen/layout_margin_min" - android:paddingRight="@dimen/layout_margin_min" + android:paddingStart="@dimen/layout_margin_min" + android:paddingEnd="@dimen/layout_margin_min" android:paddingTop="@dimen/pasilleros_margin_main_menu" android:paddingBottom="@dimen/pasilleros_margin_main_menu"> @@ -33,7 +33,7 @@ android:textSize="@dimen/body2" android:textColor="@color/verdnatura_white" android:gravity="center" - android:layout_marginRight="@dimen/layout_margin_min"/> + android:layout_marginEnd="@dimen/layout_margin_min"/> + android:gravity="end"/> @@ -75,8 +75,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@color/verdnatura_black_5" - android:paddingLeft="@dimen/layout_margin_min" - android:paddingRight="@dimen/layout_margin_min" + android:paddingStart="@dimen/layout_margin_min" + android:paddingEnd="@dimen/layout_margin_min" android:paddingTop="@dimen/pasilleros_margin_main_menu" > @@ -88,7 +88,7 @@ android:textSize="@dimen/body2" android:textColor="@color/verdnatura_white" android:layout_weight="1" - android:gravity="left" + android:gravity="start" /> + android:paddingEnd="@dimen/layout_margin_min" + android:gravity="end"/> @@ -116,7 +116,8 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:src="@android:drawable/divider_horizontal_bright" - android:background="@color/verdnatura_pumpkin_orange"/> + android:background="@color/verdnatura_pumpkin_orange" + android:contentDescription="@string/divider"/> + android:src="@drawable/ic_delete_black_24dp" + android:contentDescription="@string/trash"/> + android:orientation="vertical" + android:background="@color/verdnatura_black_1"> + app:srcCompat="@drawable/ic_note_add" + android:contentDescription="@string/notes"/> + app:srcCompat="@drawable/ic_phone" + android:contentDescription="@string/phone"/> + app:srcCompat="@drawable/ic_location" + android:contentDescription="@string/map"/> + app:srcCompat="@drawable/camion_descarga" + android:contentDescription="@string/loadRoute"/> - - + android:textSize="18sp" + tools:text="2041368"/> + android:layout_marginStart="5dp" + tools:text="H o V"/> - - - @@ -103,19 +95,18 @@ android:id="@+id/textView33" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginRight="0dp" + android:layout_marginEnd="0dp" android:layout_weight="0" - - android:text="Silla FV" android:textColor="@color/verdnatura_white" android:visibility="gone" - tools:visibility="gone" /> + tools:visibility="gone" + tools:text="Silla FV"/> + xmlns:tools="http://schemas.android.com/tools"> @@ -20,10 +20,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@color/verdnatura_black_5" - android:paddingLeft="@dimen/pasilleros_margin_main_menu" - android:paddingRight="@dimen/pasilleros_margin_main_menu" + android:paddingStart="@dimen/pasilleros_margin_main_menu" + android:paddingEnd="@dimen/pasilleros_margin_main_menu" android:paddingTop="@dimen/pasilleros_margin_main_menu" - android:paddingBottom="@dimen/pasilleros_margin_main_menu"> + android:paddingBottom="@dimen/pasilleros_margin_main_menu" + android:baselineAligned="false"> + android:layout_marginEnd="@dimen/layout_margin_min"> + android:layout_marginEnd="@dimen/layout_margin_1"> + android:contentDescription="@string/item"/> + android:textStyle="bold" + tools:text="6 x 15"/> + android:src="@drawable/ic_more_vert_black_24dp" + android:contentDescription="@string/options"/> diff --git a/app/src/main/res/layout/item_ubication_row_new.xml b/app/src/main/res/layout/item_ubication_row_new.xml index a6fb054f..39867fd5 100644 --- a/app/src/main/res/layout/item_ubication_row_new.xml +++ b/app/src/main/res/layout/item_ubication_row_new.xml @@ -1,7 +1,7 @@ + xmlns:tools="http://schemas.android.com/tools"> @@ -20,10 +20,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@color/verdnatura_black_5" - android:paddingLeft="@dimen/pasilleros_margin_main_menu" - android:paddingRight="@dimen/pasilleros_margin_main_menu" + android:paddingStart="@dimen/pasilleros_margin_main_menu" + android:paddingEnd="@dimen/pasilleros_margin_main_menu" android:paddingTop="@dimen/pasilleros_margin_main_menu" - android:paddingBottom="@dimen/pasilleros_margin_main_menu"> + android:paddingBottom="@dimen/pasilleros_margin_main_menu" + android:baselineAligned="false"> + android:layout_marginEnd="@dimen/layout_margin_min"> + android:layout_marginEnd="@dimen/layout_margin_1"> + android:textStyle="bold" + tools:text="6 x 15"/> + android:src="@drawable/ic_more_vert_black_24dp" + android:contentDescription="@string/options"/> diff --git a/app/src/main/res/layout/item_work_forms_row.xml b/app/src/main/res/layout/item_work_forms_row.xml index f74cc9b0..7c6b7055 100644 --- a/app/src/main/res/layout/item_work_forms_row.xml +++ b/app/src/main/res/layout/item_work_forms_row.xml @@ -30,7 +30,7 @@ android:textSize="@dimen/h7" android:gravity="center_vertical" android:visibility="visible" - android:layout_marginLeft="@dimen/pasilleros_margin_main_menu" + android:layout_marginStart="@dimen/pasilleros_margin_main_menu" android:textStyle="bold"/> + android:src="@drawable/ic_delete_black_24dp" + android:contentDescription="@string/trash"/> - - diff --git a/app/src/main/res/layout/layout.xml b/app/src/main/res/layout/layout.xml deleted file mode 100644 index 3a69d524..00000000 --- a/app/src/main/res/layout/layout.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/sale_row_fragment_old.xml b/app/src/main/res/layout/sale_row_fragment_old.xml deleted file mode 100644 index a569e01b..00000000 --- a/app/src/main/res/layout/sale_row_fragment_old.xml +++ /dev/null @@ -1,686 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/shelvinglog_row.xml b/app/src/main/res/layout/shelvinglog_row.xml index 90362047..a1e8af62 100644 --- a/app/src/main/res/layout/shelvinglog_row.xml +++ b/app/src/main/res/layout/shelvinglog_row.xml @@ -1,6 +1,5 @@ - + @@ -9,74 +8,66 @@ type="es.verdnatura.presentation.view.feature.historicoshelvinglog.model.ShelvingLog" /> + + - + android:background="@color/verdnatura_black_5" + android:orientation="horizontal" + android:paddingStart="@dimen/layout_margin_min" + android:paddingTop="@dimen/layout_margin_min" + android:paddingEnd="@dimen/layout_margin_min" + android:paddingBottom="@dimen/layout_margin_min"> - android:gravity="left" - /> - - + android:gravity="center" + android:text="@{item.creationDate}" + android:textColor="@color/verdnatura_white" + android:textSize="@dimen/body2" /> + android:paddingEnd="@dimen/layout_margin_min"> - - - + android:gravity="start" + android:text="@{item.description}" + android:textColor="@color/verdnatura_white" + android:textSize="@dimen/body2" /> @@ -84,13 +75,14 @@ android:id="@+id/imageViewSeparator" android:layout_width="fill_parent" android:layout_height="wrap_content" + android:background="@color/verdnatura_pumpkin_orange" android:src="@android:drawable/divider_horizontal_bright" - android:background="@color/verdnatura_pumpkin_orange"/> + android:contentDescription="@string/divider"/> + android:background="@color/verdnatura_black_9" /> \ No newline at end of file diff --git a/app/src/main/res/layout/toolbar.xml b/app/src/main/res/layout/toolbar.xml index ecd028e2..dc9552f3 100644 --- a/app/src/main/res/layout/toolbar.xml +++ b/app/src/main/res/layout/toolbar.xml @@ -20,7 +20,8 @@ android:layout_height="match_parent" android:scaleType="center" android:visibility="invisible" - android:src="@drawable/ic_arrow_back_black_24dp" /> + android:src="@drawable/ic_arrow_back_black_24dp" + android:contentDescription="@string/back"/> + app:srcCompat="@drawable/ic_vn_logo_negativo_app_warehouse" + android:contentDescription="@string/title"/> @@ -49,21 +51,17 @@ + android:layout_marginStart="@dimen/default_layout_margin" + android:padding="@dimen/layout_margin_min"> @@ -72,8 +70,8 @@ android:id="@+id/toolbar_subtitle" android:layout_width="wrap_content" android:layout_height="match_parent" - android:layout_gravity="right" - android:layout_marginLeft="@dimen/layout_margin_min" + android:layout_gravity="end" + android:layout_marginStart="@dimen/layout_margin_min" android:gravity="center_vertical" android:maxLines="1" android:text="" @@ -91,15 +89,14 @@ android:id="@+id/toolbar_icons" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/layout_margin_min" + android:layout_marginStart="@dimen/layout_margin_min" tool:listitem="@layout/item_toolbar_row" tool:visibility="visible" /> - diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 13330e7a..9b169f7c 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -629,9 +629,9 @@ Teléfono Kilómetros Horas - Km de inicio + km de inicio Comercial - Km de fin + km de fin Hora de inicio Hora de fin Selecciona la hora @@ -691,7 +691,7 @@ Para guardar pulsa el icono del tick de la parte superior. ¿Quieres guardarlos? SI NO - Añadir... + Añadir… Apellidos Confirmada reserva Está siendo revisado por %1$s @@ -702,6 +702,41 @@ Los campos item y packing son obligatorios Menú de inicio Todo + Permite marcar las líneas de previa escaneando ticket + Eti + Pallet: + Consign + ETD + ESCANEAR CARROS + Servidor: + Prioridad: + Stock + Password + Nombre o apellido + Descripción + Imágenes : + Añadir nueva… + Imagen a subir + Imagen del artículo + 0 + 00:00 + Nombre del usuario + Imagen trabajador + Atrás + Separador + Actualizar + Code + Notas + Mapa + cabecera + m3 + Opciones + %1$d:%2$d + Nivel: + -T: + Firma: + Observaciones: + Imágenes adjuntas: diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 1f768605..cb47f34d 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -690,7 +690,7 @@ Pour sauvegarder, appuyez sur l\'icône de coche en haut. Voulez-vous les sauvegarder ? OUI NON - Añadir... + Añadir… Nom de famille Confirmada reserva Está siendo revisado por %1$s @@ -701,6 +701,41 @@ Los campos item y packing son obligatorios Menu de démarrage Tout + Permite marcar las líneas de previa escaneando ticket + Eti + Pallet: + Consign + ETD + ESCANEAR CARROS + Server: + Prioridad: + Stock + Password + Nombre o apellido + Descripción + Imágenes : + Añadir nueva… + Imagen a subir + Imagen del artículo + 0 + 00:00 + Nombre del usuario + Imagen trabajador + Atrás + Separador + Actualizar + Code + Notas + Mapa + cabecera + m3 + Opciones + %1$d:%2$d + Nivel: + -T: + Firma: + Observaciones: + Imágenes adjuntas: diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index fadca186..810b4e6c 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -690,7 +690,7 @@ Para salvar, toque no ícone de marca de seleção na parte superior. Você quer salvá-los? SIM NÃO - Añadir... + Añadir… Sobrenome Confirmada reserva Está siendo revisado por %1$s @@ -701,6 +701,40 @@ Los campos item y packing son obligatorios Menu padrão Tudo - + Permite marcar las líneas de previa escaneando ticket + Eti + Pallet: + Consign + ETD + ESCANEAR CARROS + Server: + Prioridad: + Stock + Password + Nombre o apellido + Descripción + Imágenes : + Añadir nueva… + Imagen a subir + Imagen del artículo + 0 + 00:00 + Nombre del usuario + Imagen trabajador + Atrás + Separador + Actualizar + Code + Notas + Mapa + cabecera + m3 + Opciones + %1$d:%2$d + Nivel: + -T: + Firma: + Observaciones: + Imágenes adjuntas: diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 24a9443a..54ff857d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -143,7 +143,7 @@ Until Android_id Serial Number - You are going to change the Serial Number. Be carefull + You are going to change the Serial Number. Be careful Copied Tags type Device name : @@ -660,7 +660,7 @@ Location Permission Required To use this application, you must grant location permissions. Manually Enable Location Permission. - Item fiels is required + Item fields is required Sacador Test The route has no tickets to send Send the roadmap to the driver @@ -690,7 +690,7 @@ To save, tap the checkmark icon at the top. Do you want to save them? YES NO - Añadir... + Añadir… Surname Confirmada reserva Ticket on checking by %1$s @@ -701,5 +701,40 @@ Los campos item y packing son obligatorios Default menu All + Permite marcar las líneas de previa escaneando ticket + Eti + Pallet: + Consign + ETD + ESCANEAR CARROS + Server: + Prioridad: + Stock + Password + Nombre o apellido + Descripción + Imágenes : + Añadir nueva… + Imagen a subir + Imagen del artículo + 0 + 00:00 + Nombre del usuario + Imagen trabajador + Atrás + Separador + Actualizar + Code + Notas + Mapa + cabecera + m3 + Opciones + %1$d:%2$d + Nivel: + -T: + Firma: + Observaciones: + Imágenes adjuntas: diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 1da52ee7..4e0f45f9 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -124,8 +124,8 @@