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

rename ConversationOperationDialog to ConversationsListBottomDialog

Browse Source 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2022-02-11 22:05:33 +01:00
parent 9423376ca7
commit dbf6b91260
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,7 +82,7 @@ import com.nextcloud.talk.models.database.UserEntity;
import com.nextcloud.talk.models.json.conversations.Conversation; import com.nextcloud.talk.models.json.conversations.Conversation;
import com.nextcloud.talk.models.json.participants.Participant; import com.nextcloud.talk.models.json.participants.Participant;
import com.nextcloud.talk.ui.dialog.ChooseAccountDialogFragment; import com.nextcloud.talk.ui.dialog.ChooseAccountDialogFragment;
import com.nextcloud.talk.ui.dialog.ConversationOperationDialog; import com.nextcloud.talk.ui.dialog.ConversationsListBottomDialog;
import com.nextcloud.talk.utils.ApiUtils; import com.nextcloud.talk.utils.ApiUtils;
import com.nextcloud.talk.utils.ClosedInterfaceImpl; import com.nextcloud.talk.utils.ClosedInterfaceImpl;
import com.nextcloud.talk.utils.ConductorRemapping; import com.nextcloud.talk.utils.ConductorRemapping;
@ -214,7 +214,7 @@ public class ConversationsListController extends BaseController implements Searc
private HashMap<String, GenericTextHeaderItem> callHeaderItems = new HashMap<>(); private HashMap<String, GenericTextHeaderItem> callHeaderItems = new HashMap<>();
private ConversationOperationDialog conversationOperationDialog; private ConversationsListBottomDialog conversationsListBottomDialog;
public ConversationsListController(Bundle bundle) { public ConversationsListController(Bundle bundle) {
super(); super();
@ -904,12 +904,12 @@ public class ConversationsListController extends BaseController implements Searc
Object clickedItem = adapter.getItem(position); Object clickedItem = adapter.getItem(position);
if (clickedItem != null) { if (clickedItem != null) {
Conversation conversation = ((ConversationItem) clickedItem).getModel(); Conversation conversation = ((ConversationItem) clickedItem).getModel();
conversationOperationDialog = new ConversationOperationDialog( conversationsListBottomDialog = new ConversationsListBottomDialog(
getActivity(), getActivity(),
this, this,
userUtils.getCurrentUser(), userUtils.getCurrentUser(),
conversation); conversation);
conversationOperationDialog.show(); conversationsListBottomDialog.show();
} }
} }
} }
@ -1026,6 +1026,17 @@ public class ConversationsListController extends BaseController implements Searc
bundle.putInt(BundleKeys.INSTANCE.getKEY_OPERATION_CODE(), 99); bundle.putInt(BundleKeys.INSTANCE.getKEY_OPERATION_CODE(), 99);
prepareAndShowBottomSheetWithBundle(bundle); prepareAndShowBottomSheetWithBundle(bundle);
// instead to use prepareAnd...
// use something like
//
// conversationOperationDialog = new ConversationOperationDialog(
// getActivity(),
// this,
// userUtils.getCurrentUser(),
// conversation);
// conversationOperationDialog.show();
} else { } else {
currentUser = userUtils.getCurrentUser(); currentUser = userUtils.getCurrentUser();

2
app/src/main/java/com/nextcloud/talk/ui/dialog/ConversationOperationDialog.kt → app/src/main/java/com/nextcloud/talk/ui/dialog/ConversationsListBottomDialog.kt
View File

@ -37,7 +37,7 @@ import org.parceler.Parcels
import javax.inject.Inject import javax.inject.Inject
@AutoInjector(NextcloudTalkApplication::class) @AutoInjector(NextcloudTalkApplication::class)
class ConversationOperationDialog( class ConversationsListBottomDialog(
val activity: Activity, val activity: Activity,
val controller: ConversationsListController, val controller: ConversationsListController,
val currentUser: UserEntity, val currentUser: UserEntity,