Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,11 @@ internal fun OnlineIndicator(
)
}

internal enum class OnlineIndicatorDimensions(val indicatorSize: Dp, val borderWidth: Dp, val offset: Dp) {
Small(indicatorSize = 8.dp, borderWidth = 1.dp, offset = 1.dp),
Medium(indicatorSize = 12.dp, borderWidth = 2.dp, offset = 2.dp),
Large(indicatorSize = 14.dp, borderWidth = 2.dp, offset = 2.dp),
ExtraLarge(indicatorSize = 16.dp, borderWidth = 2.dp, offset = 0.dp),
internal data class OnlineIndicatorDimensions(val indicatorSize: Dp, val borderWidth: Dp, val offset: Dp) {
companion object {
val Small = OnlineIndicatorDimensions(indicatorSize = 8.dp, borderWidth = 1.dp, offset = 1.dp)
val Medium = OnlineIndicatorDimensions(indicatorSize = 12.dp, borderWidth = 2.dp, offset = 2.dp)
val Large = OnlineIndicatorDimensions(indicatorSize = 14.dp, borderWidth = 2.dp, offset = 2.dp)
val ExtraLarge = OnlineIndicatorDimensions(indicatorSize = 16.dp, borderWidth = 2.dp, offset = 0.dp)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,15 @@ public fun UserAvatar(
}

internal fun BoxWithConstraintsScope.resolveIndicatorDimensions(): OnlineIndicatorDimensions = when {
maxWidth > AvatarSize.ExtraExtraLarge -> {
val scale = maxWidth / AvatarSize.ExtraExtraLarge
val base = OnlineIndicatorDimensions.ExtraLarge
OnlineIndicatorDimensions(
indicatorSize = base.indicatorSize * scale,
borderWidth = base.borderWidth,
offset = base.offset,
)
}
maxWidth >= AvatarSize.ExtraExtraLarge -> OnlineIndicatorDimensions.ExtraLarge
maxWidth >= AvatarSize.ExtraLarge -> OnlineIndicatorDimensions.ExtraLarge
maxWidth >= AvatarSize.Large -> OnlineIndicatorDimensions.Large
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -774,20 +774,6 @@ internal class ChannelInfoViewControllerTest {
awaitItem(),
)
}

assertEquals(
ChannelInfoViewState.Content(
members = emptyMembers(),
options = listOf(
ChannelInfoViewState.Content.Option.RenameChannel(name = "", isReadOnly = true),
ChannelInfoViewState.Content.Option.PinnedMessages,
ChannelInfoViewState.Content.Option.MediaAttachments,
ChannelInfoViewState.Content.Option.FilesAttachments,

),
),
awaitItem(),
)
}
}

Expand Down Expand Up @@ -852,20 +838,6 @@ internal class ChannelInfoViewControllerTest {
fixture.givenUnhideChannel()

sut.onViewAction(ChannelInfoViewAction.UnhideChannelClick)

assertEquals(
ChannelInfoViewState.Content(
members = emptyMembers(),
options = listOf(
ChannelInfoViewState.Content.Option.RenameChannel(name = "", isReadOnly = true),
ChannelInfoViewState.Content.Option.PinnedMessages,
ChannelInfoViewState.Content.Option.MediaAttachments,
ChannelInfoViewState.Content.Option.FilesAttachments,

),
),
awaitItem(),
)
}
}

Expand Down
Loading