misc fix

app/src/main/java/com/biganto/visual/roompark/conductor/dialogs/PhotoDialogController.kt

@@ -11,7 +11,6 @@ import android.widget.ImageView
 import android.widget.ProgressBar
 import androidx.annotation.LayoutRes
 import androidx.core.os.bundleOf
-import androidx.recyclerview.widget.RecyclerView
 import com.biganto.visual.roompark.R
 import com.bluelinelabs.conductor.Controller
 import com.bumptech.glide.Glide
@@ -38,7 +37,6 @@ class PhotoDialogController : Controller {
 
     constructor(photoUrl: String) : super(bundleOf(PHOTO_URL_KEY to photoUrl))
 
-    lateinit var recyclerView : RecyclerView
 
     @SuppressLint("SourceLockedOrientationActivity")
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup): View {

app/src/main/java/com/biganto/visual/roompark/conductor/dialogs/tour_chooser/DownloadTourDialogController.kt

@@ -10,6 +10,8 @@ import android.widget.ProgressBar
 import androidx.annotation.LayoutRes
 import androidx.core.os.bundleOf
 import com.biganto.visual.roompark.R
+import com.biganto.visual.roompark.base.IBottomNavigation
+import com.biganto.visual.roompark.base.ICollapsingToolBar
 import com.biganto.visual.roompark.base.RoomParkApplication
 import com.biganto.visual.roompark.base.RoomParkMainActivity
 import com.biganto.visual.roompark.di.dagger.ActivityModule
@@ -84,6 +86,11 @@ class DownloadTourDialogController : Controller {
         super.onDetach(view)
     }
 
+
+    private val bottomNavigationController: IBottomNavigation by lazy {rpActivity}
+
+    private val toolbar: ICollapsingToolBar by lazy {rpActivity}
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup): View {
         val view = inflater.inflate(getLayoutId(), container, false)
 

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

@@ -200,13 +200,9 @@ class EstateScreenController  :
 
     private fun setToolbar(){
         toolBar.setToolbar(null, StatusToolbarModel())
-        toolBar.statusToolbar.findViewById<View>(R.id.back_cross).let {
-            detachDisposable.add(
-                it.clicks()
-                    .subscribeOn(AndroidSchedulers.mainThread())
-                    .subscribe { handleBack() }
-            )
-        }
+        toolBar.statusToolbar.findViewById<View>(R.id.back_cross)
+            .setOnClickListener { handleBack() }
+
         detachDisposable.add(
             flatScroll.scrollChangeEvents()
 //                .debounce (25,TimeUnit.MILLISECONDS)

app/src/main/java/com/biganto/visual/roompark/presentation/screen/favorites/util/FavoritesAdapter.kt

@@ -67,7 +67,9 @@ class FavoriteViewHolder(itemView: View) : CommonViewHolder<EstateModel>(itemVie
     }
 
     val onStartTourObs: Observable<EstateModel> get() =
-        startTour.clicks().filter { bindedModel.availableStatus }.map { bindedModel }
+        startTour.clicks()
+//            .filter { bindedModel.availableStatus }
+            .map { bindedModel }
 
     override fun onViewBound(model: EstateModel) {
         estateTitle.text =

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

@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="#000000">
+    android:background="#FF000000">
 
 
     <com.github.chrisbanes.photoview.PhotoView

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

@@ -50,11 +50,11 @@
 
     <ImageView
         android:id="@+id/back_cross"
-        android:layout_width="32dp"
-        android:layout_height="32dp"
-        android:layout_marginEnd="8dp"
+        android:layout_width="48dp"
+        android:layout_height="24dp"
+        android:layout_marginEnd="0dp"
         android:fitsSystemWindows="true"
-        android:scaleType="centerCrop"
+        android:scaleType="fitCenter"
         android:tint="@color/colorGray"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"