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

DROID-1504 Widgets | Fix | Layout fixes in tree or compact list widgets (#209)

Browse Source
This commit is contained in:
Evgenii Kozlov 2023-07-17 13:50:35 +02:00 committed by GitHub
parent 1dfab0bd07
commit 085958916f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/com/anytypeio/anytype/ui/widgets/types/Icons.kt
View File

@ -31,6 +31,7 @@ import com.anytypeio.anytype.presentation.objects.ObjectIcon
@Composable
fun TreeWidgetObjectIcon(
modifier: Modifier = Modifier,
icon: ObjectIcon,
paddingStart: Dp,
paddingEnd: Dp
@ -38,7 +39,7 @@ fun TreeWidgetObjectIcon(
when (icon) {
is ObjectIcon.Profile.Avatar -> {
Box(
modifier = Modifier
modifier = modifier
.height(18.dp)
.width(18.dp)
.padding(start = paddingStart, end = paddingEnd)
@ -61,13 +62,13 @@ fun TreeWidgetObjectIcon(
is ObjectIcon.Profile.Image -> {
UriImage(
uri = icon.hash,
modifier = Modifier.padding(start = paddingStart, end = paddingEnd)
modifier = modifier.padding(start = paddingStart, end = paddingEnd)
)
}
is ObjectIcon.Basic.Emoji -> {
UriImage(
uri = Emojifier.safeUri(icon.unicode),
modifier = Modifier.padding(start = paddingStart, end = paddingEnd)
modifier = modifier.padding(start = paddingStart, end = paddingEnd)
)
}
is ObjectIcon.Basic.Image -> {
@ -89,7 +90,7 @@ fun TreeWidgetObjectIcon(
else
painterResource(id = R.drawable.ic_dashboard_task_checkbox_not_checked),
contentDescription = "Task icon",
modifier = Modifier.padding(start = paddingStart, end = paddingEnd)
modifier = modifier.padding(start = paddingStart, end = paddingEnd)
)
}
else -> {

4
app/src/main/java/com/anytypeio/anytype/ui/widgets/types/ListWidget.kt
View File

@ -14,6 +14,7 @@ import androidx.compose.material.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.alpha
import androidx.compose.ui.res.colorResource
@ -149,7 +150,8 @@ fun CompactListWidgetList(
TreeWidgetObjectIcon(
icon = element.objectIcon,
paddingStart = 8.dp,
paddingEnd = 4.dp
paddingEnd = 4.dp,
modifier = Modifier.align(Alignment.CenterVertically)
)
Text(
text = element.obj.getWidgetObjectName() ?: stringResource(id = R.string.untitled),

3
app/src/main/java/com/anytypeio/anytype/ui/widgets/types/TreeWidget.kt
View File

@ -200,7 +200,8 @@ private fun TreeWidgetTreeItems(
TreeWidgetObjectIcon(
icon = element.objectIcon,
paddingStart = 8.dp,
paddingEnd = 4.dp
paddingEnd = 4.dp,
modifier = Modifier.align(Alignment.CenterVertically)
)
}
Text(