Support setting transitions in view controller

README.md

@@ -31,8 +31,6 @@ The `Screen` class is extendable, and will provide you with the foundation for y
 ```java
 
 @ViewController(MyController.class)
-@EnterTransition(FadeTransition.class)
-@ExitTransition(FadeTransition.class)
 public class MyScreen extends Screen {
 }
 ```
@@ -57,8 +55,6 @@ You can also [use view binders like Butterknife](https://github.com/lyft/scoop/b
 ```java
 
 @ViewController(MyController.class)
-@EnterTransition(FadeTransition.class)
-@ExitTransition(FadeTransition.class)
 public class MyScreen extends Screen {
 }
 ```
@@ -94,12 +90,10 @@ The big difference from Android fragments and activities is that in Scoop we don
 Layout
 ===============
 
-A `Layout` annotation can be used similarly to `ViewController` annotation, and can accomplish the same goals. However, there is a higher degree of coupling between the controller and the view in this approach, so this implementation is generally not recommended. 
+A `Layout` annotation can be used similarly to `ViewController` annotation, and can accomplish the same goals. However, there is a higher degree of coupling between the controller and the view in this approach, so this implementation is generally not recommended.
 
 ```java
 @Layout(R.layout.my)
-@EnterTransition(FadeTransition.class)
-@ExitTransition(FadeTransition.class)
 public class MyScreen extends Screen {
 }
 ```
@@ -202,13 +196,22 @@ Transitions are animations played between moving from one `ViewController` to an
 4. Upward slide
 5. Fade
 
-To apply a transition you have to specify it for your `Screen` using `EnterTranstion`/`ExitTransition` attributes.
+To apply a transition you have to specify it for your `ViewController` by overriding `enterTransition()`/`exitTransition()` methods.
 
 ```java
-@EnterTransition(FadeTransition.class)
-@ExitTransition(FadeTransition.class)
-public class MyScreen extends Screen {
-  ...
+public class MyController extends ViewController {
+
+    @Override
+    protected ScreenTransition enterTransition() {
+        return new ForwardSlideTransition();
+    }
+
+    @Override
+    protected ScreenTransition exitTransition() {
+        return new BackwardSlideTransition();
+    }
+
+    ...
 }
 ```
 

scoop-basics/src/main/java/com/example/scoop/basics/ui/layoutsample/layout/NestedLayoutViewController.java

@@ -9,7 +9,9 @@
 import com.example.scoop.basics.scoop.AppRouter;
 import com.example.scoop.basics.ui.BaseViewController;
 import com.example.scoop.basics.ui.layoutsample.module.NestedViewModule;
+import com.lyft.scoop.ScreenTransition;
 import com.lyft.scoop.dagger.DaggerInjector;
+import com.lyft.scoop.transitions.FadeTransition;
 import javax.inject.Inject;
 
 public class NestedLayoutViewController extends BaseViewController {
@@ -53,4 +55,14 @@ public void onDetach() {
     public void goBack() {
         appRouter.goBack();
     }
+
+    @Override
+    protected ScreenTransition enterTransition() {
+        return new FadeTransition();
+    }
+
+    @Override
+    protected ScreenTransition exitTransition() {
+        return new FadeTransition();
+    }
 }

scoop-basics/src/main/java/com/example/scoop/basics/ui/layoutsample/screen/NestedLayoutScreen.java

@@ -3,15 +3,10 @@
 import com.example.scoop.basics.ui.layoutsample.layout.NestedLayoutViewController;
 import com.example.scoop.basics.ui.layoutsample.module.NestedLayoutModule;
 import com.lyft.scoop.Controller;
-import com.lyft.scoop.EnterTransition;
-import com.lyft.scoop.ExitTransition;
 import com.lyft.scoop.Screen;
 import com.lyft.scoop.dagger.DaggerModule;
-import com.lyft.scoop.transitions.FadeTransition;
 
 @Controller(NestedLayoutViewController.class)
 @DaggerModule(NestedLayoutModule.class)
-@EnterTransition(FadeTransition.class)
-@ExitTransition(FadeTransition.class)
 public class NestedLayoutScreen extends Screen {
 }

scoop-basics/src/main/java/com/example/scoop/basics/ui/navigationsample/controller/AController.java

@@ -6,6 +6,8 @@
 import com.example.scoop.basics.scoop.AppRouter;
 import com.example.scoop.basics.ui.BaseViewController;
 import com.example.scoop.basics.ui.navigationsample.screen.BScreen;
+import com.lyft.scoop.ScreenTransition;
+import com.lyft.scoop.transitions.FadeTransition;
 import javax.inject.Inject;
 
 public class AController extends BaseViewController {
@@ -44,4 +46,14 @@ public void toast() {
         Toast.makeText(getView().getContext(), TOAST_TEXT,
                 Toast.LENGTH_SHORT).show();
     }
+
+    @Override
+    protected ScreenTransition enterTransition() {
+        return new FadeTransition();
+    }
+
+    @Override
+    protected ScreenTransition exitTransition() {
+        return new FadeTransition();
+    }
 }

scoop-basics/src/main/java/com/example/scoop/basics/ui/navigationsample/controller/BController.java

@@ -5,6 +5,8 @@
 import com.example.scoop.basics.scoop.AppRouter;
 import com.example.scoop.basics.ui.BaseViewController;
 import com.example.scoop.basics.ui.navigationsample.screen.CScreen;
+import com.lyft.scoop.ScreenTransition;
+import com.lyft.scoop.transitions.FadeTransition;
 import javax.inject.Inject;
 
 public class BController extends BaseViewController {
@@ -40,4 +42,14 @@ public void goBack() {
     public void goToB() {
         appRouter.goTo(new CScreen());
     }
+
+    @Override
+    protected ScreenTransition enterTransition() {
+        return new FadeTransition();
+    }
+
+    @Override
+    protected ScreenTransition exitTransition() {
+        return new FadeTransition();
+    }
 }

scoop-basics/src/main/java/com/example/scoop/basics/ui/navigationsample/controller/CController.java

@@ -5,6 +5,9 @@
 import com.example.scoop.basics.scoop.AppRouter;
 import com.example.scoop.basics.ui.BaseViewController;
 import com.example.scoop.basics.ui.navigationsample.screen.AScreen;
+import com.lyft.scoop.ScreenTransition;
+import com.lyft.scoop.transitions.BackwardSlideTransition;
+import com.lyft.scoop.transitions.ForwardSlideTransition;
 import javax.inject.Inject;
 
 public class CController extends BaseViewController {
@@ -35,4 +38,14 @@ public void onDetach() {
     public void onClick() {
         appRouter.resetTo(new AScreen());
     }
+
+    @Override
+    protected ScreenTransition enterTransition() {
+        return new ForwardSlideTransition();
+    }
+
+    @Override
+    protected ScreenTransition exitTransition() {
+        return new BackwardSlideTransition();
+    }
 }

scoop-basics/src/main/java/com/example/scoop/basics/ui/navigationsample/screen/AScreen.java

@@ -3,15 +3,10 @@
 import com.example.scoop.basics.ui.navigationsample.controller.AController;
 import com.example.scoop.basics.ui.navigationsample.module.AModule;
 import com.lyft.scoop.Controller;
-import com.lyft.scoop.EnterTransition;
-import com.lyft.scoop.ExitTransition;
 import com.lyft.scoop.Screen;
 import com.lyft.scoop.dagger.DaggerModule;
-import com.lyft.scoop.transitions.FadeTransition;
 
 @Controller(AController.class)
 @DaggerModule(AModule.class)
-@EnterTransition(FadeTransition.class)
-@ExitTransition(FadeTransition.class)
 public class AScreen extends Screen {
 }

scoop-basics/src/main/java/com/example/scoop/basics/ui/navigationsample/screen/BScreen.java

@@ -3,16 +3,10 @@
 import com.example.scoop.basics.ui.navigationsample.controller.BController;
 import com.example.scoop.basics.ui.navigationsample.module.BModule;
 import com.lyft.scoop.Controller;
-import com.lyft.scoop.EnterTransition;
-import com.lyft.scoop.ExitTransition;
 import com.lyft.scoop.Screen;
 import com.lyft.scoop.dagger.DaggerModule;
-import com.lyft.scoop.transitions.BackwardSlideTransition;
-import com.lyft.scoop.transitions.ForwardSlideTransition;
 
 @Controller(BController.class)
 @DaggerModule(BModule.class)
-@EnterTransition(ForwardSlideTransition.class)
-@ExitTransition(BackwardSlideTransition.class)
 public class BScreen extends Screen {
 }

scoop-basics/src/main/java/com/example/scoop/basics/ui/navigationsample/screen/CScreen.java

@@ -3,16 +3,10 @@
 import com.example.scoop.basics.ui.navigationsample.controller.CController;
 import com.example.scoop.basics.ui.navigationsample.module.CModule;
 import com.lyft.scoop.Controller;
-import com.lyft.scoop.EnterTransition;
-import com.lyft.scoop.ExitTransition;
 import com.lyft.scoop.Screen;
 import com.lyft.scoop.dagger.DaggerModule;
-import com.lyft.scoop.transitions.BackwardSlideTransition;
-import com.lyft.scoop.transitions.ForwardSlideTransition;
 
 @Controller(CController.class)
 @DaggerModule(CModule.class)
-@EnterTransition(ForwardSlideTransition.class)
-@ExitTransition(BackwardSlideTransition.class)
 public class CScreen extends Screen {
 }

scoop-basics/src/main/java/com/example/scoop/basics/ui/paramsample/controller/ParametrizedController.java

@@ -6,6 +6,8 @@
 import com.example.scoop.basics.ui.BaseViewController;
 import com.example.scoop.basics.ui.paramsample.screen.ParametrizedScreen;
 import com.lyft.scoop.Screen;
+import com.lyft.scoop.ScreenTransition;
+import com.lyft.scoop.transitions.FadeTransition;
 import javax.inject.Inject;
 
 public class ParametrizedController extends BaseViewController {
@@ -34,4 +36,14 @@ public void onAttach() {
     public void onDetach() {
         super.onDetach();
     }
+
+    @Override
+    protected ScreenTransition enterTransition() {
+        return new FadeTransition();
+    }
+
+    @Override
+    protected ScreenTransition exitTransition() {
+        return new FadeTransition();
+    }
 }

scoop-basics/src/main/java/com/example/scoop/basics/ui/paramsample/screen/ParametrizedScreen.java

@@ -3,16 +3,11 @@
 import com.example.scoop.basics.ui.paramsample.controller.ParametrizedController;
 import com.example.scoop.basics.ui.paramsample.module.ParametrizedModule;
 import com.lyft.scoop.Controller;
-import com.lyft.scoop.EnterTransition;
-import com.lyft.scoop.ExitTransition;
 import com.lyft.scoop.Screen;
 import com.lyft.scoop.dagger.DaggerModule;
-import com.lyft.scoop.transitions.FadeTransition;
 
 @Controller(ParametrizedController.class)
 @DaggerModule(ParametrizedModule.class)
-@EnterTransition(FadeTransition.class)
-@ExitTransition(FadeTransition.class)
 public class ParametrizedScreen extends Screen {
 
     private final String args;

scoop-basics/src/main/java/com/example/scoop/basics/ui/transitions/customtransition/controller/AutoTransitionEndController.java

@@ -5,6 +5,8 @@
 import com.example.scoop.basics.rx.ViewSubscriptions;
 import com.example.scoop.basics.scoop.AppRouter;
 import com.example.scoop.basics.ui.BaseViewController;
+import com.example.scoop.basics.ui.transitions.customtransition.AutoTransition;
+import com.lyft.scoop.ScreenTransition;
 import javax.inject.Inject;
 
 public class AutoTransitionEndController extends BaseViewController {
@@ -39,4 +41,14 @@ public void onDetach() {
     public void goNext() {
         appRouter.goBack();
     }
+
+    @Override
+    protected ScreenTransition enterTransition() {
+        return new AutoTransition();
+    }
+
+    @Override
+    protected ScreenTransition exitTransition() {
+        return new AutoTransition();
+    }
 }

scoop-basics/src/main/java/com/example/scoop/basics/ui/transitions/customtransition/controller/AutoTransitionStartController.java

@@ -6,6 +6,8 @@
 import com.example.scoop.basics.scoop.AppRouter;
 import com.example.scoop.basics.ui.BaseViewController;
 import com.example.scoop.basics.ui.transitions.customtransition.screen.AutoTransitionEndScreen;
+import com.lyft.scoop.ScreenTransition;
+import com.lyft.scoop.transitions.FadeTransition;
 import javax.inject.Inject;
 
 public class AutoTransitionStartController extends BaseViewController {
@@ -40,4 +42,14 @@ public void onDetach() {
     public void goNext() {
         appRouter.goTo(new AutoTransitionEndScreen());
     }
+
+    @Override
+    protected ScreenTransition enterTransition() {
+        return new FadeTransition();
+    }
+
+    @Override
+    protected ScreenTransition exitTransition() {
+        return new FadeTransition();
+    }
 }

scoop-basics/src/main/java/com/example/scoop/basics/ui/transitions/customtransition/screen/AutoTransitionEndScreen.java

@@ -1,17 +1,12 @@
 package com.example.scoop.basics.ui.transitions.customtransition.screen;
 
-import com.example.scoop.basics.ui.transitions.customtransition.AutoTransition;
 import com.example.scoop.basics.ui.transitions.customtransition.controller.AutoTransitionEndController;
 import com.example.scoop.basics.ui.transitions.customtransition.module.AutoTransitionEndModule;
 import com.lyft.scoop.Controller;
-import com.lyft.scoop.EnterTransition;
-import com.lyft.scoop.ExitTransition;
 import com.lyft.scoop.Screen;
 import com.lyft.scoop.dagger.DaggerModule;
 
 @Controller(AutoTransitionEndController.class)
 @DaggerModule(AutoTransitionEndModule.class)
-@EnterTransition(AutoTransition.class)
-@ExitTransition(AutoTransition.class)
 public class AutoTransitionEndScreen extends Screen {
 }

scoop-basics/src/main/java/com/example/scoop/basics/ui/transitions/customtransition/screen/AutoTransitionStartScreen.java

@@ -1,17 +1,12 @@
 package com.example.scoop.basics.ui.transitions.customtransition.screen;
 
-import com.example.scoop.basics.ui.transitions.customtransition.AutoTransition;
 import com.example.scoop.basics.ui.transitions.customtransition.controller.AutoTransitionStartController;
 import com.example.scoop.basics.ui.transitions.customtransition.module.AutoTransitionStartModule;
 import com.lyft.scoop.Controller;
-import com.lyft.scoop.EnterTransition;
-import com.lyft.scoop.ExitTransition;
 import com.lyft.scoop.Screen;
 import com.lyft.scoop.dagger.DaggerModule;
 
 @Controller(AutoTransitionStartController.class)
 @DaggerModule(AutoTransitionStartModule.class)
-@EnterTransition(AutoTransition.class)
-@ExitTransition(AutoTransition.class)
 public class AutoTransitionStartScreen extends Screen {
-}
+}

scoop-basics/src/main/java/com/example/scoop/basics/ui/transitions/dialogtransitions/controller/DialogController.java

@@ -4,6 +4,9 @@
 import com.example.scoop.basics.R;
 import com.example.scoop.basics.scoop.DialogRouter;
 import com.example.scoop.basics.ui.BaseViewController;
+import com.example.scoop.basics.ui.transitions.dialogtransitions.SlideDownTransition;
+import com.example.scoop.basics.ui.transitions.dialogtransitions.SlideUpTransition;
+import com.lyft.scoop.ScreenTransition;
 import javax.inject.Inject;
 
 public class DialogController extends BaseViewController {
@@ -24,4 +27,14 @@ protected int layoutId() {
     public void goToB() {
         dialogRouter.dismiss();
     }
+
+    @Override
+    protected ScreenTransition enterTransition() {
+        return new SlideUpTransition();
+    }
+
+    @Override
+    protected ScreenTransition exitTransition() {
+        return new SlideDownTransition();
+    }
 }