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-3644 Widgets | Fix | Fix widget name resolving (#2386)

Browse source
This commit is contained in:
Evgenii Kozlov 2025-05-09 15:05:25 +02:00
parent 98a081c3ea
commit f3e1594491
3 changed files with 8 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/com/anytypeio/anytype/ui/widgets/types/DataViewWidget.kt
View file

@ -144,7 +144,8 @@ fun DataViewListWidgetCard(
obj = element.obj,
icon = element.objectIcon,
mode = mode,
onObjectCheckboxClicked = onObjectCheckboxClicked
onObjectCheckboxClicked = onObjectCheckboxClicked,
name = element.getPrettyName()
)
if (idx != item.elements.lastIndex) {
Divider(
@ -392,7 +393,8 @@ fun ListWidgetElement(
onWidgetObjectClicked: (ObjectWrapper.Basic) -> Unit,
onObjectCheckboxClicked: (Id, Boolean) -> Unit,
icon: ObjectIcon,
obj: ObjectWrapper.Basic
obj: ObjectWrapper.Basic,
name: String
) {
Box(
modifier = Modifier
@ -408,8 +410,6 @@ fun ListWidgetElement(
) {
val hasDescription = !obj.description.isNullOrEmpty()
val hasIcon = icon != ObjectIcon.None
val name = obj.name?.trim()?.orNull()
val snippet = obj.snippet?.trim().orNull()
if (hasIcon) {
ListWidgetObjectIcon(
icon = icon,
@ -425,7 +425,7 @@ fun ListWidgetElement(
)
}
Text(
text = name ?: snippet ?: stringResource(id = R.string.untitled),
text = name.ifEmpty { stringResource(id = R.string.untitled) },
modifier = if (hasDescription)
Modifier
.padding(

3
app/src/main/java/com/anytypeio/anytype/ui/widgets/types/ListWidget.kt
View file

@ -111,7 +111,8 @@ fun ListWidgetCard(
obj = element.obj,
icon = element.objectIcon,
mode = mode,
onObjectCheckboxClicked = onObjectCheckboxClicked
onObjectCheckboxClicked = onObjectCheckboxClicked,
name = element.getPrettyName()
)
if (idx != item.elements.lastIndex) {
Divider(

11
presentation/src/main/java/com/anytypeio/anytype/presentation/widgets/Widget.kt
View file

@ -253,19 +253,10 @@ fun buildWidgetName(
obj: ObjectWrapper.Basic,
fieldParser: FieldParser
): Name {
val prettyPrintName = fieldParser.getObjectName(obj)
val prettyPrintName = fieldParser.getObjectPluralName(obj)
return Name.Default(prettyPrintName = prettyPrintName)
}
private fun createDefaultName(
obj: ObjectWrapper.Basic,
fieldParser: FieldParser
): Name.Default {
return Name.Default(
prettyPrintName = fieldParser.getObjectName(obj)
)
}
typealias WidgetId = Id
typealias ViewId = Id
typealias FromIndex = Int