Skip to content

fix: android auto responsive sheet size #193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: android auto responsive sheet size #193

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 46 additions & 21 deletions android/src/main/java/com/lodev09/truesheet/TrueSheetDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,20 @@ class TrueSheetDialog(private val reactContext: ThemedReactContext, private val
var maxScreenHeight = 0

var contentHeight = 0
set(value) {
val oldValue = field
field = value

// If height changed and using auto size, reconfigure
if (oldValue != value && sizes.size == 1 && sizes[0] == "auto" && isShowing) {
// Force expanded state to ensure proper height

behavior.apply {
setPeekHeight(value + footerHeight, true)
state = BottomSheetBehavior.STATE_COLLAPSED
}
}
}
var footerHeight = 0
var maxSheetHeight: Int? = null

Expand Down Expand Up @@ -263,29 +277,35 @@ class TrueSheetDialog(private val reactContext: ThemedReactContext, private val
/**
* Determines the state based from the given size index.
*/
private fun getStateForSizeIndex(index: Int) =
when (sizes.size) {
1 -> BottomSheetBehavior.STATE_EXPANDED
private fun getStateForSizeIndex(index: Int): Int {
return when (sizes.size) {
1 -> {
if (sizes[0] == "auto") {
return BottomSheetBehavior.STATE_COLLAPSED
}
return BottomSheetBehavior.STATE_EXPANDED
}

2 -> {
when (index) {
0 -> BottomSheetBehavior.STATE_COLLAPSED
1 -> BottomSheetBehavior.STATE_EXPANDED
else -> BottomSheetBehavior.STATE_HIDDEN
}
}
2 -> {
when (index) {
0 -> BottomSheetBehavior.STATE_COLLAPSED
1 -> BottomSheetBehavior.STATE_EXPANDED
else -> BottomSheetBehavior.STATE_HIDDEN
}
}

3 -> {
when (index) {
0 -> BottomSheetBehavior.STATE_COLLAPSED
1 -> BottomSheetBehavior.STATE_HALF_EXPANDED
2 -> BottomSheetBehavior.STATE_EXPANDED
else -> BottomSheetBehavior.STATE_HIDDEN
}
}

3 -> {
when (index) {
0 -> BottomSheetBehavior.STATE_COLLAPSED
1 -> BottomSheetBehavior.STATE_HALF_EXPANDED
2 -> BottomSheetBehavior.STATE_EXPANDED
else -> BottomSheetBehavior.STATE_HIDDEN
}
}

else -> BottomSheetBehavior.STATE_HIDDEN
}
}

/**
* Handle keyboard state changes and adjust maxScreenHeight (sheet max height) accordingly.
Expand Down Expand Up @@ -329,8 +349,12 @@ class TrueSheetDialog(private val reactContext: ThemedReactContext, private val

when (sizes.size) {
1 -> {
maxHeight = getSizeHeight(sizes[0])
skipCollapsed = true
if (sizes[0] == "auto") {
setPeekHeight(getSizeHeight(sizes[0]), true)
} else {
maxHeight = getSizeHeight(sizes[0])
skipCollapsed = true
}
}

2 -> {
Expand Down Expand Up @@ -358,6 +382,7 @@ class TrueSheetDialog(private val reactContext: ThemedReactContext, private val
when (sizes.size) {
1 -> {
when (state) {
BottomSheetBehavior.STATE_COLLAPSED -> SizeInfo(0, Utils.toDIP(behavior.maxHeight.toFloat()))
BottomSheetBehavior.STATE_EXPANDED -> SizeInfo(0, Utils.toDIP(behavior.maxHeight.toFloat()))
else -> null
}
Expand Down