From cf08d35723db742b2c51de1c82cc9547776c5d8e Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Sun, 25 Mar 2018 19:52:09 +0200
Subject: [PATCH] Undo previous change because it is broken

---
 .../quasseldroid/ui/settings/about/AboutSettingsFragment.kt   | 3 +++
 .../quasseldroid/ui/settings/crash/CrashSettingsFragment.kt   | 2 ++
 app/src/main/res/layout-sw720dp/activity_settings.xml         | 4 ++--
 app/src/main/res/layout/activity_settings.xml                 | 4 ++--
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/settings/about/AboutSettingsFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/settings/about/AboutSettingsFragment.kt
index 8fe7dc1f5..9de5af5a6 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/settings/about/AboutSettingsFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/settings/about/AboutSettingsFragment.kt
@@ -3,6 +3,7 @@ package de.kuschku.quasseldroid.ui.settings.about
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
+import android.support.v4.view.ViewCompat
 import android.support.v7.widget.DividerItemDecoration
 import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.RecyclerView
@@ -171,6 +172,7 @@ class AboutSettingsFragment : DaggerFragment() {
       )
     ))
     libraries.addItemDecoration(DividerItemDecoration(context, LinearLayoutManager.VERTICAL))
+    ViewCompat.setNestedScrollingEnabled(libraries, false)
 
     contributors.layoutManager = LinearLayoutManager(context)
     contributors.adapter = ContributorAdapter(listOf(
@@ -201,6 +203,7 @@ class AboutSettingsFragment : DaggerFragment() {
       )
     ))
     contributors.addItemDecoration(DividerItemDecoration(context, LinearLayoutManager.VERTICAL))
+    ViewCompat.setNestedScrollingEnabled(contributors, false)
 
     return view
   }
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/settings/crash/CrashSettingsFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/settings/crash/CrashSettingsFragment.kt
index 2f09fa5aa..8b6435a23 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/settings/crash/CrashSettingsFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/settings/crash/CrashSettingsFragment.kt
@@ -5,6 +5,7 @@ import android.content.Intent
 import android.os.Bundle
 import android.os.Handler
 import android.os.HandlerThread
+import android.support.v4.view.ViewCompat
 import android.support.v7.recyclerview.extensions.ListAdapter
 import android.support.v7.util.DiffUtil
 import android.support.v7.widget.DividerItemDecoration
@@ -62,6 +63,7 @@ class CrashSettingsFragment : ServiceBoundFragment() {
     list.layoutManager = LinearLayoutManager(context)
     list.adapter = adapter
     list.addItemDecoration(DividerItemDecoration(context, LinearLayoutManager.VERTICAL))
+    ViewCompat.setNestedScrollingEnabled(list, false)
 
     handler.post {
       val crashDir = this.crashDir
diff --git a/app/src/main/res/layout-sw720dp/activity_settings.xml b/app/src/main/res/layout-sw720dp/activity_settings.xml
index da20df2b3..9ddcca650 100644
--- a/app/src/main/res/layout-sw720dp/activity_settings.xml
+++ b/app/src/main/res/layout-sw720dp/activity_settings.xml
@@ -37,7 +37,7 @@
       android:clipToPadding="false"
       app:cardElevation="4dp">
 
-      <ScrollView
+      <android.support.v4.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scrollbars="vertical">
@@ -47,7 +47,7 @@
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           tools:layout="@layout/fragment_about" />
-      </ScrollView>
+      </android.support.v4.widget.NestedScrollView>
     </android.support.v7.widget.CardView>
 
   </LinearLayout>
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 4769f0e8e..8ed200484 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -25,7 +25,7 @@
 
     </android.support.design.widget.AppBarLayout>
 
-    <ScrollView
+    <android.support.v4.widget.NestedScrollView
       android:layout_width="match_parent"
       android:layout_height="match_parent"
       android:scrollbars="vertical">
@@ -34,7 +34,7 @@
         android:id="@+id/fragment_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
-    </ScrollView>
+    </android.support.v4.widget.NestedScrollView>
   </LinearLayout>
 
 </android.support.v4.widget.DrawerLayout>
\ No newline at end of file
-- 
GitLab