From c41250b12b15ed06367fe91eafbb9d979b282e8b Mon Sep 17 00:00:00 2001
From: Ezerous <ezerous@gmail.com>
Date: Sat, 12 Sep 2020 14:15:09 +0300
Subject: [PATCH] WebView minor fix

---
 app/build.gradle                                             | 4 ++--
 app/src/main/res/layout-v21/activity_topic_post_row.xml      | 5 ++---
 app/src/main/res/layout/activity_topic.xml                   | 1 -
 app/src/main/res/layout/activity_topic_post_row.xml          | 5 ++---
 app/src/main/res/layout/fragment_profile_latest_posts.xml    | 3 +--
 .../main/res/layout/fragment_profile_latest_posts_row.xml    | 3 ++-
 app/src/main/res/layout/fragment_shoutbox.xml                | 1 -
 app/src/main/res/layout/fragment_shoutbox_shout_row.xml      | 3 ++-
 8 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 10c07e6e..0c95158c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,8 +15,8 @@ android {
         applicationId "gr.thmmy.mthmmy"
         minSdkVersion 19
         targetSdkVersion 29
-        versionCode 27
-        versionName "1.8.4"
+        versionCode 28
+        versionName "1.8.5"
         archivesBaseName = "mTHMMY-v$versionName"
         buildConfigField "String", "CURRENT_BRANCH", "\"" + getCurrentBranch() + "\""
         buildConfigField "String", "COMMIT_HASH", "\"" + getCommitHash() + "\""
diff --git a/app/src/main/res/layout-v21/activity_topic_post_row.xml b/app/src/main/res/layout-v21/activity_topic_post_row.xml
index 6d27a5a9..01d3fb6d 100644
--- a/app/src/main/res/layout-v21/activity_topic_post_row.xml
+++ b/app/src/main/res/layout-v21/activity_topic_post_row.xml
@@ -223,7 +223,8 @@
             <FrameLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginBottom="16dp">
+                android:layout_marginBottom="16dp"
+                android:descendantFocusability="blocksDescendants">
 
                 <gr.thmmy.mthmmy.views.ReactiveWebView
                     android:id="@+id/post"
@@ -233,8 +234,6 @@
                     android:layout_marginLeft="16dp"
                     android:layout_marginRight="16dp"
                     android:background="@color/background_light"
-                    android:clickable="true"
-                    android:focusable="true"
                     android:text="@string/post" />
             </FrameLayout>
 
diff --git a/app/src/main/res/layout/activity_topic.xml b/app/src/main/res/layout/activity_topic.xml
index e8752417..24793374 100644
--- a/app/src/main/res/layout/activity_topic.xml
+++ b/app/src/main/res/layout/activity_topic.xml
@@ -48,7 +48,6 @@
             android:paddingTop="4dp"
             android:paddingBottom="4dp"
             android:scrollbars="none"
-            android:descendantFocusability="blocksDescendants"
             app:layout_behavior="@string/appbar_scrolling_view_behavior"
             tools:context="gr.thmmy.mthmmy.activities.topic.TopicActivity" />
 
diff --git a/app/src/main/res/layout/activity_topic_post_row.xml b/app/src/main/res/layout/activity_topic_post_row.xml
index a0df17df..ee728e71 100644
--- a/app/src/main/res/layout/activity_topic_post_row.xml
+++ b/app/src/main/res/layout/activity_topic_post_row.xml
@@ -223,7 +223,8 @@
             <FrameLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginBottom="16dp">
+                android:layout_marginBottom="16dp"
+                android:descendantFocusability="blocksDescendants">
 
                 <gr.thmmy.mthmmy.views.ReactiveWebView
                     android:id="@+id/post"
@@ -233,8 +234,6 @@
                     android:layout_marginLeft="16dp"
                     android:layout_marginRight="16dp"
                     android:background="@color/background_light"
-                    android:clickable="true"
-                    android:focusable="true"
                     android:text="@string/post" />
             </FrameLayout>
 
diff --git a/app/src/main/res/layout/fragment_profile_latest_posts.xml b/app/src/main/res/layout/fragment_profile_latest_posts.xml
index f5e3ba3b..6827530d 100644
--- a/app/src/main/res/layout/fragment_profile_latest_posts.xml
+++ b/app/src/main/res/layout/fragment_profile_latest_posts.xml
@@ -11,7 +11,6 @@
         android:layout_height="match_parent"
         android:padding="4dp"
         android:clipToPadding = "false"
-        android:scrollbars="none"
-        android:descendantFocusability="blocksDescendants">
+        android:scrollbars="none">
     </androidx.recyclerview.widget.RecyclerView>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_profile_latest_posts_row.xml b/app/src/main/res/layout/fragment_profile_latest_posts_row.xml
index bf992123..6c1a8d25 100644
--- a/app/src/main/res/layout/fragment_profile_latest_posts_row.xml
+++ b/app/src/main/res/layout/fragment_profile_latest_posts_row.xml
@@ -68,7 +68,8 @@
                 android:paddingStart="10dp"
                 android:paddingEnd="10dp"
                 android:paddingTop="6dp"
-                android:paddingBottom="8dp">
+                android:paddingBottom="8dp"
+                android:descendantFocusability="blocksDescendants">
 
                 <gr.thmmy.mthmmy.views.ReactiveWebView
                     android:id="@+id/post"
diff --git a/app/src/main/res/layout/fragment_shoutbox.xml b/app/src/main/res/layout/fragment_shoutbox.xml
index 70439ee5..a3982068 100644
--- a/app/src/main/res/layout/fragment_shoutbox.xml
+++ b/app/src/main/res/layout/fragment_shoutbox.xml
@@ -22,7 +22,6 @@
         android:layout_height="0dp"
         android:layout_weight="1"
         android:paddingBottom="8dp"
-        android:descendantFocusability="blocksDescendants"
         tools:listitem="@layout/fragment_shoutbox_shout_row" />
 
     <gr.thmmy.mthmmy.views.editorview.EditorView
diff --git a/app/src/main/res/layout/fragment_shoutbox_shout_row.xml b/app/src/main/res/layout/fragment_shoutbox_shout_row.xml
index 0bf57058..68da76bd 100644
--- a/app/src/main/res/layout/fragment_shoutbox_shout_row.xml
+++ b/app/src/main/res/layout/fragment_shoutbox_shout_row.xml
@@ -12,7 +12,8 @@
     card_view:cardCornerRadius="5dp"
     card_view:cardElevation="2dp"
     card_view:cardPreventCornerOverlap="false"
-    card_view:cardUseCompatPadding="true">
+    card_view:cardUseCompatPadding="true"
+    android:descendantFocusability="blocksDescendants">
 
     <LinearLayout
         android:layout_width="match_parent"