mobile/MaterialFiles
mobile/MaterialFiles
1
0
Fork 0
mirror of https://github.com/zhanghai/MaterialFiles synced 2024-07-09 03:55:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Refactor] Fix shadowed variable name warning.

Browse Source
This commit is contained in:
Hai Zhang 2023-05-14 21:34:34 -07:00
parent 30164e073c
commit 43a22b31d5
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/me/zhanghai/android/files/filelist/BreadcrumbLayout.kt
View File

@ -88,15 +88,18 @@ class BreadcrumbLayout : HorizontalScrollView {
override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
val heightMode = MeasureSpec.getMode(heightMeasureSpec)
var heightMeasureSpec = heightMeasureSpec
if (heightMode == MeasureSpec.UNSPECIFIED || heightMode == MeasureSpec.AT_MOST) {
var height = tabLayoutHeight
if (heightMode == MeasureSpec.AT_MOST) {
height = height.coerceAtMost(MeasureSpec.getSize(heightMeasureSpec))
val newHeightMeasureSpec = if (heightMode != MeasureSpec.EXACTLY) {
val maximumHeight = if (heightMode == MeasureSpec.AT_MOST) {
MeasureSpec.getSize(heightMeasureSpec)
} else {
Int.MAX_VALUE
}
heightMeasureSpec = MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
val height = tabLayoutHeight.coerceAtMost(maximumHeight)
MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
} else {
heightMeasureSpec
}
super.onMeasure(widthMeasureSpec, heightMeasureSpec)
super.onMeasure(widthMeasureSpec, newHeightMeasureSpec)
}
override fun requestLayout() {

13
app/src/main/java/me/zhanghai/android/files/ui/WrapFirstPageContentViewPager.kt
View File

@ -15,14 +15,15 @@ class WrapFirstPageContentViewPager : ViewPager {
constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
var heightMeasureSpec = heightMeasureSpec
if (MeasureSpec.getMode(heightMeasureSpec) != MeasureSpec.EXACTLY && childCount > 0) {
val heightMode = MeasureSpec.getMode(heightMeasureSpec)
val newHeightMeasureSpec = if (heightMode != MeasureSpec.EXACTLY && childCount > 0) {
val child = getChildAt(0)
child.measure(widthMeasureSpec, heightMeasureSpec)
heightMeasureSpec = MeasureSpec.makeMeasureSpec(
child.measuredHeight, MeasureSpec.EXACTLY
)
val height = child.measuredHeight
MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
} else {
heightMeasureSpec
}
super.onMeasure(widthMeasureSpec, heightMeasureSpec)
super.onMeasure(widthMeasureSpec, newHeightMeasureSpec)
}
}