Fix lint issues

This commit is contained in:
Jorge Martín 2023-08-17 15:31:14 +02:00 committed by yostyle
parent 675b3ab383
commit 9fdeb81e50
6 changed files with 15 additions and 11 deletions

View file

@ -79,7 +79,7 @@ fun RoomNotificationSettingsOption(
@DayNightPreviews @DayNightPreviews
@Composable @Composable
fun RoomPrivacyOptionLightPreview() = ElementPreview { ContentToPreview() } internal fun RoomPrivacyOptionLightPreview() = ElementPreview { ContentToPreview() }
@Composable @Composable
private fun ContentToPreview() { private fun ContentToPreview() {

View file

@ -54,6 +54,7 @@ fun RoomNotificationSettingsView(
onBackPressed: () -> Unit = {}, onBackPressed: () -> Unit = {},
) { ) {
Scaffold( Scaffold(
modifier = modifier,
topBar = { topBar = {
RoomNotificationSettingsTopBar( RoomNotificationSettingsTopBar(
onBackPressed = { onBackPressed() } onBackPressed = { onBackPressed() }
@ -61,7 +62,7 @@ fun RoomNotificationSettingsView(
} }
) { padding -> ) { padding ->
Column( Column(
modifier = modifier modifier = Modifier
.fillMaxWidth() .fillMaxWidth()
.padding(padding) .padding(padding)
.consumeWindowInsets(padding), .consumeWindowInsets(padding),
@ -94,7 +95,6 @@ fun RoomNotificationSettingsView(
if (state.roomNotificationSettings != null) { if (state.roomNotificationSettings != null) {
RoomNotificationSettingsOptions( RoomNotificationSettingsOptions(
modifier = modifier,
selected = state.roomNotificationSettings.mode, selected = state.roomNotificationSettings.mode,
enabled = !state.roomNotificationSettings.isDefault, enabled = !state.roomNotificationSettings.isDefault,
onOptionSelected = { onOptionSelected = {
@ -128,8 +128,8 @@ fun RoomNotificationSettingsTopBar(
@Composable @Composable
fun RoomNotificationSettingsOptions( fun RoomNotificationSettingsOptions(
selected: RoomNotificationMode?, selected: RoomNotificationMode?,
modifier: Modifier = Modifier,
enabled: Boolean, enabled: Boolean,
modifier: Modifier = Modifier,
onOptionSelected: (RoomNotificationSettingsItem) -> Unit = {}, onOptionSelected: (RoomNotificationSettingsItem) -> Unit = {},
) { ) {
val items = roomNotificationSettingsItems() val items = roomNotificationSettingsItems()
@ -147,12 +147,12 @@ fun RoomNotificationSettingsOptions(
@Preview @Preview
@Composable @Composable
fun RoomNotificationSettingsLightPreview(@PreviewParameter(RoomNotificationSettingsStateProvider::class) state: RoomNotificationSettingsState) = internal fun RoomNotificationSettingsLightPreview(@PreviewParameter(RoomNotificationSettingsStateProvider::class) state: RoomNotificationSettingsState) =
ElementPreviewLight { ContentToPreview(state) } ElementPreviewLight { ContentToPreview(state) }
@Preview @Preview
@Composable @Composable
fun RoomNotificationSettingsDarkPreview(@PreviewParameter(RoomNotificationSettingsStateProvider::class) state: RoomNotificationSettingsState) = internal fun RoomNotificationSettingsDarkPreview(@PreviewParameter(RoomNotificationSettingsStateProvider::class) state: RoomNotificationSettingsState) =
ElementPreviewDark { ContentToPreview(state) } ElementPreviewDark { ContentToPreview(state) }
@Composable @Composable

View file

@ -51,7 +51,11 @@ import org.junit.Test
@ExperimentalCoroutinesApi @ExperimentalCoroutinesApi
class RoomDetailsPresenterTests { class RoomDetailsPresenterTests {
private fun aRoomDetailsPresenter(room: MatrixRoom, leaveRoomPresenter: LeaveRoomPresenter = LeaveRoomPresenterFake(), dispatchers: CoroutineDispatchers): RoomDetailsPresenter { private fun aRoomDetailsPresenter(
room: MatrixRoom,
leaveRoomPresenter: LeaveRoomPresenter = LeaveRoomPresenterFake(),
dispatchers: CoroutineDispatchers
): RoomDetailsPresenter {
val matrixClient = FakeMatrixClient() val matrixClient = FakeMatrixClient()
val roomMemberDetailsPresenterFactory = object : RoomMemberDetailsPresenter.Factory { val roomMemberDetailsPresenterFactory = object : RoomMemberDetailsPresenter.Factory {
override fun create(roomMemberId: UserId): RoomMemberDetailsPresenter { override fun create(roomMemberId: UserId): RoomMemberDetailsPresenter {

View file

@ -30,7 +30,6 @@ import io.element.android.libraries.matrix.api.media.VideoInfo
import io.element.android.libraries.matrix.api.poll.PollKind import io.element.android.libraries.matrix.api.poll.PollKind
import io.element.android.libraries.matrix.api.room.location.AssetType import io.element.android.libraries.matrix.api.room.location.AssetType
import io.element.android.libraries.matrix.api.timeline.MatrixTimeline import io.element.android.libraries.matrix.api.timeline.MatrixTimeline
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.StateFlow
import java.io.Closeable import java.io.Closeable
import java.io.File import java.io.File

View file

@ -214,7 +214,10 @@ class RustMatrixRoom(
}.map { }.map {
_roomNotificationSettingsStateFlow.value = MatrixRoomNotificationSettingsState.Ready(it) _roomNotificationSettingsStateFlow.value = MatrixRoomNotificationSettingsState.Ready(it)
}.onFailure { }.onFailure {
_roomNotificationSettingsStateFlow.value = MatrixRoomNotificationSettingsState.Error(prevRoomNotificationSettings = currentRoomNotificationSettings, failure = it) _roomNotificationSettingsStateFlow.value = MatrixRoomNotificationSettingsState.Error(
prevRoomNotificationSettings = currentRoomNotificationSettings,
failure = it
)
} }
} }

View file

@ -70,8 +70,6 @@ class FakeMatrixRoom(
private var updateMembersResult: Result<Unit> = Result.success(Unit) private var updateMembersResult: Result<Unit> = Result.success(Unit)
private var joinRoomResult = Result.success(Unit) private var joinRoomResult = Result.success(Unit)
private var updateRoomNotificationSettingsResult: Result<Unit> = Result.success(Unit) private var updateRoomNotificationSettingsResult: Result<Unit> = Result.success(Unit)
private var acceptInviteResult = Result.success(Unit)
private var rejectInviteResult = Result.success(Unit)
private var inviteUserResult = Result.success(Unit) private var inviteUserResult = Result.success(Unit)
private var canInviteResult = Result.success(true) private var canInviteResult = Result.success(true)
private var canRedactResult = Result.success(canRedact) private var canRedactResult = Result.success(canRedact)