From 29bce98fd9fbd7e1e8ef05e3569a444401355385 Mon Sep 17 00:00:00 2001 From: Lukas Woehrl Date: Wed, 4 Jan 2017 22:39:46 +0100 Subject: [PATCH] enums for csharp and java --- csharp/Facebook.Yoga/YogaAlign.cs | 1 + gentest/gentest-java.js | 2 +- java/com/facebook/yoga/YogaAlign.java | 4 +++- java/tests/com/facebook/yoga/YGAlignBaseline.java | 8 ++++---- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/csharp/Facebook.Yoga/YogaAlign.cs b/csharp/Facebook.Yoga/YogaAlign.cs index 80835d73..71b8b33b 100644 --- a/csharp/Facebook.Yoga/YogaAlign.cs +++ b/csharp/Facebook.Yoga/YogaAlign.cs @@ -16,5 +16,6 @@ namespace Facebook.Yoga Center, FlexEnd, Stretch, + Baseline, } } diff --git a/gentest/gentest-java.js b/gentest/gentest-java.js index 6d8afd0c..1c510c48 100644 --- a/gentest/gentest-java.js +++ b/gentest/gentest-java.js @@ -100,7 +100,7 @@ JavaEmitter.prototype = Object.create(Emitter.prototype, { YGAlignFlexEnd:{value:'YogaAlign.FLEX_END'}, YGAlignFlexStart:{value:'YogaAlign.FLEX_START'}, YGAlignStretch:{value:'YogaAlign.STRETCH'}, - YGAlignBaseline:{value:'YogaAlign.Baseline'}, + YGAlignBaseline:{value:'YogaAlign.BASELINE'}, YGDirectionInherit:{value:'YogaDirection.INHERIT'}, YGDirectionLTR:{value:'YogaDirection.LTR'}, diff --git a/java/com/facebook/yoga/YogaAlign.java b/java/com/facebook/yoga/YogaAlign.java index 74bcde73..7466dcda 100644 --- a/java/com/facebook/yoga/YogaAlign.java +++ b/java/com/facebook/yoga/YogaAlign.java @@ -17,7 +17,8 @@ public enum YogaAlign { FLEX_START(1), CENTER(2), FLEX_END(3), - STRETCH(4); + STRETCH(4), + BASELINE(5); private int mIntValue; @@ -36,6 +37,7 @@ public enum YogaAlign { case 2: return CENTER; case 3: return FLEX_END; case 4: return STRETCH; + case 5: return BASELINE; default: throw new IllegalArgumentException("Unkown enum value: " + value); } } diff --git a/java/tests/com/facebook/yoga/YGAlignBaseline.java b/java/tests/com/facebook/yoga/YGAlignBaseline.java index c7969020..1acb633a 100644 --- a/java/tests/com/facebook/yoga/YGAlignBaseline.java +++ b/java/tests/com/facebook/yoga/YGAlignBaseline.java @@ -20,7 +20,7 @@ public class YGAlignBaseline { public void test_align_baseline() { final YogaNode root = new YogaNode(); root.setFlexDirection(YogaFlexDirection.ROW); - root.setAlignItems(YogaAlign.Baseline); + root.setAlignItems(YogaAlign.BASELINE); root.setWidth(100f); root.setHeight(100f); @@ -74,7 +74,7 @@ public class YGAlignBaseline { public void test_align_baseline_child() { final YogaNode root = new YogaNode(); root.setFlexDirection(YogaFlexDirection.ROW); - root.setAlignItems(YogaAlign.Baseline); + root.setAlignItems(YogaAlign.BASELINE); root.setWidth(100f); root.setHeight(100f); @@ -143,7 +143,7 @@ public class YGAlignBaseline { public void test_align_baseline_double_nested_child() { final YogaNode root = new YogaNode(); root.setFlexDirection(YogaFlexDirection.ROW); - root.setAlignItems(YogaAlign.Baseline); + root.setAlignItems(YogaAlign.BASELINE); root.setWidth(100f); root.setHeight(100f); @@ -226,7 +226,7 @@ public class YGAlignBaseline { @Test public void test_align_baseline_column() { final YogaNode root = new YogaNode(); - root.setAlignItems(YogaAlign.Baseline); + root.setAlignItems(YogaAlign.BASELINE); root.setWidth(100f); root.setHeight(100f);