diff --git a/Bitwarden/Application/Support/Assets.xcassets/BackgroundColors/backgroundSplash.colorset/Contents.json b/Bitwarden/Application/Support/Assets.xcassets/BackgroundColors/backgroundSplash.colorset/Contents.json index e4846c314a..110e0bcefe 100644 --- a/Bitwarden/Application/Support/Assets.xcassets/BackgroundColors/backgroundSplash.colorset/Contents.json +++ b/Bitwarden/Application/Support/Assets.xcassets/BackgroundColors/backgroundSplash.colorset/Contents.json @@ -5,9 +5,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0xFF", - "green" : "0xFF", - "red" : "0xFF" + "blue" : "0xF9", + "green" : "0xF6", + "red" : "0xF3" } }, "idiom" : "universal" @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0x1E", - "green" : "0x1C", - "red" : "0x1C" + "blue" : "0x27", + "green" : "0x1A", + "red" : "0x12" } }, "idiom" : "universal" diff --git a/BitwardenShared/UI/Auth/CompleteRegistration/CompleteRegistrationView.swift b/BitwardenShared/UI/Auth/CompleteRegistration/CompleteRegistrationView.swift index ffdc0b7883..a641a85803 100644 --- a/BitwardenShared/UI/Auth/CompleteRegistration/CompleteRegistrationView.swift +++ b/BitwardenShared/UI/Auth/CompleteRegistration/CompleteRegistrationView.swift @@ -102,7 +102,7 @@ struct CompleteRegistrationView: View { Image(decorative: Asset.Images.questionRound) .resizable() .frame(width: 24, height: 24) - .foregroundStyle(Asset.Colors.primaryBitwarden.swiftUIColor) + .foregroundStyle(Asset.Colors.iconSecondary.swiftUIColor) VStack(alignment: .leading, spacing: 0) { Text(Localizations.whatMakesAPasswordStrong) @@ -115,13 +115,13 @@ struct CompleteRegistrationView: View { } label: { Text(Localizations.learnMore) .styleGuide(.subheadline) - .foregroundStyle(Asset.Colors.primaryBitwarden.swiftUIColor) + .foregroundStyle(Asset.Colors.textInteraction.swiftUIColor) } } .frame(maxWidth: .infinity, alignment: .leading) } .padding(16) - .background(Asset.Colors.backgroundTertiary.swiftUIColor) + .background(Asset.Colors.backgroundSecondary.swiftUIColor) .clipShape(RoundedRectangle(cornerRadius: 10)) } @@ -167,7 +167,7 @@ struct CompleteRegistrationView: View { store.send(.preventAccountLockTapped) } label: { Text(Localizations.learnAboutWaysToPreventAccountLockout) - .foregroundColor(Color(asset: Asset.Colors.primaryBitwardenLight)) + .foregroundColor(Asset.Colors.textInteraction.swiftUIColor) .styleGuide(.footnote, weight: .bold) .multilineTextAlignment(.leading) } diff --git a/BitwardenShared/UI/Auth/CompleteRegistration/ExpiredLink/ExpiredLinkView.swift b/BitwardenShared/UI/Auth/CompleteRegistration/ExpiredLink/ExpiredLinkView.swift index 7a39b3567c..a79280fb8f 100644 --- a/BitwardenShared/UI/Auth/CompleteRegistration/ExpiredLink/ExpiredLinkView.swift +++ b/BitwardenShared/UI/Auth/CompleteRegistration/ExpiredLink/ExpiredLinkView.swift @@ -17,7 +17,7 @@ struct ExpiredLinkView: View { VStack(alignment: .center, spacing: 0) { Image(decorative: Asset.Images.expiredLink) .frame(maxWidth: .infinity) - .foregroundColor(Asset.Colors.primaryBitwarden.swiftUIColor) + .foregroundColor(Asset.Colors.iconSecondary.swiftUIColor) .padding([.bottom, .top], 32) Text(Localizations.expiredLink) diff --git a/BitwardenShared/UI/Auth/CompleteRegistration/ExpiredLink/__Snapshots__/ExpiredLinkViewTests/test_snapshot_toggles_on.2.png b/BitwardenShared/UI/Auth/CompleteRegistration/ExpiredLink/__Snapshots__/ExpiredLinkViewTests/test_snapshot_toggles_on.2.png index c53c0c7753..fe2a30e868 100644 Binary files a/BitwardenShared/UI/Auth/CompleteRegistration/ExpiredLink/__Snapshots__/ExpiredLinkViewTests/test_snapshot_toggles_on.2.png and b/BitwardenShared/UI/Auth/CompleteRegistration/ExpiredLink/__Snapshots__/ExpiredLinkViewTests/test_snapshot_toggles_on.2.png differ diff --git a/BitwardenShared/UI/Auth/CompleteRegistration/MasterPasswordGuidance/MasterPasswordGuidanceView.swift b/BitwardenShared/UI/Auth/CompleteRegistration/MasterPasswordGuidance/MasterPasswordGuidanceView.swift index f76e9019c9..90ee7e37f6 100644 --- a/BitwardenShared/UI/Auth/CompleteRegistration/MasterPasswordGuidance/MasterPasswordGuidanceView.swift +++ b/BitwardenShared/UI/Auth/CompleteRegistration/MasterPasswordGuidance/MasterPasswordGuidanceView.swift @@ -19,7 +19,7 @@ struct MasterPasswordGuidanceView: View { detailedInstructionsView } - .background(Asset.Colors.backgroundTertiary.swiftUIColor) + .background(Asset.Colors.backgroundSecondary.swiftUIColor) .clipShape(RoundedRectangle(cornerRadius: 10)) passwordGeneratorButton @@ -80,7 +80,7 @@ struct MasterPasswordGuidanceView: View { Image(decorative: Asset.Images.restart2) .resizable() .frame(width: 24, height: 24) - .foregroundStyle(Asset.Colors.primaryBitwarden.swiftUIColor) + .foregroundStyle(Asset.Colors.iconSecondary.swiftUIColor) VStack(alignment: .leading, spacing: 0) { Text(Localizations.useTheGeneratorToCreateAStrongUniquePassword) @@ -90,16 +90,16 @@ struct MasterPasswordGuidanceView: View { Text(Localizations.tryItOut) .styleGuide(.subheadline) - .foregroundStyle(Asset.Colors.primaryBitwarden.swiftUIColor) + .foregroundStyle(Asset.Colors.textInteraction.swiftUIColor) } .frame(maxWidth: .infinity, alignment: .leading) } Image(decorative: Asset.Images.rightAngle) - .foregroundStyle(Asset.Colors.textSecondary.swiftUIColor) + .foregroundStyle(Asset.Colors.iconPrimary.swiftUIColor) } .padding(16) - .background(Asset.Colors.backgroundTertiary.swiftUIColor) + .background(Asset.Colors.backgroundSecondary.swiftUIColor) .clipShape(RoundedRectangle(cornerRadius: 10)) } } diff --git a/BitwardenShared/UI/Auth/CompleteRegistration/MasterPasswordGuidance/__Snapshots__/MasterPasswordGuidanceViewTests/test_snapshot_masterPasswordGuidance.1.png b/BitwardenShared/UI/Auth/CompleteRegistration/MasterPasswordGuidance/__Snapshots__/MasterPasswordGuidanceViewTests/test_snapshot_masterPasswordGuidance.1.png index 210194e2da..b8668d6ad5 100644 Binary files a/BitwardenShared/UI/Auth/CompleteRegistration/MasterPasswordGuidance/__Snapshots__/MasterPasswordGuidanceViewTests/test_snapshot_masterPasswordGuidance.1.png and b/BitwardenShared/UI/Auth/CompleteRegistration/MasterPasswordGuidance/__Snapshots__/MasterPasswordGuidanceViewTests/test_snapshot_masterPasswordGuidance.1.png differ diff --git a/BitwardenShared/UI/Auth/CompleteRegistration/MasterPasswordGuidance/__Snapshots__/MasterPasswordGuidanceViewTests/test_snapshot_masterPasswordGuidance.2.png b/BitwardenShared/UI/Auth/CompleteRegistration/MasterPasswordGuidance/__Snapshots__/MasterPasswordGuidanceViewTests/test_snapshot_masterPasswordGuidance.2.png index 1a534bffeb..936b4e36d3 100644 Binary files a/BitwardenShared/UI/Auth/CompleteRegistration/MasterPasswordGuidance/__Snapshots__/MasterPasswordGuidanceViewTests/test_snapshot_masterPasswordGuidance.2.png and b/BitwardenShared/UI/Auth/CompleteRegistration/MasterPasswordGuidance/__Snapshots__/MasterPasswordGuidanceViewTests/test_snapshot_masterPasswordGuidance.2.png differ diff --git a/BitwardenShared/UI/Auth/CompleteRegistration/MasterPasswordGuidance/__Snapshots__/MasterPasswordGuidanceViewTests/test_snapshot_masterPasswordGuidance.3.png b/BitwardenShared/UI/Auth/CompleteRegistration/MasterPasswordGuidance/__Snapshots__/MasterPasswordGuidanceViewTests/test_snapshot_masterPasswordGuidance.3.png index 5ac23f23c3..10483dabc2 100644 Binary files a/BitwardenShared/UI/Auth/CompleteRegistration/MasterPasswordGuidance/__Snapshots__/MasterPasswordGuidanceViewTests/test_snapshot_masterPasswordGuidance.3.png and b/BitwardenShared/UI/Auth/CompleteRegistration/MasterPasswordGuidance/__Snapshots__/MasterPasswordGuidanceViewTests/test_snapshot_masterPasswordGuidance.3.png differ diff --git a/BitwardenShared/UI/Auth/CompleteRegistration/MasterPasswordGuidance/__Snapshots__/MasterPasswordGuidanceViewTests/test_snapshot_masterPasswordGuidance.4.png b/BitwardenShared/UI/Auth/CompleteRegistration/MasterPasswordGuidance/__Snapshots__/MasterPasswordGuidanceViewTests/test_snapshot_masterPasswordGuidance.4.png index f1986d2d82..de4ef7a870 100644 Binary files a/BitwardenShared/UI/Auth/CompleteRegistration/MasterPasswordGuidance/__Snapshots__/MasterPasswordGuidanceViewTests/test_snapshot_masterPasswordGuidance.4.png and b/BitwardenShared/UI/Auth/CompleteRegistration/MasterPasswordGuidance/__Snapshots__/MasterPasswordGuidanceViewTests/test_snapshot_masterPasswordGuidance.4.png differ diff --git a/BitwardenShared/UI/Auth/CompleteRegistration/PreventAccountLock/PreventAccountLockView.swift b/BitwardenShared/UI/Auth/CompleteRegistration/PreventAccountLock/PreventAccountLockView.swift index 572e023782..f0dd4c5b25 100644 --- a/BitwardenShared/UI/Auth/CompleteRegistration/PreventAccountLock/PreventAccountLockView.swift +++ b/BitwardenShared/UI/Auth/CompleteRegistration/PreventAccountLock/PreventAccountLockView.swift @@ -21,7 +21,7 @@ struct PreventAccountLockView: View { writeDownInstructions } - .background(Asset.Colors.backgroundTertiary.swiftUIColor) + .background(Asset.Colors.backgroundSecondary.swiftUIColor) .clipShape(RoundedRectangle(cornerRadius: 10)) } .scrollView() @@ -59,7 +59,7 @@ struct PreventAccountLockView: View { Image(decorative: Asset.Images.lightbulb) .resizable() .frame(width: 32, height: 32) - .foregroundStyle(Asset.Colors.primaryBitwarden.swiftUIColor) + .foregroundStyle(Asset.Colors.iconSecondary.swiftUIColor) VStack(alignment: .leading, spacing: 4) { Text(Localizations.createAHint) @@ -84,7 +84,7 @@ struct PreventAccountLockView: View { Image(decorative: Asset.Images.pencil) .resizable() .frame(width: 32, height: 32) - .foregroundStyle(Asset.Colors.primaryBitwarden.swiftUIColor) + .foregroundStyle(Asset.Colors.iconSecondary.swiftUIColor) VStack(alignment: .leading, spacing: 4) { Text(Localizations.writeYourPasswordDown) diff --git a/BitwardenShared/UI/Auth/CompleteRegistration/PreventAccountLock/__Snapshots__/PreventAccountLockViewTests/test_snapshot_preventAccountLock.1.png b/BitwardenShared/UI/Auth/CompleteRegistration/PreventAccountLock/__Snapshots__/PreventAccountLockViewTests/test_snapshot_preventAccountLock.1.png index 13cf9bd907..1a83372d6f 100644 Binary files a/BitwardenShared/UI/Auth/CompleteRegistration/PreventAccountLock/__Snapshots__/PreventAccountLockViewTests/test_snapshot_preventAccountLock.1.png and b/BitwardenShared/UI/Auth/CompleteRegistration/PreventAccountLock/__Snapshots__/PreventAccountLockViewTests/test_snapshot_preventAccountLock.1.png differ diff --git a/BitwardenShared/UI/Auth/CompleteRegistration/PreventAccountLock/__Snapshots__/PreventAccountLockViewTests/test_snapshot_preventAccountLock.2.png b/BitwardenShared/UI/Auth/CompleteRegistration/PreventAccountLock/__Snapshots__/PreventAccountLockViewTests/test_snapshot_preventAccountLock.2.png index 9a6b3461e9..4a6747a0cc 100644 Binary files a/BitwardenShared/UI/Auth/CompleteRegistration/PreventAccountLock/__Snapshots__/PreventAccountLockViewTests/test_snapshot_preventAccountLock.2.png and b/BitwardenShared/UI/Auth/CompleteRegistration/PreventAccountLock/__Snapshots__/PreventAccountLockViewTests/test_snapshot_preventAccountLock.2.png differ diff --git a/BitwardenShared/UI/Auth/CompleteRegistration/PreventAccountLock/__Snapshots__/PreventAccountLockViewTests/test_snapshot_preventAccountLock.3.png b/BitwardenShared/UI/Auth/CompleteRegistration/PreventAccountLock/__Snapshots__/PreventAccountLockViewTests/test_snapshot_preventAccountLock.3.png index 93315372c6..12acd95929 100644 Binary files a/BitwardenShared/UI/Auth/CompleteRegistration/PreventAccountLock/__Snapshots__/PreventAccountLockViewTests/test_snapshot_preventAccountLock.3.png and b/BitwardenShared/UI/Auth/CompleteRegistration/PreventAccountLock/__Snapshots__/PreventAccountLockViewTests/test_snapshot_preventAccountLock.3.png differ diff --git a/BitwardenShared/UI/Auth/CompleteRegistration/PreventAccountLock/__Snapshots__/PreventAccountLockViewTests/test_snapshot_preventAccountLock.4.png b/BitwardenShared/UI/Auth/CompleteRegistration/PreventAccountLock/__Snapshots__/PreventAccountLockViewTests/test_snapshot_preventAccountLock.4.png index e0003d32ba..93bd0efcd9 100644 Binary files a/BitwardenShared/UI/Auth/CompleteRegistration/PreventAccountLock/__Snapshots__/PreventAccountLockViewTests/test_snapshot_preventAccountLock.4.png and b/BitwardenShared/UI/Auth/CompleteRegistration/PreventAccountLock/__Snapshots__/PreventAccountLockViewTests/test_snapshot_preventAccountLock.4.png differ diff --git a/BitwardenShared/UI/Auth/CompleteRegistration/__Snapshots__/CompleteRegistrationViewTests/test_nativeCreateAccountFlow.1.png b/BitwardenShared/UI/Auth/CompleteRegistration/__Snapshots__/CompleteRegistrationViewTests/test_nativeCreateAccountFlow.1.png index b7f4b52a2b..cd393bcfd0 100644 Binary files a/BitwardenShared/UI/Auth/CompleteRegistration/__Snapshots__/CompleteRegistrationViewTests/test_nativeCreateAccountFlow.1.png and b/BitwardenShared/UI/Auth/CompleteRegistration/__Snapshots__/CompleteRegistrationViewTests/test_nativeCreateAccountFlow.1.png differ diff --git a/BitwardenShared/UI/Auth/CompleteRegistration/__Snapshots__/CompleteRegistrationViewTests/test_nativeCreateAccountFlow.2.png b/BitwardenShared/UI/Auth/CompleteRegistration/__Snapshots__/CompleteRegistrationViewTests/test_nativeCreateAccountFlow.2.png index eda13846e4..86408ed52f 100644 Binary files a/BitwardenShared/UI/Auth/CompleteRegistration/__Snapshots__/CompleteRegistrationViewTests/test_nativeCreateAccountFlow.2.png and b/BitwardenShared/UI/Auth/CompleteRegistration/__Snapshots__/CompleteRegistrationViewTests/test_nativeCreateAccountFlow.2.png differ diff --git a/BitwardenShared/UI/Auth/CompleteRegistration/__Snapshots__/CompleteRegistrationViewTests/test_nativeCreateAccountFlow.3.png b/BitwardenShared/UI/Auth/CompleteRegistration/__Snapshots__/CompleteRegistrationViewTests/test_nativeCreateAccountFlow.3.png index f7b36ef884..303f680f56 100644 Binary files a/BitwardenShared/UI/Auth/CompleteRegistration/__Snapshots__/CompleteRegistrationViewTests/test_nativeCreateAccountFlow.3.png and b/BitwardenShared/UI/Auth/CompleteRegistration/__Snapshots__/CompleteRegistrationViewTests/test_nativeCreateAccountFlow.3.png differ diff --git a/BitwardenShared/UI/Auth/CompleteRegistration/__Snapshots__/CompleteRegistrationViewTests/test_snapshot_empty.1.png b/BitwardenShared/UI/Auth/CompleteRegistration/__Snapshots__/CompleteRegistrationViewTests/test_snapshot_empty.1.png index be6ed0909b..3b036b4535 100644 Binary files a/BitwardenShared/UI/Auth/CompleteRegistration/__Snapshots__/CompleteRegistrationViewTests/test_snapshot_empty.1.png and b/BitwardenShared/UI/Auth/CompleteRegistration/__Snapshots__/CompleteRegistrationViewTests/test_snapshot_empty.1.png differ diff --git a/BitwardenShared/UI/Auth/CompleteRegistration/__Snapshots__/CompleteRegistrationViewTests/test_snapshot_empty.2.png b/BitwardenShared/UI/Auth/CompleteRegistration/__Snapshots__/CompleteRegistrationViewTests/test_snapshot_empty.2.png index 3754ad2a81..93f942a9f0 100644 Binary files a/BitwardenShared/UI/Auth/CompleteRegistration/__Snapshots__/CompleteRegistrationViewTests/test_snapshot_empty.2.png and b/BitwardenShared/UI/Auth/CompleteRegistration/__Snapshots__/CompleteRegistrationViewTests/test_snapshot_empty.2.png differ diff --git a/BitwardenShared/UI/Auth/CompleteRegistration/__Snapshots__/CompleteRegistrationViewTests/test_snapshot_empty.3.png b/BitwardenShared/UI/Auth/CompleteRegistration/__Snapshots__/CompleteRegistrationViewTests/test_snapshot_empty.3.png index 5a98cd3cc1..c725628188 100644 Binary files a/BitwardenShared/UI/Auth/CompleteRegistration/__Snapshots__/CompleteRegistrationViewTests/test_snapshot_empty.3.png and b/BitwardenShared/UI/Auth/CompleteRegistration/__Snapshots__/CompleteRegistrationViewTests/test_snapshot_empty.3.png differ diff --git a/BitwardenShared/UI/Auth/CompleteRegistration/__Snapshots__/CompleteRegistrationViewTests/test_snapshot_textFields_hidden.1.png b/BitwardenShared/UI/Auth/CompleteRegistration/__Snapshots__/CompleteRegistrationViewTests/test_snapshot_textFields_hidden.1.png index 1381677f00..5bdda1eef4 100644 Binary files a/BitwardenShared/UI/Auth/CompleteRegistration/__Snapshots__/CompleteRegistrationViewTests/test_snapshot_textFields_hidden.1.png and b/BitwardenShared/UI/Auth/CompleteRegistration/__Snapshots__/CompleteRegistrationViewTests/test_snapshot_textFields_hidden.1.png differ diff --git a/BitwardenShared/UI/Auth/CompleteRegistration/__Snapshots__/CompleteRegistrationViewTests/test_snapshot_textFields_populated.1.png b/BitwardenShared/UI/Auth/CompleteRegistration/__Snapshots__/CompleteRegistrationViewTests/test_snapshot_textFields_populated.1.png index f67497adc0..c25a5ac471 100644 Binary files a/BitwardenShared/UI/Auth/CompleteRegistration/__Snapshots__/CompleteRegistrationViewTests/test_snapshot_textFields_populated.1.png and b/BitwardenShared/UI/Auth/CompleteRegistration/__Snapshots__/CompleteRegistrationViewTests/test_snapshot_textFields_populated.1.png differ diff --git a/BitwardenShared/UI/Auth/CompleteRegistration/__Snapshots__/CompleteRegistrationViewTests/test_snapshot_textFields_populated.2.png b/BitwardenShared/UI/Auth/CompleteRegistration/__Snapshots__/CompleteRegistrationViewTests/test_snapshot_textFields_populated.2.png index 87e4978d2b..55418c6006 100644 Binary files a/BitwardenShared/UI/Auth/CompleteRegistration/__Snapshots__/CompleteRegistrationViewTests/test_snapshot_textFields_populated.2.png and b/BitwardenShared/UI/Auth/CompleteRegistration/__Snapshots__/CompleteRegistrationViewTests/test_snapshot_textFields_populated.2.png differ diff --git a/BitwardenShared/UI/Auth/CompleteRegistration/__Snapshots__/CompleteRegistrationViewTests/test_snapshot_textFields_populated.3.png b/BitwardenShared/UI/Auth/CompleteRegistration/__Snapshots__/CompleteRegistrationViewTests/test_snapshot_textFields_populated.3.png index 3a9a65e7cd..12e0296986 100644 Binary files a/BitwardenShared/UI/Auth/CompleteRegistration/__Snapshots__/CompleteRegistrationViewTests/test_snapshot_textFields_populated.3.png and b/BitwardenShared/UI/Auth/CompleteRegistration/__Snapshots__/CompleteRegistrationViewTests/test_snapshot_textFields_populated.3.png differ diff --git a/BitwardenShared/UI/Auth/CompleteRegistration/__Snapshots__/CompleteRegistrationViewTests/test_snapshot_toggles_on.1.png b/BitwardenShared/UI/Auth/CompleteRegistration/__Snapshots__/CompleteRegistrationViewTests/test_snapshot_toggles_on.1.png index be6ed0909b..3b036b4535 100644 Binary files a/BitwardenShared/UI/Auth/CompleteRegistration/__Snapshots__/CompleteRegistrationViewTests/test_snapshot_toggles_on.1.png and b/BitwardenShared/UI/Auth/CompleteRegistration/__Snapshots__/CompleteRegistrationViewTests/test_snapshot_toggles_on.1.png differ diff --git a/BitwardenShared/UI/Auth/CreateAccount/__Snapshots__/CreateAccountViewTests/test_snapshot_empty.1.png b/BitwardenShared/UI/Auth/CreateAccount/__Snapshots__/CreateAccountViewTests/test_snapshot_empty.1.png index 721b87f01c..c225bd8805 100644 Binary files a/BitwardenShared/UI/Auth/CreateAccount/__Snapshots__/CreateAccountViewTests/test_snapshot_empty.1.png and b/BitwardenShared/UI/Auth/CreateAccount/__Snapshots__/CreateAccountViewTests/test_snapshot_empty.1.png differ diff --git a/BitwardenShared/UI/Auth/CreateAccount/__Snapshots__/CreateAccountViewTests/test_snapshot_textFields_hidden.1.png b/BitwardenShared/UI/Auth/CreateAccount/__Snapshots__/CreateAccountViewTests/test_snapshot_textFields_hidden.1.png index 409efb33da..c462556edf 100644 Binary files a/BitwardenShared/UI/Auth/CreateAccount/__Snapshots__/CreateAccountViewTests/test_snapshot_textFields_hidden.1.png and b/BitwardenShared/UI/Auth/CreateAccount/__Snapshots__/CreateAccountViewTests/test_snapshot_textFields_hidden.1.png differ diff --git a/BitwardenShared/UI/Auth/CreateAccount/__Snapshots__/CreateAccountViewTests/test_snapshot_textFields_populated.1.png b/BitwardenShared/UI/Auth/CreateAccount/__Snapshots__/CreateAccountViewTests/test_snapshot_textFields_populated.1.png index 5d41712fc3..c79958f1ad 100644 Binary files a/BitwardenShared/UI/Auth/CreateAccount/__Snapshots__/CreateAccountViewTests/test_snapshot_textFields_populated.1.png and b/BitwardenShared/UI/Auth/CreateAccount/__Snapshots__/CreateAccountViewTests/test_snapshot_textFields_populated.1.png differ diff --git a/BitwardenShared/UI/Auth/CreateAccount/__Snapshots__/CreateAccountViewTests/test_snapshot_toggles_on.1.png b/BitwardenShared/UI/Auth/CreateAccount/__Snapshots__/CreateAccountViewTests/test_snapshot_toggles_on.1.png index bcddaceae3..ade281e445 100644 Binary files a/BitwardenShared/UI/Auth/CreateAccount/__Snapshots__/CreateAccountViewTests/test_snapshot_toggles_on.1.png and b/BitwardenShared/UI/Auth/CreateAccount/__Snapshots__/CreateAccountViewTests/test_snapshot_toggles_on.1.png differ diff --git a/BitwardenShared/UI/Auth/IntroCarousel/IntroCarouselView.swift b/BitwardenShared/UI/Auth/IntroCarousel/IntroCarouselView.swift index 641afd3782..e604f8fa93 100644 --- a/BitwardenShared/UI/Auth/IntroCarousel/IntroCarouselView.swift +++ b/BitwardenShared/UI/Auth/IntroCarousel/IntroCarouselView.swift @@ -60,31 +60,35 @@ struct IntroCarouselView: View { @ViewBuilder imageContent: () -> some View, @ViewBuilder textContent: () -> some View ) -> some View { - if verticalSizeClass == .regular { - VStack(spacing: 80) { - imageContent() - textContent() - } - .padding(.vertical, 16) - .frame(maxWidth: .infinity, minHeight: minHeight) - .scrollView(addVerticalPadding: false) - } else { - HStack(alignment: .top, spacing: 40) { - VStack(spacing: 0) { - Spacer(minLength: 0) + Group { + if verticalSizeClass == .regular { + VStack(spacing: 80) { imageContent() - .padding(.leading, 36) - .padding(.vertical, 16) - Spacer(minLength: 0) + textContent() } - .frame(minHeight: minHeight) + .padding(.vertical, 16) + .frame(maxWidth: .infinity, minHeight: minHeight) + } else { + HStack(alignment: .top, spacing: 40) { + VStack(spacing: 0) { + Spacer(minLength: 0) + imageContent() + .padding(.leading, 36) + .padding(.vertical, 16) + Spacer(minLength: 0) + } + .frame(minHeight: minHeight) - textContent() - .padding(.vertical, 16) - .frame(maxWidth: .infinity, minHeight: minHeight) - .scrollView(addVerticalPadding: false) + textContent() + .padding(.vertical, 16) + .frame(maxWidth: .infinity, minHeight: minHeight) + } } } + .scrollView( + addVerticalPadding: false, + backgroundColor: Asset.Colors.backgroundSecondary.swiftUIColor + ) } /// A view that displays a carousel page. diff --git a/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page1.1.png b/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page1.1.png index cdba8e8367..984d9101b9 100644 Binary files a/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page1.1.png and b/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page1.1.png differ diff --git a/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page1.2.png b/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page1.2.png index c8096cef8d..f0adcf4b46 100644 Binary files a/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page1.2.png and b/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page1.2.png differ diff --git a/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page1.3.png b/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page1.3.png index 034a4a8eba..40ee367868 100644 Binary files a/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page1.3.png and b/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page1.3.png differ diff --git a/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page1.4.png b/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page1.4.png index afee7db08e..369cb67ae5 100644 Binary files a/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page1.4.png and b/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page1.4.png differ diff --git a/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page2.1.png b/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page2.1.png index 903fe37f8e..a88ce09b4d 100644 Binary files a/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page2.1.png and b/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page2.1.png differ diff --git a/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page2.2.png b/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page2.2.png index b7a2863880..ddde2546f5 100644 Binary files a/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page2.2.png and b/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page2.2.png differ diff --git a/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page2.3.png b/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page2.3.png index 0cff642f93..016d383ceb 100644 Binary files a/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page2.3.png and b/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page2.3.png differ diff --git a/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page2.4.png b/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page2.4.png index ae52a6dfa9..08dbdb6008 100644 Binary files a/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page2.4.png and b/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page2.4.png differ diff --git a/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page3.1.png b/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page3.1.png index c9734af9dc..a1a30218fc 100644 Binary files a/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page3.1.png and b/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page3.1.png differ diff --git a/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page3.2.png b/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page3.2.png index 1280ab6146..27169f96f8 100644 Binary files a/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page3.2.png and b/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page3.2.png differ diff --git a/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page3.3.png b/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page3.3.png index 87ab96436c..549ecdb80a 100644 Binary files a/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page3.3.png and b/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page3.3.png differ diff --git a/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page3.4.png b/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page3.4.png index 61a82493d2..822ee3c893 100644 Binary files a/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page3.4.png and b/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page3.4.png differ diff --git a/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page4.1.png b/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page4.1.png index 0e6ae9cf7e..f7e0bbe682 100644 Binary files a/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page4.1.png and b/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page4.1.png differ diff --git a/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page4.2.png b/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page4.2.png index 56c6d91ab3..3340721141 100644 Binary files a/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page4.2.png and b/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page4.2.png differ diff --git a/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page4.3.png b/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page4.3.png index 7a94898646..b911570a75 100644 Binary files a/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page4.3.png and b/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page4.3.png differ diff --git a/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page4.4.png b/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page4.4.png index 1c0c7b8f92..cb46e73ddc 100644 Binary files a/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page4.4.png and b/BitwardenShared/UI/Auth/IntroCarousel/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page4.4.png differ diff --git a/BitwardenShared/UI/Auth/Landing/LandingView.swift b/BitwardenShared/UI/Auth/Landing/LandingView.swift index e1a9246f04..4827060027 100644 --- a/BitwardenShared/UI/Auth/Landing/LandingView.swift +++ b/BitwardenShared/UI/Auth/Landing/LandingView.swift @@ -122,13 +122,13 @@ struct LandingView: View { Button(Localizations.createAccount) { store.send(.createAccountPressed) } - .foregroundColor(Asset.Colors.primaryBitwarden.swiftUIColor) + .foregroundColor(Asset.Colors.textInteraction.swiftUIColor) } .styleGuide(.footnote) } .padding([.horizontal, .bottom], 16) } - .background(Asset.Colors.backgroundSecondary.swiftUIColor.ignoresSafeArea()) + .background(Asset.Colors.backgroundPrimary.swiftUIColor.ignoresSafeArea()) } } diff --git a/BitwardenShared/UI/Auth/Landing/SelfHosted/__Snapshots__/SelfHostedViewTests/test_viewRender.1.png b/BitwardenShared/UI/Auth/Landing/SelfHosted/__Snapshots__/SelfHostedViewTests/test_viewRender.1.png index 9ad6e93b20..edc242aa7d 100644 Binary files a/BitwardenShared/UI/Auth/Landing/SelfHosted/__Snapshots__/SelfHostedViewTests/test_viewRender.1.png and b/BitwardenShared/UI/Auth/Landing/SelfHosted/__Snapshots__/SelfHostedViewTests/test_viewRender.1.png differ diff --git a/BitwardenShared/UI/Auth/Landing/__Snapshots__/LandingViewTests/test_snapshot_email_value.1.png b/BitwardenShared/UI/Auth/Landing/__Snapshots__/LandingViewTests/test_snapshot_email_value.1.png index fb79e14a6d..c3373e0e4b 100644 Binary files a/BitwardenShared/UI/Auth/Landing/__Snapshots__/LandingViewTests/test_snapshot_email_value.1.png and b/BitwardenShared/UI/Auth/Landing/__Snapshots__/LandingViewTests/test_snapshot_email_value.1.png differ diff --git a/BitwardenShared/UI/Auth/Landing/__Snapshots__/LandingViewTests/test_snapshot_empty.1.png b/BitwardenShared/UI/Auth/Landing/__Snapshots__/LandingViewTests/test_snapshot_empty.1.png index de8bae2c0c..53f92bad1f 100644 Binary files a/BitwardenShared/UI/Auth/Landing/__Snapshots__/LandingViewTests/test_snapshot_empty.1.png and b/BitwardenShared/UI/Auth/Landing/__Snapshots__/LandingViewTests/test_snapshot_empty.1.png differ diff --git a/BitwardenShared/UI/Auth/Landing/__Snapshots__/LandingViewTests/test_snapshot_isRememberMeOn_true.1.png b/BitwardenShared/UI/Auth/Landing/__Snapshots__/LandingViewTests/test_snapshot_isRememberMeOn_true.1.png index 497bb116a5..a286f3f801 100644 Binary files a/BitwardenShared/UI/Auth/Landing/__Snapshots__/LandingViewTests/test_snapshot_isRememberMeOn_true.1.png and b/BitwardenShared/UI/Auth/Landing/__Snapshots__/LandingViewTests/test_snapshot_isRememberMeOn_true.1.png differ diff --git a/BitwardenShared/UI/Auth/Landing/__Snapshots__/LandingViewTests/test_snapshot_profilesClosed.1.png b/BitwardenShared/UI/Auth/Landing/__Snapshots__/LandingViewTests/test_snapshot_profilesClosed.1.png index de8bae2c0c..53f92bad1f 100644 Binary files a/BitwardenShared/UI/Auth/Landing/__Snapshots__/LandingViewTests/test_snapshot_profilesClosed.1.png and b/BitwardenShared/UI/Auth/Landing/__Snapshots__/LandingViewTests/test_snapshot_profilesClosed.1.png differ diff --git a/BitwardenShared/UI/Auth/Landing/__Snapshots__/LandingViewTests/test_snapshot_profilesVisible.1.png b/BitwardenShared/UI/Auth/Landing/__Snapshots__/LandingViewTests/test_snapshot_profilesVisible.1.png index 04b4e8b9b8..ea5d95c27d 100644 Binary files a/BitwardenShared/UI/Auth/Landing/__Snapshots__/LandingViewTests/test_snapshot_profilesVisible.1.png and b/BitwardenShared/UI/Auth/Landing/__Snapshots__/LandingViewTests/test_snapshot_profilesVisible.1.png differ diff --git a/BitwardenShared/UI/Auth/Login/LoginDecryptionOptions/LoginDecryptionOptionsView.swift b/BitwardenShared/UI/Auth/Login/LoginDecryptionOptions/LoginDecryptionOptionsView.swift index ddc79b3e57..b3de93ec2c 100644 --- a/BitwardenShared/UI/Auth/Login/LoginDecryptionOptions/LoginDecryptionOptionsView.swift +++ b/BitwardenShared/UI/Auth/Login/LoginDecryptionOptions/LoginDecryptionOptionsView.swift @@ -119,9 +119,24 @@ struct LoginDecryptionOptionsView: View { await store.perform(.notYouPressed) } .accessibilityIdentifier("NotYouButton") - .foregroundColor(Asset.Colors.primaryBitwarden.swiftUIColor) + .foregroundColor(Asset.Colors.textInteraction.swiftUIColor) } .styleGuide(.footnote) .padding(.top, 24) } } + +// MARK: - Previews + +#if DEBUG +#Preview { + NavigationView { + LoginDecryptionOptionsView(store: Store(processor: StateProcessor( + state: LoginDecryptionOptionsState( + shouldShowContinueButton: true, + email: "user@example.com" + ) + ))) + } +} +#endif diff --git a/BitwardenShared/UI/Auth/Login/LoginDecryptionOptions/__Snapshots__/LoginDecryptionOptionsViewTests/test_snapshot_default.1.png b/BitwardenShared/UI/Auth/Login/LoginDecryptionOptions/__Snapshots__/LoginDecryptionOptionsViewTests/test_snapshot_default.1.png index 6b113ba99e..9fb5b5e7ba 100644 Binary files a/BitwardenShared/UI/Auth/Login/LoginDecryptionOptions/__Snapshots__/LoginDecryptionOptionsViewTests/test_snapshot_default.1.png and b/BitwardenShared/UI/Auth/Login/LoginDecryptionOptions/__Snapshots__/LoginDecryptionOptionsViewTests/test_snapshot_default.1.png differ diff --git a/BitwardenShared/UI/Auth/Login/LoginDecryptionOptions/__Snapshots__/LoginDecryptionOptionsViewTests/test_snapshot_default.2.png b/BitwardenShared/UI/Auth/Login/LoginDecryptionOptions/__Snapshots__/LoginDecryptionOptionsViewTests/test_snapshot_default.2.png index 44fa12c3c9..8138b16caf 100644 Binary files a/BitwardenShared/UI/Auth/Login/LoginDecryptionOptions/__Snapshots__/LoginDecryptionOptionsViewTests/test_snapshot_default.2.png and b/BitwardenShared/UI/Auth/Login/LoginDecryptionOptions/__Snapshots__/LoginDecryptionOptionsViewTests/test_snapshot_default.2.png differ diff --git a/BitwardenShared/UI/Auth/Login/LoginDecryptionOptions/__Snapshots__/LoginDecryptionOptionsViewTests/test_snapshot_default.3.png b/BitwardenShared/UI/Auth/Login/LoginDecryptionOptions/__Snapshots__/LoginDecryptionOptionsViewTests/test_snapshot_default.3.png index 3de935ea36..259d4c06c5 100644 Binary files a/BitwardenShared/UI/Auth/Login/LoginDecryptionOptions/__Snapshots__/LoginDecryptionOptionsViewTests/test_snapshot_default.3.png and b/BitwardenShared/UI/Auth/Login/LoginDecryptionOptions/__Snapshots__/LoginDecryptionOptionsViewTests/test_snapshot_default.3.png differ diff --git a/BitwardenShared/UI/Auth/Login/LoginView.swift b/BitwardenShared/UI/Auth/Login/LoginView.swift index 31c90e98cf..db3d96ae5a 100644 --- a/BitwardenShared/UI/Auth/Login/LoginView.swift +++ b/BitwardenShared/UI/Auth/Login/LoginView.swift @@ -25,7 +25,7 @@ struct LoginView: View { .padding(.top, 16) .frame(maxWidth: .infinity) } - .background(Asset.Colors.backgroundSecondary.swiftUIColor.ignoresSafeArea()) + .background(Asset.Colors.backgroundPrimary.swiftUIColor.ignoresSafeArea()) .navigationTitle(Localizations.bitwarden) .navigationBarTitleDisplayMode(.inline) .navigationBarBackButtonHidden(true) @@ -71,7 +71,7 @@ struct LoginView: View { } .styleGuide(.subheadline) .accessibilityIdentifier("GetMasterPasswordHintLabel") - .foregroundColor(Asset.Colors.primaryBitwarden.swiftUIColor) + .foregroundColor(Asset.Colors.textInteraction.swiftUIColor) } } @@ -128,7 +128,7 @@ struct LoginView: View { store.send(.notYouPressed) } .accessibilityIdentifier("NotYouLabel") - .foregroundColor(Asset.Colors.primaryBitwarden.swiftUIColor) + .foregroundColor(Asset.Colors.textInteraction.swiftUIColor) } .styleGuide(.footnote) } diff --git a/BitwardenShared/UI/Auth/Login/LoginWithDevice/LoginWithDeviceView.swift b/BitwardenShared/UI/Auth/Login/LoginWithDevice/LoginWithDeviceView.swift index 43894ec6d0..fbdbe81cba 100644 --- a/BitwardenShared/UI/Auth/Login/LoginWithDevice/LoginWithDeviceView.swift +++ b/BitwardenShared/UI/Auth/Login/LoginWithDevice/LoginWithDeviceView.swift @@ -49,7 +49,7 @@ struct LoginWithDeviceView: View { store.send(.dismiss) } .styleGuide(.subheadline) - .foregroundStyle(Asset.Colors.primaryBitwarden.swiftUIColor) + .foregroundStyle(Asset.Colors.textInteraction.swiftUIColor) .accessibilityIdentifier("ViewAllLoginOptionsButton") } } @@ -72,7 +72,7 @@ struct LoginWithDeviceView: View { Text(store.state.fingerprintPhrase ?? "") .styleGuide(.bodyMonospaced) - .foregroundStyle(Asset.Colors.fingerprint.swiftUIColor) + .foregroundStyle(Asset.Colors.textCodePink.swiftUIColor) .multilineTextAlignment(.leading) .accessibilityIdentifier("FingerprintPhraseValue") } @@ -85,7 +85,7 @@ struct LoginWithDeviceView: View { await store.perform(.resendNotification) } .styleGuide(.body) - .foregroundStyle(Asset.Colors.primaryBitwarden.swiftUIColor) + .foregroundStyle(Asset.Colors.textInteraction.swiftUIColor) .accessibilityIdentifier("ResendNotificationButton") } } diff --git a/BitwardenShared/UI/Auth/Login/LoginWithDevice/__Snapshots__/LoginWithDeviceViewTests/test_snapshot_default.1.png b/BitwardenShared/UI/Auth/Login/LoginWithDevice/__Snapshots__/LoginWithDeviceViewTests/test_snapshot_default.1.png index cf09bb34a0..b891db265b 100644 Binary files a/BitwardenShared/UI/Auth/Login/LoginWithDevice/__Snapshots__/LoginWithDeviceViewTests/test_snapshot_default.1.png and b/BitwardenShared/UI/Auth/Login/LoginWithDevice/__Snapshots__/LoginWithDeviceViewTests/test_snapshot_default.1.png differ diff --git a/BitwardenShared/UI/Auth/Login/LoginWithDevice/__Snapshots__/LoginWithDeviceViewTests/test_snapshot_default.2.png b/BitwardenShared/UI/Auth/Login/LoginWithDevice/__Snapshots__/LoginWithDeviceViewTests/test_snapshot_default.2.png index 240a9da9a3..f49c0ea349 100644 Binary files a/BitwardenShared/UI/Auth/Login/LoginWithDevice/__Snapshots__/LoginWithDeviceViewTests/test_snapshot_default.2.png and b/BitwardenShared/UI/Auth/Login/LoginWithDevice/__Snapshots__/LoginWithDeviceViewTests/test_snapshot_default.2.png differ diff --git a/BitwardenShared/UI/Auth/Login/LoginWithDevice/__Snapshots__/LoginWithDeviceViewTests/test_snapshot_default.3.png b/BitwardenShared/UI/Auth/Login/LoginWithDevice/__Snapshots__/LoginWithDeviceViewTests/test_snapshot_default.3.png index 2f88f03c17..07924be4e1 100644 Binary files a/BitwardenShared/UI/Auth/Login/LoginWithDevice/__Snapshots__/LoginWithDeviceViewTests/test_snapshot_default.3.png and b/BitwardenShared/UI/Auth/Login/LoginWithDevice/__Snapshots__/LoginWithDeviceViewTests/test_snapshot_default.3.png differ diff --git a/BitwardenShared/UI/Auth/Login/SingleSignOn/__Snapshots__/SingleSignOnViewTests/test_snapshot_empty.1.png b/BitwardenShared/UI/Auth/Login/SingleSignOn/__Snapshots__/SingleSignOnViewTests/test_snapshot_empty.1.png index 5fc9b7c006..7a2c6bc222 100644 Binary files a/BitwardenShared/UI/Auth/Login/SingleSignOn/__Snapshots__/SingleSignOnViewTests/test_snapshot_empty.1.png and b/BitwardenShared/UI/Auth/Login/SingleSignOn/__Snapshots__/SingleSignOnViewTests/test_snapshot_empty.1.png differ diff --git a/BitwardenShared/UI/Auth/Login/SingleSignOn/__Snapshots__/SingleSignOnViewTests/test_snapshot_empty.2.png b/BitwardenShared/UI/Auth/Login/SingleSignOn/__Snapshots__/SingleSignOnViewTests/test_snapshot_empty.2.png index 9bfefef3f9..7825b4bfce 100644 Binary files a/BitwardenShared/UI/Auth/Login/SingleSignOn/__Snapshots__/SingleSignOnViewTests/test_snapshot_empty.2.png and b/BitwardenShared/UI/Auth/Login/SingleSignOn/__Snapshots__/SingleSignOnViewTests/test_snapshot_empty.2.png differ diff --git a/BitwardenShared/UI/Auth/Login/SingleSignOn/__Snapshots__/SingleSignOnViewTests/test_snapshot_empty.3.png b/BitwardenShared/UI/Auth/Login/SingleSignOn/__Snapshots__/SingleSignOnViewTests/test_snapshot_empty.3.png index f8c08c7db5..65fe090c7c 100644 Binary files a/BitwardenShared/UI/Auth/Login/SingleSignOn/__Snapshots__/SingleSignOnViewTests/test_snapshot_empty.3.png and b/BitwardenShared/UI/Auth/Login/SingleSignOn/__Snapshots__/SingleSignOnViewTests/test_snapshot_empty.3.png differ diff --git a/BitwardenShared/UI/Auth/Login/SingleSignOn/__Snapshots__/SingleSignOnViewTests/test_snapshot_populated.1.png b/BitwardenShared/UI/Auth/Login/SingleSignOn/__Snapshots__/SingleSignOnViewTests/test_snapshot_populated.1.png index c8455ebb7a..05f1d30098 100644 Binary files a/BitwardenShared/UI/Auth/Login/SingleSignOn/__Snapshots__/SingleSignOnViewTests/test_snapshot_populated.1.png and b/BitwardenShared/UI/Auth/Login/SingleSignOn/__Snapshots__/SingleSignOnViewTests/test_snapshot_populated.1.png differ diff --git a/BitwardenShared/UI/Auth/Login/SingleSignOn/__Snapshots__/SingleSignOnViewTests/test_snapshot_populated.2.png b/BitwardenShared/UI/Auth/Login/SingleSignOn/__Snapshots__/SingleSignOnViewTests/test_snapshot_populated.2.png index e2f6a95e2a..142e99e124 100644 Binary files a/BitwardenShared/UI/Auth/Login/SingleSignOn/__Snapshots__/SingleSignOnViewTests/test_snapshot_populated.2.png and b/BitwardenShared/UI/Auth/Login/SingleSignOn/__Snapshots__/SingleSignOnViewTests/test_snapshot_populated.2.png differ diff --git a/BitwardenShared/UI/Auth/Login/SingleSignOn/__Snapshots__/SingleSignOnViewTests/test_snapshot_populated.3.png b/BitwardenShared/UI/Auth/Login/SingleSignOn/__Snapshots__/SingleSignOnViewTests/test_snapshot_populated.3.png index 143b02c555..71d4b4b192 100644 Binary files a/BitwardenShared/UI/Auth/Login/SingleSignOn/__Snapshots__/SingleSignOnViewTests/test_snapshot_populated.3.png and b/BitwardenShared/UI/Auth/Login/SingleSignOn/__Snapshots__/SingleSignOnViewTests/test_snapshot_populated.3.png differ diff --git a/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_authApp.1.png b/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_authApp.1.png index cb0dacb18e..996df7f57e 100644 Binary files a/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_authApp.1.png and b/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_authApp.1.png differ diff --git a/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_authApp.2.png b/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_authApp.2.png index 42be56c398..827fd48caa 100644 Binary files a/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_authApp.2.png and b/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_authApp.2.png differ diff --git a/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_authApp.3.png b/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_authApp.3.png index 307a62739e..c8d0fd1532 100644 Binary files a/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_authApp.3.png and b/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_authApp.3.png differ diff --git a/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_authApp_dark.1.png b/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_authApp_dark.1.png index 51f79442cc..2b247663fb 100644 Binary files a/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_authApp_dark.1.png and b/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_authApp_dark.1.png differ diff --git a/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_authApp_largeText.1.png b/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_authApp_largeText.1.png index cd3256043a..1ceccdfa3a 100644 Binary files a/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_authApp_largeText.1.png and b/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_authApp_largeText.1.png differ diff --git a/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_authApp_light.1.png b/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_authApp_light.1.png index 3734c6b35e..75bafe305f 100644 Binary files a/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_authApp_light.1.png and b/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_authApp_light.1.png differ diff --git a/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_email.1.png b/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_email.1.png index c9812fb56e..b946262a25 100644 Binary files a/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_email.1.png and b/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_email.1.png differ diff --git a/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_email.2.png b/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_email.2.png index 09c2fb6ad1..b0efcd726e 100644 Binary files a/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_email.2.png and b/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_email.2.png differ diff --git a/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_email.3.png b/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_email.3.png index 6aec1b055a..255d31d642 100644 Binary files a/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_email.3.png and b/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_email.3.png differ diff --git a/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_email_filled.1.png b/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_email_filled.1.png index b67c1beea8..f43b5a6d3b 100644 Binary files a/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_email_filled.1.png and b/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_email_filled.1.png differ diff --git a/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_email_filled.2.png b/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_email_filled.2.png index b3fa9e4c9f..3326fc9f22 100644 Binary files a/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_email_filled.2.png and b/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_email_filled.2.png differ diff --git a/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_email_filled.3.png b/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_email_filled.3.png index d88db4a532..fa2dd87386 100644 Binary files a/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_email_filled.3.png and b/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_email_filled.3.png differ diff --git a/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_yubikey.1.png b/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_yubikey.1.png index 47a1ea1eb9..c8369280d0 100644 Binary files a/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_yubikey.1.png and b/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_yubikey.1.png differ diff --git a/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_yubikey.2.png b/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_yubikey.2.png index 9ca82a4b8e..5977a2ef79 100644 Binary files a/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_yubikey.2.png and b/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_yubikey.2.png differ diff --git a/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_yubikey.3.png b/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_yubikey.3.png index 891555c4c4..c4b3605630 100644 Binary files a/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_yubikey.3.png and b/BitwardenShared/UI/Auth/Login/TwoFactorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_yubikey.3.png differ diff --git a/BitwardenShared/UI/Auth/Login/__Snapshots__/LoginViewTests/test_snapshot_empty.1.png b/BitwardenShared/UI/Auth/Login/__Snapshots__/LoginViewTests/test_snapshot_empty.1.png index 269f5178ad..1730d51923 100644 Binary files a/BitwardenShared/UI/Auth/Login/__Snapshots__/LoginViewTests/test_snapshot_empty.1.png and b/BitwardenShared/UI/Auth/Login/__Snapshots__/LoginViewTests/test_snapshot_empty.1.png differ diff --git a/BitwardenShared/UI/Auth/Login/__Snapshots__/LoginViewTests/test_snapshot_passwordHidden.1.png b/BitwardenShared/UI/Auth/Login/__Snapshots__/LoginViewTests/test_snapshot_passwordHidden.1.png index b03ef94d7c..e3584dfe97 100644 Binary files a/BitwardenShared/UI/Auth/Login/__Snapshots__/LoginViewTests/test_snapshot_passwordHidden.1.png and b/BitwardenShared/UI/Auth/Login/__Snapshots__/LoginViewTests/test_snapshot_passwordHidden.1.png differ diff --git a/BitwardenShared/UI/Auth/Login/__Snapshots__/LoginViewTests/test_snapshot_passwordRevealed.1.png b/BitwardenShared/UI/Auth/Login/__Snapshots__/LoginViewTests/test_snapshot_passwordRevealed.1.png index b4b22ff4a2..3efb78f98e 100644 Binary files a/BitwardenShared/UI/Auth/Login/__Snapshots__/LoginViewTests/test_snapshot_passwordRevealed.1.png and b/BitwardenShared/UI/Auth/Login/__Snapshots__/LoginViewTests/test_snapshot_passwordRevealed.1.png differ diff --git a/BitwardenShared/UI/Auth/Login/__Snapshots__/LoginViewTests/test_snapshot_selfHosted.1.png b/BitwardenShared/UI/Auth/Login/__Snapshots__/LoginViewTests/test_snapshot_selfHosted.1.png index 057a017646..d2e935cc25 100644 Binary files a/BitwardenShared/UI/Auth/Login/__Snapshots__/LoginViewTests/test_snapshot_selfHosted.1.png and b/BitwardenShared/UI/Auth/Login/__Snapshots__/LoginViewTests/test_snapshot_selfHosted.1.png differ diff --git a/BitwardenShared/UI/Auth/Login/__Snapshots__/LoginViewTests/test_snapshot_withDevice.1.png b/BitwardenShared/UI/Auth/Login/__Snapshots__/LoginViewTests/test_snapshot_withDevice.1.png index 3f4160373b..01bd1a9a9e 100644 Binary files a/BitwardenShared/UI/Auth/Login/__Snapshots__/LoginViewTests/test_snapshot_withDevice.1.png and b/BitwardenShared/UI/Auth/Login/__Snapshots__/LoginViewTests/test_snapshot_withDevice.1.png differ diff --git a/BitwardenShared/UI/Auth/PasswordHint/PasswordHintView.swift b/BitwardenShared/UI/Auth/PasswordHint/PasswordHintView.swift index 50de4f97d7..3b450738de 100644 --- a/BitwardenShared/UI/Auth/PasswordHint/PasswordHintView.swift +++ b/BitwardenShared/UI/Auth/PasswordHint/PasswordHintView.swift @@ -32,7 +32,7 @@ struct PasswordHintView: View { } .padding(16) } - .background(Asset.Colors.backgroundSecondary.swiftUIColor) + .background(Asset.Colors.backgroundPrimary.swiftUIColor) .navigationTitle(Localizations.passwordHint) .toolbar { cancelToolbarItem { diff --git a/BitwardenShared/UI/Auth/PasswordHint/__Snapshots__/PasswordHintViewTests/test_snapshot_empty.1.png b/BitwardenShared/UI/Auth/PasswordHint/__Snapshots__/PasswordHintViewTests/test_snapshot_empty.1.png index 075d6eb039..4d2125f813 100644 Binary files a/BitwardenShared/UI/Auth/PasswordHint/__Snapshots__/PasswordHintViewTests/test_snapshot_empty.1.png and b/BitwardenShared/UI/Auth/PasswordHint/__Snapshots__/PasswordHintViewTests/test_snapshot_empty.1.png differ diff --git a/BitwardenShared/UI/Auth/PasswordHint/__Snapshots__/PasswordHintViewTests/test_snapshot_withEmailAddress.1.png b/BitwardenShared/UI/Auth/PasswordHint/__Snapshots__/PasswordHintViewTests/test_snapshot_withEmailAddress.1.png index a0ab3e5f25..01502cf635 100644 Binary files a/BitwardenShared/UI/Auth/PasswordHint/__Snapshots__/PasswordHintViewTests/test_snapshot_withEmailAddress.1.png and b/BitwardenShared/UI/Auth/PasswordHint/__Snapshots__/PasswordHintViewTests/test_snapshot_withEmailAddress.1.png differ diff --git a/BitwardenShared/UI/Auth/PasswordHint/__Snapshots__/PasswordHintViewTests/test_snapshot_withEmailAddress.2.png b/BitwardenShared/UI/Auth/PasswordHint/__Snapshots__/PasswordHintViewTests/test_snapshot_withEmailAddress.2.png index 4d551873fb..9cf3c2f603 100644 Binary files a/BitwardenShared/UI/Auth/PasswordHint/__Snapshots__/PasswordHintViewTests/test_snapshot_withEmailAddress.2.png and b/BitwardenShared/UI/Auth/PasswordHint/__Snapshots__/PasswordHintViewTests/test_snapshot_withEmailAddress.2.png differ diff --git a/BitwardenShared/UI/Auth/PasswordHint/__Snapshots__/PasswordHintViewTests/test_snapshot_withEmailAddress.3.png b/BitwardenShared/UI/Auth/PasswordHint/__Snapshots__/PasswordHintViewTests/test_snapshot_withEmailAddress.3.png index 8d5252c983..3ab0f4c386 100644 Binary files a/BitwardenShared/UI/Auth/PasswordHint/__Snapshots__/PasswordHintViewTests/test_snapshot_withEmailAddress.3.png and b/BitwardenShared/UI/Auth/PasswordHint/__Snapshots__/PasswordHintViewTests/test_snapshot_withEmailAddress.3.png differ diff --git a/BitwardenShared/UI/Auth/ProfileSwitcher/ProfileSwitcherItem.swift b/BitwardenShared/UI/Auth/ProfileSwitcher/ProfileSwitcherItem.swift index 5f43dc1add..a40f6c7b52 100644 --- a/BitwardenShared/UI/Auth/ProfileSwitcher/ProfileSwitcherItem.swift +++ b/BitwardenShared/UI/Auth/ProfileSwitcher/ProfileSwitcherItem.swift @@ -6,7 +6,7 @@ import SwiftUI /// Part of `ProfileSwitcherState`. struct ProfileSwitcherItem: Equatable, Hashable { /// The color associated with the profile - var color: Color = .init(asset: Asset.Colors.primaryBitwardenLight).opacity(0.12) + var color: Color = Asset.Colors.backgroundTertiary.swiftUIColor /// The account's email. var email: String diff --git a/BitwardenShared/UI/Auth/ProfileSwitcher/ProfileSwitcherRow.swift b/BitwardenShared/UI/Auth/ProfileSwitcher/ProfileSwitcherRow.swift index 472ff6be04..a202c31753 100644 --- a/BitwardenShared/UI/Auth/ProfileSwitcher/ProfileSwitcherRow.swift +++ b/BitwardenShared/UI/Auth/ProfileSwitcher/ProfileSwitcherRow.swift @@ -85,7 +85,7 @@ struct ProfileSwitcherRow: View { } .padding([.leading], 16) } - .background(Asset.Colors.backgroundPrimary.swiftUIColor) + .background(Asset.Colors.backgroundSecondary.swiftUIColor) } /// A row divider view @@ -94,7 +94,7 @@ struct ProfileSwitcherRow: View { Rectangle() .frame(height: 1.0) .frame(maxWidth: .infinity) - .foregroundColor(Asset.Colors.separatorOpaque.swiftUIColor) + .foregroundColor(Asset.Colors.strokeDivider.swiftUIColor) } else { EmptyView() } @@ -113,7 +113,7 @@ struct ProfileSwitcherRow: View { .accessibilityLabel(Localizations.account) case .addAccount: Asset.Images.plus.swiftUIImage - .imageStyle(.rowIcon(color: Asset.Colors.primaryBitwarden.swiftUIColor)) + .imageStyle(.rowIcon(color: Asset.Colors.iconSecondary.swiftUIColor)) .padding(4) } } @@ -183,11 +183,11 @@ struct ProfileSwitcherRow: View { private var trailingIconColor: Color { switch store.state.rowType { case .active: - Asset.Colors.primaryBitwarden.swiftUIColor + Asset.Colors.iconPrimary.swiftUIColor case .alternate: Asset.Colors.textSecondary.swiftUIColor case .addAccount: - Asset.Colors.backgroundPrimary.swiftUIColor + Asset.Colors.backgroundSecondary.swiftUIColor } } diff --git a/BitwardenShared/UI/Auth/ProfileSwitcher/ProfileSwitcherToolbarView.swift b/BitwardenShared/UI/Auth/ProfileSwitcher/ProfileSwitcherToolbarView.swift index 142bbcea1e..7565e977f2 100644 --- a/BitwardenShared/UI/Auth/ProfileSwitcher/ProfileSwitcherToolbarView.swift +++ b/BitwardenShared/UI/Auth/ProfileSwitcher/ProfileSwitcherToolbarView.swift @@ -63,8 +63,8 @@ extension View { .accessibilityHidden(initials != nil) } } - .foregroundColor(textColor ?? Asset.Colors.primaryBitwarden.swiftUIColor) - .background(color ?? Asset.Colors.primaryBitwarden.swiftUIColor.opacity(0.12)) + .foregroundColor(textColor ?? Asset.Colors.textInteraction.swiftUIColor) + .background(color ?? Asset.Colors.backgroundTertiary.swiftUIColor) .clipShape(Circle()) } } diff --git a/BitwardenShared/UI/Auth/ProfileSwitcher/ProfileSwitcherView.swift b/BitwardenShared/UI/Auth/ProfileSwitcher/ProfileSwitcherView.swift index 765b6ca81b..f2ae5a0afd 100644 --- a/BitwardenShared/UI/Auth/ProfileSwitcher/ProfileSwitcherView.swift +++ b/BitwardenShared/UI/Auth/ProfileSwitcher/ProfileSwitcherView.swift @@ -21,7 +21,7 @@ struct ProfileSwitcherView: View { addAccountRow } } - .background(Asset.Colors.backgroundPrimary.swiftUIColor) + .background(Asset.Colors.backgroundSecondary.swiftUIColor) .transition(.move(edge: .top)) .hidden(!store.state.isVisible) .fixedSize(horizontal: false, vertical: true) @@ -67,7 +67,7 @@ struct ProfileSwitcherView: View { ZStack(alignment: .top) { Color.black.opacity(0.4) .ignoresSafeArea() - Asset.Colors.backgroundPrimary.swiftUIColor + Asset.Colors.backgroundSecondary.swiftUIColor .frame(height: abs(min(scrollOffset.y, 0))) .fixedSize(horizontal: false, vertical: true) } diff --git a/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherRowTests/test_snapshot_active_divider.1.png b/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherRowTests/test_snapshot_active_divider.1.png index 06f7aacded..c9027e1869 100644 Binary files a/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherRowTests/test_snapshot_active_divider.1.png and b/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherRowTests/test_snapshot_active_divider.1.png differ diff --git a/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherRowTests/test_snapshot_active_noDivider.1.png b/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherRowTests/test_snapshot_active_noDivider.1.png index e7aa1a89d6..d300bad6a9 100644 Binary files a/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherRowTests/test_snapshot_active_noDivider.1.png and b/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherRowTests/test_snapshot_active_noDivider.1.png differ diff --git a/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherRowTests/test_snapshot_addAccount.1.png b/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherRowTests/test_snapshot_addAccount.1.png index a2f77463d4..7b7d5fdf64 100644 Binary files a/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherRowTests/test_snapshot_addAccount.1.png and b/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherRowTests/test_snapshot_addAccount.1.png differ diff --git a/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherRowTests/test_snapshot_alternate_locked.1.png b/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherRowTests/test_snapshot_alternate_locked.1.png index 78bcc7da90..2790891559 100644 Binary files a/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherRowTests/test_snapshot_alternate_locked.1.png and b/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherRowTests/test_snapshot_alternate_locked.1.png differ diff --git a/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherRowTests/test_snapshot_alternate_loggedOut.1.png b/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherRowTests/test_snapshot_alternate_loggedOut.1.png index 681b8e8c42..e236d1c87b 100644 Binary files a/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherRowTests/test_snapshot_alternate_loggedOut.1.png and b/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherRowTests/test_snapshot_alternate_loggedOut.1.png differ diff --git a/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherRowTests/test_snapshot_alternate_unlocked.1.png b/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherRowTests/test_snapshot_alternate_unlocked.1.png index 0d911f5ef3..f9deb70fa0 100644 Binary files a/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherRowTests/test_snapshot_alternate_unlocked.1.png and b/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherRowTests/test_snapshot_alternate_unlocked.1.png differ diff --git a/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherViewTests/test_snapshot_multiAccount_locked_atMaximum.1.png b/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherViewTests/test_snapshot_multiAccount_locked_atMaximum.1.png index 841efc28a5..a1d2f6d2cf 100644 Binary files a/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherViewTests/test_snapshot_multiAccount_locked_atMaximum.1.png and b/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherViewTests/test_snapshot_multiAccount_locked_atMaximum.1.png differ diff --git a/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherViewTests/test_snapshot_multiAccount_locked_belowMaximum.1.png b/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherViewTests/test_snapshot_multiAccount_locked_belowMaximum.1.png index 54f3fbf7f9..d8cefbd912 100644 Binary files a/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherViewTests/test_snapshot_multiAccount_locked_belowMaximum.1.png and b/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherViewTests/test_snapshot_multiAccount_locked_belowMaximum.1.png differ diff --git a/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherViewTests/test_snapshot_multiAccount_unlocked_atMaximum.1.png b/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherViewTests/test_snapshot_multiAccount_unlocked_atMaximum.1.png index 4ef83aceef..1487f106d1 100644 Binary files a/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherViewTests/test_snapshot_multiAccount_unlocked_atMaximum.1.png and b/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherViewTests/test_snapshot_multiAccount_unlocked_atMaximum.1.png differ diff --git a/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherViewTests/test_snapshot_multiAccount_unlocked_atMaximum_largeText.1.png b/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherViewTests/test_snapshot_multiAccount_unlocked_atMaximum_largeText.1.png index 1ca4a8fbb0..5d424f5b21 100644 Binary files a/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherViewTests/test_snapshot_multiAccount_unlocked_atMaximum_largeText.1.png and b/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherViewTests/test_snapshot_multiAccount_unlocked_atMaximum_largeText.1.png differ diff --git a/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherViewTests/test_snapshot_multiAccount_unlocked_belowMaximum.1.png b/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherViewTests/test_snapshot_multiAccount_unlocked_belowMaximum.1.png index 88b3dc14dc..3c05c19197 100644 Binary files a/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherViewTests/test_snapshot_multiAccount_unlocked_belowMaximum.1.png and b/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherViewTests/test_snapshot_multiAccount_unlocked_belowMaximum.1.png differ diff --git a/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherViewTests/test_snapshot_profileSwitcherView_previews.1.png b/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherViewTests/test_snapshot_profileSwitcherView_previews.1.png index e3acb5aa96..1562d10282 100644 Binary files a/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherViewTests/test_snapshot_profileSwitcherView_previews.1.png and b/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherViewTests/test_snapshot_profileSwitcherView_previews.1.png differ diff --git a/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherViewTests/test_snapshot_profileSwitcherView_previews.2.png b/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherViewTests/test_snapshot_profileSwitcherView_previews.2.png index b93cd85475..c3e73d7748 100644 Binary files a/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherViewTests/test_snapshot_profileSwitcherView_previews.2.png and b/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherViewTests/test_snapshot_profileSwitcherView_previews.2.png differ diff --git a/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherViewTests/test_snapshot_profileSwitcherView_previews.3.png b/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherViewTests/test_snapshot_profileSwitcherView_previews.3.png index 88b3dc14dc..3c05c19197 100644 Binary files a/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherViewTests/test_snapshot_profileSwitcherView_previews.3.png and b/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherViewTests/test_snapshot_profileSwitcherView_previews.3.png differ diff --git a/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherViewTests/test_snapshot_profileSwitcherView_previews.4.png b/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherViewTests/test_snapshot_profileSwitcherView_previews.4.png index 4ef83aceef..1487f106d1 100644 Binary files a/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherViewTests/test_snapshot_profileSwitcherView_previews.4.png and b/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherViewTests/test_snapshot_profileSwitcherView_previews.4.png differ diff --git a/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherViewTests/test_snapshot_singleAccount.1.png b/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherViewTests/test_snapshot_singleAccount.1.png index e3acb5aa96..1562d10282 100644 Binary files a/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherViewTests/test_snapshot_singleAccount.1.png and b/BitwardenShared/UI/Auth/ProfileSwitcher/__Snapshots__/ProfileSwitcherViewTests/test_snapshot_singleAccount.1.png differ diff --git a/BitwardenShared/UI/Auth/RemoveMasterPassword/__Snapshots__/RemoveMasterPasswordViewTests/test_snapshot_removeMasterPassword.1.png b/BitwardenShared/UI/Auth/RemoveMasterPassword/__Snapshots__/RemoveMasterPasswordViewTests/test_snapshot_removeMasterPassword.1.png index c34bf78f8f..9019be06b7 100644 Binary files a/BitwardenShared/UI/Auth/RemoveMasterPassword/__Snapshots__/RemoveMasterPasswordViewTests/test_snapshot_removeMasterPassword.1.png and b/BitwardenShared/UI/Auth/RemoveMasterPassword/__Snapshots__/RemoveMasterPasswordViewTests/test_snapshot_removeMasterPassword.1.png differ diff --git a/BitwardenShared/UI/Auth/RemoveMasterPassword/__Snapshots__/RemoveMasterPasswordViewTests/test_snapshot_removeMasterPassword.2.png b/BitwardenShared/UI/Auth/RemoveMasterPassword/__Snapshots__/RemoveMasterPasswordViewTests/test_snapshot_removeMasterPassword.2.png index 122cfcc410..1d9c962b5c 100644 Binary files a/BitwardenShared/UI/Auth/RemoveMasterPassword/__Snapshots__/RemoveMasterPasswordViewTests/test_snapshot_removeMasterPassword.2.png and b/BitwardenShared/UI/Auth/RemoveMasterPassword/__Snapshots__/RemoveMasterPasswordViewTests/test_snapshot_removeMasterPassword.2.png differ diff --git a/BitwardenShared/UI/Auth/RemoveMasterPassword/__Snapshots__/RemoveMasterPasswordViewTests/test_snapshot_removeMasterPassword.3.png b/BitwardenShared/UI/Auth/RemoveMasterPassword/__Snapshots__/RemoveMasterPasswordViewTests/test_snapshot_removeMasterPassword.3.png index f6bf776c44..a780c0bd98 100644 Binary files a/BitwardenShared/UI/Auth/RemoveMasterPassword/__Snapshots__/RemoveMasterPasswordViewTests/test_snapshot_removeMasterPassword.3.png and b/BitwardenShared/UI/Auth/RemoveMasterPassword/__Snapshots__/RemoveMasterPasswordViewTests/test_snapshot_removeMasterPassword.3.png differ diff --git a/BitwardenShared/UI/Auth/SetMasterPassword/SetMasterPasswordView.swift b/BitwardenShared/UI/Auth/SetMasterPassword/SetMasterPasswordView.swift index 059b38459a..c05a3f6224 100644 --- a/BitwardenShared/UI/Auth/SetMasterPassword/SetMasterPasswordView.swift +++ b/BitwardenShared/UI/Auth/SetMasterPassword/SetMasterPasswordView.swift @@ -77,7 +77,7 @@ struct SetMasterPasswordView: View { } .padding(16) } - .background(Asset.Colors.backgroundSecondary.swiftUIColor) + .background(Asset.Colors.backgroundPrimary.swiftUIColor) .navigationTitle(Localizations.setMasterPassword) .navigationBarTitleDisplayMode(.inline) .toolbar { diff --git a/BitwardenShared/UI/Auth/SetMasterPassword/__Snapshots__/SetMasterPasswordViewTests/test_snapshot_setPassword_filled.portrait.png b/BitwardenShared/UI/Auth/SetMasterPassword/__Snapshots__/SetMasterPasswordViewTests/test_snapshot_setPassword_filled.portrait.png index 12b75ab761..1864057e79 100644 Binary files a/BitwardenShared/UI/Auth/SetMasterPassword/__Snapshots__/SetMasterPasswordViewTests/test_snapshot_setPassword_filled.portrait.png and b/BitwardenShared/UI/Auth/SetMasterPassword/__Snapshots__/SetMasterPasswordViewTests/test_snapshot_setPassword_filled.portrait.png differ diff --git a/BitwardenShared/UI/Auth/SetMasterPassword/__Snapshots__/SetMasterPasswordViewTests/test_snapshot_setPassword_filled.portraitDark.png b/BitwardenShared/UI/Auth/SetMasterPassword/__Snapshots__/SetMasterPasswordViewTests/test_snapshot_setPassword_filled.portraitDark.png index 90773b184f..ca38f34840 100644 Binary files a/BitwardenShared/UI/Auth/SetMasterPassword/__Snapshots__/SetMasterPasswordViewTests/test_snapshot_setPassword_filled.portraitDark.png and b/BitwardenShared/UI/Auth/SetMasterPassword/__Snapshots__/SetMasterPasswordViewTests/test_snapshot_setPassword_filled.portraitDark.png differ diff --git a/BitwardenShared/UI/Auth/SetMasterPassword/__Snapshots__/SetMasterPasswordViewTests/test_snapshot_setPassword_filled.tallPortraitAX5.png b/BitwardenShared/UI/Auth/SetMasterPassword/__Snapshots__/SetMasterPasswordViewTests/test_snapshot_setPassword_filled.tallPortraitAX5.png index 791bc679dc..b80dc494ee 100644 Binary files a/BitwardenShared/UI/Auth/SetMasterPassword/__Snapshots__/SetMasterPasswordViewTests/test_snapshot_setPassword_filled.tallPortraitAX5.png and b/BitwardenShared/UI/Auth/SetMasterPassword/__Snapshots__/SetMasterPasswordViewTests/test_snapshot_setPassword_filled.tallPortraitAX5.png differ diff --git a/BitwardenShared/UI/Auth/SetMasterPassword/__Snapshots__/SetMasterPasswordViewTests/test_snapshot_setPassword_privilege_elevation.portrait.png b/BitwardenShared/UI/Auth/SetMasterPassword/__Snapshots__/SetMasterPasswordViewTests/test_snapshot_setPassword_privilege_elevation.portrait.png index 557dc6c247..e3a751c660 100644 Binary files a/BitwardenShared/UI/Auth/SetMasterPassword/__Snapshots__/SetMasterPasswordViewTests/test_snapshot_setPassword_privilege_elevation.portrait.png and b/BitwardenShared/UI/Auth/SetMasterPassword/__Snapshots__/SetMasterPasswordViewTests/test_snapshot_setPassword_privilege_elevation.portrait.png differ diff --git a/BitwardenShared/UI/Auth/SetMasterPassword/__Snapshots__/SetMasterPasswordViewTests/test_snapshot_setPassword_privilege_elevation.portraitDark.png b/BitwardenShared/UI/Auth/SetMasterPassword/__Snapshots__/SetMasterPasswordViewTests/test_snapshot_setPassword_privilege_elevation.portraitDark.png index 02e1c850a4..c2d0277561 100644 Binary files a/BitwardenShared/UI/Auth/SetMasterPassword/__Snapshots__/SetMasterPasswordViewTests/test_snapshot_setPassword_privilege_elevation.portraitDark.png and b/BitwardenShared/UI/Auth/SetMasterPassword/__Snapshots__/SetMasterPasswordViewTests/test_snapshot_setPassword_privilege_elevation.portraitDark.png differ diff --git a/BitwardenShared/UI/Auth/SetMasterPassword/__Snapshots__/SetMasterPasswordViewTests/test_snapshot_setPassword_privilege_elevation.tallPortraitAX5.png b/BitwardenShared/UI/Auth/SetMasterPassword/__Snapshots__/SetMasterPasswordViewTests/test_snapshot_setPassword_privilege_elevation.tallPortraitAX5.png index d5bfd46b7c..16fe25c22a 100644 Binary files a/BitwardenShared/UI/Auth/SetMasterPassword/__Snapshots__/SetMasterPasswordViewTests/test_snapshot_setPassword_privilege_elevation.tallPortraitAX5.png and b/BitwardenShared/UI/Auth/SetMasterPassword/__Snapshots__/SetMasterPasswordViewTests/test_snapshot_setPassword_privilege_elevation.tallPortraitAX5.png differ diff --git a/BitwardenShared/UI/Auth/StartRegistration/CheckEmail/CheckEmailView.swift b/BitwardenShared/UI/Auth/StartRegistration/CheckEmail/CheckEmailView.swift index 97d616a731..e2dc347616 100644 --- a/BitwardenShared/UI/Auth/StartRegistration/CheckEmail/CheckEmailView.swift +++ b/BitwardenShared/UI/Auth/StartRegistration/CheckEmail/CheckEmailView.swift @@ -19,7 +19,7 @@ struct CheckEmailView: View { VStack(spacing: 16) { VStack(alignment: .center, spacing: 0) { Image(decorative: Asset.Images.checkEmail) - .foregroundColor(Asset.Colors.primaryBitwarden.swiftUIColor) + .foregroundColor(Asset.Colors.iconSecondary.swiftUIColor) .frame(maxWidth: .infinity) .padding(.vertical, 32) @@ -48,7 +48,7 @@ struct CheckEmailView: View { Text(LocalizedStringKey(Localizations.noEmailGoBackToEditYourEmailAddress)) .styleGuide(.subheadline) - .tint(Asset.Colors.primaryBitwarden.swiftUIColor) + .tint(Asset.Colors.textInteraction.swiftUIColor) .foregroundColor(Asset.Colors.textPrimary.swiftUIColor) .padding([.horizontal, .bottom], 32) .environment(\.openURL, OpenURLAction { _ in @@ -58,7 +58,7 @@ struct CheckEmailView: View { Text(LocalizedStringKey(Localizations.orLogInYouMayAlreadyHaveAnAccount)) .styleGuide(.subheadline) - .tint(Asset.Colors.primaryBitwarden.swiftUIColor) + .tint(Asset.Colors.textInteraction.swiftUIColor) .foregroundColor(Asset.Colors.textPrimary.swiftUIColor) .padding(.horizontal, 32) .environment(\.openURL, OpenURLAction { _ in diff --git a/BitwardenShared/UI/Auth/StartRegistration/CheckEmail/__Snapshots__/CheckEmailViewTests/test_snapshot_empty.1.png b/BitwardenShared/UI/Auth/StartRegistration/CheckEmail/__Snapshots__/CheckEmailViewTests/test_snapshot_empty.1.png index d646eb5d8d..18a4f4f0e9 100644 Binary files a/BitwardenShared/UI/Auth/StartRegistration/CheckEmail/__Snapshots__/CheckEmailViewTests/test_snapshot_empty.1.png and b/BitwardenShared/UI/Auth/StartRegistration/CheckEmail/__Snapshots__/CheckEmailViewTests/test_snapshot_empty.1.png differ diff --git a/BitwardenShared/UI/Auth/StartRegistration/CheckEmail/__Snapshots__/CheckEmailViewTests/test_snapshot_empty.2.png b/BitwardenShared/UI/Auth/StartRegistration/CheckEmail/__Snapshots__/CheckEmailViewTests/test_snapshot_empty.2.png index 6de391acb8..5f7b9f00f5 100644 Binary files a/BitwardenShared/UI/Auth/StartRegistration/CheckEmail/__Snapshots__/CheckEmailViewTests/test_snapshot_empty.2.png and b/BitwardenShared/UI/Auth/StartRegistration/CheckEmail/__Snapshots__/CheckEmailViewTests/test_snapshot_empty.2.png differ diff --git a/BitwardenShared/UI/Auth/StartRegistration/CheckEmail/__Snapshots__/CheckEmailViewTests/test_snapshot_empty.3.png b/BitwardenShared/UI/Auth/StartRegistration/CheckEmail/__Snapshots__/CheckEmailViewTests/test_snapshot_empty.3.png index 08b7213dbb..44288f3d18 100644 Binary files a/BitwardenShared/UI/Auth/StartRegistration/CheckEmail/__Snapshots__/CheckEmailViewTests/test_snapshot_empty.3.png and b/BitwardenShared/UI/Auth/StartRegistration/CheckEmail/__Snapshots__/CheckEmailViewTests/test_snapshot_empty.3.png differ diff --git a/BitwardenShared/UI/Auth/StartRegistration/StartRegistrationView.swift b/BitwardenShared/UI/Auth/StartRegistration/StartRegistrationView.swift index 3e92d46702..a98c2e756f 100644 --- a/BitwardenShared/UI/Auth/StartRegistration/StartRegistrationView.swift +++ b/BitwardenShared/UI/Auth/StartRegistration/StartRegistrationView.swift @@ -107,7 +107,7 @@ struct StartRegistrationView: View { private var termsAndPrivacyText: some View { Text(LocalizedStringKey(store.state.termsAndPrivacyDisclaimerText)) .styleGuide(.footnote) - .tint(Asset.Colors.primaryBitwarden.swiftUIColor) + .tint(Asset.Colors.textInteraction.swiftUIColor) .foregroundColor(Asset.Colors.textPrimary.swiftUIColor) .padding([.bottom], 32) .multilineTextAlignment(.center) @@ -121,7 +121,7 @@ struct StartRegistrationView: View { send: StartRegistrationAction.toggleReceiveMarketing )) { Text(LocalizedStringKey(store.state.receiveMarketingEmailsText)) - .tint(Asset.Colors.primaryBitwarden.swiftUIColor) + .tint(Asset.Colors.textInteraction.swiftUIColor) .foregroundColor(Asset.Colors.textPrimary.swiftUIColor) .styleGuide(.subheadline) } diff --git a/BitwardenShared/UI/Auth/StartRegistration/__Snapshots__/StartRegistrationViewTests/test_snapshot_empty.1.png b/BitwardenShared/UI/Auth/StartRegistration/__Snapshots__/StartRegistrationViewTests/test_snapshot_empty.1.png index 57341ba7e5..f3aecbe8b8 100644 Binary files a/BitwardenShared/UI/Auth/StartRegistration/__Snapshots__/StartRegistrationViewTests/test_snapshot_empty.1.png and b/BitwardenShared/UI/Auth/StartRegistration/__Snapshots__/StartRegistrationViewTests/test_snapshot_empty.1.png differ diff --git a/BitwardenShared/UI/Auth/StartRegistration/__Snapshots__/StartRegistrationViewTests/test_snapshot_marketingToggle_hidden.1.png b/BitwardenShared/UI/Auth/StartRegistration/__Snapshots__/StartRegistrationViewTests/test_snapshot_marketingToggle_hidden.1.png index 123689b7c8..1084050ad8 100644 Binary files a/BitwardenShared/UI/Auth/StartRegistration/__Snapshots__/StartRegistrationViewTests/test_snapshot_marketingToggle_hidden.1.png and b/BitwardenShared/UI/Auth/StartRegistration/__Snapshots__/StartRegistrationViewTests/test_snapshot_marketingToggle_hidden.1.png differ diff --git a/BitwardenShared/UI/Auth/StartRegistration/__Snapshots__/StartRegistrationViewTests/test_snapshot_nativeCreateAccountFeatureFlag.1.png b/BitwardenShared/UI/Auth/StartRegistration/__Snapshots__/StartRegistrationViewTests/test_snapshot_nativeCreateAccountFeatureFlag.1.png index 8b4149c3ab..b76720e600 100644 Binary files a/BitwardenShared/UI/Auth/StartRegistration/__Snapshots__/StartRegistrationViewTests/test_snapshot_nativeCreateAccountFeatureFlag.1.png and b/BitwardenShared/UI/Auth/StartRegistration/__Snapshots__/StartRegistrationViewTests/test_snapshot_nativeCreateAccountFeatureFlag.1.png differ diff --git a/BitwardenShared/UI/Auth/StartRegistration/__Snapshots__/StartRegistrationViewTests/test_snapshot_textFields_populated.1.png b/BitwardenShared/UI/Auth/StartRegistration/__Snapshots__/StartRegistrationViewTests/test_snapshot_textFields_populated.1.png index ffb6e43f0a..6f49e30a45 100644 Binary files a/BitwardenShared/UI/Auth/StartRegistration/__Snapshots__/StartRegistrationViewTests/test_snapshot_textFields_populated.1.png and b/BitwardenShared/UI/Auth/StartRegistration/__Snapshots__/StartRegistrationViewTests/test_snapshot_textFields_populated.1.png differ diff --git a/BitwardenShared/UI/Auth/StartRegistration/__Snapshots__/StartRegistrationViewTests/test_snapshot_textFields_populated.2.png b/BitwardenShared/UI/Auth/StartRegistration/__Snapshots__/StartRegistrationViewTests/test_snapshot_textFields_populated.2.png index 29906bbe38..0b5bf0f340 100644 Binary files a/BitwardenShared/UI/Auth/StartRegistration/__Snapshots__/StartRegistrationViewTests/test_snapshot_textFields_populated.2.png and b/BitwardenShared/UI/Auth/StartRegistration/__Snapshots__/StartRegistrationViewTests/test_snapshot_textFields_populated.2.png differ diff --git a/BitwardenShared/UI/Auth/StartRegistration/__Snapshots__/StartRegistrationViewTests/test_snapshot_textFields_populated.3.png b/BitwardenShared/UI/Auth/StartRegistration/__Snapshots__/StartRegistrationViewTests/test_snapshot_textFields_populated.3.png index 684e835392..28bfe6bfcb 100644 Binary files a/BitwardenShared/UI/Auth/StartRegistration/__Snapshots__/StartRegistrationViewTests/test_snapshot_textFields_populated.3.png and b/BitwardenShared/UI/Auth/StartRegistration/__Snapshots__/StartRegistrationViewTests/test_snapshot_textFields_populated.3.png differ diff --git a/BitwardenShared/UI/Auth/StartRegistration/__Snapshots__/StartRegistrationViewTests/test_snapshot_textFields_populated_long.1.png b/BitwardenShared/UI/Auth/StartRegistration/__Snapshots__/StartRegistrationViewTests/test_snapshot_textFields_populated_long.1.png index 9752177d2c..f2a1e2d52b 100644 Binary files a/BitwardenShared/UI/Auth/StartRegistration/__Snapshots__/StartRegistrationViewTests/test_snapshot_textFields_populated_long.1.png and b/BitwardenShared/UI/Auth/StartRegistration/__Snapshots__/StartRegistrationViewTests/test_snapshot_textFields_populated_long.1.png differ diff --git a/BitwardenShared/UI/Auth/StartRegistration/__Snapshots__/StartRegistrationViewTests/test_snapshot_textFields_populated_long.2.png b/BitwardenShared/UI/Auth/StartRegistration/__Snapshots__/StartRegistrationViewTests/test_snapshot_textFields_populated_long.2.png index ecf0472ab7..285d83dce2 100644 Binary files a/BitwardenShared/UI/Auth/StartRegistration/__Snapshots__/StartRegistrationViewTests/test_snapshot_textFields_populated_long.2.png and b/BitwardenShared/UI/Auth/StartRegistration/__Snapshots__/StartRegistrationViewTests/test_snapshot_textFields_populated_long.2.png differ diff --git a/BitwardenShared/UI/Auth/StartRegistration/__Snapshots__/StartRegistrationViewTests/test_snapshot_textFields_populated_long.3.png b/BitwardenShared/UI/Auth/StartRegistration/__Snapshots__/StartRegistrationViewTests/test_snapshot_textFields_populated_long.3.png index 721b37a6f9..c5e1cff028 100644 Binary files a/BitwardenShared/UI/Auth/StartRegistration/__Snapshots__/StartRegistrationViewTests/test_snapshot_textFields_populated_long.3.png and b/BitwardenShared/UI/Auth/StartRegistration/__Snapshots__/StartRegistrationViewTests/test_snapshot_textFields_populated_long.3.png differ diff --git a/BitwardenShared/UI/Auth/StartRegistration/__Snapshots__/StartRegistrationViewTests/test_snapshot_toggles_on.1.png b/BitwardenShared/UI/Auth/StartRegistration/__Snapshots__/StartRegistrationViewTests/test_snapshot_toggles_on.1.png index 955affbc15..6341331cca 100644 Binary files a/BitwardenShared/UI/Auth/StartRegistration/__Snapshots__/StartRegistrationViewTests/test_snapshot_toggles_on.1.png and b/BitwardenShared/UI/Auth/StartRegistration/__Snapshots__/StartRegistrationViewTests/test_snapshot_toggles_on.1.png differ diff --git a/BitwardenShared/UI/Auth/UpdateMasterPassword/UpdateMasterPasswordView.swift b/BitwardenShared/UI/Auth/UpdateMasterPassword/UpdateMasterPasswordView.swift index 893d8978ec..38abe7a1b3 100644 --- a/BitwardenShared/UI/Auth/UpdateMasterPassword/UpdateMasterPasswordView.swift +++ b/BitwardenShared/UI/Auth/UpdateMasterPassword/UpdateMasterPasswordView.swift @@ -88,7 +88,7 @@ struct UpdateMasterPasswordView: View { } .padding(16) } - .background(Asset.Colors.backgroundSecondary.swiftUIColor) + .background(Asset.Colors.backgroundPrimary.swiftUIColor) .navigationTitle(Localizations.updateMasterPassword) .navigationBarTitleDisplayMode(.inline) .toolbar { diff --git a/BitwardenShared/UI/Auth/UpdateMasterPassword/__Snapshots__/UpdateMasterPasswordViewTests/test_snapshot_resetPassword_withFilled_dark.1.png b/BitwardenShared/UI/Auth/UpdateMasterPassword/__Snapshots__/UpdateMasterPasswordViewTests/test_snapshot_resetPassword_withFilled_dark.1.png index 72dae976cf..7175f885ac 100644 Binary files a/BitwardenShared/UI/Auth/UpdateMasterPassword/__Snapshots__/UpdateMasterPasswordViewTests/test_snapshot_resetPassword_withFilled_dark.1.png and b/BitwardenShared/UI/Auth/UpdateMasterPassword/__Snapshots__/UpdateMasterPasswordViewTests/test_snapshot_resetPassword_withFilled_dark.1.png differ diff --git a/BitwardenShared/UI/Auth/UpdateMasterPassword/__Snapshots__/UpdateMasterPasswordViewTests/test_snapshot_resetPassword_withFilled_default.1.png b/BitwardenShared/UI/Auth/UpdateMasterPassword/__Snapshots__/UpdateMasterPasswordViewTests/test_snapshot_resetPassword_withFilled_default.1.png index 72dae976cf..7175f885ac 100644 Binary files a/BitwardenShared/UI/Auth/UpdateMasterPassword/__Snapshots__/UpdateMasterPasswordViewTests/test_snapshot_resetPassword_withFilled_default.1.png and b/BitwardenShared/UI/Auth/UpdateMasterPassword/__Snapshots__/UpdateMasterPasswordViewTests/test_snapshot_resetPassword_withFilled_default.1.png differ diff --git a/BitwardenShared/UI/Auth/UpdateMasterPassword/__Snapshots__/UpdateMasterPasswordViewTests/test_snapshot_resetPassword_withFilled_large.1.png b/BitwardenShared/UI/Auth/UpdateMasterPassword/__Snapshots__/UpdateMasterPasswordViewTests/test_snapshot_resetPassword_withFilled_large.1.png index dc68fb14a7..5010a7a90f 100644 Binary files a/BitwardenShared/UI/Auth/UpdateMasterPassword/__Snapshots__/UpdateMasterPasswordViewTests/test_snapshot_resetPassword_withFilled_large.1.png and b/BitwardenShared/UI/Auth/UpdateMasterPassword/__Snapshots__/UpdateMasterPasswordViewTests/test_snapshot_resetPassword_withFilled_large.1.png differ diff --git a/BitwardenShared/UI/Auth/UpdateMasterPassword/__Snapshots__/UpdateMasterPasswordViewTests/test_snapshot_weakPassword_withFilled_dark.1.png b/BitwardenShared/UI/Auth/UpdateMasterPassword/__Snapshots__/UpdateMasterPasswordViewTests/test_snapshot_weakPassword_withFilled_dark.1.png index 3f8f7cd81c..2c9f969c2b 100644 Binary files a/BitwardenShared/UI/Auth/UpdateMasterPassword/__Snapshots__/UpdateMasterPasswordViewTests/test_snapshot_weakPassword_withFilled_dark.1.png and b/BitwardenShared/UI/Auth/UpdateMasterPassword/__Snapshots__/UpdateMasterPasswordViewTests/test_snapshot_weakPassword_withFilled_dark.1.png differ diff --git a/BitwardenShared/UI/Auth/UpdateMasterPassword/__Snapshots__/UpdateMasterPasswordViewTests/test_snapshot_weakPassword_withFilled_default.1.png b/BitwardenShared/UI/Auth/UpdateMasterPassword/__Snapshots__/UpdateMasterPasswordViewTests/test_snapshot_weakPassword_withFilled_default.1.png index 3f8f7cd81c..2c9f969c2b 100644 Binary files a/BitwardenShared/UI/Auth/UpdateMasterPassword/__Snapshots__/UpdateMasterPasswordViewTests/test_snapshot_weakPassword_withFilled_default.1.png and b/BitwardenShared/UI/Auth/UpdateMasterPassword/__Snapshots__/UpdateMasterPasswordViewTests/test_snapshot_weakPassword_withFilled_default.1.png differ diff --git a/BitwardenShared/UI/Auth/UpdateMasterPassword/__Snapshots__/UpdateMasterPasswordViewTests/test_snapshot_weakPassword_withFilled_large.1.png b/BitwardenShared/UI/Auth/UpdateMasterPassword/__Snapshots__/UpdateMasterPasswordViewTests/test_snapshot_weakPassword_withFilled_large.1.png index dd59565526..117244be3b 100644 Binary files a/BitwardenShared/UI/Auth/UpdateMasterPassword/__Snapshots__/UpdateMasterPasswordViewTests/test_snapshot_weakPassword_withFilled_large.1.png and b/BitwardenShared/UI/Auth/UpdateMasterPassword/__Snapshots__/UpdateMasterPasswordViewTests/test_snapshot_weakPassword_withFilled_large.1.png differ diff --git a/BitwardenShared/UI/Auth/VaultUnlock/VaultUnlockView.swift b/BitwardenShared/UI/Auth/VaultUnlock/VaultUnlockView.swift index 84fb7f94d4..1708fc1ebf 100644 --- a/BitwardenShared/UI/Auth/VaultUnlock/VaultUnlockView.swift +++ b/BitwardenShared/UI/Auth/VaultUnlock/VaultUnlockView.swift @@ -75,7 +75,7 @@ struct VaultUnlockView: View { if store.state.isBiometricsEnabledAndInvalid { Text(Localizations.accountBiometricInvalidatedExtension) .styleGuide(.body, weight: .bold) - .foregroundColor(Asset.Colors.loadingRed.swiftUIColor) + .foregroundColor(Asset.Colors.error.swiftUIColor) } } @@ -91,7 +91,7 @@ struct VaultUnlockView: View { } .padding(16) } - .background(Asset.Colors.backgroundSecondary.swiftUIColor.ignoresSafeArea()) + .background(Asset.Colors.backgroundPrimary.swiftUIColor.ignoresSafeArea()) } /// The Toolbar item for the profile switcher view. diff --git a/BitwardenShared/UI/Auth/VaultUnlock/__Snapshots__/VaultUnlockViewTests/test_snapshot_profilesClosed.1.png b/BitwardenShared/UI/Auth/VaultUnlock/__Snapshots__/VaultUnlockViewTests/test_snapshot_profilesClosed.1.png index 4695c05e62..2cd716aa62 100644 Binary files a/BitwardenShared/UI/Auth/VaultUnlock/__Snapshots__/VaultUnlockViewTests/test_snapshot_profilesClosed.1.png and b/BitwardenShared/UI/Auth/VaultUnlock/__Snapshots__/VaultUnlockViewTests/test_snapshot_profilesClosed.1.png differ diff --git a/BitwardenShared/UI/Auth/VaultUnlock/__Snapshots__/VaultUnlockViewTests/test_snapshot_profilesVisible.1.png b/BitwardenShared/UI/Auth/VaultUnlock/__Snapshots__/VaultUnlockViewTests/test_snapshot_profilesVisible.1.png index 2bedb71b4e..de716977f9 100644 Binary files a/BitwardenShared/UI/Auth/VaultUnlock/__Snapshots__/VaultUnlockViewTests/test_snapshot_profilesVisible.1.png and b/BitwardenShared/UI/Auth/VaultUnlock/__Snapshots__/VaultUnlockViewTests/test_snapshot_profilesVisible.1.png differ diff --git a/BitwardenShared/UI/Auth/VaultUnlock/__Snapshots__/VaultUnlockViewTests/test_snapshot_profilesVisible_max.1.png b/BitwardenShared/UI/Auth/VaultUnlock/__Snapshots__/VaultUnlockViewTests/test_snapshot_profilesVisible_max.1.png index 5d3a3d4603..b707e72bb9 100644 Binary files a/BitwardenShared/UI/Auth/VaultUnlock/__Snapshots__/VaultUnlockViewTests/test_snapshot_profilesVisible_max.1.png and b/BitwardenShared/UI/Auth/VaultUnlock/__Snapshots__/VaultUnlockViewTests/test_snapshot_profilesVisible_max.1.png differ diff --git a/BitwardenShared/UI/Auth/VaultUnlock/__Snapshots__/VaultUnlockViewTests/test_snapshot_profilesVisible_max_largeText.1.png b/BitwardenShared/UI/Auth/VaultUnlock/__Snapshots__/VaultUnlockViewTests/test_snapshot_profilesVisible_max_largeText.1.png index 7c465a0570..8fd07d77dc 100644 Binary files a/BitwardenShared/UI/Auth/VaultUnlock/__Snapshots__/VaultUnlockViewTests/test_snapshot_profilesVisible_max_largeText.1.png and b/BitwardenShared/UI/Auth/VaultUnlock/__Snapshots__/VaultUnlockViewTests/test_snapshot_profilesVisible_max_largeText.1.png differ diff --git a/BitwardenShared/UI/Auth/VaultUnlock/__Snapshots__/VaultUnlockViewTests/test_snapshot_vaultUnlock_empty.1.png b/BitwardenShared/UI/Auth/VaultUnlock/__Snapshots__/VaultUnlockViewTests/test_snapshot_vaultUnlock_empty.1.png index 4695c05e62..2cd716aa62 100644 Binary files a/BitwardenShared/UI/Auth/VaultUnlock/__Snapshots__/VaultUnlockViewTests/test_snapshot_vaultUnlock_empty.1.png and b/BitwardenShared/UI/Auth/VaultUnlock/__Snapshots__/VaultUnlockViewTests/test_snapshot_vaultUnlock_empty.1.png differ diff --git a/BitwardenShared/UI/Auth/VaultUnlock/__Snapshots__/VaultUnlockViewTests/test_snapshot_vaultUnlock_passwordHidden.1.png b/BitwardenShared/UI/Auth/VaultUnlock/__Snapshots__/VaultUnlockViewTests/test_snapshot_vaultUnlock_passwordHidden.1.png index 1745b43308..5c9f5acdae 100644 Binary files a/BitwardenShared/UI/Auth/VaultUnlock/__Snapshots__/VaultUnlockViewTests/test_snapshot_vaultUnlock_passwordHidden.1.png and b/BitwardenShared/UI/Auth/VaultUnlock/__Snapshots__/VaultUnlockViewTests/test_snapshot_vaultUnlock_passwordHidden.1.png differ diff --git a/BitwardenShared/UI/Auth/VaultUnlock/__Snapshots__/VaultUnlockViewTests/test_snapshot_vaultUnlock_passwordRevealed.1.png b/BitwardenShared/UI/Auth/VaultUnlock/__Snapshots__/VaultUnlockViewTests/test_snapshot_vaultUnlock_passwordRevealed.1.png index a72ab8f020..ed340979f5 100644 Binary files a/BitwardenShared/UI/Auth/VaultUnlock/__Snapshots__/VaultUnlockViewTests/test_snapshot_vaultUnlock_passwordRevealed.1.png and b/BitwardenShared/UI/Auth/VaultUnlock/__Snapshots__/VaultUnlockViewTests/test_snapshot_vaultUnlock_passwordRevealed.1.png differ diff --git a/BitwardenShared/UI/Auth/VaultUnlock/__Snapshots__/VaultUnlockViewTests/test_snapshot_vaultUnlock_withBiometrics_enabledAndInvalidIntegrity.1.png b/BitwardenShared/UI/Auth/VaultUnlock/__Snapshots__/VaultUnlockViewTests/test_snapshot_vaultUnlock_withBiometrics_enabledAndInvalidIntegrity.1.png index c58bf0b332..adebe15b82 100644 Binary files a/BitwardenShared/UI/Auth/VaultUnlock/__Snapshots__/VaultUnlockViewTests/test_snapshot_vaultUnlock_withBiometrics_enabledAndInvalidIntegrity.1.png and b/BitwardenShared/UI/Auth/VaultUnlock/__Snapshots__/VaultUnlockViewTests/test_snapshot_vaultUnlock_withBiometrics_enabledAndInvalidIntegrity.1.png differ diff --git a/BitwardenShared/UI/Auth/VaultUnlock/__Snapshots__/VaultUnlockViewTests/test_snapshot_vaultUnlock_withBiometrics_faceId.1.png b/BitwardenShared/UI/Auth/VaultUnlock/__Snapshots__/VaultUnlockViewTests/test_snapshot_vaultUnlock_withBiometrics_faceId.1.png index c228a563ea..7281cbd5a5 100644 Binary files a/BitwardenShared/UI/Auth/VaultUnlock/__Snapshots__/VaultUnlockViewTests/test_snapshot_vaultUnlock_withBiometrics_faceId.1.png and b/BitwardenShared/UI/Auth/VaultUnlock/__Snapshots__/VaultUnlockViewTests/test_snapshot_vaultUnlock_withBiometrics_faceId.1.png differ diff --git a/BitwardenShared/UI/Auth/VaultUnlock/__Snapshots__/VaultUnlockViewTests/test_snapshot_vaultUnlock_withBiometrics_notAvailable.1.png b/BitwardenShared/UI/Auth/VaultUnlock/__Snapshots__/VaultUnlockViewTests/test_snapshot_vaultUnlock_withBiometrics_notAvailable.1.png index 9add391e28..6e10f0a6d5 100644 Binary files a/BitwardenShared/UI/Auth/VaultUnlock/__Snapshots__/VaultUnlockViewTests/test_snapshot_vaultUnlock_withBiometrics_notAvailable.1.png and b/BitwardenShared/UI/Auth/VaultUnlock/__Snapshots__/VaultUnlockViewTests/test_snapshot_vaultUnlock_withBiometrics_notAvailable.1.png differ diff --git a/BitwardenShared/UI/Auth/VaultUnlock/__Snapshots__/VaultUnlockViewTests/test_snapshot_vaultUnlock_withBiometrics_touchId.1.png b/BitwardenShared/UI/Auth/VaultUnlock/__Snapshots__/VaultUnlockViewTests/test_snapshot_vaultUnlock_withBiometrics_touchId.1.png index 264551d771..1c518c9629 100644 Binary files a/BitwardenShared/UI/Auth/VaultUnlock/__Snapshots__/VaultUnlockViewTests/test_snapshot_vaultUnlock_withBiometrics_touchId.1.png and b/BitwardenShared/UI/Auth/VaultUnlock/__Snapshots__/VaultUnlockViewTests/test_snapshot_vaultUnlock_withBiometrics_touchId.1.png differ diff --git a/BitwardenShared/UI/Auth/VaultUnlockSetup/VaultUnlockSetupView.swift b/BitwardenShared/UI/Auth/VaultUnlockSetup/VaultUnlockSetupView.swift index 64faf4309d..1d51e3080f 100644 --- a/BitwardenShared/UI/Auth/VaultUnlockSetup/VaultUnlockSetupView.swift +++ b/BitwardenShared/UI/Auth/VaultUnlockSetup/VaultUnlockSetupView.swift @@ -39,7 +39,7 @@ struct VaultUnlockSetupView: View { } } } - .background(Asset.Colors.backgroundTertiary.swiftUIColor) + .background(Asset.Colors.backgroundSecondary.swiftUIColor) .clipShape(RoundedRectangle(cornerRadius: 10)) VStack(spacing: 12) { diff --git a/BitwardenShared/UI/Auth/VaultUnlockSetup/__Snapshots__/VaultUnlockSetupViewTests/test_snapshot_vaultUnlockSetup.1.png b/BitwardenShared/UI/Auth/VaultUnlockSetup/__Snapshots__/VaultUnlockSetupViewTests/test_snapshot_vaultUnlockSetup.1.png index 50a326da64..875fe2db58 100644 Binary files a/BitwardenShared/UI/Auth/VaultUnlockSetup/__Snapshots__/VaultUnlockSetupViewTests/test_snapshot_vaultUnlockSetup.1.png and b/BitwardenShared/UI/Auth/VaultUnlockSetup/__Snapshots__/VaultUnlockSetupViewTests/test_snapshot_vaultUnlockSetup.1.png differ diff --git a/BitwardenShared/UI/Auth/VaultUnlockSetup/__Snapshots__/VaultUnlockSetupViewTests/test_snapshot_vaultUnlockSetup.2.png b/BitwardenShared/UI/Auth/VaultUnlockSetup/__Snapshots__/VaultUnlockSetupViewTests/test_snapshot_vaultUnlockSetup.2.png index f1fa6820c5..97b3d34a5e 100644 Binary files a/BitwardenShared/UI/Auth/VaultUnlockSetup/__Snapshots__/VaultUnlockSetupViewTests/test_snapshot_vaultUnlockSetup.2.png and b/BitwardenShared/UI/Auth/VaultUnlockSetup/__Snapshots__/VaultUnlockSetupViewTests/test_snapshot_vaultUnlockSetup.2.png differ diff --git a/BitwardenShared/UI/Auth/VaultUnlockSetup/__Snapshots__/VaultUnlockSetupViewTests/test_snapshot_vaultUnlockSetup.3.png b/BitwardenShared/UI/Auth/VaultUnlockSetup/__Snapshots__/VaultUnlockSetupViewTests/test_snapshot_vaultUnlockSetup.3.png index 6ebe661af6..8f29a193ed 100644 Binary files a/BitwardenShared/UI/Auth/VaultUnlockSetup/__Snapshots__/VaultUnlockSetupViewTests/test_snapshot_vaultUnlockSetup.3.png and b/BitwardenShared/UI/Auth/VaultUnlockSetup/__Snapshots__/VaultUnlockSetupViewTests/test_snapshot_vaultUnlockSetup.3.png differ diff --git a/BitwardenShared/UI/Auth/VaultUnlockSetup/__Snapshots__/VaultUnlockSetupViewTests/test_snapshot_vaultUnlockSetup.4.png b/BitwardenShared/UI/Auth/VaultUnlockSetup/__Snapshots__/VaultUnlockSetupViewTests/test_snapshot_vaultUnlockSetup.4.png index f9d5bb7930..f309c9dc88 100644 Binary files a/BitwardenShared/UI/Auth/VaultUnlockSetup/__Snapshots__/VaultUnlockSetupViewTests/test_snapshot_vaultUnlockSetup.4.png and b/BitwardenShared/UI/Auth/VaultUnlockSetup/__Snapshots__/VaultUnlockSetupViewTests/test_snapshot_vaultUnlockSetup.4.png differ diff --git a/BitwardenShared/UI/Auth/VaultUnlockSetup/__Snapshots__/VaultUnlockSetupViewTests/test_snapshot_vaultUnlockSetup_noBiometrics.1.png b/BitwardenShared/UI/Auth/VaultUnlockSetup/__Snapshots__/VaultUnlockSetupViewTests/test_snapshot_vaultUnlockSetup_noBiometrics.1.png index e9074891e9..b8f90c0c56 100644 Binary files a/BitwardenShared/UI/Auth/VaultUnlockSetup/__Snapshots__/VaultUnlockSetupViewTests/test_snapshot_vaultUnlockSetup_noBiometrics.1.png and b/BitwardenShared/UI/Auth/VaultUnlockSetup/__Snapshots__/VaultUnlockSetupViewTests/test_snapshot_vaultUnlockSetup_noBiometrics.1.png differ diff --git a/BitwardenShared/UI/Auth/VaultUnlockSetup/__Snapshots__/VaultUnlockSetupViewTests/test_snapshot_vaultUnlockSetup_touchID.1.png b/BitwardenShared/UI/Auth/VaultUnlockSetup/__Snapshots__/VaultUnlockSetupViewTests/test_snapshot_vaultUnlockSetup_touchID.1.png index cb58344171..ca854f536f 100644 Binary files a/BitwardenShared/UI/Auth/VaultUnlockSetup/__Snapshots__/VaultUnlockSetupViewTests/test_snapshot_vaultUnlockSetup_touchID.1.png and b/BitwardenShared/UI/Auth/VaultUnlockSetup/__Snapshots__/VaultUnlockSetupViewTests/test_snapshot_vaultUnlockSetup_touchID.1.png differ diff --git a/BitwardenShared/UI/Auth/VaultUnlockSetup/__Snapshots__/VaultUnlockSetupViewTests/test_snapshot_vaultUnlockSetup_unlockMethodEnabled.1.png b/BitwardenShared/UI/Auth/VaultUnlockSetup/__Snapshots__/VaultUnlockSetupViewTests/test_snapshot_vaultUnlockSetup_unlockMethodEnabled.1.png index 19f089cd3f..0c284c4827 100644 Binary files a/BitwardenShared/UI/Auth/VaultUnlockSetup/__Snapshots__/VaultUnlockSetupViewTests/test_snapshot_vaultUnlockSetup_unlockMethodEnabled.1.png and b/BitwardenShared/UI/Auth/VaultUnlockSetup/__Snapshots__/VaultUnlockSetupViewTests/test_snapshot_vaultUnlockSetup_unlockMethodEnabled.1.png differ diff --git a/BitwardenShared/UI/Platform/Application/Appearance/Modifiers/ImageStyle.swift b/BitwardenShared/UI/Platform/Application/Appearance/Modifiers/ImageStyle.swift index 7626370f80..3e19f7bbd8 100644 --- a/BitwardenShared/UI/Platform/Application/Appearance/Modifiers/ImageStyle.swift +++ b/BitwardenShared/UI/Platform/Application/Appearance/Modifiers/ImageStyle.swift @@ -26,7 +26,7 @@ extension ImageStyle { /// An `ImageStyle` for applying common properties to a circular accessory icon. /// /// - Size: 16x16pt - /// - Color: `Asset.Colors.primaryBitwarden` + /// - Color: `Asset.Colors.iconSecondary` /// static let accessoryIcon = accessoryIcon() @@ -40,10 +40,10 @@ extension ImageStyle { /// An `ImageStyle` for applying common properties for icons within a toolbar. /// /// - Size: 19x19pt - /// - Color: `Asset.Colors.primaryBitwarden` + /// - Color: `Asset.Colors.iconSecondary` /// static let toolbarIcon = ImageStyle( - color: Asset.Colors.primaryBitwarden.swiftUIColor, + color: Asset.Colors.iconSecondary.swiftUIColor, scaleWithFont: false, width: 19, height: 19 @@ -52,14 +52,14 @@ extension ImageStyle { /// An `ImageStyle` for applying common properties to a circular accessory icon. /// /// - Size: 16x16pt - /// - Color: Defaults to `Asset.Colors.primaryBitwarden` + /// - Color: Defaults to `Asset.Colors.iconSecondary` /// /// - Parameters: - /// - color: The foreground color of the image. Defaults to `Asset.Colors.primaryBitwarden`. + /// - color: The foreground color of the image. Defaults to `Asset.Colors.iconSecondary`. /// - scaleWithFont: Whether the image should scale with font size changes. /// static func accessoryIcon( - color: Color = Asset.Colors.primaryBitwarden.swiftUIColor, + color: Color = Asset.Colors.iconSecondary.swiftUIColor, scaleWithFont: Bool = false ) -> ImageStyle { ImageStyle(color: color, scaleWithFont: scaleWithFont, width: 16, height: 16) diff --git a/BitwardenShared/UI/Platform/Application/Appearance/Modifiers/ScrollViewModifier.swift b/BitwardenShared/UI/Platform/Application/Appearance/Modifiers/ScrollViewModifier.swift index 9ac165913f..7acf9d75d1 100644 --- a/BitwardenShared/UI/Platform/Application/Appearance/Modifiers/ScrollViewModifier.swift +++ b/BitwardenShared/UI/Platform/Application/Appearance/Modifiers/ScrollViewModifier.swift @@ -10,6 +10,9 @@ struct ScrollViewModifier: ViewModifier { /// Whether or not to add the vertical padding. var addVerticalPadding = true + /// The background color to apply to the scroll view. + var backgroundColor: Color + // MARK: View func body(content: Content) -> some View { @@ -18,6 +21,6 @@ struct ScrollViewModifier: ViewModifier { .padding(.horizontal, 16) .padding([.top, .bottom], addVerticalPadding ? 16 : 0) } - .background(Color(asset: Asset.Colors.backgroundSecondary)) + .background(backgroundColor) } } diff --git a/BitwardenShared/UI/Platform/Application/Appearance/Styles/AccessoryButtonStyle.swift b/BitwardenShared/UI/Platform/Application/Appearance/Styles/AccessoryButtonStyle.swift index 6d79961ff1..472b204708 100644 --- a/BitwardenShared/UI/Platform/Application/Appearance/Styles/AccessoryButtonStyle.swift +++ b/BitwardenShared/UI/Platform/Application/Appearance/Styles/AccessoryButtonStyle.swift @@ -9,8 +9,8 @@ struct AccessoryButtonStyle: ButtonStyle { configuration.label .frame(width: 14, height: 14) .padding(10) - .foregroundColor(Asset.Colors.primaryBitwarden.swiftUIColor) - .background(Asset.Colors.fillTertiary.swiftUIColor) + .foregroundColor(Asset.Colors.iconSecondary.swiftUIColor) + .background(Asset.Colors.Legacy.fillTertiary.swiftUIColor) .clipShape(Circle()) .opacity(configuration.isPressed ? 0.5 : 1) } diff --git a/BitwardenShared/UI/Platform/Application/Appearance/Styles/BitwardenToggleStyle.swift b/BitwardenShared/UI/Platform/Application/Appearance/Styles/BitwardenToggleStyle.swift index 75b3925945..a3f82bff6f 100644 --- a/BitwardenShared/UI/Platform/Application/Appearance/Styles/BitwardenToggleStyle.swift +++ b/BitwardenShared/UI/Platform/Application/Appearance/Styles/BitwardenToggleStyle.swift @@ -9,7 +9,7 @@ struct BitwardenToggleStyle: ToggleStyle { Toggle(configuration) .styleGuide(.body) .foregroundColor(Asset.Colors.textPrimary.swiftUIColor) - .tint(Asset.Colors.primaryBitwarden.swiftUIColor) + .tint(Asset.Colors.iconSecondary.swiftUIColor) } } diff --git a/BitwardenShared/UI/Platform/Application/Appearance/Styles/PrimaryButtonStyle.swift b/BitwardenShared/UI/Platform/Application/Appearance/Styles/PrimaryButtonStyle.swift index 474d341088..1726e5aacb 100644 --- a/BitwardenShared/UI/Platform/Application/Appearance/Styles/PrimaryButtonStyle.swift +++ b/BitwardenShared/UI/Platform/Application/Appearance/Styles/PrimaryButtonStyle.swift @@ -16,11 +16,11 @@ struct PrimaryButtonStyle: ButtonStyle { /// The background color of this button. var backgroundColor: Color { if isDestructive { - Asset.Colors.loadingRed.swiftUIColor + Asset.Colors.error.swiftUIColor } else { isEnabled - ? Asset.Colors.primaryBitwarden.swiftUIColor - : Asset.Colors.fillTertiary.swiftUIColor + ? Asset.Colors.buttonFilledBackground.swiftUIColor + : Asset.Colors.buttonFilledDisabledBackground.swiftUIColor } } @@ -28,8 +28,8 @@ struct PrimaryButtonStyle: ButtonStyle { /// images. var foregroundColor: Color { isEnabled - ? Asset.Colors.primaryContrastBitwarden.swiftUIColor - : Asset.Colors.textTertiary.swiftUIColor + ? Asset.Colors.buttonFilledForeground.swiftUIColor + : Asset.Colors.buttonFilledDisabledForeground.swiftUIColor } func makeBody(configuration: Configuration) -> some View { @@ -62,19 +62,17 @@ extension ButtonStyle where Self == PrimaryButtonStyle { // MARK: Previews #if DEBUG -#Preview("Enabled") { - Button("Hello World!") {} - .buttonStyle(.primary()) -} +#Preview { + VStack { + Button("Hello World!") {} -#Preview("Disabled") { - Button("Hello World!") {} - .buttonStyle(.primary()) - .disabled(true) -} + Button("Hello World!") {} + .disabled(true) -#Preview("Destructive") { - Button("Hello World!") {} - .buttonStyle(.primary(isDestructive: true)) + Button("Hello World!") {} + .buttonStyle(.primary(isDestructive: true)) + } + .buttonStyle(.primary()) + .padding() } #endif diff --git a/BitwardenShared/UI/Platform/Application/Appearance/Styles/SecondaryButtonStyle.swift b/BitwardenShared/UI/Platform/Application/Appearance/Styles/SecondaryButtonStyle.swift index f1cfeab67c..0f4889e925 100644 --- a/BitwardenShared/UI/Platform/Application/Appearance/Styles/SecondaryButtonStyle.swift +++ b/BitwardenShared/UI/Platform/Application/Appearance/Styles/SecondaryButtonStyle.swift @@ -10,12 +10,12 @@ struct SecondaryButtonStyle: ButtonStyle { func makeBody(configuration: Configuration) -> some View { configuration.label - .foregroundColor(Asset.Colors.primaryBitwarden.swiftUIColor) + .foregroundColor(Asset.Colors.textInteraction.swiftUIColor) .styleGuide(.bodyBold) .padding(.vertical, 14) .padding(.horizontal, 20) .frame(maxWidth: shouldFillWidth ? .infinity : nil) - .background(Asset.Colors.primaryBitwarden.swiftUIColor.opacity(0.08)) + .background(Asset.Colors.buttonFilledBackground.swiftUIColor.opacity(0.08)) .clipShape(RoundedRectangle(cornerRadius: 12)) .opacity(configuration.isPressed ? 0.5 : 1) } @@ -32,3 +32,16 @@ extension ButtonStyle where Self == SecondaryButtonStyle { SecondaryButtonStyle(shouldFillWidth: shouldFillWidth) } } + +#if DEBUG +#Preview { + VStack { + Button("Hello World!") {} + + Button("Hello World!") {} + .disabled(true) + } + .buttonStyle(.secondary()) + .padding() +} +#endif diff --git a/BitwardenShared/UI/Platform/Application/Appearance/Styles/TertiaryButtonStyle.swift b/BitwardenShared/UI/Platform/Application/Appearance/Styles/TertiaryButtonStyle.swift index 4f5c63fe8f..f3a3985384 100644 --- a/BitwardenShared/UI/Platform/Application/Appearance/Styles/TertiaryButtonStyle.swift +++ b/BitwardenShared/UI/Platform/Application/Appearance/Styles/TertiaryButtonStyle.swift @@ -14,8 +14,8 @@ struct TertiaryButtonStyle: ButtonStyle { /// The button's foreground color. var foregroundColor: Color { isDestructive - ? Asset.Colors.loadingRed.swiftUIColor - : Asset.Colors.primaryBitwarden.swiftUIColor + ? Asset.Colors.error.swiftUIColor + : Asset.Colors.textInteraction.swiftUIColor } func makeBody(configuration: Configuration) -> some View { @@ -25,7 +25,7 @@ struct TertiaryButtonStyle: ButtonStyle { .padding(.vertical, 14) .padding(.horizontal, 20) .frame(maxWidth: shouldFillWidth ? .infinity : nil) - .background(Asset.Colors.fillTertiary.swiftUIColor) + .background(Asset.Colors.Legacy.fillTertiary.swiftUIColor) .clipShape(RoundedRectangle(cornerRadius: 12)) .opacity(configuration.isPressed ? 0.5 : 1) } @@ -44,3 +44,16 @@ extension ButtonStyle where Self == TertiaryButtonStyle { TertiaryButtonStyle(isDestructive: isDestructive, shouldFillWidth: shouldFillWidth) } } + +#if DEBUG +#Preview { + VStack { + Button("Hello World!") {} + + Button("Hello World!") {} + .disabled(true) + } + .buttonStyle(.tertiary()) + .padding() +} +#endif diff --git a/BitwardenShared/UI/Platform/Application/Appearance/Styles/TransparentButtonStyle.swift b/BitwardenShared/UI/Platform/Application/Appearance/Styles/TransparentButtonStyle.swift index 682f7d1318..8860c51978 100644 --- a/BitwardenShared/UI/Platform/Application/Appearance/Styles/TransparentButtonStyle.swift +++ b/BitwardenShared/UI/Platform/Application/Appearance/Styles/TransparentButtonStyle.swift @@ -11,8 +11,8 @@ struct TransparentButtonStyle: ButtonStyle { /// images. var foregroundColor: Color { isEnabled - ? Asset.Colors.primaryBitwarden.swiftUIColor - : Asset.Colors.textTertiary.swiftUIColor + ? Asset.Colors.textInteraction.swiftUIColor + : Asset.Colors.Legacy.textTertiary.swiftUIColor } func makeBody(configuration: Configuration) -> some View { @@ -40,14 +40,14 @@ extension ButtonStyle where Self == TransparentButtonStyle { // MARK: Previews #if DEBUG -#Preview("Enabled") { - Button("Hello World!") {} - .buttonStyle(.transparent) -} +#Preview { + VStack { + Button("Hello World!") {} -#Preview("Disabled") { - Button("Hello World!") {} - .buttonStyle(.transparent) - .disabled(true) + Button("Hello World!") {} + .disabled(true) + } + .buttonStyle(.transparent) + .padding() } #endif diff --git a/BitwardenShared/UI/Platform/Application/Appearance/UI.swift b/BitwardenShared/UI/Platform/Application/Appearance/UI.swift index a20fd34e94..c810080be6 100644 --- a/BitwardenShared/UI/Platform/Application/Appearance/UI.swift +++ b/BitwardenShared/UI/Platform/Application/Appearance/UI.swift @@ -60,7 +60,7 @@ public enum UI { ) let navigationBarAppearance = UINavigationBarAppearance() - navigationBarAppearance.backgroundColor = Asset.Colors.primaryContrastBitwarden.color + navigationBarAppearance.backgroundColor = Asset.Colors.backgroundSecondary.color navigationBarAppearance.buttonAppearance.normal.titleTextAttributes = [.font: bodyFont] navigationBarAppearance.largeTitleTextAttributes = [.font: largeTitleFont] navigationBarAppearance.titleTextAttributes = [.font: bodyBoldFont] @@ -70,21 +70,23 @@ public enum UI { UIPageControl.appearance().currentPageIndicatorTintColor = Asset.Colors.textPrimary.color UIPageControl.appearance().pageIndicatorTintColor = Asset.Colors.textPrimary.color.withAlphaComponent(0.3) - UIBarButtonItem.appearance().tintColor = Asset.Colors.primaryBitwarden.color + UIBarButtonItem.appearance().tintColor = Asset.Colors.textInteraction.color // Make the tab bar opaque. let tabBarAppearance = UITabBarAppearance() tabBarAppearance.configureWithOpaqueBackground() + tabBarAppearance.backgroundColor = Asset.Colors.backgroundSecondary.color UITabBar.appearance().scrollEdgeAppearance = tabBarAppearance UITabBar.appearance().standardAppearance = tabBarAppearance - UITabBar.appearance().tintColor = Asset.Colors.primaryBitwarden.color + UITabBar.appearance().tintColor = Asset.Colors.iconSecondary.color + UITabBar.appearance().unselectedItemTintColor = Asset.Colors.iconPrimary.color UIBarButtonItem.appearance(whenContainedInInstancesOf: [UISearchBar.self]).title = Localizations.cancel UIBarButtonItem.appearance(whenContainedInInstancesOf: [UISearchBar.self]).setTitleTextAttributes( [.font: FontFamily.DMSans.regular.font(size: 15)], for: .normal ) - UISearchBar.appearance().tintColor = Asset.Colors.primaryBitwarden.color + UISearchBar.appearance().tintColor = Asset.Colors.textInteraction.color // Explicitly tint the image so that it does not assume the tint color assigned to the entire search bar. let image = Asset.Images.cancelRound.image let tintedImage = image.withTintColor(Asset.Colors.textSecondary.color, renderingMode: .alwaysOriginal) diff --git a/BitwardenShared/UI/Platform/Application/Appearance/__Snapshots__/StyleGuideFontTests/test_snapshot_styleGuideFont.4.png b/BitwardenShared/UI/Platform/Application/Appearance/__Snapshots__/StyleGuideFontTests/test_snapshot_styleGuideFont.4.png index 094473817f..513d088a4e 100644 Binary files a/BitwardenShared/UI/Platform/Application/Appearance/__Snapshots__/StyleGuideFontTests/test_snapshot_styleGuideFont.4.png and b/BitwardenShared/UI/Platform/Application/Appearance/__Snapshots__/StyleGuideFontTests/test_snapshot_styleGuideFont.4.png differ diff --git a/BitwardenShared/UI/Platform/Application/Appearance/__Snapshots__/StyleGuideFontTests/test_snapshot_styleGuideFont_largeText.4.png b/BitwardenShared/UI/Platform/Application/Appearance/__Snapshots__/StyleGuideFontTests/test_snapshot_styleGuideFont_largeText.4.png index d1f83ab777..87a497d647 100644 Binary files a/BitwardenShared/UI/Platform/Application/Appearance/__Snapshots__/StyleGuideFontTests/test_snapshot_styleGuideFont_largeText.4.png and b/BitwardenShared/UI/Platform/Application/Appearance/__Snapshots__/StyleGuideFontTests/test_snapshot_styleGuideFont_largeText.4.png differ diff --git a/BitwardenShared/UI/Platform/Application/Extensions/View+Toolbar.swift b/BitwardenShared/UI/Platform/Application/Extensions/View+Toolbar.swift index 9d3032f222..08d1e03b96 100644 --- a/BitwardenShared/UI/Platform/Application/Extensions/View+Toolbar.swift +++ b/BitwardenShared/UI/Platform/Application/Extensions/View+Toolbar.swift @@ -86,7 +86,7 @@ extension View { /// func toolbarButton(_ label: String, action: @escaping () async -> Void) -> some View { AsyncButton(label, action: action) - .foregroundColor(Asset.Colors.primaryBitwarden.swiftUIColor) + .foregroundColor(Asset.Colors.textInteraction.swiftUIColor) .styleGuide(.body) // Ideally we would set both `minHeight` and `minWidth` to 44. Setting `minWidth` causes // padding to be applied equally on both sides of the image. This results in extra padding diff --git a/BitwardenShared/UI/Platform/Application/Extensions/View.swift b/BitwardenShared/UI/Platform/Application/Extensions/View.swift index bde81b949f..1d5cd5a907 100644 --- a/BitwardenShared/UI/Platform/Application/Extensions/View.swift +++ b/BitwardenShared/UI/Platform/Application/Extensions/View.swift @@ -110,11 +110,19 @@ extension View { /// Applies the `ScrollViewModifier` to a view. /// - /// - Parameter addVerticalPadding: Whether or not to add vertical padding. Defaults to `true`. + /// - Parameters: + /// - addVerticalPadding: Whether or not to add vertical padding. Defaults to `true`. + /// - backgroundColor: The background color to apply to the scroll view. Defaults to `backgroundPrimary`. /// /// - Returns: A view within a `ScrollView`. /// - func scrollView(addVerticalPadding: Bool = true) -> some View { - modifier(ScrollViewModifier(addVerticalPadding: addVerticalPadding)) + func scrollView( + addVerticalPadding: Bool = true, + backgroundColor: Color = Asset.Colors.backgroundPrimary.swiftUIColor + ) -> some View { + modifier(ScrollViewModifier( + addVerticalPadding: addVerticalPadding, + backgroundColor: backgroundColor + )) } } diff --git a/BitwardenShared/UI/Platform/Application/Extensions/__Snapshots__/UITabBarControllerExtensionsTests/test_snapshot_tabBarItems_generatorSelected_darkMode.1.png b/BitwardenShared/UI/Platform/Application/Extensions/__Snapshots__/UITabBarControllerExtensionsTests/test_snapshot_tabBarItems_generatorSelected_darkMode.1.png index 5f27c92cb2..b03fbc6e71 100644 Binary files a/BitwardenShared/UI/Platform/Application/Extensions/__Snapshots__/UITabBarControllerExtensionsTests/test_snapshot_tabBarItems_generatorSelected_darkMode.1.png and b/BitwardenShared/UI/Platform/Application/Extensions/__Snapshots__/UITabBarControllerExtensionsTests/test_snapshot_tabBarItems_generatorSelected_darkMode.1.png differ diff --git a/BitwardenShared/UI/Platform/Application/Extensions/__Snapshots__/UITabBarControllerExtensionsTests/test_snapshot_tabBarItems_sendSelected_darkMode.1.png b/BitwardenShared/UI/Platform/Application/Extensions/__Snapshots__/UITabBarControllerExtensionsTests/test_snapshot_tabBarItems_sendSelected_darkMode.1.png index 4580f408ff..0c148f52b6 100644 Binary files a/BitwardenShared/UI/Platform/Application/Extensions/__Snapshots__/UITabBarControllerExtensionsTests/test_snapshot_tabBarItems_sendSelected_darkMode.1.png and b/BitwardenShared/UI/Platform/Application/Extensions/__Snapshots__/UITabBarControllerExtensionsTests/test_snapshot_tabBarItems_sendSelected_darkMode.1.png differ diff --git a/BitwardenShared/UI/Platform/Application/Extensions/__Snapshots__/UITabBarControllerExtensionsTests/test_snapshot_tabBarItems_settingsSelected_darkMode.1.png b/BitwardenShared/UI/Platform/Application/Extensions/__Snapshots__/UITabBarControllerExtensionsTests/test_snapshot_tabBarItems_settingsSelected_darkMode.1.png index 8d9dcbaff4..68d1d7dd19 100644 Binary files a/BitwardenShared/UI/Platform/Application/Extensions/__Snapshots__/UITabBarControllerExtensionsTests/test_snapshot_tabBarItems_settingsSelected_darkMode.1.png and b/BitwardenShared/UI/Platform/Application/Extensions/__Snapshots__/UITabBarControllerExtensionsTests/test_snapshot_tabBarItems_settingsSelected_darkMode.1.png differ diff --git a/BitwardenShared/UI/Platform/Application/Extensions/__Snapshots__/UITabBarControllerExtensionsTests/test_snapshot_tabBarItems_vaultSelected_darkMode.1.png b/BitwardenShared/UI/Platform/Application/Extensions/__Snapshots__/UITabBarControllerExtensionsTests/test_snapshot_tabBarItems_vaultSelected_darkMode.1.png index 0489120041..100053233b 100644 Binary files a/BitwardenShared/UI/Platform/Application/Extensions/__Snapshots__/UITabBarControllerExtensionsTests/test_snapshot_tabBarItems_vaultSelected_darkMode.1.png and b/BitwardenShared/UI/Platform/Application/Extensions/__Snapshots__/UITabBarControllerExtensionsTests/test_snapshot_tabBarItems_vaultSelected_darkMode.1.png differ diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Backgrounds/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Background/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Backgrounds/Contents.json rename to BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Background/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Loading/loadingBlue.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Background/backgroundAlert.colorset/Contents.json similarity index 92% rename from BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Loading/loadingBlue.colorset/Contents.json rename to BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Background/backgroundAlert.colorset/Contents.json index 3b057a3eec..c43135b0ba 100644 --- a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Loading/loadingBlue.colorset/Contents.json +++ b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Background/backgroundAlert.colorset/Contents.json @@ -24,8 +24,8 @@ "components" : { "alpha" : "1.000", "blue" : "0xFF", - "green" : "0xC5", - "red" : "0xB2" + "green" : "0xAB", + "red" : "0x65" } }, "idiom" : "universal" diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Loading/loadingRed.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Background/backgroundPrimary.colorset/Contents.json similarity index 80% rename from BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Loading/loadingRed.colorset/Contents.json rename to BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Background/backgroundPrimary.colorset/Contents.json index 1cf194d7cc..110e0bcefe 100644 --- a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Loading/loadingRed.colorset/Contents.json +++ b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Background/backgroundPrimary.colorset/Contents.json @@ -5,9 +5,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0x1A", - "green" : "0x1A", - "red" : "0xBA" + "blue" : "0xF9", + "green" : "0xF6", + "red" : "0xF3" } }, "idiom" : "universal" @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0xAB", - "green" : "0xB4", - "red" : "0xFF" + "blue" : "0x27", + "green" : "0x1A", + "red" : "0x12" } }, "idiom" : "universal" diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Backgrounds/backgroundPrimary.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Background/backgroundSecondary.colorset/Contents.json similarity index 88% rename from BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Backgrounds/backgroundPrimary.colorset/Contents.json rename to BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Background/backgroundSecondary.colorset/Contents.json index 4aa9e82a01..8c82dacfe8 100644 --- a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Backgrounds/backgroundPrimary.colorset/Contents.json +++ b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Background/backgroundSecondary.colorset/Contents.json @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0x3C", - "green" : "0x3A", - "red" : "0x3A" + "blue" : "0x33", + "green" : "0x27", + "red" : "0x20" } }, "idiom" : "universal" diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Backgrounds/backgroundSecondary.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Background/backgroundTertiary.colorset/Contents.json similarity index 76% rename from BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Backgrounds/backgroundSecondary.colorset/Contents.json rename to BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Background/backgroundTertiary.colorset/Contents.json index 4c8ef69a5a..3c5f7cd8b1 100644 --- a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Backgrounds/backgroundSecondary.colorset/Contents.json +++ b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Background/backgroundTertiary.colorset/Contents.json @@ -5,9 +5,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0xF7", - "green" : "0xF2", - "red" : "0xF2" + "blue" : "0xF6", + "green" : "0xE5", + "red" : "0xDB" } }, "idiom" : "universal" @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0x1E", - "green" : "0x1C", - "red" : "0x1C" + "blue" : "0x27", + "green" : "0x1A", + "red" : "0x12" } }, "idiom" : "universal" diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/BrandColors/primaryBitwardenDark.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/BrandColors/primaryBitwardenDark.colorset/Contents.json deleted file mode 100644 index abddd64722..0000000000 --- a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/BrandColors/primaryBitwardenDark.colorset/Contents.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0xFF", - "green" : "0xC5", - "red" : "0xB2" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/BrandColors/primaryBitwardenLight.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/BrandColors/primaryBitwardenLight.colorset/Contents.json deleted file mode 100644 index 39216d073b..0000000000 --- a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/BrandColors/primaryBitwardenLight.colorset/Contents.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0xDC", - "green" : "0x5D", - "red" : "0x17" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/BrandColors/tabInactiveBitwarden.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/BrandColors/tabInactiveBitwarden.colorset/Contents.json deleted file mode 100644 index 3344c90472..0000000000 --- a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/BrandColors/tabInactiveBitwarden.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0x4D", - "green" : "0x48", - "red" : "0x41" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0xCE", - "green" : "0xC7", - "red" : "0xC1" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/BrandColors/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Button/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/BrandColors/Contents.json rename to BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Button/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/BrandColors/primaryBitwarden.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Button/buttonFilledBackground.colorset/Contents.json similarity index 92% rename from BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/BrandColors/primaryBitwarden.colorset/Contents.json rename to BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Button/buttonFilledBackground.colorset/Contents.json index 3b057a3eec..c43135b0ba 100644 --- a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/BrandColors/primaryBitwarden.colorset/Contents.json +++ b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Button/buttonFilledBackground.colorset/Contents.json @@ -24,8 +24,8 @@ "components" : { "alpha" : "1.000", "blue" : "0xFF", - "green" : "0xC5", - "red" : "0xB2" + "green" : "0xAB", + "red" : "0x65" } }, "idiom" : "universal" diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Button/buttonFilledDisabledBackground.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Button/buttonFilledDisabledBackground.colorset/Contents.json new file mode 100644 index 0000000000..16c7f67775 --- /dev/null +++ b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Button/buttonFilledDisabledBackground.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xE3", + "green" : "0xD9", + "red" : "0xD3" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x6A", + "green" : "0x5B", + "red" : "0x52" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Button/buttonFilledDisabledForeground.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Button/buttonFilledDisabledForeground.colorset/Contents.json new file mode 100644 index 0000000000..818c15d136 --- /dev/null +++ b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Button/buttonFilledDisabledForeground.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xBB", + "green" : "0xA3", + "red" : "0x96" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xBB", + "green" : "0xA3", + "red" : "0x96" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/BrandColors/primaryContrastBitwarden.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Button/buttonFilledForeground.colorset/Contents.json similarity index 88% rename from BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/BrandColors/primaryContrastBitwarden.colorset/Contents.json rename to BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Button/buttonFilledForeground.colorset/Contents.json index e4846c314a..8c82dacfe8 100644 --- a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/BrandColors/primaryContrastBitwarden.colorset/Contents.json +++ b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Button/buttonFilledForeground.colorset/Contents.json @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0x1E", - "green" : "0x1C", - "red" : "0x1C" + "blue" : "0x33", + "green" : "0x27", + "red" : "0x20" } }, "idiom" : "universal" diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Button/buttonOutlinedBorder.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Button/buttonOutlinedBorder.colorset/Contents.json new file mode 100644 index 0000000000..c43135b0ba --- /dev/null +++ b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Button/buttonOutlinedBorder.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xDC", + "green" : "0x5D", + "red" : "0x17" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xFF", + "green" : "0xAB", + "red" : "0x65" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Button/buttonOutlinedDisabledBorder.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Button/buttonOutlinedDisabledBorder.colorset/Contents.json new file mode 100644 index 0000000000..27af940b5c --- /dev/null +++ b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Button/buttonOutlinedDisabledBorder.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xBB", + "green" : "0xA3", + "red" : "0x96" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x6A", + "green" : "0x5B", + "red" : "0x52" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Button/buttonOutlinedDisabledForeground.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Button/buttonOutlinedDisabledForeground.colorset/Contents.json new file mode 100644 index 0000000000..27af940b5c --- /dev/null +++ b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Button/buttonOutlinedDisabledForeground.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xBB", + "green" : "0xA3", + "red" : "0x96" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x6A", + "green" : "0x5B", + "red" : "0x52" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Button/buttonOutlinedForeground.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Button/buttonOutlinedForeground.colorset/Contents.json new file mode 100644 index 0000000000..c43135b0ba --- /dev/null +++ b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Button/buttonOutlinedForeground.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xDC", + "green" : "0x5D", + "red" : "0x17" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xFF", + "green" : "0xAB", + "red" : "0x65" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/FillColors/fillPrimary.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/FillColors/fillPrimary.colorset/Contents.json deleted file mode 100644 index 3ddbd12ac8..0000000000 --- a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/FillColors/fillPrimary.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "0.20", - "blue" : "0x80", - "green" : "0x7B", - "red" : "0x78" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "0.36", - "blue" : "0x80", - "green" : "0x7A", - "red" : "0x78" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/FillColors/fillQuaternary.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/FillColors/fillQuaternary.colorset/Contents.json deleted file mode 100644 index dc761f4212..0000000000 --- a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/FillColors/fillQuaternary.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "0.08", - "blue" : "0x80", - "green" : "0x79", - "red" : "0x74" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "0.18", - "blue" : "0x80", - "green" : "0x77", - "red" : "0x74" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/FillColors/fillSecondary.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/FillColors/fillSecondary.colorset/Contents.json deleted file mode 100644 index 8f803f087a..0000000000 --- a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/FillColors/fillSecondary.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "0.16", - "blue" : "0x80", - "green" : "0x7B", - "red" : "0x78" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "0.32", - "blue" : "0x80", - "green" : "0x7A", - "red" : "0x78" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/FillColors/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Icon/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/FillColors/Contents.json rename to BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Icon/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Fingerprint/fingerprint.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Icon/iconBadgeBackground.colorset/Contents.json similarity index 88% rename from BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Fingerprint/fingerprint.colorset/Contents.json rename to BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Icon/iconBadgeBackground.colorset/Contents.json index 05ff9f61bd..9e59974de7 100644 --- a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Fingerprint/fingerprint.colorset/Contents.json +++ b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Icon/iconBadgeBackground.colorset/Contents.json @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0xC7", - "green" : "0x8D", - "red" : "0xF0" + "blue" : "0xD0", + "green" : "0x8F", + "red" : "0xFF" } }, "idiom" : "universal" diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Backgrounds/backgroundTertiary.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Icon/iconBadgeForeground.colorset/Contents.json similarity index 88% rename from BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Backgrounds/backgroundTertiary.colorset/Contents.json rename to BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Icon/iconBadgeForeground.colorset/Contents.json index 970a665024..8c82dacfe8 100644 --- a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Backgrounds/backgroundTertiary.colorset/Contents.json +++ b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Icon/iconBadgeForeground.colorset/Contents.json @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0x2E", - "green" : "0x2C", - "red" : "0x2C" + "blue" : "0x33", + "green" : "0x27", + "red" : "0x20" } }, "idiom" : "universal" diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Icon/iconPrimary.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Icon/iconPrimary.colorset/Contents.json new file mode 100644 index 0000000000..955d04bf9b --- /dev/null +++ b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Icon/iconPrimary.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x91", + "green" : "0x6D", + "red" : "0x5A" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xBB", + "green" : "0xA3", + "red" : "0x96" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/TextColors/textPrimary.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Icon/iconReversed.colorset/Contents.json similarity index 88% rename from BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/TextColors/textPrimary.colorset/Contents.json rename to BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Icon/iconReversed.colorset/Contents.json index 0c600f92f1..8c82dacfe8 100644 --- a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/TextColors/textPrimary.colorset/Contents.json +++ b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Icon/iconReversed.colorset/Contents.json @@ -5,9 +5,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0x00", - "green" : "0x00", - "red" : "0x00" + "blue" : "0xFF", + "green" : "0xFF", + "red" : "0xFF" } }, "idiom" : "universal" @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0xFF", - "green" : "0xFF", - "red" : "0xFF" + "blue" : "0x33", + "green" : "0x27", + "red" : "0x20" } }, "idiom" : "universal" diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Icon/iconSecondary.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Icon/iconSecondary.colorset/Contents.json new file mode 100644 index 0000000000..c43135b0ba --- /dev/null +++ b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Icon/iconSecondary.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xDC", + "green" : "0x5D", + "red" : "0x17" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xFF", + "green" : "0xAB", + "red" : "0x65" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/TextColors/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Legacy/Contents.json similarity index 52% rename from BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/TextColors/Contents.json rename to BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Legacy/Contents.json index 73c00596a7..6e965652df 100644 --- a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/TextColors/Contents.json +++ b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Legacy/Contents.json @@ -2,5 +2,8 @@ "info" : { "author" : "xcode", "version" : 1 + }, + "properties" : { + "provides-namespace" : true } } diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Backgrounds/backgroundDimmed.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Legacy/backgroundDimmed.colorset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Backgrounds/backgroundDimmed.colorset/Contents.json rename to BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Legacy/backgroundDimmed.colorset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/FillColors/fillTertiary.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Legacy/fillTertiary.colorset/Contents.json similarity index 91% rename from BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/FillColors/fillTertiary.colorset/Contents.json rename to BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Legacy/fillTertiary.colorset/Contents.json index 70ecbfb8a8..6ec472d360 100644 --- a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/FillColors/fillTertiary.colorset/Contents.json +++ b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Legacy/fillTertiary.colorset/Contents.json @@ -4,7 +4,7 @@ "color" : { "color-space" : "srgb", "components" : { - "alpha" : "0.12", + "alpha" : "0.120", "blue" : "0x80", "green" : "0x7A", "red" : "0x76" @@ -22,7 +22,7 @@ "color" : { "color-space" : "srgb", "components" : { - "alpha" : "0.24", + "alpha" : "0.240", "blue" : "0x80", "green" : "0x79", "red" : "0x76" diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Material/materialRegularBase.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Legacy/materialRegularBase.colorset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Material/materialRegularBase.colorset/Contents.json rename to BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Legacy/materialRegularBase.colorset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Material/materialRegularBlend.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Legacy/materialRegularBlend.colorset/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Material/materialRegularBlend.colorset/Contents.json rename to BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Legacy/materialRegularBlend.colorset/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/TextColors/textQuaternary.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Legacy/textTertiary.colorset/Contents.json similarity index 91% rename from BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/TextColors/textQuaternary.colorset/Contents.json rename to BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Legacy/textTertiary.colorset/Contents.json index 7abb66ed93..8cef96ee12 100644 --- a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/TextColors/textQuaternary.colorset/Contents.json +++ b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Legacy/textTertiary.colorset/Contents.json @@ -4,7 +4,7 @@ "color" : { "color-space" : "srgb", "components" : { - "alpha" : "0.18", + "alpha" : "0.300", "blue" : "0x43", "green" : "0x3C", "red" : "0x3C" @@ -22,7 +22,7 @@ "color" : { "color-space" : "srgb", "components" : { - "alpha" : "0.16", + "alpha" : "0.300", "blue" : "0xF5", "green" : "0xEB", "red" : "0xEB" diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Loading/loadingGreen.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Loading/loadingGreen.colorset/Contents.json deleted file mode 100644 index e5d50ba40d..0000000000 --- a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Loading/loadingGreen.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0x45", - "green" : "0x7E", - "red" : "0x01" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0x6D", - "green" : "0xB0", - "red" : "0x41" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Loading/loadingOrange.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Loading/loadingOrange.colorset/Contents.json deleted file mode 100644 index fd692c1005..0000000000 --- a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Loading/loadingOrange.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0x09", - "green" : "0x66", - "red" : "0x8B" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0x4F", - "green" : "0x91", - "red" : "0xC9" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/SeparatorColors/separatorNonOpaque.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/SeparatorColors/separatorNonOpaque.colorset/Contents.json deleted file mode 100644 index 7a5754f183..0000000000 --- a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/SeparatorColors/separatorNonOpaque.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "0.360", - "blue" : "0x43", - "green" : "0x3C", - "red" : "0x3C" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "0.650", - "blue" : "0x58", - "green" : "0x54", - "red" : "0x54" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Fingerprint/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Status/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Fingerprint/Contents.json rename to BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Status/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/SeparatorColors/separatorOpaque.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Status/error.colorset/Contents.json similarity index 80% rename from BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/SeparatorColors/separatorOpaque.colorset/Contents.json rename to BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Status/error.colorset/Contents.json index 3d8e0fb8b7..8803242ea5 100644 --- a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/SeparatorColors/separatorOpaque.colorset/Contents.json +++ b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Status/error.colorset/Contents.json @@ -5,9 +5,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0xC8", - "green" : "0xC6", - "red" : "0xC6" + "blue" : "0x3A", + "green" : "0x26", + "red" : "0xCB" } }, "idiom" : "universal" @@ -23,9 +23,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0x3A", - "green" : "0x38", - "red" : "0x38" + "blue" : "0x63", + "green" : "0x4E", + "red" : "0xFF" } }, "idiom" : "universal" diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Status/statusGood.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Status/statusGood.colorset/Contents.json new file mode 100644 index 0000000000..c43135b0ba --- /dev/null +++ b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Status/statusGood.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xDC", + "green" : "0x5D", + "red" : "0x17" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xFF", + "green" : "0xAB", + "red" : "0x65" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Status/statusStrong.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Status/statusStrong.colorset/Contents.json new file mode 100644 index 0000000000..6fe6efa725 --- /dev/null +++ b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Status/statusStrong.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x18", + "green" : "0x80", + "red" : "0x0C" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x78", + "green" : "0xF1", + "red" : "0x6B" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Status/statusWeak1.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Status/statusWeak1.colorset/Contents.json new file mode 100644 index 0000000000..8803242ea5 --- /dev/null +++ b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Status/statusWeak1.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x3A", + "green" : "0x26", + "red" : "0xCB" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x63", + "green" : "0x4E", + "red" : "0xFF" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/TextColors/textPrimaryInverted.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Status/statusWeak2.colorset/Contents.json similarity index 84% rename from BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/TextColors/textPrimaryInverted.colorset/Contents.json rename to BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Status/statusWeak2.colorset/Contents.json index 9c0e331e97..0769b9fdf9 100644 --- a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/TextColors/textPrimaryInverted.colorset/Contents.json +++ b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Status/statusWeak2.colorset/Contents.json @@ -5,9 +5,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0xFF", - "green" : "0xFF", - "red" : "0xFF" + "blue" : "0x00", + "green" : "0x58", + "red" : "0xAC" } }, "idiom" : "universal" @@ -24,8 +24,8 @@ "components" : { "alpha" : "1.000", "blue" : "0x00", - "green" : "0x00", - "red" : "0x00" + "green" : "0xBF", + "red" : "0xFF" } }, "idiom" : "universal" diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Loading/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Stroke/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Loading/Contents.json rename to BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Stroke/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Stroke/strokeBorder.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Stroke/strokeBorder.colorset/Contents.json new file mode 100644 index 0000000000..c43135b0ba --- /dev/null +++ b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Stroke/strokeBorder.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xDC", + "green" : "0x5D", + "red" : "0x17" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xFF", + "green" : "0xAB", + "red" : "0x65" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Stroke/strokeDivider.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Stroke/strokeDivider.colorset/Contents.json new file mode 100644 index 0000000000..16c7f67775 --- /dev/null +++ b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Stroke/strokeDivider.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xE3", + "green" : "0xD9", + "red" : "0xD3" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x6A", + "green" : "0x5B", + "red" : "0x52" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Material/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Text/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Material/Contents.json rename to BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Text/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Text/textCodeBlue.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Text/textCodeBlue.colorset/Contents.json new file mode 100644 index 0000000000..c43135b0ba --- /dev/null +++ b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Text/textCodeBlue.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xDC", + "green" : "0x5D", + "red" : "0x17" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xFF", + "green" : "0xAB", + "red" : "0x65" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Text/textCodePink.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Text/textCodePink.colorset/Contents.json new file mode 100644 index 0000000000..9e59974de7 --- /dev/null +++ b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Text/textCodePink.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x76", + "green" : "0x11", + "red" : "0xC0" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xD0", + "green" : "0x8F", + "red" : "0xFF" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Text/textInteraction.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Text/textInteraction.colorset/Contents.json new file mode 100644 index 0000000000..c43135b0ba --- /dev/null +++ b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Text/textInteraction.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xDC", + "green" : "0x5D", + "red" : "0x17" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xFF", + "green" : "0xAB", + "red" : "0x65" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Text/textPrimary.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Text/textPrimary.colorset/Contents.json new file mode 100644 index 0000000000..6722f5a461 --- /dev/null +++ b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Text/textPrimary.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x29", + "green" : "0x20", + "red" : "0x1B" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xF9", + "green" : "0xF6", + "red" : "0xF3" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Text/textReversed.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Text/textReversed.colorset/Contents.json new file mode 100644 index 0000000000..66897a24b1 --- /dev/null +++ b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Text/textReversed.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xFF", + "green" : "0xFF", + "red" : "0xFF" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x27", + "green" : "0x1A", + "red" : "0x12" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Text/textSecondary.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Text/textSecondary.colorset/Contents.json new file mode 100644 index 0000000000..83aab1133f --- /dev/null +++ b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Text/textSecondary.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x91", + "green" : "0x6D", + "red" : "0x5A" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xB5", + "green" : "0x98", + "red" : "0x88" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/TextColors/textSecondary.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/TextColors/textSecondary.colorset/Contents.json deleted file mode 100644 index 24d34c1ed2..0000000000 --- a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/TextColors/textSecondary.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "1.000", - "blue" : "0x59", - "green" : "0x50", - "red" : "0x50" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "0.600", - "blue" : "0xF5", - "green" : "0xEB", - "red" : "0xEB" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/TextColors/textTertiary.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/TextColors/textTertiary.colorset/Contents.json deleted file mode 100644 index 4488fcfb98..0000000000 --- a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/TextColors/textTertiary.colorset/Contents.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "colors" : [ - { - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "0.30", - "blue" : "0x43", - "green" : "0x3C", - "red" : "0x3C" - } - }, - "idiom" : "universal" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "color" : { - "color-space" : "srgb", - "components" : { - "alpha" : "0.30", - "blue" : "0xF5", - "green" : "0xEB", - "red" : "0xEB" - } - }, - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/SeparatorColors/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Tint/Contents.json similarity index 100% rename from BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/SeparatorColors/Contents.json rename to BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Tint/Contents.json diff --git a/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Tint/tintPrimary.colorset/Contents.json b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Tint/tintPrimary.colorset/Contents.json new file mode 100644 index 0000000000..c43135b0ba --- /dev/null +++ b/BitwardenShared/UI/Platform/Application/Support/Colors.xcassets/Tint/tintPrimary.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xDC", + "green" : "0x5D", + "red" : "0x17" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xFF", + "green" : "0xAB", + "red" : "0x65" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/BitwardenShared/UI/Platform/Application/Utilities/Alert/Alert/Alert.swift b/BitwardenShared/UI/Platform/Application/Utilities/Alert/Alert/Alert.swift index 7fbbe6eb9d..6bb262584b 100644 --- a/BitwardenShared/UI/Platform/Application/Utilities/Alert/Alert/Alert.swift +++ b/BitwardenShared/UI/Platform/Application/Utilities/Alert/Alert/Alert.swift @@ -104,7 +104,7 @@ public class Alert { alertTextFields.forEach { alertTextField in alert.addTextField { textField in textField.placeholder = alertTextField.placeholder - textField.tintColor = Asset.Colors.primaryBitwarden.color + textField.tintColor = Asset.Colors.tintPrimary.color textField.keyboardType = alertTextField.keyboardType textField.isSecureTextEntry = alertTextField.isSecureTextEntry textField.autocapitalizationType = alertTextField.autocapitalizationType @@ -131,7 +131,7 @@ public class Alert { alert.preferredAction = action } } - alert.view.tintColor = Asset.Colors.primaryBitwarden.color + alert.view.tintColor = Asset.Colors.tintPrimary.color return alert } diff --git a/BitwardenShared/UI/Platform/Application/Views/BitwardenDatePicker.swift b/BitwardenShared/UI/Platform/Application/Views/BitwardenDatePicker.swift index f4f197713c..e15a983527 100644 --- a/BitwardenShared/UI/Platform/Application/Views/BitwardenDatePicker.swift +++ b/BitwardenShared/UI/Platform/Application/Views/BitwardenDatePicker.swift @@ -87,8 +87,8 @@ struct BitwardenDatePicker: View { .styleGuide(.subheadline) .frame(maxWidth: .infinity) .padding(8) - .background(Asset.Colors.fillTertiary.swiftUIColor) - .foregroundStyle(Asset.Colors.primaryBitwarden.swiftUIColor) + .background(Asset.Colors.Legacy.fillTertiary.swiftUIColor) + .foregroundStyle(Asset.Colors.textInteraction.swiftUIColor) .clipShape(Capsule()) // Turn off hit testing here so that the DatePicker above receives all user interaction. .allowsHitTesting(false) diff --git a/BitwardenShared/UI/Platform/Application/Views/BitwardenField.swift b/BitwardenShared/UI/Platform/Application/Views/BitwardenField.swift index f59b63bf72..72ad245bd7 100644 --- a/BitwardenShared/UI/Platform/Application/Views/BitwardenField.swift +++ b/BitwardenShared/UI/Platform/Application/Views/BitwardenField.swift @@ -45,7 +45,7 @@ struct BitwardenField: View where Content: View, Acce .frame(maxWidth: .infinity, minHeight: 28, alignment: .leading) .padding(.horizontal, 16) .padding(.vertical, verticalPadding) - .background(Asset.Colors.backgroundPrimary.swiftUIColor) + .background(Asset.Colors.backgroundSecondary.swiftUIColor) .clipShape(RoundedRectangle(cornerRadius: 10)) if let accessoryContent { diff --git a/BitwardenShared/UI/Platform/Application/Views/BitwardenMultilineTextField.swift b/BitwardenShared/UI/Platform/Application/Views/BitwardenMultilineTextField.swift index f74ec86edc..86099979d2 100644 --- a/BitwardenShared/UI/Platform/Application/Views/BitwardenMultilineTextField.swift +++ b/BitwardenShared/UI/Platform/Application/Views/BitwardenMultilineTextField.swift @@ -39,7 +39,7 @@ struct BitwardenMultilineTextField: View { .styleGuide(.body, includeLineSpacing: false) .accessibilityIdentifier(accessibilityIdentifier ?? "") .foregroundStyle(Asset.Colors.textPrimary.swiftUIColor) - .tint(Asset.Colors.primaryBitwarden.swiftUIColor) + .tint(Asset.Colors.tintPrimary.swiftUIColor) .scrollDisabled(true) } else { TextEditor( @@ -48,7 +48,7 @@ struct BitwardenMultilineTextField: View { .styleGuide(.body, includeLineSpacing: false) .accessibilityIdentifier(accessibilityIdentifier ?? "") .foregroundStyle(Asset.Colors.textPrimary.swiftUIColor) - .tint(Asset.Colors.primaryBitwarden.swiftUIColor) + .tint(Asset.Colors.tintPrimary.swiftUIColor) } } } diff --git a/BitwardenShared/UI/Platform/Application/Views/BitwardenTextField.swift b/BitwardenShared/UI/Platform/Application/Views/BitwardenTextField.swift index b1a6d0b10f..b94b76dd40 100644 --- a/BitwardenShared/UI/Platform/Application/Views/BitwardenTextField.swift +++ b/BitwardenShared/UI/Platform/Application/Views/BitwardenTextField.swift @@ -118,13 +118,13 @@ struct BitwardenTextField: View { text = "" } label: { Asset.Images.cancelRound.swiftUIImage - .foregroundColor(Asset.Colors.primaryBitwarden.swiftUIColor) + .foregroundColor(Asset.Colors.iconSecondary.swiftUIColor) .frame(width: 14, height: 14) } .padding(.vertical, 5) .hidden(text.isEmpty || !isFocused) } - .tint(Asset.Colors.primaryBitwarden.swiftUIColor) + .tint(Asset.Colors.tintPrimary.swiftUIColor) .onAppear { isSecureFieldFocused = isPasswordAutoFocused } diff --git a/BitwardenShared/UI/Platform/Application/Views/EmptyContentView.swift b/BitwardenShared/UI/Platform/Application/Views/EmptyContentView.swift index 922e6c4110..1c57c8974d 100644 --- a/BitwardenShared/UI/Platform/Application/Views/EmptyContentView.swift +++ b/BitwardenShared/UI/Platform/Application/Views/EmptyContentView.swift @@ -90,7 +90,7 @@ struct EmptyContentView: View { Label { Text(Localizations.addItem) } icon: { Asset.Images.plus.swiftUIImage .imageStyle(.accessoryIcon( - color: Asset.Colors.textPrimaryInverted.swiftUIColor, + color: Asset.Colors.buttonFilledForeground.swiftUIColor, scaleWithFont: true )) } diff --git a/BitwardenShared/UI/Platform/Application/Views/EmptyContentViewTests.swift b/BitwardenShared/UI/Platform/Application/Views/EmptyContentViewTests.swift index 2c13e4d99b..bca197ec05 100644 --- a/BitwardenShared/UI/Platform/Application/Views/EmptyContentViewTests.swift +++ b/BitwardenShared/UI/Platform/Application/Views/EmptyContentViewTests.swift @@ -19,7 +19,7 @@ final class EmptyContentViewTests: BitwardenTestCase { Label { Text(Localizations.addItem) } icon: { Asset.Images.plus.swiftUIImage .imageStyle(.accessoryIcon( - color: Asset.Colors.textPrimaryInverted.swiftUIColor, + color: Asset.Colors.buttonFilledForeground.swiftUIColor, scaleWithFont: true )) } diff --git a/BitwardenShared/UI/Platform/Application/Views/FormFields/SliderFieldView.swift b/BitwardenShared/UI/Platform/Application/Views/FormFields/SliderFieldView.swift index 6aabd94ca7..13b8b2100c 100644 --- a/BitwardenShared/UI/Platform/Application/Views/FormFields/SliderFieldView.swift +++ b/BitwardenShared/UI/Platform/Application/Views/FormFields/SliderFieldView.swift @@ -77,7 +77,7 @@ struct SliderFieldView: View { step: field.step, onEditingChanged: onEditingChanged ) - .tint(Asset.Colors.primaryBitwarden.swiftUIColor) + .tint(Asset.Colors.tintPrimary.swiftUIColor) .accessibilityLabel(field.title) .accessibilityIdentifier(field.sliderAccessibilityId ?? field.title) .apply { view in @@ -97,7 +97,7 @@ struct SliderFieldView: View { } .padding(.horizontal, 16) .padding(.vertical, 8) - .background(Asset.Colors.backgroundPrimary.swiftUIColor) + .background(Asset.Colors.backgroundSecondary.swiftUIColor) .cornerRadius(10) } diff --git a/BitwardenShared/UI/Platform/Application/Views/InfoContainer.swift b/BitwardenShared/UI/Platform/Application/Views/InfoContainer.swift index c9f84e8066..3c4173b6a1 100644 --- a/BitwardenShared/UI/Platform/Application/Views/InfoContainer.swift +++ b/BitwardenShared/UI/Platform/Application/Views/InfoContainer.swift @@ -35,7 +35,7 @@ struct InfoContainer: View { .padding(16) .overlay { RoundedRectangle(cornerRadius: 4) - .strokeBorder(Asset.Colors.primaryBitwarden.swiftUIColor) + .strokeBorder(Asset.Colors.strokeBorder.swiftUIColor) } } diff --git a/BitwardenShared/UI/Platform/Application/Views/LoadingOverlayView.swift b/BitwardenShared/UI/Platform/Application/Views/LoadingOverlayView.swift index 8dff019075..3ebdc4a2af 100644 --- a/BitwardenShared/UI/Platform/Application/Views/LoadingOverlayView.swift +++ b/BitwardenShared/UI/Platform/Application/Views/LoadingOverlayView.swift @@ -21,8 +21,8 @@ struct LoadingOverlayView: View { .frame(width: 270, alignment: .center) .background( ZStack { - Asset.Colors.materialRegularBase.swiftUIColor - Asset.Colors.materialRegularBlend.swiftUIColor + Asset.Colors.Legacy.materialRegularBase.swiftUIColor + Asset.Colors.Legacy.materialRegularBlend.swiftUIColor .blendMode(colorScheme == .light ? .colorDodge : .overlay) } .compositingGroup() @@ -30,7 +30,7 @@ struct LoadingOverlayView: View { .cornerRadius(14) .controlSize(.large) .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .center) - .background(Asset.Colors.backgroundDimmed.swiftUIColor.ignoresSafeArea()) + .background(Asset.Colors.Legacy.backgroundDimmed.swiftUIColor.ignoresSafeArea()) } } diff --git a/BitwardenShared/UI/Platform/Application/Views/PasswordStrengthIndicator.swift b/BitwardenShared/UI/Platform/Application/Views/PasswordStrengthIndicator.swift index 47453de998..9014179848 100644 --- a/BitwardenShared/UI/Platform/Application/Views/PasswordStrengthIndicator.swift +++ b/BitwardenShared/UI/Platform/Application/Views/PasswordStrengthIndicator.swift @@ -26,7 +26,7 @@ struct PasswordStrengthIndicator: View { GeometryReader { geometry in ZStack(alignment: .leading) { RoundedRectangle(cornerRadius: 2) - .fill(Color(asset: Asset.Colors.separatorOpaque)) + .fill(Color(asset: Asset.Colors.strokeDivider)) RoundedRectangle(cornerRadius: 2) .fill(Color(asset: passwordStrength.color)) @@ -41,22 +41,18 @@ struct PasswordStrengthIndicator: View { HStack(spacing: 4) { if passwordTextCount >= requiredTextCount { Image(asset: Asset.Images.check) - .foregroundColor(Color(asset: Asset.Colors.loadingGreen)) + .foregroundColor(Asset.Colors.textSecondary.swiftUIColor) .frame(width: 10, height: 10) .padding(.leading, 1) } else { Circle() - .stroke(Color(.separatorOpaque), lineWidth: 2) + .stroke(Asset.Colors.iconPrimary.swiftUIColor, lineWidth: 2) .frame(width: 10, height: 10) .padding(.leading, 1) } Text(Localizations.xCharacters(requiredTextCount)) - .foregroundColor( - passwordTextCount >= requiredTextCount ? - Color(asset: Asset.Colors.loadingGreen) : - Color(asset: Asset.Colors.separatorOpaque) - ) + .foregroundColor(Asset.Colors.textSecondary.swiftUIColor) .styleGuide(.footnote, weight: .bold) .dynamicTypeSize(...DynamicTypeSize.accessibility3) } @@ -129,21 +125,21 @@ extension PasswordStrengthIndicator { init(score: UInt8?) { switch score { case 0, 1: - color = Asset.Colors.loadingRed + color = Asset.Colors.statusWeak1 text = Localizations.weak case 2: - color = Asset.Colors.loadingOrange + color = Asset.Colors.statusWeak2 text = Localizations.weak case 3: - color = Asset.Colors.loadingBlue + color = Asset.Colors.statusGood text = Localizations.good case 4: - color = Asset.Colors.loadingGreen + color = Asset.Colors.statusStrong text = Localizations.strong default: // Provide the initial color when not visible so the color isn't animated when the // first segment appears. - color = Asset.Colors.loadingRed + color = Asset.Colors.statusWeak1 text = nil } diff --git a/BitwardenShared/UI/Platform/Application/Views/PasswordStrengthIndicatorTests.swift b/BitwardenShared/UI/Platform/Application/Views/PasswordStrengthIndicatorTests.swift index ddc48a2bcd..ebc0e5e730 100644 --- a/BitwardenShared/UI/Platform/Application/Views/PasswordStrengthIndicatorTests.swift +++ b/BitwardenShared/UI/Platform/Application/Views/PasswordStrengthIndicatorTests.swift @@ -12,7 +12,7 @@ class PasswordStrengthIndicatorTests: BitwardenTestCase { let view = PasswordStrengthIndicator( passwordStrengthScore: 0 ) - XCTAssertEqual(view.passwordStrength.color.swiftUIColor, Asset.Colors.loadingRed.swiftUIColor) + XCTAssertEqual(view.passwordStrength.color.swiftUIColor, Asset.Colors.statusWeak1.swiftUIColor) XCTAssertEqual(view.passwordStrength.text, "Weak") XCTAssertEqual(view.passwordStrength.strengthPercent, 0.2) } @@ -22,7 +22,7 @@ class PasswordStrengthIndicatorTests: BitwardenTestCase { let view = PasswordStrengthIndicator( passwordStrengthScore: 1 ) - XCTAssertEqual(view.passwordStrength.color.swiftUIColor, Asset.Colors.loadingRed.swiftUIColor) + XCTAssertEqual(view.passwordStrength.color.swiftUIColor, Asset.Colors.statusWeak1.swiftUIColor) XCTAssertEqual(view.passwordStrength.text, "Weak") XCTAssertEqual(view.passwordStrength.strengthPercent, 0.4) } @@ -32,7 +32,7 @@ class PasswordStrengthIndicatorTests: BitwardenTestCase { let view = PasswordStrengthIndicator( passwordStrengthScore: 2 ) - XCTAssertEqual(view.passwordStrength.color.swiftUIColor, Asset.Colors.loadingOrange.swiftUIColor) + XCTAssertEqual(view.passwordStrength.color.swiftUIColor, Asset.Colors.statusWeak2.swiftUIColor) XCTAssertEqual(view.passwordStrength.text, "Weak") XCTAssertEqual(view.passwordStrength.strengthPercent, 0.6) } @@ -42,7 +42,7 @@ class PasswordStrengthIndicatorTests: BitwardenTestCase { let view = PasswordStrengthIndicator( passwordStrengthScore: 3 ) - XCTAssertEqual(view.passwordStrength.color.swiftUIColor, Asset.Colors.loadingBlue.swiftUIColor) + XCTAssertEqual(view.passwordStrength.color.swiftUIColor, Asset.Colors.statusGood.swiftUIColor) XCTAssertEqual(view.passwordStrength.text, "Good") XCTAssertEqual(view.passwordStrength.strengthPercent, 0.8) } @@ -52,7 +52,7 @@ class PasswordStrengthIndicatorTests: BitwardenTestCase { let view = PasswordStrengthIndicator( passwordStrengthScore: 4 ) - XCTAssertEqual(view.passwordStrength.color.swiftUIColor, Asset.Colors.loadingGreen.swiftUIColor) + XCTAssertEqual(view.passwordStrength.color.swiftUIColor, Asset.Colors.statusStrong.swiftUIColor) XCTAssertEqual(view.passwordStrength.text, "Strong") XCTAssertEqual(view.passwordStrength.strengthPercent, 1) } @@ -62,7 +62,7 @@ class PasswordStrengthIndicatorTests: BitwardenTestCase { let view = PasswordStrengthIndicator( passwordStrengthScore: 8 ) - XCTAssertEqual(view.passwordStrength.color.swiftUIColor, Asset.Colors.loadingRed.swiftUIColor) + XCTAssertEqual(view.passwordStrength.color.swiftUIColor, Asset.Colors.statusWeak1.swiftUIColor) XCTAssertNil(view.passwordStrength.text) XCTAssertEqual(view.passwordStrength.strengthPercent, 0) } @@ -72,7 +72,7 @@ class PasswordStrengthIndicatorTests: BitwardenTestCase { let view = PasswordStrengthIndicator( passwordStrengthScore: nil ) - XCTAssertEqual(view.passwordStrength.color.swiftUIColor, Asset.Colors.loadingRed.swiftUIColor) + XCTAssertEqual(view.passwordStrength.color.swiftUIColor, Asset.Colors.statusWeak1.swiftUIColor) XCTAssertNil(view.passwordStrength.text) XCTAssertEqual(view.passwordStrength.strengthPercent, 0) } diff --git a/BitwardenShared/UI/Platform/Application/Views/PasswordText.swift b/BitwardenShared/UI/Platform/Application/Views/PasswordText.swift index b6ae59fdfb..56f6aa46aa 100644 --- a/BitwardenShared/UI/Platform/Application/Views/PasswordText.swift +++ b/BitwardenShared/UI/Platform/Application/Views/PasswordText.swift @@ -27,8 +27,8 @@ struct PasswordText: View { /// /// The following foreground color is applied to each character: /// - Letters: `textPrimary` - /// - Numbers: `primaryBitwarden` - /// - Symbols: `fingerprint` + /// - Numbers: `textCodeBlue` + /// - Symbols: `textCodePink` /// /// - Parameter value: The value to color code. /// - Returns: A color-coded `Text` view containing the provided string. @@ -38,9 +38,9 @@ struct PasswordText: View { password.reduce(Text("")) { text, character in let foregroundColor: Color = { if character.isNumber { - return Asset.Colors.primaryBitwarden.swiftUIColor + return Asset.Colors.textCodeBlue.swiftUIColor } else if character.isSymbol || character.isPunctuation { - return Asset.Colors.fingerprint.swiftUIColor + return Asset.Colors.textCodePink.swiftUIColor } else { return Asset.Colors.textPrimary.swiftUIColor } diff --git a/BitwardenShared/UI/Platform/Application/Views/RegionSelector.swift b/BitwardenShared/UI/Platform/Application/Views/RegionSelector.swift index 17b990ea2a..06ff36b89d 100644 --- a/BitwardenShared/UI/Platform/Application/Views/RegionSelector.swift +++ b/BitwardenShared/UI/Platform/Application/Views/RegionSelector.swift @@ -27,13 +27,13 @@ struct RegionSelector: View { Text("\(selectorLabel): ") .foregroundColor(Asset.Colors.textSecondary.swiftUIColor) + Text(regionName).bold() - .foregroundColor(Asset.Colors.primaryBitwarden.swiftUIColor) + .foregroundColor(Asset.Colors.textInteraction.swiftUIColor) } .styleGuide(.footnote) Image(decorative: Asset.Images.downAngle) .scaledFrame(width: 12, height: 12) - .foregroundColor(Asset.Colors.primaryBitwarden.swiftUIColor) + .foregroundColor(Asset.Colors.iconSecondary.swiftUIColor) } } .accessibilityIdentifier("RegionSelectorDropdown") diff --git a/BitwardenShared/UI/Platform/Application/Views/SearchNoResultsView.swift b/BitwardenShared/UI/Platform/Application/Views/SearchNoResultsView.swift index ac3525737e..e4b10957ff 100644 --- a/BitwardenShared/UI/Platform/Application/Views/SearchNoResultsView.swift +++ b/BitwardenShared/UI/Platform/Application/Views/SearchNoResultsView.swift @@ -37,7 +37,7 @@ struct SearchNoResultsView: View { } } } - .background(Color(asset: Asset.Colors.backgroundSecondary)) + .background(Color(asset: Asset.Colors.backgroundPrimary)) } // MARK: Initialization diff --git a/BitwardenShared/UI/Platform/Application/Views/SectionView.swift b/BitwardenShared/UI/Platform/Application/Views/SectionView.swift index 286dd012a5..00f63a5f7b 100644 --- a/BitwardenShared/UI/Platform/Application/Views/SectionView.swift +++ b/BitwardenShared/UI/Platform/Application/Views/SectionView.swift @@ -66,7 +66,7 @@ struct SectionView_Previews: PreviewProvider { } } .padding(16) - .background(Asset.Colors.backgroundSecondary.swiftUIColor) + .background(Asset.Colors.backgroundPrimary.swiftUIColor) } } #endif diff --git a/BitwardenShared/UI/Platform/Application/Views/SettingsMenuField.swift b/BitwardenShared/UI/Platform/Application/Views/SettingsMenuField.swift index b68585e385..41e63cabc8 100644 --- a/BitwardenShared/UI/Platform/Application/Views/SettingsMenuField.swift +++ b/BitwardenShared/UI/Platform/Application/Views/SettingsMenuField.swift @@ -70,7 +70,7 @@ struct SettingsMenuField: View where T: Menuable { .padding(.leading, 16) } } - .background(Asset.Colors.backgroundPrimary.swiftUIColor) + .background(Asset.Colors.backgroundSecondary.swiftUIColor) } /// Initializes a new `SettingsMenuField`. diff --git a/BitwardenShared/UI/Platform/Application/Views/SettingsPickerField.swift b/BitwardenShared/UI/Platform/Application/Views/SettingsPickerField.swift index 43de074253..33ffd90f08 100644 --- a/BitwardenShared/UI/Platform/Application/Views/SettingsPickerField.swift +++ b/BitwardenShared/UI/Platform/Application/Views/SettingsPickerField.swift @@ -68,7 +68,7 @@ struct SettingsPickerField: View { } } } - .background(Asset.Colors.backgroundPrimary.swiftUIColor) + .background(Asset.Colors.backgroundSecondary.swiftUIColor) } // MARK: Initialization diff --git a/BitwardenShared/UI/Platform/Application/Views/ToastView.swift b/BitwardenShared/UI/Platform/Application/Views/ToastView.swift index 97a128301a..af5a961327 100644 --- a/BitwardenShared/UI/Platform/Application/Views/ToastView.swift +++ b/BitwardenShared/UI/Platform/Application/Views/ToastView.swift @@ -33,9 +33,9 @@ struct ToastView: View { .dynamicTypeSize(...DynamicTypeSize.accessibility2) .id(toast.id) .padding(14) - .foregroundColor(Asset.Colors.textPrimaryInverted.swiftUIColor) + .foregroundColor(Asset.Colors.textReversed.swiftUIColor) .frame(minWidth: 300, minHeight: 46) - .background(Asset.Colors.primaryBitwarden.swiftUIColor) + .background(Asset.Colors.backgroundAlert.swiftUIColor) .clipShape(RoundedRectangle(cornerRadius: 24)) .accessibilityElement(children: .combine) .padding(.horizontal, 16) @@ -79,7 +79,7 @@ struct ToastView_Previews: PreviewProvider { .previewDisplayName("Toast View") NavigationView { - Asset.Colors.backgroundPrimary.swiftUIColor + Asset.Colors.backgroundSecondary.swiftUIColor .toast(.constant(Toast(text: "Taos, NM!"))) } .previewDisplayName("Overlay") diff --git a/BitwardenShared/UI/Platform/Application/Views/__Snapshots__/EmptyContentViewTests/test_snapshot_emptyContentView.1.png b/BitwardenShared/UI/Platform/Application/Views/__Snapshots__/EmptyContentViewTests/test_snapshot_emptyContentView.1.png index a4bf3e361f..ba46a88a7a 100644 Binary files a/BitwardenShared/UI/Platform/Application/Views/__Snapshots__/EmptyContentViewTests/test_snapshot_emptyContentView.1.png and b/BitwardenShared/UI/Platform/Application/Views/__Snapshots__/EmptyContentViewTests/test_snapshot_emptyContentView.1.png differ diff --git a/BitwardenShared/UI/Platform/Application/Views/__Snapshots__/EmptyContentViewTests/test_snapshot_emptyContentView.2.png b/BitwardenShared/UI/Platform/Application/Views/__Snapshots__/EmptyContentViewTests/test_snapshot_emptyContentView.2.png index 6535095218..b89a40339e 100644 Binary files a/BitwardenShared/UI/Platform/Application/Views/__Snapshots__/EmptyContentViewTests/test_snapshot_emptyContentView.2.png and b/BitwardenShared/UI/Platform/Application/Views/__Snapshots__/EmptyContentViewTests/test_snapshot_emptyContentView.2.png differ diff --git a/BitwardenShared/UI/Platform/Application/Views/__Snapshots__/EmptyContentViewTests/test_snapshot_emptyContentView.3.png b/BitwardenShared/UI/Platform/Application/Views/__Snapshots__/EmptyContentViewTests/test_snapshot_emptyContentView.3.png index 79c1bbcfbb..28b37f65f9 100644 Binary files a/BitwardenShared/UI/Platform/Application/Views/__Snapshots__/EmptyContentViewTests/test_snapshot_emptyContentView.3.png and b/BitwardenShared/UI/Platform/Application/Views/__Snapshots__/EmptyContentViewTests/test_snapshot_emptyContentView.3.png differ diff --git a/BitwardenShared/UI/Platform/Application/Views/__Snapshots__/LoadingOverlayViewTests/test_snapshot_loadingOverlay.1.png b/BitwardenShared/UI/Platform/Application/Views/__Snapshots__/LoadingOverlayViewTests/test_snapshot_loadingOverlay.1.png index 3b11889b7b..5adca35703 100644 Binary files a/BitwardenShared/UI/Platform/Application/Views/__Snapshots__/LoadingOverlayViewTests/test_snapshot_loadingOverlay.1.png and b/BitwardenShared/UI/Platform/Application/Views/__Snapshots__/LoadingOverlayViewTests/test_snapshot_loadingOverlay.1.png differ diff --git a/BitwardenShared/UI/Platform/Application/Views/__Snapshots__/PasswordStrengthIndicatorTests/test_snapshot_passwordStrengthIndicator.1.png b/BitwardenShared/UI/Platform/Application/Views/__Snapshots__/PasswordStrengthIndicatorTests/test_snapshot_passwordStrengthIndicator.1.png index 572faa0423..32d5136917 100644 Binary files a/BitwardenShared/UI/Platform/Application/Views/__Snapshots__/PasswordStrengthIndicatorTests/test_snapshot_passwordStrengthIndicator.1.png and b/BitwardenShared/UI/Platform/Application/Views/__Snapshots__/PasswordStrengthIndicatorTests/test_snapshot_passwordStrengthIndicator.1.png differ diff --git a/BitwardenShared/UI/Platform/Application/Views/__Snapshots__/PasswordStrengthIndicatorTests/test_snapshot_passwordStrengthIndicator.2.png b/BitwardenShared/UI/Platform/Application/Views/__Snapshots__/PasswordStrengthIndicatorTests/test_snapshot_passwordStrengthIndicator.2.png index 4b1f9e0686..9c7b8eabcf 100644 Binary files a/BitwardenShared/UI/Platform/Application/Views/__Snapshots__/PasswordStrengthIndicatorTests/test_snapshot_passwordStrengthIndicator.2.png and b/BitwardenShared/UI/Platform/Application/Views/__Snapshots__/PasswordStrengthIndicatorTests/test_snapshot_passwordStrengthIndicator.2.png differ diff --git a/BitwardenShared/UI/Platform/Application/Views/__Snapshots__/SectionViewTests/test_snapshot_sectionView.1.png b/BitwardenShared/UI/Platform/Application/Views/__Snapshots__/SectionViewTests/test_snapshot_sectionView.1.png index f0261bd6b5..d1d5e43353 100644 Binary files a/BitwardenShared/UI/Platform/Application/Views/__Snapshots__/SectionViewTests/test_snapshot_sectionView.1.png and b/BitwardenShared/UI/Platform/Application/Views/__Snapshots__/SectionViewTests/test_snapshot_sectionView.1.png differ diff --git a/BitwardenShared/UI/Platform/Application/Views/__Snapshots__/ToastViewTests/test_snapshot_toastView_previews.2.png b/BitwardenShared/UI/Platform/Application/Views/__Snapshots__/ToastViewTests/test_snapshot_toastView_previews.2.png index 2fe94a62c6..74a8a736d9 100644 Binary files a/BitwardenShared/UI/Platform/Application/Views/__Snapshots__/ToastViewTests/test_snapshot_toastView_previews.2.png and b/BitwardenShared/UI/Platform/Application/Views/__Snapshots__/ToastViewTests/test_snapshot_toastView_previews.2.png differ diff --git a/BitwardenShared/UI/Platform/Application/Views/__Snapshots__/ToastViewTests/test_snapshot_toastView_previews.5.png b/BitwardenShared/UI/Platform/Application/Views/__Snapshots__/ToastViewTests/test_snapshot_toastView_previews.5.png index 95a54f86bb..29bf74850d 100644 Binary files a/BitwardenShared/UI/Platform/Application/Views/__Snapshots__/ToastViewTests/test_snapshot_toastView_previews.5.png and b/BitwardenShared/UI/Platform/Application/Views/__Snapshots__/ToastViewTests/test_snapshot_toastView_previews.5.png differ diff --git a/BitwardenShared/UI/Platform/DebugMenu/__Snapshots__/DebugMenuViewTests/test_snapshot_debugMenuWithFeatureFlags.1.png b/BitwardenShared/UI/Platform/DebugMenu/__Snapshots__/DebugMenuViewTests/test_snapshot_debugMenuWithFeatureFlags.1.png index e718d91ac2..8deb16742d 100644 Binary files a/BitwardenShared/UI/Platform/DebugMenu/__Snapshots__/DebugMenuViewTests/test_snapshot_debugMenuWithFeatureFlags.1.png and b/BitwardenShared/UI/Platform/DebugMenu/__Snapshots__/DebugMenuViewTests/test_snapshot_debugMenuWithFeatureFlags.1.png differ diff --git a/BitwardenShared/UI/Platform/ExtensionSetup/ExtensionActivation/ExtensionActivationView.swift b/BitwardenShared/UI/Platform/ExtensionSetup/ExtensionActivation/ExtensionActivationView.swift index d102b88454..5121788808 100644 --- a/BitwardenShared/UI/Platform/ExtensionSetup/ExtensionActivation/ExtensionActivationView.swift +++ b/BitwardenShared/UI/Platform/ExtensionSetup/ExtensionActivation/ExtensionActivationView.swift @@ -44,7 +44,7 @@ struct ExtensionActivationView: View { .padding(16) .overlay { RoundedRectangle(cornerRadius: 12) - .strokeBorder(Asset.Colors.separatorOpaque.swiftUIColor, lineWidth: 1.5) + .strokeBorder(Asset.Colors.strokeDivider.swiftUIColor, lineWidth: 1.5) } case .autofillExtension: Image(decorative: Asset.Images.check) diff --git a/BitwardenShared/UI/Platform/ExtensionSetup/ExtensionActivation/__Snapshots__/ExtensionActivationViewTests/test_snapshot_extensionActivationView_appExtension.1.png b/BitwardenShared/UI/Platform/ExtensionSetup/ExtensionActivation/__Snapshots__/ExtensionActivationViewTests/test_snapshot_extensionActivationView_appExtension.1.png index 69a960c8e5..00c65927ca 100644 Binary files a/BitwardenShared/UI/Platform/ExtensionSetup/ExtensionActivation/__Snapshots__/ExtensionActivationViewTests/test_snapshot_extensionActivationView_appExtension.1.png and b/BitwardenShared/UI/Platform/ExtensionSetup/ExtensionActivation/__Snapshots__/ExtensionActivationViewTests/test_snapshot_extensionActivationView_appExtension.1.png differ diff --git a/BitwardenShared/UI/Platform/ExtensionSetup/ExtensionActivation/__Snapshots__/ExtensionActivationViewTests/test_snapshot_extensionActivationView_appExtension.2.png b/BitwardenShared/UI/Platform/ExtensionSetup/ExtensionActivation/__Snapshots__/ExtensionActivationViewTests/test_snapshot_extensionActivationView_appExtension.2.png index e977f4c3e4..98d0f3315c 100644 Binary files a/BitwardenShared/UI/Platform/ExtensionSetup/ExtensionActivation/__Snapshots__/ExtensionActivationViewTests/test_snapshot_extensionActivationView_appExtension.2.png and b/BitwardenShared/UI/Platform/ExtensionSetup/ExtensionActivation/__Snapshots__/ExtensionActivationViewTests/test_snapshot_extensionActivationView_appExtension.2.png differ diff --git a/BitwardenShared/UI/Platform/ExtensionSetup/ExtensionActivation/__Snapshots__/ExtensionActivationViewTests/test_snapshot_extensionActivationView_appExtension.3.png b/BitwardenShared/UI/Platform/ExtensionSetup/ExtensionActivation/__Snapshots__/ExtensionActivationViewTests/test_snapshot_extensionActivationView_appExtension.3.png index 6ea4c60148..0425b3b9c2 100644 Binary files a/BitwardenShared/UI/Platform/ExtensionSetup/ExtensionActivation/__Snapshots__/ExtensionActivationViewTests/test_snapshot_extensionActivationView_appExtension.3.png and b/BitwardenShared/UI/Platform/ExtensionSetup/ExtensionActivation/__Snapshots__/ExtensionActivationViewTests/test_snapshot_extensionActivationView_appExtension.3.png differ diff --git a/BitwardenShared/UI/Platform/ExtensionSetup/ExtensionActivation/__Snapshots__/ExtensionActivationViewTests/test_snapshot_extensionActivationView_autofillExtension.1.png b/BitwardenShared/UI/Platform/ExtensionSetup/ExtensionActivation/__Snapshots__/ExtensionActivationViewTests/test_snapshot_extensionActivationView_autofillExtension.1.png index b5f7fda244..e370c1abc0 100644 Binary files a/BitwardenShared/UI/Platform/ExtensionSetup/ExtensionActivation/__Snapshots__/ExtensionActivationViewTests/test_snapshot_extensionActivationView_autofillExtension.1.png and b/BitwardenShared/UI/Platform/ExtensionSetup/ExtensionActivation/__Snapshots__/ExtensionActivationViewTests/test_snapshot_extensionActivationView_autofillExtension.1.png differ diff --git a/BitwardenShared/UI/Platform/ExtensionSetup/ExtensionActivation/__Snapshots__/ExtensionActivationViewTests/test_snapshot_extensionActivationView_autofillExtension.2.png b/BitwardenShared/UI/Platform/ExtensionSetup/ExtensionActivation/__Snapshots__/ExtensionActivationViewTests/test_snapshot_extensionActivationView_autofillExtension.2.png index 96fdfded98..9188bd264f 100644 Binary files a/BitwardenShared/UI/Platform/ExtensionSetup/ExtensionActivation/__Snapshots__/ExtensionActivationViewTests/test_snapshot_extensionActivationView_autofillExtension.2.png and b/BitwardenShared/UI/Platform/ExtensionSetup/ExtensionActivation/__Snapshots__/ExtensionActivationViewTests/test_snapshot_extensionActivationView_autofillExtension.2.png differ diff --git a/BitwardenShared/UI/Platform/ExtensionSetup/ExtensionActivation/__Snapshots__/ExtensionActivationViewTests/test_snapshot_extensionActivationView_autofillExtension.3.png b/BitwardenShared/UI/Platform/ExtensionSetup/ExtensionActivation/__Snapshots__/ExtensionActivationViewTests/test_snapshot_extensionActivationView_autofillExtension.3.png index 3a99c6df7e..2230005b2e 100644 Binary files a/BitwardenShared/UI/Platform/ExtensionSetup/ExtensionActivation/__Snapshots__/ExtensionActivationViewTests/test_snapshot_extensionActivationView_autofillExtension.3.png and b/BitwardenShared/UI/Platform/ExtensionSetup/ExtensionActivation/__Snapshots__/ExtensionActivationViewTests/test_snapshot_extensionActivationView_autofillExtension.3.png differ diff --git a/BitwardenShared/UI/Platform/LoginRequest/LoginRequestView.swift b/BitwardenShared/UI/Platform/LoginRequest/LoginRequestView.swift index ac2abe5274..902b4ead5f 100644 --- a/BitwardenShared/UI/Platform/LoginRequest/LoginRequestView.swift +++ b/BitwardenShared/UI/Platform/LoginRequest/LoginRequestView.swift @@ -106,7 +106,7 @@ struct LoginRequestView: View { Text(store.state.request.fingerprintPhrase ?? "") .styleGuide(.bodyMonospaced) - .foregroundStyle(Asset.Colors.fingerprint.swiftUIColor) + .foregroundStyle(Asset.Colors.textCodePink.swiftUIColor) .multilineTextAlignment(.leading) .accessibilityIdentifier("FingerprintPhraseValue") } diff --git a/BitwardenShared/UI/Platform/LoginRequest/__Snapshots__/LoginRequestViewTests/test_snapshot_default.1.png b/BitwardenShared/UI/Platform/LoginRequest/__Snapshots__/LoginRequestViewTests/test_snapshot_default.1.png index afa87e39cc..f62a2420dc 100644 Binary files a/BitwardenShared/UI/Platform/LoginRequest/__Snapshots__/LoginRequestViewTests/test_snapshot_default.1.png and b/BitwardenShared/UI/Platform/LoginRequest/__Snapshots__/LoginRequestViewTests/test_snapshot_default.1.png differ diff --git a/BitwardenShared/UI/Platform/LoginRequest/__Snapshots__/LoginRequestViewTests/test_snapshot_default_dark.1.png b/BitwardenShared/UI/Platform/LoginRequest/__Snapshots__/LoginRequestViewTests/test_snapshot_default_dark.1.png index c42090d8a9..57683f116a 100644 Binary files a/BitwardenShared/UI/Platform/LoginRequest/__Snapshots__/LoginRequestViewTests/test_snapshot_default_dark.1.png and b/BitwardenShared/UI/Platform/LoginRequest/__Snapshots__/LoginRequestViewTests/test_snapshot_default_dark.1.png differ diff --git a/BitwardenShared/UI/Platform/LoginRequest/__Snapshots__/LoginRequestViewTests/test_snapshot_default_large.1.png b/BitwardenShared/UI/Platform/LoginRequest/__Snapshots__/LoginRequestViewTests/test_snapshot_default_large.1.png index 9df83ed02d..6a16c2ab6c 100644 Binary files a/BitwardenShared/UI/Platform/LoginRequest/__Snapshots__/LoginRequestViewTests/test_snapshot_default_large.1.png and b/BitwardenShared/UI/Platform/LoginRequest/__Snapshots__/LoginRequestViewTests/test_snapshot_default_large.1.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/About/__Snapshots__/AboutViewTests/test_snapshot_default.1.png b/BitwardenShared/UI/Platform/Settings/Settings/About/__Snapshots__/AboutViewTests/test_snapshot_default.1.png index 1071181e18..9f60accd01 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/About/__Snapshots__/AboutViewTests/test_snapshot_default.1.png and b/BitwardenShared/UI/Platform/Settings/Settings/About/__Snapshots__/AboutViewTests/test_snapshot_default.1.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/About/__Snapshots__/AboutViewTests/test_snapshot_default.2.png b/BitwardenShared/UI/Platform/Settings/Settings/About/__Snapshots__/AboutViewTests/test_snapshot_default.2.png index c064dbb37f..95293d3824 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/About/__Snapshots__/AboutViewTests/test_snapshot_default.2.png and b/BitwardenShared/UI/Platform/Settings/Settings/About/__Snapshots__/AboutViewTests/test_snapshot_default.2.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/About/__Snapshots__/AboutViewTests/test_snapshot_default.3.png b/BitwardenShared/UI/Platform/Settings/Settings/About/__Snapshots__/AboutViewTests/test_snapshot_default.3.png index e384c510a1..0d377fc050 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/About/__Snapshots__/AboutViewTests/test_snapshot_default.3.png and b/BitwardenShared/UI/Platform/Settings/Settings/About/__Snapshots__/AboutViewTests/test_snapshot_default.3.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/DeleteAccount/DeleteAccountView.swift b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/DeleteAccount/DeleteAccountView.swift index 6567c2afba..4ec52bfb3c 100644 --- a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/DeleteAccount/DeleteAccountView.swift +++ b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/DeleteAccount/DeleteAccountView.swift @@ -16,10 +16,10 @@ struct DeleteAccountView: View { VStack(alignment: .leading, spacing: 24) { Image(asset: Asset.Images.exclamationTriangle) .scaledFrame(width: 24, height: 24) - .foregroundColor(Color(asset: Asset.Colors.loadingRed)) + .foregroundColor(Color(asset: Asset.Colors.error)) Text(Localizations.deletingYourAccountIsPermanent) - .foregroundColor(Color(asset: Asset.Colors.loadingRed)) + .foregroundColor(Color(asset: Asset.Colors.error)) .styleGuide(.headline, weight: .semibold) Text(Localizations.deleteAccountExplanation) diff --git a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/DeleteAccount/__Snapshots__/DeleteAccountViewTests/test_snapshot.1.png b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/DeleteAccount/__Snapshots__/DeleteAccountViewTests/test_snapshot.1.png index 93f3125aac..78a5f4c3cb 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/DeleteAccount/__Snapshots__/DeleteAccountViewTests/test_snapshot.1.png and b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/DeleteAccount/__Snapshots__/DeleteAccountViewTests/test_snapshot.1.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/PendingRequests/PendingRequestsView.swift b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/PendingRequests/PendingRequestsView.swift index c5ac7abed8..42f6bed241 100644 --- a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/PendingRequests/PendingRequestsView.swift +++ b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/PendingRequests/PendingRequestsView.swift @@ -114,7 +114,7 @@ struct PendingRequestsView: View { Text(pendingRequest.fingerprintPhrase ?? "") .styleGuide(.caption2Monospaced) - .foregroundStyle(Asset.Colors.fingerprint.swiftUIColor) + .foregroundStyle(Asset.Colors.textCodePink.swiftUIColor) .frame(maxWidth: .infinity, alignment: .leading) .multilineTextAlignment(.leading) .accessibilityIdentifier("FingerprintPhraseValue") @@ -141,7 +141,7 @@ struct PendingRequestsView: View { } } } - .background(Asset.Colors.backgroundTertiary.swiftUIColor) + .background(Asset.Colors.backgroundSecondary.swiftUIColor) .accessibilityIdentifier("LoginRequestCell") } } diff --git a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/PendingRequests/__Snapshots__/PendingRequestsViewTests/test_snapshot_empty.1.png b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/PendingRequests/__Snapshots__/PendingRequestsViewTests/test_snapshot_empty.1.png index 95d35f8ec7..791d272381 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/PendingRequests/__Snapshots__/PendingRequestsViewTests/test_snapshot_empty.1.png and b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/PendingRequests/__Snapshots__/PendingRequestsViewTests/test_snapshot_empty.1.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/PendingRequests/__Snapshots__/PendingRequestsViewTests/test_snapshot_empty.2.png b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/PendingRequests/__Snapshots__/PendingRequestsViewTests/test_snapshot_empty.2.png index 1821deb1c7..52a134fc93 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/PendingRequests/__Snapshots__/PendingRequestsViewTests/test_snapshot_empty.2.png and b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/PendingRequests/__Snapshots__/PendingRequestsViewTests/test_snapshot_empty.2.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/PendingRequests/__Snapshots__/PendingRequestsViewTests/test_snapshot_empty.3.png b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/PendingRequests/__Snapshots__/PendingRequestsViewTests/test_snapshot_empty.3.png index b9b9637f92..cfc7ccea46 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/PendingRequests/__Snapshots__/PendingRequestsViewTests/test_snapshot_empty.3.png and b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/PendingRequests/__Snapshots__/PendingRequestsViewTests/test_snapshot_empty.3.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/PendingRequests/__Snapshots__/PendingRequestsViewTests/test_snapshot_requests.1.png b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/PendingRequests/__Snapshots__/PendingRequestsViewTests/test_snapshot_requests.1.png index cd59f18b1e..1921d15fc0 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/PendingRequests/__Snapshots__/PendingRequestsViewTests/test_snapshot_requests.1.png and b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/PendingRequests/__Snapshots__/PendingRequestsViewTests/test_snapshot_requests.1.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/PendingRequests/__Snapshots__/PendingRequestsViewTests/test_snapshot_requests.2.png b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/PendingRequests/__Snapshots__/PendingRequestsViewTests/test_snapshot_requests.2.png index 02bf338d7a..955a9d741e 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/PendingRequests/__Snapshots__/PendingRequestsViewTests/test_snapshot_requests.2.png and b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/PendingRequests/__Snapshots__/PendingRequestsViewTests/test_snapshot_requests.2.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/PendingRequests/__Snapshots__/PendingRequestsViewTests/test_snapshot_requests.3.png b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/PendingRequests/__Snapshots__/PendingRequestsViewTests/test_snapshot_requests.3.png index 942ffcdc8d..5d20e1bced 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/PendingRequests/__Snapshots__/PendingRequestsViewTests/test_snapshot_requests.3.png and b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/PendingRequests/__Snapshots__/PendingRequestsViewTests/test_snapshot_requests.3.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_snapshot_biometricsDisabled_touchID.1.png b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_snapshot_biometricsDisabled_touchID.1.png index 728723c01c..88b520b001 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_snapshot_biometricsDisabled_touchID.1.png and b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_snapshot_biometricsDisabled_touchID.1.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_snapshot_biometricsEnabled_faceID.1.png b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_snapshot_biometricsEnabled_faceID.1.png index 7899df6679..9236642ed7 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_snapshot_biometricsEnabled_faceID.1.png and b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_snapshot_biometricsEnabled_faceID.1.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_snapshot_biometricsEnabled_faceID_nonValidIntegrity_dark.1.png b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_snapshot_biometricsEnabled_faceID_nonValidIntegrity_dark.1.png index 29e640a86b..02ce2d09d0 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_snapshot_biometricsEnabled_faceID_nonValidIntegrity_dark.1.png and b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_snapshot_biometricsEnabled_faceID_nonValidIntegrity_dark.1.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_snapshot_customSessionTimeoutField.1.png b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_snapshot_customSessionTimeoutField.1.png index c2d0c3d8ac..d706878a96 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_snapshot_customSessionTimeoutField.1.png and b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_snapshot_customSessionTimeoutField.1.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_snapshot_noMasterPassword.1.png b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_snapshot_noMasterPassword.1.png index 86d8fbac99..502f949885 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_snapshot_noMasterPassword.1.png and b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_snapshot_noMasterPassword.1.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_snapshot_timeoutPolicy.1.png b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_snapshot_timeoutPolicy.1.png index 7d4cd4cd7c..a64087f68a 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_snapshot_timeoutPolicy.1.png and b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_snapshot_timeoutPolicy.1.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_snapshot_timeoutPolicy.2.png b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_snapshot_timeoutPolicy.2.png index 8dc040ff20..7939dd0c68 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_snapshot_timeoutPolicy.2.png and b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_snapshot_timeoutPolicy.2.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_snapshot_timeoutPolicy.3.png b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_snapshot_timeoutPolicy.3.png index bffa2de907..56703a3a78 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_snapshot_timeoutPolicy.3.png and b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_snapshot_timeoutPolicy.3.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_snapshot_timeoutPolicyWithAction.1.png b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_snapshot_timeoutPolicyWithAction.1.png index 0db6ba0eb7..b22c8e2d8b 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_snapshot_timeoutPolicyWithAction.1.png and b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_snapshot_timeoutPolicyWithAction.1.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_snapshot_timeoutPolicyWithAction.2.png b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_snapshot_timeoutPolicyWithAction.2.png index bcb6f42e4a..67281adbb2 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_snapshot_timeoutPolicyWithAction.2.png and b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_snapshot_timeoutPolicyWithAction.2.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_snapshot_timeoutPolicyWithAction.3.png b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_snapshot_timeoutPolicyWithAction.3.png index 535b7017fb..854e406e1b 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_snapshot_timeoutPolicyWithAction.3.png and b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_snapshot_timeoutPolicyWithAction.3.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_view_render.1.png b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_view_render.1.png index 48b3ed08c4..a23f87e228 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_view_render.1.png and b/BitwardenShared/UI/Platform/Settings/Settings/AccountSecurity/__Snapshots__/AccountSecurityViewTests/test_view_render.1.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/Appearance/SelectLanguage/SelectLanguageView.swift b/BitwardenShared/UI/Platform/Settings/Settings/Appearance/SelectLanguage/SelectLanguageView.swift index b3a56bf6eb..73809cdefc 100644 --- a/BitwardenShared/UI/Platform/Settings/Settings/Appearance/SelectLanguage/SelectLanguageView.swift +++ b/BitwardenShared/UI/Platform/Settings/Settings/Appearance/SelectLanguage/SelectLanguageView.swift @@ -18,7 +18,7 @@ struct SelectLanguageView: View { languageOptionRow(languageOption) } } - .background(Asset.Colors.backgroundPrimary.swiftUIColor) + .background(Asset.Colors.backgroundSecondary.swiftUIColor) .cornerRadius(10) .scrollView() .navigationBar(title: Localizations.selectLanguage, titleDisplayMode: .inline) diff --git a/BitwardenShared/UI/Platform/Settings/Settings/Appearance/SelectLanguage/__Snapshots__/SelectLanguageViewTests/test_snapshot_default.1.png b/BitwardenShared/UI/Platform/Settings/Settings/Appearance/SelectLanguage/__Snapshots__/SelectLanguageViewTests/test_snapshot_default.1.png index a780a28501..a5f401974a 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/Appearance/SelectLanguage/__Snapshots__/SelectLanguageViewTests/test_snapshot_default.1.png and b/BitwardenShared/UI/Platform/Settings/Settings/Appearance/SelectLanguage/__Snapshots__/SelectLanguageViewTests/test_snapshot_default.1.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/Appearance/SelectLanguage/__Snapshots__/SelectLanguageViewTests/test_snapshot_default_dark.1.png b/BitwardenShared/UI/Platform/Settings/Settings/Appearance/SelectLanguage/__Snapshots__/SelectLanguageViewTests/test_snapshot_default_dark.1.png index f6993c3036..4d95d23634 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/Appearance/SelectLanguage/__Snapshots__/SelectLanguageViewTests/test_snapshot_default_dark.1.png and b/BitwardenShared/UI/Platform/Settings/Settings/Appearance/SelectLanguage/__Snapshots__/SelectLanguageViewTests/test_snapshot_default_dark.1.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/Appearance/SelectLanguage/__Snapshots__/SelectLanguageViewTests/test_snapshot_default_large.1.png b/BitwardenShared/UI/Platform/Settings/Settings/Appearance/SelectLanguage/__Snapshots__/SelectLanguageViewTests/test_snapshot_default_large.1.png index 9604542d98..931902c667 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/Appearance/SelectLanguage/__Snapshots__/SelectLanguageViewTests/test_snapshot_default_large.1.png and b/BitwardenShared/UI/Platform/Settings/Settings/Appearance/SelectLanguage/__Snapshots__/SelectLanguageViewTests/test_snapshot_default_large.1.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/Appearance/__Snapshots__/AppearanceViewTests/test_viewRender.1.png b/BitwardenShared/UI/Platform/Settings/Settings/Appearance/__Snapshots__/AppearanceViewTests/test_viewRender.1.png index 205a0b6136..eb43aaf573 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/Appearance/__Snapshots__/AppearanceViewTests/test_viewRender.1.png and b/BitwardenShared/UI/Platform/Settings/Settings/Appearance/__Snapshots__/AppearanceViewTests/test_viewRender.1.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/Appearance/__Snapshots__/AppearanceViewTests/test_viewRender.2.png b/BitwardenShared/UI/Platform/Settings/Settings/Appearance/__Snapshots__/AppearanceViewTests/test_viewRender.2.png index 289d794881..aa47268583 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/Appearance/__Snapshots__/AppearanceViewTests/test_viewRender.2.png and b/BitwardenShared/UI/Platform/Settings/Settings/Appearance/__Snapshots__/AppearanceViewTests/test_viewRender.2.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/Appearance/__Snapshots__/AppearanceViewTests/test_viewRender.3.png b/BitwardenShared/UI/Platform/Settings/Settings/Appearance/__Snapshots__/AppearanceViewTests/test_viewRender.3.png index 9cbbf40dfa..1990aca68c 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/Appearance/__Snapshots__/AppearanceViewTests/test_viewRender.3.png and b/BitwardenShared/UI/Platform/Settings/Settings/Appearance/__Snapshots__/AppearanceViewTests/test_viewRender.3.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/AppExtension/__Snapshots__/AppExtensionViewTests/test_snapshot_appExtension_activate.1.png b/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/AppExtension/__Snapshots__/AppExtensionViewTests/test_snapshot_appExtension_activate.1.png index 65013b39e5..b13dfd73b2 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/AppExtension/__Snapshots__/AppExtensionViewTests/test_snapshot_appExtension_activate.1.png and b/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/AppExtension/__Snapshots__/AppExtensionViewTests/test_snapshot_appExtension_activate.1.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/AppExtension/__Snapshots__/AppExtensionViewTests/test_snapshot_appExtension_activate.2.png b/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/AppExtension/__Snapshots__/AppExtensionViewTests/test_snapshot_appExtension_activate.2.png index 24ffadcdba..9dc14d7875 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/AppExtension/__Snapshots__/AppExtensionViewTests/test_snapshot_appExtension_activate.2.png and b/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/AppExtension/__Snapshots__/AppExtensionViewTests/test_snapshot_appExtension_activate.2.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/AppExtension/__Snapshots__/AppExtensionViewTests/test_snapshot_appExtension_activate.3.png b/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/AppExtension/__Snapshots__/AppExtensionViewTests/test_snapshot_appExtension_activate.3.png index b02c0700dc..94fe56004d 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/AppExtension/__Snapshots__/AppExtensionViewTests/test_snapshot_appExtension_activate.3.png and b/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/AppExtension/__Snapshots__/AppExtensionViewTests/test_snapshot_appExtension_activate.3.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/AppExtension/__Snapshots__/AppExtensionViewTests/test_snapshot_appExtension_almostDone.1.png b/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/AppExtension/__Snapshots__/AppExtensionViewTests/test_snapshot_appExtension_almostDone.1.png index 1a0765ee40..0ee1b5e1af 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/AppExtension/__Snapshots__/AppExtensionViewTests/test_snapshot_appExtension_almostDone.1.png and b/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/AppExtension/__Snapshots__/AppExtensionViewTests/test_snapshot_appExtension_almostDone.1.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/AppExtension/__Snapshots__/AppExtensionViewTests/test_snapshot_appExtension_almostDone.2.png b/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/AppExtension/__Snapshots__/AppExtensionViewTests/test_snapshot_appExtension_almostDone.2.png index bc3b0560ae..073cca021b 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/AppExtension/__Snapshots__/AppExtensionViewTests/test_snapshot_appExtension_almostDone.2.png and b/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/AppExtension/__Snapshots__/AppExtensionViewTests/test_snapshot_appExtension_almostDone.2.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/AppExtension/__Snapshots__/AppExtensionViewTests/test_snapshot_appExtension_almostDone.3.png b/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/AppExtension/__Snapshots__/AppExtensionViewTests/test_snapshot_appExtension_almostDone.3.png index 5f5a319ae5..11f619fe8a 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/AppExtension/__Snapshots__/AppExtensionViewTests/test_snapshot_appExtension_almostDone.3.png and b/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/AppExtension/__Snapshots__/AppExtensionViewTests/test_snapshot_appExtension_almostDone.3.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/AppExtension/__Snapshots__/AppExtensionViewTests/test_snapshot_appExtension_reactivate.1.png b/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/AppExtension/__Snapshots__/AppExtensionViewTests/test_snapshot_appExtension_reactivate.1.png index 7239176bf1..e3dd10ad74 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/AppExtension/__Snapshots__/AppExtensionViewTests/test_snapshot_appExtension_reactivate.1.png and b/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/AppExtension/__Snapshots__/AppExtensionViewTests/test_snapshot_appExtension_reactivate.1.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/AppExtension/__Snapshots__/AppExtensionViewTests/test_snapshot_appExtension_reactivate.2.png b/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/AppExtension/__Snapshots__/AppExtensionViewTests/test_snapshot_appExtension_reactivate.2.png index dd223e65e5..cad7f48440 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/AppExtension/__Snapshots__/AppExtensionViewTests/test_snapshot_appExtension_reactivate.2.png and b/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/AppExtension/__Snapshots__/AppExtensionViewTests/test_snapshot_appExtension_reactivate.2.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/AppExtension/__Snapshots__/AppExtensionViewTests/test_snapshot_appExtension_reactivate.3.png b/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/AppExtension/__Snapshots__/AppExtensionViewTests/test_snapshot_appExtension_reactivate.3.png index e221fda083..6a859a7a7a 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/AppExtension/__Snapshots__/AppExtensionViewTests/test_snapshot_appExtension_reactivate.3.png and b/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/AppExtension/__Snapshots__/AppExtensionViewTests/test_snapshot_appExtension_reactivate.3.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/PasswordAutoFill/__Snapshots__/PasswordAutoFillViewTests/test_view_render.1.png b/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/PasswordAutoFill/__Snapshots__/PasswordAutoFillViewTests/test_view_render.1.png index 4de3812c0d..53cfb8f6a7 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/PasswordAutoFill/__Snapshots__/PasswordAutoFillViewTests/test_view_render.1.png and b/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/PasswordAutoFill/__Snapshots__/PasswordAutoFillViewTests/test_view_render.1.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/PasswordAutoFill/__Snapshots__/PasswordAutoFillViewTests/test_view_render.2.png b/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/PasswordAutoFill/__Snapshots__/PasswordAutoFillViewTests/test_view_render.2.png index e448fa221a..5c526dcfeb 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/PasswordAutoFill/__Snapshots__/PasswordAutoFillViewTests/test_view_render.2.png and b/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/PasswordAutoFill/__Snapshots__/PasswordAutoFillViewTests/test_view_render.2.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/PasswordAutoFill/__Snapshots__/PasswordAutoFillViewTests/test_view_render.3.png b/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/PasswordAutoFill/__Snapshots__/PasswordAutoFillViewTests/test_view_render.3.png index f9ad48774f..874488d52d 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/PasswordAutoFill/__Snapshots__/PasswordAutoFillViewTests/test_view_render.3.png and b/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/PasswordAutoFill/__Snapshots__/PasswordAutoFillViewTests/test_view_render.3.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/__Snapshots__/AutoFillViewTests/test_view_render.1.png b/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/__Snapshots__/AutoFillViewTests/test_view_render.1.png index 64356cfdc4..7057692b46 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/__Snapshots__/AutoFillViewTests/test_view_render.1.png and b/BitwardenShared/UI/Platform/Settings/Settings/AutoFill/__Snapshots__/AutoFillViewTests/test_view_render.1.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/Other/__Snapshots__/OtherSettingsViewTests/test_view_render.1.png b/BitwardenShared/UI/Platform/Settings/Settings/Other/__Snapshots__/OtherSettingsViewTests/test_view_render.1.png index 07eddd5b6d..bbfc5fb0a9 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/Other/__Snapshots__/OtherSettingsViewTests/test_view_render.1.png and b/BitwardenShared/UI/Platform/Settings/Settings/Other/__Snapshots__/OtherSettingsViewTests/test_view_render.1.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/Other/__Snapshots__/OtherSettingsViewTests/test_view_render.2.png b/BitwardenShared/UI/Platform/Settings/Settings/Other/__Snapshots__/OtherSettingsViewTests/test_view_render.2.png index 8b37d9b12e..cb534ba706 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/Other/__Snapshots__/OtherSettingsViewTests/test_view_render.2.png and b/BitwardenShared/UI/Platform/Settings/Settings/Other/__Snapshots__/OtherSettingsViewTests/test_view_render.2.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/Other/__Snapshots__/OtherSettingsViewTests/test_view_render.3.png b/BitwardenShared/UI/Platform/Settings/Settings/Other/__Snapshots__/OtherSettingsViewTests/test_view_render.3.png index 18c57c5dac..efda0275f3 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/Other/__Snapshots__/OtherSettingsViewTests/test_view_render.3.png and b/BitwardenShared/UI/Platform/Settings/Settings/Other/__Snapshots__/OtherSettingsViewTests/test_view_render.3.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/SettingsListItem.swift b/BitwardenShared/UI/Platform/Settings/Settings/SettingsListItem.swift index b1ed039b8c..776ae8af6b 100644 --- a/BitwardenShared/UI/Platform/Settings/Settings/SettingsListItem.swift +++ b/BitwardenShared/UI/Platform/Settings/Settings/SettingsListItem.swift @@ -56,7 +56,7 @@ struct SettingsListItem: View { } } .accessibilityIdentifier(accessibilityIdentifier ?? "") - .background(Asset.Colors.backgroundTertiary.swiftUIColor) + .background(Asset.Colors.backgroundSecondary.swiftUIColor) } // MARK: Initialization diff --git a/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_empty.1.png b/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_empty.1.png index 3053f64c3a..2d9eee9c22 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_empty.1.png and b/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_empty.1.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_empty.2.png b/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_empty.2.png index 83264b0b9c..f4b776c993 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_empty.2.png and b/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_empty.2.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_empty.3.png b/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_empty.3.png index 14e3aa4586..83dcb459b0 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_empty.3.png and b/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_empty.3.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_jsonEncrypted.1.png b/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_jsonEncrypted.1.png index 73757f442f..1236366767 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_jsonEncrypted.1.png and b/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_jsonEncrypted.1.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_jsonEncrypted.2.png b/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_jsonEncrypted.2.png index 37bebe6c7d..a3ca56c094 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_jsonEncrypted.2.png and b/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_jsonEncrypted.2.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_jsonEncrypted.3.png b/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_jsonEncrypted.3.png index 81f8755ddc..385bb04278 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_jsonEncrypted.3.png and b/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_jsonEncrypted.3.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_noMasterPassword.1.png b/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_noMasterPassword.1.png index 4967efee2f..22a9196666 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_noMasterPassword.1.png and b/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_noMasterPassword.1.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_noMasterPassword.2.png b/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_noMasterPassword.2.png index acd522771e..f3dcf9966c 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_noMasterPassword.2.png and b/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_noMasterPassword.2.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_noMasterPassword.3.png b/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_noMasterPassword.3.png index 1d7d374957..55fd11c585 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_noMasterPassword.3.png and b/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_noMasterPassword.3.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_populated.1.png b/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_populated.1.png index 22060ac7c6..d501ad73e3 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_populated.1.png and b/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_populated.1.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_populated.2.png b/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_populated.2.png index 9faecacbbd..8d1d96596d 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_populated.2.png and b/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_populated.2.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_populated.3.png b/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_populated.3.png index e65825f75f..958a635fc6 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_populated.3.png and b/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_populated.3.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_vaultExportDisabled.1.png b/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_vaultExportDisabled.1.png index d1c139f22c..6eadf167d2 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_vaultExportDisabled.1.png and b/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_vaultExportDisabled.1.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_vaultExportDisabled.2.png b/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_vaultExportDisabled.2.png index c1a95bfc56..b5e8623048 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_vaultExportDisabled.2.png and b/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_vaultExportDisabled.2.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_vaultExportDisabled.3.png b/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_vaultExportDisabled.3.png index abf2027e5b..c9e8537970 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_vaultExportDisabled.3.png and b/BitwardenShared/UI/Platform/Settings/Settings/Vault/ExportVault/__Snapshots__/ExportVaultViewTests/test_snapshot_vaultExportDisabled.3.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/Vault/Folders/AddEditFolder/__Snapshots__/AddEditFolderViewTests/test_snapshot_add_empty.1.png b/BitwardenShared/UI/Platform/Settings/Settings/Vault/Folders/AddEditFolder/__Snapshots__/AddEditFolderViewTests/test_snapshot_add_empty.1.png index 837766954c..0fb6e30e82 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/Vault/Folders/AddEditFolder/__Snapshots__/AddEditFolderViewTests/test_snapshot_add_empty.1.png and b/BitwardenShared/UI/Platform/Settings/Settings/Vault/Folders/AddEditFolder/__Snapshots__/AddEditFolderViewTests/test_snapshot_add_empty.1.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/Vault/Folders/AddEditFolder/__Snapshots__/AddEditFolderViewTests/test_snapshot_add_empty.2.png b/BitwardenShared/UI/Platform/Settings/Settings/Vault/Folders/AddEditFolder/__Snapshots__/AddEditFolderViewTests/test_snapshot_add_empty.2.png index 0fefc74a8b..a48aed5f50 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/Vault/Folders/AddEditFolder/__Snapshots__/AddEditFolderViewTests/test_snapshot_add_empty.2.png and b/BitwardenShared/UI/Platform/Settings/Settings/Vault/Folders/AddEditFolder/__Snapshots__/AddEditFolderViewTests/test_snapshot_add_empty.2.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/Vault/Folders/AddEditFolder/__Snapshots__/AddEditFolderViewTests/test_snapshot_add_empty.3.png b/BitwardenShared/UI/Platform/Settings/Settings/Vault/Folders/AddEditFolder/__Snapshots__/AddEditFolderViewTests/test_snapshot_add_empty.3.png index 62e4d8a2c2..9287c5d149 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/Vault/Folders/AddEditFolder/__Snapshots__/AddEditFolderViewTests/test_snapshot_add_empty.3.png and b/BitwardenShared/UI/Platform/Settings/Settings/Vault/Folders/AddEditFolder/__Snapshots__/AddEditFolderViewTests/test_snapshot_add_empty.3.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/Vault/Folders/AddEditFolder/__Snapshots__/AddEditFolderViewTests/test_snapshot_add_populated.1.png b/BitwardenShared/UI/Platform/Settings/Settings/Vault/Folders/AddEditFolder/__Snapshots__/AddEditFolderViewTests/test_snapshot_add_populated.1.png index c0e47bd450..cf7ce969b7 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/Vault/Folders/AddEditFolder/__Snapshots__/AddEditFolderViewTests/test_snapshot_add_populated.1.png and b/BitwardenShared/UI/Platform/Settings/Settings/Vault/Folders/AddEditFolder/__Snapshots__/AddEditFolderViewTests/test_snapshot_add_populated.1.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/Vault/Folders/AddEditFolder/__Snapshots__/AddEditFolderViewTests/test_snapshot_add_populated.2.png b/BitwardenShared/UI/Platform/Settings/Settings/Vault/Folders/AddEditFolder/__Snapshots__/AddEditFolderViewTests/test_snapshot_add_populated.2.png index 017fa5c77c..79a746c97a 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/Vault/Folders/AddEditFolder/__Snapshots__/AddEditFolderViewTests/test_snapshot_add_populated.2.png and b/BitwardenShared/UI/Platform/Settings/Settings/Vault/Folders/AddEditFolder/__Snapshots__/AddEditFolderViewTests/test_snapshot_add_populated.2.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/Vault/Folders/AddEditFolder/__Snapshots__/AddEditFolderViewTests/test_snapshot_add_populated.3.png b/BitwardenShared/UI/Platform/Settings/Settings/Vault/Folders/AddEditFolder/__Snapshots__/AddEditFolderViewTests/test_snapshot_add_populated.3.png index 6dc6d1ff1b..0db139442a 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/Vault/Folders/AddEditFolder/__Snapshots__/AddEditFolderViewTests/test_snapshot_add_populated.3.png and b/BitwardenShared/UI/Platform/Settings/Settings/Vault/Folders/AddEditFolder/__Snapshots__/AddEditFolderViewTests/test_snapshot_add_populated.3.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/Vault/Folders/AddEditFolder/__Snapshots__/AddEditFolderViewTests/test_snapshot_edit_populated.1.png b/BitwardenShared/UI/Platform/Settings/Settings/Vault/Folders/AddEditFolder/__Snapshots__/AddEditFolderViewTests/test_snapshot_edit_populated.1.png index f2cd165447..5d1aa8483a 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/Vault/Folders/AddEditFolder/__Snapshots__/AddEditFolderViewTests/test_snapshot_edit_populated.1.png and b/BitwardenShared/UI/Platform/Settings/Settings/Vault/Folders/AddEditFolder/__Snapshots__/AddEditFolderViewTests/test_snapshot_edit_populated.1.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/Vault/Folders/AddEditFolder/__Snapshots__/AddEditFolderViewTests/test_snapshot_edit_populated.2.png b/BitwardenShared/UI/Platform/Settings/Settings/Vault/Folders/AddEditFolder/__Snapshots__/AddEditFolderViewTests/test_snapshot_edit_populated.2.png index 8bcaa7288f..d9538be239 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/Vault/Folders/AddEditFolder/__Snapshots__/AddEditFolderViewTests/test_snapshot_edit_populated.2.png and b/BitwardenShared/UI/Platform/Settings/Settings/Vault/Folders/AddEditFolder/__Snapshots__/AddEditFolderViewTests/test_snapshot_edit_populated.2.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/Vault/Folders/AddEditFolder/__Snapshots__/AddEditFolderViewTests/test_snapshot_edit_populated.3.png b/BitwardenShared/UI/Platform/Settings/Settings/Vault/Folders/AddEditFolder/__Snapshots__/AddEditFolderViewTests/test_snapshot_edit_populated.3.png index f7748231c4..d8d7bbc60b 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/Vault/Folders/AddEditFolder/__Snapshots__/AddEditFolderViewTests/test_snapshot_edit_populated.3.png and b/BitwardenShared/UI/Platform/Settings/Settings/Vault/Folders/AddEditFolder/__Snapshots__/AddEditFolderViewTests/test_snapshot_edit_populated.3.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/Vault/Folders/FoldersView.swift b/BitwardenShared/UI/Platform/Settings/Settings/Vault/Folders/FoldersView.swift index eef9323b6a..e2390b4c26 100644 --- a/BitwardenShared/UI/Platform/Settings/Settings/Vault/Folders/FoldersView.swift +++ b/BitwardenShared/UI/Platform/Settings/Settings/Vault/Folders/FoldersView.swift @@ -16,7 +16,7 @@ struct FoldersView: View { VStack(alignment: .leading, spacing: 16) { if store.state.folders.isEmpty { empty - .background(Color(asset: Asset.Colors.backgroundSecondary)) + .background(Color(asset: Asset.Colors.backgroundPrimary)) } else { folders .scrollView() diff --git a/BitwardenShared/UI/Platform/Settings/Settings/Vault/Folders/__Snapshots__/FoldersViewTests/test_snapshot_folders.1.png b/BitwardenShared/UI/Platform/Settings/Settings/Vault/Folders/__Snapshots__/FoldersViewTests/test_snapshot_folders.1.png index 16911ad963..d84b6602a4 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/Vault/Folders/__Snapshots__/FoldersViewTests/test_snapshot_folders.1.png and b/BitwardenShared/UI/Platform/Settings/Settings/Vault/Folders/__Snapshots__/FoldersViewTests/test_snapshot_folders.1.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/Vault/__Snapshots__/VaultSettingsViewTests/test_snapshot_default.1.png b/BitwardenShared/UI/Platform/Settings/Settings/Vault/__Snapshots__/VaultSettingsViewTests/test_snapshot_default.1.png index e1877d46ed..be63a54ed0 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/Vault/__Snapshots__/VaultSettingsViewTests/test_snapshot_default.1.png and b/BitwardenShared/UI/Platform/Settings/Settings/Vault/__Snapshots__/VaultSettingsViewTests/test_snapshot_default.1.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/Vault/__Snapshots__/VaultSettingsViewTests/test_snapshot_default.2.png b/BitwardenShared/UI/Platform/Settings/Settings/Vault/__Snapshots__/VaultSettingsViewTests/test_snapshot_default.2.png index edce49fd84..eca83d165d 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/Vault/__Snapshots__/VaultSettingsViewTests/test_snapshot_default.2.png and b/BitwardenShared/UI/Platform/Settings/Settings/Vault/__Snapshots__/VaultSettingsViewTests/test_snapshot_default.2.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/Vault/__Snapshots__/VaultSettingsViewTests/test_snapshot_default.3.png b/BitwardenShared/UI/Platform/Settings/Settings/Vault/__Snapshots__/VaultSettingsViewTests/test_snapshot_default.3.png index aa4b16bb6b..aa1f3e1e87 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/Vault/__Snapshots__/VaultSettingsViewTests/test_snapshot_default.3.png and b/BitwardenShared/UI/Platform/Settings/Settings/Vault/__Snapshots__/VaultSettingsViewTests/test_snapshot_default.3.png differ diff --git a/BitwardenShared/UI/Platform/Settings/Settings/__Snapshots__/SettingsViewTests/test_viewRender.1.png b/BitwardenShared/UI/Platform/Settings/Settings/__Snapshots__/SettingsViewTests/test_viewRender.1.png index a1554c395c..082f65156c 100644 Binary files a/BitwardenShared/UI/Platform/Settings/Settings/__Snapshots__/SettingsViewTests/test_viewRender.1.png and b/BitwardenShared/UI/Platform/Settings/Settings/__Snapshots__/SettingsViewTests/test_viewRender.1.png differ diff --git a/BitwardenShared/UI/Tools/Generator/Generator/GeneratorView.swift b/BitwardenShared/UI/Tools/Generator/Generator/GeneratorView.swift index 1f3491dfa1..21c2aec85a 100644 --- a/BitwardenShared/UI/Tools/Generator/Generator/GeneratorView.swift +++ b/BitwardenShared/UI/Tools/Generator/Generator/GeneratorView.swift @@ -28,7 +28,7 @@ struct GeneratorView: View { } .padding(16) } - .background(Asset.Colors.backgroundSecondary.swiftUIColor) + .background(Asset.Colors.backgroundPrimary.swiftUIColor) .navigationBarTitleDisplayMode(store.state.presentationMode == .inPlace ? .inline : .large) .navigationTitle(Localizations.generator) .task { await store.perform(.appeared) } diff --git a/BitwardenShared/UI/Tools/Generator/Generator/__Snapshots__/GeneratorViewTests/test_snapshot_generatorViewPassphrase.1.png b/BitwardenShared/UI/Tools/Generator/Generator/__Snapshots__/GeneratorViewTests/test_snapshot_generatorViewPassphrase.1.png index 977f7c6fa2..b7bdbb11b6 100644 Binary files a/BitwardenShared/UI/Tools/Generator/Generator/__Snapshots__/GeneratorViewTests/test_snapshot_generatorViewPassphrase.1.png and b/BitwardenShared/UI/Tools/Generator/Generator/__Snapshots__/GeneratorViewTests/test_snapshot_generatorViewPassphrase.1.png differ diff --git a/BitwardenShared/UI/Tools/Generator/Generator/__Snapshots__/GeneratorViewTests/test_snapshot_generatorViewPassword.1.png b/BitwardenShared/UI/Tools/Generator/Generator/__Snapshots__/GeneratorViewTests/test_snapshot_generatorViewPassword.1.png index d38758a242..54dedc45ad 100644 Binary files a/BitwardenShared/UI/Tools/Generator/Generator/__Snapshots__/GeneratorViewTests/test_snapshot_generatorViewPassword.1.png and b/BitwardenShared/UI/Tools/Generator/Generator/__Snapshots__/GeneratorViewTests/test_snapshot_generatorViewPassword.1.png differ diff --git a/BitwardenShared/UI/Tools/Generator/Generator/__Snapshots__/GeneratorViewTests/test_snapshot_generatorViewPassword_inPlace.1.png b/BitwardenShared/UI/Tools/Generator/Generator/__Snapshots__/GeneratorViewTests/test_snapshot_generatorViewPassword_inPlace.1.png index 452107a241..83937af09e 100644 Binary files a/BitwardenShared/UI/Tools/Generator/Generator/__Snapshots__/GeneratorViewTests/test_snapshot_generatorViewPassword_inPlace.1.png and b/BitwardenShared/UI/Tools/Generator/Generator/__Snapshots__/GeneratorViewTests/test_snapshot_generatorViewPassword_inPlace.1.png differ diff --git a/BitwardenShared/UI/Tools/Generator/Generator/__Snapshots__/GeneratorViewTests/test_snapshot_generatorViewPassword_policyInEffect.1.png b/BitwardenShared/UI/Tools/Generator/Generator/__Snapshots__/GeneratorViewTests/test_snapshot_generatorViewPassword_policyInEffect.1.png index 16e6223f96..4acf6ea3ab 100644 Binary files a/BitwardenShared/UI/Tools/Generator/Generator/__Snapshots__/GeneratorViewTests/test_snapshot_generatorViewPassword_policyInEffect.1.png and b/BitwardenShared/UI/Tools/Generator/Generator/__Snapshots__/GeneratorViewTests/test_snapshot_generatorViewPassword_policyInEffect.1.png differ diff --git a/BitwardenShared/UI/Tools/Generator/Generator/__Snapshots__/GeneratorViewTests/test_snapshot_generatorViewToast.1.png b/BitwardenShared/UI/Tools/Generator/Generator/__Snapshots__/GeneratorViewTests/test_snapshot_generatorViewToast.1.png index e06e4da77e..ac4282b874 100644 Binary files a/BitwardenShared/UI/Tools/Generator/Generator/__Snapshots__/GeneratorViewTests/test_snapshot_generatorViewToast.1.png and b/BitwardenShared/UI/Tools/Generator/Generator/__Snapshots__/GeneratorViewTests/test_snapshot_generatorViewToast.1.png differ diff --git a/BitwardenShared/UI/Tools/Generator/Generator/__Snapshots__/GeneratorViewTests/test_snapshot_generatorViewUsernameCatchAll.1.png b/BitwardenShared/UI/Tools/Generator/Generator/__Snapshots__/GeneratorViewTests/test_snapshot_generatorViewUsernameCatchAll.1.png index af5e07dbbc..57faf9dbfd 100644 Binary files a/BitwardenShared/UI/Tools/Generator/Generator/__Snapshots__/GeneratorViewTests/test_snapshot_generatorViewUsernameCatchAll.1.png and b/BitwardenShared/UI/Tools/Generator/Generator/__Snapshots__/GeneratorViewTests/test_snapshot_generatorViewUsernameCatchAll.1.png differ diff --git a/BitwardenShared/UI/Tools/Generator/Generator/__Snapshots__/GeneratorViewTests/test_snapshot_generatorViewUsernameForwarded.1.png b/BitwardenShared/UI/Tools/Generator/Generator/__Snapshots__/GeneratorViewTests/test_snapshot_generatorViewUsernameForwarded.1.png index 319c1aa844..d194ec54e4 100644 Binary files a/BitwardenShared/UI/Tools/Generator/Generator/__Snapshots__/GeneratorViewTests/test_snapshot_generatorViewUsernameForwarded.1.png and b/BitwardenShared/UI/Tools/Generator/Generator/__Snapshots__/GeneratorViewTests/test_snapshot_generatorViewUsernameForwarded.1.png differ diff --git a/BitwardenShared/UI/Tools/Generator/Generator/__Snapshots__/GeneratorViewTests/test_snapshot_generatorViewUsernamePlusAddressed.1.png b/BitwardenShared/UI/Tools/Generator/Generator/__Snapshots__/GeneratorViewTests/test_snapshot_generatorViewUsernamePlusAddressed.1.png index fae0857d95..9d6d14152e 100644 Binary files a/BitwardenShared/UI/Tools/Generator/Generator/__Snapshots__/GeneratorViewTests/test_snapshot_generatorViewUsernamePlusAddressed.1.png and b/BitwardenShared/UI/Tools/Generator/Generator/__Snapshots__/GeneratorViewTests/test_snapshot_generatorViewUsernamePlusAddressed.1.png differ diff --git a/BitwardenShared/UI/Tools/Generator/Generator/__Snapshots__/GeneratorViewTests/test_snapshot_generatorViewUsernamePlusAddressed_inPlace.1.png b/BitwardenShared/UI/Tools/Generator/Generator/__Snapshots__/GeneratorViewTests/test_snapshot_generatorViewUsernamePlusAddressed_inPlace.1.png index 910b1c4dc5..4568059891 100644 Binary files a/BitwardenShared/UI/Tools/Generator/Generator/__Snapshots__/GeneratorViewTests/test_snapshot_generatorViewUsernamePlusAddressed_inPlace.1.png and b/BitwardenShared/UI/Tools/Generator/Generator/__Snapshots__/GeneratorViewTests/test_snapshot_generatorViewUsernamePlusAddressed_inPlace.1.png differ diff --git a/BitwardenShared/UI/Tools/Generator/Generator/__Snapshots__/GeneratorViewTests/test_snapshot_generatorViewUsernameRandomWord.1.png b/BitwardenShared/UI/Tools/Generator/Generator/__Snapshots__/GeneratorViewTests/test_snapshot_generatorViewUsernameRandomWord.1.png index a405ff9299..d507a1e193 100644 Binary files a/BitwardenShared/UI/Tools/Generator/Generator/__Snapshots__/GeneratorViewTests/test_snapshot_generatorViewUsernameRandomWord.1.png and b/BitwardenShared/UI/Tools/Generator/Generator/__Snapshots__/GeneratorViewTests/test_snapshot_generatorViewUsernameRandomWord.1.png differ diff --git a/BitwardenShared/UI/Tools/PasswordHistory/PasswordHistoryList/PasswordHistoryListView.swift b/BitwardenShared/UI/Tools/PasswordHistory/PasswordHistoryList/PasswordHistoryListView.swift index f7f5f8e05d..c64ba65e54 100644 --- a/BitwardenShared/UI/Tools/PasswordHistory/PasswordHistoryList/PasswordHistoryListView.swift +++ b/BitwardenShared/UI/Tools/PasswordHistory/PasswordHistoryList/PasswordHistoryListView.swift @@ -21,7 +21,7 @@ struct PasswordHistoryListView: View { passwordHistoryList() } } - .background(Asset.Colors.backgroundSecondary.swiftUIColor.ignoresSafeArea()) + .background(Asset.Colors.backgroundPrimary.swiftUIColor.ignoresSafeArea()) .navigationTitle(Localizations.passwordHistory) .toast(store.binding( get: \.toast, @@ -81,7 +81,7 @@ struct PasswordHistoryListView: View { .accessibilityIdentifier("GeneratedPasswordRow") } } - .background(Asset.Colors.backgroundPrimary.swiftUIColor) + .background(Asset.Colors.backgroundSecondary.swiftUIColor) .cornerRadius(16) .padding(16) } diff --git a/BitwardenShared/UI/Tools/PasswordHistory/PasswordHistoryList/__Snapshots__/PasswordHistoryListViewTests/test_snapshot_generatorHistoryViewEmpty.1.png b/BitwardenShared/UI/Tools/PasswordHistory/PasswordHistoryList/__Snapshots__/PasswordHistoryListViewTests/test_snapshot_generatorHistoryViewEmpty.1.png index a64e171d9c..3e43a5613b 100644 Binary files a/BitwardenShared/UI/Tools/PasswordHistory/PasswordHistoryList/__Snapshots__/PasswordHistoryListViewTests/test_snapshot_generatorHistoryViewEmpty.1.png and b/BitwardenShared/UI/Tools/PasswordHistory/PasswordHistoryList/__Snapshots__/PasswordHistoryListViewTests/test_snapshot_generatorHistoryViewEmpty.1.png differ diff --git a/BitwardenShared/UI/Tools/PasswordHistory/PasswordHistoryList/__Snapshots__/PasswordHistoryListViewTests/test_snapshot_generatorHistoryViewList.1.png b/BitwardenShared/UI/Tools/PasswordHistory/PasswordHistoryList/__Snapshots__/PasswordHistoryListViewTests/test_snapshot_generatorHistoryViewList.1.png index 9a330c7113..519a15e523 100644 Binary files a/BitwardenShared/UI/Tools/PasswordHistory/PasswordHistoryList/__Snapshots__/PasswordHistoryListViewTests/test_snapshot_generatorHistoryViewList.1.png and b/BitwardenShared/UI/Tools/PasswordHistory/PasswordHistoryList/__Snapshots__/PasswordHistoryListViewTests/test_snapshot_generatorHistoryViewList.1.png differ diff --git a/BitwardenShared/UI/Tools/PasswordHistory/PasswordHistoryList/__Snapshots__/PasswordHistoryListViewTests/test_snapshot_generatorHistoryViewList.2.png b/BitwardenShared/UI/Tools/PasswordHistory/PasswordHistoryList/__Snapshots__/PasswordHistoryListViewTests/test_snapshot_generatorHistoryViewList.2.png index 3ca8dae39a..685fac4075 100644 Binary files a/BitwardenShared/UI/Tools/PasswordHistory/PasswordHistoryList/__Snapshots__/PasswordHistoryListViewTests/test_snapshot_generatorHistoryViewList.2.png and b/BitwardenShared/UI/Tools/PasswordHistory/PasswordHistoryList/__Snapshots__/PasswordHistoryListViewTests/test_snapshot_generatorHistoryViewList.2.png differ diff --git a/BitwardenShared/UI/Tools/Send/Send/SendList/SendListView.swift b/BitwardenShared/UI/Tools/Send/Send/SendList/SendListView.swift index 93d5c03a08..6afdbdfdf5 100644 --- a/BitwardenShared/UI/Tools/Send/Send/SendList/SendListView.swift +++ b/BitwardenShared/UI/Tools/Send/Send/SendList/SendListView.swift @@ -78,7 +78,7 @@ private struct MainSendListView: View { .padding(16) .frame(minHeight: reader.size.height) } - .background(Asset.Colors.backgroundSecondary.swiftUIColor.ignoresSafeArea()) + .background(Asset.Colors.backgroundPrimary.swiftUIColor.ignoresSafeArea()) } } @@ -100,7 +100,7 @@ private struct MainSendListView: View { } .padding(16) } - .background(Asset.Colors.backgroundSecondary.swiftUIColor.ignoresSafeArea()) + .background(Asset.Colors.backgroundPrimary.swiftUIColor.ignoresSafeArea()) } /// A view that displays the search interface, including search results, an empty search @@ -119,7 +119,7 @@ private struct MainSendListView: View { } .padding(16) } - .background(Asset.Colors.backgroundSecondary.swiftUIColor.ignoresSafeArea()) + .background(Asset.Colors.backgroundPrimary.swiftUIColor.ignoresSafeArea()) } else { SearchNoResultsView() } @@ -169,7 +169,7 @@ private struct MainSendListView: View { ) } } - .background(Asset.Colors.backgroundPrimary.swiftUIColor) + .background(Asset.Colors.backgroundSecondary.swiftUIColor) .clipShape(RoundedRectangle(cornerRadius: 10)) } } @@ -218,7 +218,7 @@ struct SendListView: View { } label: { Image(asset: Asset.Images.infoRound, label: Text(Localizations.aboutSend)) .resizable() - .foregroundColor(Asset.Colors.primaryBitwarden.swiftUIColor) + .foregroundColor(Asset.Colors.iconSecondary.swiftUIColor) .frame(width: 22, height: 22) } .frame(minHeight: 44) diff --git a/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_empty_dark.1.png b/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_empty_dark.1.png index f47d5a899b..2cc8d55102 100644 Binary files a/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_empty_dark.1.png and b/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_empty_dark.1.png differ diff --git a/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_search_empty_ax5.1.png b/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_search_empty_ax5.1.png index bbdae029c0..27c8f0d76b 100644 Binary files a/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_search_empty_ax5.1.png and b/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_search_empty_ax5.1.png differ diff --git a/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_search_empty_dark.1.png b/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_search_empty_dark.1.png index bb0b0532ec..6e446cd99a 100644 Binary files a/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_search_empty_dark.1.png and b/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_search_empty_dark.1.png differ diff --git a/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_search_empty_light.1.png b/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_search_empty_light.1.png index 76f49bdf01..2d44debd7a 100644 Binary files a/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_search_empty_light.1.png and b/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_search_empty_light.1.png differ diff --git a/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_search_results_ax5.1.png b/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_search_results_ax5.1.png index f992bc7470..642eb60729 100644 Binary files a/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_search_results_ax5.1.png and b/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_search_results_ax5.1.png differ diff --git a/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_search_results_dark.1.png b/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_search_results_dark.1.png index 067cdccdfa..df9a12858b 100644 Binary files a/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_search_results_dark.1.png and b/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_search_results_dark.1.png differ diff --git a/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_search_results_light.1.png b/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_search_results_light.1.png index fe5601b2cd..d47a05dc44 100644 Binary files a/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_search_results_light.1.png and b/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_search_results_light.1.png differ diff --git a/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_textValues_ax5.1.png b/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_textValues_ax5.1.png index afbc9f74d7..1802a4023c 100644 Binary files a/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_textValues_ax5.1.png and b/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_textValues_ax5.1.png differ diff --git a/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_textValues_dark.1.png b/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_textValues_dark.1.png index 76ea499cdc..792dfb8bfa 100644 Binary files a/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_textValues_dark.1.png and b/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_textValues_dark.1.png differ diff --git a/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_textValues_light.1.png b/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_textValues_light.1.png index 84a6951626..68e350a82c 100644 Binary files a/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_textValues_light.1.png and b/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_textValues_light.1.png differ diff --git a/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_values_ax5.1.png b/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_values_ax5.1.png index 61c413896b..5ae06b8f04 100644 Binary files a/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_values_ax5.1.png and b/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_values_ax5.1.png differ diff --git a/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_values_dark.1.png b/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_values_dark.1.png index 61c413896b..5ae06b8f04 100644 Binary files a/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_values_dark.1.png and b/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_values_dark.1.png differ diff --git a/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_values_light.1.png b/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_values_light.1.png index 61c413896b..5ae06b8f04 100644 Binary files a/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_values_light.1.png and b/BitwardenShared/UI/Tools/Send/Send/SendList/__Snapshots__/SendListViewTests/test_snapshot_values_light.1.png differ diff --git a/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/AddEditSendItemView.swift b/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/AddEditSendItemView.swift index 991ade4390..ddbf8a6871 100644 --- a/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/AddEditSendItemView.swift +++ b/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/AddEditSendItemView.swift @@ -49,7 +49,7 @@ struct AddEditSendItemView: View { // swiftlint:disable:this type_body_length profileSwitcher } .dismissKeyboardInteractively() - .background(Asset.Colors.backgroundSecondary.swiftUIColor.ignoresSafeArea()) + .background(Asset.Colors.backgroundPrimary.swiftUIColor.ignoresSafeArea()) .navigationBar( title: store.state.mode.navigationTitle, titleDisplayMode: .inline @@ -291,7 +291,7 @@ struct AddEditSendItemView: View { // swiftlint:disable:this type_body_length store.send(.clearExpirationDatePressed) } .accessibilityIdentifier("Clear") - .tint(Asset.Colors.primaryBitwarden.swiftUIColor) + .tint(Asset.Colors.textInteraction.swiftUIColor) .accessibilityIdentifier("SendClearExpirationDateButton") } } @@ -431,7 +431,7 @@ struct AddEditSendItemView: View { // swiftlint:disable:this type_body_length .rotationEffect(store.state.isOptionsExpanded ? Angle(degrees: 180) : .zero) } .padding(.vertical, 12) - .foregroundStyle(Asset.Colors.primaryBitwarden.swiftUIColor) + .foregroundStyle(Asset.Colors.textInteraction.swiftUIColor) } .accessibilityIdentifier("SendShowHideOptionsButton") } diff --git a/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_file_edit_withOptions_withValues.1.png b/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_file_edit_withOptions_withValues.1.png index 60d64cdcf4..69265f8883 100644 Binary files a/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_file_edit_withOptions_withValues.1.png and b/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_file_edit_withOptions_withValues.1.png differ diff --git a/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_file_empty.1.png b/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_file_empty.1.png index 2c23add277..73b128b25c 100644 Binary files a/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_file_empty.1.png and b/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_file_empty.1.png differ diff --git a/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_file_withOptions_empty.1.png b/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_file_withOptions_empty.1.png index 06e02c8ea1..8851a77ae4 100644 Binary files a/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_file_withOptions_empty.1.png and b/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_file_withOptions_empty.1.png differ diff --git a/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_file_withOptions_withValues.1.png b/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_file_withOptions_withValues.1.png index acfcff467a..b0d9ad4362 100644 Binary files a/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_file_withOptions_withValues.1.png and b/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_file_withOptions_withValues.1.png differ diff --git a/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_file_withValues.1.png b/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_file_withValues.1.png index 6ac2d7bb40..d7549bee23 100644 Binary files a/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_file_withValues.1.png and b/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_file_withValues.1.png differ diff --git a/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_file_withValues_prefilled.1.png b/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_file_withValues_prefilled.1.png index 3802e7f324..0c47ac9b26 100644 Binary files a/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_file_withValues_prefilled.1.png and b/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_file_withValues_prefilled.1.png differ diff --git a/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_sendDisabled.1.png b/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_sendDisabled.1.png index 50b9f99316..37d1f4091b 100644 Binary files a/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_sendDisabled.1.png and b/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_sendDisabled.1.png differ diff --git a/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_sendHideEmailDisabled.1.png b/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_sendHideEmailDisabled.1.png index f705cd4263..455f92c97a 100644 Binary files a/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_sendHideEmailDisabled.1.png and b/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_sendHideEmailDisabled.1.png differ diff --git a/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_text_edit_withOptions_withValues.1.png b/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_text_edit_withOptions_withValues.1.png index e1ba4eb35e..29a7343861 100644 Binary files a/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_text_edit_withOptions_withValues.1.png and b/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_text_edit_withOptions_withValues.1.png differ diff --git a/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_text_empty.1.png b/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_text_empty.1.png index e5784ce238..a998c11437 100644 Binary files a/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_text_empty.1.png and b/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_text_empty.1.png differ diff --git a/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_text_extension_withValues.1.png b/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_text_extension_withValues.1.png index f0763f9d7b..4e7332e629 100644 Binary files a/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_text_extension_withValues.1.png and b/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_text_extension_withValues.1.png differ diff --git a/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_text_withOptions_empty.1.png b/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_text_withOptions_empty.1.png index a633e1c6ff..eb556b6e27 100644 Binary files a/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_text_withOptions_empty.1.png and b/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_text_withOptions_empty.1.png differ diff --git a/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_text_withOptions_withValues.1.png b/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_text_withOptions_withValues.1.png index 3910e5de23..856be20013 100644 Binary files a/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_text_withOptions_withValues.1.png and b/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_text_withOptions_withValues.1.png differ diff --git a/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_text_withValues.1.png b/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_text_withValues.1.png index 0bd82d6c98..63dbfeb9a4 100644 Binary files a/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_text_withValues.1.png and b/BitwardenShared/UI/Tools/Send/SendItem/AddEditSendItem/__Snapshots__/AddEditSendItemViewTests/test_snapshot_text_withValues.1.png differ diff --git a/BitwardenShared/UI/Vault/Vault/AutofillList/VaultAutofillListView.swift b/BitwardenShared/UI/Vault/Vault/AutofillList/VaultAutofillListView.swift index 190a2d2887..c9ab1b872e 100644 --- a/BitwardenShared/UI/Vault/Vault/AutofillList/VaultAutofillListView.swift +++ b/BitwardenShared/UI/Vault/Vault/AutofillList/VaultAutofillListView.swift @@ -151,7 +151,7 @@ private struct VaultAutofillListSearchableView: View { } } } - .background(Asset.Colors.backgroundPrimary.swiftUIColor) + .background(Asset.Colors.backgroundSecondary.swiftUIColor) .clipShape(RoundedRectangle(cornerRadius: 10)) .scrollView() } @@ -205,7 +205,7 @@ private struct VaultAutofillListSearchableView: View { } icon: { Asset.Images.plus.swiftUIImage .imageStyle(.accessoryIcon( - color: Asset.Colors.textPrimaryInverted.swiftUIColor, + color: Asset.Colors.buttonFilledForeground.swiftUIColor, scaleWithFont: true )) } diff --git a/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_empty.1.png b/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_empty.1.png index 0db81540fd..1f5d687e4c 100644 Binary files a/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_empty.1.png and b/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_empty.1.png differ diff --git a/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_empty.2.png b/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_empty.2.png index af238e64cf..91752af2eb 100644 Binary files a/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_empty.2.png and b/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_empty.2.png differ diff --git a/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_empty.3.png b/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_empty.3.png index d64cc8bb50..e14dc3decd 100644 Binary files a/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_empty.3.png and b/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_empty.3.png differ diff --git a/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_emptyFido2Creation.1.png b/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_emptyFido2Creation.1.png index b06a58b4fc..b2035c42c7 100644 Binary files a/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_emptyFido2Creation.1.png and b/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_emptyFido2Creation.1.png differ diff --git a/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_emptyFido2Creation.2.png b/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_emptyFido2Creation.2.png index bbf35106a0..aed503ee64 100644 Binary files a/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_emptyFido2Creation.2.png and b/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_emptyFido2Creation.2.png differ diff --git a/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_emptyFido2Creation.3.png b/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_emptyFido2Creation.3.png index e4423c2ebf..30592a475e 100644 Binary files a/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_emptyFido2Creation.3.png and b/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_emptyFido2Creation.3.png differ diff --git a/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_fido2Creation.1.png b/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_fido2Creation.1.png index 8e9e7a123c..58ff826b59 100644 Binary files a/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_fido2Creation.1.png and b/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_fido2Creation.1.png differ diff --git a/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_fido2Creation.2.png b/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_fido2Creation.2.png index 66c24bec2e..2d4945f341 100644 Binary files a/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_fido2Creation.2.png and b/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_fido2Creation.2.png differ diff --git a/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_fido2Creation.3.png b/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_fido2Creation.3.png index d9e34aa29c..a5e7709e47 100644 Binary files a/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_fido2Creation.3.png and b/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_fido2Creation.3.png differ diff --git a/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_populated.1.png b/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_populated.1.png index fce73a3000..c619343b7b 100644 Binary files a/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_populated.1.png and b/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_populated.1.png differ diff --git a/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_populated.2.png b/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_populated.2.png index 6acfd0c108..3cd49e8a91 100644 Binary files a/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_populated.2.png and b/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_populated.2.png differ diff --git a/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_populated.3.png b/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_populated.3.png index 5cf93ef01d..982c19da82 100644 Binary files a/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_populated.3.png and b/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_populated.3.png differ diff --git a/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_populatedWithFido2_multipleSections.1.png b/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_populatedWithFido2_multipleSections.1.png index f2c57de4a4..1680e9a782 100644 Binary files a/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_populatedWithFido2_multipleSections.1.png and b/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_populatedWithFido2_multipleSections.1.png differ diff --git a/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_populatedWithFido2_multipleSections.2.png b/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_populatedWithFido2_multipleSections.2.png index 9e0c390ce3..f76c47d9c5 100644 Binary files a/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_populatedWithFido2_multipleSections.2.png and b/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_populatedWithFido2_multipleSections.2.png differ diff --git a/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_populatedWithFido2_multipleSections.3.png b/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_populatedWithFido2_multipleSections.3.png index 1c14662442..74bdbfff48 100644 Binary files a/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_populatedWithFido2_multipleSections.3.png and b/BitwardenShared/UI/Vault/Vault/AutofillList/__Snapshots__/VaultAutofillListViewTests/test_snapshot_vaultAutofillList_populatedWithFido2_multipleSections.3.png differ diff --git a/BitwardenShared/UI/Vault/Vault/VaultGroup/VaultGroupView.swift b/BitwardenShared/UI/Vault/Vault/VaultGroup/VaultGroupView.swift index 1f08b32ea7..a672e29b23 100644 --- a/BitwardenShared/UI/Vault/Vault/VaultGroup/VaultGroupView.swift +++ b/BitwardenShared/UI/Vault/Vault/VaultGroup/VaultGroupView.swift @@ -32,7 +32,7 @@ struct VaultGroupView: View { ) .navigationTitle(store.state.group.navigationTitle) .navigationBarTitleDisplayMode(.inline) - .background(Asset.Colors.backgroundSecondary.swiftUIColor.ignoresSafeArea()) + .background(Asset.Colors.backgroundPrimary.swiftUIColor.ignoresSafeArea()) .toolbar { addToolbarItem(hidden: !store.state.showAddToolbarItem) { store.send(.addItemPressed) @@ -126,7 +126,7 @@ struct VaultGroupView: View { for: item, isLastInSection: store.state.searchResults.last == item ) - .background(Asset.Colors.backgroundPrimary.swiftUIColor) + .background(Asset.Colors.backgroundSecondary.swiftUIColor) } } } diff --git a/BitwardenShared/UI/Vault/Vault/VaultGroup/__Snapshots__/VaultGroupViewTests/test_snapshot_empty.1.png b/BitwardenShared/UI/Vault/Vault/VaultGroup/__Snapshots__/VaultGroupViewTests/test_snapshot_empty.1.png index 2723f7313b..352a8ebfa0 100644 Binary files a/BitwardenShared/UI/Vault/Vault/VaultGroup/__Snapshots__/VaultGroupViewTests/test_snapshot_empty.1.png and b/BitwardenShared/UI/Vault/Vault/VaultGroup/__Snapshots__/VaultGroupViewTests/test_snapshot_empty.1.png differ diff --git a/BitwardenShared/UI/Vault/Vault/VaultGroup/__Snapshots__/VaultGroupViewTests/test_snapshot_emptyCollection.1.png b/BitwardenShared/UI/Vault/Vault/VaultGroup/__Snapshots__/VaultGroupViewTests/test_snapshot_emptyCollection.1.png index 037d6da342..f1d17b02b9 100644 Binary files a/BitwardenShared/UI/Vault/Vault/VaultGroup/__Snapshots__/VaultGroupViewTests/test_snapshot_emptyCollection.1.png and b/BitwardenShared/UI/Vault/Vault/VaultGroup/__Snapshots__/VaultGroupViewTests/test_snapshot_emptyCollection.1.png differ diff --git a/BitwardenShared/UI/Vault/Vault/VaultGroup/__Snapshots__/VaultGroupViewTests/test_snapshot_emptyFolder.1.png b/BitwardenShared/UI/Vault/Vault/VaultGroup/__Snapshots__/VaultGroupViewTests/test_snapshot_emptyFolder.1.png index 0a210978d6..017877dce5 100644 Binary files a/BitwardenShared/UI/Vault/Vault/VaultGroup/__Snapshots__/VaultGroupViewTests/test_snapshot_emptyFolder.1.png and b/BitwardenShared/UI/Vault/Vault/VaultGroup/__Snapshots__/VaultGroupViewTests/test_snapshot_emptyFolder.1.png differ diff --git a/BitwardenShared/UI/Vault/Vault/VaultGroup/__Snapshots__/VaultGroupViewTests/test_snapshot_emptyTrash.1.png b/BitwardenShared/UI/Vault/Vault/VaultGroup/__Snapshots__/VaultGroupViewTests/test_snapshot_emptyTrash.1.png index b305474c5f..e86bedf0a0 100644 Binary files a/BitwardenShared/UI/Vault/Vault/VaultGroup/__Snapshots__/VaultGroupViewTests/test_snapshot_emptyTrash.1.png and b/BitwardenShared/UI/Vault/Vault/VaultGroup/__Snapshots__/VaultGroupViewTests/test_snapshot_emptyTrash.1.png differ diff --git a/BitwardenShared/UI/Vault/Vault/VaultGroup/__Snapshots__/VaultGroupViewTests/test_snapshot_multipleItems.1.png b/BitwardenShared/UI/Vault/Vault/VaultGroup/__Snapshots__/VaultGroupViewTests/test_snapshot_multipleItems.1.png index 7dc6147f81..146e71ace2 100644 Binary files a/BitwardenShared/UI/Vault/Vault/VaultGroup/__Snapshots__/VaultGroupViewTests/test_snapshot_multipleItems.1.png and b/BitwardenShared/UI/Vault/Vault/VaultGroup/__Snapshots__/VaultGroupViewTests/test_snapshot_multipleItems.1.png differ diff --git a/BitwardenShared/UI/Vault/Vault/VaultGroup/__Snapshots__/VaultGroupViewTests/test_snapshot_oneItem.1.png b/BitwardenShared/UI/Vault/Vault/VaultGroup/__Snapshots__/VaultGroupViewTests/test_snapshot_oneItem.1.png index 094fc60e2d..fef6e87796 100644 Binary files a/BitwardenShared/UI/Vault/Vault/VaultGroup/__Snapshots__/VaultGroupViewTests/test_snapshot_oneItem.1.png and b/BitwardenShared/UI/Vault/Vault/VaultGroup/__Snapshots__/VaultGroupViewTests/test_snapshot_oneItem.1.png differ diff --git a/BitwardenShared/UI/Vault/Vault/VaultGroup/__Snapshots__/VaultGroupViewTests/test_snapshot_search_oneItem.1.png b/BitwardenShared/UI/Vault/Vault/VaultGroup/__Snapshots__/VaultGroupViewTests/test_snapshot_search_oneItem.1.png index 8a501db555..c96c51b2a4 100644 Binary files a/BitwardenShared/UI/Vault/Vault/VaultGroup/__Snapshots__/VaultGroupViewTests/test_snapshot_search_oneItem.1.png and b/BitwardenShared/UI/Vault/Vault/VaultGroup/__Snapshots__/VaultGroupViewTests/test_snapshot_search_oneItem.1.png differ diff --git a/BitwardenShared/UI/Vault/Vault/VaultGroup/__Snapshots__/VaultGroupViewTests/test_snapshot_search_oneTOTPItem.1.png b/BitwardenShared/UI/Vault/Vault/VaultGroup/__Snapshots__/VaultGroupViewTests/test_snapshot_search_oneTOTPItem.1.png index cd53b3c96c..3718db6cc9 100644 Binary files a/BitwardenShared/UI/Vault/Vault/VaultGroup/__Snapshots__/VaultGroupViewTests/test_snapshot_search_oneTOTPItem.1.png and b/BitwardenShared/UI/Vault/Vault/VaultGroup/__Snapshots__/VaultGroupViewTests/test_snapshot_search_oneTOTPItem.1.png differ diff --git a/BitwardenShared/UI/Vault/Vault/VaultItemSelection/VaultItemSelectionView.swift b/BitwardenShared/UI/Vault/Vault/VaultItemSelection/VaultItemSelectionView.swift index 78ed29fb7d..1bc6ea475c 100644 --- a/BitwardenShared/UI/Vault/Vault/VaultItemSelection/VaultItemSelectionView.swift +++ b/BitwardenShared/UI/Vault/Vault/VaultItemSelection/VaultItemSelectionView.swift @@ -137,7 +137,7 @@ private struct VaultItemSelectionSearchableView: View { get: \.toast, send: VaultItemSelectionAction.toastShown )) - .background(Color(asset: Asset.Colors.backgroundSecondary).ignoresSafeArea()) + .background(Color(asset: Asset.Colors.backgroundPrimary).ignoresSafeArea()) } // MARK: Private Views @@ -158,7 +158,7 @@ private struct VaultItemSelectionSearchableView: View { } icon: { Asset.Images.plus.swiftUIImage .imageStyle(.accessoryIcon( - color: Asset.Colors.textPrimaryInverted.swiftUIColor, + color: Asset.Colors.buttonFilledForeground.swiftUIColor, scaleWithFont: true )) } @@ -203,7 +203,7 @@ private struct VaultItemSelectionSearchableView: View { vaultListItemView(item, hasDivider: store.state.searchResults.last != item) } } - .background(Asset.Colors.backgroundPrimary.swiftUIColor) + .background(Asset.Colors.backgroundSecondary.swiftUIColor) } } diff --git a/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_empty.1.png b/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_empty.1.png index 63eaf4ab32..e2ac5748ce 100644 Binary files a/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_empty.1.png and b/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_empty.1.png differ diff --git a/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_empty.2.png b/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_empty.2.png index 79c90d4e8b..2d16ec7479 100644 Binary files a/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_empty.2.png and b/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_empty.2.png differ diff --git a/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_empty.3.png b/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_empty.3.png index f5d5f4dc1a..e4e06a8b7b 100644 Binary files a/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_empty.3.png and b/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_empty.3.png differ diff --git a/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_emptyNoAccountOrIssuer.1.png b/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_emptyNoAccountOrIssuer.1.png index 0ea7b0d048..73b217d2ef 100644 Binary files a/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_emptyNoAccountOrIssuer.1.png and b/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_emptyNoAccountOrIssuer.1.png differ diff --git a/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_populated.1.png b/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_populated.1.png index a5770b3f33..545b0a8dba 100644 Binary files a/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_populated.1.png and b/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_populated.1.png differ diff --git a/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_populated.2.png b/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_populated.2.png index 22f8c88021..46e176f82f 100644 Binary files a/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_populated.2.png and b/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_populated.2.png differ diff --git a/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_populated.3.png b/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_populated.3.png index 12117e1610..fd1e5fc56f 100644 Binary files a/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_populated.3.png and b/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_populated.3.png differ diff --git a/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_search.1.png b/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_search.1.png index b44e11b397..738e3e70d6 100644 Binary files a/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_search.1.png and b/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_search.1.png differ diff --git a/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_search.2.png b/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_search.2.png index 79f00cfd24..aabec1f427 100644 Binary files a/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_search.2.png and b/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_search.2.png differ diff --git a/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_search.3.png b/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_search.3.png index ba65785a1f..3fe2d55d86 100644 Binary files a/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_search.3.png and b/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_search.3.png differ diff --git a/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_searchEmpty.1.png b/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_searchEmpty.1.png index cb38068b07..cc685eb2ff 100644 Binary files a/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_searchEmpty.1.png and b/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_searchEmpty.1.png differ diff --git a/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_searchEmpty.2.png b/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_searchEmpty.2.png index b37050aba4..28082abf17 100644 Binary files a/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_searchEmpty.2.png and b/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_searchEmpty.2.png differ diff --git a/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_searchEmpty.3.png b/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_searchEmpty.3.png index 0270666530..a47c07b090 100644 Binary files a/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_searchEmpty.3.png and b/BitwardenShared/UI/Vault/Vault/VaultItemSelection/__Snapshots__/VaultItemSelectionViewTests/test_snapshot_cipherSelection_searchEmpty.3.png differ diff --git a/BitwardenShared/UI/Vault/Vault/VaultList/SearchVaultFilterRowView/SearchVaultFilterRowView.swift b/BitwardenShared/UI/Vault/Vault/VaultList/SearchVaultFilterRowView/SearchVaultFilterRowView.swift index 4d30efca48..b73ca63edf 100644 --- a/BitwardenShared/UI/Vault/Vault/VaultList/SearchVaultFilterRowView/SearchVaultFilterRowView.swift +++ b/BitwardenShared/UI/Vault/Vault/VaultList/SearchVaultFilterRowView/SearchVaultFilterRowView.swift @@ -52,7 +52,7 @@ struct SearchVaultFilterRowView: View { .padding(.vertical, 9) .frame(minHeight: 60) .accessibilityIdentifier(accessibilityID ?? "") - .background(Asset.Colors.backgroundPrimary.swiftUIColor) + .background(Asset.Colors.backgroundSecondary.swiftUIColor) if hasDivider { Divider() diff --git a/BitwardenShared/UI/Vault/Vault/VaultList/VaultListView.swift b/BitwardenShared/UI/Vault/Vault/VaultList/VaultListView.swift index 4206870487..d9684f5af7 100644 --- a/BitwardenShared/UI/Vault/Vault/VaultList/VaultListView.swift +++ b/BitwardenShared/UI/Vault/Vault/VaultList/VaultListView.swift @@ -41,7 +41,7 @@ private struct SearchableVaultListView: View { search .hidden(!isSearching) } - .background(Asset.Colors.backgroundSecondary.swiftUIColor.ignoresSafeArea()) + .background(Asset.Colors.backgroundPrimary.swiftUIColor.ignoresSafeArea()) .toast(store.binding( get: \.toast, send: VaultListAction.toastShown @@ -111,7 +111,7 @@ private struct SearchableVaultListView: View { for: item, isLastInSection: store.state.searchResults.last == item ) - .background(Asset.Colors.backgroundPrimary.swiftUIColor) + .background(Asset.Colors.backgroundSecondary.swiftUIColor) } .accessibilityIdentifier("CipherCell") } diff --git a/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_empty.1.png b/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_empty.1.png index 2723f7313b..352a8ebfa0 100644 Binary files a/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_empty.1.png and b/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_empty.1.png differ diff --git a/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_empty_singleAccountProfileSwitcher.1.png b/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_empty_singleAccountProfileSwitcher.1.png index 88384a10a1..449b04dedd 100644 Binary files a/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_empty_singleAccountProfileSwitcher.1.png and b/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_empty_singleAccountProfileSwitcher.1.png differ diff --git a/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_myVault.1.png b/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_myVault.1.png index 38d061682e..1c5d7a8590 100644 Binary files a/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_myVault.1.png and b/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_myVault.1.png differ diff --git a/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_myVault.2.png b/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_myVault.2.png index fa0e8c2873..2ca8eabf1a 100644 Binary files a/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_myVault.2.png and b/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_myVault.2.png differ diff --git a/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_myVault.3.png b/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_myVault.3.png index 2e71ec9450..ed429a6554 100644 Binary files a/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_myVault.3.png and b/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_myVault.3.png differ diff --git a/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_vaultListView_previews.2.png b/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_vaultListView_previews.2.png index ed791fc073..e20396a328 100644 Binary files a/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_vaultListView_previews.2.png and b/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_vaultListView_previews.2.png differ diff --git a/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_vaultListView_previews.3.png b/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_vaultListView_previews.3.png index 689adb8616..c443301f3a 100644 Binary files a/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_vaultListView_previews.3.png and b/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_vaultListView_previews.3.png differ diff --git a/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_vaultListView_previews.4.png b/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_vaultListView_previews.4.png index e915e31bf6..391bec718c 100644 Binary files a/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_vaultListView_previews.4.png and b/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_vaultListView_previews.4.png differ diff --git a/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_vaultListView_previews.5.png b/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_vaultListView_previews.5.png index 241575c90f..c00dab6b21 100644 Binary files a/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_vaultListView_previews.5.png and b/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_vaultListView_previews.5.png differ diff --git a/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_vaultListView_previews.6.png b/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_vaultListView_previews.6.png index a7830bd7a6..a9029121e3 100644 Binary files a/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_vaultListView_previews.6.png and b/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_vaultListView_previews.6.png differ diff --git a/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_vaultListView_previews.7.png b/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_vaultListView_previews.7.png index 17bcb7c9bb..88aa72d7ed 100644 Binary files a/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_vaultListView_previews.7.png and b/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_vaultListView_previews.7.png differ diff --git a/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_vaultListView_previews.8.png b/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_vaultListView_previews.8.png index 8d99a35d81..d247a5dc0a 100644 Binary files a/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_vaultListView_previews.8.png and b/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_vaultListView_previews.8.png differ diff --git a/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_vaultListView_previews.9.png b/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_vaultListView_previews.9.png index 76ab77f751..c42392b162 100644 Binary files a/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_vaultListView_previews.9.png and b/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_vaultListView_previews.9.png differ diff --git a/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_withMultipleSearchResults.1.png b/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_withMultipleSearchResults.1.png index 4d9e47e74e..8f0bda66dd 100644 Binary files a/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_withMultipleSearchResults.1.png and b/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_withMultipleSearchResults.1.png differ diff --git a/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_withSearchResult.1.png b/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_withSearchResult.1.png index 8a501db555..c96c51b2a4 100644 Binary files a/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_withSearchResult.1.png and b/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_withSearchResult.1.png differ diff --git a/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_withoutSearchResult.1.png b/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_withoutSearchResult.1.png index 76f49bdf01..2d44debd7a 100644 Binary files a/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_withoutSearchResult.1.png and b/BitwardenShared/UI/Vault/Vault/VaultList/__Snapshots__/VaultListViewTests/test_snapshot_withoutSearchResult.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/AddEditCardItemView.swift b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/AddEditCardItemView.swift index 04379ab1ab..c3837f34dc 100644 --- a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/AddEditCardItemView.swift +++ b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/AddEditCardItemView.swift @@ -128,7 +128,7 @@ struct AddEditCardItemView_Previews: PreviewProvider { ) .padding(16) } - .background(Asset.Colors.backgroundSecondary.swiftUIColor) + .background(Asset.Colors.backgroundPrimary.swiftUIColor) .navigationBar(title: "Empty Add Edit State", titleDisplayMode: .inline) } .previewDisplayName("Empty Add Edit State") @@ -153,7 +153,7 @@ struct AddEditCardItemView_Previews: PreviewProvider { ) .padding(16) } - .background(Asset.Colors.backgroundSecondary.swiftUIColor) + .background(Asset.Colors.backgroundPrimary.swiftUIColor) .navigationBar(title: "Hidden Add Edit State", titleDisplayMode: .inline) } .previewDisplayName("Hidden Add Edit State") @@ -180,7 +180,7 @@ struct AddEditCardItemView_Previews: PreviewProvider { ) .padding(16) } - .background(Asset.Colors.backgroundSecondary.swiftUIColor) + .background(Asset.Colors.backgroundPrimary.swiftUIColor) .navigationBar(title: "Visible Add Edit State", titleDisplayMode: .inline) } .previewDisplayName("Visible Add Edit State") diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/__Snapshots__/AddEditCardItemViewTests/test_snapshot_addEditCardItemView.1.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/__Snapshots__/AddEditCardItemViewTests/test_snapshot_addEditCardItemView.1.png index 13053797eb..394fc52351 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/__Snapshots__/AddEditCardItemViewTests/test_snapshot_addEditCardItemView.1.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/__Snapshots__/AddEditCardItemViewTests/test_snapshot_addEditCardItemView.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/__Snapshots__/AddEditCardItemViewTests/test_snapshot_addEditCardItemView.2.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/__Snapshots__/AddEditCardItemViewTests/test_snapshot_addEditCardItemView.2.png index cb3c017a37..dbbe31a22f 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/__Snapshots__/AddEditCardItemViewTests/test_snapshot_addEditCardItemView.2.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/__Snapshots__/AddEditCardItemViewTests/test_snapshot_addEditCardItemView.2.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/__Snapshots__/AddEditCardItemViewTests/test_snapshot_addEditCardItemView.3.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/__Snapshots__/AddEditCardItemViewTests/test_snapshot_addEditCardItemView.3.png index 8e43c11c91..583990a8aa 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/__Snapshots__/AddEditCardItemViewTests/test_snapshot_addEditCardItemView.3.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/__Snapshots__/AddEditCardItemViewTests/test_snapshot_addEditCardItemView.3.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/__Snapshots__/AddEditCardItemViewTests/test_snapshot_addEditCardItemView.4.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/__Snapshots__/AddEditCardItemViewTests/test_snapshot_addEditCardItemView.4.png index d4a1767a46..ed87425e29 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/__Snapshots__/AddEditCardItemViewTests/test_snapshot_addEditCardItemView.4.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/__Snapshots__/AddEditCardItemViewTests/test_snapshot_addEditCardItemView.4.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/__Snapshots__/AddEditCardItemViewTests/test_snapshot_addEditCardItemView.5.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/__Snapshots__/AddEditCardItemViewTests/test_snapshot_addEditCardItemView.5.png index a8b7193711..d9d3122e67 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/__Snapshots__/AddEditCardItemViewTests/test_snapshot_addEditCardItemView.5.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/__Snapshots__/AddEditCardItemViewTests/test_snapshot_addEditCardItemView.5.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/__Snapshots__/AddEditCardItemViewTests/test_snapshot_addEditCardItemView.6.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/__Snapshots__/AddEditCardItemViewTests/test_snapshot_addEditCardItemView.6.png index 3008506c0e..c7505bba11 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/__Snapshots__/AddEditCardItemViewTests/test_snapshot_addEditCardItemView.6.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/__Snapshots__/AddEditCardItemViewTests/test_snapshot_addEditCardItemView.6.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/__Snapshots__/AddEditCardItemViewTests/test_snapshot_addEditCardItemView.7.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/__Snapshots__/AddEditCardItemViewTests/test_snapshot_addEditCardItemView.7.png index c1cffe257d..6430bf011c 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/__Snapshots__/AddEditCardItemViewTests/test_snapshot_addEditCardItemView.7.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/__Snapshots__/AddEditCardItemViewTests/test_snapshot_addEditCardItemView.7.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/__Snapshots__/AddEditCardItemViewTests/test_snapshot_addEditCardItemView.8.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/__Snapshots__/AddEditCardItemViewTests/test_snapshot_addEditCardItemView.8.png index 353f0d59fc..6c1b35cf14 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/__Snapshots__/AddEditCardItemViewTests/test_snapshot_addEditCardItemView.8.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/__Snapshots__/AddEditCardItemViewTests/test_snapshot_addEditCardItemView.8.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/__Snapshots__/AddEditCardItemViewTests/test_snapshot_addEditCardItemView.9.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/__Snapshots__/AddEditCardItemViewTests/test_snapshot_addEditCardItemView.9.png index 76e0d924b2..5c79b8b188 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/__Snapshots__/AddEditCardItemViewTests/test_snapshot_addEditCardItemView.9.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCardItem/__Snapshots__/AddEditCardItemViewTests/test_snapshot_addEditCardItemView.9.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCustomFields/AddEditCustomFieldsView.swift b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCustomFields/AddEditCustomFieldsView.swift index 93486cbc15..c35dec1b44 100644 --- a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCustomFields/AddEditCustomFieldsView.swift +++ b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCustomFields/AddEditCustomFieldsView.swift @@ -167,7 +167,7 @@ struct AddEditCustomFieldsView_Previews: PreviewProvider { ) .padding(16) .background( - Asset.Colors.backgroundSecondary.swiftUIColor + Asset.Colors.backgroundPrimary.swiftUIColor .ignoresSafeArea() ) } diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCustomFields/__Snapshots__/AddEditCustomFieldsViewTests/test_snapshot_allFields_dark.1.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCustomFields/__Snapshots__/AddEditCustomFieldsViewTests/test_snapshot_allFields_dark.1.png index d0938d1eb7..13949d507a 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCustomFields/__Snapshots__/AddEditCustomFieldsViewTests/test_snapshot_allFields_dark.1.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCustomFields/__Snapshots__/AddEditCustomFieldsViewTests/test_snapshot_allFields_dark.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCustomFields/__Snapshots__/AddEditCustomFieldsViewTests/test_snapshot_allFields_default.1.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCustomFields/__Snapshots__/AddEditCustomFieldsViewTests/test_snapshot_allFields_default.1.png index 6d4998139d..bb757a9af5 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCustomFields/__Snapshots__/AddEditCustomFieldsViewTests/test_snapshot_allFields_default.1.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCustomFields/__Snapshots__/AddEditCustomFieldsViewTests/test_snapshot_allFields_default.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCustomFields/__Snapshots__/AddEditCustomFieldsViewTests/test_snapshot_allFields_large.1.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCustomFields/__Snapshots__/AddEditCustomFieldsViewTests/test_snapshot_allFields_large.1.png index 2f789e023c..8c4e888062 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCustomFields/__Snapshots__/AddEditCustomFieldsViewTests/test_snapshot_allFields_large.1.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditCustomFields/__Snapshots__/AddEditCustomFieldsViewTests/test_snapshot_allFields_large.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditIdentityItem/AddEditIdentityItemView.swift b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditIdentityItem/AddEditIdentityItemView.swift index a6d144abb6..d0432c150a 100644 --- a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditIdentityItem/AddEditIdentityItemView.swift +++ b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditIdentityItem/AddEditIdentityItemView.swift @@ -260,7 +260,7 @@ struct AddEditIdentityItemView: View { } .padding(16) } - .background(Asset.Colors.backgroundSecondary.swiftUIColor) + .background(Asset.Colors.backgroundPrimary.swiftUIColor) .ignoresSafeArea() } } diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditItemView.swift b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditItemView.swift index be39bbd53c..9118e4a62f 100644 --- a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditItemView.swift +++ b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditItemView.swift @@ -73,7 +73,7 @@ struct AddEditItemView: View { .animation(.default, value: store.state.collectionsForOwner) .dismissKeyboardImmediately() .background( - Asset.Colors.backgroundSecondary.swiftUIColor + Asset.Colors.backgroundPrimary.swiftUIColor .ignoresSafeArea() ) .navigationBarTitleDisplayMode(.inline) @@ -225,7 +225,7 @@ private extension AddEditItemView { } label: { Asset.Images.questionRound.swiftUIImage } - .foregroundColor(Asset.Colors.primaryBitwarden.swiftUIColor) + .foregroundColor(Asset.Colors.iconSecondary.swiftUIColor) .accessibilityLabel(Localizations.masterPasswordRePromptHelp) } } diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditLoginItem/AddEditLoginItemView.swift b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditLoginItem/AddEditLoginItemView.swift index 350d08f856..2c3390a2cf 100644 --- a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditLoginItem/AddEditLoginItemView.swift +++ b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditLoginItem/AddEditLoginItemView.swift @@ -250,7 +250,7 @@ struct AddEditLoginItemView_Previews: PreviewProvider { } .padding(16) } - .background(Asset.Colors.backgroundSecondary.swiftUIColor) + .background(Asset.Colors.backgroundPrimary.swiftUIColor) .ignoresSafeArea() } .previewDisplayName("Empty Add Edit State") @@ -271,7 +271,7 @@ struct AddEditLoginItemView_Previews: PreviewProvider { } .padding(16) } - .background(Asset.Colors.backgroundSecondary.swiftUIColor) + .background(Asset.Colors.backgroundPrimary.swiftUIColor) .ignoresSafeArea() } .previewDisplayName("Auth Key") diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditLoginItem/__Snapshots__/AddEditLoginItemViewTests/test_snapshot_addEditLoginItemView.1.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditLoginItem/__Snapshots__/AddEditLoginItemViewTests/test_snapshot_addEditLoginItemView.1.png index fb49cdece4..4a99634950 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditLoginItem/__Snapshots__/AddEditLoginItemViewTests/test_snapshot_addEditLoginItemView.1.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditLoginItem/__Snapshots__/AddEditLoginItemViewTests/test_snapshot_addEditLoginItemView.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditLoginItem/__Snapshots__/AddEditLoginItemViewTests/test_snapshot_addEditLoginItemView.2.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditLoginItem/__Snapshots__/AddEditLoginItemViewTests/test_snapshot_addEditLoginItemView.2.png index 7c494ba213..3edeaee8ba 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditLoginItem/__Snapshots__/AddEditLoginItemViewTests/test_snapshot_addEditLoginItemView.2.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditLoginItem/__Snapshots__/AddEditLoginItemViewTests/test_snapshot_addEditLoginItemView.2.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditLoginItem/__Snapshots__/AddEditLoginItemViewTests/test_snapshot_addEditLoginItemView.3.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditLoginItem/__Snapshots__/AddEditLoginItemViewTests/test_snapshot_addEditLoginItemView.3.png index 74a513f76f..69bb821356 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditLoginItem/__Snapshots__/AddEditLoginItemViewTests/test_snapshot_addEditLoginItemView.3.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditLoginItem/__Snapshots__/AddEditLoginItemViewTests/test_snapshot_addEditLoginItemView.3.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditLoginItem/__Snapshots__/AddEditLoginItemViewTests/test_snapshot_addEditLoginItemView.4.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditLoginItem/__Snapshots__/AddEditLoginItemViewTests/test_snapshot_addEditLoginItemView.4.png index 32ff3112ca..ecf5d8be81 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditLoginItem/__Snapshots__/AddEditLoginItemViewTests/test_snapshot_addEditLoginItemView.4.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditLoginItem/__Snapshots__/AddEditLoginItemViewTests/test_snapshot_addEditLoginItemView.4.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditLoginItem/__Snapshots__/AddEditLoginItemViewTests/test_snapshot_addEditLoginItemView.5.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditLoginItem/__Snapshots__/AddEditLoginItemViewTests/test_snapshot_addEditLoginItemView.5.png index 3c96a897f5..5f3b0ab318 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditLoginItem/__Snapshots__/AddEditLoginItemViewTests/test_snapshot_addEditLoginItemView.5.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditLoginItem/__Snapshots__/AddEditLoginItemViewTests/test_snapshot_addEditLoginItemView.5.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditLoginItem/__Snapshots__/AddEditLoginItemViewTests/test_snapshot_addEditLoginItemView.6.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditLoginItem/__Snapshots__/AddEditLoginItemViewTests/test_snapshot_addEditLoginItemView.6.png index 20883cc3c6..e0ae72c9f6 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditLoginItem/__Snapshots__/AddEditLoginItemViewTests/test_snapshot_addEditLoginItemView.6.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditLoginItem/__Snapshots__/AddEditLoginItemViewTests/test_snapshot_addEditLoginItemView.6.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_add_empty.1.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_add_empty.1.png index e39751b4ab..7d0158c618 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_add_empty.1.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_add_empty.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_add_identity_full_fieldsEmpty.1.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_add_identity_full_fieldsEmpty.1.png index e2aa99c4f3..a27923f2b1 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_add_identity_full_fieldsEmpty.1.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_add_identity_full_fieldsEmpty.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_add_identity_full_fieldsFilled.1.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_add_identity_full_fieldsFilled.1.png index ca76c471e4..1eb0d8f76b 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_add_identity_full_fieldsFilled.1.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_add_identity_full_fieldsFilled.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_add_identity_full_fieldsFilled_largeText.1.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_add_identity_full_fieldsFilled_largeText.1.png index 5aa14ae94a..cdaf233182 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_add_identity_full_fieldsFilled_largeText.1.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_add_identity_full_fieldsFilled_largeText.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_add_login_collections.1.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_add_login_collections.1.png index 6019a91cc9..b91cfe0469 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_add_login_collections.1.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_add_login_collections.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_add_login_collectionsNone.1.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_add_login_collectionsNone.1.png index f0442e93bd..665b4a5937 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_add_login_collectionsNone.1.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_add_login_collectionsNone.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_add_login_full_fieldsNotVisible.1.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_add_login_full_fieldsNotVisible.1.png index e8374b947b..153c785f84 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_add_login_full_fieldsNotVisible.1.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_add_login_full_fieldsNotVisible.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_add_login_full_fieldsVisible.1.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_add_login_full_fieldsVisible.1.png index 527de44fd1..c5cec9e5d4 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_add_login_full_fieldsVisible.1.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_add_login_full_fieldsVisible.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_add_personalOwnershipPolicy.1.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_add_personalOwnershipPolicy.1.png index cb91345965..c55b6d6883 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_add_personalOwnershipPolicy.1.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_add_personalOwnershipPolicy.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_add_secureNote_full_fieldsVisible.1.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_add_secureNote_full_fieldsVisible.1.png index 3b38bcadeb..20ef5b896e 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_add_secureNote_full_fieldsVisible.1.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_add_secureNote_full_fieldsVisible.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_edit_full_disabledViewPassword.1.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_edit_full_disabledViewPassword.1.png index 814587ed56..b987330c32 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_edit_full_disabledViewPassword.1.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_edit_full_disabledViewPassword.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_edit_full_fieldsNotVisible.1.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_edit_full_fieldsNotVisible.1.png index 346e9c70ff..fefa144e11 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_edit_full_fieldsNotVisible.1.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_edit_full_fieldsNotVisible.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_edit_full_fieldsNotVisible_largeText.1.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_edit_full_fieldsNotVisible_largeText.1.png index 8a53f41d91..49cee86e91 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_edit_full_fieldsNotVisible_largeText.1.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_edit_full_fieldsNotVisible_largeText.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_edit_full_fieldsVisible.1.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_edit_full_fieldsVisible.1.png index a15c867063..014dc94bae 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_edit_full_fieldsVisible.1.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_edit_full_fieldsVisible.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_edit_full_fieldsVisible_largeText.1.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_edit_full_fieldsVisible_largeText.1.png index a09b97bd58..1ed9da624d 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_edit_full_fieldsVisible_largeText.1.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_edit_full_fieldsVisible_largeText.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.1.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.1.png index bb48eda9de..a3b488ce84 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.1.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.10.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.10.png index bc30b62445..94e75a453a 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.10.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.10.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.11.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.11.png index a4d6ef1845..793076878e 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.11.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.11.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.12.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.12.png index 726bfb52f7..3667e57e7d 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.12.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.12.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.13.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.13.png index c36d8625be..ce3f645d56 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.13.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.13.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.14.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.14.png index 93b711af07..514df923d8 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.14.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.14.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.15.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.15.png index f071e18b62..5dfed583fb 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.15.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.15.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.2.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.2.png index 4c6415f8b7..fd3c238f48 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.2.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.2.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.3.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.3.png index d85f49e44c..b1fd9c8bef 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.3.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.3.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.4.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.4.png index 00c33f5aed..bd128f6e2c 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.4.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.4.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.5.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.5.png index abb826639a..9d136516de 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.5.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.5.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.6.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.6.png index d7b1e535f4..58cfb0ff5b 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.6.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.6.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.7.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.7.png index 2d4da002e9..52e1c7c743 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.7.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.7.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.8.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.8.png index 2fd69cc93f..ed758dad69 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.8.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.8.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.9.png b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.9.png index 1b4f2676f4..bbc30bb59c 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.9.png and b/BitwardenShared/UI/Vault/VaultItem/AddEditItem/__Snapshots__/AddEditItemViewTests/test_snapshot_previews_addEditItemView.9.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/Attachments/AttachmentsView.swift b/BitwardenShared/UI/Vault/VaultItem/Attachments/AttachmentsView.swift index db2fbcb9f1..c152751231 100644 --- a/BitwardenShared/UI/Vault/VaultItem/Attachments/AttachmentsView.swift +++ b/BitwardenShared/UI/Vault/VaultItem/Attachments/AttachmentsView.swift @@ -137,7 +137,7 @@ struct AttachmentsView: View { store.send(.deletePressed(attachment)) } label: { Image(asset: Asset.Images.trash) - .imageStyle(.rowIcon(color: Asset.Colors.primaryBitwarden.swiftUIColor)) + .imageStyle(.rowIcon(color: Asset.Colors.iconSecondary.swiftUIColor)) } .accessibilityLabel(Localizations.delete) } @@ -148,7 +148,7 @@ struct AttachmentsView: View { .padding(.leading, 16) } } - .background(Asset.Colors.backgroundPrimary.swiftUIColor) + .background(Asset.Colors.backgroundSecondary.swiftUIColor) .accessibilityIdentifier("AttachmentRow") } } diff --git a/BitwardenShared/UI/Vault/VaultItem/Attachments/__Snapshots__/AttachmentsViewTests/test_snapshot_attachments_empty_dark.1.png b/BitwardenShared/UI/Vault/VaultItem/Attachments/__Snapshots__/AttachmentsViewTests/test_snapshot_attachments_empty_dark.1.png index fd0f98c16d..f093f5c80b 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/Attachments/__Snapshots__/AttachmentsViewTests/test_snapshot_attachments_empty_dark.1.png and b/BitwardenShared/UI/Vault/VaultItem/Attachments/__Snapshots__/AttachmentsViewTests/test_snapshot_attachments_empty_dark.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/Attachments/__Snapshots__/AttachmentsViewTests/test_snapshot_attachments_empty_default.1.png b/BitwardenShared/UI/Vault/VaultItem/Attachments/__Snapshots__/AttachmentsViewTests/test_snapshot_attachments_empty_default.1.png index c4093e6ea1..3c00ed47cf 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/Attachments/__Snapshots__/AttachmentsViewTests/test_snapshot_attachments_empty_default.1.png and b/BitwardenShared/UI/Vault/VaultItem/Attachments/__Snapshots__/AttachmentsViewTests/test_snapshot_attachments_empty_default.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/Attachments/__Snapshots__/AttachmentsViewTests/test_snapshot_attachments_empty_large.1.png b/BitwardenShared/UI/Vault/VaultItem/Attachments/__Snapshots__/AttachmentsViewTests/test_snapshot_attachments_empty_large.1.png index 28ac73639b..94b13d2c82 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/Attachments/__Snapshots__/AttachmentsViewTests/test_snapshot_attachments_empty_large.1.png and b/BitwardenShared/UI/Vault/VaultItem/Attachments/__Snapshots__/AttachmentsViewTests/test_snapshot_attachments_empty_large.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/Attachments/__Snapshots__/AttachmentsViewTests/test_snapshot_attachments_several_dark.1.png b/BitwardenShared/UI/Vault/VaultItem/Attachments/__Snapshots__/AttachmentsViewTests/test_snapshot_attachments_several_dark.1.png index bcd69ba175..4dc2a596ac 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/Attachments/__Snapshots__/AttachmentsViewTests/test_snapshot_attachments_several_dark.1.png and b/BitwardenShared/UI/Vault/VaultItem/Attachments/__Snapshots__/AttachmentsViewTests/test_snapshot_attachments_several_dark.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/Attachments/__Snapshots__/AttachmentsViewTests/test_snapshot_attachments_several_default.1.png b/BitwardenShared/UI/Vault/VaultItem/Attachments/__Snapshots__/AttachmentsViewTests/test_snapshot_attachments_several_default.1.png index 14fc300b37..77e89e0332 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/Attachments/__Snapshots__/AttachmentsViewTests/test_snapshot_attachments_several_default.1.png and b/BitwardenShared/UI/Vault/VaultItem/Attachments/__Snapshots__/AttachmentsViewTests/test_snapshot_attachments_several_default.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/Attachments/__Snapshots__/AttachmentsViewTests/test_snapshot_attachments_several_large.1.png b/BitwardenShared/UI/Vault/VaultItem/Attachments/__Snapshots__/AttachmentsViewTests/test_snapshot_attachments_several_large.1.png index 47bd27f002..778eea7b6f 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/Attachments/__Snapshots__/AttachmentsViewTests/test_snapshot_attachments_several_large.1.png and b/BitwardenShared/UI/Vault/VaultItem/Attachments/__Snapshots__/AttachmentsViewTests/test_snapshot_attachments_several_large.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AuthenticatorKeyCapture/ManualEntryView.swift b/BitwardenShared/UI/Vault/VaultItem/AuthenticatorKeyCapture/ManualEntryView.swift index 69f40b64f8..970f8113ef 100644 --- a/BitwardenShared/UI/Vault/VaultItem/AuthenticatorKeyCapture/ManualEntryView.swift +++ b/BitwardenShared/UI/Vault/VaultItem/AuthenticatorKeyCapture/ManualEntryView.swift @@ -51,7 +51,7 @@ struct ManualEntryView: View { footer } .background( - Asset.Colors.backgroundSecondary.swiftUIColor + Asset.Colors.backgroundPrimary.swiftUIColor .ignoresSafeArea() ) .scrollView() @@ -78,7 +78,7 @@ struct ManualEntryView: View { await store.perform(.scanCodePressed) } label: { Text(Localizations.scanQRCode) - .foregroundColor(Asset.Colors.primaryBitwarden.swiftUIColor) + .foregroundColor(Asset.Colors.textInteraction.swiftUIColor) .styleGuide(.callout) } .buttonStyle(InlineButtonStyle()) diff --git a/BitwardenShared/UI/Vault/VaultItem/AuthenticatorKeyCapture/ScanCodeView.swift b/BitwardenShared/UI/Vault/VaultItem/AuthenticatorKeyCapture/ScanCodeView.swift index 78fa3fc4a8..a10b0ec270 100644 --- a/BitwardenShared/UI/Vault/VaultItem/AuthenticatorKeyCapture/ScanCodeView.swift +++ b/BitwardenShared/UI/Vault/VaultItem/AuthenticatorKeyCapture/ScanCodeView.swift @@ -21,7 +21,7 @@ struct ScanCodeView: View { var body: some View { content - .background(Asset.Colors.backgroundSecondary.swiftUIColor.ignoresSafeArea()) + .background(Asset.Colors.backgroundPrimary.swiftUIColor.ignoresSafeArea()) .navigationTitle(Localizations.scanQrTitle) .navigationBarTitleDisplayMode(.inline) .toolbar { @@ -53,16 +53,14 @@ struct ScanCodeView: View { .styleGuide(.body) .multilineTextAlignment(.center) .dynamicTypeSize(...maxDynamicTypeSize) - .foregroundColor(.white) Spacer() Button( action: { store.send(.manualEntryPressed) }, label: { Group { Text(Localizations.cannotScanQRCode + " ") - .foregroundColor(.white) + Text(Localizations.enterKeyManually) - .foregroundColor(Asset.Colors.primaryBitwardenDark.swiftUIColor) + .foregroundColor(Asset.Colors.textInteraction.swiftUIColor) } .styleGuide(.body) .multilineTextAlignment(.center) @@ -71,6 +69,8 @@ struct ScanCodeView: View { ) .buttonStyle(InlineButtonStyle()) } + .foregroundColor(Asset.Colors.textPrimary.swiftUIColor) + .environment(\.colorScheme, .dark) } @ViewBuilder var overlayContent: some View { @@ -131,7 +131,7 @@ struct ScanCodeView: View { private func qrCornerGuides(length: CGFloat) -> some View { CornerBorderShape(cornerLength: length * 0.1, lineWidth: 3) .stroke(lineWidth: 3) - .foregroundColor(Asset.Colors.primaryBitwardenLight.swiftUIColor) + .foregroundColor(Asset.Colors.iconSecondary.swiftUIColor) .frame( width: length * 0.65, height: length * 0.65 diff --git a/BitwardenShared/UI/Vault/VaultItem/AuthenticatorKeyCapture/__Snapshots__/ManualEntryViewTests/test_snapshot_manualEntryView_empty.1.png b/BitwardenShared/UI/Vault/VaultItem/AuthenticatorKeyCapture/__Snapshots__/ManualEntryViewTests/test_snapshot_manualEntryView_empty.1.png index 24c74ba223..b62309c574 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AuthenticatorKeyCapture/__Snapshots__/ManualEntryViewTests/test_snapshot_manualEntryView_empty.1.png and b/BitwardenShared/UI/Vault/VaultItem/AuthenticatorKeyCapture/__Snapshots__/ManualEntryViewTests/test_snapshot_manualEntryView_empty.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AuthenticatorKeyCapture/__Snapshots__/ManualEntryViewTests/test_snapshot_manualEntryView_empty_landscape.1.png b/BitwardenShared/UI/Vault/VaultItem/AuthenticatorKeyCapture/__Snapshots__/ManualEntryViewTests/test_snapshot_manualEntryView_empty_landscape.1.png index c142e76fa3..af97162826 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AuthenticatorKeyCapture/__Snapshots__/ManualEntryViewTests/test_snapshot_manualEntryView_empty_landscape.1.png and b/BitwardenShared/UI/Vault/VaultItem/AuthenticatorKeyCapture/__Snapshots__/ManualEntryViewTests/test_snapshot_manualEntryView_empty_landscape.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AuthenticatorKeyCapture/__Snapshots__/ManualEntryViewTests/test_snapshot_manualEntryView_text_dark.1.png b/BitwardenShared/UI/Vault/VaultItem/AuthenticatorKeyCapture/__Snapshots__/ManualEntryViewTests/test_snapshot_manualEntryView_text_dark.1.png index 07a27f4133..5e156f6f3f 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AuthenticatorKeyCapture/__Snapshots__/ManualEntryViewTests/test_snapshot_manualEntryView_text_dark.1.png and b/BitwardenShared/UI/Vault/VaultItem/AuthenticatorKeyCapture/__Snapshots__/ManualEntryViewTests/test_snapshot_manualEntryView_text_dark.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AuthenticatorKeyCapture/__Snapshots__/ManualEntryViewTests/test_snapshot_manualEntryView_text_largeText.1.png b/BitwardenShared/UI/Vault/VaultItem/AuthenticatorKeyCapture/__Snapshots__/ManualEntryViewTests/test_snapshot_manualEntryView_text_largeText.1.png index c4241cdfb1..0fe9cb4e96 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AuthenticatorKeyCapture/__Snapshots__/ManualEntryViewTests/test_snapshot_manualEntryView_text_largeText.1.png and b/BitwardenShared/UI/Vault/VaultItem/AuthenticatorKeyCapture/__Snapshots__/ManualEntryViewTests/test_snapshot_manualEntryView_text_largeText.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AuthenticatorKeyCapture/__Snapshots__/ManualEntryViewTests/test_snapshot_manualEntryView_text_light.1.png b/BitwardenShared/UI/Vault/VaultItem/AuthenticatorKeyCapture/__Snapshots__/ManualEntryViewTests/test_snapshot_manualEntryView_text_light.1.png index 0ab04b608a..0e16fc2a14 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AuthenticatorKeyCapture/__Snapshots__/ManualEntryViewTests/test_snapshot_manualEntryView_text_light.1.png and b/BitwardenShared/UI/Vault/VaultItem/AuthenticatorKeyCapture/__Snapshots__/ManualEntryViewTests/test_snapshot_manualEntryView_text_light.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AuthenticatorKeyCapture/__Snapshots__/ScanCodeViewTests/test_snapshot_scanCodeView_previews.1.png b/BitwardenShared/UI/Vault/VaultItem/AuthenticatorKeyCapture/__Snapshots__/ScanCodeViewTests/test_snapshot_scanCodeView_previews.1.png index 8c99e127cf..581a1586d7 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AuthenticatorKeyCapture/__Snapshots__/ScanCodeViewTests/test_snapshot_scanCodeView_previews.1.png and b/BitwardenShared/UI/Vault/VaultItem/AuthenticatorKeyCapture/__Snapshots__/ScanCodeViewTests/test_snapshot_scanCodeView_previews.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AuthenticatorKeyCapture/__Snapshots__/ScanCodeViewTests/test_snapshot_scanCodeView_previews.2.png b/BitwardenShared/UI/Vault/VaultItem/AuthenticatorKeyCapture/__Snapshots__/ScanCodeViewTests/test_snapshot_scanCodeView_previews.2.png index b462f535ca..cbfbf2920b 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AuthenticatorKeyCapture/__Snapshots__/ScanCodeViewTests/test_snapshot_scanCodeView_previews.2.png and b/BitwardenShared/UI/Vault/VaultItem/AuthenticatorKeyCapture/__Snapshots__/ScanCodeViewTests/test_snapshot_scanCodeView_previews.2.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/AuthenticatorKeyCapture/__Snapshots__/ScanCodeViewTests/test_snapshot_scanCodeView_previews.3.png b/BitwardenShared/UI/Vault/VaultItem/AuthenticatorKeyCapture/__Snapshots__/ScanCodeViewTests/test_snapshot_scanCodeView_previews.3.png index 469ded9e09..b975a5d3a8 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/AuthenticatorKeyCapture/__Snapshots__/ScanCodeViewTests/test_snapshot_scanCodeView_previews.3.png and b/BitwardenShared/UI/Vault/VaultItem/AuthenticatorKeyCapture/__Snapshots__/ScanCodeViewTests/test_snapshot_scanCodeView_previews.3.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/EditCollections/__Snapshots__/EditCollectionsViewTests/test_snapshot_editCollections.1.png b/BitwardenShared/UI/Vault/VaultItem/EditCollections/__Snapshots__/EditCollectionsViewTests/test_snapshot_editCollections.1.png index ee606d8d54..b58baaed2c 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/EditCollections/__Snapshots__/EditCollectionsViewTests/test_snapshot_editCollections.1.png and b/BitwardenShared/UI/Vault/VaultItem/EditCollections/__Snapshots__/EditCollectionsViewTests/test_snapshot_editCollections.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/EditCollections/__Snapshots__/EditCollectionsViewTests/test_snapshot_editCollections.2.png b/BitwardenShared/UI/Vault/VaultItem/EditCollections/__Snapshots__/EditCollectionsViewTests/test_snapshot_editCollections.2.png index bcfbb5a0d3..6dad6fa1c1 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/EditCollections/__Snapshots__/EditCollectionsViewTests/test_snapshot_editCollections.2.png and b/BitwardenShared/UI/Vault/VaultItem/EditCollections/__Snapshots__/EditCollectionsViewTests/test_snapshot_editCollections.2.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/EditCollections/__Snapshots__/EditCollectionsViewTests/test_snapshot_editCollections.3.png b/BitwardenShared/UI/Vault/VaultItem/EditCollections/__Snapshots__/EditCollectionsViewTests/test_snapshot_editCollections.3.png index 4e62501bf6..d960b933a7 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/EditCollections/__Snapshots__/EditCollectionsViewTests/test_snapshot_editCollections.3.png and b/BitwardenShared/UI/Vault/VaultItem/EditCollections/__Snapshots__/EditCollectionsViewTests/test_snapshot_editCollections.3.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/MoveToOrganization/__Snapshots__/MoveToOrganizationViewTests/test_snapshot_moveToOrganization_collections.1.png b/BitwardenShared/UI/Vault/VaultItem/MoveToOrganization/__Snapshots__/MoveToOrganizationViewTests/test_snapshot_moveToOrganization_collections.1.png index e0730f2a89..03417c981c 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/MoveToOrganization/__Snapshots__/MoveToOrganizationViewTests/test_snapshot_moveToOrganization_collections.1.png and b/BitwardenShared/UI/Vault/VaultItem/MoveToOrganization/__Snapshots__/MoveToOrganizationViewTests/test_snapshot_moveToOrganization_collections.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/MoveToOrganization/__Snapshots__/MoveToOrganizationViewTests/test_snapshot_moveToOrganization_collections.2.png b/BitwardenShared/UI/Vault/VaultItem/MoveToOrganization/__Snapshots__/MoveToOrganizationViewTests/test_snapshot_moveToOrganization_collections.2.png index a58e2d3dac..9107c53287 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/MoveToOrganization/__Snapshots__/MoveToOrganizationViewTests/test_snapshot_moveToOrganization_collections.2.png and b/BitwardenShared/UI/Vault/VaultItem/MoveToOrganization/__Snapshots__/MoveToOrganizationViewTests/test_snapshot_moveToOrganization_collections.2.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/MoveToOrganization/__Snapshots__/MoveToOrganizationViewTests/test_snapshot_moveToOrganization_collections.3.png b/BitwardenShared/UI/Vault/VaultItem/MoveToOrganization/__Snapshots__/MoveToOrganizationViewTests/test_snapshot_moveToOrganization_collections.3.png index f70c197791..4dcb1cd940 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/MoveToOrganization/__Snapshots__/MoveToOrganizationViewTests/test_snapshot_moveToOrganization_collections.3.png and b/BitwardenShared/UI/Vault/VaultItem/MoveToOrganization/__Snapshots__/MoveToOrganizationViewTests/test_snapshot_moveToOrganization_collections.3.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/MoveToOrganization/__Snapshots__/MoveToOrganizationViewTests/test_snapshot_moveToOrganization_empty.1.png b/BitwardenShared/UI/Vault/VaultItem/MoveToOrganization/__Snapshots__/MoveToOrganizationViewTests/test_snapshot_moveToOrganization_empty.1.png index 0b694465f1..adc834ee4e 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/MoveToOrganization/__Snapshots__/MoveToOrganizationViewTests/test_snapshot_moveToOrganization_empty.1.png and b/BitwardenShared/UI/Vault/VaultItem/MoveToOrganization/__Snapshots__/MoveToOrganizationViewTests/test_snapshot_moveToOrganization_empty.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/MoveToOrganization/__Snapshots__/MoveToOrganizationViewTests/test_snapshot_moveToOrganization_empty.2.png b/BitwardenShared/UI/Vault/VaultItem/MoveToOrganization/__Snapshots__/MoveToOrganizationViewTests/test_snapshot_moveToOrganization_empty.2.png index 1b98eda9ee..2fad3e6984 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/MoveToOrganization/__Snapshots__/MoveToOrganizationViewTests/test_snapshot_moveToOrganization_empty.2.png and b/BitwardenShared/UI/Vault/VaultItem/MoveToOrganization/__Snapshots__/MoveToOrganizationViewTests/test_snapshot_moveToOrganization_empty.2.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/MoveToOrganization/__Snapshots__/MoveToOrganizationViewTests/test_snapshot_moveToOrganization_empty.3.png b/BitwardenShared/UI/Vault/VaultItem/MoveToOrganization/__Snapshots__/MoveToOrganizationViewTests/test_snapshot_moveToOrganization_empty.3.png index 6c5554b567..faaeaa3054 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/MoveToOrganization/__Snapshots__/MoveToOrganizationViewTests/test_snapshot_moveToOrganization_empty.3.png and b/BitwardenShared/UI/Vault/VaultItem/MoveToOrganization/__Snapshots__/MoveToOrganizationViewTests/test_snapshot_moveToOrganization_empty.3.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewCardItem/ViewCardItemView.swift b/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewCardItem/ViewCardItemView.swift index 5b92b30d24..4c07cb6169 100644 --- a/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewCardItem/ViewCardItemView.swift +++ b/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewCardItem/ViewCardItemView.swift @@ -161,7 +161,7 @@ struct ViewCardItemView_Previews: PreviewProvider { ) .padding(16) } - .background(Asset.Colors.backgroundSecondary.swiftUIColor) + .background(Asset.Colors.backgroundPrimary.swiftUIColor) .navigationBar(title: "Empty View State", titleDisplayMode: .inline) } .previewDisplayName("Empty View State") @@ -190,7 +190,7 @@ struct ViewCardItemView_Previews: PreviewProvider { ) .padding(16) } - .background(Asset.Colors.backgroundSecondary.swiftUIColor) + .background(Asset.Colors.backgroundPrimary.swiftUIColor) .navigationBar(title: "Visible View State", titleDisplayMode: .inline) } .previewDisplayName("Visible Add Edit State") @@ -217,7 +217,7 @@ struct ViewCardItemView_Previews: PreviewProvider { ) .padding(16) } - .background(Asset.Colors.backgroundSecondary.swiftUIColor) + .background(Asset.Colors.backgroundPrimary.swiftUIColor) .navigationBar(title: "Hidden View State", titleDisplayMode: .inline) } .previewDisplayName("Hidden View State") @@ -244,7 +244,7 @@ struct ViewCardItemView_Previews: PreviewProvider { ) .padding(16) } - .background(Asset.Colors.backgroundSecondary.swiftUIColor) + .background(Asset.Colors.backgroundPrimary.swiftUIColor) .navigationBar(title: "Hidden View State", titleDisplayMode: .inline) } .previewDisplayName("No Expiration") @@ -271,7 +271,7 @@ struct ViewCardItemView_Previews: PreviewProvider { ) .padding(16) } - .background(Asset.Colors.backgroundSecondary.swiftUIColor) + .background(Asset.Colors.backgroundPrimary.swiftUIColor) .navigationBar(title: "Hidden View State", titleDisplayMode: .inline) } .previewDisplayName("Year But Not Month") diff --git a/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewCardItem/__Snapshots__/ViewCardItemViewTests/test_snapshot_viewCardItemView_full.1.png b/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewCardItem/__Snapshots__/ViewCardItemViewTests/test_snapshot_viewCardItemView_full.1.png index f4b3285b64..e4801e16a6 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewCardItem/__Snapshots__/ViewCardItemViewTests/test_snapshot_viewCardItemView_full.1.png and b/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewCardItem/__Snapshots__/ViewCardItemViewTests/test_snapshot_viewCardItemView_full.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewCardItem/__Snapshots__/ViewCardItemViewTests/test_snapshot_viewCardItemView_full_dark.1.png b/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewCardItem/__Snapshots__/ViewCardItemViewTests/test_snapshot_viewCardItemView_full_dark.1.png index 9b74f73770..ddce9a1d9f 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewCardItem/__Snapshots__/ViewCardItemViewTests/test_snapshot_viewCardItemView_full_dark.1.png and b/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewCardItem/__Snapshots__/ViewCardItemViewTests/test_snapshot_viewCardItemView_full_dark.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewCardItem/__Snapshots__/ViewCardItemViewTests/test_snapshot_viewCardItemView_full_largeFont.1.png b/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewCardItem/__Snapshots__/ViewCardItemViewTests/test_snapshot_viewCardItemView_full_largeFont.1.png index b146d86ad3..f93056b508 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewCardItem/__Snapshots__/ViewCardItemViewTests/test_snapshot_viewCardItemView_full_largeFont.1.png and b/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewCardItem/__Snapshots__/ViewCardItemViewTests/test_snapshot_viewCardItemView_full_largeFont.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewCardItem/__Snapshots__/ViewCardItemViewTests/test_snapshot_viewCardItemView_hiddenCode.1.png b/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewCardItem/__Snapshots__/ViewCardItemViewTests/test_snapshot_viewCardItemView_hiddenCode.1.png index 99e26856ca..7ae2e89932 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewCardItem/__Snapshots__/ViewCardItemViewTests/test_snapshot_viewCardItemView_hiddenCode.1.png and b/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewCardItem/__Snapshots__/ViewCardItemViewTests/test_snapshot_viewCardItemView_hiddenCode.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewCardItem/__Snapshots__/ViewCardItemViewTests/test_snapshot_viewCardItemView_noExpirationState.1.png b/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewCardItem/__Snapshots__/ViewCardItemViewTests/test_snapshot_viewCardItemView_noExpirationState.1.png index bf5eab5c56..d729bfda08 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewCardItem/__Snapshots__/ViewCardItemViewTests/test_snapshot_viewCardItemView_noExpirationState.1.png and b/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewCardItem/__Snapshots__/ViewCardItemViewTests/test_snapshot_viewCardItemView_noExpirationState.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewCardItem/__Snapshots__/ViewCardItemViewTests/test_snapshot_viewCardItemView_partialExpirationState.1.png b/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewCardItem/__Snapshots__/ViewCardItemViewTests/test_snapshot_viewCardItemView_partialExpirationState.1.png index b99ab2f7cd..5e2cd771b2 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewCardItem/__Snapshots__/ViewCardItemViewTests/test_snapshot_viewCardItemView_partialExpirationState.1.png and b/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewCardItem/__Snapshots__/ViewCardItemViewTests/test_snapshot_viewCardItemView_partialExpirationState.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewIdentityItem/ViewIdentityItemView.swift b/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewIdentityItem/ViewIdentityItemView.swift index b38c0ff2f8..c0c8a549be 100644 --- a/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewIdentityItem/ViewIdentityItemView.swift +++ b/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewIdentityItem/ViewIdentityItemView.swift @@ -122,7 +122,7 @@ struct ViewIdentityItemView: View { } .padding(16) } - .background(Asset.Colors.backgroundSecondary.swiftUIColor) + .background(Asset.Colors.backgroundPrimary.swiftUIColor) .ignoresSafeArea() } } diff --git a/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewItemDetailsView.swift b/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewItemDetailsView.swift index 1427808efa..edba82b564 100644 --- a/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewItemDetailsView.swift +++ b/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewItemDetailsView.swift @@ -70,7 +70,7 @@ struct ViewItemDetailsView: View { .frame(maxWidth: .infinity, minHeight: 28, alignment: .leading) .padding(.horizontal, 16) .padding(.vertical, 8) - .background(Asset.Colors.backgroundPrimary.swiftUIColor) + .background(Asset.Colors.backgroundSecondary.swiftUIColor) .clipShape(RoundedRectangle(cornerRadius: 10)) } else { BitwardenField(title: customField.name) { @@ -202,9 +202,9 @@ struct ViewItemDetailsView: View { store.send(.passwordHistoryPressed) } label: { Text("\(passwordHistoryCount)") - .underline(color: Asset.Colors.primaryBitwarden.swiftUIColor) + .underline(color: Asset.Colors.textInteraction.swiftUIColor) } - .foregroundStyle(Asset.Colors.primaryBitwarden.swiftUIColor) + .foregroundStyle(Asset.Colors.textInteraction.swiftUIColor) .id("passwordHistoryButton") } .accessibilityLabel(Localizations.passwordHistory + ": \(passwordHistoryCount)") @@ -280,7 +280,7 @@ struct ViewItemDetailsView: View { store.send(.downloadAttachment(attachment)) } label: { Image(asset: Asset.Images.download) - .imageStyle(.rowIcon(color: Asset.Colors.primaryBitwarden.swiftUIColor)) + .imageStyle(.rowIcon(color: Asset.Colors.iconSecondary.swiftUIColor)) } .accessibilityLabel(Localizations.download) } @@ -291,7 +291,7 @@ struct ViewItemDetailsView: View { .padding(.leading, 16) } } - .background(Asset.Colors.backgroundPrimary.swiftUIColor) + .background(Asset.Colors.backgroundSecondary.swiftUIColor) .accessibilityElement(children: .contain) .accessibilityIdentifier("CipherAttachment") } diff --git a/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewItemView.swift b/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewItemView.swift index 47daaa816c..0c7dce8101 100644 --- a/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewItemView.swift +++ b/BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewItemView.swift @@ -38,7 +38,7 @@ struct ViewItemView: View { details(for: viewState) } } - .background(Asset.Colors.backgroundSecondary.swiftUIColor.ignoresSafeArea()) + .background(Asset.Colors.backgroundPrimary.swiftUIColor.ignoresSafeArea()) .navigationTitle(navigationTitle) .navigationBarTitleDisplayMode(.inline) .toast(store.binding( diff --git a/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_identity_withAllValues.1.png b/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_identity_withAllValues.1.png index 544a5a2a17..3f75e499bc 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_identity_withAllValues.1.png and b/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_identity_withAllValues.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_identity_withAllValues_largeText.1.png b/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_identity_withAllValues_largeText.1.png index a67d9d9ac6..6d994c9242 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_identity_withAllValues_largeText.1.png and b/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_identity_withAllValues_largeText.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_login_disabledViewPassword.1.png b/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_login_disabledViewPassword.1.png index be764e7f4c..ee9f814a49 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_login_disabledViewPassword.1.png and b/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_login_disabledViewPassword.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_login_hiddenTotp.1.png b/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_login_hiddenTotp.1.png index 158e662101..11a110dcb9 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_login_hiddenTotp.1.png and b/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_login_hiddenTotp.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_login_withAllValues.1.png b/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_login_withAllValues.1.png index 713bf21687..bedfd71d60 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_login_withAllValues.1.png and b/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_login_withAllValues.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_login_withAllValues_exceptTotp_noPremium.1.png b/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_login_withAllValues_exceptTotp_noPremium.1.png index 337f7c0d0f..be2b76fa7e 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_login_withAllValues_exceptTotp_noPremium.1.png and b/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_login_withAllValues_exceptTotp_noPremium.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_login_withAllValues_largeText.1.png b/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_login_withAllValues_largeText.1.png index 8fa4a6a403..e7b9a1bf0e 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_login_withAllValues_largeText.1.png and b/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_login_withAllValues_largeText.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_login_withAllValues_noPremium.1.png b/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_login_withAllValues_noPremium.1.png index fd9151a704..d12644e249 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_login_withAllValues_noPremium.1.png and b/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_login_withAllValues_noPremium.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_login_withAllValues_noPremium_largeText.1.png b/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_login_withAllValues_noPremium_largeText.1.png index 33c9379897..940cf5287d 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_login_withAllValues_noPremium_largeText.1.png and b/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_login_withAllValues_noPremium_largeText.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_previews_card.1.png b/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_previews_card.1.png index c7c5e8cafd..4ec91f1acf 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_previews_card.1.png and b/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_previews_card.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_previews_card_dark.1.png b/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_previews_card_dark.1.png index 02310a420f..030c5760db 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_previews_card_dark.1.png and b/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_previews_card_dark.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_previews_card_largeText.1.png b/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_previews_card_largeText.1.png index 150cbc1400..9815655d92 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_previews_card_largeText.1.png and b/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_previews_card_largeText.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_previews_login.1.png b/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_previews_login.1.png index b671c66064..69557a06e7 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_previews_login.1.png and b/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_previews_login.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_previews_login_dark.1.png b/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_previews_login_dark.1.png index d13dcaeed8..5e25a88dca 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_previews_login_dark.1.png and b/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_previews_login_dark.1.png differ diff --git a/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_previews_login_largeText.1.png b/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_previews_login_largeText.1.png index c0c4213a13..a0342a9f19 100644 Binary files a/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_previews_login_largeText.1.png and b/BitwardenShared/UI/Vault/VaultItem/ViewItem/__Snapshots__/ViewItemViewTests/test_snapshot_previews_login_largeText.1.png differ diff --git a/BitwardenShared/UI/Vault/Views/CircularProgressShapeTests.swift b/BitwardenShared/UI/Vault/Views/CircularProgressShapeTests.swift index 38cf3dec6d..4bb43ed27d 100644 --- a/BitwardenShared/UI/Vault/Views/CircularProgressShapeTests.swift +++ b/BitwardenShared/UI/Vault/Views/CircularProgressShapeTests.swift @@ -14,7 +14,7 @@ final class CircularProgressShapeTests: BitwardenTestCase { clockwise: true ) .stroke(lineWidth: 3) - .foregroundColor(Asset.Colors.primaryBitwarden.swiftUIColor) + .foregroundColor(Asset.Colors.iconSecondary.swiftUIColor) .frame(width: 30, height: 30) CircularProgressShape( progress: 0.4, diff --git a/BitwardenShared/UI/Vault/Views/TOTPCountdownTimerView.swift b/BitwardenShared/UI/Vault/Views/TOTPCountdownTimerView.swift index 9314778bda..a1680b2a08 100644 --- a/BitwardenShared/UI/Vault/Views/TOTPCountdownTimerView.swift +++ b/BitwardenShared/UI/Vault/Views/TOTPCountdownTimerView.swift @@ -34,7 +34,7 @@ struct TOTPCountdownTimerView: View { .background { CircularProgressShape(progress: timer.remainingFraction, clockwise: true) .stroke(lineWidth: 3) - .foregroundColor(Asset.Colors.primaryBitwarden.swiftUIColor) + .foregroundColor(Asset.Colors.iconSecondary.swiftUIColor) .animation( .smooth( duration: TOTPCountdownTimerView.timerInterval diff --git a/BitwardenShared/UI/Vault/Views/VaultListItemRow/VaultListItemRowView.swift b/BitwardenShared/UI/Vault/Views/VaultListItemRow/VaultListItemRowView.swift index c38a308bc8..a425b54984 100644 --- a/BitwardenShared/UI/Vault/Views/VaultListItemRow/VaultListItemRowView.swift +++ b/BitwardenShared/UI/Vault/Views/VaultListItemRow/VaultListItemRowView.swift @@ -152,7 +152,7 @@ struct VaultListItemRowView: View { } label: { Asset.Images.copy.swiftUIImage } - .foregroundColor(Asset.Colors.primaryBitwarden.swiftUIColor) + .foregroundColor(Asset.Colors.iconPrimary.swiftUIColor) .accessibilityLabel(Localizations.copyTotp) } } diff --git a/BitwardenShared/UI/Vault/Views/VaultListItemRow/__Snapshots__/VaultListItemRowViewTests/test_snapshot_default.1.png b/BitwardenShared/UI/Vault/Views/VaultListItemRow/__Snapshots__/VaultListItemRowViewTests/test_snapshot_default.1.png index d69046a6f9..b6ecf6a5e0 100644 Binary files a/BitwardenShared/UI/Vault/Views/VaultListItemRow/__Snapshots__/VaultListItemRowViewTests/test_snapshot_default.1.png and b/BitwardenShared/UI/Vault/Views/VaultListItemRow/__Snapshots__/VaultListItemRowViewTests/test_snapshot_default.1.png differ diff --git a/BitwardenShared/UI/Vault/Views/VaultListItemRow/__Snapshots__/VaultListItemRowViewTests/test_snapshot_fido2RpIdAndsubtitle.1.png b/BitwardenShared/UI/Vault/Views/VaultListItemRow/__Snapshots__/VaultListItemRowViewTests/test_snapshot_fido2RpIdAndsubtitle.1.png index c837aa9ae9..a2cfd755bf 100644 Binary files a/BitwardenShared/UI/Vault/Views/VaultListItemRow/__Snapshots__/VaultListItemRowViewTests/test_snapshot_fido2RpIdAndsubtitle.1.png and b/BitwardenShared/UI/Vault/Views/VaultListItemRow/__Snapshots__/VaultListItemRowViewTests/test_snapshot_fido2RpIdAndsubtitle.1.png differ diff --git a/BitwardenShared/UI/Vault/Views/VaultListItemRow/__Snapshots__/VaultListItemRowViewTests/test_snapshot_fido2Subtitle.1.png b/BitwardenShared/UI/Vault/Views/VaultListItemRow/__Snapshots__/VaultListItemRowViewTests/test_snapshot_fido2Subtitle.1.png index 4162873420..35bf20daae 100644 Binary files a/BitwardenShared/UI/Vault/Views/VaultListItemRow/__Snapshots__/VaultListItemRowViewTests/test_snapshot_fido2Subtitle.1.png and b/BitwardenShared/UI/Vault/Views/VaultListItemRow/__Snapshots__/VaultListItemRowViewTests/test_snapshot_fido2Subtitle.1.png differ diff --git a/BitwardenShared/UI/Vault/Views/VaultListItemRow/__Snapshots__/VaultListItemRowViewTests/test_snapshot_organization.1.png b/BitwardenShared/UI/Vault/Views/VaultListItemRow/__Snapshots__/VaultListItemRowViewTests/test_snapshot_organization.1.png index c40ae11343..42b162b1e9 100644 Binary files a/BitwardenShared/UI/Vault/Views/VaultListItemRow/__Snapshots__/VaultListItemRowViewTests/test_snapshot_organization.1.png and b/BitwardenShared/UI/Vault/Views/VaultListItemRow/__Snapshots__/VaultListItemRowViewTests/test_snapshot_organization.1.png differ diff --git a/BitwardenShared/UI/Vault/Views/VaultListItemRow/__Snapshots__/VaultListItemRowViewTests/test_snapshot_showWebIcon.1.png b/BitwardenShared/UI/Vault/Views/VaultListItemRow/__Snapshots__/VaultListItemRowViewTests/test_snapshot_showWebIcon.1.png index d69046a6f9..b6ecf6a5e0 100644 Binary files a/BitwardenShared/UI/Vault/Views/VaultListItemRow/__Snapshots__/VaultListItemRowViewTests/test_snapshot_showWebIcon.1.png and b/BitwardenShared/UI/Vault/Views/VaultListItemRow/__Snapshots__/VaultListItemRowViewTests/test_snapshot_showWebIcon.1.png differ diff --git a/BitwardenShared/UI/Vault/Views/VaultListItemRow/__Snapshots__/VaultListItemRowViewTests/test_snapshot_subtitle.1.png b/BitwardenShared/UI/Vault/Views/VaultListItemRow/__Snapshots__/VaultListItemRowViewTests/test_snapshot_subtitle.1.png index 072c4ba549..f1839e97c6 100644 Binary files a/BitwardenShared/UI/Vault/Views/VaultListItemRow/__Snapshots__/VaultListItemRowViewTests/test_snapshot_subtitle.1.png and b/BitwardenShared/UI/Vault/Views/VaultListItemRow/__Snapshots__/VaultListItemRowViewTests/test_snapshot_subtitle.1.png differ diff --git a/BitwardenShared/UI/Vault/Views/VaultListItemRow/__Snapshots__/VaultListItemRowViewTests/test_snapshot_totp.1.png b/BitwardenShared/UI/Vault/Views/VaultListItemRow/__Snapshots__/VaultListItemRowViewTests/test_snapshot_totp.1.png index ad2bd81471..c2a6385485 100644 Binary files a/BitwardenShared/UI/Vault/Views/VaultListItemRow/__Snapshots__/VaultListItemRowViewTests/test_snapshot_totp.1.png and b/BitwardenShared/UI/Vault/Views/VaultListItemRow/__Snapshots__/VaultListItemRowViewTests/test_snapshot_totp.1.png differ diff --git a/BitwardenShared/UI/Vault/Views/VaultListSectionView.swift b/BitwardenShared/UI/Vault/Views/VaultListSectionView.swift index 6725835a02..2548a5fb8c 100644 --- a/BitwardenShared/UI/Vault/Views/VaultListSectionView.swift +++ b/BitwardenShared/UI/Vault/Views/VaultListSectionView.swift @@ -32,7 +32,7 @@ struct VaultListSectionView: View { itemContent(item) } } - .background(Asset.Colors.backgroundPrimary.swiftUIColor) + .background(Asset.Colors.backgroundSecondary.swiftUIColor) .clipShape(RoundedRectangle(cornerRadius: 10)) } } diff --git a/BitwardenShared/UI/Vault/Views/__Snapshots__/CircularProgressShapeTests/test_snapshot_progress.1.png b/BitwardenShared/UI/Vault/Views/__Snapshots__/CircularProgressShapeTests/test_snapshot_progress.1.png index 918e460b98..d6de5ba692 100644 Binary files a/BitwardenShared/UI/Vault/Views/__Snapshots__/CircularProgressShapeTests/test_snapshot_progress.1.png and b/BitwardenShared/UI/Vault/Views/__Snapshots__/CircularProgressShapeTests/test_snapshot_progress.1.png differ