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-583 Sets | Fix | Broken checkbox button (#2682)

Browse source
This commit is contained in:
Evgenii Kozlov 2022-10-26 15:16:24 +03:00
parent 166f7f6f78
commit 5342712b14
4 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -289,7 +289,7 @@ class ObjectIconWidget @JvmOverloads constructor(
fun setCheckbox(isChecked: Boolean?) {
with(binding) {
ivCheckbox.visible()
ivCheckbox.isEnabled = isChecked ?: false
ivCheckbox.isActivated = isChecked ?: false
initialContainer.invisible()
emojiContainer.invisible()
ivBookmark.gone()

4
core-ui/src/main/res/drawable/ic_data_view_grid_checkbox_selector.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/ic_data_view_grid_checkbox_checked" android:state_enabled="true" />
<item android:drawable="@drawable/ic_data_view_grid_checkbox" android:state_enabled="false" />
<item android:drawable="@drawable/ic_data_view_grid_checkbox_checked" android:state_activated="true" />
<item android:drawable="@drawable/ic_data_view_grid_checkbox" android:state_activated="false" />
</selector>

2
core-ui/src/main/res/layout/widget_object_icon.xml
View file

@ -44,6 +44,7 @@
android:layout_height="match_parent"
android:layout_gravity="center"
android:contentDescription="@string/content_desc_checkbox_icon"
android:clickable="true"
android:src="@drawable/ic_data_view_grid_checkbox_selector"
android:visibility="invisible" />
@ -53,7 +54,6 @@
android:layout_height="24dp"
android:layout_gravity="center"
android:contentDescription="@string/bookmark_icon"
android:src="@drawable/ic_data_view_grid_checkbox_selector"
android:visibility="gone" />
</merge>

6
presentation/src/main/java/com/anytypeio/anytype/presentation/sets/ObjectSetViewModel.kt
View file

@ -59,6 +59,7 @@ import com.anytypeio.anytype.presentation.relations.ObjectSetConfig.DEFAULT_LIMI
import com.anytypeio.anytype.presentation.relations.render
import com.anytypeio.anytype.presentation.relations.tabs
import com.anytypeio.anytype.presentation.relations.title
import com.anytypeio.anytype.presentation.search.ObjectSearchConstants
import com.anytypeio.anytype.presentation.sets.model.CellView
import com.anytypeio.anytype.presentation.sets.model.FilterExpression
import com.anytypeio.anytype.presentation.sets.model.SortingExpression
@ -190,12 +191,14 @@ class ObjectSetViewModel(
val dv = s.dv
val view = dv.viewers.find { it.id == v } ?: dv.viewers.firstOrNull()
if (view != null) {
val dataViewKeys = dv.relations.map { it.key }
val defaultKeys = ObjectSearchConstants.defaultKeys
DataViewSubscriptionContainer.Params(
subscription = context,
sorts = view.sorts,
filters = view.filters,
sources = dv.sources,
keys = dv.relations.map { it.key },
keys = defaultKeys + dataViewKeys,
limit = DEFAULT_LIMIT,
offset = o
)
@ -651,6 +654,7 @@ class ObjectSetViewModel(
}
fun onTaskCheckboxClicked(target: Id) {
Timber.d("onTaskCheckboxClicked: $target")
viewModelScope.launch {
val obj = database.store.get(target)
if (obj != null) {