Skip to content

Commit 7f37228

Browse files
committed
knock requests : format and clean
1 parent a973c8f commit 7f37228

File tree

11 files changed

+10
-18
lines changed

11 files changed

+10
-18
lines changed

features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerState.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ package io.element.android.features.knockrequests.impl.banner
1010
import androidx.compose.runtime.Composable
1111
import androidx.compose.ui.res.pluralStringResource
1212
import androidx.compose.ui.res.stringResource
13-
import io.element.android.features.knockrequests.impl.data.KnockRequestPresentable
1413
import io.element.android.features.knockrequests.impl.R
14+
import io.element.android.features.knockrequests.impl.data.KnockRequestPresentable
1515
import io.element.android.libraries.core.extensions.firstIfSingle
1616
import kotlinx.collections.immutable.ImmutableList
1717

features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerView.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import androidx.compose.foundation.layout.width
2525
import androidx.compose.material3.MaterialTheme
2626
import androidx.compose.runtime.Composable
2727
import androidx.compose.runtime.LaunchedEffect
28-
import androidx.compose.runtime.SideEffect
2928
import androidx.compose.ui.Modifier
3029
import androidx.compose.ui.draw.drawWithContent
3130
import androidx.compose.ui.geometry.Offset
@@ -57,7 +56,6 @@ import io.element.android.libraries.designsystem.theme.components.Surface
5756
import io.element.android.libraries.designsystem.theme.components.Text
5857
import io.element.android.libraries.ui.strings.CommonStrings
5958
import kotlinx.collections.immutable.ImmutableList
60-
import timber.log.Timber
6159

6260
private const val MAX_AVATAR_COUNT = 3
6361

features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/KnockRequestPresentable.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,4 @@ interface KnockRequestPresentable {
3232
fun getBestName(): String {
3333
return displayName?.takeIf { it.isNotEmpty() } ?: userId.value
3434
}
35-
3635
}

features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/KnockRequestsService.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ class KnockRequestsService(
2727
knockRequestsFlow: Flow<List<KnockRequest>>,
2828
coroutineScope: CoroutineScope,
2929
) {
30-
3130
// Keep track of the knock requests that have been handled, so we don't have to wait for sync to remove them.
3231
private val handledKnockRequestIds = MutableStateFlow<Set<EventId>>(emptySet())
3332

features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListView.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,6 @@ private fun KnockRequestActionConfirmation(
229229
stringResource(R.string.screen_knock_requests_list_accept_all_alert_title),
230230
stringResource(R.string.screen_knock_requests_list_accept_all_alert_description),
231231
stringResource(R.string.screen_knock_requests_list_accept_all_alert_confirm_button_title),
232-
233232
)
234233
is KnockRequestsActionTarget.Decline -> Triple(
235234
stringResource(R.string.screen_knock_requests_list_decline_alert_title),

features/knockrequests/impl/src/test/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerPresenterTest.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import kotlinx.coroutines.test.runTest
2929
import org.junit.Test
3030

3131
@OptIn(ExperimentalCoroutinesApi::class) class KnockRequestsBannerPresenterTest {
32-
3332
@Test
3433
fun `present - when feature is disabled then the banner should be hidden`() = runTest {
3534
val knockRequests = flowOf(listOf(FakeKnockRequest()))

features/knockrequests/impl/src/test/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerViewTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import org.junit.rules.TestRule
2626
import org.junit.runner.RunWith
2727

2828
@RunWith(AndroidJUnit4::class)
29-
class KnockRequestsListViewTest {
29+
class KnockRequestsBannerViewTest {
3030
@get:Rule
3131
val rule = createAndroidComposeRule<ComponentActivity>()
3232

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsPresenter.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ import kotlinx.collections.immutable.toPersistentList
5050
import kotlinx.coroutines.CoroutineScope
5151
import kotlinx.coroutines.flow.collect
5252
import kotlinx.coroutines.flow.launchIn
53-
import kotlinx.coroutines.flow.map
5453
import kotlinx.coroutines.flow.onEach
5554
import kotlinx.coroutines.launch
5655
import javax.inject.Inject
@@ -109,7 +108,6 @@ class RoomDetailsPresenter @Inject constructor(
109108
val roomType by getRoomType(dmMember, currentMember)
110109
val roomCallState = roomCallStatePresenter.present()
111110

112-
113111
val topicState = remember(canEditTopic, roomTopic, roomType) {
114112
val topic = roomTopic
115113
when {

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/join/JoinRule.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ package io.element.android.libraries.matrix.api.room.join
99

1010
sealed interface JoinRule {
1111
data object Public : JoinRule
12-
data object Private: JoinRule
13-
data object Knock: JoinRule
14-
data object Invite: JoinRule
15-
data class Restricted(val rules: List<AllowRule>): JoinRule
16-
data class KnockRestricted(val rules: List<AllowRule>): JoinRule
17-
data class Custom(val value: String): JoinRule
12+
data object Private : JoinRule
13+
data object Knock : JoinRule
14+
data object Invite : JoinRule
15+
data class Restricted(val rules: List<AllowRule>) : JoinRule
16+
data class KnockRestricted(val rules: List<AllowRule>) : JoinRule
17+
data class Custom(val value: String) : JoinRule
1818
}

libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/MatrixRoomInfoMapperTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ import kotlinx.collections.immutable.toImmutableList
3131
import kotlinx.collections.immutable.toImmutableMap
3232
import kotlinx.collections.immutable.toPersistentList
3333
import org.junit.Test
34-
import org.matrix.rustcomponents.sdk.JoinRule as RustJoinRule
3534
import org.matrix.rustcomponents.sdk.Membership
35+
import org.matrix.rustcomponents.sdk.JoinRule as RustJoinRule
3636
import org.matrix.rustcomponents.sdk.RoomNotificationMode as RustRoomNotificationMode
3737

3838
class MatrixRoomInfoMapperTest {

0 commit comments

Comments
 (0)