mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-03 16:10:00 +00:00
fix detekt errors
This commit is contained in:
+8
-5
@@ -130,7 +130,8 @@ internal fun ActiveCallTimelineItemView(
|
|||||||
GroupCallBody(
|
GroupCallBody(
|
||||||
event,
|
event,
|
||||||
state,
|
state,
|
||||||
Modifier.weight(1f)
|
Modifier
|
||||||
|
.weight(1f)
|
||||||
.padding(top = 12.dp, bottom = 12.dp)
|
.padding(top = 12.dp, bottom = 12.dp)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@@ -169,7 +170,7 @@ internal fun ActiveCallTimelineItemView(
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
private fun DirectMessageCallBody(state: RtcNotificationState.Active, modifier: Modifier) {
|
private fun DirectMessageCallBody(state: RtcNotificationState.Active, modifier: Modifier = Modifier) {
|
||||||
Row(
|
Row(
|
||||||
verticalAlignment = Alignment.Top,
|
verticalAlignment = Alignment.Top,
|
||||||
modifier = modifier
|
modifier = modifier
|
||||||
@@ -201,7 +202,8 @@ private fun DirectMessageCallBody(state: RtcNotificationState.Active, modifier:
|
|||||||
url = user.avatarUrl,
|
url = user.avatarUrl,
|
||||||
size = AvatarSize.ActiveCallItem
|
size = AvatarSize.ActiveCallItem
|
||||||
)
|
)
|
||||||
}.toImmutableList(),
|
}
|
||||||
|
.toImmutableList(),
|
||||||
avatarType = AvatarType.User,
|
avatarType = AvatarType.User,
|
||||||
overlapRatio = 0.5f,
|
overlapRatio = 0.5f,
|
||||||
lastOnTop = true,
|
lastOnTop = true,
|
||||||
@@ -217,7 +219,7 @@ private fun DirectMessageCallBody(state: RtcNotificationState.Active, modifier:
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
private fun GroupCallBody(event: TimelineItem.Event, state: RtcNotificationState.Active, modifier: Modifier) {
|
private fun GroupCallBody(event: TimelineItem.Event, state: RtcNotificationState.Active, modifier: Modifier = Modifier) {
|
||||||
Column(modifier = modifier) {
|
Column(modifier = modifier) {
|
||||||
Text(
|
Text(
|
||||||
text = stringResource(CommonStrings.common_group_call_in_progress),
|
text = stringResource(CommonStrings.common_group_call_in_progress),
|
||||||
@@ -261,7 +263,8 @@ private fun GroupCallBody(event: TimelineItem.Event, state: RtcNotificationState
|
|||||||
url = user.avatarUrl,
|
url = user.avatarUrl,
|
||||||
size = AvatarSize.ActiveCallItem
|
size = AvatarSize.ActiveCallItem
|
||||||
)
|
)
|
||||||
}.toImmutableList(),
|
}
|
||||||
|
.toImmutableList(),
|
||||||
avatarType = AvatarType.User,
|
avatarType = AvatarType.User,
|
||||||
overlapRatio = 0.5f,
|
overlapRatio = 0.5f,
|
||||||
lastOnTop = true,
|
lastOnTop = true,
|
||||||
|
|||||||
+1
-1
@@ -14,7 +14,7 @@ import io.element.android.libraries.matrix.api.user.MatrixUser
|
|||||||
|
|
||||||
// State of the call, for now only isDeclined but in the future could be missed, active.
|
// State of the call, for now only isDeclined but in the future could be missed, active.
|
||||||
sealed interface RtcNotificationState {
|
sealed interface RtcNotificationState {
|
||||||
/** Call is currently active **/
|
/** Call is currently active. **/
|
||||||
data class Active(
|
data class Active(
|
||||||
val joinedMembers: List<MatrixUser>,
|
val joinedMembers: List<MatrixUser>,
|
||||||
val isJoined: Boolean,
|
val isJoined: Boolean,
|
||||||
|
|||||||
Reference in New Issue
Block a user