From c389da51b62448591a6c6b683974f46e57a01df7 Mon Sep 17 00:00:00 2001 From: skydoves Date: Sun, 4 Aug 2024 15:43:11 +0900 Subject: [PATCH] Fix dragging issue on the nested scroll components --- flexible-core/api/android/flexible-core.api | 4 ++++ flexible-core/api/desktop/flexible-core.api | 4 ++++ .../com/skydoves/flexible/core/Logger.kt | 22 +++++++++++++++++++ .../flexible/core/FlexibleSheetState.kt | 2 +- .../com/skydoves/flexible/core/Logger.kt | 19 ++++++++++++++++ .../com/skydoves/flexible/core/Logger.kt | 19 ++++++++++++++++ 6 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 flexible-core/src/androidMain/kotlin/com/skydoves/flexible/core/Logger.kt create mode 100644 flexible-core/src/commonMain/kotlin/com/skydoves/flexible/core/Logger.kt create mode 100644 flexible-core/src/skiaMain/kotlin/com/skydoves/flexible/core/Logger.kt diff --git a/flexible-core/api/android/flexible-core.api b/flexible-core/api/android/flexible-core.api index 1c2c0fd..17acd1b 100644 --- a/flexible-core/api/android/flexible-core.api +++ b/flexible-core/api/android/flexible-core.api @@ -85,6 +85,10 @@ public final class com/skydoves/flexible/core/FlexibleSwipeableKt { public abstract interface annotation class com/skydoves/flexible/core/InternalFlexibleApi : java/lang/annotation/Annotation { } +public final class com/skydoves/flexible/core/LoggerKt { + public static final fun log (Ljava/lang/String;)V +} + public final class com/skydoves/flexible/core/ScreenHeightKt { public static final fun screenHeight (Landroidx/compose/runtime/Composer;I)F } diff --git a/flexible-core/api/desktop/flexible-core.api b/flexible-core/api/desktop/flexible-core.api index 77a3347..5f00fa7 100644 --- a/flexible-core/api/desktop/flexible-core.api +++ b/flexible-core/api/desktop/flexible-core.api @@ -78,6 +78,10 @@ public final class com/skydoves/flexible/core/FlexibleSwipeableKt { public abstract interface annotation class com/skydoves/flexible/core/InternalFlexibleApi : java/lang/annotation/Annotation { } +public final class com/skydoves/flexible/core/LoggerKt { + public static final fun log (Ljava/lang/String;)V +} + public final class com/skydoves/flexible/core/ScreenHeightKt { public static final fun screenHeight (Landroidx/compose/runtime/Composer;I)F } diff --git a/flexible-core/src/androidMain/kotlin/com/skydoves/flexible/core/Logger.kt b/flexible-core/src/androidMain/kotlin/com/skydoves/flexible/core/Logger.kt new file mode 100644 index 0000000..e931aaf --- /dev/null +++ b/flexible-core/src/androidMain/kotlin/com/skydoves/flexible/core/Logger.kt @@ -0,0 +1,22 @@ +/* + * Designed and developed by 2023 skydoves (Jaewoong Eum) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.skydoves.flexible.core + +import android.util.Log + +public actual fun log(message: String) { + Log.d("FlexibleBottomSheet", message) +} diff --git a/flexible-core/src/commonMain/kotlin/com/skydoves/flexible/core/FlexibleSheetState.kt b/flexible-core/src/commonMain/kotlin/com/skydoves/flexible/core/FlexibleSheetState.kt index f9cc4d3..3009842 100644 --- a/flexible-core/src/commonMain/kotlin/com/skydoves/flexible/core/FlexibleSheetState.kt +++ b/flexible-core/src/commonMain/kotlin/com/skydoves/flexible/core/FlexibleSheetState.kt @@ -377,7 +377,7 @@ public fun consumeSwipeWithinBottomSheetBoundsNestedScrollConnection( } else if (delta > 0 && source == NestedScrollSource.Fling && sheetState.currentValue == FlexibleSheetValue.FullyExpanded && !sheetState.isModal ) { - onDragging.invoke(false) + onDragging.invoke(true) Offset.Zero } else if (delta > 0 && sheetState.currentValue != FlexibleSheetValue.FullyExpanded && !sheetState.isModal diff --git a/flexible-core/src/commonMain/kotlin/com/skydoves/flexible/core/Logger.kt b/flexible-core/src/commonMain/kotlin/com/skydoves/flexible/core/Logger.kt new file mode 100644 index 0000000..6428f44 --- /dev/null +++ b/flexible-core/src/commonMain/kotlin/com/skydoves/flexible/core/Logger.kt @@ -0,0 +1,19 @@ +/* + * Designed and developed by 2023 skydoves (Jaewoong Eum) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.skydoves.flexible.core + +@InternalFlexibleApi +public expect fun log(message: String) diff --git a/flexible-core/src/skiaMain/kotlin/com/skydoves/flexible/core/Logger.kt b/flexible-core/src/skiaMain/kotlin/com/skydoves/flexible/core/Logger.kt new file mode 100644 index 0000000..6d82054 --- /dev/null +++ b/flexible-core/src/skiaMain/kotlin/com/skydoves/flexible/core/Logger.kt @@ -0,0 +1,19 @@ +/* + * Designed and developed by 2023 skydoves (Jaewoong Eum) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.skydoves.flexible.core + +public actual fun log(message: String) { +}