Skip to content

Commit 33c828b

Browse files
committed
Merge pull request lgvalle#22 from lgvalle/fix-slide-direction
Replace START and END with LEFT and RIGHT on Gravity
2 parents e6c86cc + 26e78ca commit 33c828b

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ To do this you need to include shared element transition information as part of
321321
FragmentB fragmentB = FragmentB.newInstance(sample);
322322

323323
// Defines enter transition for all fragment views
324-
Slide slideTransition = new Slide(Gravity.END);
324+
Slide slideTransition = new Slide(Gravity.RIGHT);
325325
slideTransition.setDuration(1000);
326326
sharedElementFragment2.setEnterTransition(slideTransition);
327327

@@ -354,7 +354,7 @@ This works for both Fragments and Activities shared element transitions.
354354
FragmentB fragmentB = FragmentB.newInstance(sample);
355355

356356
// Defines enter transition for all fragment views
357-
Slide slideTransition = new Slide(Gravity.END);
357+
Slide slideTransition = new Slide(Gravity.RIGHT);
358358
slideTransition.setDuration(1000);
359359
sharedElementFragment2.setEnterTransition(slideTransition);
360360

‎app/src/main/java/com/lgvalle/material_animations/AnimationsActivity1.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ private void changePosition() {
8787
if (positionChanged) {
8888
lp.gravity = Gravity.CENTER;
8989
} else {
90-
lp.gravity = Gravity.START;
90+
lp.gravity = Gravity.LEFT;
9191
}
9292
positionChanged = !positionChanged;
9393
square.setLayoutParams(lp);

‎app/src/main/java/com/lgvalle/material_animations/MainActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ protected void onCreate(Bundle savedInstanceState) {
2828
private void setupWindowAnimations() {
2929
// Re-enter transition is executed when returning to this activity
3030
Slide slideTransition = new Slide();
31-
slideTransition.setSlideEdge(Gravity.START);
31+
slideTransition.setSlideEdge(Gravity.LEFT);
3232
slideTransition.setDuration(getResources().getInteger(R.integer.anim_duration_long));
3333
getWindow().setReenterTransition(slideTransition);
3434
getWindow().setExitTransition(slideTransition);

‎app/src/main/java/com/lgvalle/material_animations/SharedElementActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ private void setupWindowAnimations() {
3333

3434
private void setupLayout(Sample sample) {
3535
// Transition for fragment1
36-
Slide slideTransition = new Slide(Gravity.START);
36+
Slide slideTransition = new Slide(Gravity.LEFT);
3737
slideTransition.setDuration(getResources().getInteger(R.integer.anim_duration_long));
3838
// Create fragment and define some of it transitions
3939
SharedElementFragment1 sharedElementFragment1 = SharedElementFragment1.newInstance(sample);

‎app/src/main/java/com/lgvalle/material_animations/SharedElementFragment1.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public void onClick(View v) {
5656
private void addNextFragment(Sample sample, ImageView squareBlue, boolean overlap) {
5757
SharedElementFragment2 sharedElementFragment2 = SharedElementFragment2.newInstance(sample);
5858

59-
Slide slideTransition = new Slide(Gravity.END);
59+
Slide slideTransition = new Slide(Gravity.RIGHT);
6060
slideTransition.setDuration(getResources().getInteger(R.integer.anim_duration_medium));
6161

6262
ChangeBounds changeBoundsTransition = new ChangeBounds();

0 commit comments

Comments
 (0)