Skip to content

Commit f2d5cb4

Browse files
authored
DROID-2905 Navigation | Enhancement | Misc. object type navigation fixes (#2194) (#2196)
1 parent a512446 commit f2d5cb4

File tree

3 files changed

+20
-6
lines changed

3 files changed

+20
-6
lines changed

app/src/main/java/com/anytypeio/anytype/ui/relations/value/ObjectValueFragment.kt

+13-5
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import com.anytypeio.anytype.presentation.home.OpenObjectNavigation
3030
import com.anytypeio.anytype.presentation.relations.value.`object`.ObjectValueViewModel
3131
import com.anytypeio.anytype.presentation.relations.value.`object`.ObjectValueViewModelFactory
3232
import com.anytypeio.anytype.presentation.relations.value.tagstatus.RelationContext
33+
import com.anytypeio.anytype.ui.base.navigation
3334
import com.anytypeio.anytype.ui.chats.ChatFragment
3435
import com.anytypeio.anytype.ui.date.DateObjectFragment
3536
import com.anytypeio.anytype.ui.editor.EditorFragment
@@ -122,8 +123,15 @@ class ObjectValueFragment : BaseBottomSheetComposeFragment() {
122123
)
123124
)
124125
}
125-
OpenObjectNavigation.NonValidObject -> {
126-
toast(getString(R.string.error_non_valid_object))
126+
is OpenObjectNavigation.OpenType -> {
127+
runCatching {
128+
navigation().openObjectType(
129+
objectId = nav.target,
130+
space = nav.space
131+
)
132+
}.onFailure {
133+
Timber.e(it, "Error while opening object type from ")
134+
}
127135
}
128136
is OpenObjectNavigation.OpenDateObject -> {
129137
runCatching {
@@ -138,12 +146,12 @@ class ObjectValueFragment : BaseBottomSheetComposeFragment() {
138146
Timber.e(it, "Failed to navigate to date object screen")
139147
}
140148
}
149+
OpenObjectNavigation.NonValidObject -> {
150+
toast(getString(R.string.error_non_valid_object))
151+
}
141152
is OpenObjectNavigation.UnexpectedLayoutError -> {
142153
toast(getString(R.string.error_unexpected_layout))
143154
}
144-
else -> {
145-
// Do nothing.
146-
}
147155
}
148156
}
149157
}

presentation/src/main/java/com/anytypeio/anytype/presentation/home/HomeScreenViewModel.kt

+6
Original file line numberDiff line numberDiff line change
@@ -2581,6 +2581,12 @@ fun ObjectType.Layout.navigation(
25812581
space = space
25822582
)
25832583
}
2584+
ObjectType.Layout.OBJECT_TYPE -> {
2585+
OpenObjectNavigation.OpenType(
2586+
target = target,
2587+
space = space
2588+
)
2589+
}
25842590
else -> {
25852591
OpenObjectNavigation.UnexpectedLayoutError(this)
25862592
}

presentation/src/main/java/com/anytypeio/anytype/presentation/relations/value/object/ObjectValueViewModel.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ class ObjectValueViewModel(
116116
}
117117
}
118118

119-
private suspend fun getSearchParams(
119+
private fun getSearchParams(
120120
relation: ObjectWrapper.Relation,
121121
query: String,
122122
ids: List<Id>

0 commit comments

Comments
 (0)