knock requests : format and clean

This commit is contained in:
ganfra 2024-12-18 18:13:13 +01:00
parent a973c8f028
commit 7f372282dc
11 changed files with 10 additions and 18 deletions

View file

@ -10,8 +10,8 @@ package io.element.android.features.knockrequests.impl.banner
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.res.pluralStringResource
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import io.element.android.features.knockrequests.impl.data.KnockRequestPresentable
import io.element.android.features.knockrequests.impl.R import io.element.android.features.knockrequests.impl.R
import io.element.android.features.knockrequests.impl.data.KnockRequestPresentable
import io.element.android.libraries.core.extensions.firstIfSingle import io.element.android.libraries.core.extensions.firstIfSingle
import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.ImmutableList

View file

@ -25,7 +25,6 @@ import androidx.compose.foundation.layout.width
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.SideEffect
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.drawWithContent import androidx.compose.ui.draw.drawWithContent
import androidx.compose.ui.geometry.Offset import androidx.compose.ui.geometry.Offset
@ -57,7 +56,6 @@ import io.element.android.libraries.designsystem.theme.components.Surface
import io.element.android.libraries.designsystem.theme.components.Text import io.element.android.libraries.designsystem.theme.components.Text
import io.element.android.libraries.ui.strings.CommonStrings import io.element.android.libraries.ui.strings.CommonStrings
import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.ImmutableList
import timber.log.Timber
private const val MAX_AVATAR_COUNT = 3 private const val MAX_AVATAR_COUNT = 3

View file

@ -32,5 +32,4 @@ interface KnockRequestPresentable {
fun getBestName(): String { fun getBestName(): String {
return displayName?.takeIf { it.isNotEmpty() } ?: userId.value return displayName?.takeIf { it.isNotEmpty() } ?: userId.value
} }
} }

View file

@ -27,7 +27,6 @@ class KnockRequestsService(
knockRequestsFlow: Flow<List<KnockRequest>>, knockRequestsFlow: Flow<List<KnockRequest>>,
coroutineScope: CoroutineScope, coroutineScope: CoroutineScope,
) { ) {
// Keep track of the knock requests that have been handled, so we don't have to wait for sync to remove them. // Keep track of the knock requests that have been handled, so we don't have to wait for sync to remove them.
private val handledKnockRequestIds = MutableStateFlow<Set<EventId>>(emptySet()) private val handledKnockRequestIds = MutableStateFlow<Set<EventId>>(emptySet())

View file

@ -229,7 +229,6 @@ private fun KnockRequestActionConfirmation(
stringResource(R.string.screen_knock_requests_list_accept_all_alert_title), stringResource(R.string.screen_knock_requests_list_accept_all_alert_title),
stringResource(R.string.screen_knock_requests_list_accept_all_alert_description), stringResource(R.string.screen_knock_requests_list_accept_all_alert_description),
stringResource(R.string.screen_knock_requests_list_accept_all_alert_confirm_button_title), stringResource(R.string.screen_knock_requests_list_accept_all_alert_confirm_button_title),
) )
is KnockRequestsActionTarget.Decline -> Triple( is KnockRequestsActionTarget.Decline -> Triple(
stringResource(R.string.screen_knock_requests_list_decline_alert_title), stringResource(R.string.screen_knock_requests_list_decline_alert_title),

View file

@ -29,7 +29,6 @@ import kotlinx.coroutines.test.runTest
import org.junit.Test import org.junit.Test
@OptIn(ExperimentalCoroutinesApi::class) class KnockRequestsBannerPresenterTest { @OptIn(ExperimentalCoroutinesApi::class) class KnockRequestsBannerPresenterTest {
@Test @Test
fun `present - when feature is disabled then the banner should be hidden`() = runTest { fun `present - when feature is disabled then the banner should be hidden`() = runTest {
val knockRequests = flowOf(listOf(FakeKnockRequest())) val knockRequests = flowOf(listOf(FakeKnockRequest()))

View file

@ -26,7 +26,7 @@ import org.junit.rules.TestRule
import org.junit.runner.RunWith import org.junit.runner.RunWith
@RunWith(AndroidJUnit4::class) @RunWith(AndroidJUnit4::class)
class KnockRequestsListViewTest { class KnockRequestsBannerViewTest {
@get:Rule @get:Rule
val rule = createAndroidComposeRule<ComponentActivity>() val rule = createAndroidComposeRule<ComponentActivity>()

View file

@ -50,7 +50,6 @@ import kotlinx.collections.immutable.toPersistentList
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import javax.inject.Inject import javax.inject.Inject
@ -109,7 +108,6 @@ class RoomDetailsPresenter @Inject constructor(
val roomType by getRoomType(dmMember, currentMember) val roomType by getRoomType(dmMember, currentMember)
val roomCallState = roomCallStatePresenter.present() val roomCallState = roomCallStatePresenter.present()
val topicState = remember(canEditTopic, roomTopic, roomType) { val topicState = remember(canEditTopic, roomTopic, roomType) {
val topic = roomTopic val topic = roomTopic
when { when {

View file

@ -9,10 +9,10 @@ package io.element.android.libraries.matrix.api.room.join
sealed interface JoinRule { sealed interface JoinRule {
data object Public : JoinRule data object Public : JoinRule
data object Private: JoinRule data object Private : JoinRule
data object Knock: JoinRule data object Knock : JoinRule
data object Invite: JoinRule data object Invite : JoinRule
data class Restricted(val rules: List<AllowRule>): JoinRule data class Restricted(val rules: List<AllowRule>) : JoinRule
data class KnockRestricted(val rules: List<AllowRule>): JoinRule data class KnockRestricted(val rules: List<AllowRule>) : JoinRule
data class Custom(val value: String): JoinRule data class Custom(val value: String) : JoinRule
} }

View file

@ -31,8 +31,8 @@ import kotlinx.collections.immutable.toImmutableList
import kotlinx.collections.immutable.toImmutableMap import kotlinx.collections.immutable.toImmutableMap
import kotlinx.collections.immutable.toPersistentList import kotlinx.collections.immutable.toPersistentList
import org.junit.Test import org.junit.Test
import org.matrix.rustcomponents.sdk.JoinRule as RustJoinRule
import org.matrix.rustcomponents.sdk.Membership import org.matrix.rustcomponents.sdk.Membership
import org.matrix.rustcomponents.sdk.JoinRule as RustJoinRule
import org.matrix.rustcomponents.sdk.RoomNotificationMode as RustRoomNotificationMode import org.matrix.rustcomponents.sdk.RoomNotificationMode as RustRoomNotificationMode
class MatrixRoomInfoMapperTest { class MatrixRoomInfoMapperTest {

View file

@ -30,7 +30,7 @@ class FakeKnockRequest(
val declineAndBanLambda: (String?) -> Result<Unit> = { lambdaError() }, val declineAndBanLambda: (String?) -> Result<Unit> = { lambdaError() },
val markAsSeenLambda: () -> Result<Unit> = { lambdaError() }, val markAsSeenLambda: () -> Result<Unit> = { lambdaError() },
) : KnockRequest { ) : KnockRequest {
override suspend fun accept(): Result<Unit> = simulateLongTask{ override suspend fun accept(): Result<Unit> = simulateLongTask {
acceptLambda() acceptLambda()
} }