Skip to content

Commit 5239e5c

Browse files
committed
Fix lint issues
1 parent 7fd0ad0 commit 5239e5c

File tree

10 files changed

+17
-12
lines changed

10 files changed

+17
-12
lines changed

appnav/src/main/kotlin/io/element/android/appnav/RootFlowNode.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService
5656
import io.element.android.libraries.matrix.api.core.SessionId
5757
import io.element.android.libraries.matrix.api.core.toRoomIdOrAlias
5858
import io.element.android.libraries.matrix.api.permalink.PermalinkData
59-
import io.element.android.libraries.sessionstorage.api.LoggedInState
6059
import io.element.android.libraries.oidc.api.OidcAction
6160
import io.element.android.libraries.oidc.api.OidcActionFlow
61+
import io.element.android.libraries.sessionstorage.api.LoggedInState
6262
import kotlinx.coroutines.flow.distinctUntilChanged
6363
import kotlinx.coroutines.flow.launchIn
6464
import kotlinx.coroutines.flow.onEach

features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/ResetIdentityFlowNode.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class ResetIdentityFlowNode @AssistedInject constructor(
6666
buildContext = buildContext,
6767
plugins = plugins,
6868
) {
69-
interface Callback: Plugin {
69+
interface Callback : Plugin {
7070
fun onDone()
7171
}
7272

features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordNode.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ class ResetIdentityPasswordNode @AssistedInject constructor(
3636
@Assisted plugins: List<Plugin>,
3737
private val coroutineDispatchers: CoroutineDispatchers,
3838
) : Node(buildContext, plugins = plugins) {
39-
4039
data class Inputs(val handle: IdentityPasswordResetHandle) : NodeInputs
4140

4241
private val presenter by lazy {

features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordView.kt

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package io.element.android.features.securebackup.impl.reset.password
1818

1919
import androidx.compose.foundation.layout.fillMaxWidth
2020
import androidx.compose.runtime.Composable
21-
import androidx.compose.runtime.MutableState
2221
import androidx.compose.runtime.getValue
2322
import androidx.compose.runtime.mutableStateOf
2423
import androidx.compose.runtime.remember
@@ -58,7 +57,12 @@ fun ResetIdentityPasswordView(
5857
title = stringResource(CommonStrings.screen_reset_encryption_password_title),
5958
subTitle = stringResource(CommonStrings.screen_reset_encryption_password_subtitle),
6059
onBackClick = onBack,
61-
content = { Content(textFieldState = passwordState) },
60+
content = {
61+
Content(
62+
text = passwordState.value,
63+
onTextChange = { passwordState.value = it }
64+
)
65+
},
6266
buttons = {
6367
Button(
6468
modifier = Modifier.fillMaxWidth(),
@@ -80,14 +84,14 @@ fun ResetIdentityPasswordView(
8084
}
8185

8286
@Composable
83-
private fun Content(textFieldState: MutableState<String>) {
87+
private fun Content(text: String, onTextChange: (String) -> Unit) {
8488
var showPassword by remember { mutableStateOf(false) }
8589
OutlinedTextField(
8690
modifier = Modifier
8791
.fillMaxWidth()
8892
.onTabOrEnterKeyFocusNext(LocalFocusManager.current),
89-
value = textFieldState.value,
90-
onValueChange = { text -> textFieldState.value = text },
93+
value = text,
94+
onValueChange = onTextChange,
9195
label = { Text(stringResource(CommonStrings.common_password)) },
9296
placeholder = { Text(stringResource(CommonStrings.screen_reset_encryption_password_placeholder)) },
9397
singleLine = true,

features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootNode.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ class ResetIdentityRootNode @AssistedInject constructor(
4242
override fun View(modifier: Modifier) {
4343
val state = presenter.present()
4444
ResetIdentityRootView(
45+
modifier = modifier,
4546
state = state,
4647
onContinue = callback::onContinue,
4748
onBack = ::navigateUp,

features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/root/ResetIdentityRootView.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,10 @@ fun ResetIdentityRootView(
4747
state: ResetIdentityRootState,
4848
onContinue: () -> Unit,
4949
onBack: () -> Unit,
50+
modifier: Modifier = Modifier,
5051
) {
5152
FlowStepPage(
53+
modifier = modifier,
5254
iconStyle = BigIcon.Style.AlertSolid,
5355
title = stringResource(io.element.android.libraries.ui.strings.R.string.screen_encryption_reset_title),
5456
subTitle = stringResource(io.element.android.libraries.ui.strings.R.string.screen_encryption_reset_subtitle),
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import com.google.common.truth.Truth.assertThat
2323
import kotlinx.coroutines.test.runTest
2424
import org.junit.Test
2525

26-
class ResetIdentityRootPresenterTests {
26+
class ResetIdentityRootPresenterTest {
2727
@Test
2828
fun `present - initial state`() = runTest {
2929
val presenter = ResetIdentityRootPresenter()

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/MatrixClient.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ import io.element.android.libraries.matrix.api.sync.SyncService
4141
import io.element.android.libraries.matrix.api.user.MatrixSearchUserResults
4242
import io.element.android.libraries.matrix.api.user.MatrixUser
4343
import io.element.android.libraries.matrix.api.verification.SessionVerificationService
44-
import io.element.android.libraries.sessionstorage.api.LoginType
4544
import kotlinx.collections.immutable.ImmutableList
4645
import kotlinx.coroutines.CoroutineScope
4746
import kotlinx.coroutines.flow.Flow

libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/DefaultOidcEntryPoint.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import io.element.android.libraries.androidutils.browser.openUrlInChromeCustomTa
2424
import io.element.android.libraries.architecture.createNode
2525
import io.element.android.libraries.di.AppScope
2626
import io.element.android.libraries.matrix.api.auth.OidcDetails
27-
import io.element.android.libraries.oidc.impl.webview.OidcNode
2827
import io.element.android.libraries.oidc.api.OidcEntryPoint
28+
import io.element.android.libraries.oidc.impl.webview.OidcNode
2929
import javax.inject.Inject
3030

3131
@ContributesBinding(AppScope::class)

libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/OidcPresenter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ import androidx.compose.runtime.setValue
2525
import dagger.assisted.Assisted
2626
import dagger.assisted.AssistedFactory
2727
import dagger.assisted.AssistedInject
28-
import io.element.android.libraries.oidc.api.OidcAction
2928
import io.element.android.libraries.architecture.AsyncAction
3029
import io.element.android.libraries.architecture.Presenter
3130
import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService
3231
import io.element.android.libraries.matrix.api.auth.OidcDetails
32+
import io.element.android.libraries.oidc.api.OidcAction
3333
import kotlinx.coroutines.launch
3434

3535
class OidcPresenter @AssistedInject constructor(

0 commit comments

Comments
 (0)