Commit 5ba7d8c6 authored by Vladislav Bogdashkin's avatar Vladislav Bogdashkin 🎣

deal preview tour provided

parent cec8e61b
...@@ -197,6 +197,7 @@ class EstateRepository @Inject constructor( ...@@ -197,6 +197,7 @@ class EstateRepository @Inject constructor(
private val getDealsApi: Observable<List<DealEntity>> = private val getDealsApi: Observable<List<DealEntity>> =
local.recentUser() local.recentUser()
.doOnError (Timber::e)
.flatMap { .flatMap {
when (it) { when (it) {
is UserState.Authenticated -> db.fetchUser(it.uuid.toInt()) is UserState.Authenticated -> db.fetchUser(it.uuid.toInt())
...@@ -230,8 +231,8 @@ class EstateRepository @Inject constructor( ...@@ -230,8 +231,8 @@ class EstateRepository @Inject constructor(
override fun getDeals(): Observable<List<DealModel>> { override fun getDeals(): Observable<List<DealModel>> {
return Observable.mergeDelayError( return Observable.mergeDelayError(
arrayListOf( arrayListOf(
getDealsDb,getDealsApi getDealsDb,
getDealsApi
) )
) )
.map { fromEntity(it, ::fromEntity) } .map { fromEntity(it, ::fromEntity) }
......
...@@ -34,7 +34,7 @@ private const val TIMEOUT_SECONDS=120L ...@@ -34,7 +34,7 @@ private const val TIMEOUT_SECONDS=120L
private const val WRITE_SECONDS=120L private const val WRITE_SECONDS=120L
private const val READ_SECONDS=120L private const val READ_SECONDS=120L
val INTERCEPT_LOG_LEVEL = HttpLoggingInterceptor.Level.HEADERS val INTERCEPT_LOG_LEVEL = HttpLoggingInterceptor.Level.NONE
@Module @Module
class RetrofitModule{ class RetrofitModule{
......
...@@ -17,10 +17,12 @@ import com.biganto.visual.roompark.domain.model.typeDoubleString ...@@ -17,10 +17,12 @@ import com.biganto.visual.roompark.domain.model.typeDoubleString
import com.biganto.visual.roompark.domain.model.typeShortString import com.biganto.visual.roompark.domain.model.typeShortString
import com.biganto.visual.roompark.presentation.screen.estate.EstateScreenController import com.biganto.visual.roompark.presentation.screen.estate.EstateScreenController
import com.biganto.visual.roompark.util.extensions.toRubly import com.biganto.visual.roompark.util.extensions.toRubly
import com.biganto.visual.roompark.util.view_utils.image_view.RoundedImageView
import com.biganto.visual.roompark.util.view_utils.status_progress_view.StatusProgressAnimationState import com.biganto.visual.roompark.util.view_utils.status_progress_view.StatusProgressAnimationState
import com.biganto.visual.roompark.util.view_utils.status_progress_view.StatusProgressCeil import com.biganto.visual.roompark.util.view_utils.status_progress_view.StatusProgressCeil
import com.bluelinelabs.conductor.RouterTransaction import com.bluelinelabs.conductor.RouterTransaction
import com.bluelinelabs.conductor.changehandler.FadeChangeHandler import com.bluelinelabs.conductor.changehandler.FadeChangeHandler
import com.bumptech.glide.Glide
import com.google.android.material.textview.MaterialTextView import com.google.android.material.textview.MaterialTextView
import com.jakewharton.rxbinding3.view.clicks import com.jakewharton.rxbinding3.view.clicks
import com.jakewharton.rxbinding3.view.scrollChangeEvents import com.jakewharton.rxbinding3.view.scrollChangeEvents
...@@ -85,6 +87,9 @@ class DealScreenController : ...@@ -85,6 +87,9 @@ class DealScreenController :
@BindView(R.id.start_tour_card) @BindView(R.id.start_tour_card)
lateinit var startTourView: View lateinit var startTourView: View
@BindView(R.id.start_tour_image_view) lateinit var tourScreen: RoundedImageView
private var servedDeal : DealModel? = null private var servedDeal : DealModel? = null
override fun onAttach(view: View) { override fun onAttach(view: View) {
...@@ -204,6 +209,11 @@ class DealScreenController : ...@@ -204,6 +209,11 @@ class DealScreenController :
dealPayed.text = viewState.estate.paymentSum.toRubly() dealPayed.text = viewState.estate.paymentSum.toRubly()
dealSumToPay.text = viewState.estate.amount_pay_sum.toRubly() dealSumToPay.text = viewState.estate.amount_pay_sum.toRubly()
viewState.estate.estate.multitourPreview?.let {
Glide.with(tourScreen)
.load(it)
.into(tourScreen)
}
dealModel = viewState.estate dealModel = viewState.estate
toolBar.setToolbar(HeaderToolbarModel( toolBar.setToolbar(HeaderToolbarModel(
......
...@@ -92,6 +92,7 @@ class DealViewHolder(itemView: View) : CommonViewHolder<DealPreviewModel>(itemVi ...@@ -92,6 +92,7 @@ class DealViewHolder(itemView: View) : CommonViewHolder<DealPreviewModel>(itemVi
statusLayout.addView(currentStatusText,0) statusLayout.addView(currentStatusText,0)
statusLayout.invalidate() statusLayout.invalidate()
model.tourPreview?.let { model.tourPreview?.let {
Glide.with(tourScreen) Glide.with(tourScreen)
.load(it) .load(it)
......
...@@ -235,7 +235,7 @@ ...@@ -235,7 +235,7 @@
android:id="@+id/start_tour_card" android:id="@+id/start_tour_card"
layout="@layout/start_tour_viewholder_big" layout="@layout/start_tour_viewholder_big"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content" />
<include <include
layout="@layout/horizontal_divider" layout="@layout/horizontal_divider"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment