From 507bc516ce25d8a758e22113e5e897039e45c304 Mon Sep 17 00:00:00 2001 From: Alexander Capehart Date: Thu, 27 Jul 2023 15:42:19 -0600 Subject: [PATCH] ui: fix edit layout crashes Fix crashes that prevented android studio from showing layout previews of certain views. --- .../main/java/org/oxycblt/auxio/detail/DetailAppBarLayout.kt | 4 +++- app/src/main/java/org/oxycblt/auxio/image/CoverView.kt | 2 +- app/src/main/java/org/oxycblt/auxio/ui/IconToolbar.kt | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 app/src/main/java/org/oxycblt/auxio/ui/IconToolbar.kt diff --git a/app/src/main/java/org/oxycblt/auxio/detail/DetailAppBarLayout.kt b/app/src/main/java/org/oxycblt/auxio/detail/DetailAppBarLayout.kt index 28c1f65f7..3c494cd96 100644 --- a/app/src/main/java/org/oxycblt/auxio/detail/DetailAppBarLayout.kt +++ b/app/src/main/java/org/oxycblt/auxio/detail/DetailAppBarLayout.kt @@ -59,7 +59,9 @@ constructor(context: Context, attrs: AttributeSet? = null, @AttrRes defStyleAttr override fun onAttachedToWindow() { super.onAttachedToWindow() - (layoutParams as CoordinatorLayout.LayoutParams).behavior = Behavior(context) + if (!isInEditMode) { + (layoutParams as CoordinatorLayout.LayoutParams).behavior = Behavior(context) + } } private fun findTitleView(): TextView { diff --git a/app/src/main/java/org/oxycblt/auxio/image/CoverView.kt b/app/src/main/java/org/oxycblt/auxio/image/CoverView.kt index f57d35968..f2858479c 100644 --- a/app/src/main/java/org/oxycblt/auxio/image/CoverView.kt +++ b/app/src/main/java/org/oxycblt/auxio/image/CoverView.kt @@ -255,7 +255,7 @@ constructor(context: Context, attrs: AttributeSet? = null, @AttrRes defStyleAttr } private fun getCornerRadiusRes() = - if (uiSettings.roundMode) { + if (!isInEditMode && uiSettings.roundMode) { SIZING_CORNER_RADII[sizing] } else { null diff --git a/app/src/main/java/org/oxycblt/auxio/ui/IconToolbar.kt b/app/src/main/java/org/oxycblt/auxio/ui/IconToolbar.kt new file mode 100644 index 000000000..39167f751 --- /dev/null +++ b/app/src/main/java/org/oxycblt/auxio/ui/IconToolbar.kt @@ -0,0 +1,4 @@ +package org.oxycblt.auxio.ui + +class IconToolbar { +} \ No newline at end of file