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-3589 Type screen | Fix | Back navigation (#2336)

Browse source
This commit is contained in:
Konstantin Ivanov 2025-04-17 16:04:30 +02:00 • committed by Evgenii Kozlov
parent 526284ef95
commit 5581e08abf
10 changed files with 68 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

4
feature-object-type/src/main/java/com/anytypeio/anytype/feature_object_type/fields/UiEvent.kt
View file

@ -4,9 +4,9 @@ import com.anytypeio.anytype.core_models.Id
sealed class FieldEvent {
data object OnEditPropertyScreenDismiss : FieldEvent()
data object OnDismissScreen : FieldEvent()
data object OnBackClick : FieldEvent()
data object OnEditPropertyScreenDismiss : FieldEvent()
data class OnFieldItemClick(val item: UiFieldsListItem) : FieldEvent()

9
feature-object-type/src/main/java/com/anytypeio/anytype/feature_object_type/fields/ui/ListScreen.kt
View file

@ -1,6 +1,7 @@
package com.anytypeio.anytype.feature_object_type.fields.ui
import android.os.Build
import androidx.activity.compose.BackHandler
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.Image
import androidx.compose.foundation.background
@ -86,6 +87,7 @@ import kotlinx.coroutines.delay
import sh.calvin.reorderable.ReorderableItem
import sh.calvin.reorderable.ReorderableLazyListState
import sh.calvin.reorderable.rememberReorderableLazyListState
import timber.log.Timber
@OptIn(ExperimentalFoundationApi::class)
@Composable
@ -121,6 +123,11 @@ fun FieldsMainScreen(
}
}
BackHandler(enabled = true) {
Timber.d("Back pressed on Properties Screen")
fieldEvent.invoke(FieldEvent.OnDismissScreen)
}
Scaffold(
modifier = Modifier
.nestedScroll(rememberNestedScrollInteropConnection())
@ -136,7 +143,7 @@ fun FieldsMainScreen(
uiTitleState = uiTitleState,
uiIconState = uiIconState,
onBackClick = {
fieldEvent(OnBackClick)
fieldEvent(FieldEvent.OnDismissScreen)
}
)
},

3
feature-object-type/src/main/java/com/anytypeio/anytype/feature_object_type/ui/UiEvent.kt
View file

@ -2,7 +2,6 @@ package com.anytypeio.anytype.feature_object_type.ui
import com.anytypeio.anytype.core_models.ObjectType.Layout
import com.anytypeio.anytype.core_models.multiplayer.SpaceSyncAndP2PStatusState
import com.anytypeio.anytype.presentation.objects.ObjectIcon
import com.anytypeio.anytype.presentation.objects.custom_icon.CustomIconColor
import com.anytypeio.anytype.presentation.templates.TemplateView
@ -43,7 +42,7 @@ sealed class TypeEvent {
//endregion
data object OnLayoutButtonClick : TypeEvent()
data object OnFieldsButtonClick : TypeEvent()
data object OnPropertiesButtonClick : TypeEvent()
data object OnTemplatesButtonClick : TypeEvent()
//region Icon picker

4
feature-object-type/src/main/java/com/anytypeio/anytype/feature_object_type/ui/UiState.kt
View file

@ -29,10 +29,6 @@ sealed class ObjectTypeCommand {
val spaceId: Id
) : ObjectTypeCommand()
data object OpenTypePropertiesListScreen : ObjectTypeCommand()
data object CloseFieldsScreen : ObjectTypeCommand()
data class OpenAddNewPropertyScreen(val typeId: Id, val space: Id) : ObjectTypeCommand()
}

2
feature-object-type/src/main/java/com/anytypeio/anytype/feature_object_type/ui/header/HorizontalButtons.kt
View file

@ -56,7 +56,7 @@ fun HorizontalButtons(
if (uiPropertiesButtonState is UiPropertiesButtonState.Visible) {
Row(
modifier = modifierButton.noRippleThrottledClickable {
onTypeEvent(TypeEvent.OnFieldsButtonClick)
onTypeEvent(TypeEvent.OnPropertiesButtonClick)
},
verticalAlignment = Alignment.CenterVertically
) {

17
feature-object-type/src/main/java/com/anytypeio/anytype/feature_object_type/viewmodel/ObjectTypeViewModel.kt
View file

@ -175,6 +175,8 @@ class ObjectTypeViewModel(
private val _objectTypeConflictingFieldIds = MutableStateFlow<List<Id>>(emptyList())
//endregion
val showPropertiesScreen = MutableStateFlow<Boolean>(false)
val commands = MutableSharedFlow<ObjectTypeCommand>()
//region INIT AND LIFE CYCLE
@ -473,10 +475,8 @@ class ObjectTypeViewModel(
fun onTypeEvent(event: TypeEvent) {
Timber.d("onTypeEvent: $event")
when (event) {
TypeEvent.OnFieldsButtonClick -> {
viewModelScope.launch {
commands.emit(ObjectTypeCommand.OpenTypePropertiesListScreen)
}
TypeEvent.OnPropertiesButtonClick -> {
showPropertiesScreen.value = true
viewModelScope.launch {
sendAnalyticsShowObjectTypeScreen(
analytics = analytics,
@ -551,7 +551,7 @@ class ObjectTypeViewModel(
TypeEvent.OnBackClick -> {
viewModelScope.launch {
commands.emit(ObjectTypeCommand.Back)
commands.emit(Back)
}
}
@ -817,10 +817,9 @@ class ObjectTypeViewModel(
}
is FieldEvent.EditProperty -> proceedWithEditPropertyEvent(event)
FieldEvent.OnBackClick -> {
viewModelScope.launch {
commands.emit(ObjectTypeCommand.CloseFieldsScreen)
}
FieldEvent.OnDismissScreen -> {
showPropertiesScreen.value = false
}
}
}