Skip to content

Commit

Permalink
Fix dragging issue on the nested scroll components
Browse files Browse the repository at this point in the history
  • Loading branch information
skydoves committed Aug 4, 2024
1 parent 688b8f7 commit c389da5
Show file tree
Hide file tree
Showing 6 changed files with 69 additions and 1 deletion.
4 changes: 4 additions & 0 deletions flexible-core/api/android/flexible-core.api
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
4 changes: 4 additions & 0 deletions flexible-core/api/desktop/flexible-core.api
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
Original file line number Diff line number Diff line change
@@ -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)
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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)
Original file line number Diff line number Diff line change
@@ -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) {
}

0 comments on commit c389da5

Please # to comment.