mirror of
https://github.com/bitwarden/android.git
synced 2025-02-21 00:00:31 +03:00
Use 100 character line limit for detekt (#50)
This commit is contained in:
parent
dd4b937061
commit
9e1ab9ad25
4 changed files with 36 additions and 11 deletions
|
@ -84,7 +84,11 @@ fun LoginScreen(
|
||||||
}
|
}
|
||||||
// TODO Get the "login target" from a dropdown (BIT-202)
|
// TODO Get the "login target" from a dropdown (BIT-202)
|
||||||
Text(
|
Text(
|
||||||
text = stringResource(id = R.string.log_in_attempt_by_x_on_y, state.emailAddress, "bitwarden.com"),
|
text = stringResource(
|
||||||
|
id = R.string.log_in_attempt_by_x_on_y,
|
||||||
|
state.emailAddress,
|
||||||
|
"bitwarden.com",
|
||||||
|
),
|
||||||
color = MaterialTheme.colorScheme.primary,
|
color = MaterialTheme.colorScheme.primary,
|
||||||
style = MaterialTheme.typography.bodySmall,
|
style = MaterialTheme.typography.bodySmall,
|
||||||
)
|
)
|
||||||
|
|
|
@ -22,7 +22,9 @@ import androidx.compose.ui.unit.dp
|
||||||
*
|
*
|
||||||
* TODO: remove deprecated version: BIT-289
|
* TODO: remove deprecated version: BIT-289
|
||||||
*/
|
*/
|
||||||
@Deprecated(message = "Use overloaded BitwardenTextField that takes an input instead of an initialText.")
|
@Deprecated(
|
||||||
|
message = "Use overloaded BitwardenTextField that takes an input instead of an initialText.",
|
||||||
|
)
|
||||||
@Composable
|
@Composable
|
||||||
fun BitwardenTextField(
|
fun BitwardenTextField(
|
||||||
label: String,
|
label: String,
|
||||||
|
|
|
@ -43,19 +43,38 @@ fun VaultUnlockedNavBarScreen(
|
||||||
navController.apply {
|
navController.apply {
|
||||||
val navOptions = vaultUnlockedNavBarScreenNavOptions()
|
val navOptions = vaultUnlockedNavBarScreenNavOptions()
|
||||||
when (event) {
|
when (event) {
|
||||||
VaultUnlockedNavBarEvent.NavigateToVaultScreen -> navigateToVault(navOptions)
|
VaultUnlockedNavBarEvent.NavigateToVaultScreen -> {
|
||||||
VaultUnlockedNavBarEvent.NavigateToSendScreen -> navigateToSend(navOptions)
|
navigateToVault(navOptions)
|
||||||
VaultUnlockedNavBarEvent.NavigateToGeneratorScreen -> navigateToGenerator(navOptions)
|
}
|
||||||
VaultUnlockedNavBarEvent.NavigateToSettingsScreen -> navigateToSettings(navOptions)
|
|
||||||
|
VaultUnlockedNavBarEvent.NavigateToSendScreen -> {
|
||||||
|
navigateToSend(navOptions)
|
||||||
|
}
|
||||||
|
|
||||||
|
VaultUnlockedNavBarEvent.NavigateToGeneratorScreen -> {
|
||||||
|
navigateToGenerator(navOptions)
|
||||||
|
}
|
||||||
|
|
||||||
|
VaultUnlockedNavBarEvent.NavigateToSettingsScreen -> {
|
||||||
|
navigateToSettings(navOptions)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
VaultUnlockedNavBarScaffold(
|
VaultUnlockedNavBarScaffold(
|
||||||
navController = navController,
|
navController = navController,
|
||||||
generatorTabClickedAction = { viewModel.trySendAction(VaultUnlockedNavBarAction.GeneratorTabClick) },
|
generatorTabClickedAction = {
|
||||||
sendTabClickedAction = { viewModel.trySendAction(VaultUnlockedNavBarAction.SendTabClick) },
|
viewModel.trySendAction(VaultUnlockedNavBarAction.GeneratorTabClick)
|
||||||
vaultTabClickedAction = { viewModel.trySendAction(VaultUnlockedNavBarAction.VaultTabClick) },
|
},
|
||||||
settingsTabClickedAction = { viewModel.trySendAction(VaultUnlockedNavBarAction.SettingsTabClick) },
|
sendTabClickedAction = {
|
||||||
|
viewModel.trySendAction(VaultUnlockedNavBarAction.SendTabClick)
|
||||||
|
},
|
||||||
|
vaultTabClickedAction = {
|
||||||
|
viewModel.trySendAction(VaultUnlockedNavBarAction.VaultTabClick)
|
||||||
|
},
|
||||||
|
settingsTabClickedAction = {
|
||||||
|
viewModel.trySendAction(VaultUnlockedNavBarAction.SettingsTabClick)
|
||||||
|
},
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -566,7 +566,7 @@ style:
|
||||||
active: false
|
active: false
|
||||||
MaxLineLength:
|
MaxLineLength:
|
||||||
active: true
|
active: true
|
||||||
maxLineLength: 120
|
maxLineLength: 100
|
||||||
excludePackageStatements: true
|
excludePackageStatements: true
|
||||||
excludeImportStatements: true
|
excludeImportStatements: true
|
||||||
excludeCommentStatements: false
|
excludeCommentStatements: false
|
||||||
|
|
Loading…
Add table
Reference in a new issue