From 92fa8d683a3f3f27843cc9f6dc7f57a42cbf2c47 Mon Sep 17 00:00:00 2001 From: arkon Date: Fri, 10 Apr 2020 18:11:04 -0400 Subject: [PATCH] Remove maxWidth logic from SimpleNavigationView since it's not a sidebar anymore --- .../tachiyomi/widget/SimpleNavigationView.kt | 23 ------------------- 1 file changed, 23 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/SimpleNavigationView.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/SimpleNavigationView.kt index e89354e170..49149e9973 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/SimpleNavigationView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/widget/SimpleNavigationView.kt @@ -20,7 +20,6 @@ import com.google.android.material.internal.ScrimInsetsFrameLayout import com.google.android.material.textfield.TextInputLayout import eu.kanade.tachiyomi.R as TR import eu.kanade.tachiyomi.util.view.inflate -import kotlin.math.min @Suppress("LeakingThis") @SuppressLint("PrivateResource", "RestrictedApi") @@ -30,11 +29,6 @@ open class SimpleNavigationView @JvmOverloads constructor( defStyleAttr: Int = 0 ) : ScrimInsetsFrameLayout(context, attrs, defStyleAttr) { - /** - * Max width of the navigation view. - */ - private var maxWidth: Int - /** * Recycler view containing all the items. */ @@ -54,28 +48,11 @@ open class SimpleNavigationView @JvmOverloads constructor( R.styleable.NavigationView_elevation, 0).toFloat()) } - maxWidth = a.getDimensionPixelSize(R.styleable.NavigationView_android_maxWidth, 0) - a.recycle() recycler.layoutManager = LinearLayoutManager(context) } - /** - * Overriden to measure the width of the navigation view. - */ - @SuppressLint("SwitchIntDef") - override fun onMeasure(widthSpec: Int, heightSpec: Int) { - val width = when (MeasureSpec.getMode(widthSpec)) { - MeasureSpec.AT_MOST -> MeasureSpec.makeMeasureSpec( - min(MeasureSpec.getSize(widthSpec), maxWidth), MeasureSpec.EXACTLY) - MeasureSpec.UNSPECIFIED -> MeasureSpec.makeMeasureSpec(maxWidth, MeasureSpec.EXACTLY) - else -> widthSpec - } - // Let super sort out the height - super.onMeasure(width, heightSpec) - } - /** * Base view holder. */