From 8e1cd62c7cbbd2b83dd9e117d97e23c12e251ea7 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Fri, 22 Jun 2018 21:14:30 +0200
Subject: [PATCH] really disallow clicking on thumbnail section titles

---
 app/build.gradle                                                | 2 +-
 .../com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt  | 2 +-
 .../com/simplemobiletools/gallery/adapters/MediaAdapter.kt      | 2 +-
 app/src/main/res/layout/thumbnail_section.xml                   | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index e9d3681f5..4aa3731e4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -47,7 +47,7 @@ ext {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:4.2.10'
+    implementation 'com.simplemobiletools:commons:4.2.11'
     implementation 'com.theartofdev.edmodo:android-image-cropper:2.7.0'
     implementation 'com.android.support:multidex:1.0.3'
     implementation 'it.sephiroth.android.exif:library:1.0.1'
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
index 375fa60f3..87daaf994 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
@@ -62,7 +62,7 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: ArrayList<Directo
 
     override fun onBindViewHolder(holder: MyRecyclerViewAdapter.ViewHolder, position: Int) {
         val dir = dirs.getOrNull(position) ?: return
-        val view = holder.bindView(dir, !isPickIntent) { itemView, adapterPosition ->
+        val view = holder.bindView(dir, true, !isPickIntent) { itemView, adapterPosition ->
             setupView(itemView, dir)
         }
         bindViewHolder(holder, position, view)
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt
index eddf5d004..f1ba47f62 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt
@@ -82,7 +82,7 @@ class MediaAdapter(activity: BaseSimpleActivity, var media: MutableList<Thumbnai
         }
 
         val allowLongPress = !allowMultiplePicks && tmbItem is Medium
-        val view = holder.bindView(tmbItem, allowLongPress) { itemView, adapterPosition ->
+        val view = holder.bindView(tmbItem, tmbItem is Medium, allowLongPress) { itemView, adapterPosition ->
             if (tmbItem is Medium) {
                 setupThumbnail(itemView, tmbItem)
             } else {
diff --git a/app/src/main/res/layout/thumbnail_section.xml b/app/src/main/res/layout/thumbnail_section.xml
index 8278e2058..65d51f7df 100644
--- a/app/src/main/res/layout/thumbnail_section.xml
+++ b/app/src/main/res/layout/thumbnail_section.xml
@@ -4,5 +4,6 @@
     android:id="@+id/thumbnail_section"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:clickable="false"
     android:padding="@dimen/activity_margin"
     android:textSize="@dimen/bigger_text_size"/>