fix(android): corner radius & auto size bug

lodev09 · Feb 5, 2025 · 8ac8d37 · 8ac8d37
1 parent 744905a
commit 8ac8d37
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/android/src/main/java/com/lodev09/truesheet/TrueSheetDialog.kt b/android/src/main/java/com/lodev09/truesheet/TrueSheetDialog.kt
@@ -103,7 +103,13 @@ class TrueSheetDialog(private val reactContext: ThemedReactContext, private val
    * Setup background color and corner radius.
    */
   fun setupBackground() {
-    val outerRadii = FloatArray(8) { cornerRadius }
+    val outerRadii = floatArrayOf(
+      cornerRadius, cornerRadius,
+      cornerRadius, cornerRadius,
+      0f, 0f,
+      0f, 0f
+    )
+
     val background = ShapeDrawable(RoundRectShape(outerRadii, null, null))
 
     // Use current background color

diff --git a/android/src/main/java/com/lodev09/truesheet/core/RootSheetView.kt b/android/src/main/java/com/lodev09/truesheet/core/RootSheetView.kt
@@ -2,6 +2,7 @@ package com.lodev09.truesheet.core
 
 import android.annotation.SuppressLint
 import android.content.Context
+import android.util.Log
 import android.view.MotionEvent
 import android.view.View
 import com.facebook.react.config.ReactFeatureFlags
@@ -30,6 +31,8 @@ class RootSheetView(private val context: Context?) :
   private var viewWidth = 0
   private var viewHeight = 0
 
+  private var hasUpdatedSize = false
+
   private val jSTouchDispatcher = JSTouchDispatcher(this)
   private var jSPointerDispatcher: JSPointerDispatcher? = null
   var sizeChangeListener: ((w: Int, h: Int) -> Unit)? = null
@@ -45,22 +48,13 @@ class RootSheetView(private val context: Context?) :
   private val reactContext: ThemedReactContext
     get() = context as ThemedReactContext
 
-  private fun updateContainerSize() {
-    sizeChangeListener?.let { it(viewWidth, viewHeight) }
-  }
-
   override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
     super.onSizeChanged(w, h, oldw, oldh)
 
     viewWidth = w
     viewHeight = h
 
-    updateContainerSize()
-  }
-
-  override fun addView(child: View, index: Int, params: LayoutParams) {
-    super.addView(child, index, params)
-    updateContainerSize()
+    sizeChangeListener?.let { it(viewWidth, viewHeight) }
   }
 
   override fun handleException(t: Throwable) {