Skip to content

Commit 6719534

Browse files
SaintPatrckSaintPatrck
authored
[PM-21357] Migrate ModifierExtensions to ui module (#5215)
1 parent 183584f commit 6719534

File tree

113 files changed

+147
-232
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+147
-232
lines changed

‎app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupAutofillScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ import androidx.compose.ui.unit.dp
3030
import androidx.hilt.navigation.compose.hiltViewModel
3131
import androidx.lifecycle.compose.collectAsStateWithLifecycle
3232
import com.bitwarden.ui.platform.base.util.EventsEffect
33+
import com.bitwarden.ui.platform.base.util.standardHorizontalMargin
3334
import com.bitwarden.ui.platform.components.model.CardStyle
3435
import com.bitwarden.ui.platform.model.WindowSize
3536
import com.bitwarden.ui.platform.theme.BitwardenTheme
3637
import com.bitwarden.ui.platform.util.rememberWindowSize
3738
import com.x8bit.bitwarden.R
3839
import com.x8bit.bitwarden.ui.auth.feature.accountsetup.handlers.rememberSetupAutoFillHandler
39-
import com.x8bit.bitwarden.ui.platform.base.util.standardHorizontalMargin
4040
import com.x8bit.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar
4141
import com.x8bit.bitwarden.ui.platform.components.appbar.NavigationIcon
4242
import com.x8bit.bitwarden.ui.platform.components.button.BitwardenFilledButton

‎app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupCompleteScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import androidx.compose.ui.text.style.TextAlign
2424
import androidx.compose.ui.tooling.preview.Preview
2525
import androidx.compose.ui.unit.dp
2626
import androidx.hilt.navigation.compose.hiltViewModel
27+
import com.bitwarden.ui.platform.base.util.standardHorizontalMargin
2728
import com.bitwarden.ui.platform.theme.BitwardenTheme
2829
import com.x8bit.bitwarden.R
29-
import com.x8bit.bitwarden.ui.platform.base.util.standardHorizontalMargin
3030
import com.x8bit.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar
3131
import com.x8bit.bitwarden.ui.platform.components.button.BitwardenFilledButton
3232
import com.x8bit.bitwarden.ui.platform.components.scaffold.BitwardenScaffold

‎app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupUnlockScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ import androidx.compose.ui.unit.dp
3434
import androidx.hilt.navigation.compose.hiltViewModel
3535
import androidx.lifecycle.compose.collectAsStateWithLifecycle
3636
import com.bitwarden.ui.platform.base.util.EventsEffect
37+
import com.bitwarden.ui.platform.base.util.standardHorizontalMargin
3738
import com.bitwarden.ui.platform.components.model.CardStyle
3839
import com.bitwarden.ui.platform.model.WindowSize
3940
import com.bitwarden.ui.platform.theme.BitwardenTheme
4041
import com.bitwarden.ui.platform.util.rememberWindowSize
4142
import com.x8bit.bitwarden.R
4243
import com.x8bit.bitwarden.ui.auth.feature.accountsetup.handlers.SetupUnlockHandler
43-
import com.x8bit.bitwarden.ui.platform.base.util.standardHorizontalMargin
4444
import com.x8bit.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar
4545
import com.x8bit.bitwarden.ui.platform.components.appbar.NavigationIcon
4646
import com.x8bit.bitwarden.ui.platform.components.button.BitwardenFilledButton

‎app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/checkemail/CheckEmailScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ import androidx.compose.ui.unit.dp
3131
import androidx.hilt.navigation.compose.hiltViewModel
3232
import androidx.lifecycle.compose.collectAsStateWithLifecycle
3333
import com.bitwarden.ui.platform.base.util.EventsEffect
34+
import com.bitwarden.ui.platform.base.util.standardHorizontalMargin
3435
import com.bitwarden.ui.platform.theme.BitwardenTheme
3536
import com.x8bit.bitwarden.R
3637
import com.x8bit.bitwarden.ui.auth.feature.checkemail.handlers.rememberCheckEmailHandler
37-
import com.x8bit.bitwarden.ui.platform.base.util.standardHorizontalMargin
3838
import com.x8bit.bitwarden.ui.platform.base.util.toAnnotatedString
3939
import com.x8bit.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar
4040
import com.x8bit.bitwarden.ui.platform.components.button.BitwardenFilledButton

‎app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/completeregistration/CompleteRegistrationScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ import androidx.compose.ui.unit.dp
3636
import androidx.hilt.navigation.compose.hiltViewModel
3737
import androidx.lifecycle.compose.collectAsStateWithLifecycle
3838
import com.bitwarden.ui.platform.base.util.EventsEffect
39+
import com.bitwarden.ui.platform.base.util.standardHorizontalMargin
3940
import com.bitwarden.ui.platform.components.model.CardStyle
4041
import com.bitwarden.ui.platform.model.WindowSize
4142
import com.bitwarden.ui.platform.theme.BitwardenTheme
4243
import com.bitwarden.ui.platform.util.rememberWindowSize
4344
import com.x8bit.bitwarden.R
4445
import com.x8bit.bitwarden.ui.auth.feature.completeregistration.handlers.CompleteRegistrationHandler
4546
import com.x8bit.bitwarden.ui.auth.feature.completeregistration.handlers.rememberCompleteRegistrationHandler
46-
import com.x8bit.bitwarden.ui.platform.base.util.standardHorizontalMargin
4747
import com.x8bit.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar
4848
import com.x8bit.bitwarden.ui.platform.components.button.BitwardenFilledButton
4949
import com.x8bit.bitwarden.ui.platform.components.button.BitwardenTextButton

‎app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/createaccount/CreateAccountScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import androidx.core.net.toUri
3434
import androidx.hilt.navigation.compose.hiltViewModel
3535
import androidx.lifecycle.compose.collectAsStateWithLifecycle
3636
import com.bitwarden.ui.platform.base.util.EventsEffect
37+
import com.bitwarden.ui.platform.base.util.standardHorizontalMargin
3738
import com.bitwarden.ui.platform.components.model.CardStyle
3839
import com.bitwarden.ui.platform.theme.BitwardenTheme
3940
import com.x8bit.bitwarden.R
@@ -52,7 +53,6 @@ import com.x8bit.bitwarden.ui.auth.feature.createaccount.CreateAccountAction.Sub
5253
import com.x8bit.bitwarden.ui.auth.feature.createaccount.CreateAccountAction.TermsClick
5354
import com.x8bit.bitwarden.ui.auth.feature.createaccount.CreateAccountEvent.NavigateToPrivacyPolicy
5455
import com.x8bit.bitwarden.ui.auth.feature.createaccount.CreateAccountEvent.NavigateToTerms
55-
import com.x8bit.bitwarden.ui.platform.base.util.standardHorizontalMargin
5656
import com.x8bit.bitwarden.ui.platform.base.util.toAnnotatedString
5757
import com.x8bit.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar
5858
import com.x8bit.bitwarden.ui.platform.components.button.BitwardenTextButton

‎app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ import androidx.compose.ui.unit.dp
2525
import androidx.hilt.navigation.compose.hiltViewModel
2626
import androidx.lifecycle.compose.collectAsStateWithLifecycle
2727
import com.bitwarden.ui.platform.base.util.EventsEffect
28+
import com.bitwarden.ui.platform.base.util.standardHorizontalMargin
2829
import com.bitwarden.ui.platform.components.model.CardStyle
2930
import com.bitwarden.ui.platform.theme.BitwardenTheme
3031
import com.x8bit.bitwarden.R
31-
import com.x8bit.bitwarden.ui.platform.base.util.standardHorizontalMargin
3232
import com.x8bit.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar
3333
import com.x8bit.bitwarden.ui.platform.components.button.BitwardenTextButton
3434
import com.x8bit.bitwarden.ui.platform.components.dialog.BitwardenBasicDialog

‎app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/environment/EnvironmentScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ import androidx.compose.ui.unit.dp
2828
import androidx.hilt.navigation.compose.hiltViewModel
2929
import androidx.lifecycle.compose.collectAsStateWithLifecycle
3030
import com.bitwarden.ui.platform.base.util.EventsEffect
31+
import com.bitwarden.ui.platform.base.util.standardHorizontalMargin
3132
import com.bitwarden.ui.platform.components.model.CardStyle
3233
import com.x8bit.bitwarden.BuildConfig
3334
import com.x8bit.bitwarden.R
34-
import com.x8bit.bitwarden.ui.platform.base.util.standardHorizontalMargin
3535
import com.x8bit.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar
3636
import com.x8bit.bitwarden.ui.platform.components.button.BitwardenFilledButton
3737
import com.x8bit.bitwarden.ui.platform.components.button.BitwardenOutlinedButton

‎app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/expiredregistrationlink/ExpiredRegistrationLinkScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import androidx.compose.ui.tooling.preview.Preview
2121
import androidx.compose.ui.unit.dp
2222
import androidx.hilt.navigation.compose.hiltViewModel
2323
import com.bitwarden.ui.platform.base.util.EventsEffect
24+
import com.bitwarden.ui.platform.base.util.standardHorizontalMargin
2425
import com.bitwarden.ui.platform.theme.BitwardenTheme
2526
import com.x8bit.bitwarden.R
26-
import com.x8bit.bitwarden.ui.platform.base.util.standardHorizontalMargin
2727
import com.x8bit.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar
2828
import com.x8bit.bitwarden.ui.platform.components.appbar.NavigationIcon
2929
import com.x8bit.bitwarden.ui.platform.components.button.BitwardenFilledButton

‎app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/landing/LandingScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ import androidx.hilt.navigation.compose.hiltViewModel
3737
import androidx.lifecycle.compose.collectAsStateWithLifecycle
3838
import com.bitwarden.data.repository.model.Environment
3939
import com.bitwarden.ui.platform.base.util.EventsEffect
40+
import com.bitwarden.ui.platform.base.util.standardHorizontalMargin
4041
import com.bitwarden.ui.platform.components.model.CardStyle
4142
import com.bitwarden.ui.platform.theme.BitwardenTheme
4243
import com.x8bit.bitwarden.R
43-
import com.x8bit.bitwarden.ui.platform.base.util.standardHorizontalMargin
4444
import com.x8bit.bitwarden.ui.platform.components.account.BitwardenAccountSwitcher
4545
import com.x8bit.bitwarden.ui.platform.components.account.BitwardenPlaceholderAccountActionItem
4646
import com.x8bit.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar

‎app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ import androidx.compose.ui.unit.dp
3333
import androidx.hilt.navigation.compose.hiltViewModel
3434
import androidx.lifecycle.compose.collectAsStateWithLifecycle
3535
import com.bitwarden.ui.platform.base.util.EventsEffect
36+
import com.bitwarden.ui.platform.base.util.standardHorizontalMargin
3637
import com.bitwarden.ui.platform.components.model.CardStyle
3738
import com.bitwarden.ui.platform.theme.BitwardenTheme
3839
import com.x8bit.bitwarden.R
39-
import com.x8bit.bitwarden.ui.platform.base.util.standardHorizontalMargin
4040
import com.x8bit.bitwarden.ui.platform.components.account.BitwardenAccountSwitcher
4141
import com.x8bit.bitwarden.ui.platform.components.account.BitwardenPlaceholderAccountActionItem
4242
import com.x8bit.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar

‎app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/masterpasswordgenerator/MasterPasswordGeneratorScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ import androidx.compose.ui.unit.dp
2727
import androidx.hilt.navigation.compose.hiltViewModel
2828
import androidx.lifecycle.compose.collectAsStateWithLifecycle
2929
import com.bitwarden.ui.platform.base.util.EventsEffect
30+
import com.bitwarden.ui.platform.base.util.standardHorizontalMargin
3031
import com.bitwarden.ui.platform.components.model.CardStyle
3132
import com.bitwarden.ui.platform.theme.BitwardenTheme
3233
import com.x8bit.bitwarden.R
33-
import com.x8bit.bitwarden.ui.platform.base.util.standardHorizontalMargin
3434
import com.x8bit.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar
3535
import com.x8bit.bitwarden.ui.platform.components.button.BitwardenFilledButton
3636
import com.x8bit.bitwarden.ui.platform.components.button.BitwardenTextButton

‎app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/masterpasswordguidance/MasterPasswordGuidanceScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ import androidx.compose.ui.tooling.preview.Preview
2323
import androidx.compose.ui.unit.dp
2424
import androidx.hilt.navigation.compose.hiltViewModel
2525
import com.bitwarden.ui.platform.base.util.EventsEffect
26+
import com.bitwarden.ui.platform.base.util.standardHorizontalMargin
2627
import com.bitwarden.ui.platform.base.util.toAnnotatedString
2728
import com.bitwarden.ui.platform.theme.BitwardenTheme
2829
import com.x8bit.bitwarden.R
29-
import com.x8bit.bitwarden.ui.platform.base.util.standardHorizontalMargin
3030
import com.x8bit.bitwarden.ui.platform.base.util.toAnnotatedString
3131
import com.x8bit.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar
3232
import com.x8bit.bitwarden.ui.platform.components.card.BitwardenActionCard

‎app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/masterpasswordhint/MasterPasswordHintScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import androidx.compose.ui.unit.dp
2121
import androidx.hilt.navigation.compose.hiltViewModel
2222
import androidx.lifecycle.compose.collectAsStateWithLifecycle
2323
import com.bitwarden.ui.platform.base.util.EventsEffect
24+
import com.bitwarden.ui.platform.base.util.standardHorizontalMargin
2425
import com.bitwarden.ui.platform.components.model.CardStyle
2526
import com.x8bit.bitwarden.R
26-
import com.x8bit.bitwarden.ui.platform.base.util.standardHorizontalMargin
2727
import com.x8bit.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar
2828
import com.x8bit.bitwarden.ui.platform.components.button.BitwardenTextButton
2929
import com.x8bit.bitwarden.ui.platform.components.dialog.BitwardenBasicDialog

‎app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/preventaccountlockout/PreventAccountLockoutScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ import androidx.compose.ui.tooling.preview.Preview
2323
import androidx.compose.ui.unit.dp
2424
import androidx.hilt.navigation.compose.hiltViewModel
2525
import com.bitwarden.ui.platform.base.util.EventsEffect
26+
import com.bitwarden.ui.platform.base.util.standardHorizontalMargin
2627
import com.bitwarden.ui.platform.theme.BitwardenTheme
2728
import com.x8bit.bitwarden.R
28-
import com.x8bit.bitwarden.ui.platform.base.util.standardHorizontalMargin
2929
import com.x8bit.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar
3030
import com.x8bit.bitwarden.ui.platform.components.card.BitwardenContentCard
3131
import com.x8bit.bitwarden.ui.platform.components.model.ContentBlockData

‎app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/removepassword/RemovePasswordScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ import androidx.compose.ui.tooling.preview.Preview
2323
import androidx.compose.ui.unit.dp
2424
import androidx.hilt.navigation.compose.hiltViewModel
2525
import androidx.lifecycle.compose.collectAsStateWithLifecycle
26+
import com.bitwarden.ui.platform.base.util.standardHorizontalMargin
2627
import com.bitwarden.ui.platform.components.model.CardStyle
2728
import com.bitwarden.ui.platform.theme.BitwardenTheme
2829
import com.bitwarden.ui.util.asText
2930
import com.x8bit.bitwarden.R
30-
import com.x8bit.bitwarden.ui.platform.base.util.standardHorizontalMargin
3131
import com.x8bit.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar
3232
import com.x8bit.bitwarden.ui.platform.components.button.BitwardenFilledButton
3333
import com.x8bit.bitwarden.ui.platform.components.button.BitwardenOutlinedButton

‎app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/resetpassword/ResetPasswordScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ import androidx.compose.ui.unit.dp
2929
import androidx.hilt.navigation.compose.hiltViewModel
3030
import androidx.lifecycle.compose.collectAsStateWithLifecycle
3131
import com.bitwarden.ui.platform.base.util.EventsEffect
32+
import com.bitwarden.ui.platform.base.util.standardHorizontalMargin
3233
import com.bitwarden.ui.platform.components.model.CardStyle
3334
import com.bitwarden.ui.platform.theme.BitwardenTheme
3435
import com.x8bit.bitwarden.R
3536
import com.x8bit.bitwarden.data.auth.datasource.disk.model.ForcePasswordResetReason
3637
import com.x8bit.bitwarden.ui.auth.feature.completeregistration.PasswordStrengthIndicator
3738
import com.x8bit.bitwarden.ui.auth.feature.completeregistration.PasswordStrengthState
38-
import com.x8bit.bitwarden.ui.platform.base.util.standardHorizontalMargin
3939
import com.x8bit.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar
4040
import com.x8bit.bitwarden.ui.platform.components.appbar.action.BitwardenOverflowActionItem
4141
import com.x8bit.bitwarden.ui.platform.components.appbar.action.OverflowMenuItemData

‎app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/setpassword/SetPasswordScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ import androidx.compose.ui.res.stringResource
2525
import androidx.compose.ui.unit.dp
2626
import androidx.hilt.navigation.compose.hiltViewModel
2727
import androidx.lifecycle.compose.collectAsStateWithLifecycle
28+
import com.bitwarden.ui.platform.base.util.standardHorizontalMargin
2829
import com.bitwarden.ui.platform.components.model.CardStyle
2930
import com.bitwarden.ui.platform.theme.BitwardenTheme
3031
import com.x8bit.bitwarden.R
31-
import com.x8bit.bitwarden.ui.platform.base.util.standardHorizontalMargin
3232
import com.x8bit.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar
3333
import com.x8bit.bitwarden.ui.platform.components.button.BitwardenTextButton
3434
import com.x8bit.bitwarden.ui.platform.components.card.BitwardenInfoCalloutCard

‎app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/startregistration/StartRegistrationScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ import androidx.hilt.navigation.compose.hiltViewModel
4343
import androidx.lifecycle.compose.collectAsStateWithLifecycle
4444
import com.bitwarden.data.repository.model.Environment
4545
import com.bitwarden.ui.platform.base.util.EventsEffect
46+
import com.bitwarden.ui.platform.base.util.standardHorizontalMargin
4647
import com.bitwarden.ui.platform.components.model.CardStyle
4748
import com.bitwarden.ui.platform.theme.BitwardenTheme
4849
import com.x8bit.bitwarden.R
@@ -51,7 +52,6 @@ import com.x8bit.bitwarden.ui.auth.feature.startregistration.StartRegistrationEv
5152
import com.x8bit.bitwarden.ui.auth.feature.startregistration.StartRegistrationEvent.NavigateToTerms
5253
import com.x8bit.bitwarden.ui.auth.feature.startregistration.handlers.StartRegistrationHandler
5354
import com.x8bit.bitwarden.ui.auth.feature.startregistration.handlers.rememberStartRegistrationHandler
54-
import com.x8bit.bitwarden.ui.platform.base.util.standardHorizontalMargin
5555
import com.x8bit.bitwarden.ui.platform.base.util.toAnnotatedString
5656
import com.x8bit.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar
5757
import com.x8bit.bitwarden.ui.platform.components.button.BitwardenFilledButton

‎app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/trusteddevice/TrustedDeviceScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ import androidx.compose.ui.unit.dp
2929
import androidx.hilt.navigation.compose.hiltViewModel
3030
import androidx.lifecycle.compose.collectAsStateWithLifecycle
3131
import com.bitwarden.ui.platform.base.util.EventsEffect
32+
import com.bitwarden.ui.platform.base.util.standardHorizontalMargin
3233
import com.bitwarden.ui.platform.components.model.CardStyle
3334
import com.bitwarden.ui.platform.theme.BitwardenTheme
3435
import com.x8bit.bitwarden.R
3536
import com.x8bit.bitwarden.ui.auth.feature.trusteddevice.handlers.TrustedDeviceHandlers
36-
import com.x8bit.bitwarden.ui.platform.base.util.standardHorizontalMargin
3737
import com.x8bit.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar
3838
import com.x8bit.bitwarden.ui.platform.components.appbar.NavigationIcon
3939
import com.x8bit.bitwarden.ui.platform.components.button.BitwardenFilledButton

‎app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
4040
import com.bitwarden.network.model.TwoFactorAuthMethod
4141
import com.bitwarden.ui.platform.base.util.EventsEffect
4242
import com.bitwarden.ui.platform.base.util.LifecycleEventEffect
43+
import com.bitwarden.ui.platform.base.util.standardHorizontalMargin
4344
import com.bitwarden.ui.platform.components.model.CardStyle
4445
import com.bitwarden.ui.platform.theme.BitwardenTheme
4546
import com.bitwarden.ui.util.asText
4647
import com.x8bit.bitwarden.R
4748
import com.x8bit.bitwarden.ui.auth.feature.twofactorlogin.util.description
4849
import com.x8bit.bitwarden.ui.auth.feature.twofactorlogin.util.title
49-
import com.x8bit.bitwarden.ui.platform.base.util.standardHorizontalMargin
5050
import com.x8bit.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar
5151
import com.x8bit.bitwarden.ui.platform.components.appbar.action.BitwardenOverflowActionItem
5252
import com.x8bit.bitwarden.ui.platform.components.appbar.action.OverflowMenuItemData

‎app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockScreen.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ import androidx.compose.ui.unit.dp
3636
import androidx.hilt.navigation.compose.hiltViewModel
3737
import androidx.lifecycle.compose.collectAsStateWithLifecycle
3838
import com.bitwarden.ui.platform.base.util.EventsEffect
39+
import com.bitwarden.ui.platform.base.util.cardStyle
40+
import com.bitwarden.ui.platform.base.util.standardHorizontalMargin
3941
import com.bitwarden.ui.platform.components.model.CardStyle
4042
import com.bitwarden.ui.platform.theme.BitwardenTheme
4143
import com.x8bit.bitwarden.R
@@ -48,8 +50,6 @@ import com.x8bit.bitwarden.ui.auth.feature.vaultunlock.util.unlockScreenTitle
4850
import com.x8bit.bitwarden.ui.credentials.manager.CredentialProviderCompletionManager
4951
import com.x8bit.bitwarden.ui.credentials.manager.model.AssertFido2CredentialResult
5052
import com.x8bit.bitwarden.ui.credentials.manager.model.GetCredentialsResult
51-
import com.x8bit.bitwarden.ui.platform.base.util.cardStyle
52-
import com.x8bit.bitwarden.ui.platform.base.util.standardHorizontalMargin
5353
import com.x8bit.bitwarden.ui.platform.components.account.BitwardenAccountActionItem
5454
import com.x8bit.bitwarden.ui.platform.components.account.BitwardenAccountSwitcher
5555
import com.x8bit.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar

‎app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/welcome/WelcomeScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ import androidx.compose.ui.unit.dp
4242
import androidx.hilt.navigation.compose.hiltViewModel
4343
import androidx.lifecycle.compose.collectAsStateWithLifecycle
4444
import com.bitwarden.ui.platform.base.util.EventsEffect
45+
import com.bitwarden.ui.platform.base.util.standardHorizontalMargin
4546
import com.bitwarden.ui.platform.model.WindowSize
4647
import com.bitwarden.ui.platform.theme.BitwardenTheme
4748
import com.bitwarden.ui.platform.util.rememberWindowSize
4849
import com.x8bit.bitwarden.R
49-
import com.x8bit.bitwarden.ui.platform.base.util.standardHorizontalMargin
5050
import com.x8bit.bitwarden.ui.platform.components.button.BitwardenFilledButton
5151
import com.x8bit.bitwarden.ui.platform.components.button.BitwardenOutlinedButton
5252
import com.x8bit.bitwarden.ui.platform.components.scaffold.BitwardenScaffold

0 commit comments

Comments
 (0)