Merge branch 'develop' of https://github.com/vector-im/element-x-android into dla/feature/room_list_decoration

This commit is contained in:
David Langley 2023-09-18 16:44:13 +01:00
commit bd97cca6aa

View file

@ -34,11 +34,6 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.geometry.Rect
import androidx.compose.ui.geometry.Size
import androidx.compose.ui.graphics.Outline
import androidx.compose.ui.graphics.Path
import androidx.compose.ui.graphics.Shape
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.res.vectorResource
@ -46,8 +41,6 @@ import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.tooling.preview.PreviewParameter
import androidx.compose.ui.unit.Density
import androidx.compose.ui.unit.LayoutDirection
import androidx.compose.ui.unit.dp
import io.element.android.features.roomlist.impl.model.RoomListRoomSummary
import io.element.android.features.roomlist.impl.model.RoomListRoomSummaryProvider
@ -211,29 +204,6 @@ private fun NotificationIcon(room: RoomListRoomSummary) {
}
}
val TextPlaceholderShape = PercentRectangleSizeShape(0.5f)
class PercentRectangleSizeShape(private val percent: Float) : Shape {
override fun createOutline(
size: Size,
layoutDirection: LayoutDirection,
density: Density
): Outline {
val halfPercent = percent / 2f
val path = Path().apply {
val rect = Rect(
left = 0f,
top = size.height * halfPercent,
right = size.width,
bottom = size.height * (1 - halfPercent)
)
addRect(rect)
close()
}
return Outline.Generic(path)
}
}
@Preview
@Composable
internal fun RoomSummaryRowLightPreview(@PreviewParameter(RoomListRoomSummaryProvider::class) data: RoomListRoomSummary) =