fix #213

AkaneTan · Sep 10, 2024 · 1fc6778 · 1fc6778
1 parent 764a56b
commit 1fc6778
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/app/src/main/kotlin/org/akanework/gramophone/logic/ui/MyRecyclerView.kt b/app/src/main/kotlin/org/akanework/gramophone/logic/ui/MyRecyclerView.kt
@@ -50,7 +50,6 @@ class MyRecyclerView(context: Context, attributeSet: AttributeSet?, defStyleAttr
 	private var scrollIsNatural = false
 
 	override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) {
-		super.onLayout(changed, l, t, r, b)
 		if (lastWidth != width) {
 			adapter.dispatchToAdapter { it.onWidthChanged(width) }
 			lastWidth = width
@@ -63,6 +62,7 @@ class MyRecyclerView(context: Context, attributeSet: AttributeSet?, defStyleAttr
 				deferredFastScrollBuilder = null
 			}
 		}
+		super.onLayout(changed, l, t, r, b)
 	}
 
 	private fun RecyclerView.Adapter<*>?.dispatchToAdapter(action: (Adapter<*>) -> Unit) {
@@ -161,6 +161,12 @@ class MyRecyclerView(context: Context, attributeSet: AttributeSet?, defStyleAttr
 			fsBuilder()
 	}
 
+	override fun setAdapter(adapter: RecyclerView.Adapter<*>?) {
+		super.setAdapter(adapter)
+		if (width != 0)
+			adapter.dispatchToAdapter { it.onWidthChanged(width) }
+	}
+
 	override fun onOffsetChanged(unused: AppBarLayout?, offset: Int) {
 		if (offset == 0) ah?.hideScrollbar()
 	}

diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -13,10 +13,10 @@
     <dimen name="decor_height">48dp</dimen>
     <dimen name="list_height">75dp</dimen>
     <dimen name="larger_list_height">78dp</dimen>
-    <dimen name="grid_card_label_height">45dp</dimen>
+    <dimen name="grid_card_label_height">70sp</dimen>
     <dimen name="grid_card_margin_top">8dp</dimen>
     <dimen name="grid_card_margin_label">12.5dp</dimen>
-    <dimen name="grid_card_padding_bottom">24dp</dimen>
+    <dimen name="grid_card_padding_bottom">0dp</dimen>
     <dimen name="lyric_top_padding">36dp</dimen>
     <dimen name="lyric_bottom_padding">640dp</dimen>
 </resources>