tours layout

app/src/main/java/com/biganto/visual/roompark/domain/interactor/tours.kt

@@ -10,16 +10,16 @@ import javax.inject.Inject
  */
 
 class ToursInteractor @Inject constructor(
-    val downloadUseCase: DownloadUseCase,
-    val tourUseCase:TourPreviewsUseCase
+    private val downloadUseCase: DownloadUseCase,
+    private val tourUseCase:TourPreviewsUseCase
 ){
 
-    fun getEstateTourList(estate:EstateModel){
+    fun getEstateTourList(estate:EstateModel) =
         tourUseCase.fetchTourOffer(estate.multitourId
             ?: error("Отсутсвуют виртуальные туры для данного объекта"),estate.id)
-    }
-
 
+    fun downloadTour(tourId:String,cancellationToken: DownloadUseCase.CancellationToken) =
+        downloadUseCase.startTourDownloading(tourId,cancellationToken)
 
 
 }
\ No newline at end of file

app/src/main/java/com/biganto/visual/roompark/presentation/screen/estate/ScreenContract.kt

@@ -15,5 +15,6 @@ interface EstateScreen : BigantoBaseContract<EstateScreenViewState> {
     fun switchElectric(): Observable<Pair<Int,Boolean>>
     fun showCommonInfo(): Observable<Int>
     fun showExplication(): Observable<Int>
+    fun tourCardClicked(): Observable<Int>
 }
 

app/src/main/java/com/biganto/visual/roompark/presentation/screen/estate/ScreenController.kt

@@ -70,6 +70,12 @@ class EstateScreenController  :
             .map { planTypesTabLayout.selectedTabPosition }
             .observeOn(AndroidSchedulers.mainThread())
 
+    override fun tourCardClicked(): Observable<Int> =
+        startToourCard.clicks()
+            .map { 1 }
+            .debounce(320L, TimeUnit.MILLISECONDS)
+            .observeOn(AndroidSchedulers.mainThread())
+
     private fun ViewGroup.switchMatch() =
         this.findViewById<SwitchMaterial>(R.id.switch1)
             .checkedChanges()
@@ -110,6 +116,10 @@ class EstateScreenController  :
     @Inject
     override lateinit var injectedPresenter: EstateScreenPresenter
 
+    @BindView(R.id.start_tour_image_view)
+    lateinit var startToourCard: View
+
+
     @BindView(R.id.flatTypesCustomView)
     lateinit var flatTypeView: ViewGroup
 
@@ -251,6 +261,8 @@ class EstateScreenController  :
             is EstateScreenViewState.PlanTypeSelected -> render(viewState)
             is EstateScreenViewState.SomeError -> render(viewState)
             is EstateScreenViewState.ShowEstateInfo -> render(viewState)
+            is EstateScreenViewState.ToursLoaded -> render(viewState)
+
         }
     }
 
@@ -302,12 +314,12 @@ class EstateScreenController  :
     }
 
     private fun render(viewState: EstateScreenViewState.ShowEstateInfo) {
-
         (flatInfoRecyclerView.adapter as FlatInfoAdapter).setItems(viewState.info)
-
     }
 
+    private fun render(viewState: EstateScreenViewState.ToursLoaded) {
 
+    }
 
     private fun render(viewState: EstateScreenViewState.LoadPlanTypes) {
         planTypesTabLayout.removeAllTabs()

app/src/main/java/com/biganto/visual/roompark/presentation/screen/estate/ScreenPresenter.kt

@@ -5,6 +5,7 @@ import androidx.annotation.StringRes
 import com.biganto.visual.roompark.R
 import com.biganto.visual.roompark.conductor.BigantoBasePresenter
 import com.biganto.visual.roompark.domain.interactor.EstateInteractor
+import com.biganto.visual.roompark.domain.interactor.ToursInteractor
 import com.biganto.visual.roompark.domain.model.*
 import com.biganto.visual.roompark.presentation.screen.estate.util.DisplayInfoModel
 import com.biganto.visual.roompark.util.extensions.toRubly
@@ -23,6 +24,7 @@ import javax.inject.Named
 
 class EstateScreenPresenter @Inject constructor(
     private val interactor: EstateInteractor,
+    private val toursInteractor: ToursInteractor,
     private val context: Context,
     @Named(SELECTED_ESTATE_ID_KEY) private val estateId:Int
 )
@@ -53,7 +55,7 @@ class EstateScreenPresenter @Inject constructor(
 
         val fetchPlan = intent(EstateScreen::planTypesTabSelected)
             .map { planList?.get(it) }
-            .flatMap {planPreset ->
+            .flatMap { planPreset ->
                 interactor.getPlan(planPreset)
                     .map<EstateScreenViewState> { plan -> EstateScreenViewState.LoadPlan(plan) }
                     .startWith(
@@ -66,7 +68,7 @@ class EstateScreenPresenter @Inject constructor(
 
                             EstateScreenViewState.ShowEstateInfo(
                                 showType
-                                ,if (showType== InfoShowType.COMMON_INFO)
+                                , if (showType == InfoShowType.COMMON_INFO)
                                     mapCommonInfo(estate?.commonInfo)
                                 else mapCommonInfo(planPreset.explication)
                             )
@@ -105,26 +107,39 @@ class EstateScreenPresenter @Inject constructor(
 
         val showInfo = intent(EstateScreen::showCommonInfo)
             .doOnNext { showType = InfoShowType.COMMON_INFO }
-            .map { estate?.commonInfo}
-            .map (::mapCommonInfo)
-            .map { EstateScreenViewState.ShowEstateInfo(showType,it) }
+            .map { estate?.commonInfo }
+            .map(::mapCommonInfo)
+            .map { EstateScreenViewState.ShowEstateInfo(showType, it) }
 
         val showExplication = intent(EstateScreen::showExplication)
             .doOnNext { showType = InfoShowType.EXPLICATIONS }
-            .map { planList?.get(it)?.explication}
-            .map (::mapCommonInfo)
-            .map { EstateScreenViewState.ShowEstateInfo(showType,it) }
-
-        val state = restoreStateObservable
-            .mergeWith(prefetchCards)
-            .mergeWith(fetchPlans)
-            .mergeWith(fetchPlan)
-            .mergeWith(switchElectric)
-            .mergeWith(switchFurn)
-            .mergeWith(switchSizes)
-            .mergeWith(switchWalls)
-            .mergeWith(showInfo)
-            .mergeWith(showExplication)
+            .map { planList?.get(it)?.explication }
+            .map(::mapCommonInfo)
+            .map { EstateScreenViewState.ShowEstateInfo(showType, it) }
+
+
+        val onStartTours = intent(EstateScreen::tourCardClicked)
+            .map { estate }
+            .flatMap {estate -> toursInteractor.getEstateTourList(estate)
+                .map { EstateScreenViewState.ToursLoaded(it) }
+            }
+
+
+        val state = Observable.mergeDelayError(
+            arrayListOf(
+                restoreStateObservable,
+                prefetchCards,
+                fetchPlans,
+                fetchPlan,
+                switchElectric,
+                switchFurn,
+                switchSizes,
+                switchWalls,
+                showInfo,
+                onStartTours,
+                showExplication
+            )
+        )
             .doOnError { Timber.e(it) }
             .subscribeOn(Schedulers.io())
             .observeOn(AndroidSchedulers.mainThread())

app/src/main/java/com/biganto/visual/roompark/presentation/screen/estate/ScreenViewState.kt

@@ -3,6 +3,7 @@ package com.biganto.visual.roompark.presentation.screen.estate
 import com.biganto.visual.roompark.conductor.BigantoBaseViewState
 import com.biganto.visual.roompark.domain.model.EstateModel
 import com.biganto.visual.roompark.domain.model.PlanPresetModel
+import com.biganto.visual.roompark.domain.model.TourModel
 import com.biganto.visual.roompark.presentation.screen.estate.util.DisplayInfoModel
 import com.biganto.visual.roompark.util.monades.ExceptionString
 
@@ -19,4 +20,5 @@ sealed class EstateScreenViewState : BigantoBaseViewState() {
     class LoadPlan(val planBody:String) : EstateScreenViewState()
     class SomeError(val exception: ExceptionString) : EstateScreenViewState()
     class ShowEstateInfo(val showType: InfoShowType, val info:List<DisplayInfoModel>) : EstateScreenViewState()
+    class ToursLoaded(val tours:List<TourModel>) : EstateScreenViewState()
 }
\ No newline at end of file

app/src/main/res/layout/tour_chooser_viewholder.xml

+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:id="@+id/tour_preview_imageView"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_marginStart="19dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="16dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/ic_bell_on" />
+
+    <com.google.android.material.textview.MaterialTextView
+        style="@style/Default_TextView"
+        android:id="@+id/tour_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        android:ellipsize="end"
+        android:text="Тур"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/tour_status_imageView"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toEndOf="@+id/tour_preview_imageView"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:id="@+id/tour_status_imageView"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="16dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/ic_back" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

app/src/main/res/layout/tours_chooser_screen.xml

+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/playTourCardOpacityLight">
+
+    <com.google.android.material.card.MaterialCardView
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="32dp"
+        android:layout_marginEnd="32dp"
+        app:cardElevation="2dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.32999998">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/toursList"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="16dp"
+            android:layout_marginBottom="8dp"
+            android:orientation="vertical"
+            tools:itemCount="3"
+            tools:listitem="@layout/tour_chooser_viewholder">
+
+        </androidx.recyclerview.widget.RecyclerView>
+    </com.google.android.material.card.MaterialCardView>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file