Skip to content
This repository was archived by the owner on Dec 27, 2024. It is now read-only.

Commit 0d55669

Browse files
jswong65jswong65
committed
Split experiment
1 parent 5767f16 commit 0d55669

File tree

6 files changed

+322
-0
lines changed

6 files changed

+322
-0
lines changed

‎constraintlayout/core/src/main/java/androidx/constraintlayout/core/state/ConstraintSetParser.java

+46
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import androidx.constraintlayout.core.state.helpers.ChainReference;
3737
import androidx.constraintlayout.core.state.helpers.FlowReference;
3838
import androidx.constraintlayout.core.state.helpers.GuidelineReference;
39+
import androidx.constraintlayout.core.state.helpers.SplitReference;
3940
import androidx.constraintlayout.core.widgets.ConstraintWidget;
4041
import androidx.constraintlayout.core.widgets.Flow;
4142

@@ -538,6 +539,12 @@ public static void parseJSON(String content, State state,
538539
(CLObject) element
539540
);
540541
break;
542+
case "Split":
543+
parseSplitType(state,
544+
elementName,
545+
layoutVariables,
546+
(CLObject) element);
547+
break;
541548
}
542549
} else {
543550
parseWidget(state, layoutVariables,
@@ -854,6 +861,45 @@ private static void parseChainType(String orientation,
854861
}
855862
}
856863

864+
private static void parseSplitType(State state,
865+
String name,
866+
LayoutVariables layoutVariables,
867+
CLObject element) throws CLParsingException {
868+
869+
SplitReference split = state.getSplit(name);
870+
871+
for (String param : element.names()) {
872+
switch (param) {
873+
case "contains":
874+
CLArray list = element.getArrayOrNull(param);
875+
if (list != null) {
876+
for (int j = 0; j < list.size(); j++) {
877+
878+
String elementNameReference = list.get(j).content();
879+
ConstraintReference elementReference =
880+
state.constraints(elementNameReference);
881+
if (PARSER_DEBUG) {
882+
System.out.println(
883+
"Add REFERENCE "
884+
+ "($elementNameReference = $elementReference) "
885+
+ "TO BARRIER "
886+
);
887+
}
888+
split.add(elementReference);
889+
}
890+
}
891+
break;
892+
case "orientation":
893+
int orientation = element.get(param).getInt();
894+
split.setOrientation(orientation);
895+
break;
896+
default:
897+
ConstraintReference reference = state.constraints(name);
898+
applyAttribute(state, layoutVariables, reference, element, param);
899+
}
900+
}
901+
}
902+
857903
/**
858904
* It's used to parse the Flow type of Helper with the following format:
859905
* flowID: {

‎constraintlayout/core/src/main/java/androidx/constraintlayout/core/state/State.java

+15
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import androidx.constraintlayout.core.state.helpers.FlowReference;
2828
import androidx.constraintlayout.core.state.helpers.GuidelineReference;
2929
import androidx.constraintlayout.core.state.helpers.HorizontalChainReference;
30+
import androidx.constraintlayout.core.state.helpers.SplitReference;
3031
import androidx.constraintlayout.core.state.helpers.VerticalChainReference;
3132
import androidx.constraintlayout.core.widgets.ConstraintWidget;
3233
import androidx.constraintlayout.core.widgets.ConstraintWidgetContainer;
@@ -93,6 +94,7 @@ public enum Helper {
9394
LAYER,
9495
HORIZONTAL_FLOW,
9596
VERTICAL_FLOW,
97+
SPLIT,
9698
FLOW
9799
}
98100

@@ -324,6 +326,10 @@ public HelperReference helper(Object key, State.Helper type) {
324326
reference = new FlowReference(this, type);
325327
}
326328
break;
329+
case SPLIT: {
330+
reference = new SplitReference(this, type);
331+
}
332+
break;
327333
default: {
328334
reference = new HelperReference(this, type);
329335
}
@@ -368,6 +374,15 @@ public BarrierReference barrier(Object key, Direction direction) {
368374
return (BarrierReference) reference.getFacade();
369375
}
370376

377+
public SplitReference getSplit(Object key) {
378+
ConstraintReference reference = constraints(key);
379+
if (reference.getFacade() == null || !(reference.getFacade() instanceof SplitReference)) {
380+
SplitReference flowReference = new SplitReference(this, Helper.SPLIT);
381+
reference.setFacade(flowReference);
382+
}
383+
return (SplitReference) reference.getFacade();
384+
}
385+
371386
/**
372387
* Gets a reference to a Flow object. Creating it if needed.
373388
* @param key id of the reference

‎constraintlayout/core/src/main/java/androidx/constraintlayout/core/state/helpers/SplitReference.java

+81
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
package androidx.constraintlayout.core.state.helpers;
2+
3+
import androidx.constraintlayout.core.state.HelperReference;
4+
import androidx.constraintlayout.core.state.State;
5+
import androidx.constraintlayout.core.utils.Split;
6+
import androidx.constraintlayout.core.widgets.ConstraintWidget;
7+
import androidx.constraintlayout.core.widgets.Flow;
8+
import androidx.constraintlayout.core.widgets.HelperWidget;
9+
10+
public class SplitReference extends HelperReference {
11+
12+
public SplitReference(State state, State.Helper type) {
13+
super(state, type);
14+
}
15+
16+
protected Split mSplit;
17+
18+
protected ConstraintWidget mLeft;
19+
20+
protected ConstraintWidget mRight;
21+
22+
protected int mOrientation;
23+
24+
public ConstraintWidget getLeft() {
25+
return mLeft;
26+
}
27+
28+
public void setLeft(ConstraintWidget mLeft) {
29+
this.mLeft = mLeft;
30+
}
31+
32+
public ConstraintWidget getRight() {
33+
return mRight;
34+
}
35+
36+
public void setRight(ConstraintWidget mRight) {
37+
this.mRight = mRight;
38+
}
39+
40+
@Override
41+
public HelperWidget getHelperWidget() {
42+
if (mSplit == null) {
43+
mSplit = new Split();
44+
}
45+
return mSplit;
46+
}
47+
48+
@Override
49+
public void setHelperWidget(HelperWidget widget) {
50+
if (widget instanceof Flow) {
51+
mSplit = (Split) widget;
52+
} else {
53+
mSplit = null;
54+
}
55+
}
56+
57+
public int getOrientation() {
58+
return mOrientation;
59+
}
60+
61+
public void setOrientation(int orientation) {
62+
mOrientation = orientation;
63+
64+
}
65+
66+
@Override
67+
public void apply() {
68+
if (mLeft != null) {
69+
mSplit.setFirst(mLeft);
70+
}
71+
72+
if (mRight != null) {
73+
mSplit.setSecond(mRight);
74+
}
75+
76+
mSplit.setOrientation(mOrientation);
77+
78+
// General attributes of a widget
79+
applyBase();
80+
}
81+
}

‎constraintlayout/core/src/main/java/androidx/constraintlayout/core/utils/Split.java

+114
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
package androidx.constraintlayout.core.utils;
2+
3+
import androidx.constraintlayout.core.LinearSystem;
4+
import androidx.constraintlayout.core.widgets.ConstraintWidget;
5+
import androidx.constraintlayout.core.widgets.ConstraintWidgetContainer;
6+
import androidx.constraintlayout.core.widgets.VirtualLayout;
7+
8+
public class Split extends VirtualLayout {
9+
10+
ConstraintWidget splitBar;
11+
12+
ConstraintWidget first;
13+
ConstraintWidget second;
14+
ConstraintWidgetContainer mContainer;
15+
int orientation;
16+
17+
public Split() {
18+
splitBar = new ConstraintWidget();
19+
first = new ConstraintWidget();
20+
second = new ConstraintWidget();
21+
}
22+
23+
public void setFirst(ConstraintWidget a) {
24+
first = a;
25+
}
26+
27+
public void setSecond(ConstraintWidget b) {
28+
second = b;
29+
}
30+
31+
public void setSplitBar(ConstraintWidget splitBar) {
32+
this.splitBar = splitBar;
33+
}
34+
35+
public ConstraintWidget getFirst() {
36+
return first;
37+
}
38+
39+
public ConstraintWidget getSecond() {
40+
return second;
41+
}
42+
43+
public ConstraintWidget getSplitBar() {
44+
return splitBar;
45+
}
46+
47+
public ConstraintWidgetContainer getContainer() {
48+
return mContainer;
49+
}
50+
51+
public void setContainer(ConstraintWidgetContainer container) {
52+
mContainer = container;
53+
}
54+
55+
public int getOrientation() {
56+
return orientation;
57+
}
58+
59+
public void setOrientation(int orientation) {
60+
this.orientation = orientation;
61+
}
62+
63+
@Override
64+
public void measure(int widthMode, int widthSize, int heightMode, int heightSize) {
65+
super.measure(widthMode, widthSize, heightMode, heightSize);
66+
for (int i = 0; i < mWidgetsCount; i++) {
67+
if (i == 0) {
68+
setFirst(mWidgets[i]);
69+
} else if (i == 1) {
70+
setSecond(mWidgets[i]);
71+
} else if (i == 2) {
72+
setSplitBar(mWidgets[i]);
73+
}
74+
}
75+
splitBar.stringId = String.valueOf(splitBar.hashCode());
76+
first.stringId = String.valueOf(first.hashCode());
77+
second.stringId = String.valueOf(second.hashCode());
78+
}
79+
80+
@Override
81+
public void addToSolver(LinearSystem system, boolean optimize) {
82+
this.mTop.connect(getParent().mTop, 0);
83+
this.mLeft.connect(getParent().mLeft, 0);
84+
this.mRight.connect(getParent().mRight, 0);
85+
this.mBottom.connect(getParent().mBottom, 0);
86+
87+
splitBar.mTop.connect(mTop, 0);
88+
splitBar.mBottom.connect(mBottom, 0);
89+
splitBar.mLeft.connect(mLeft, 0);
90+
splitBar.mRight.connect(mRight, 0);
91+
92+
if (orientation == 0) {
93+
first.mLeft.connect(mLeft, 0);
94+
first.mRight.connect(splitBar.mLeft, 0);
95+
first.mTop.connect(mTop, 0);
96+
first.mBottom.connect(mBottom, 0);
97+
98+
second.mLeft.connect(splitBar.mRight, 0);
99+
second.mRight.connect(mRight, 0);
100+
second.mTop.connect(mTop, 0);
101+
second.mBottom.connect(mBottom, 0);
102+
} else {
103+
first.mLeft.connect(mLeft, 0);
104+
first.mRight.connect(mRight, 0);
105+
first.mTop.connect(mTop, 0);
106+
first.mBottom.connect(splitBar.mTop, 0);
107+
108+
second.mLeft.connect(mLeft, 0);
109+
second.mRight.connect(mRight, 0);
110+
second.mTop.connect(splitBar.mBottom, 0);
111+
second.mBottom.connect(mBottom, 0);
112+
}
113+
}
114+
}

‎constraintlayout/core/src/test/java/androidx/constraintlayout/core/FlowTest.java

+37
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
import static org.junit.Assert.assertEquals;
2323

24+
import androidx.constraintlayout.core.utils.Split;
2425
import androidx.constraintlayout.core.widgets.ConstraintAnchor;
2526
import androidx.constraintlayout.core.widgets.ConstraintWidget;
2627
import androidx.constraintlayout.core.widgets.ConstraintWidgetContainer;
@@ -230,4 +231,40 @@ public void didMeasures() {
230231
System.out.println("A: " + a);
231232
System.out.println("B: " + b);
232233
}
234+
@Test
235+
public void testSplit() {
236+
ConstraintWidgetContainer root = new ConstraintWidgetContainer(50, 50);
237+
Split split = new Split();
238+
split.setDebugName("split");
239+
240+
split.setHorizontalDimensionBehaviour(ConstraintWidget.DimensionBehaviour.MATCH_PARENT);
241+
split.setVerticalDimensionBehaviour(ConstraintWidget.DimensionBehaviour.MATCH_PARENT);
242+
split.connect(ConstraintAnchor.Type.LEFT, root, ConstraintAnchor.Type.LEFT);
243+
split.connect(ConstraintAnchor.Type.RIGHT, root, ConstraintAnchor.Type.RIGHT);
244+
split.connect(ConstraintAnchor.Type.TOP, root, ConstraintAnchor.Type.TOP);
245+
split.connect(ConstraintAnchor.Type.BOTTOM, root, ConstraintAnchor.Type.BOTTOM);
246+
split.setOrientation(1);
247+
root.add(split);
248+
split.setContainer(root);
249+
root.setMeasurer(new BasicMeasure.Measurer() {
250+
@Override
251+
public void measure(ConstraintWidget widget, BasicMeasure.Measure measure) {
252+
measure.measuredWidth = widget.getWidth();
253+
measure.measuredHeight = widget.getHeight();
254+
}
255+
256+
@Override
257+
public void didMeasures() {
258+
259+
}
260+
});
261+
root.setMeasurer(sMeasurer);
262+
root.measure(Optimizer.OPTIMIZATION_NONE,
263+
0, 0, 0, 0, 0, 0, 0, 0);
264+
//root.layout();
265+
System.out.println("root: " + root);
266+
System.out.println("flow: " + split);
267+
System.out.println("A: " + split.getFirst());
268+
System.out.println("B: " + split.getSecond());
269+
}
233270
}

‎projects/ComposeConstraintLayout/app/src/main/java/com/example/constraintlayout/FlowDemo.kt

+29
Original file line numberDiff line numberDiff line change
@@ -209,3 +209,32 @@ fun FlowBasicDemo6() {
209209
}
210210
}
211211

212+
// test adding constraints to parent
213+
@Preview(group = "split")
214+
@Composable
215+
fun SplitDemo1() {
216+
ConstraintLayout(
217+
ConstraintSet("""
218+
{
219+
split: {
220+
height: 'parent',
221+
width: 'parent',
222+
type: 'Split',
223+
orientation: 1,
224+
contains: ['btn1', 'btn2', 'btn3'],
225+
}
226+
}
227+
""".trimIndent()),
228+
modifier = Modifier.fillMaxSize()) {
229+
val numArray = arrayOf("btn1", "btn2", "btn3")
230+
for (num in numArray) {
231+
Button(
232+
modifier = Modifier.layoutId(num),
233+
onClick = {},
234+
) {
235+
Text(text = num)
236+
}
237+
}
238+
}
239+
}
240+

0 commit comments

Comments
 (0)