Sulkta-OSS/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update plugin ktlint to v12.1.0 (#2200)

Browse source 
* Update plugin ktlint to v12.1.0

* Run `./gradlew ktlintFormat` and fix some issues manually.

* Fix other issues reproted by Ktlint

* Limit false positives, KtLint removes unnecessary curly brace in String templates.

* Remove useless Unit

* Minor improvements over ktlint changes

* Restore `AlertDialogContent` behaviour

* Update screenshots

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Benoit Marty <benoit@matrix.org>
Co-authored-by: Jorge Martín <jorgem@element.io>
Co-authored-by: ElementBot <benoitm+elementbot@element.io>
This commit is contained in:
renovate[bot] 2024-01-10 16:22:24 +01:00 • committed by GitHub
parent 7e1866818e
commit c8bd362397
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
442 changed files with 1091 additions and 1081 deletions
Download patch file Download diff file Expand all files Collapse all files

1
features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/LoggerTag.kt
View file

@ -22,4 +22,3 @@ private val loggerTag = LoggerTag("SecureBackup")
val loggerTagRoot = LoggerTag("Root", loggerTag)
val loggerTagSetup = LoggerTag("Setup", loggerTag)
val loggerTagDisable = LoggerTag("Disable", loggerTag)

2
features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootView.kt
View file

@ -23,6 +23,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.PreviewParameter
import io.element.android.compound.theme.ElementTheme
import io.element.android.features.securebackup.impl.R
import io.element.android.libraries.architecture.AsyncData
import io.element.android.libraries.designsystem.components.async.AsyncLoading
@ -41,7 +42,6 @@ import io.element.android.libraries.designsystem.utils.snackbar.SnackbarHost
import io.element.android.libraries.designsystem.utils.snackbar.rememberSnackbarHostState
import io.element.android.libraries.matrix.api.encryption.BackupState
import io.element.android.libraries.matrix.api.encryption.RecoveryState
import io.element.android.compound.theme.ElementTheme
import io.element.android.libraries.ui.strings.CommonStrings
@Composable

5
features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupNode.kt
View file

@ -68,10 +68,11 @@ class SecureBackupSetupNode @AssistedInject constructor(
private fun CoroutineScope.postSuccessSnackbar() = launch {
snackbarDispatcher.post(
SnackbarMessage(
messageResId = if (inputs.isChangeRecoveryKeyUserStory)
messageResId = if (inputs.isChangeRecoveryKeyUserStory) {
R.string.screen_recovery_key_change_success
else
} else {
R.string.screen_recovery_key_setup_success
}
)
)
}

3
features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupStateMachine.kt
View file

@ -24,8 +24,7 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
import javax.inject.Inject
import com.freeletics.flowredux.dsl.State as MachineState
class SecureBackupSetupStateMachine @Inject constructor(
) : FlowReduxStateMachine<SecureBackupSetupStateMachine.State, SecureBackupSetupStateMachine.Event>(
class SecureBackupSetupStateMachine @Inject constructor() : FlowReduxStateMachine<SecureBackupSetupStateMachine.State, SecureBackupSetupStateMachine.Event>(
initialState = State.Initial
) {

10
features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupView.kt
View file

@ -80,10 +80,11 @@ private fun SecureBackupSetupState.canGoBack(): Boolean {
private fun title(state: SecureBackupSetupState): String {
return when (state.setupState) {
SetupState.Init,
SetupState.Creating -> if (state.isChangeRecoveryKeyUserStory)
SetupState.Creating -> if (state.isChangeRecoveryKeyUserStory) {
stringResource(id = R.string.screen_recovery_key_change_title)
else
} else {
stringResource(id = R.string.screen_recovery_key_setup_title)
}
is SetupState.Created,
is SetupState.CreatedAndSaved ->
stringResource(id = R.string.screen_recovery_key_save_title)
@ -94,10 +95,11 @@ private fun title(state: SecureBackupSetupState): String {
private fun subtitle(state: SecureBackupSetupState): String {
return when (state.setupState) {
SetupState.Init,
SetupState.Creating -> if (state.isChangeRecoveryKeyUserStory)
SetupState.Creating -> if (state.isChangeRecoveryKeyUserStory) {
stringResource(id = R.string.screen_recovery_key_change_description)
else
} else {
stringResource(id = R.string.screen_recovery_key_setup_description)
}
is SetupState.Created,
is SetupState.CreatedAndSaved ->
stringResource(id = R.string.screen_recovery_key_save_description)

9
features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/views/RecoveryKeyView.kt
View file

@ -41,6 +41,8 @@ import androidx.compose.ui.text.input.VisualTransformation
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.PreviewParameter
import androidx.compose.ui.unit.dp
import io.element.android.compound.theme.ElementTheme
import io.element.android.compound.tokens.generated.CompoundIcons
import io.element.android.features.securebackup.impl.R
import io.element.android.features.securebackup.impl.tools.RecoveryKeyVisualTransformation
import io.element.android.libraries.designsystem.modifiers.clickableIfNotNull
@ -52,8 +54,6 @@ import io.element.android.libraries.designsystem.theme.components.OutlinedTextFi
import io.element.android.libraries.designsystem.theme.components.Text
import io.element.android.libraries.designsystem.theme.components.autofill
import io.element.android.libraries.designsystem.utils.CommonDrawables
import io.element.android.compound.theme.ElementTheme
import io.element.android.compound.tokens.generated.CompoundIcons
import io.element.android.libraries.ui.strings.CommonStrings
@Composable
@ -209,10 +209,11 @@ private fun RecoveryKeyFooter(state: RecoveryKeyViewState) {
)
Text(
text = stringResource(
id = if (state.recoveryKeyUserStory == RecoveryKeyUserStory.Change)
id = if (state.recoveryKeyUserStory == RecoveryKeyUserStory.Change) {
R.string.screen_recovery_key_change_generate_key_description
else
} else {
R.string.screen_recovery_key_setup_generate_key_description
}
),
color = ElementTheme.colors.textSecondary,
modifier = Modifier.padding(start = 8.dp),

5
features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/tools/RecoveryKeyVisualTransformation.kt
View file

@ -37,10 +37,11 @@ class RecoveryKeyVisualTransformation : VisualTransformation {
override fun originalToTransformed(offset: Int): Int {
if (offset == 0) return 0
val numberOfChunks = offset / 4
return if (offset == text.length && offset % 4 == 0)
return if (offset == text.length && offset % 4 == 0) {
offset + numberOfChunks - 1
else
} else {
offset + numberOfChunks
}
}
override fun transformedToOriginal(offset: Int): Int {