Skip to content

Fix navigation for 3 dot menu in EditorModal #2875

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix navigation for 3 dot menu in EditorModal #2875

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions app/src/main/java/com/anytypeio/anytype/ui/editor/EditorFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1029,6 +1029,11 @@ open class EditorFragment : NavigationFragment<FragmentEditorBinding>(R.layout.f

private fun execute(event: EventWrapper<Command>) {
Timber.d("Executing command: $event")
val currentDestinationId = if (this.parentFragment is EditorModalFragment) {
R.id.editorModalScreen
} else {
R.id.pageScreen
}
event.getContentIfNotHandled()?.let { command ->
when (command) {
is Command.OpenDocumentImagePicker -> {
Expand All @@ -1050,7 +1055,7 @@ open class EditorFragment : NavigationFragment<FragmentEditorBinding>(R.layout.f
is Command.OpenDocumentEmojiIconPicker -> {
hideSoftInput()
findNavController().safeNavigate(
R.id.pageScreen,
currentDestinationId,
R.id.action_pageScreen_to_objectIconPickerScreen,
bundleOf(
IconPickerFragmentBase.ARG_CONTEXT_ID_KEY to command.ctx,
Expand Down Expand Up @@ -1108,7 +1113,7 @@ open class EditorFragment : NavigationFragment<FragmentEditorBinding>(R.layout.f
is Command.OpenDocumentMenu -> {
hideKeyboard()
findNavController().safeNavigate(
currentDestinationId = R.id.pageScreen,
currentDestinationId = currentDestinationId,
id = R.id.objectMenuScreen,
args = ObjectMenuFragment.args(
ctx = command.ctx,
Expand All @@ -1125,7 +1130,7 @@ open class EditorFragment : NavigationFragment<FragmentEditorBinding>(R.layout.f
}
is Command.OpenCoverGallery -> {
findNavController().safeNavigate(
currentDestinationId = R.id.pageScreen,
currentDestinationId = currentDestinationId,
id = R.id.action_pageScreen_to_objectCoverScreen,
args = SelectCoverObjectFragment.args(
ctx = command.ctx,
Expand Down Expand Up @@ -1177,7 +1182,7 @@ open class EditorFragment : NavigationFragment<FragmentEditorBinding>(R.layout.f
is Command.OpenObjectRelationScreen.RelationList -> {
hideKeyboard()
findNavController().safeNavigate(
R.id.pageScreen,
currentDestinationId,
R.id.objectRelationListScreen,
bundleOf(
ObjectFieldsFragment.ARG_CTX to command.ctx,
Expand Down Expand Up @@ -1383,7 +1388,7 @@ open class EditorFragment : NavigationFragment<FragmentEditorBinding>(R.layout.f
is Command.OpenObjectTypeMenu -> openObjectTypeMenu(command)
is Command.OpenObjectRelationScreen.Value.TagOrStatus -> {
findNavController().safeNavigate(
R.id.pageScreen,
currentDestinationId,
R.id.nav_relations,
TagOrStatusValueFragment.args(
ctx = command.ctx,
Expand All @@ -1397,7 +1402,7 @@ open class EditorFragment : NavigationFragment<FragmentEditorBinding>(R.layout.f
}
is Command.OpenObjectRelationScreen.Value.ObjectValue -> {
findNavController().safeNavigate(
R.id.pageScreen,
currentDestinationId,
R.id.objectValueScreen,
ObjectValueFragment.args(
ctx = command.ctx,
Expand All @@ -1411,7 +1416,7 @@ open class EditorFragment : NavigationFragment<FragmentEditorBinding>(R.layout.f
}
is Command.SetObjectIcon -> {
findNavController().safeNavigate(
R.id.pageScreen,
currentDestinationId,
R.id.objectIconPickerScreen,
bundleOf(
IconPickerFragmentBase.ARG_CONTEXT_ID_KEY to ctx,
Expand All @@ -1421,7 +1426,7 @@ open class EditorFragment : NavigationFragment<FragmentEditorBinding>(R.layout.f
}
is Command.OpenShareScreen -> {
findNavController().safeNavigate(
currentDestinationId = R.id.pageScreen,
currentDestinationId = currentDestinationId,
id = R.id.shareSpaceScreen,
args = ShareSpaceFragment.args(command.space),
errorMessage = "Error while opening share screen"
Expand Down