gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 12:09:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update animations

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-02-08 13:26:21 +01:00
parent b5407b5da8
commit 6e0d6b1d8a
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/CallMenuController.java
View File

@ -33,7 +33,6 @@ import android.view.ViewGroup;
import com.bluelinelabs.conductor.RouterTransaction; import com.bluelinelabs.conductor.RouterTransaction;
import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler; import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler;
import com.bluelinelabs.conductor.changehandler.VerticalChangeHandler;
import com.kennyc.bottomsheet.adapters.AppAdapter; import com.kennyc.bottomsheet.adapters.AppAdapter;
import com.nextcloud.talk.R; import com.nextcloud.talk.R;
import com.nextcloud.talk.adapters.items.AppItem; import com.nextcloud.talk.adapters.items.AppItem;
@ -206,13 +205,13 @@ public class CallMenuController extends BaseController implements FlexibleAdapte
.popChangeHandler(new HorizontalChangeHandler())); .popChangeHandler(new HorizontalChangeHandler()));
} else if (tag != 7) { } else if (tag != 7) {
getRouter().pushController(RouterTransaction.with(new EntryMenuController(bundle)) getRouter().pushController(RouterTransaction.with(new EntryMenuController(bundle))
.pushChangeHandler(new VerticalChangeHandler()) .pushChangeHandler(new HorizontalChangeHandler())
.popChangeHandler(new VerticalChangeHandler())); .popChangeHandler(new HorizontalChangeHandler()));
} else { } else {
bundle.putParcelable(BundleKeys.KEY_MENU_TYPE, Parcels.wrap(MenuType.SHARE)); bundle.putParcelable(BundleKeys.KEY_MENU_TYPE, Parcels.wrap(MenuType.SHARE));
getRouter().pushController(RouterTransaction.with(new CallMenuController(bundle)) getRouter().pushController(RouterTransaction.with(new CallMenuController(bundle))
.pushChangeHandler(new VerticalChangeHandler()) .pushChangeHandler(new HorizontalChangeHandler())
.popChangeHandler(new VerticalChangeHandler())); .popChangeHandler(new HorizontalChangeHandler()));
} }
} }
} }
@ -233,8 +232,8 @@ public class CallMenuController extends BaseController implements FlexibleAdapte
bundle.putString(BundleKeys.KEY_APP_ITEM_PACKAGE_NAME, appItem.getPackageName()); bundle.putString(BundleKeys.KEY_APP_ITEM_PACKAGE_NAME, appItem.getPackageName());
bundle.putString(BundleKeys.KEY_APP_ITEM_NAME, appItem.getName()); bundle.putString(BundleKeys.KEY_APP_ITEM_NAME, appItem.getName());
getRouter().pushController(RouterTransaction.with(new EntryMenuController(bundle)) getRouter().pushController(RouterTransaction.with(new EntryMenuController(bundle))
.pushChangeHandler(new VerticalChangeHandler()) .pushChangeHandler(new HorizontalChangeHandler())
.popChangeHandler(new VerticalChangeHandler())); .popChangeHandler(new HorizontalChangeHandler()));
} }
} }
} else if (menuType.equals(MenuType.NEW_CONVERSATION) && position != 0) { } else if (menuType.equals(MenuType.NEW_CONVERSATION) && position != 0) {
@ -247,8 +246,8 @@ public class CallMenuController extends BaseController implements FlexibleAdapte
if (getParentController() != null && getParentController().getParentController() != null) { if (getParentController() != null && getParentController().getParentController() != null) {
getParentController().getParentController().getRouter().pushController( getParentController().getParentController().getRouter().pushController(
(RouterTransaction.with(new ContactsController(bundle)) (RouterTransaction.with(new ContactsController(bundle))
.pushChangeHandler(new VerticalChangeHandler()) .pushChangeHandler(new HorizontalChangeHandler())
.popChangeHandler(new VerticalChangeHandler()))); .popChangeHandler(new HorizontalChangeHandler())));
} }
} else { } else {
bundle = new Bundle(); bundle = new Bundle();