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

Fix an issue with cancelling bottom sheet

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-12-08 00:05:30 +01:00
parent 5227620689
commit d189c49367
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java
View File

@ -22,6 +22,7 @@ package com.nextcloud.talk.controllers;
import android.app.SearchManager;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
@ -807,14 +808,16 @@ public class ContactsController extends BaseController implements SearchView.OnQ
RouterTransaction.with(new OperationsMenuController(bundle))
.popChangeHandler(new VerticalChangeHandler())
.pushChangeHandler(new VerticalChangeHandler()));
bottomSheet.setOnShowListener(dialog -> eventBus.post(new BottomSheetLockEvent(false, 0,
false, false)));
}
if (bottomSheet == null) {
bottomSheet = new BottomSheet.Builder(getActivity()).setView(view).create();
}
bottomSheet.setOnShowListener(dialog -> eventBus.post(new BottomSheetLockEvent(false, 0,
false, false)));
bottomSheet.setOnDismissListener(dialog -> getActionBar().setDisplayHomeAsUpEnabled(getRouter().getBackstackSize() > 1));
bottomSheet.show();
}

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

@ -535,6 +535,7 @@ public class ConversationsListController extends BaseController implements Searc
}
bottomSheet.setOnShowListener(dialog -> new KeyboardUtils(getActivity(), bottomSheet.getLayout(), true));
bottomSheet.setOnDismissListener(dialog -> getActionBar().setDisplayHomeAsUpEnabled(getRouter().getBackstackSize() > 1));
bottomSheet.show();
}

2
app/src/main/java/com/nextcloud/talk/controllers/base/BaseController.java
View File

@ -104,7 +104,7 @@ public abstract class BaseController extends ButterKnifeController {
protected void onAttach(@NonNull View view) {
setTitle();
if (getActionBar() != null) {
getActionBar().setDisplayHomeAsUpEnabled(getRouter().getBackstackSize() > 1);
getActionBar().setDisplayHomeAsUpEnabled(getParentController() != null || getRouter().getBackstackSize() > 1);
}
super.onAttach(view);
}