fix handle back on tour load view

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

@@ -125,8 +125,7 @@ class DownloadTourDialogController : Controller {
                         snackbar.showSnackBar(error.localizedMessage)
                     }
                 ))
-        cancelDownloadText.setOnClickListener {
-            downloadToken.isCancelled = true;handleBack() }
+        cancelDownloadText.setOnClickListener {handleBack() }
 //        downloadTour(it.tour.tour_id, downloadToken)
 
 //        view.findViewById<View>(R.id.close_current_button).setOnClickListener { handleBack() }
@@ -147,7 +146,8 @@ class DownloadTourDialogController : Controller {
     fun getLayoutId() = R.layout.download_tour_layout
 
     override fun handleBack(): Boolean {
-        return router.popCurrentController()
+        downloadToken.isCancelled = true
+        return router.popController(this)
     }
 
 

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

@@ -80,7 +80,7 @@ class ChooseTourDialogController : Controller {
             .subscribe(::onTourClicked)
         )
 
-        //view.findViewById<View>(R.id.close_current_button).setOnClickListener { handleBack() }
+        view.findViewById<View>(R.id.close_current_button).setOnClickListener { handleBack() }
         view.setOnClickListener { handleBack() }
 
         return view

app/src/main/res/layout-v23/download_tour_layout.xml

@@ -7,12 +7,20 @@
                                                    android:orientation="vertical">
 
     <ImageView
+        android:id="@+id/backgroundDownloader"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-            android:id="@+id/backgroundDownloader"
-            android:scaleType="centerCrop"
         android:background="#A62B2727"
+        android:scaleType="centerCrop"
+        android:clickable="true"
+        android:focusableInTouchMode="true"
+        android:focusable="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         />
+
     <com.google.android.material.textview.MaterialTextView
             android:layout_width="0dp"
             android:layout_height="wrap_content"

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

@@ -4,7 +4,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/playTourCardOpacityLight">
+    android:background="@color/playTourCardOpacityLight"
+    android:clickable="true"
+    android:focusableInTouchMode="true">
 
     <com.google.android.material.card.MaterialCardView
         android:layout_width="0dp"
@@ -45,8 +47,8 @@
         android:focusable="true"
         android:focusableInTouchMode="true"
         android:scaleType="fitXY"
-        app:layout_constraintTop_toTopOf="parent"
+        android:src="@drawable/ic_close_circled"
         app:layout_constraintEnd_toEndOf="parent"
-        android:src="@drawable/ic_close_circled" />
+        app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file