Fix lint issues

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

View file

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

View file

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

View file

@ -51,7 +51,11 @@ import org.junit.Test
@ExperimentalCoroutinesApi
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 roomMemberDetailsPresenterFactory = object : RoomMemberDetailsPresenter.Factory {
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.room.location.AssetType
import io.element.android.libraries.matrix.api.timeline.MatrixTimeline
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.StateFlow
import java.io.Closeable
import java.io.File

View file

@ -214,7 +214,10 @@ class RustMatrixRoom(
}.map {
_roomNotificationSettingsStateFlow.value = MatrixRoomNotificationSettingsState.Ready(it)
}.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 joinRoomResult = 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 canInviteResult = Result.success(true)
private var canRedactResult = Result.success(canRedact)