anyproto/anytype-kotlin
1
0
Fork 0
mirror of https://github.com/anyproto/anytype-kotlin.git synced 2025-06-08 05:47:05 +09:00
Code Activity

DROID-290 Navigation | Enhancement | Open bookmark object instead of opening system browser (#2495)

Browse source
This commit is contained in:
Evgenii Kozlov 2022-08-09 20:04:56 +03:00 • committed by GitHub
parent 89cdb6b848
commit 4d8768771f
Signed by: github
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

3
presentation/src/main/java/com/anytypeio/anytype/presentation/editor/render/DefaultBlockViewRenderer.kt
View file

@ -1510,8 +1510,7 @@ class DefaultBlockViewRenderer @Inject constructor(
color = block.textColor()
)
}
ObjectType.Layout.FILE, ObjectType.Layout.IMAGE -> {
ObjectType.Layout.FILE, ObjectType.Layout.IMAGE, ObjectType.Layout.BOOKMARK -> {
BlockView.Title.Basic(
mode = blockMode,
id = block.id,

3
presentation/src/main/java/com/anytypeio/anytype/presentation/objects/SupportedLayouts.kt
View file

@ -11,6 +11,7 @@ object SupportedLayouts {
ObjectType.Layout.PROFILE,
ObjectType.Layout.SET,
ObjectType.Layout.TODO,
ObjectType.Layout.NOTE
ObjectType.Layout.NOTE,
ObjectType.Layout.BOOKMARK
)
}

3
presentation/src/main/java/com/anytypeio/anytype/presentation/search/ObjectSearchViewModel.kt
View file

@ -128,7 +128,8 @@ open class ObjectSearchViewModel(
ObjectType.Layout.TODO,
ObjectType.Layout.NOTE,
ObjectType.Layout.FILE,
ObjectType.Layout.IMAGE -> {
ObjectType.Layout.IMAGE,
ObjectType.Layout.BOOKMARK -> {
navigate(EventWrapper(AppNavigation.Command.LaunchDocument(id = target)))
}
ObjectType.Layout.SET -> {

24
presentation/src/main/java/com/anytypeio/anytype/presentation/sets/ObjectSetViewModel.kt
View file

@ -588,29 +588,16 @@ class ObjectSetViewModel(
val record = records.records.find { rec -> rec[Relations.ID] == target }
if (record != null) {
val obj = ObjectWrapper.Basic(record)
if (obj.layout != ObjectType.Layout.BOOKMARK) {
proceedWithNavigation(
target = target,
layout = obj.layout
)
} else {
proceedWithBrowsingBookmarkObject(obj)
}
proceedWithNavigation(
target = target,
layout = obj.layout
)
} else {
toast("Record not found. Please, try again later.")
}
}
}
private fun proceedWithBrowsingBookmarkObject(obj: ObjectWrapper.Basic) {
val url = obj.url
if (url.isNullOrEmpty()) {
toast("Url is empty.")
} else {
dispatch(ObjectSetCommand.Intent.GoTo(url))
}
}
fun onTaskCheckboxClicked(target: Id) {
val set = reducer.state.value
if (set.isInitialized) {
@ -1102,7 +1089,8 @@ class ObjectSetViewModel(
ObjectType.Layout.TODO,
ObjectType.Layout.NOTE,
ObjectType.Layout.IMAGE,
ObjectType.Layout.FILE -> proceedWithOpeningPage(target)
ObjectType.Layout.FILE,
ObjectType.Layout.BOOKMARK -> proceedWithOpeningPage(target)
ObjectType.Layout.SET -> {
viewModelScope.launch {
closeBlock(CloseBlock.Params(context)).process(

3
presentation/src/main/java/com/anytypeio/anytype/presentation/sets/RelationValueBaseViewModel.kt
View file

@ -300,7 +300,8 @@ abstract class RelationValueBaseViewModel(
ObjectType.Layout.TODO,
ObjectType.Layout.FILE,
ObjectType.Layout.IMAGE,
ObjectType.Layout.NOTE -> {
ObjectType.Layout.NOTE,
ObjectType.Layout.BOOKMARK -> {
viewModelScope.launch {
navigation.emit(AppNavigation.Command.OpenObject(id))
}