Skip to content
Snippets Groups Projects
Commit cf08d357 authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Undo previous change because it is broken

parent fd0dd57b
No related branches found
No related tags found
No related merge requests found
......@@ -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
}
......
......@@ -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
......
......@@ -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>
......
......@@ -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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment