diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/showticket/ShowTicketFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/showticket/ShowTicketFragment.kt index 19c8894b..be4c33b2 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/showticket/ShowTicketFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/showticket/ShowTicketFragment.kt @@ -5,7 +5,7 @@ import android.os.Bundle import android.view.View import android.view.inputmethod.EditorInfo import es.verdnatura.R -import es.verdnatura.databinding.FragmentControladorBinding +import es.verdnatura.databinding.FragmentGeneralBlackBinding import es.verdnatura.domain.ConstAndValues import es.verdnatura.presentation.base.BaseFragment import es.verdnatura.presentation.common.OnCollectionSelectedListener @@ -14,13 +14,13 @@ import es.verdnatura.presentation.view.feature.sacador.model.CollectionVO @Suppress("UNUSED_ANONYMOUS_PARAMETER") class ShowTicketFragment(var menuOrigin: String) : - BaseFragment( + BaseFragment( ShowTicketViewModel::class ) { private var goBack: Boolean = false private var onCollectionSelectedListener: OnCollectionSelectedListener? = null - override fun getLayoutId(): Int = R.layout.fragment_controlador + override fun getLayoutId(): Int = R.layout.fragment_general_black private var type = "" @@ -35,7 +35,7 @@ class ShowTicketFragment(var menuOrigin: String) : override fun init() { - // binding.splashProgress.visibility = View.GONE + binding.scanInput.visibility = View.VISIBLE binding.mainToolbar.toolbarTitle.text = getString(R.string.verticket) binding.splashProgress.visibility = View.GONE diff --git a/app/src/main/res/layout/fragment_general_black.xml b/app/src/main/res/layout/fragment_general_black.xml index 4bef1a2b..17981fe4 100644 --- a/app/src/main/res/layout/fragment_general_black.xml +++ b/app/src/main/res/layout/fragment_general_black.xml @@ -9,6 +9,20 @@ android:layout_height="match_parent" android:background="@color/verdnatura_black"> + + ' @@ -116,8 +116,7 @@ android:layout_width="@dimen/semaforo_next_to_ticket" android:layout_height="@dimen/semaforo_next_to_ticket" android:layout_centerVertical="true" - android:layout_marginLeft="24dp" - android:layout_marginBottom="1dp" + android:layout_marginLeft="20dp" android:background="@drawable/background_and_round_collection_fragment" />