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-2538 fixes

Browse source
This commit is contained in:
Evgenii Kozlov 2024-06-14 00:09:04 +02:00
parent b2eeb5e5d5
commit 9118882ec2
3 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/com/anytypeio/anytype/ui/relations/ObjectRelationListFragment.kt
View file

@ -14,6 +14,7 @@ import com.anytypeio.anytype.R
import com.anytypeio.anytype.core_models.Id
import com.anytypeio.anytype.core_models.Key
import com.anytypeio.anytype.core_models.primitives.SpaceId
import com.anytypeio.anytype.core_models.restrictions.ObjectRestriction
import com.anytypeio.anytype.core_ui.features.relations.DocumentRelationAdapter
import com.anytypeio.anytype.core_ui.reactive.textChanges
import com.anytypeio.anytype.core_utils.ext.arg
@ -188,6 +189,13 @@ open class ObjectRelationListFragment : BaseBottomSheetFragment<FragmentRelation
override fun onStart() {
jobs += lifecycleScope.subscribe(vm.commands) { command -> execute(command) }
jobs += lifecycleScope.subscribe(vm.toasts) { toast(it) }
jobs += lifecycleScope.subscribe(vm.restrictions) { restrictions ->
if (restrictions.contains(ObjectRestriction.RELATIONS) || restrictions.contains(ObjectRestriction.DETAILS)) {
binding.topToolbar.gone()
} else {
binding.topToolbar.visible()
}
}
jobs += lifecycleScope.subscribe(vm.isEditMode) { isEditMode ->
if (isEditMode) {
binding.btnEditOrDone.setText(R.string.done)

2
presentation/src/main/java/com/anytypeio/anytype/presentation/relations/ObjectRelationListViewModelFactory.kt
View file

@ -45,7 +45,7 @@ class ObjectRelationListViewModelFactory(
analytics = analytics,
storeOfRelations = storeOfRelations,
addRelationToObject = addRelationToObject,
restrictions = restrictions
objectRestrictionProvider = restrictions
) as T
}
}

4
presentation/src/main/java/com/anytypeio/anytype/presentation/relations/RelationListViewModel.kt
View file

@ -14,6 +14,7 @@ import com.anytypeio.anytype.core_models.Payload
import com.anytypeio.anytype.core_models.RelationFormat
import com.anytypeio.anytype.core_models.RelationLink
import com.anytypeio.anytype.core_models.ext.mapToObjectWrapperType
import com.anytypeio.anytype.core_models.restrictions.ObjectRestriction
import com.anytypeio.anytype.core_utils.diff.DefaultObjectDiffIdentifier
import com.anytypeio.anytype.domain.misc.UrlBuilder
import com.anytypeio.anytype.domain.`object`.UpdateDetail
@ -42,7 +43,7 @@ import timber.log.Timber
class RelationListViewModel(
private val relationListProvider: RelationListProvider,
private val restrictions: ObjectRestrictionProvider,
private val objectRestrictionProvider: ObjectRestrictionProvider,
private val lockedStateProvider: LockedStateProvider,
private val urlBuilder: UrlBuilder,
private val dispatcher: Dispatcher<Payload>,
@ -62,6 +63,7 @@ class RelationListViewModel(
private val isInAddMode = MutableStateFlow(false)
val commands = MutableSharedFlow<Command>(replay = 0)
val views = MutableStateFlow<List<Model>>(emptyList())
val restrictions = MutableStateFlow(objectRestrictionProvider.provide())
fun onStartListMode(ctx: Id) {
Timber.d("onStartListMode, ctx: $ctx")