浏览代码

Don't restrict filter sheet height anymore

arkon 4 年之前
父节点
当前提交
1557f713f4

+ 0 - 29
app/src/main/java/eu/kanade/tachiyomi/widget/MaxHeightViewPager.kt

@@ -1,29 +0,0 @@
-package eu.kanade.tachiyomi.widget
-
-import android.content.Context
-import android.util.AttributeSet
-import androidx.core.view.forEach
-import androidx.viewpager.widget.ViewPager
-
-/**
- * A [ViewPager] that sets its height to the maximum height of its children.
- * This is a way to mimic WRAP_CONTENT for its height.
- */
-class MaxHeightViewPager(context: Context, attrs: AttributeSet?) : ViewPager(context, attrs) {
-
-    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-        var measuredHeight = heightMeasureSpec
-
-        var height = 0
-        forEach {
-            it.measure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED))
-            val h = it.measuredHeight
-            if (h > height) height = h
-        }
-        if (height != 0) {
-            measuredHeight = MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
-        }
-
-        super.onMeasure(widthMeasureSpec, measuredHeight)
-    }
-}

+ 1 - 1
app/src/main/res/layout/common_tabbed_sheet.xml

@@ -43,7 +43,7 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <eu.kanade.tachiyomi.widget.MaxHeightViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/pager"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />