|
@@ -11,7 +11,7 @@ public class AnimationsOptions {
|
11
|
11
|
|
12
|
12
|
options.push = NestedAnimationsOptions.parse(json.optJSONObject("push"));
|
13
|
13
|
options.pop = NestedAnimationsOptions.parse(json.optJSONObject("pop"));
|
14
|
|
- options.startApp = AnimationOptions.parse(json.optJSONObject("startApp"));
|
|
14
|
+ options.setRoot = AnimationOptions.parse(json.optJSONObject("setRoot"));
|
15
|
15
|
options.showModal = AnimationOptions.parse(json.optJSONObject("showModal"));
|
16
|
16
|
options.dismissModal = AnimationOptions.parse(json.optJSONObject("dismissModal"));
|
17
|
17
|
|
|
@@ -20,14 +20,14 @@ public class AnimationsOptions {
|
20
|
20
|
|
21
|
21
|
public NestedAnimationsOptions push = new NestedAnimationsOptions();
|
22
|
22
|
public NestedAnimationsOptions pop = new NestedAnimationsOptions();
|
23
|
|
- public AnimationOptions startApp = new AnimationOptions();
|
|
23
|
+ public AnimationOptions setRoot = new AnimationOptions();
|
24
|
24
|
public AnimationOptions showModal = new AnimationOptions();
|
25
|
25
|
public AnimationOptions dismissModal = new AnimationOptions();
|
26
|
26
|
|
27
|
27
|
public void mergeWith(AnimationsOptions other) {
|
28
|
28
|
push.mergeWith(other.push);
|
29
|
29
|
pop.mergeWith(other.pop);
|
30
|
|
- startApp.mergeWith(other.startApp);
|
|
30
|
+ setRoot.mergeWith(other.setRoot);
|
31
|
31
|
showModal.mergeWith(other.showModal);
|
32
|
32
|
dismissModal.mergeWith(other.dismissModal);
|
33
|
33
|
}
|
|
@@ -35,7 +35,7 @@ public class AnimationsOptions {
|
35
|
35
|
void mergeWithDefault(AnimationsOptions defaultOptions) {
|
36
|
36
|
push.mergeWithDefault(defaultOptions.push);
|
37
|
37
|
pop.mergeWithDefault(defaultOptions.pop);
|
38
|
|
- startApp.mergeWithDefault(defaultOptions.startApp);
|
|
38
|
+ setRoot.mergeWithDefault(defaultOptions.setRoot);
|
39
|
39
|
showModal.mergeWithDefault(defaultOptions.showModal);
|
40
|
40
|
dismissModal.mergeWithDefault(defaultOptions.dismissModal);
|
41
|
41
|
}
|