ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-02 20:38:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #967 from vector-im/feature/bma/detektConfig

Browse Source 
Update detekt config.
This commit is contained in:
Benoit Marty
2023-07-28 16:47:26 +02:00
committed by GitHub
parent 36d2246e2a 2da6ceeb5f
commit 822bb82347
90 changed files with 296 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/AvatarActionBottomSheet.kt
+2 -2
View File
@@ -111,12 +111,12 @@ private fun AvatarActionBottomSheetContent(
@Preview
@Composable
fun AvatarActionBottomSheetLightPreview() =
internal fun AvatarActionBottomSheetLightPreview() =
ElementPreviewLight { ContentToPreview() }
@Preview
@Composable
fun AvatarActionBottomSheetDarkPreview() =
internal fun AvatarActionBottomSheetDarkPreview() =
ElementPreviewDark { ContentToPreview() }
@Composable
libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserHeader.kt
+2 -2
View File
@@ -103,12 +103,12 @@ private fun MatrixUserHeaderContent(
@Preview
@Composable
fun MatrixUserHeaderLightPreview(@PreviewParameter(MatrixUserProvider::class) matrixUser: MatrixUser) =
internal fun MatrixUserHeaderLightPreview(@PreviewParameter(MatrixUserProvider::class) matrixUser: MatrixUser) =
ElementPreviewLight { ContentToPreview(matrixUser) }
@Preview
@Composable
fun MatrixUserHeaderDarkPreview(@PreviewParameter(MatrixUserProvider::class) matrixUser: MatrixUser) =
internal fun MatrixUserHeaderDarkPreview(@PreviewParameter(MatrixUserProvider::class) matrixUser: MatrixUser) =
ElementPreviewDark { ContentToPreview(matrixUser) }
@Composable
libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserHeaderPlaceholder.kt
+2 -2
View File
@@ -68,12 +68,12 @@ fun MatrixUserHeaderPlaceholder(
@Preview
@Composable
fun MatrixUserHeaderPlaceholderLightPreview() =
internal fun MatrixUserHeaderPlaceholderLightPreview() =
ElementPreviewLight { ContentToPreview() }
@Preview
@Composable
fun MatrixUserHeaderPlaceholderDarkPreview() =
internal fun MatrixUserHeaderPlaceholderDarkPreview() =
ElementPreviewDark { ContentToPreview() }
@Composable
libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/UnsavedAvatar.kt
+2 -2
View File
@@ -85,11 +85,11 @@ fun UnsavedAvatar(
@Preview
@Composable
fun UnsavedAvatarLightPreview() = ElementPreviewLight { ContentToPreview() }
internal fun UnsavedAvatarLightPreview() = ElementPreviewLight { ContentToPreview() }
@Preview
@Composable
fun UnsavedAvatarDarkPreview() = ElementPreviewDark { ContentToPreview() }
internal fun UnsavedAvatarDarkPreview() = ElementPreviewDark { ContentToPreview() }
@Composable
private fun ContentToPreview() {
libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/MatrixRoomMembers.kt
+3 -8
View File
@@ -57,14 +57,9 @@ fun MatrixRoom.getDirectRoomMember(roomMembersState: MatrixRoomMembersState): St
val roomMembers = roomMembersState.roomMembers()
return remember(roomMembersState) {
derivedStateOf {
if (roomMembers == null) {
null
} else if (roomMembers.size == 2 && isDirect && isEncrypted) {
roomMembers.find { it.userId != this.sessionId }
} else {
null
}
roomMembers
?.takeIf { it.size == 2 && isDirect && isEncrypted }
?.find { it.userId != sessionId }
}
}
}