From 879098ca8cc6d26a5488d32b5b58e3b4c464b5a1 Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Fri, 15 Jun 2018 11:39:51 +0200 Subject: [PATCH] Change transitions and update back call color Signed-off-by: Mario Danic --- .../talk/controllers/CallNotificationController.java | 6 ++++-- app/src/main/res/layout/activity_call.xml | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java index 4c50ae13e..c39bf5b7b 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java @@ -136,8 +136,10 @@ public class CallNotificationController extends BaseController { originalBundle.putString(BundleKeys.KEY_ROOM_TOKEN, currentRoom.getToken()); List routerTransactions = new ArrayList<>(); - routerTransactions.add(RouterTransaction.with(new MagicBottomNavigationController())); - routerTransactions.add(RouterTransaction.with(new ChatController(originalBundle))); + routerTransactions.add(RouterTransaction.with(new MagicBottomNavigationController()) + .popChangeHandler(new HorizontalChangeHandler()).pushChangeHandler(new HorizontalChangeHandler())); + routerTransactions.add(RouterTransaction.with(new ChatController(originalBundle)).popChangeHandler(new + HorizontalChangeHandler()).pushChangeHandler(new HorizontalChangeHandler())); getRouter().setBackstack(routerTransactions, new HorizontalChangeHandler()); } diff --git a/app/src/main/res/layout/activity_call.xml b/app/src/main/res/layout/activity_call.xml index 12c942060..2d3ffce23 100644 --- a/app/src/main/res/layout/activity_call.xml +++ b/app/src/main/res/layout/activity_call.xml @@ -32,7 +32,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:animateLayoutChanges="true" - android:background="#000000" + android:background="@color/grey950" android:orientation="vertical">