narvey/anytype-kotlin-wild
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DROID-2107 Merge branch 'release/0-27-0' into droid-2107-picker-crash

Browse Source 
# Conflicts:
#	app/src/main/java/com/anytypeio/anytype/ui/editor/PickerDelegate.kt
This commit is contained in:
konstantiniiv 2023-12-25 13:41:11 +01:00
commit 4b3bdf197c
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/com/anytypeio/anytype/ui/spaces/SelectSpaceFragment.kt
View File

@ -22,6 +22,7 @@ import com.anytypeio.anytype.presentation.spaces.Command
import com.anytypeio.anytype.presentation.spaces.SelectSpaceViewModel
import com.anytypeio.anytype.ui.settings.typography
import javax.inject.Inject
import timber.log.Timber
class SelectSpaceFragment : BaseBottomSheetComposeFragment() {
@ -84,10 +85,14 @@ class SelectSpaceFragment : BaseBottomSheetComposeFragment() {
findNavController().popBackStack()
}
is Command.SwitchToNewSpace -> {
if (exitHomeWhenSpaceIsSelected == true) {
findNavController().navigate(R.id.switchSpaceAction)
} else {
findNavController().popBackStack()
try {
if (exitHomeWhenSpaceIsSelected == true) {
findNavController().navigate(R.id.switchSpaceAction)
} else {
findNavController().popBackStack()
}
} catch (e: Exception) {
Timber.e(e, "Navigation error")
}
}
}

5
app/src/main/java/com/anytypeio/anytype/ui/spaces/SelectSpaceScreen.kt
View File

@ -35,6 +35,7 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import coil.compose.rememberAsyncImagePainter
import com.anytypeio.anytype.R
import com.anytypeio.anytype.core_ui.extensions.throttledClick
import com.anytypeio.anytype.core_ui.foundation.Dragger
import com.anytypeio.anytype.core_ui.foundation.noRippleClickable
import com.anytypeio.anytype.core_ui.views.Caption1Medium
@ -154,7 +155,9 @@ private fun SelectSpaceSpaceItem(
) {
SpaceImageBlock(
icon = item.view.icon,
onSpaceIconClick = { onSpaceClicked(item.view) },
onSpaceIconClick = throttledClick(
onClick = { onSpaceClicked(item.view) }
),
gradientBackground = colorResource(id = R.color.default_gradient_background),
gradientCornerRadius = 4.dp
)

9
presentation/src/main/java/com/anytypeio/anytype/presentation/objects/menu/ObjectMenuViewModelBase.kt
View File

@ -355,7 +355,7 @@ abstract class ObjectMenuViewModelBase(
fun proceedWithCreatingWidget(obj: ObjectWrapper.Basic) {
viewModelScope.launch {
val config = spaceManager.getConfig()
if (config != null) {
if (config != null && obj.isValid) {
createWidget(
CreateWidget.Params(
ctx = config.widgets,
@ -378,6 +378,13 @@ abstract class ObjectMenuViewModelBase(
}
)
}
} else {
if (!obj.isValid) {
sendToast("Could not create widget: object is not valid.")
}
if (config == null) {
sendToast("Could not create widget: config is missing.")
}
}
}
}