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-256 Types | Enhancement | Disabled change-type option for bookmark objects (#2496)

Browse source
This commit is contained in:
Evgenii Kozlov 2022-08-09 20:21:20 +03:00 • committed by GitHub
parent 9a656ce0c4
commit ddc8b3748c
Signed by: github
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 28 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core-models/src/main/java/com/anytypeio/anytype/core_models/ObjectWrapper.kt
View file

@ -78,6 +78,8 @@ sealed class ObjectWrapper {
val url: String? by default
val featuredRelations: List<String>? by default
fun isEmpty(): Boolean = map.isEmpty()
}
}

9
core-ui/src/main/java/com/anytypeio/anytype/core_ui/menu/ObjectTypePopupMenu.kt
View file

@ -9,10 +9,15 @@ class ObjectTypePopupMenu(
context: Context,
view: View,
onChangeTypeClicked: () -> Unit,
onOpenSetClicked: () -> Unit
onOpenSetClicked: () -> Unit,
allowChangingObjectType: Boolean = false
) : PopupMenu(context, view) {
init {
menuInflater.inflate(R.menu.menu_object_type, menu)
if (allowChangingObjectType) {
menuInflater.inflate(R.menu.menu_object_type, menu)
} else {
menuInflater.inflate(R.menu.menu_object_type_change_disabled, menu)
}
setOnMenuItemClickListener { item ->
when(item.itemId) {
R.id.change_type -> onChangeTypeClicked()

3
core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/FeaturedRelationGroupWidget.kt
View file

@ -232,7 +232,8 @@ class FeaturedRelationGroupWidget : ConstraintLayout {
},
onOpenSetClicked = {
click(ListenerType.Relation.ObjectTypeOpenSet(type = relation.type))
}
},
allowChangingObjectType = item.allowChangingObjectType
)
popup.show()
}

6
core-ui/src/main/res/menu/menu_object_type_change_disabled.xml Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/open_set"
android:title="@string/open_set" />
</menu>

3
presentation/src/main/java/com/anytypeio/anytype/presentation/editor/editor/model/BlockView.kt
View file

@ -1142,7 +1142,8 @@ sealed class BlockView : ViewType {
data class FeaturedRelation(
override val id: String,
val relations: List<DocumentRelationView>
val relations: List<DocumentRelationView>,
val allowChangingObjectType : Boolean = true
) : BlockView() {
override fun getViewType(): Int = HOLDER_FEATURED_RELATION
}

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

@ -5,6 +5,7 @@ import com.anytypeio.anytype.core_models.Block.Content
import com.anytypeio.anytype.core_models.CoverType
import com.anytypeio.anytype.core_models.Id
import com.anytypeio.anytype.core_models.ObjectType
import com.anytypeio.anytype.core_models.ObjectType.Companion.BOOKMARK_TYPE
import com.anytypeio.anytype.core_models.ObjectWrapper
import com.anytypeio.anytype.core_models.Relation
import com.anytypeio.anytype.core_models.Relations
@ -2013,19 +2014,17 @@ class DefaultBlockViewRenderer @Inject constructor(
details: Block.Details,
relations: List<Relation>
): BlockView.FeaturedRelation {
val featured = details.details[ctx]?.featuredRelations ?: emptyList()
val views = mutableListOf<DocumentRelationView>()
views.addAll(
mapFeaturedRelations(
ctx = ctx,
ids = featured,
details = details,
relations = relations
)
val obj = ObjectWrapper.Basic(details.details[ctx]?.map ?: emptyMap())
val views = mapFeaturedRelations(
ctx = ctx,
ids = obj.featuredRelations ?: emptyList(),
details = details,
relations = relations
)
return BlockView.FeaturedRelation(
id = block.id,
relations = views
relations = views,
allowChangingObjectType = !obj.type.contains(BOOKMARK_TYPE)
)
}