Skip to content
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

Jump to bottom

add support for no Anchor onSwipe #617

Merged
merged 10 commits into from
May 27, 2022
Merged

add support for no Anchor onSwipe #617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4a3ef6b
fix desig time lockout of on click
jafu888 May 19, 2022
cbb4ffe
Merge branch 'main' into to_ship
jafu888 May 19, 2022
345be5d
fix ConstraintLayout Compose chain
jafu888 May 24, 2022
56c59b2
add support for weights and margins
jafu888 May 25, 2022
6f2d273
resolve comments & clean up spaces
jafu888 May 25, 2022
a823ee2
resolve comments & clean up spaces
jafu888 May 25, 2022
27c57ec
Merge branch 'to_ship' of https://github.com/androidx/constraintlayou…
jafu888 May 25, 2022
6bdeb1d
resolve oscar comments
jafu888 May 25, 2022
f295440
Merge branch 'main' into to_ship
jafu888 May 25, 2022
ad2fbfe
add support for onSwipe to work with and Anchor
jafu888 May 25, 2022
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
39 changes: 31 additions & 8 deletions constraintlayout/core/src/main/java/androidx/constraintlayout/core/state/Transition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import androidx.constraintlayout.core.widgets.ConstraintWidgetContainer;

import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;

public class Transition implements TypedValues {
Expand Down Expand Up @@ -78,7 +79,7 @@ public boolean hasOnSwipe() {
}

static class OnSwipe {
private String mAnchorId;
String mAnchorId;
private int mAnchorSide;
private StopEngine mEngine;
public static final int ANCHOR_SIDE_TOP = 0;
Expand Down Expand Up @@ -162,6 +163,10 @@ static class OnSwipe {
};
private long mStart;

float getScale() {
return mDragScale;
}

float[] getDirection() {
return TOUCH_DIRECTION[mDragDirection];
}
Expand Down Expand Up @@ -362,9 +367,27 @@ public boolean isNotDone(float progress) {
* @return the change in progress
*/
public float dragToProgress(float currentProgress, int baseW, int baseH, float dx, float dy) {
if (mOnSwipe == null || mOnSwipe.mAnchorId == null) {
WidgetState w = mState.values().stream().findFirst().get();
return -dy / w.mParentHeight;
Collection<WidgetState> widgets = mState.values();
WidgetState childWidget = null;
for (WidgetState widget : widgets) {
childWidget = widget;
break;
}
if (mOnSwipe == null || childWidget == null) {
if (childWidget != null) {
return -dy / childWidget.mParentHeight;
}
return 1.0f;
}
if (mOnSwipe.mAnchorId == null) {

float[] dir = mOnSwipe.getDirection();
float motionDpDtX = childWidget.mParentHeight;
float motionDpDtY = childWidget.mParentHeight;

float drag = (dir[0] != 0) ? dx * Math.abs(dir[0]) / motionDpDtX
: dy * Math.abs(dir[1]) / motionDpDtY;
return drag * mOnSwipe.getScale();
}
WidgetState base = mState.get(mOnSwipe.mAnchorId);
float[] dir = mOnSwipe.getDirection();
Expand All @@ -378,7 +401,7 @@ public float dragToProgress(float currentProgress, int baseW, int baseH, float d
if (DEBUG) {
Utils.log(" drag " + drag);
}
return drag;
return drag * mOnSwipe.getScale();
}

/**
Expand Down Expand Up @@ -412,7 +435,7 @@ public void setTouchUp(float currentProgress,
}

float drag = (dir[0] != 0) ? velocityX / motionDpDt[0] : velocityY / motionDpDt[1];

drag *= mOnSwipe.getScale();
if (DEBUG) {
Utils.log(" >>> velocity " + drag);
Utils.log(" >>> mDuration " + mDuration);
Expand Down Expand Up @@ -825,8 +848,8 @@ static class WidgetState {
MotionWidget mMotionWidgetEnd;
MotionWidget mMotionWidgetInterpolated;
KeyCache mKeyCache = new KeyCache();
private int mParentHeight = -1;
private int mParentWidth = -1;
int mParentHeight = -1;
int mParentWidth = -1;

WidgetState() {
mStart = new WidgetFrame();
Expand Down
4 changes: 3 additions & 1 deletion ...ts/ComposeConstraintLayout/app/src/main/java/com/example/constraintlayout/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import com.google.accompanist.coil.rememberCoilPainter
class MainActivity : AppCompatActivity() {
private var mFrameLayout: FrameLayout? = null
private var composeNum = 0
private val START_NUMBER = 6
private val START_NUMBER = 48
private var demos:ArrayList<CompFunc> = ArrayList()
var map = HashMap<Int, String>();
val linkServer = LinkServer()
Expand Down Expand Up @@ -153,6 +153,8 @@ class MainActivity : AppCompatActivity() {
demos.add(object : CompFunc { @Composable override fun Run() { OnSwipeExperiment() } })
demos.add(object : CompFunc { @Composable override fun Run() { OnSwipeSample1() } })
demos.add(object : CompFunc { @Composable override fun Run() { OnSwipeSample2() } })
demos.add(object : CompFunc { @Composable override fun Run() { OnSwipeSample3() } })

demos.add(object : CompFunc { @Composable override fun Run() { MultiSwipe() } })
demos.add(object : CompFunc { @Composable override fun Run() { MotionArc() } })
demos.add(object : CompFunc { @Composable override fun Run() { MotionEasing() } })
Expand Down
70 changes: 70 additions & 0 deletions ...mposeConstraintLayout/app/src/main/java/com/example/constraintlayout/OnSwipeExperiment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,76 @@ fun OnSwipeSample2() {
.background(Color.White),
motionScene = MotionScene(content = scene),
) {
Text(
text = "on Swipe example \n"+
" onSwipe: {\n" +
" anchor: 'box',\n" +
" direction: 'end',\n" +
" side: 'start',\n" +
" mode: 'spring'\n" +
" }"
)
Box(
modifier = Modifier
.background(Color.Green)
.layoutId("box")
)
}
}
}

@Preview
@Composable
fun OnSwipeSample3() {

var scene =
"""
{
ConstraintSets: {
start: {
box: {
width: 50, height: 50,
bottom: ['parent', 'bottom', 70],
start: ['parent', 'start', 170],
}
},
end: {

box: {
width: 50, height: 50,
top: ['parent', 'top', 170],
end: ['parent', 'end', 170],
}
}
},
Transitions: {
default: {
from: 'start',
to: 'end',
onSwipe: {
direction: 'end',
mode: 'spring',
scale: .3,
}
}
}
}
""".trimIndent()

Column {
MotionLayout(
modifier = Modifier
.fillMaxSize()
.background(Color.White),
motionScene = MotionScene(content = scene),
) {
Text(
text = "on Swipe example \n"+
" onSwipe: {\n" +
" direction: 'end',\n" +
" mode: 'spring'\n" +
" }"
)
Box(
modifier = Modifier
.background(Color.Green)
Expand Down