gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-13 07:44:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix issues with the bottom sheet

Browse Source
This commit is contained in:
Mario Danic 2018-11-29 16:21:41 +01:00
parent 2ec45391de
commit 40b03de7a7
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -261,9 +261,7 @@ public class CallMenuController extends BaseController implements FlexibleAdapte
eventBus.post(new BottomSheetLockEvent(true, 0, false, true)); eventBus.post(new BottomSheetLockEvent(true, 0, false, true));
bundle = new Bundle(); bundle = new Bundle();
bundle.putBoolean(BundleKeys.KEY_NEW_CONVERSATION, true); bundle.putBoolean(BundleKeys.KEY_NEW_CONVERSATION, true);
getParentController().getParentController().getRouter().pushController((RouterTransaction.with getParentController().getRouter().pushController((RouterTransaction.with(new ContactsController(bundle))
(new ContactsController
(bundle))
.pushChangeHandler(new VerticalChangeHandler()) .pushChangeHandler(new VerticalChangeHandler())
.popChangeHandler(new VerticalChangeHandler()))); .popChangeHandler(new VerticalChangeHandler())));
} else { } else {

1
app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.java
View File

@ -134,6 +134,7 @@ public class EntryMenuController extends BaseController {
if (originalBundle.containsKey(BundleKeys.KEY_SPREED_CAPABILITIES)) { if (originalBundle.containsKey(BundleKeys.KEY_SPREED_CAPABILITIES)) {
bundle.putParcelable(BundleKeys.KEY_SPREED_CAPABILITIES, originalBundle.getParcelable(BundleKeys.KEY_SPREED_CAPABILITIES)); bundle.putParcelable(BundleKeys.KEY_SPREED_CAPABILITIES, originalBundle.getParcelable(BundleKeys.KEY_SPREED_CAPABILITIES));
} }
getRouter().pushController(RouterTransaction.with(new OperationsMenuController(bundle)) getRouter().pushController(RouterTransaction.with(new OperationsMenuController(bundle))
.pushChangeHandler(new HorizontalChangeHandler()) .pushChangeHandler(new HorizontalChangeHandler())
.popChangeHandler(new HorizontalChangeHandler())); .popChangeHandler(new HorizontalChangeHandler()));

15
app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java
View File

@ -630,17 +630,10 @@ public class OperationsMenuController extends BaseController {
conversationIntent.putExtras(bundle); conversationIntent.putExtras(bundle);
if (getParentController() != null) { if (getParentController() != null) {
if (getParentController().getParentController() != null) { getParentController().getRouter().pushController(RouterTransaction.with(new
getParentController().getParentController().getRouter().pushController(RouterTransaction.with(new ChatController(bundle))
ChatController(bundle)) .pushChangeHandler(new HorizontalChangeHandler())
.pushChangeHandler(new HorizontalChangeHandler()) .popChangeHandler(new HorizontalChangeHandler()));
.popChangeHandler(new HorizontalChangeHandler()));
} else {
getParentController().getRouter().pushController(RouterTransaction.with(new
ChatController(bundle))
.pushChangeHandler(new HorizontalChangeHandler())
.popChangeHandler(new HorizontalChangeHandler()));
}
} }
} else { } else {