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

DROID-922 Editor | Fix | Style panels should not leak click events to views beside it (#2894)

Browse source
This commit is contained in:
Evgenii Kozlov 2023-02-06 20:27:44 +01:00 • committed by uburoiubu
parent e420931752
commit 8e25539804
4 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -23,6 +23,11 @@ class StyleToolbarMainWidget @JvmOverloads constructor(
LayoutInflater.from(context), this
)
init {
// Preventing click-through.
binding.root.isClickable = true
}
val styles = merge(
binding.tvStyleTitle.clicks().map { UiBlock.HEADER_ONE },
binding.tvStyleHeading.clicks().map { UiBlock.HEADER_TWO },

5
core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/StyleToolbarExtraWidget.kt
View file

@ -21,6 +21,11 @@ class StyleToolbarExtraWidget @JvmOverloads constructor(
LayoutInflater.from(context), this, true
)
init {
// Preventing click-through.
binding.root.isClickable = true
}
val actions: Flow<StylingEvent> = merge(
binding.bold.clicks().map { StylingEvent.Markup.Bold },
binding.italic.clicks().map { StylingEvent.Markup.Italic },

7
core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/style/StyleBackgroundToolbarWidget.kt
View file

@ -4,9 +4,9 @@ import android.content.Context
import android.util.AttributeSet
import android.view.LayoutInflater
import androidx.cardview.widget.CardView
import com.anytypeio.anytype.core_models.ThemeColor
import com.anytypeio.anytype.core_ui.databinding.WidgetBlockStyleToolbarBackgroundBinding
import com.anytypeio.anytype.core_ui.reactive.clicks
import com.anytypeio.anytype.core_models.ThemeColor
import com.anytypeio.anytype.presentation.editor.editor.styling.StyleToolbarState
import com.anytypeio.anytype.presentation.editor.editor.styling.StylingEvent
import kotlinx.coroutines.flow.Flow
@ -22,6 +22,11 @@ class StyleBackgroundToolbarWidget @JvmOverloads constructor(
LayoutInflater.from(context), this, true
)
init {
// Preventing click-through.
binding.root.isClickable = true
}
val actions: Flow<StylingEvent> = merge(
binding.flowColors.backgroundColorDefault.clicks()
.map { StylingEvent.Coloring.Background(ThemeColor.DEFAULT) },

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

@ -34,7 +34,10 @@ class StyleColorToolbarWidget @JvmOverloads constructor(
LayoutInflater.from(context), this, true
)
init {
binding.root.isClickable = true
setup()
}