Commit 0bbe0ec5 authored by Geoffrey Métais's avatar Geoffrey Métais
Browse files

Fix about view not scrollable

Fix #1049
parent 61af2af2
......@@ -2,7 +2,7 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ScrollView
<androidx.core.widget.NestedScrollView
android:id="@+id/about_main"
android:layout_width="match_parent"
android:layout_height="match_parent">
......@@ -120,7 +120,7 @@
android:textSize="12sp" />
</LinearLayout>
</ScrollView>
</androidx.core.widget.NestedScrollView>
<include layout="@layout/tv_time" />
</merge>
......@@ -29,8 +29,8 @@ import android.view.View
import android.view.ViewGroup
import android.webkit.WebView
import android.webkit.WebViewClient
import android.widget.ScrollView
import androidx.appcompat.app.AppCompatActivity
import androidx.core.widget.NestedScrollView
import androidx.fragment.app.Fragment
import androidx.viewpager.widget.ViewPager
import com.google.android.material.tabs.TabLayout
......@@ -58,7 +58,7 @@ class AboutFragment : Fragment() {
(activity as? AppCompatActivity)?.supportActionBar?.title = "VLC ${BuildConfig.VERSION_NAME}"
val aboutMain = view.findViewById<ScrollView>(org.videolan.vlc.R.id.about_main)
val aboutMain = view.findViewById<NestedScrollView>(org.videolan.vlc.R.id.about_main)
val webView = view.findViewById<WebView>(org.videolan.vlc.R.id.webview)
val revision = getString(org.videolan.vlc.R.string.build_revision)
......
......@@ -128,15 +128,16 @@ class SecondaryActivity : ContentActivity() {
private fun fetchSecondaryFragment(id: String) {
when (id) {
ALBUMS_SONGS -> {
fragment = AudioAlbumsSongsFragment()
val args = Bundle()
args.putParcelable(AudioBrowserFragment.TAG_ITEM, intent.getParcelableExtra<Parcelable>(AudioBrowserFragment.TAG_ITEM))
fragment!!.arguments = args
fragment = AudioAlbumsSongsFragment().apply {
val args = Bundle(1)
args.putParcelable(AudioBrowserFragment.TAG_ITEM, intent.getParcelableExtra<Parcelable>(AudioBrowserFragment.TAG_ITEM))
arguments = args
}
}
ABOUT -> fragment = AboutFragment()
VIDEO_GROUP_LIST -> {
fragment = VideoGridFragment().apply {
arguments = Bundle(1).apply {
arguments = Bundle(2).apply {
putParcelable(KEY_FOLDER, intent.getParcelableExtra<Parcelable>(KEY_FOLDER))
putParcelable(KEY_GROUP, intent.getParcelableExtra<Parcelable>(KEY_GROUP))
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment