From 447b3dc1e85359eb0b8366d6cc1d64e65d255771 Mon Sep 17 00:00:00 2001 From: El-Fitz <8971906+El-Fitz@users.noreply.github.com> Date: Tue, 31 Dec 2024 19:33:18 +0100 Subject: [PATCH 01/26] feat: create authentication identity input view --- .../AuthenticationIdentityInputView.swift | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 WireUI/Sources/WireAuthenticationUI/Views/AuthenticationIdentityInputView.swift diff --git a/WireUI/Sources/WireAuthenticationUI/Views/AuthenticationIdentityInputView.swift b/WireUI/Sources/WireAuthenticationUI/Views/AuthenticationIdentityInputView.swift new file mode 100644 index 00000000000..77ed34f3df1 --- /dev/null +++ b/WireUI/Sources/WireAuthenticationUI/Views/AuthenticationIdentityInputView.swift @@ -0,0 +1,67 @@ +// +// Wire +// Copyright (C) 2024 Wire Swiss GmbH +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see http://www.gnu.org/licenses/. +// + +import SwiftUI +import WireDesign +import WireFoundation +import WireReusableUIComponents + +package struct AuthenticationIdentityInputView: View { + @State private var identity: String = "" + private let termsURL: URL + + package init(termsURL: URL) { + self.termsURL = termsURL + } + + package var body: some View { + VStack(alignment: .center, spacing: 16) { + HStack { + Spacer() + .frame(maxWidth: .infinity) + Logo() + .frame(width: 164, height: 95) + Spacer() + .frame(maxWidth: .infinity) + } + Text("Simply enter you email adress to start!") + .wireTextStyle(.body1) + LabeledTextField( + mandatory: true, + placeholder: "Email or SSO code", + title: "Email or SSO code", + string: $identity + ) + Button(action: { + + }, label: { + Text("Next") + }) + .wireButtonStyle(.primary) + Text(AttributedString.markdown(from: String(format: "By pressing on “Next”, you accept Wire’s [Terms and Conditions](%@)", termsURL.absoluteString))) + .multilineTextAlignment(.center) + .wireTextStyle(.subline1) + } + } +} + +#Preview { + AuthenticationIdentityInputView(termsURL: URL(string: "https://example.com")!) + .environment(\.wireTextStyleMapping, WireTextStyleMapping()) + .padding(32) +} From 4e0db9b095e1218c608cd65ff48d4771538611fe Mon Sep 17 00:00:00 2001 From: El-Fitz <8971906+El-Fitz@users.noreply.github.com> Date: Tue, 7 Jan 2025 19:20:49 +0100 Subject: [PATCH 02/26] chore: add tests & Localizable.strings --- WireUI/Package.swift | 8 ++- .../WireAuthenticationUI/.swiftgen.yml | 14 ++++ .../Resources/en.lproj/Localizable.strings | 24 +++++++ .../AuthenticationIdentityInputView.swift | 14 ++-- ...AuthenticationIdentityInputViewTests.swift | 68 +++++++++++++++++++ .../testColorSchemeVariants.dark.png | 3 + .../testColorSchemeVariants.light.png | 3 + ...testDynamicTypeVariants.accessibility1.png | 3 + ...testDynamicTypeVariants.accessibility2.png | 3 + ...testDynamicTypeVariants.accessibility3.png | 3 + ...testDynamicTypeVariants.accessibility4.png | 3 + ...testDynamicTypeVariants.accessibility5.png | 3 + .../testDynamicTypeVariants.large.png | 3 + .../testDynamicTypeVariants.medium.png | 3 + .../testDynamicTypeVariants.small.png | 3 + .../testDynamicTypeVariants.xLarge.png | 3 + .../testDynamicTypeVariants.xSmall.png | 3 + .../testDynamicTypeVariants.xxLarge.png | 3 + .../testDynamicTypeVariants.xxxLarge.png | 3 + ...SnapshotTestReferenceImageDirectory.swift} | 11 ++- 20 files changed, 168 insertions(+), 13 deletions(-) create mode 100644 WireUI/Sources/WireAuthenticationUI/.swiftgen.yml create mode 100644 WireUI/Sources/WireAuthenticationUI/Resources/en.lproj/Localizable.strings create mode 100644 WireUI/Tests/WireAuthenticationUITests/AuthenticationIdentityInputViewTests.swift create mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.dark.png create mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.light.png create mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility1.png create mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility2.png create mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility3.png create mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility4.png create mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility5.png create mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.large.png create mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.medium.png create mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.small.png create mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xLarge.png create mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xSmall.png create mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxLarge.png create mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxxLarge.png rename WireUI/Tests/WireAuthenticationUITests/{WireIndividualToTeamMigrationTests.swift => Resources/ReferenceImages/SnapshotTestReferenceImageDirectory.swift} (78%) diff --git a/WireUI/Package.swift b/WireUI/Package.swift index 173bad98917..abbd053456f 100644 --- a/WireUI/Package.swift +++ b/WireUI/Package.swift @@ -43,9 +43,13 @@ let package = Package( .target( name: "WireAuthenticationUI", - dependencies: ["WireDesign", "WireFoundation", "WireReusableUIComponents"] + dependencies: ["WireDesign", "WireFoundation", "WireReusableUIComponents"], + plugins: [.plugin(name: "SwiftGenPlugin", package: "WirePlugins")] + ), + .testTarget( + name: "WireAuthenticationUITests", + dependencies: ["WireAuthenticationUI"] ), - .testTarget(name: "WireAuthenticationUITests", dependencies: ["WireAuthenticationUI"]), .target(name: "WireConversationListUI"), .testTarget(name: "WireConversationListUITests", dependencies: ["WireConversationListUI", "WireSettingsUI"]), diff --git a/WireUI/Sources/WireAuthenticationUI/.swiftgen.yml b/WireUI/Sources/WireAuthenticationUI/.swiftgen.yml new file mode 100644 index 00000000000..668e9ff4faf --- /dev/null +++ b/WireUI/Sources/WireAuthenticationUI/.swiftgen.yml @@ -0,0 +1,14 @@ +# Every input/output paths in the rest of the config will then be expressed relative to these. + +input_dir: ./ +output_dir: ${GENERATED}/ + +# Generate constants for your localized strings. + +strings: + inputs: + - Resources/en.lproj/Localizable.strings + filter: + outputs: + - templateName: structured-swift5 + output: Strings+Generated.swift diff --git a/WireUI/Sources/WireAuthenticationUI/Resources/en.lproj/Localizable.strings b/WireUI/Sources/WireAuthenticationUI/Resources/en.lproj/Localizable.strings new file mode 100644 index 00000000000..d66e5743747 --- /dev/null +++ b/WireUI/Sources/WireAuthenticationUI/Resources/en.lproj/Localizable.strings @@ -0,0 +1,24 @@ +// + // Wire + // Copyright (C) 2025 Wire Swiss GmbH + // + // This program is free software: you can redistribute it and/or modify + // it under the terms of the GNU General Public License as published by + // the Free Software Foundation, either version 3 of the License, or + // (at your option) any later version. + // + // This program is distributed in the hope that it will be useful, + // but WITHOUT ANY WARRANTY; without even the implied warranty of + // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + // GNU General Public License for more details. + // + // You should have received a copy of the GNU General Public License + // along with this program. If not, see http://www.gnu.org/licenses/. + // + +"authentication.identity.input.body" = "Simply enter you email adress to start!"; +"authentication.identity.input.label.placeholder" = "Email or SSO code"; +"authentication.identity.input.label.title" = "Email or SSO code"; +"authentication.identity.input.submit" = "Next"; +"authentication.identity.input.terms" = "By pressing on “Next”, you accept Wire’s [Terms and Conditions](%@)"; + diff --git a/WireUI/Sources/WireAuthenticationUI/Views/AuthenticationIdentityInputView.swift b/WireUI/Sources/WireAuthenticationUI/Views/AuthenticationIdentityInputView.swift index 77ed34f3df1..ccbc8763e28 100644 --- a/WireUI/Sources/WireAuthenticationUI/Views/AuthenticationIdentityInputView.swift +++ b/WireUI/Sources/WireAuthenticationUI/Views/AuthenticationIdentityInputView.swift @@ -42,7 +42,7 @@ package struct AuthenticationIdentityInputView: View { Text("Simply enter you email adress to start!") .wireTextStyle(.body1) LabeledTextField( - mandatory: true, + isMandatory: true, placeholder: "Email or SSO code", title: "Email or SSO code", string: $identity @@ -60,8 +60,14 @@ package struct AuthenticationIdentityInputView: View { } } +struct AuthenticationIdentityInputPreview: View { + var body: some View { + AuthenticationIdentityInputView(termsURL: URL(string: "https://example.com")!) + .environment(\.wireTextStyleMapping, WireTextStyleMapping()) + .padding(32) + } +} + #Preview { - AuthenticationIdentityInputView(termsURL: URL(string: "https://example.com")!) - .environment(\.wireTextStyleMapping, WireTextStyleMapping()) - .padding(32) + AuthenticationIdentityInputPreview() } diff --git a/WireUI/Tests/WireAuthenticationUITests/AuthenticationIdentityInputViewTests.swift b/WireUI/Tests/WireAuthenticationUITests/AuthenticationIdentityInputViewTests.swift new file mode 100644 index 00000000000..95785ea9dd9 --- /dev/null +++ b/WireUI/Tests/WireAuthenticationUITests/AuthenticationIdentityInputViewTests.swift @@ -0,0 +1,68 @@ +// +// Wire +// Copyright (C) 2025 Wire Swiss GmbH +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see http://www.gnu.org/licenses/. +// + +import SwiftUI +import WireTestingPackage +import XCTest + +@testable import WireAuthenticationUI + +class AuthenticationIdentityInputView: XCTestCase { + private var snapshotHelper: SnapshotHelper! + + override func setUp() { + snapshotHelper = .init() + .withSnapshotDirectory(SnapshotTestReferenceImageDirectory) + } + + override func tearDown() { + snapshotHelper = nil + } + + @MainActor + func testColorSchemeVariants() { + let screenBounds = UIScreen.main.bounds + + let view = AuthenticationIdentityInputPreview() + .frame(width: screenBounds.width, height: screenBounds.height) + + snapshotHelper + .withUserInterfaceStyle(.light) + .verify(matching: view, named: "light") + snapshotHelper + .withUserInterfaceStyle(.dark) + .verify(matching: view, named: "dark") + } + + + @MainActor + func testDynamicTypeVariants() { + let screenBounds = UIScreen.main.bounds + + let view = AuthenticationIdentityInputPreview() + .frame(width: screenBounds.width, height: screenBounds.height) + + for dynamicTypeSize in DynamicTypeSize.allCases { + snapshotHelper + .verify( + matching: view.dynamicTypeSize(dynamicTypeSize), + named: "\(dynamicTypeSize)" + ) + } + } +} diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.dark.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.dark.png new file mode 100644 index 00000000000..353bda67298 --- /dev/null +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.dark.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c50c880774844d890f5055359e83df62e50fa5c2ead8316803e936cb553d3783 +size 132189 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.light.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.light.png new file mode 100644 index 00000000000..ebd9b0c681b --- /dev/null +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.light.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:62283317b66749337c2a298e1307358ff34fa496fa67cfaf990b2782616c8643 +size 128898 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility1.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility1.png new file mode 100644 index 00000000000..47690a4e7ab --- /dev/null +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a00adf6e014544257b8f37806410890ee2bac7d2d398faff2f46fa539ebd6ed5 +size 163142 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility2.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility2.png new file mode 100644 index 00000000000..8ace77da5cd --- /dev/null +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:32870cd552ee824001d045f61528584b8cbfba78dd212cdf100d3b5031403305 +size 177808 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility3.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility3.png new file mode 100644 index 00000000000..8b9b677aee8 --- /dev/null +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility3.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6622e312009bd320659eb8f10e321b23fb0be42d3ce9ae2cd036728fbfb8c6b5 +size 198236 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility4.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility4.png new file mode 100644 index 00000000000..6d08e6aed65 --- /dev/null +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility4.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c7d87003d3bdd5fa948709acc0422a20ec80ca08c776e77db2ef65fce33a1224 +size 225793 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility5.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility5.png new file mode 100644 index 00000000000..0dbdc6ad0b0 --- /dev/null +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility5.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c9534c72058df53ad332a04e374a20d2d3d98e6815df28c4129c1ddad2ad36cd +size 246106 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.large.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.large.png new file mode 100644 index 00000000000..ebd9b0c681b --- /dev/null +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.large.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:62283317b66749337c2a298e1307358ff34fa496fa67cfaf990b2782616c8643 +size 128898 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.medium.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.medium.png new file mode 100644 index 00000000000..9bb930dc0bf --- /dev/null +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.medium.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c794b8322f1aa2f941a5f42795df6080b1930465e1a38485fb3f212ccef4c7ad +size 128175 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.small.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.small.png new file mode 100644 index 00000000000..7ee48d2c750 --- /dev/null +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.small.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a83c5d248428d10ebea1ef9dc068361f236af7dc1cf42fae1458ccdbc088cc6c +size 126157 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xLarge.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xLarge.png new file mode 100644 index 00000000000..bda509654cd --- /dev/null +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xLarge.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:31c201f1e6eff1fac4de0e0e0bd727bba6ebe49aa9da757b9af796b32f411962 +size 134813 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xSmall.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xSmall.png new file mode 100644 index 00000000000..96be48cef9f --- /dev/null +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xSmall.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c27baa3dadc210d38e553d6c60ac30cde0b5a3c22fd0a0c65d4c9e0d82590efc +size 124910 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxLarge.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxLarge.png new file mode 100644 index 00000000000..857377ea1fe --- /dev/null +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxLarge.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:abf95a4a85e5c348d4f403aa09e903b6c37118e78467d34e93f1d76ee91c493f +size 140007 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxxLarge.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxxLarge.png new file mode 100644 index 00000000000..4e53a57fd25 --- /dev/null +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxxLarge.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a8d300f4044a7068f7b69d51954fdd5217ab863513f9e03164919785ea39e5a4 +size 144235 diff --git a/WireUI/Tests/WireAuthenticationUITests/WireIndividualToTeamMigrationTests.swift b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/SnapshotTestReferenceImageDirectory.swift similarity index 78% rename from WireUI/Tests/WireAuthenticationUITests/WireIndividualToTeamMigrationTests.swift rename to WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/SnapshotTestReferenceImageDirectory.swift index 8a6af86fd02..6b1997849e8 100644 --- a/WireUI/Tests/WireAuthenticationUITests/WireIndividualToTeamMigrationTests.swift +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/SnapshotTestReferenceImageDirectory.swift @@ -16,11 +16,8 @@ // along with this program. If not, see http://www.gnu.org/licenses/. // -import XCTest -@testable import WireAuthenticationUI +import Foundation -class WireAuthenticationUITests: XCTestCase { - func testExample() throws { - throw XCTSkip("[WPB-15229] Not yet implemented") - } -} +public let SnapshotTestReferenceImageDirectory = URL(fileURLWithPath: #filePath) + .deletingLastPathComponent() + .path From 2aa3c65780df6dd24fb46065241a29264b4b0dcb Mon Sep 17 00:00:00 2001 From: El-Fitz <8971906+El-Fitz@users.noreply.github.com> Date: Wed, 8 Jan 2025 06:38:13 +0100 Subject: [PATCH 03/26] chore: use L10n strings --- .../Resources/en.lproj/Localizable.strings | 4 +-- .../AuthenticationIdentityInputView.swift | 32 ++++++++++++------- ...AuthenticationIdentityInputViewTests.swift | 1 - 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/WireUI/Sources/WireAuthenticationUI/Resources/en.lproj/Localizable.strings b/WireUI/Sources/WireAuthenticationUI/Resources/en.lproj/Localizable.strings index d66e5743747..ac94d2be225 100644 --- a/WireUI/Sources/WireAuthenticationUI/Resources/en.lproj/Localizable.strings +++ b/WireUI/Sources/WireAuthenticationUI/Resources/en.lproj/Localizable.strings @@ -17,8 +17,8 @@ // "authentication.identity.input.body" = "Simply enter you email adress to start!"; -"authentication.identity.input.label.placeholder" = "Email or SSO code"; -"authentication.identity.input.label.title" = "Email or SSO code"; +"authentication.identity.input.field.placeholder" = "Email or SSO code"; +"authentication.identity.input.field.title" = "Email or SSO code"; "authentication.identity.input.submit" = "Next"; "authentication.identity.input.terms" = "By pressing on “Next”, you accept Wire’s [Terms and Conditions](%@)"; diff --git a/WireUI/Sources/WireAuthenticationUI/Views/AuthenticationIdentityInputView.swift b/WireUI/Sources/WireAuthenticationUI/Views/AuthenticationIdentityInputView.swift index ccbc8763e28..8f87db8040d 100644 --- a/WireUI/Sources/WireAuthenticationUI/Views/AuthenticationIdentityInputView.swift +++ b/WireUI/Sources/WireAuthenticationUI/Views/AuthenticationIdentityInputView.swift @@ -1,6 +1,6 @@ // // Wire -// Copyright (C) 2024 Wire Swiss GmbH +// Copyright (C) 2025 Wire Swiss GmbH // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -22,10 +22,17 @@ import WireFoundation import WireReusableUIComponents package struct AuthenticationIdentityInputView: View { + + package enum Action { + case submit(identity: String) + } + @State private var identity: String = "" + private let actionCallback: @Sendable (Action) -> Void private let termsURL: URL - package init(termsURL: URL) { + package init(actionCallback: @escaping @Sendable (Action) -> Void, termsURL: URL) { + self.actionCallback = actionCallback self.termsURL = termsURL } @@ -39,21 +46,21 @@ package struct AuthenticationIdentityInputView: View { Spacer() .frame(maxWidth: .infinity) } - Text("Simply enter you email adress to start!") + Text(L10n.Authentication.Identity.Input.body) .wireTextStyle(.body1) LabeledTextField( isMandatory: true, - placeholder: "Email or SSO code", - title: "Email or SSO code", + placeholder: L10n.Authentication.Identity.Input.Field.placeholder, + title: L10n.Authentication.Identity.Input.Field.title, string: $identity ) Button(action: { - + actionCallback(.submit(identity: identity)) }, label: { - Text("Next") + Text(L10n.Authentication.Identity.Input.submit) }) .wireButtonStyle(.primary) - Text(AttributedString.markdown(from: String(format: "By pressing on “Next”, you accept Wire’s [Terms and Conditions](%@)", termsURL.absoluteString))) + Text(AttributedString.markdown(from: L10n.Authentication.Identity.Input.terms(termsURL.absoluteString))) .multilineTextAlignment(.center) .wireTextStyle(.subline1) } @@ -62,9 +69,12 @@ package struct AuthenticationIdentityInputView: View { struct AuthenticationIdentityInputPreview: View { var body: some View { - AuthenticationIdentityInputView(termsURL: URL(string: "https://example.com")!) - .environment(\.wireTextStyleMapping, WireTextStyleMapping()) - .padding(32) + AuthenticationIdentityInputView( + actionCallback: { _ in }, + termsURL: URL(string: "https://example.com")! + ) + .environment(\.wireTextStyleMapping, WireTextStyleMapping()) + .padding(32) } } diff --git a/WireUI/Tests/WireAuthenticationUITests/AuthenticationIdentityInputViewTests.swift b/WireUI/Tests/WireAuthenticationUITests/AuthenticationIdentityInputViewTests.swift index 95785ea9dd9..2e1da689c53 100644 --- a/WireUI/Tests/WireAuthenticationUITests/AuthenticationIdentityInputViewTests.swift +++ b/WireUI/Tests/WireAuthenticationUITests/AuthenticationIdentityInputViewTests.swift @@ -49,7 +49,6 @@ class AuthenticationIdentityInputView: XCTestCase { .verify(matching: view, named: "dark") } - @MainActor func testDynamicTypeVariants() { let screenBounds = UIScreen.main.bounds From 82889b5b1731a0a70fa083426288e2cff5babf41 Mon Sep 17 00:00:00 2001 From: El-Fitz <8971906+El-Fitz@users.noreply.github.com> Date: Fri, 10 Jan 2025 18:13:23 +0100 Subject: [PATCH 04/26] chore: update snapshots to use iPhone 14 iOS 17.5 --- .../testColorSchemeVariants.dark.png | 4 ++-- .../testColorSchemeVariants.light.png | 4 ++-- .../testDynamicTypeVariants.accessibility1.png | 4 ++-- .../testDynamicTypeVariants.accessibility2.png | 4 ++-- .../testDynamicTypeVariants.accessibility3.png | 4 ++-- .../testDynamicTypeVariants.accessibility4.png | 4 ++-- .../testDynamicTypeVariants.accessibility5.png | 4 ++-- .../testDynamicTypeVariants.large.png | 4 ++-- .../testDynamicTypeVariants.medium.png | 4 ++-- .../testDynamicTypeVariants.small.png | 4 ++-- .../testDynamicTypeVariants.xLarge.png | 4 ++-- .../testDynamicTypeVariants.xSmall.png | 4 ++-- .../testDynamicTypeVariants.xxLarge.png | 4 ++-- .../testDynamicTypeVariants.xxxLarge.png | 4 ++-- 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.dark.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.dark.png index 353bda67298..a0b4f0d06c7 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.dark.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.dark.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c50c880774844d890f5055359e83df62e50fa5c2ead8316803e936cb553d3783 -size 132189 +oid sha256:a561d63d5b51cda171995a0022b12ff71b423ec033ffde632743099ede00e6b6 +size 113598 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.light.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.light.png index ebd9b0c681b..1aa19b3ee15 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.light.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.light.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:62283317b66749337c2a298e1307358ff34fa496fa67cfaf990b2782616c8643 -size 128898 +oid sha256:cddefc3e6026bf59bb956f55319bf265d30d13e345546cc63c7a4f9c4e6fbd23 +size 113176 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility1.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility1.png index 47690a4e7ab..01ff1d0f786 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility1.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a00adf6e014544257b8f37806410890ee2bac7d2d398faff2f46fa539ebd6ed5 -size 163142 +oid sha256:bd72ed28875d0853d2ba615ae8d505331fc30fb6b773bd69c6afe000e5deaaae +size 146722 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility2.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility2.png index 8ace77da5cd..83adfa78251 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility2.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:32870cd552ee824001d045f61528584b8cbfba78dd212cdf100d3b5031403305 -size 177808 +oid sha256:5fe7780b0904ee521c39a398c0aff261e1398996894fbcb563287da4bc04b75c +size 162667 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility3.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility3.png index 8b9b677aee8..4c27d100924 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility3.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6622e312009bd320659eb8f10e321b23fb0be42d3ce9ae2cd036728fbfb8c6b5 -size 198236 +oid sha256:b7cc75cb013e80dca5156ce64bf6e4bb1c9ff402fbcf157daaed153bcee76814 +size 186950 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility4.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility4.png index 6d08e6aed65..1a2cc7403ef 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility4.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c7d87003d3bdd5fa948709acc0422a20ec80ca08c776e77db2ef65fce33a1224 -size 225793 +oid sha256:18fc00cb38b900499241feebb95e20f03159392174841b3d5ed38a33a3323ec9 +size 205772 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility5.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility5.png index 0dbdc6ad0b0..d9d5816e524 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility5.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c9534c72058df53ad332a04e374a20d2d3d98e6815df28c4129c1ddad2ad36cd -size 246106 +oid sha256:58426bd2e77b427e6963827cb3b44476ff57db511c7ee78d17ffccc5bc4732d5 +size 206737 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.large.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.large.png index ebd9b0c681b..1aa19b3ee15 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.large.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.large.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:62283317b66749337c2a298e1307358ff34fa496fa67cfaf990b2782616c8643 -size 128898 +oid sha256:cddefc3e6026bf59bb956f55319bf265d30d13e345546cc63c7a4f9c4e6fbd23 +size 113176 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.medium.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.medium.png index 9bb930dc0bf..804cf00cb4e 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.medium.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.medium.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c794b8322f1aa2f941a5f42795df6080b1930465e1a38485fb3f212ccef4c7ad -size 128175 +oid sha256:9daa108f067ab51fa7d0ed3321f35abf00415ffd58b79312da2c978baaf7c7c8 +size 111172 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.small.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.small.png index 7ee48d2c750..d69969a80b3 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.small.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.small.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a83c5d248428d10ebea1ef9dc068361f236af7dc1cf42fae1458ccdbc088cc6c -size 126157 +oid sha256:268318776faaaadb0228ef4b9d6771259d3167101866e7aaaaa6334d10dde2ae +size 109773 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xLarge.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xLarge.png index bda509654cd..fa01d768983 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xLarge.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xLarge.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:31c201f1e6eff1fac4de0e0e0bd727bba6ebe49aa9da757b9af796b32f411962 -size 134813 +oid sha256:be853a41d6de5cf4b38b2ee775b3dbba6c4707834d29b48b856d2cf71654f33b +size 119134 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xSmall.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xSmall.png index 96be48cef9f..c1ece18be70 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xSmall.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xSmall.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c27baa3dadc210d38e553d6c60ac30cde0b5a3c22fd0a0c65d4c9e0d82590efc -size 124910 +oid sha256:d976c4edf45591cad666c3be705341e2b9182008ebc835eca69fa8a225cc6601 +size 108228 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxLarge.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxLarge.png index 857377ea1fe..22f5dba9163 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxLarge.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxLarge.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:abf95a4a85e5c348d4f403aa09e903b6c37118e78467d34e93f1d76ee91c493f -size 140007 +oid sha256:4fc2c7ed8e704d0356eb765baf0d10d00bd67832c634c08a4c981c7f7ef3e63c +size 127861 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxxLarge.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxxLarge.png index 4e53a57fd25..bc9b7445a0d 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxxLarge.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxxLarge.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a8d300f4044a7068f7b69d51954fdd5217ab863513f9e03164919785ea39e5a4 -size 144235 +oid sha256:1fa6a2969669e883d8fae4681ecbdc7528262951157a3a96ec3c5dc25d1b8e8c +size 133496 From 5a4e4623c38e634718a628bca60dcbeb508e77c0 Mon Sep 17 00:00:00 2001 From: El-Fitz <8971906+El-Fitz@users.noreply.github.com> Date: Fri, 17 Jan 2025 16:51:03 +0100 Subject: [PATCH 05/26] fix: labeled text field UI --- .../Components/Logo.swift | 2 +- .../AuthenticationIdentityInputView.swift | 2 +- .../WireDesign/Colors/ColorTheme.swift | 4 + .../LabeledTextField/LabeledTextField.swift | 95 +++++++++++++++++-- .../testColorSchemeVariants.dark.png | 4 +- .../testColorSchemeVariants.light.png | 4 +- ...testDynamicTypeVariants.accessibility1.png | 4 +- ...testDynamicTypeVariants.accessibility2.png | 4 +- ...testDynamicTypeVariants.accessibility3.png | 4 +- ...testDynamicTypeVariants.accessibility4.png | 4 +- ...testDynamicTypeVariants.accessibility5.png | 4 +- .../testDynamicTypeVariants.large.png | 4 +- .../testDynamicTypeVariants.medium.png | 4 +- .../testDynamicTypeVariants.small.png | 4 +- .../testDynamicTypeVariants.xLarge.png | 4 +- .../testDynamicTypeVariants.xSmall.png | 4 +- .../testDynamicTypeVariants.xxLarge.png | 4 +- .../testDynamicTypeVariants.xxxLarge.png | 4 +- 18 files changed, 122 insertions(+), 37 deletions(-) diff --git a/WireUI/Sources/WireAuthenticationUI/Components/Logo.swift b/WireUI/Sources/WireAuthenticationUI/Components/Logo.swift index 84b17c9655a..a8951aabbf5 100644 --- a/WireUI/Sources/WireAuthenticationUI/Components/Logo.swift +++ b/WireUI/Sources/WireAuthenticationUI/Components/Logo.swift @@ -24,7 +24,7 @@ struct Logo: View { Image(ImageResource(name: "logo", bundle: .module)) .resizable() .scaledToFit() - .padding(.all, min(geometry.size.height, geometry.size.width) / 2.97) + .padding(.all, min(geometry.size.height, geometry.size.width) / 3) } } } diff --git a/WireUI/Sources/WireAuthenticationUI/Views/AuthenticationIdentityInputView.swift b/WireUI/Sources/WireAuthenticationUI/Views/AuthenticationIdentityInputView.swift index 8f87db8040d..b09b69fa48e 100644 --- a/WireUI/Sources/WireAuthenticationUI/Views/AuthenticationIdentityInputView.swift +++ b/WireUI/Sources/WireAuthenticationUI/Views/AuthenticationIdentityInputView.swift @@ -49,7 +49,7 @@ package struct AuthenticationIdentityInputView: View { Text(L10n.Authentication.Identity.Input.body) .wireTextStyle(.body1) LabeledTextField( - isMandatory: true, + isMandatory: false, placeholder: L10n.Authentication.Identity.Input.Field.placeholder, title: L10n.Authentication.Identity.Input.Field.title, string: $identity diff --git a/WireUI/Sources/WireDesign/Colors/ColorTheme.swift b/WireUI/Sources/WireDesign/Colors/ColorTheme.swift index ca9dc7dc564..387d3b1a343 100644 --- a/WireUI/Sources/WireDesign/Colors/ColorTheme.swift +++ b/WireUI/Sources/WireDesign/Colors/ColorTheme.swift @@ -46,6 +46,9 @@ public enum ColorTheme { public static let secondaryText = UIColor(light: .gray70, dark: .gray60) public static let requiredField = UIColor(light: .red500Light, dark: .red500Dark) + + public static let labelTitle = UIColor(light: .gray80, dark: .gray50) + public static let onDisabled = UIColor(light: .gray80, dark: .gray50) } public enum Backgrounds { @@ -145,6 +148,7 @@ public enum ColorTheme { public enum Strokes { public static let outline = UIColor(light: .gray40, dark: .gray90) + public static let disabledOutline = UIColor(light: .gray50, dark: .gray80) public static let dividersOutlineVariant = UIColor(light: .gray20, dark: .gray100) } diff --git a/WireUI/Sources/WireReusableUIComponents/LabeledTextField/LabeledTextField.swift b/WireUI/Sources/WireReusableUIComponents/LabeledTextField/LabeledTextField.swift index eddc8d58ba2..15e95e8375f 100644 --- a/WireUI/Sources/WireReusableUIComponents/LabeledTextField/LabeledTextField.swift +++ b/WireUI/Sources/WireReusableUIComponents/LabeledTextField/LabeledTextField.swift @@ -21,14 +21,21 @@ import WireDesign import WireFoundation public struct LabeledTextField: View { + @Environment(\.isEnabled) private var isEnabled private let isMandatory: Bool private let placeholder: String? private let title: String? + @FocusState var isFocused: Bool @Binding private var string: String - public init(isMandatory: Bool = false, placeholder: String?, title: String?, string: Binding) { + public init( + isMandatory: Bool = false, + placeholder: String?, + title: String?, + string: Binding + ) { self.isMandatory = isMandatory self.placeholder = placeholder self.title = title @@ -36,7 +43,7 @@ public struct LabeledTextField: View { } public var body: some View { - VStack(alignment: .leading) { + VStack(alignment: .leading, spacing: 2) { if let title { ( isMandatory ? ( @@ -45,12 +52,74 @@ public struct LabeledTextField: View { .foregroundColor(ColorTheme.Base.requiredField.color) ) : Text(title) ) - .wireTextStyle(.h4) + .foregroundStyle(Self.titleColor(isEnabled: isEnabled, isFocused: isFocused)) + .wireTextStyle(.subline1) } - TextField(placeholder ?? "", text: $string) - .textFieldStyle(.roundedBorder) - .wireTextStyle(.body1) + HStack(spacing: 0) { + TextField(placeholder ?? "", text: $string) + .wireTextStyle(.body1) + .focused($isFocused) + .foregroundStyle(Self.labelColor(isEnabled: isEnabled)) + .padding(.vertical, 12) + if !string.isEmpty && isEnabled { + Button(action: { + string = "" + }, label: { + Image(systemName: "xmark.circle.fill") + .foregroundStyle(.black) + .frame(width: 16, height: 16) + .padding(19) + }) + } + } + .padding(.leading, 16) + .background { + if #available(iOS 17.0, *) { + RoundedRectangle(cornerRadius: 12) + .fill(Self.labelBackgroundColor(isEnabled: isEnabled)) + .stroke(Self.labelBorderColor(isEnabled: isEnabled, isFocused: isFocused), lineWidth: 1) + } else { + RoundedRectangle(cornerRadius: 12) + .stroke(Self.labelBorderColor(isEnabled: isEnabled, isFocused: isFocused), lineWidth: 1) + .background(Self.labelBackgroundColor(isEnabled: isEnabled)) + .cornerRadius(12) + } + } + } + } + + static func titleColor(isEnabled: Bool, isFocused: Bool) -> Color { + if isEnabled && isFocused { + return ColorTheme.Base.onPrimaryVariant.color + } + if isEnabled { + return ColorTheme.Base.labelTitle.color } + return ColorTheme.Base.labelTitle.color + } + + static func labelColor(isEnabled: Bool) -> Color { + if isEnabled { + return .primaryText + } + return ColorTheme.Base.onDisabled.color + } + + static func labelBackgroundColor(isEnabled: Bool) -> Color { + if isEnabled { + return .clear + } + return ColorTheme.Backgrounds.background.color + } + + static func labelBorderColor(isEnabled: Bool, isFocused: Bool) -> Color { + if isEnabled && isFocused { + return ColorTheme.Base.onPrimaryVariant.color + } + if isEnabled { + return ColorTheme.Strokes.outline.color + } + return ColorTheme.Strokes.outline.color } } @@ -61,22 +130,34 @@ public struct LabeledTextField: View { title: nil, string: .constant("") ) + .padding() LabeledTextField( isMandatory: false, placeholder: "Placeholder", title: "Some Title", string: .constant("") ) + .padding() LabeledTextField( isMandatory: true, placeholder: "Placeholder", title: "Some Title", string: .constant("") ) + .padding() + LabeledTextField( + isMandatory: true, + placeholder: "Placeholder", + title: "Some Title", + string: .constant("Lorem ipsum dolor sit amet, consectetur [...]") + ) + .padding() LabeledTextField( isMandatory: true, placeholder: "Placeholder", title: "Some Title", - string: .constant("Lorem ipsum sic amet [...]") + string: .constant("Lorem ipsum dolor sit amet, consectetur [...]") ) + .padding() + .disabled(true) } diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.dark.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.dark.png index a0b4f0d06c7..ba1c9939179 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.dark.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.dark.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a561d63d5b51cda171995a0022b12ff71b423ec033ffde632743099ede00e6b6 -size 113598 +oid sha256:7dedf364c0b7e82927a233bbf8fc3d45b90a4be7a932b66854781924e7b604cb +size 113905 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.light.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.light.png index 1aa19b3ee15..5f03fdc36d9 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.light.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.light.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cddefc3e6026bf59bb956f55319bf265d30d13e345546cc63c7a4f9c4e6fbd23 -size 113176 +oid sha256:e06ce3b212555232f203678bc654016d3b3ec1fe1059c33b15e291fa6a26effc +size 113709 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility1.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility1.png index 01ff1d0f786..c36a937e8f5 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility1.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bd72ed28875d0853d2ba615ae8d505331fc30fb6b773bd69c6afe000e5deaaae -size 146722 +oid sha256:2267c79d2e841568f7b1d8f2542ad7a082c4b0e7fd526d42d48220abe2b59187 +size 147218 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility2.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility2.png index 83adfa78251..b1883509420 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility2.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5fe7780b0904ee521c39a398c0aff261e1398996894fbcb563287da4bc04b75c -size 162667 +oid sha256:1fd151f601983901f72fb243f8157010662284aef010b30e2a134c9eec12238c +size 161731 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility3.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility3.png index 4c27d100924..282477875ef 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility3.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b7cc75cb013e80dca5156ce64bf6e4bb1c9ff402fbcf157daaed153bcee76814 -size 186950 +oid sha256:92c7b3f650d2d0d124f71b84ed885d9f44af11d89a2dd95a970fb47dca117cbd +size 186049 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility4.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility4.png index 1a2cc7403ef..619a4f78e3f 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility4.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:18fc00cb38b900499241feebb95e20f03159392174841b3d5ed38a33a3323ec9 -size 205772 +oid sha256:1cc32d7f856322e7590166a29e4774c8fd83024769ebadc6059504957740f427 +size 211067 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility5.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility5.png index d9d5816e524..ee3ddbf1acb 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility5.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:58426bd2e77b427e6963827cb3b44476ff57db511c7ee78d17ffccc5bc4732d5 -size 206737 +oid sha256:dfdba4aff240376e939cd5d9a3e9661385f20c3b43f9a02687e74470cca0f3db +size 207492 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.large.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.large.png index 1aa19b3ee15..5f03fdc36d9 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.large.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.large.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cddefc3e6026bf59bb956f55319bf265d30d13e345546cc63c7a4f9c4e6fbd23 -size 113176 +oid sha256:e06ce3b212555232f203678bc654016d3b3ec1fe1059c33b15e291fa6a26effc +size 113709 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.medium.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.medium.png index 804cf00cb4e..75f857b3d17 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.medium.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.medium.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9daa108f067ab51fa7d0ed3321f35abf00415ffd58b79312da2c978baaf7c7c8 -size 111172 +oid sha256:ce20c3913a32ccd3e61187dc713f156d00d016089106ea7f5ddfc89c95ce3b7a +size 111643 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.small.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.small.png index d69969a80b3..7e4d79d255e 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.small.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.small.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:268318776faaaadb0228ef4b9d6771259d3167101866e7aaaaa6334d10dde2ae -size 109773 +oid sha256:dd894482e9952837968abd93d08ea0bf9cd89dd642fb68cb623ac77380a60aa2 +size 110514 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xLarge.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xLarge.png index fa01d768983..a59b3ee2764 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xLarge.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xLarge.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be853a41d6de5cf4b38b2ee775b3dbba6c4707834d29b48b856d2cf71654f33b -size 119134 +oid sha256:50162fe18b352f578407c6a06c588157943956cc8034880a5984b203671beee0 +size 119306 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xSmall.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xSmall.png index c1ece18be70..e1093f0f38a 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xSmall.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xSmall.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d976c4edf45591cad666c3be705341e2b9182008ebc835eca69fa8a225cc6601 -size 108228 +oid sha256:8d54eb5208db31ae40e4593bc216b7f8537b603e27f1faa47c9aef5b49373cce +size 109520 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxLarge.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxLarge.png index 22f5dba9163..6e823067fa6 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxLarge.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxLarge.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4fc2c7ed8e704d0356eb765baf0d10d00bd67832c634c08a4c981c7f7ef3e63c -size 127861 +oid sha256:5c4424087b7bc87e069ced87572aa5b76b99f9107ca048ae747bc12caeac122b +size 127670 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxxLarge.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxxLarge.png index bc9b7445a0d..7894e514b41 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxxLarge.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxxLarge.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1fa6a2969669e883d8fae4681ecbdc7528262951157a3a96ec3c5dc25d1b8e8c -size 133496 +oid sha256:7a791242aa92d29177509ee9f87d83fa6b30a2897a9e86b0cf6af65639a7de5c +size 133494 From a0c811200ca02a21882280749588d4577d74ae04 Mon Sep 17 00:00:00 2001 From: El-Fitz <8971906+El-Fitz@users.noreply.github.com> Date: Mon, 20 Jan 2025 14:23:55 +0100 Subject: [PATCH 06/26] style: fix formatting --- .../LabeledTextField/LabeledTextField.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/WireUI/Sources/WireReusableUIComponents/LabeledTextField/LabeledTextField.swift b/WireUI/Sources/WireReusableUIComponents/LabeledTextField/LabeledTextField.swift index 15e95e8375f..cc7df9e3473 100644 --- a/WireUI/Sources/WireReusableUIComponents/LabeledTextField/LabeledTextField.swift +++ b/WireUI/Sources/WireReusableUIComponents/LabeledTextField/LabeledTextField.swift @@ -61,7 +61,7 @@ public struct LabeledTextField: View { .focused($isFocused) .foregroundStyle(Self.labelColor(isEnabled: isEnabled)) .padding(.vertical, 12) - if !string.isEmpty && isEnabled { + if !string.isEmpty, isEnabled { Button(action: { string = "" }, label: { @@ -89,7 +89,7 @@ public struct LabeledTextField: View { } static func titleColor(isEnabled: Bool, isFocused: Bool) -> Color { - if isEnabled && isFocused { + if isEnabled, isFocused { return ColorTheme.Base.onPrimaryVariant.color } if isEnabled { @@ -113,7 +113,7 @@ public struct LabeledTextField: View { } static func labelBorderColor(isEnabled: Bool, isFocused: Bool) -> Color { - if isEnabled && isFocused { + if isEnabled, isFocused { return ColorTheme.Base.onPrimaryVariant.color } if isEnabled { From 53d23a36fc68555c2a8147bf99d1c69a37d8ef3f Mon Sep 17 00:00:00 2001 From: El-Fitz <8971906+El-Fitz@users.noreply.github.com> Date: Mon, 20 Jan 2025 14:43:14 +0100 Subject: [PATCH 07/26] fix: add authentication UI tests to WireUIAll tests --- WireUI/Tests/TestPlans/AllTests.xctestplan | 35 +++++++++++++--------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/WireUI/Tests/TestPlans/AllTests.xctestplan b/WireUI/Tests/TestPlans/AllTests.xctestplan index 7e982d3333a..258bd482f2b 100644 --- a/WireUI/Tests/TestPlans/AllTests.xctestplan +++ b/WireUI/Tests/TestPlans/AllTests.xctestplan @@ -40,50 +40,57 @@ { "target" : { "containerPath" : "container:WireUI", - "identifier" : "WireConversationListUITests", - "name" : "WireConversationListUITests" + "identifier" : "WireSidebarUITests", + "name" : "WireSidebarUITests" } }, { "target" : { "containerPath" : "container:WireUI", - "identifier" : "WireSettingsUITests", - "name" : "WireSettingsUITests" + "identifier" : "WireAuthenticationUITests", + "name" : "WireAuthenticationUITests" } }, { "target" : { "containerPath" : "container:WireUI", - "identifier" : "WireIndividualToTeamMigrationUITests", - "name" : "WireIndividualToTeamMigrationUITests" + "identifier" : "WireMainNavigationUITests", + "name" : "WireMainNavigationUITests" } }, { "target" : { "containerPath" : "container:WireUI", - "identifier" : "WireAccountImageUITests", - "name" : "WireAccountImageUITests" + "identifier" : "WireSettingsUITests", + "name" : "WireSettingsUITests" } }, { "target" : { "containerPath" : "container:WireUI", - "identifier" : "WireSidebarUITests", - "name" : "WireSidebarUITests" + "identifier" : "WireDesignTests", + "name" : "WireDesignTests" } }, { "target" : { "containerPath" : "container:WireUI", - "identifier" : "WireMainNavigationUITests", - "name" : "WireMainNavigationUITests" + "identifier" : "WireIndividualToTeamMigrationUITests", + "name" : "WireIndividualToTeamMigrationUITests" } }, { "target" : { "containerPath" : "container:WireUI", - "identifier" : "WireDesignTests", - "name" : "WireDesignTests" + "identifier" : "WireConversationListUITests", + "name" : "WireConversationListUITests" + } + }, + { + "target" : { + "containerPath" : "container:WireUI", + "identifier" : "WireAccountImageUITests", + "name" : "WireAccountImageUITests" } }, { From 4881fb0a1465e5dd0089609d208944d0f2ce254c Mon Sep 17 00:00:00 2001 From: El-Fitz <8971906+El-Fitz@users.noreply.github.com> Date: Mon, 20 Jan 2025 17:10:03 +0100 Subject: [PATCH 08/26] refactor: extract static methods out of struct scope --- .../LabeledTextField/LabeledTextField.swift | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/WireUI/Sources/WireReusableUIComponents/LabeledTextField/LabeledTextField.swift b/WireUI/Sources/WireReusableUIComponents/LabeledTextField/LabeledTextField.swift index cc7df9e3473..06686cec769 100644 --- a/WireUI/Sources/WireReusableUIComponents/LabeledTextField/LabeledTextField.swift +++ b/WireUI/Sources/WireReusableUIComponents/LabeledTextField/LabeledTextField.swift @@ -52,14 +52,14 @@ public struct LabeledTextField: View { .foregroundColor(ColorTheme.Base.requiredField.color) ) : Text(title) ) - .foregroundStyle(Self.titleColor(isEnabled: isEnabled, isFocused: isFocused)) + .foregroundStyle(titleColor(isEnabled: isEnabled, isFocused: isFocused)) .wireTextStyle(.subline1) } HStack(spacing: 0) { TextField(placeholder ?? "", text: $string) .wireTextStyle(.body1) .focused($isFocused) - .foregroundStyle(Self.labelColor(isEnabled: isEnabled)) + .foregroundStyle(labelColor(isEnabled: isEnabled)) .padding(.vertical, 12) if !string.isEmpty, isEnabled { Button(action: { @@ -76,51 +76,51 @@ public struct LabeledTextField: View { .background { if #available(iOS 17.0, *) { RoundedRectangle(cornerRadius: 12) - .fill(Self.labelBackgroundColor(isEnabled: isEnabled)) - .stroke(Self.labelBorderColor(isEnabled: isEnabled, isFocused: isFocused), lineWidth: 1) + .fill(labelBackgroundColor(isEnabled: isEnabled)) + .stroke(labelBorderColor(isEnabled: isEnabled, isFocused: isFocused), lineWidth: 1) } else { RoundedRectangle(cornerRadius: 12) - .stroke(Self.labelBorderColor(isEnabled: isEnabled, isFocused: isFocused), lineWidth: 1) - .background(Self.labelBackgroundColor(isEnabled: isEnabled)) + .stroke(labelBorderColor(isEnabled: isEnabled, isFocused: isFocused), lineWidth: 1) + .background(labelBackgroundColor(isEnabled: isEnabled)) .cornerRadius(12) } } } } +} - static func titleColor(isEnabled: Bool, isFocused: Bool) -> Color { - if isEnabled, isFocused { - return ColorTheme.Base.onPrimaryVariant.color - } - if isEnabled { - return ColorTheme.Base.labelTitle.color - } +private func titleColor(isEnabled: Bool, isFocused: Bool) -> Color { + if isEnabled, isFocused { + return ColorTheme.Base.onPrimaryVariant.color + } + if isEnabled { return ColorTheme.Base.labelTitle.color } + return ColorTheme.Base.labelTitle.color +} - static func labelColor(isEnabled: Bool) -> Color { - if isEnabled { - return .primaryText - } - return ColorTheme.Base.onDisabled.color +private func labelColor(isEnabled: Bool) -> Color { + if isEnabled { + return .primaryText } + return ColorTheme.Base.onDisabled.color +} - static func labelBackgroundColor(isEnabled: Bool) -> Color { - if isEnabled { - return .clear - } - return ColorTheme.Backgrounds.background.color +private func labelBackgroundColor(isEnabled: Bool) -> Color { + if isEnabled { + return .clear } + return ColorTheme.Backgrounds.background.color +} - static func labelBorderColor(isEnabled: Bool, isFocused: Bool) -> Color { - if isEnabled, isFocused { - return ColorTheme.Base.onPrimaryVariant.color - } - if isEnabled { - return ColorTheme.Strokes.outline.color - } +private func labelBorderColor(isEnabled: Bool, isFocused: Bool) -> Color { + if isEnabled, isFocused { + return ColorTheme.Base.onPrimaryVariant.color + } + if isEnabled { return ColorTheme.Strokes.outline.color } + return ColorTheme.Strokes.outline.color } #Preview { From 6c806cce8541b534b75f83b3851ec8f28f319882 Mon Sep 17 00:00:00 2001 From: El-Fitz <8971906+El-Fitz@users.noreply.github.com> Date: Tue, 21 Jan 2025 09:20:44 +0100 Subject: [PATCH 09/26] fix: update TeamNameView snapshots following labelled field update --- .../testColorSchemeVariants.dark.png | 4 ++-- .../testColorSchemeVariants.light.png | 4 ++-- .../testDynamicTypeVariants.accessibility1.png | 4 ++-- .../testDynamicTypeVariants.accessibility2.png | 4 ++-- .../testDynamicTypeVariants.accessibility3.png | 4 ++-- .../testDynamicTypeVariants.accessibility4.png | 4 ++-- .../testDynamicTypeVariants.accessibility5.png | 4 ++-- .../testDynamicTypeVariants.large.png | 4 ++-- .../testDynamicTypeVariants.medium.png | 4 ++-- .../testDynamicTypeVariants.small.png | 4 ++-- .../testDynamicTypeVariants.xLarge.png | 4 ++-- .../testDynamicTypeVariants.xSmall.png | 4 ++-- .../testDynamicTypeVariants.xxLarge.png | 4 ++-- .../testDynamicTypeVariants.xxxLarge.png | 4 ++-- 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testColorSchemeVariants.dark.png b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testColorSchemeVariants.dark.png index e27b53a56f5..2314cc1eefb 100644 --- a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testColorSchemeVariants.dark.png +++ b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testColorSchemeVariants.dark.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:522794a73a7040670dcdc5dea49e04dfc1334f394de60c22a636e318b6e77a87 -size 106942 +oid sha256:2945aaca0e98108971f7a6eac77c762d7c4d6ee130df19880a406a7bf621b364 +size 108432 diff --git a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testColorSchemeVariants.light.png b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testColorSchemeVariants.light.png index 7a3f3015795..6fa45eefde1 100644 --- a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testColorSchemeVariants.light.png +++ b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testColorSchemeVariants.light.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:341d03d5038b93e7beb9b77f92111dd007d128a74fcde720029e4617b35d5864 -size 99143 +oid sha256:4f4cf23ea98cfbe59fbbef3184b2f2ca6305bb8b1d89a9924ab63cb61301cb4c +size 100107 diff --git a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility1.png b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility1.png index 676442628a6..c1c5146442f 100644 --- a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility1.png +++ b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dd8bed323e5f2459999c6b47c497194b2427a0bf067ed0212cc6c9f42c49d2a8 -size 122659 +oid sha256:a2ee3fa37ad6c6dcc0803b9a46bed876b3e749cb9a403416e8733797eafcbb12 +size 123822 diff --git a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility2.png b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility2.png index 7b749bfe383..00227ce4574 100644 --- a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility2.png +++ b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:17b612daaf9ee5f387abcd89d33b26c706eaf1f602df4031a44e663bff07de1b -size 138262 +oid sha256:d776b152a33d13190f33b16a73617bdf0f8afb38aa507869b3b33f31d6ed8872 +size 139078 diff --git a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility3.png b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility3.png index 59a7e57e1bc..ea29d81118f 100644 --- a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility3.png +++ b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f74254b5c1c98ab5cbd14b9fd76f37b53b89985a66640371de815f1a0f55b76e -size 157394 +oid sha256:5b2b6a6727336983410113a97cdd709d7a25a7d3ee3d6bb24e5befb0b9f0f8f9 +size 158380 diff --git a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility4.png b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility4.png index 3c91c258bcb..a4ebb15540a 100644 --- a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility4.png +++ b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba3f3eb100d972bc6555195112d50630d04aae76af3fb3317171b1da9dc72ea8 -size 174624 +oid sha256:b55fe074a62df26bb38f010718af7f60db43c2f19d27c4fff5ed1785b76d8442 +size 175241 diff --git a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility5.png b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility5.png index 6df87d07037..ff7e7f38054 100644 --- a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility5.png +++ b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cb8e717d00359674e19fc74c903a1fa1b8fd228ec5be9166c6073366e93d3316 -size 189756 +oid sha256:e7654b19e52064791f43fd3314869e989725d90fdea30782f80af3b747c8e971 +size 189784 diff --git a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.large.png b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.large.png index 7a3f3015795..6fa45eefde1 100644 --- a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.large.png +++ b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.large.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:341d03d5038b93e7beb9b77f92111dd007d128a74fcde720029e4617b35d5864 -size 99143 +oid sha256:4f4cf23ea98cfbe59fbbef3184b2f2ca6305bb8b1d89a9924ab63cb61301cb4c +size 100107 diff --git a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.medium.png b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.medium.png index f8fa9b8ff36..e5bfc5e269e 100644 --- a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.medium.png +++ b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.medium.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5cfe2c4da46b6586065e0223a7c65e70b039d922fe69d1082b102e8d5af039b4 -size 96852 +oid sha256:a07ecb4c2b6f1bcaf1d2041b6d7a3feb2b68a588395293d7824d92bf5bf12e39 +size 98938 diff --git a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.small.png b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.small.png index 192957a01dd..d8ffa51f6d6 100644 --- a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.small.png +++ b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.small.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:91c5f3c293f8f7fd56b20dc5928db0e53aa7a549aa47e02118b5f5c6dc6838e2 -size 95122 +oid sha256:67af9a8b050a51f4c1e9fb91eac779ea72fe82a3162578de8c1694926c6c771d +size 97340 diff --git a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xLarge.png b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xLarge.png index 5032bafcc28..8dc8be3eb49 100644 --- a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xLarge.png +++ b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xLarge.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:944810acc4a076fffaa93743d11fb13f5b15f48cdb42896ba21491fb7ebeb1ce -size 104316 +oid sha256:2eacfc06619972d232f6ae7aef5092e040fea44d8654acf8e30cb7b0dea9ba06 +size 105325 diff --git a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xSmall.png b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xSmall.png index 34b64f87e2c..4d3e6d184bf 100644 --- a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xSmall.png +++ b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xSmall.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7b38626cb338beb7571a63a85ada06f01fd716e62a0f1c8c4e9ba147a91c49a5 -size 93774 +oid sha256:0a1d53090ec5fb58552850f558e8a927d70a90b809af85d43850459290aa078d +size 96135 diff --git a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xxLarge.png b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xxLarge.png index 45bd44090e2..b8305fe68f0 100644 --- a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xxLarge.png +++ b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xxLarge.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0862a0153ac361837abc1c0da0047e61ac25f399f88278e2599cab388df35beb -size 107318 +oid sha256:f50f8bd174f8c467dd6bb9701812a720412938faa95ac070c842a9824a8057ca +size 108484 diff --git a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xxxLarge.png b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xxxLarge.png index b323cb6bdc1..7fefa26b167 100644 --- a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xxxLarge.png +++ b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xxxLarge.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3d720b306795186059e552523d901542f2a6b460041ddb67cc31f167fb829438 -size 111554 +oid sha256:eac89c1429b506d2feef505f65073677e1ff40b1f865523f5c06ed40d981c811 +size 112889 From cc3441de9e912974ff8ecbac5ce1a635ef22d9ff Mon Sep 17 00:00:00 2001 From: El-Fitz <8971906+El-Fitz@users.noreply.github.com> Date: Wed, 22 Jan 2025 15:07:43 +0100 Subject: [PATCH 10/26] chore: fix typo in test class name --- .../AuthenticationIdentityInputViewTests.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WireUI/Tests/WireAuthenticationUITests/AuthenticationIdentityInputViewTests.swift b/WireUI/Tests/WireAuthenticationUITests/AuthenticationIdentityInputViewTests.swift index 2e1da689c53..e1d4d9b93f8 100644 --- a/WireUI/Tests/WireAuthenticationUITests/AuthenticationIdentityInputViewTests.swift +++ b/WireUI/Tests/WireAuthenticationUITests/AuthenticationIdentityInputViewTests.swift @@ -22,7 +22,7 @@ import XCTest @testable import WireAuthenticationUI -class AuthenticationIdentityInputView: XCTestCase { +class AuthenticationIdentityInputViewTests: XCTestCase { private var snapshotHelper: SnapshotHelper! override func setUp() { From 75c12dc7261078f5786f0af9e093bf37d1ca1556 Mon Sep 17 00:00:00 2001 From: El-Fitz <8971906+El-Fitz@users.noreply.github.com> Date: Wed, 22 Jan 2025 16:27:49 +0100 Subject: [PATCH 11/26] chore: misc requested changes, fixes & improvements --- .../Resources/en.lproj/Localizable.strings | 2 +- .../AuthenticationIdentityInputViewTests.swift | 4 ++-- .../testColorSchemeVariants.dark.png | 4 ++-- .../testColorSchemeVariants.light.png | 4 ++-- .../testDynamicTypeVariants.accessibility1.png | 4 ++-- .../testDynamicTypeVariants.accessibility2.png | 4 ++-- .../testDynamicTypeVariants.accessibility3.png | 4 ++-- .../testDynamicTypeVariants.accessibility4.png | 4 ++-- .../testDynamicTypeVariants.accessibility5.png | 4 ++-- .../testDynamicTypeVariants.large.png | 4 ++-- .../testDynamicTypeVariants.medium.png | 4 ++-- .../testDynamicTypeVariants.small.png | 4 ++-- .../testDynamicTypeVariants.xLarge.png | 4 ++-- .../testDynamicTypeVariants.xSmall.png | 4 ++-- .../testDynamicTypeVariants.xxLarge.png | 4 ++-- .../testDynamicTypeVariants.xxxLarge.png | 4 ++-- 16 files changed, 31 insertions(+), 31 deletions(-) diff --git a/WireUI/Sources/WireAuthenticationUI/Resources/en.lproj/Localizable.strings b/WireUI/Sources/WireAuthenticationUI/Resources/en.lproj/Localizable.strings index ac94d2be225..df0ef37ca58 100644 --- a/WireUI/Sources/WireAuthenticationUI/Resources/en.lproj/Localizable.strings +++ b/WireUI/Sources/WireAuthenticationUI/Resources/en.lproj/Localizable.strings @@ -16,7 +16,7 @@ // along with this program. If not, see http://www.gnu.org/licenses/. // -"authentication.identity.input.body" = "Simply enter you email adress to start!"; +"authentication.identity.input.body" = "Simply enter your email adress to start!"; "authentication.identity.input.field.placeholder" = "Email or SSO code"; "authentication.identity.input.field.title" = "Email or SSO code"; "authentication.identity.input.submit" = "Next"; diff --git a/WireUI/Tests/WireAuthenticationUITests/AuthenticationIdentityInputViewTests.swift b/WireUI/Tests/WireAuthenticationUITests/AuthenticationIdentityInputViewTests.swift index e1d4d9b93f8..edc65b6fea4 100644 --- a/WireUI/Tests/WireAuthenticationUITests/AuthenticationIdentityInputViewTests.swift +++ b/WireUI/Tests/WireAuthenticationUITests/AuthenticationIdentityInputViewTests.swift @@ -39,7 +39,7 @@ class AuthenticationIdentityInputViewTests: XCTestCase { let screenBounds = UIScreen.main.bounds let view = AuthenticationIdentityInputPreview() - .frame(width: screenBounds.width, height: screenBounds.height) + .frame(width: screenBounds.width) snapshotHelper .withUserInterfaceStyle(.light) @@ -54,7 +54,7 @@ class AuthenticationIdentityInputViewTests: XCTestCase { let screenBounds = UIScreen.main.bounds let view = AuthenticationIdentityInputPreview() - .frame(width: screenBounds.width, height: screenBounds.height) + .frame(width: screenBounds.width) for dynamicTypeSize in DynamicTypeSize.allCases { snapshotHelper diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.dark.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.dark.png index ba1c9939179..1321e7a20f7 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.dark.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.dark.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7dedf364c0b7e82927a233bbf8fc3d45b90a4be7a932b66854781924e7b604cb -size 113905 +oid sha256:cbf14cf05866bfc2cb758aaabaa088396cfd03ab9da1b88677ba55538afb0f58 +size 76734 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.light.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.light.png index 5f03fdc36d9..efaa438d267 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.light.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.light.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e06ce3b212555232f203678bc654016d3b3ec1fe1059c33b15e291fa6a26effc -size 113709 +oid sha256:4417585313d3aa405a6fe144a83d98e7a02035322cc07c04c9dc5c36247600a2 +size 79799 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility1.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility1.png index c36a937e8f5..53c4d27083c 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility1.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2267c79d2e841568f7b1d8f2542ad7a082c4b0e7fd526d42d48220abe2b59187 -size 147218 +oid sha256:c78226a0aac38c19c091c334d0278c10312cd8e682cc15206b5e83500fda408c +size 98238 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility2.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility2.png index b1883509420..e75d699bd67 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility2.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1fd151f601983901f72fb243f8157010662284aef010b30e2a134c9eec12238c -size 161731 +oid sha256:271129e50e3fd9aa00b5c99339c227f135aa8698e7d141916d7e334b7f1e54e1 +size 106292 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility3.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility3.png index 282477875ef..ba9fa43c1f3 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility3.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:92c7b3f650d2d0d124f71b84ed885d9f44af11d89a2dd95a970fb47dca117cbd -size 186049 +oid sha256:08ca27c1277179df5398a12eafcda5b0221cfd46d0a113b60516c92636597c60 +size 118583 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility4.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility4.png index 619a4f78e3f..72b9dce379d 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility4.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1cc32d7f856322e7590166a29e4774c8fd83024769ebadc6059504957740f427 -size 211067 +oid sha256:7428d5e7a5d26fffa07e468374a99b78663ddd73e71d157b7696939ace376438 +size 124447 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility5.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility5.png index ee3ddbf1acb..52ad9bda898 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility5.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dfdba4aff240376e939cd5d9a3e9661385f20c3b43f9a02687e74470cca0f3db -size 207492 +oid sha256:69c51391da8b57cb9e9f57871c95a47b1911557d28e96390749363185880de01 +size 130906 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.large.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.large.png index 5f03fdc36d9..efaa438d267 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.large.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.large.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e06ce3b212555232f203678bc654016d3b3ec1fe1059c33b15e291fa6a26effc -size 113709 +oid sha256:4417585313d3aa405a6fe144a83d98e7a02035322cc07c04c9dc5c36247600a2 +size 79799 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.medium.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.medium.png index 75f857b3d17..871c010a21e 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.medium.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.medium.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ce20c3913a32ccd3e61187dc713f156d00d016089106ea7f5ddfc89c95ce3b7a -size 111643 +oid sha256:e1617dfcaea2a07e6801d8fc1bd11a60e68e7f33d282cce653ca7bed8936c8ed +size 78484 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.small.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.small.png index 7e4d79d255e..b2394da8784 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.small.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.small.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dd894482e9952837968abd93d08ea0bf9cd89dd642fb68cb623ac77380a60aa2 -size 110514 +oid sha256:5e561a0846bcff389d43ab34ecddbc71dbdf16c85aedfe1236af1ce4cb1df500 +size 77308 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xLarge.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xLarge.png index a59b3ee2764..ad4c753c6a9 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xLarge.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xLarge.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:50162fe18b352f578407c6a06c588157943956cc8034880a5984b203671beee0 -size 119306 +oid sha256:10f1fb6d61b092c582ee073b9febefb831d82d773d48a98f8b9a44798f9ac81c +size 83446 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xSmall.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xSmall.png index e1093f0f38a..33dda99f027 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xSmall.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xSmall.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d54eb5208db31ae40e4593bc216b7f8537b603e27f1faa47c9aef5b49373cce -size 109520 +oid sha256:3954e8ee6547223bd7af6c43cb8b46f99d37d63d6278472a76566a43b5b72c36 +size 75964 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxLarge.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxLarge.png index 6e823067fa6..1f8bd349fd9 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxLarge.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxLarge.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5c4424087b7bc87e069ced87572aa5b76b99f9107ca048ae747bc12caeac122b -size 127670 +oid sha256:6ae44d9611f4fd642e9f1190da977bce4356be6e757e456e29053f832243271a +size 86553 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxxLarge.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxxLarge.png index 7894e514b41..8ee9c433391 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxxLarge.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxxLarge.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7a791242aa92d29177509ee9f87d83fa6b30a2897a9e86b0cf6af65639a7de5c -size 133494 +oid sha256:c8313ff851c6569ea67eb595a6bf310dfa827fafa1cc1eecb29b58a085ff361b +size 90808 From a5351eaeb7f673076860f8c24011fea000225f16 Mon Sep 17 00:00:00 2001 From: El-Fitz <8971906+El-Fitz@users.noreply.github.com> Date: Wed, 22 Jan 2025 17:23:50 +0100 Subject: [PATCH 12/26] refactor: LabeledTextField free functions to computed vars --- .../LabeledTextField/LabeledTextField.swift | 66 +++++++++---------- 1 file changed, 30 insertions(+), 36 deletions(-) diff --git a/WireUI/Sources/WireReusableUIComponents/LabeledTextField/LabeledTextField.swift b/WireUI/Sources/WireReusableUIComponents/LabeledTextField/LabeledTextField.swift index 06686cec769..2618b11fd75 100644 --- a/WireUI/Sources/WireReusableUIComponents/LabeledTextField/LabeledTextField.swift +++ b/WireUI/Sources/WireReusableUIComponents/LabeledTextField/LabeledTextField.swift @@ -52,14 +52,14 @@ public struct LabeledTextField: View { .foregroundColor(ColorTheme.Base.requiredField.color) ) : Text(title) ) - .foregroundStyle(titleColor(isEnabled: isEnabled, isFocused: isFocused)) + .foregroundStyle(titleColor) .wireTextStyle(.subline1) } HStack(spacing: 0) { TextField(placeholder ?? "", text: $string) .wireTextStyle(.body1) .focused($isFocused) - .foregroundStyle(labelColor(isEnabled: isEnabled)) + .foregroundStyle(labelColor) .padding(.vertical, 12) if !string.isEmpty, isEnabled { Button(action: { @@ -76,51 +76,45 @@ public struct LabeledTextField: View { .background { if #available(iOS 17.0, *) { RoundedRectangle(cornerRadius: 12) - .fill(labelBackgroundColor(isEnabled: isEnabled)) - .stroke(labelBorderColor(isEnabled: isEnabled, isFocused: isFocused), lineWidth: 1) + .fill(labelBackgroundColor) + .stroke(labelBorderColor, lineWidth: 1) } else { RoundedRectangle(cornerRadius: 12) - .stroke(labelBorderColor(isEnabled: isEnabled, isFocused: isFocused), lineWidth: 1) - .background(labelBackgroundColor(isEnabled: isEnabled)) + .stroke(labelBorderColor, lineWidth: 1) + .background(labelBackgroundColor) .cornerRadius(12) } } } } -} -private func titleColor(isEnabled: Bool, isFocused: Bool) -> Color { - if isEnabled, isFocused { - return ColorTheme.Base.onPrimaryVariant.color - } - if isEnabled { - return ColorTheme.Base.labelTitle.color - } - return ColorTheme.Base.labelTitle.color -} + private var titleColor: Color { + if isEnabled && isFocused { + return ColorTheme.Base.onPrimaryVariant.color + } + if isEnabled { + return ColorTheme.Base.labelTitle.color + } + return ColorTheme.Base.labelTitle.color + } -private func labelColor(isEnabled: Bool) -> Color { - if isEnabled { - return .primaryText - } - return ColorTheme.Base.onDisabled.color -} + private var labelColor: Color { + isEnabled ? .primaryText : ColorTheme.Base.onDisabled.color + } -private func labelBackgroundColor(isEnabled: Bool) -> Color { - if isEnabled { - return .clear - } - return ColorTheme.Backgrounds.background.color -} + private var labelBackgroundColor: Color { + isEnabled ? .clear : ColorTheme.Backgrounds.background.color + } -private func labelBorderColor(isEnabled: Bool, isFocused: Bool) -> Color { - if isEnabled, isFocused { - return ColorTheme.Base.onPrimaryVariant.color - } - if isEnabled { - return ColorTheme.Strokes.outline.color - } - return ColorTheme.Strokes.outline.color + private var labelBorderColor: Color { + if isEnabled && isFocused { + return ColorTheme.Base.onPrimaryVariant.color + } + if isEnabled { + return ColorTheme.Strokes.outline.color + } + return ColorTheme.Strokes.outline.color + } } #Preview { From ffd02db1e734c5f40bfaaf06683b733bfb6d3572 Mon Sep 17 00:00:00 2001 From: El-Fitz <8971906+El-Fitz@users.noreply.github.com> Date: Wed, 22 Jan 2025 18:26:41 +0100 Subject: [PATCH 13/26] fix formatting, update snasphots --- .../LabeledTextField/LabeledTextField.swift | 38 +++++++++---------- .../testColorSchemeVariants.dark.png | 3 ++ .../testColorSchemeVariants.light.png | 3 ++ ...testDynamicTypeVariants.accessibility1.png | 3 ++ ...testDynamicTypeVariants.accessibility2.png | 3 ++ ...testDynamicTypeVariants.accessibility3.png | 3 ++ ...testDynamicTypeVariants.accessibility4.png | 3 ++ ...testDynamicTypeVariants.accessibility5.png | 3 ++ .../testDynamicTypeVariants.large.png | 3 ++ .../testDynamicTypeVariants.medium.png | 3 ++ .../testDynamicTypeVariants.small.png | 3 ++ .../testDynamicTypeVariants.xLarge.png | 3 ++ .../testDynamicTypeVariants.xSmall.png | 3 ++ .../testDynamicTypeVariants.xxLarge.png | 3 ++ .../testDynamicTypeVariants.xxxLarge.png | 3 ++ .../testInvalidHidden.1.png | 3 ++ .../testInvalidVisible.1.png | 3 ++ .../testValidHidden.1.png | 3 ++ .../testValidVisible.1.png | 3 ++ 19 files changed, 73 insertions(+), 19 deletions(-) create mode 100644 WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testColorSchemeVariants.dark.png create mode 100644 WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testColorSchemeVariants.light.png create mode 100644 WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.accessibility1.png create mode 100644 WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.accessibility2.png create mode 100644 WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.accessibility3.png create mode 100644 WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.accessibility4.png create mode 100644 WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.accessibility5.png create mode 100644 WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.large.png create mode 100644 WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.medium.png create mode 100644 WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.small.png create mode 100644 WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.xLarge.png create mode 100644 WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.xSmall.png create mode 100644 WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.xxLarge.png create mode 100644 WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.xxxLarge.png create mode 100644 WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testInvalidHidden.1.png create mode 100644 WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testInvalidVisible.1.png create mode 100644 WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testValidHidden.1.png create mode 100644 WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testValidVisible.1.png diff --git a/WireUI/Sources/WireReusableUIComponents/LabeledTextField/LabeledTextField.swift b/WireUI/Sources/WireReusableUIComponents/LabeledTextField/LabeledTextField.swift index 2618b11fd75..04e7d5b2b84 100644 --- a/WireUI/Sources/WireReusableUIComponents/LabeledTextField/LabeledTextField.swift +++ b/WireUI/Sources/WireReusableUIComponents/LabeledTextField/LabeledTextField.swift @@ -89,32 +89,32 @@ public struct LabeledTextField: View { } private var titleColor: Color { - if isEnabled && isFocused { - return ColorTheme.Base.onPrimaryVariant.color - } - if isEnabled { - return ColorTheme.Base.labelTitle.color - } + if isEnabled, isFocused { + return ColorTheme.Base.onPrimaryVariant.color + } + if isEnabled { return ColorTheme.Base.labelTitle.color } + return ColorTheme.Base.labelTitle.color + } - private var labelColor: Color { - isEnabled ? .primaryText : ColorTheme.Base.onDisabled.color - } + private var labelColor: Color { + isEnabled ? .primaryText : ColorTheme.Base.onDisabled.color + } - private var labelBackgroundColor: Color { - isEnabled ? .clear : ColorTheme.Backgrounds.background.color - } + private var labelBackgroundColor: Color { + isEnabled ? .clear : ColorTheme.Backgrounds.background.color + } - private var labelBorderColor: Color { - if isEnabled && isFocused { - return ColorTheme.Base.onPrimaryVariant.color - } - if isEnabled { - return ColorTheme.Strokes.outline.color - } + private var labelBorderColor: Color { + if isEnabled, isFocused { + return ColorTheme.Base.onPrimaryVariant.color + } + if isEnabled { return ColorTheme.Strokes.outline.color } + return ColorTheme.Strokes.outline.color + } } #Preview { diff --git a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testColorSchemeVariants.dark.png b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testColorSchemeVariants.dark.png new file mode 100644 index 00000000000..cb443d5316d --- /dev/null +++ b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testColorSchemeVariants.dark.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:17266031ce2662f50678cb793a25c8c18605b12490d8e54e81605eb279939bdd +size 82634 diff --git a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testColorSchemeVariants.light.png b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testColorSchemeVariants.light.png new file mode 100644 index 00000000000..2a9378bad90 --- /dev/null +++ b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testColorSchemeVariants.light.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e5c205d883faca54cfa0c0dc14610180c25a8d087a302f7d0b744c201bec9249 +size 73409 diff --git a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.accessibility1.png b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.accessibility1.png new file mode 100644 index 00000000000..d7fa98da72d --- /dev/null +++ b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.accessibility1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bf6897e97fc0491fcec351a18910a131124667d3be5e59f5d6f843991c836588 +size 81482 diff --git a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.accessibility2.png b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.accessibility2.png new file mode 100644 index 00000000000..b215b57169f --- /dev/null +++ b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.accessibility2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fdfae48d8d2b9bf7b895041fee3c3a40a9c26b6ea856dc8e722ae43bb3e20560 +size 86048 diff --git a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.accessibility3.png b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.accessibility3.png new file mode 100644 index 00000000000..a49919a392e --- /dev/null +++ b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.accessibility3.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2fb202f6b44e3dc51d464bd3b125f1906ff176ea4776a72f97d1bcb1a4d4953b +size 90497 diff --git a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.accessibility4.png b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.accessibility4.png new file mode 100644 index 00000000000..59b6ae6e238 --- /dev/null +++ b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.accessibility4.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:343c63d045f15c0d580f902b273ee27bb180f417c4cdb0d90f95f73f1113bede +size 97141 diff --git a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.accessibility5.png b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.accessibility5.png new file mode 100644 index 00000000000..5ea1549db85 --- /dev/null +++ b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.accessibility5.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c049f426910fea5ed2ad0468ac25ac83fe3626359cc2f92bbf00c0b339e2aac5 +size 102643 diff --git a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.large.png b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.large.png new file mode 100644 index 00000000000..2a9378bad90 --- /dev/null +++ b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.large.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e5c205d883faca54cfa0c0dc14610180c25a8d087a302f7d0b744c201bec9249 +size 73409 diff --git a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.medium.png b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.medium.png new file mode 100644 index 00000000000..f6aa9489cdf --- /dev/null +++ b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.medium.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:33fb2a12c3834437427f2bad0893c6038b77b2db9da257a4b4fc7b1eda0719aa +size 72772 diff --git a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.small.png b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.small.png new file mode 100644 index 00000000000..686e7cc9bbc --- /dev/null +++ b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.small.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:752ea5911a9d32e38942dd53fe457f6b8184f04b21c14a377c2fa372e5beb5d1 +size 71924 diff --git a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.xLarge.png b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.xLarge.png new file mode 100644 index 00000000000..5caf54dbb68 --- /dev/null +++ b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.xLarge.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c11ef9cc7678d5fc1a2c6722c94f3be4d466d5ed0d0c736d84ec07f87b34d9d8 +size 74932 diff --git a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.xSmall.png b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.xSmall.png new file mode 100644 index 00000000000..6df8166de44 --- /dev/null +++ b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.xSmall.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:01503df2004815fb11a4dee5017b223f26563c01ee00ea3ead776c5ea52c51ab +size 70947 diff --git a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.xxLarge.png b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.xxLarge.png new file mode 100644 index 00000000000..56a5670b3ed --- /dev/null +++ b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.xxLarge.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b71f90cbf71cf9158661e8f58d3a1f1ebde467718f6e688de9a1d0e400dae6d2 +size 76776 diff --git a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.xxxLarge.png b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.xxxLarge.png new file mode 100644 index 00000000000..82d124800c6 --- /dev/null +++ b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.xxxLarge.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:65a7c2f0d419f9993d68fc3fc4821cc675c270d1576561c7ca451b4885a54752 +size 78451 diff --git a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testInvalidHidden.1.png b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testInvalidHidden.1.png new file mode 100644 index 00000000000..002bf4f8977 --- /dev/null +++ b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testInvalidHidden.1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ad5171b066f17898d0ad6c36f6ad30aed71e3807cdaf3d47ec3742a600c1fe42 +size 73761 diff --git a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testInvalidVisible.1.png b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testInvalidVisible.1.png new file mode 100644 index 00000000000..03fc8e9ea18 --- /dev/null +++ b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testInvalidVisible.1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2491b0d6c7b62a8178eb5ed0502f9446a23407897b2393dc03dac6386d69c755 +size 79526 diff --git a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testValidHidden.1.png b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testValidHidden.1.png new file mode 100644 index 00000000000..2a9378bad90 --- /dev/null +++ b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testValidHidden.1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e5c205d883faca54cfa0c0dc14610180c25a8d087a302f7d0b744c201bec9249 +size 73409 diff --git a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testValidVisible.1.png b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testValidVisible.1.png new file mode 100644 index 00000000000..9b57d1e9ce1 --- /dev/null +++ b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testValidVisible.1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:41c814ce2aa98163156875b00fed60807c5d91bd54ac32a93a7ad561b0c7000a +size 79248 From be10146e071b5267e8f2e11ae4aeaa6cf780a1e0 Mon Sep 17 00:00:00 2001 From: El-Fitz <8971906+El-Fitz@users.noreply.github.com> Date: Thu, 23 Jan 2025 12:25:27 +0100 Subject: [PATCH 14/26] fix: typo --- .../WireAuthenticationUI/Resources/en.lproj/Localizable.strings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WireUI/Sources/WireAuthenticationUI/Resources/en.lproj/Localizable.strings b/WireUI/Sources/WireAuthenticationUI/Resources/en.lproj/Localizable.strings index df0ef37ca58..c609d822219 100644 --- a/WireUI/Sources/WireAuthenticationUI/Resources/en.lproj/Localizable.strings +++ b/WireUI/Sources/WireAuthenticationUI/Resources/en.lproj/Localizable.strings @@ -16,7 +16,7 @@ // along with this program. If not, see http://www.gnu.org/licenses/. // -"authentication.identity.input.body" = "Simply enter your email adress to start!"; +"authentication.identity.input.body" = "Simply enter your email address to start!"; "authentication.identity.input.field.placeholder" = "Email or SSO code"; "authentication.identity.input.field.title" = "Email or SSO code"; "authentication.identity.input.submit" = "Next"; From a0f4db3890df37e2026f7d57ad77d7efbde88a9d Mon Sep 17 00:00:00 2001 From: El-Fitz <8971906+El-Fitz@users.noreply.github.com> Date: Thu, 23 Jan 2025 14:15:26 +0100 Subject: [PATCH 15/26] chore: remove reference snapshots from another branch --- .../testColorSchemeVariants.dark.png | 3 --- .../testColorSchemeVariants.light.png | 3 --- .../testDynamicTypeVariants.accessibility1.png | 3 --- .../testDynamicTypeVariants.accessibility2.png | 3 --- .../testDynamicTypeVariants.accessibility3.png | 3 --- .../testDynamicTypeVariants.accessibility4.png | 3 --- .../testDynamicTypeVariants.accessibility5.png | 3 --- .../testDynamicTypeVariants.large.png | 3 --- .../testDynamicTypeVariants.medium.png | 3 --- .../testDynamicTypeVariants.small.png | 3 --- .../testDynamicTypeVariants.xLarge.png | 3 --- .../testDynamicTypeVariants.xSmall.png | 3 --- .../testDynamicTypeVariants.xxLarge.png | 3 --- .../testDynamicTypeVariants.xxxLarge.png | 3 --- .../PasswordFieldSnapshotTests/testInvalidHidden.1.png | 3 --- .../PasswordFieldSnapshotTests/testInvalidVisible.1.png | 3 --- .../PasswordFieldSnapshotTests/testValidHidden.1.png | 3 --- .../PasswordFieldSnapshotTests/testValidVisible.1.png | 3 --- 18 files changed, 54 deletions(-) delete mode 100644 WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testColorSchemeVariants.dark.png delete mode 100644 WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testColorSchemeVariants.light.png delete mode 100644 WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.accessibility1.png delete mode 100644 WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.accessibility2.png delete mode 100644 WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.accessibility3.png delete mode 100644 WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.accessibility4.png delete mode 100644 WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.accessibility5.png delete mode 100644 WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.large.png delete mode 100644 WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.medium.png delete mode 100644 WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.small.png delete mode 100644 WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.xLarge.png delete mode 100644 WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.xSmall.png delete mode 100644 WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.xxLarge.png delete mode 100644 WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.xxxLarge.png delete mode 100644 WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testInvalidHidden.1.png delete mode 100644 WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testInvalidVisible.1.png delete mode 100644 WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testValidHidden.1.png delete mode 100644 WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testValidVisible.1.png diff --git a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testColorSchemeVariants.dark.png b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testColorSchemeVariants.dark.png deleted file mode 100644 index cb443d5316d..00000000000 --- a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testColorSchemeVariants.dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:17266031ce2662f50678cb793a25c8c18605b12490d8e54e81605eb279939bdd -size 82634 diff --git a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testColorSchemeVariants.light.png b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testColorSchemeVariants.light.png deleted file mode 100644 index 2a9378bad90..00000000000 --- a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testColorSchemeVariants.light.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e5c205d883faca54cfa0c0dc14610180c25a8d087a302f7d0b744c201bec9249 -size 73409 diff --git a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.accessibility1.png b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.accessibility1.png deleted file mode 100644 index d7fa98da72d..00000000000 --- a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.accessibility1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bf6897e97fc0491fcec351a18910a131124667d3be5e59f5d6f843991c836588 -size 81482 diff --git a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.accessibility2.png b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.accessibility2.png deleted file mode 100644 index b215b57169f..00000000000 --- a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.accessibility2.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fdfae48d8d2b9bf7b895041fee3c3a40a9c26b6ea856dc8e722ae43bb3e20560 -size 86048 diff --git a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.accessibility3.png b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.accessibility3.png deleted file mode 100644 index a49919a392e..00000000000 --- a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.accessibility3.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2fb202f6b44e3dc51d464bd3b125f1906ff176ea4776a72f97d1bcb1a4d4953b -size 90497 diff --git a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.accessibility4.png b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.accessibility4.png deleted file mode 100644 index 59b6ae6e238..00000000000 --- a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.accessibility4.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:343c63d045f15c0d580f902b273ee27bb180f417c4cdb0d90f95f73f1113bede -size 97141 diff --git a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.accessibility5.png b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.accessibility5.png deleted file mode 100644 index 5ea1549db85..00000000000 --- a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.accessibility5.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c049f426910fea5ed2ad0468ac25ac83fe3626359cc2f92bbf00c0b339e2aac5 -size 102643 diff --git a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.large.png b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.large.png deleted file mode 100644 index 2a9378bad90..00000000000 --- a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.large.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e5c205d883faca54cfa0c0dc14610180c25a8d087a302f7d0b744c201bec9249 -size 73409 diff --git a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.medium.png b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.medium.png deleted file mode 100644 index f6aa9489cdf..00000000000 --- a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.medium.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:33fb2a12c3834437427f2bad0893c6038b77b2db9da257a4b4fc7b1eda0719aa -size 72772 diff --git a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.small.png b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.small.png deleted file mode 100644 index 686e7cc9bbc..00000000000 --- a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.small.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:752ea5911a9d32e38942dd53fe457f6b8184f04b21c14a377c2fa372e5beb5d1 -size 71924 diff --git a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.xLarge.png b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.xLarge.png deleted file mode 100644 index 5caf54dbb68..00000000000 --- a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.xLarge.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c11ef9cc7678d5fc1a2c6722c94f3be4d466d5ed0d0c736d84ec07f87b34d9d8 -size 74932 diff --git a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.xSmall.png b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.xSmall.png deleted file mode 100644 index 6df8166de44..00000000000 --- a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.xSmall.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:01503df2004815fb11a4dee5017b223f26563c01ee00ea3ead776c5ea52c51ab -size 70947 diff --git a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.xxLarge.png b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.xxLarge.png deleted file mode 100644 index 56a5670b3ed..00000000000 --- a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.xxLarge.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b71f90cbf71cf9158661e8f58d3a1f1ebde467718f6e688de9a1d0e400dae6d2 -size 76776 diff --git a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.xxxLarge.png b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.xxxLarge.png deleted file mode 100644 index 82d124800c6..00000000000 --- a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testDynamicTypeVariants.xxxLarge.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:65a7c2f0d419f9993d68fc3fc4821cc675c270d1576561c7ca451b4885a54752 -size 78451 diff --git a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testInvalidHidden.1.png b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testInvalidHidden.1.png deleted file mode 100644 index 002bf4f8977..00000000000 --- a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testInvalidHidden.1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ad5171b066f17898d0ad6c36f6ad30aed71e3807cdaf3d47ec3742a600c1fe42 -size 73761 diff --git a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testInvalidVisible.1.png b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testInvalidVisible.1.png deleted file mode 100644 index 03fc8e9ea18..00000000000 --- a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testInvalidVisible.1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2491b0d6c7b62a8178eb5ed0502f9446a23407897b2393dc03dac6386d69c755 -size 79526 diff --git a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testValidHidden.1.png b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testValidHidden.1.png deleted file mode 100644 index 2a9378bad90..00000000000 --- a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testValidHidden.1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e5c205d883faca54cfa0c0dc14610180c25a8d087a302f7d0b744c201bec9249 -size 73409 diff --git a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testValidVisible.1.png b/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testValidVisible.1.png deleted file mode 100644 index 9b57d1e9ce1..00000000000 --- a/WireUI/Tests/WireReusableUIComponentsTests/Resources/ReferenceImages/PasswordFieldSnapshotTests/testValidVisible.1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:41c814ce2aa98163156875b00fed60807c5d91bd54ac32a93a7ad561b0c7000a -size 79248 From 98f111a9c2bfd7b4f7a83046266c9dd30d7b35f7 Mon Sep 17 00:00:00 2001 From: El-Fitz <8971906+El-Fitz@users.noreply.github.com> Date: Fri, 24 Jan 2025 09:48:15 +0100 Subject: [PATCH 16/26] fix: remove line limit --- .../AuthenticationIdentityInputView.swift | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/WireUI/Sources/WireAuthenticationUI/Views/AuthenticationIdentityInputView.swift b/WireUI/Sources/WireAuthenticationUI/Views/AuthenticationIdentityInputView.swift index b09b69fa48e..a686940e87a 100644 --- a/WireUI/Sources/WireAuthenticationUI/Views/AuthenticationIdentityInputView.swift +++ b/WireUI/Sources/WireAuthenticationUI/Views/AuthenticationIdentityInputView.swift @@ -48,21 +48,25 @@ package struct AuthenticationIdentityInputView: View { } Text(L10n.Authentication.Identity.Input.body) .wireTextStyle(.body1) + .lineLimit(nil) LabeledTextField( isMandatory: false, placeholder: L10n.Authentication.Identity.Input.Field.placeholder, title: L10n.Authentication.Identity.Input.Field.title, string: $identity ) + .lineLimit(nil) Button(action: { actionCallback(.submit(identity: identity)) }, label: { Text(L10n.Authentication.Identity.Input.submit) + .lineLimit(nil) }) .wireButtonStyle(.primary) Text(AttributedString.markdown(from: L10n.Authentication.Identity.Input.terms(termsURL.absoluteString))) .multilineTextAlignment(.center) .wireTextStyle(.subline1) + .lineLimit(nil) } } } @@ -79,5 +83,23 @@ struct AuthenticationIdentityInputPreview: View { } #Preview { - AuthenticationIdentityInputPreview() + BackgroundView() + .overlay { + VStack(spacing: 0) { + Spacer() + .frame(maxHeight: .infinity) + if #available(iOS 16.4, *) { + ScrollView(.vertical) { + AuthenticationIdentityInputPreview() + } + .background() + .scrollBounceBehavior(.basedOnSize) + } else { + ScrollView(.vertical) { + AuthenticationIdentityInputPreview() + } + .background() + } + } + } } From e0c7ad426ad001f373b6af1dfefefe0ce0b89119 Mon Sep 17 00:00:00 2001 From: KaterinaWire Date: Mon, 27 Jan 2025 14:03:02 +0100 Subject: [PATCH 17/26] feat: fix acc snapshots --- .../Resources/en.lproj/Localizable.strings | 2 -- .../AuthenticationIdentityInputView.swift | 28 +++++++++++++------ .../testColorSchemeVariants.dark.png | 3 -- .../testColorSchemeVariants.light.png | 3 -- ...testDynamicTypeVariants.accessibility1.png | 3 -- ...testDynamicTypeVariants.accessibility2.png | 3 -- ...testDynamicTypeVariants.accessibility3.png | 3 -- ...testDynamicTypeVariants.accessibility4.png | 3 -- ...testDynamicTypeVariants.accessibility5.png | 3 -- .../testDynamicTypeVariants.large.png | 3 -- .../testDynamicTypeVariants.medium.png | 3 -- .../testDynamicTypeVariants.small.png | 3 -- .../testDynamicTypeVariants.xLarge.png | 3 -- .../testDynamicTypeVariants.xSmall.png | 3 -- .../testDynamicTypeVariants.xxLarge.png | 3 -- .../testDynamicTypeVariants.xxxLarge.png | 3 -- 16 files changed, 19 insertions(+), 53 deletions(-) delete mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.dark.png delete mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.light.png delete mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility1.png delete mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility2.png delete mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility3.png delete mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility4.png delete mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility5.png delete mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.large.png delete mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.medium.png delete mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.small.png delete mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xLarge.png delete mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xSmall.png delete mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxLarge.png delete mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxxLarge.png diff --git a/WireUI/Sources/WireAuthenticationUI/Resources/en.lproj/Localizable.strings b/WireUI/Sources/WireAuthenticationUI/Resources/en.lproj/Localizable.strings index c609d822219..37ccc457f78 100644 --- a/WireUI/Sources/WireAuthenticationUI/Resources/en.lproj/Localizable.strings +++ b/WireUI/Sources/WireAuthenticationUI/Resources/en.lproj/Localizable.strings @@ -20,5 +20,3 @@ "authentication.identity.input.field.placeholder" = "Email or SSO code"; "authentication.identity.input.field.title" = "Email or SSO code"; "authentication.identity.input.submit" = "Next"; -"authentication.identity.input.terms" = "By pressing on “Next”, you accept Wire’s [Terms and Conditions](%@)"; - diff --git a/WireUI/Sources/WireAuthenticationUI/Views/AuthenticationIdentityInputView.swift b/WireUI/Sources/WireAuthenticationUI/Views/AuthenticationIdentityInputView.swift index a686940e87a..3007eac1150 100644 --- a/WireUI/Sources/WireAuthenticationUI/Views/AuthenticationIdentityInputView.swift +++ b/WireUI/Sources/WireAuthenticationUI/Views/AuthenticationIdentityInputView.swift @@ -29,11 +29,9 @@ package struct AuthenticationIdentityInputView: View { @State private var identity: String = "" private let actionCallback: @Sendable (Action) -> Void - private let termsURL: URL - package init(actionCallback: @escaping @Sendable (Action) -> Void, termsURL: URL) { + package init(actionCallback: @escaping @Sendable (Action) -> Void) { self.actionCallback = actionCallback - self.termsURL = termsURL } package var body: some View { @@ -47,8 +45,11 @@ package struct AuthenticationIdentityInputView: View { .frame(maxWidth: .infinity) } Text(L10n.Authentication.Identity.Input.body) + .multilineTextAlignment(.leading) .wireTextStyle(.body1) .lineLimit(nil) + .fixedSize(horizontal: false, vertical: true) + .padding(.trailing) LabeledTextField( isMandatory: false, placeholder: L10n.Authentication.Identity.Input.Field.placeholder, @@ -56,6 +57,7 @@ package struct AuthenticationIdentityInputView: View { string: $identity ) .lineLimit(nil) + .minimumScaleFactor(0.8) Button(action: { actionCallback(.submit(identity: identity)) }, label: { @@ -63,10 +65,6 @@ package struct AuthenticationIdentityInputView: View { .lineLimit(nil) }) .wireButtonStyle(.primary) - Text(AttributedString.markdown(from: L10n.Authentication.Identity.Input.terms(termsURL.absoluteString))) - .multilineTextAlignment(.center) - .wireTextStyle(.subline1) - .lineLimit(nil) } } } @@ -74,8 +72,7 @@ package struct AuthenticationIdentityInputView: View { struct AuthenticationIdentityInputPreview: View { var body: some View { AuthenticationIdentityInputView( - actionCallback: { _ in }, - termsURL: URL(string: "https://example.com")! + actionCallback: { _ in } ) .environment(\.wireTextStyleMapping, WireTextStyleMapping()) .padding(32) @@ -103,3 +100,16 @@ struct AuthenticationIdentityInputPreview: View { } } } + +#Preview("Large font") { + BackgroundView() + .overlay { + VStack(spacing: 0) { + Spacer() + .frame(maxHeight: .infinity) + AuthenticationIdentityInputPreview() + .background() + } + } + .environment(\.sizeCategory, .accessibilityExtraExtraExtraLarge) +} diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.dark.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.dark.png deleted file mode 100644 index 1321e7a20f7..00000000000 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cbf14cf05866bfc2cb758aaabaa088396cfd03ab9da1b88677ba55538afb0f58 -size 76734 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.light.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.light.png deleted file mode 100644 index efaa438d267..00000000000 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.light.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4417585313d3aa405a6fe144a83d98e7a02035322cc07c04c9dc5c36247600a2 -size 79799 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility1.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility1.png deleted file mode 100644 index 53c4d27083c..00000000000 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c78226a0aac38c19c091c334d0278c10312cd8e682cc15206b5e83500fda408c -size 98238 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility2.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility2.png deleted file mode 100644 index e75d699bd67..00000000000 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility2.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:271129e50e3fd9aa00b5c99339c227f135aa8698e7d141916d7e334b7f1e54e1 -size 106292 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility3.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility3.png deleted file mode 100644 index ba9fa43c1f3..00000000000 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility3.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:08ca27c1277179df5398a12eafcda5b0221cfd46d0a113b60516c92636597c60 -size 118583 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility4.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility4.png deleted file mode 100644 index 72b9dce379d..00000000000 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility4.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7428d5e7a5d26fffa07e468374a99b78663ddd73e71d157b7696939ace376438 -size 124447 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility5.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility5.png deleted file mode 100644 index 52ad9bda898..00000000000 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility5.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:69c51391da8b57cb9e9f57871c95a47b1911557d28e96390749363185880de01 -size 130906 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.large.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.large.png deleted file mode 100644 index efaa438d267..00000000000 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.large.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4417585313d3aa405a6fe144a83d98e7a02035322cc07c04c9dc5c36247600a2 -size 79799 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.medium.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.medium.png deleted file mode 100644 index 871c010a21e..00000000000 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.medium.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e1617dfcaea2a07e6801d8fc1bd11a60e68e7f33d282cce653ca7bed8936c8ed -size 78484 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.small.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.small.png deleted file mode 100644 index b2394da8784..00000000000 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.small.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5e561a0846bcff389d43ab34ecddbc71dbdf16c85aedfe1236af1ce4cb1df500 -size 77308 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xLarge.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xLarge.png deleted file mode 100644 index ad4c753c6a9..00000000000 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xLarge.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:10f1fb6d61b092c582ee073b9febefb831d82d773d48a98f8b9a44798f9ac81c -size 83446 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xSmall.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xSmall.png deleted file mode 100644 index 33dda99f027..00000000000 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xSmall.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3954e8ee6547223bd7af6c43cb8b46f99d37d63d6278472a76566a43b5b72c36 -size 75964 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxLarge.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxLarge.png deleted file mode 100644 index 1f8bd349fd9..00000000000 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxLarge.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6ae44d9611f4fd642e9f1190da977bce4356be6e757e456e29053f832243271a -size 86553 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxxLarge.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxxLarge.png deleted file mode 100644 index 8ee9c433391..00000000000 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxxLarge.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c8313ff851c6569ea67eb595a6bf310dfa827fafa1cc1eecb29b58a085ff361b -size 90808 From 7b4f07bb181c56af9779861cf3bb23eca7ecd168 Mon Sep 17 00:00:00 2001 From: KaterinaWire Date: Mon, 27 Jan 2025 14:03:34 +0100 Subject: [PATCH 18/26] feat: fix acc snapshots --- .../testColorSchemeVariants.dark.png | 3 +++ .../testColorSchemeVariants.light.png | 3 +++ .../testDynamicTypeVariants.accessibility1.png | 3 +++ .../testDynamicTypeVariants.accessibility2.png | 3 +++ .../testDynamicTypeVariants.accessibility3.png | 3 +++ .../testDynamicTypeVariants.accessibility4.png | 3 +++ .../testDynamicTypeVariants.accessibility5.png | 3 +++ .../testDynamicTypeVariants.large.png | 3 +++ .../testDynamicTypeVariants.medium.png | 3 +++ .../testDynamicTypeVariants.small.png | 3 +++ .../testDynamicTypeVariants.xLarge.png | 3 +++ .../testDynamicTypeVariants.xSmall.png | 3 +++ .../testDynamicTypeVariants.xxLarge.png | 3 +++ .../testDynamicTypeVariants.xxxLarge.png | 3 +++ 14 files changed, 42 insertions(+) create mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.dark.png create mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.light.png create mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility1.png create mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility2.png create mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility3.png create mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility4.png create mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility5.png create mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.large.png create mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.medium.png create mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.small.png create mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xLarge.png create mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xSmall.png create mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxLarge.png create mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxxLarge.png diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.dark.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.dark.png new file mode 100644 index 00000000000..42a49a04690 --- /dev/null +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.dark.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f523f8d1324720bc2f8326c9c884d79d58956482c0fb0ef03809d017959395f +size 59637 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.light.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.light.png new file mode 100644 index 00000000000..61b2ab82e69 --- /dev/null +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.light.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e198dc5503d80483a4ea7ae7eb1e1f31e45bbe5c96df373d9f508a29a6305ec9 +size 63916 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility1.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility1.png new file mode 100644 index 00000000000..2652226739c --- /dev/null +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:878d7ca90725f01003177fbc1b460fd92c18ebc8825ca9d59ca2f840ad373c3b +size 89155 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility2.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility2.png new file mode 100644 index 00000000000..d533ec43912 --- /dev/null +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:75ec671794d3eb397d13a9730d0a79c16e2534693fb6f3e709653a504103ae23 +size 105305 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility3.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility3.png new file mode 100644 index 00000000000..ac1fb2a993f --- /dev/null +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility3.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71e24f34c5981087ad32aeb97f4496d94b3e5506d773c3165386026b8b2c2d56 +size 119953 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility4.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility4.png new file mode 100644 index 00000000000..84d60fa06e1 --- /dev/null +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility4.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:37f8dc947653dc1961f69d1b387cfe236a5606658a5c09025c585ae99c1110d3 +size 142897 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility5.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility5.png new file mode 100644 index 00000000000..37a7d0f19dc --- /dev/null +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility5.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5ce3a5ea63caf4d17d9905f84115e4c6b766f31c508f40fa7a02515b5855a332 +size 154338 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.large.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.large.png new file mode 100644 index 00000000000..61b2ab82e69 --- /dev/null +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.large.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e198dc5503d80483a4ea7ae7eb1e1f31e45bbe5c96df373d9f508a29a6305ec9 +size 63916 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.medium.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.medium.png new file mode 100644 index 00000000000..536ff7b335a --- /dev/null +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.medium.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0cb5589009d33d08c3f14778095e1ab849c03a295d0819d30971057862778f0d +size 61564 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.small.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.small.png new file mode 100644 index 00000000000..b9a73e4ab54 --- /dev/null +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.small.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c6d4593b1c94f28c858fd99dc2397a506a90e6474b50e7e9b9505df2a98987c3 +size 60332 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xLarge.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xLarge.png new file mode 100644 index 00000000000..f859e984536 --- /dev/null +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xLarge.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:901e39a80fbf3041c9633fe706a17417e78024e98a9ff14f5f3c40229e39f053 +size 71941 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xSmall.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xSmall.png new file mode 100644 index 00000000000..83262a25e18 --- /dev/null +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xSmall.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:18f815abf8107c61cd812b86e6a995500cdd2321a76cf793ccedfdd7dd158225 +size 59191 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxLarge.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxLarge.png new file mode 100644 index 00000000000..ecdd3b576f7 --- /dev/null +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxLarge.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bea130e410de5068e9dc6e25f0b35cc118e0e47ab000b2bd5153e7158a5dbdbd +size 75498 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxxLarge.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxxLarge.png new file mode 100644 index 00000000000..410f805db3d --- /dev/null +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxxLarge.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:075c799c01df5851a654c1f1bf99c38079dca65c4eaff9b09c5c794dfcef104c +size 79806 From d5c1854240f338b10784cbca1ae0685dff7ef6cb Mon Sep 17 00:00:00 2001 From: KaterinaWire Date: Mon, 27 Jan 2025 15:21:12 +0100 Subject: [PATCH 19/26] feat: clean up --- .../Views/AuthenticationIdentityInputView.swift | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/WireUI/Sources/WireAuthenticationUI/Views/AuthenticationIdentityInputView.swift b/WireUI/Sources/WireAuthenticationUI/Views/AuthenticationIdentityInputView.swift index 3007eac1150..8d30ad6df40 100644 --- a/WireUI/Sources/WireAuthenticationUI/Views/AuthenticationIdentityInputView.swift +++ b/WireUI/Sources/WireAuthenticationUI/Views/AuthenticationIdentityInputView.swift @@ -111,5 +111,8 @@ struct AuthenticationIdentityInputPreview: View { .background() } } - .environment(\.sizeCategory, .accessibilityExtraExtraExtraLarge) + .environment( + \.sizeCategory, + .accessibilityExtraExtraExtraLarge + ) } From 5d35b156ab89a551fa27056a4d72b9b60992e098 Mon Sep 17 00:00:00 2001 From: KaterinaWire Date: Mon, 27 Jan 2025 15:23:36 +0100 Subject: [PATCH 20/26] fix: swiftFormat --- .../Views/AuthenticationIdentityInputView.swift | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/WireUI/Sources/WireAuthenticationUI/Views/AuthenticationIdentityInputView.swift b/WireUI/Sources/WireAuthenticationUI/Views/AuthenticationIdentityInputView.swift index 8d30ad6df40..65380e3dd59 100644 --- a/WireUI/Sources/WireAuthenticationUI/Views/AuthenticationIdentityInputView.swift +++ b/WireUI/Sources/WireAuthenticationUI/Views/AuthenticationIdentityInputView.swift @@ -111,8 +111,5 @@ struct AuthenticationIdentityInputPreview: View { .background() } } - .environment( - \.sizeCategory, - .accessibilityExtraExtraExtraLarge - ) + .environment(\.sizeCategory,.accessibilityExtraExtraExtraLarge) } From 4ef15e6fc3d8d9687829a5083a8322467d9b72ec Mon Sep 17 00:00:00 2001 From: KaterinaWire Date: Mon, 27 Jan 2025 15:26:10 +0100 Subject: [PATCH 21/26] fix: swiftFormat --- .../Views/AuthenticationIdentityInputView.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WireUI/Sources/WireAuthenticationUI/Views/AuthenticationIdentityInputView.swift b/WireUI/Sources/WireAuthenticationUI/Views/AuthenticationIdentityInputView.swift index 65380e3dd59..3007eac1150 100644 --- a/WireUI/Sources/WireAuthenticationUI/Views/AuthenticationIdentityInputView.swift +++ b/WireUI/Sources/WireAuthenticationUI/Views/AuthenticationIdentityInputView.swift @@ -111,5 +111,5 @@ struct AuthenticationIdentityInputPreview: View { .background() } } - .environment(\.sizeCategory,.accessibilityExtraExtraExtraLarge) + .environment(\.sizeCategory, .accessibilityExtraExtraExtraLarge) } From 2b72968a6a1435603b0922eadf38f47747ddb2b9 Mon Sep 17 00:00:00 2001 From: KaterinaWire Date: Mon, 27 Jan 2025 17:10:59 +0100 Subject: [PATCH 22/26] feat: new snapshots --- .../testColorSchemeVariants.dark.png | 4 ++-- .../testColorSchemeVariants.light.png | 4 ++-- .../testDynamicTypeVariants.accessibility1.png | 4 ++-- .../testDynamicTypeVariants.accessibility2.png | 4 ++-- .../testDynamicTypeVariants.accessibility3.png | 4 ++-- .../testDynamicTypeVariants.accessibility4.png | 4 ++-- .../testDynamicTypeVariants.accessibility5.png | 4 ++-- .../testDynamicTypeVariants.large.png | 4 ++-- .../testDynamicTypeVariants.medium.png | 4 ++-- .../testDynamicTypeVariants.small.png | 4 ++-- .../testDynamicTypeVariants.xLarge.png | 4 ++-- .../testDynamicTypeVariants.xSmall.png | 4 ++-- .../testDynamicTypeVariants.xxLarge.png | 4 ++-- .../testDynamicTypeVariants.xxxLarge.png | 4 ++-- 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.dark.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.dark.png index fa879cdce2b..42a49a04690 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.dark.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.dark.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be901be39a1191baa07560ef3cf08a3e1893fbe2f02879d1efa779df869d8cec -size 254 +oid sha256:4f523f8d1324720bc2f8326c9c884d79d58956482c0fb0ef03809d017959395f +size 59637 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.light.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.light.png index 6ee1096a7d9..61b2ab82e69 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.light.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.light.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4581a4df8847395d869e2990516926bfc71cdb66818689b974091efaadf74d84 -size 254 +oid sha256:e198dc5503d80483a4ea7ae7eb1e1f31e45bbe5c96df373d9f508a29a6305ec9 +size 63916 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility1.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility1.png index 495f6514703..2652226739c 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility1.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:90b6b8afa921c20a568acd55630659363a77209b0a29f3b2c17374d6951a7362 -size 254 +oid sha256:878d7ca90725f01003177fbc1b460fd92c18ebc8825ca9d59ca2f840ad373c3b +size 89155 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility2.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility2.png index 2fd4cd16dc7..d533ec43912 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility2.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b1b629662195d2a763b92ea7d8a48837535ec8f0c12cd110bc85ce7e0d42f91e -size 256 +oid sha256:75ec671794d3eb397d13a9730d0a79c16e2534693fb6f3e709653a504103ae23 +size 105305 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility3.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility3.png index be60eee71b8..ac1fb2a993f 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility3.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f058ec0841eab24fc364c6a75fc45b1c6d7b54ffdca02562c90d0e2f1df81fd9 -size 256 +oid sha256:71e24f34c5981087ad32aeb97f4496d94b3e5506d773c3165386026b8b2c2d56 +size 119953 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility4.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility4.png index 81c23288bf9..84d60fa06e1 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility4.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d96dea15cd546c8b399f84598ddcf67eca0e246e08dcc21aa040159c659177e4 -size 256 +oid sha256:37f8dc947653dc1961f69d1b387cfe236a5606658a5c09025c585ae99c1110d3 +size 142897 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility5.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility5.png index de0743dc2ca..37a7d0f19dc 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility5.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8b3a537fc8da5238cd66877a48a96626997953d55f8308e9e6d7b7f2093bd742 -size 256 +oid sha256:5ce3a5ea63caf4d17d9905f84115e4c6b766f31c508f40fa7a02515b5855a332 +size 154338 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.large.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.large.png index 6ee1096a7d9..61b2ab82e69 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.large.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.large.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4581a4df8847395d869e2990516926bfc71cdb66818689b974091efaadf74d84 -size 254 +oid sha256:e198dc5503d80483a4ea7ae7eb1e1f31e45bbe5c96df373d9f508a29a6305ec9 +size 63916 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.medium.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.medium.png index c25de38182e..536ff7b335a 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.medium.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.medium.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:74c96e04909c979a69ad27f7a125ac0338f96d2fae1d586178162c2b92872f62 -size 254 +oid sha256:0cb5589009d33d08c3f14778095e1ab849c03a295d0819d30971057862778f0d +size 61564 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.small.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.small.png index 6813870edbf..b9a73e4ab54 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.small.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.small.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8db2217ac15bda419b77e703f90635374f59a2a52d17ad3081586eb7768b91d9 -size 254 +oid sha256:c6d4593b1c94f28c858fd99dc2397a506a90e6474b50e7e9b9505df2a98987c3 +size 60332 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xLarge.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xLarge.png index bdb3a34941d..f859e984536 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xLarge.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xLarge.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0ce6715c59a0469c738d33dec260c0b7674aec8c969aabb37c428b14ea0a88fa -size 254 +oid sha256:901e39a80fbf3041c9633fe706a17417e78024e98a9ff14f5f3c40229e39f053 +size 71941 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xSmall.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xSmall.png index 6477e8e5a5b..83262a25e18 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xSmall.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xSmall.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f03473a175feaabfc8e266ed4468f180f9c1f87dd333cf8374ea8487df68a1cf -size 254 +oid sha256:18f815abf8107c61cd812b86e6a995500cdd2321a76cf793ccedfdd7dd158225 +size 59191 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxLarge.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxLarge.png index e12dd5d8ac1..ecdd3b576f7 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxLarge.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxLarge.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bdbfd5fbfa8428319bff22365406d43233838f3eb41361f51b5d23929bd2a4c9 -size 254 +oid sha256:bea130e410de5068e9dc6e25f0b35cc118e0e47ab000b2bd5153e7158a5dbdbd +size 75498 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxxLarge.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxxLarge.png index 5ecab249b46..410f805db3d 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxxLarge.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxxLarge.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2da62f65d3c0510f1fb6ff6302ea74ad78e845d067d6755f1128e5b7ad25908d -size 254 +oid sha256:075c799c01df5851a654c1f1bf99c38079dca65c4eaff9b09c5c794dfcef104c +size 79806 From ac2ef5beda2bf8671dd36785f9cf882edea7cdfe Mon Sep 17 00:00:00 2001 From: KaterinaWire Date: Mon, 27 Jan 2025 17:27:23 +0100 Subject: [PATCH 23/26] feat: new snapshots --- .../Views/AuthenticationIdentityInputView.swift | 3 ++- .../LabeledTextField/LabeledTextField.swift | 2 +- .../testColorSchemeVariants.dark.png | 4 ++-- .../testColorSchemeVariants.light.png | 4 ++-- .../testDynamicTypeVariants.accessibility1.png | 4 ++-- .../testDynamicTypeVariants.accessibility2.png | 4 ++-- .../testDynamicTypeVariants.accessibility3.png | 4 ++-- .../testDynamicTypeVariants.accessibility4.png | 4 ++-- .../testDynamicTypeVariants.accessibility5.png | 4 ++-- .../testDynamicTypeVariants.large.png | 4 ++-- .../testDynamicTypeVariants.medium.png | 4 ++-- .../testDynamicTypeVariants.small.png | 4 ++-- .../testDynamicTypeVariants.xLarge.png | 4 ++-- .../testDynamicTypeVariants.xSmall.png | 4 ++-- .../testDynamicTypeVariants.xxLarge.png | 4 ++-- .../testDynamicTypeVariants.xxxLarge.png | 4 ++-- 16 files changed, 31 insertions(+), 30 deletions(-) diff --git a/WireUI/Sources/WireAuthenticationUI/Views/AuthenticationIdentityInputView.swift b/WireUI/Sources/WireAuthenticationUI/Views/AuthenticationIdentityInputView.swift index 3007eac1150..3a15477aec2 100644 --- a/WireUI/Sources/WireAuthenticationUI/Views/AuthenticationIdentityInputView.swift +++ b/WireUI/Sources/WireAuthenticationUI/Views/AuthenticationIdentityInputView.swift @@ -57,7 +57,7 @@ package struct AuthenticationIdentityInputView: View { string: $identity ) .lineLimit(nil) - .minimumScaleFactor(0.8) + .fixedSize(horizontal: false, vertical: true) Button(action: { actionCallback(.submit(identity: identity)) }, label: { @@ -65,6 +65,7 @@ package struct AuthenticationIdentityInputView: View { .lineLimit(nil) }) .wireButtonStyle(.primary) + .disabled(identity.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty) } } } diff --git a/WireUI/Sources/WireReusableUIComponents/LabeledTextField/LabeledTextField.swift b/WireUI/Sources/WireReusableUIComponents/LabeledTextField/LabeledTextField.swift index 04e7d5b2b84..22540fe9200 100644 --- a/WireUI/Sources/WireReusableUIComponents/LabeledTextField/LabeledTextField.swift +++ b/WireUI/Sources/WireReusableUIComponents/LabeledTextField/LabeledTextField.swift @@ -53,7 +53,7 @@ public struct LabeledTextField: View { ) : Text(title) ) .foregroundStyle(titleColor) - .wireTextStyle(.subline1) + .wireTextStyle(.h4) } HStack(spacing: 0) { TextField(placeholder ?? "", text: $string) diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.dark.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.dark.png index 42a49a04690..8310fffa4df 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.dark.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.dark.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4f523f8d1324720bc2f8326c9c884d79d58956482c0fb0ef03809d017959395f -size 59637 +oid sha256:1a5fc4b803ecb3499bf898692496ddb8066486621f90ffe5098ade389c6356f8 +size 61533 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.light.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.light.png index 61b2ab82e69..7944da3c114 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.light.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.light.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e198dc5503d80483a4ea7ae7eb1e1f31e45bbe5c96df373d9f508a29a6305ec9 -size 63916 +oid sha256:615da39235431cb77aa4a20290694bf32b758cc1ce605991c67c5092eba91257 +size 65725 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility1.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility1.png index 2652226739c..78387449273 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility1.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:878d7ca90725f01003177fbc1b460fd92c18ebc8825ca9d59ca2f840ad373c3b -size 89155 +oid sha256:609a509326379ffc9657c554539bc8634076af71fe70c7692dd3f6af9c65f838 +size 91904 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility2.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility2.png index d533ec43912..11fca3103f0 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility2.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:75ec671794d3eb397d13a9730d0a79c16e2534693fb6f3e709653a504103ae23 -size 105305 +oid sha256:b48d09f00623f8d402591d109c1c06dc62651963b9d74324d0c11d2161a21bd9 +size 109392 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility3.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility3.png index ac1fb2a993f..57eb6e4dbc2 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility3.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:71e24f34c5981087ad32aeb97f4496d94b3e5506d773c3165386026b8b2c2d56 -size 119953 +oid sha256:bbbe4735b685906fbd13f6da6de0924e61472683b8cfd077f94851de76d4ddc3 +size 124671 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility4.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility4.png index 84d60fa06e1..fc922c5132a 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility4.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:37f8dc947653dc1961f69d1b387cfe236a5606658a5c09025c585ae99c1110d3 -size 142897 +oid sha256:5506239e66c676951d56f30b63d7268f6c3b3e802efb9e85e1e1c974e0b84112 +size 154701 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility5.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility5.png index 37a7d0f19dc..5ff1c074e06 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility5.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5ce3a5ea63caf4d17d9905f84115e4c6b766f31c508f40fa7a02515b5855a332 -size 154338 +oid sha256:543e77ff0efb21b04f28e9a043bb78366fab935fe4057363c9466b6971324661 +size 168775 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.large.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.large.png index 61b2ab82e69..7944da3c114 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.large.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.large.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e198dc5503d80483a4ea7ae7eb1e1f31e45bbe5c96df373d9f508a29a6305ec9 -size 63916 +oid sha256:615da39235431cb77aa4a20290694bf32b758cc1ce605991c67c5092eba91257 +size 65725 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.medium.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.medium.png index 536ff7b335a..c1e794b851d 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.medium.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.medium.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0cb5589009d33d08c3f14778095e1ab849c03a295d0819d30971057862778f0d -size 61564 +oid sha256:c22ac378485a949208a36b9f26cb677f694aa2c6297c51152544156e4ffe58df +size 63838 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.small.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.small.png index b9a73e4ab54..9e818a32dc7 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.small.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.small.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c6d4593b1c94f28c858fd99dc2397a506a90e6474b50e7e9b9505df2a98987c3 -size 60332 +oid sha256:5a19fc147e340cf2b54f74828287930b968097e140fea7c175e958be0de34d38 +size 62083 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xLarge.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xLarge.png index f859e984536..92b90d31fc7 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xLarge.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xLarge.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:901e39a80fbf3041c9633fe706a17417e78024e98a9ff14f5f3c40229e39f053 -size 71941 +oid sha256:6c3360160213b2114c26d9e91f9c54e8e1e134c1cfcbd3c7d1373889e04c7913 +size 74296 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xSmall.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xSmall.png index 83262a25e18..c0c4b332d78 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xSmall.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xSmall.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:18f815abf8107c61cd812b86e6a995500cdd2321a76cf793ccedfdd7dd158225 -size 59191 +oid sha256:ded377581c07025c330ecd1b0e5f9b3a279369adcf16a09f01f675ea3d423092 +size 60066 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxLarge.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxLarge.png index ecdd3b576f7..fc8df4af3fb 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxLarge.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxLarge.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bea130e410de5068e9dc6e25f0b35cc118e0e47ab000b2bd5153e7158a5dbdbd -size 75498 +oid sha256:4d078e785739547e469bc0880dde2caf34f554d1c86f23e784b44251e2c726f7 +size 78411 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxxLarge.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxxLarge.png index 410f805db3d..49f7ac1cfaf 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxxLarge.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxxLarge.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:075c799c01df5851a654c1f1bf99c38079dca65c4eaff9b09c5c794dfcef104c -size 79806 +oid sha256:5f8c6c3431cca172f2f2a52095f9a2271283c86cd9d226f45302d79030b44206 +size 82470 From cd1e972296c3d43a2d5b4c72505c9b472c6fdbc3 Mon Sep 17 00:00:00 2001 From: KaterinaWire Date: Mon, 27 Jan 2025 17:34:35 +0100 Subject: [PATCH 24/26] feat: new snapshots --- .../LabeledTextField/LabeledTextField.swift | 2 +- .../testColorSchemeVariants.dark.png | 4 ++-- .../testColorSchemeVariants.light.png | 4 ++-- .../testDynamicTypeVariants.accessibility1.png | 4 ++-- .../testDynamicTypeVariants.accessibility2.png | 4 ++-- .../testDynamicTypeVariants.accessibility3.png | 4 ++-- .../testDynamicTypeVariants.accessibility4.png | 4 ++-- .../testDynamicTypeVariants.accessibility5.png | 4 ++-- .../testDynamicTypeVariants.large.png | 4 ++-- .../testDynamicTypeVariants.medium.png | 4 ++-- .../testDynamicTypeVariants.small.png | 4 ++-- .../testDynamicTypeVariants.xLarge.png | 4 ++-- .../testDynamicTypeVariants.xxLarge.png | 4 ++-- .../testDynamicTypeVariants.xxxLarge.png | 4 ++-- 14 files changed, 27 insertions(+), 27 deletions(-) diff --git a/WireUI/Sources/WireReusableUIComponents/LabeledTextField/LabeledTextField.swift b/WireUI/Sources/WireReusableUIComponents/LabeledTextField/LabeledTextField.swift index 22540fe9200..6c87b0ba24a 100644 --- a/WireUI/Sources/WireReusableUIComponents/LabeledTextField/LabeledTextField.swift +++ b/WireUI/Sources/WireReusableUIComponents/LabeledTextField/LabeledTextField.swift @@ -53,7 +53,7 @@ public struct LabeledTextField: View { ) : Text(title) ) .foregroundStyle(titleColor) - .wireTextStyle(.h4) + .wireTextStyle(.h5) } HStack(spacing: 0) { TextField(placeholder ?? "", text: $string) diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.dark.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.dark.png index 8310fffa4df..d2f897eafa5 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.dark.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.dark.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a5fc4b803ecb3499bf898692496ddb8066486621f90ffe5098ade389c6356f8 -size 61533 +oid sha256:8387cc78a5b226ad214f21a8e29a8a034e4c12466333bcda2a78fc255a4ebb94 +size 60448 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.light.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.light.png index 7944da3c114..40179e4b5c5 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.light.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.light.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:615da39235431cb77aa4a20290694bf32b758cc1ce605991c67c5092eba91257 -size 65725 +oid sha256:6c9acf51e038ee35a83d20fce02216923ac901ed69c2640c7cd4992e439bf7b6 +size 64759 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility1.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility1.png index 78387449273..f64303a40ab 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility1.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:609a509326379ffc9657c554539bc8634076af71fe70c7692dd3f6af9c65f838 -size 91904 +oid sha256:0339d9c1a024817e0a99cdce9df17f971f43debbd6c9b4c10d114165deddd1d6 +size 91004 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility2.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility2.png index 11fca3103f0..89e093ff699 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility2.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b48d09f00623f8d402591d109c1c06dc62651963b9d74324d0c11d2161a21bd9 -size 109392 +oid sha256:3168d5fc8ac3a320aed866f921407dc243e90823293cf8501919b5d65fd391a1 +size 107801 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility3.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility3.png index 57eb6e4dbc2..58fc0dc9f4d 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility3.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bbbe4735b685906fbd13f6da6de0924e61472683b8cfd077f94851de76d4ddc3 -size 124671 +oid sha256:eb2cdc6655a65a9e8d6f1fe123e9c704d060cd6d298823ffa6264a40ee78dbe2 +size 123211 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility4.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility4.png index fc922c5132a..0fd24c8e79b 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility4.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5506239e66c676951d56f30b63d7268f6c3b3e802efb9e85e1e1c974e0b84112 -size 154701 +oid sha256:80395a3cc86db4d8b5d72884c0e7b4094ab171c4b40f0ec9c0c6a509c1f3a3fc +size 146604 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility5.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility5.png index 5ff1c074e06..2215351dbed 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility5.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:543e77ff0efb21b04f28e9a043bb78366fab935fe4057363c9466b6971324661 -size 168775 +oid sha256:d8deaf459ef14762057d0748f563bb3bc96bbfffbd15e731f6fafd4819fecf1f +size 165833 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.large.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.large.png index 7944da3c114..40179e4b5c5 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.large.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.large.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:615da39235431cb77aa4a20290694bf32b758cc1ce605991c67c5092eba91257 -size 65725 +oid sha256:6c9acf51e038ee35a83d20fce02216923ac901ed69c2640c7cd4992e439bf7b6 +size 64759 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.medium.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.medium.png index c1e794b851d..de98a156d5c 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.medium.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.medium.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c22ac378485a949208a36b9f26cb677f694aa2c6297c51152544156e4ffe58df -size 63838 +oid sha256:6326ac3b5c3a80fc4d57e21feb0e8328d215b616a0434ee19ffa465fd924844e +size 62762 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.small.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.small.png index 9e818a32dc7..6e103d3c9c9 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.small.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.small.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a19fc147e340cf2b54f74828287930b968097e140fea7c175e958be0de34d38 -size 62083 +oid sha256:623594959f3e8a938affb095bcb8005e7126413fb149921a282e9663995cb1dd +size 61521 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xLarge.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xLarge.png index 92b90d31fc7..8e32fefbca5 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xLarge.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xLarge.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6c3360160213b2114c26d9e91f9c54e8e1e134c1cfcbd3c7d1373889e04c7913 -size 74296 +oid sha256:800087e537651ac0090325cc5155c34974eb560064f837b7667491b0f96c3eb2 +size 73423 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxLarge.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxLarge.png index fc8df4af3fb..719a080a621 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxLarge.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxLarge.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d078e785739547e469bc0880dde2caf34f554d1c86f23e784b44251e2c726f7 -size 78411 +oid sha256:6e0382476112f9eb9c2e7a0311cc2737a20a41782b256a6fafef0df2f37fc8f5 +size 77276 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxxLarge.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxxLarge.png index 49f7ac1cfaf..c766681dddf 100644 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxxLarge.png +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxxLarge.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5f8c6c3431cca172f2f2a52095f9a2271283c86cd9d226f45302d79030b44206 -size 82470 +oid sha256:cb390ca537e5ee60b04485d30706de5d0535411a243181b5511a64c33105e029 +size 81778 From aaab9c03b52f1b6cbdc39e45057076c644a9a851 Mon Sep 17 00:00:00 2001 From: KaterinaWire Date: Tue, 28 Jan 2025 09:34:46 +0100 Subject: [PATCH 25/26] update snapshots --- .../LabeledTextField/LabeledTextField.swift | 2 +- .../testColorSchemeVariants.dark.png | 3 --- .../testColorSchemeVariants.light.png | 3 --- .../testDynamicTypeVariants.accessibility1.png | 3 --- .../testDynamicTypeVariants.accessibility2.png | 3 --- .../testDynamicTypeVariants.accessibility3.png | 3 --- .../testDynamicTypeVariants.accessibility4.png | 3 --- .../testDynamicTypeVariants.accessibility5.png | 3 --- .../testDynamicTypeVariants.large.png | 3 --- .../testDynamicTypeVariants.medium.png | 3 --- .../testDynamicTypeVariants.small.png | 3 --- .../testDynamicTypeVariants.xLarge.png | 3 --- .../testDynamicTypeVariants.xSmall.png | 3 --- .../testDynamicTypeVariants.xxLarge.png | 3 --- .../testDynamicTypeVariants.xxxLarge.png | 3 --- .../TeamNameViewSnapshotTests/testColorSchemeVariants.dark.png | 3 --- .../testColorSchemeVariants.light.png | 3 --- .../testDynamicTypeVariants.accessibility1.png | 3 --- .../testDynamicTypeVariants.accessibility2.png | 3 --- .../testDynamicTypeVariants.accessibility3.png | 3 --- .../testDynamicTypeVariants.accessibility4.png | 3 --- .../testDynamicTypeVariants.accessibility5.png | 3 --- .../testDynamicTypeVariants.large.png | 3 --- .../testDynamicTypeVariants.medium.png | 3 --- .../testDynamicTypeVariants.small.png | 3 --- .../testDynamicTypeVariants.xLarge.png | 3 --- .../testDynamicTypeVariants.xSmall.png | 3 --- .../testDynamicTypeVariants.xxLarge.png | 3 --- .../testDynamicTypeVariants.xxxLarge.png | 3 --- 29 files changed, 1 insertion(+), 85 deletions(-) delete mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.dark.png delete mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.light.png delete mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility1.png delete mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility2.png delete mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility3.png delete mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility4.png delete mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility5.png delete mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.large.png delete mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.medium.png delete mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.small.png delete mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xLarge.png delete mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xSmall.png delete mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxLarge.png delete mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxxLarge.png delete mode 100644 WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testColorSchemeVariants.dark.png delete mode 100644 WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testColorSchemeVariants.light.png delete mode 100644 WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility1.png delete mode 100644 WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility2.png delete mode 100644 WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility3.png delete mode 100644 WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility4.png delete mode 100644 WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility5.png delete mode 100644 WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.large.png delete mode 100644 WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.medium.png delete mode 100644 WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.small.png delete mode 100644 WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xLarge.png delete mode 100644 WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xSmall.png delete mode 100644 WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xxLarge.png delete mode 100644 WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xxxLarge.png diff --git a/WireUI/Sources/WireReusableUIComponents/LabeledTextField/LabeledTextField.swift b/WireUI/Sources/WireReusableUIComponents/LabeledTextField/LabeledTextField.swift index 6c87b0ba24a..22540fe9200 100644 --- a/WireUI/Sources/WireReusableUIComponents/LabeledTextField/LabeledTextField.swift +++ b/WireUI/Sources/WireReusableUIComponents/LabeledTextField/LabeledTextField.swift @@ -53,7 +53,7 @@ public struct LabeledTextField: View { ) : Text(title) ) .foregroundStyle(titleColor) - .wireTextStyle(.h5) + .wireTextStyle(.h4) } HStack(spacing: 0) { TextField(placeholder ?? "", text: $string) diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.dark.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.dark.png deleted file mode 100644 index d2f897eafa5..00000000000 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8387cc78a5b226ad214f21a8e29a8a034e4c12466333bcda2a78fc255a4ebb94 -size 60448 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.light.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.light.png deleted file mode 100644 index 40179e4b5c5..00000000000 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.light.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6c9acf51e038ee35a83d20fce02216923ac901ed69c2640c7cd4992e439bf7b6 -size 64759 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility1.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility1.png deleted file mode 100644 index f64303a40ab..00000000000 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0339d9c1a024817e0a99cdce9df17f971f43debbd6c9b4c10d114165deddd1d6 -size 91004 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility2.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility2.png deleted file mode 100644 index 89e093ff699..00000000000 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility2.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3168d5fc8ac3a320aed866f921407dc243e90823293cf8501919b5d65fd391a1 -size 107801 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility3.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility3.png deleted file mode 100644 index 58fc0dc9f4d..00000000000 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility3.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eb2cdc6655a65a9e8d6f1fe123e9c704d060cd6d298823ffa6264a40ee78dbe2 -size 123211 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility4.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility4.png deleted file mode 100644 index 0fd24c8e79b..00000000000 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility4.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:80395a3cc86db4d8b5d72884c0e7b4094ab171c4b40f0ec9c0c6a509c1f3a3fc -size 146604 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility5.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility5.png deleted file mode 100644 index 2215351dbed..00000000000 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility5.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d8deaf459ef14762057d0748f563bb3bc96bbfffbd15e731f6fafd4819fecf1f -size 165833 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.large.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.large.png deleted file mode 100644 index 40179e4b5c5..00000000000 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.large.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6c9acf51e038ee35a83d20fce02216923ac901ed69c2640c7cd4992e439bf7b6 -size 64759 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.medium.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.medium.png deleted file mode 100644 index de98a156d5c..00000000000 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.medium.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6326ac3b5c3a80fc4d57e21feb0e8328d215b616a0434ee19ffa465fd924844e -size 62762 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.small.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.small.png deleted file mode 100644 index 6e103d3c9c9..00000000000 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.small.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:623594959f3e8a938affb095bcb8005e7126413fb149921a282e9663995cb1dd -size 61521 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xLarge.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xLarge.png deleted file mode 100644 index 8e32fefbca5..00000000000 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xLarge.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:800087e537651ac0090325cc5155c34974eb560064f837b7667491b0f96c3eb2 -size 73423 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xSmall.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xSmall.png deleted file mode 100644 index c0c4b332d78..00000000000 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xSmall.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ded377581c07025c330ecd1b0e5f9b3a279369adcf16a09f01f675ea3d423092 -size 60066 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxLarge.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxLarge.png deleted file mode 100644 index 719a080a621..00000000000 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxLarge.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6e0382476112f9eb9c2e7a0311cc2737a20a41782b256a6fafef0df2f37fc8f5 -size 77276 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxxLarge.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxxLarge.png deleted file mode 100644 index c766681dddf..00000000000 --- a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxxLarge.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cb390ca537e5ee60b04485d30706de5d0535411a243181b5511a64c33105e029 -size 81778 diff --git a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testColorSchemeVariants.dark.png b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testColorSchemeVariants.dark.png deleted file mode 100644 index 2314cc1eefb..00000000000 --- a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testColorSchemeVariants.dark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2945aaca0e98108971f7a6eac77c762d7c4d6ee130df19880a406a7bf621b364 -size 108432 diff --git a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testColorSchemeVariants.light.png b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testColorSchemeVariants.light.png deleted file mode 100644 index 6fa45eefde1..00000000000 --- a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testColorSchemeVariants.light.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4f4cf23ea98cfbe59fbbef3184b2f2ca6305bb8b1d89a9924ab63cb61301cb4c -size 100107 diff --git a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility1.png b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility1.png deleted file mode 100644 index c1c5146442f..00000000000 --- a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a2ee3fa37ad6c6dcc0803b9a46bed876b3e749cb9a403416e8733797eafcbb12 -size 123822 diff --git a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility2.png b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility2.png deleted file mode 100644 index 00227ce4574..00000000000 --- a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility2.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d776b152a33d13190f33b16a73617bdf0f8afb38aa507869b3b33f31d6ed8872 -size 139078 diff --git a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility3.png b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility3.png deleted file mode 100644 index ea29d81118f..00000000000 --- a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility3.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5b2b6a6727336983410113a97cdd709d7a25a7d3ee3d6bb24e5befb0b9f0f8f9 -size 158380 diff --git a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility4.png b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility4.png deleted file mode 100644 index a4ebb15540a..00000000000 --- a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility4.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b55fe074a62df26bb38f010718af7f60db43c2f19d27c4fff5ed1785b76d8442 -size 175241 diff --git a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility5.png b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility5.png deleted file mode 100644 index ff7e7f38054..00000000000 --- a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility5.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e7654b19e52064791f43fd3314869e989725d90fdea30782f80af3b747c8e971 -size 189784 diff --git a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.large.png b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.large.png deleted file mode 100644 index 6fa45eefde1..00000000000 --- a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.large.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4f4cf23ea98cfbe59fbbef3184b2f2ca6305bb8b1d89a9924ab63cb61301cb4c -size 100107 diff --git a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.medium.png b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.medium.png deleted file mode 100644 index e5bfc5e269e..00000000000 --- a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.medium.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a07ecb4c2b6f1bcaf1d2041b6d7a3feb2b68a588395293d7824d92bf5bf12e39 -size 98938 diff --git a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.small.png b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.small.png deleted file mode 100644 index d8ffa51f6d6..00000000000 --- a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.small.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:67af9a8b050a51f4c1e9fb91eac779ea72fe82a3162578de8c1694926c6c771d -size 97340 diff --git a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xLarge.png b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xLarge.png deleted file mode 100644 index 8dc8be3eb49..00000000000 --- a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xLarge.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2eacfc06619972d232f6ae7aef5092e040fea44d8654acf8e30cb7b0dea9ba06 -size 105325 diff --git a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xSmall.png b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xSmall.png deleted file mode 100644 index 4d3e6d184bf..00000000000 --- a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xSmall.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0a1d53090ec5fb58552850f558e8a927d70a90b809af85d43850459290aa078d -size 96135 diff --git a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xxLarge.png b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xxLarge.png deleted file mode 100644 index b8305fe68f0..00000000000 --- a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xxLarge.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f50f8bd174f8c467dd6bb9701812a720412938faa95ac070c842a9824a8057ca -size 108484 diff --git a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xxxLarge.png b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xxxLarge.png deleted file mode 100644 index 7fefa26b167..00000000000 --- a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xxxLarge.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eac89c1429b506d2feef505f65073677e1ff40b1f865523f5c06ed40d981c811 -size 112889 From 2b178cc1b7c8648769869a54299288b4a28a486b Mon Sep 17 00:00:00 2001 From: KaterinaWire Date: Tue, 28 Jan 2025 09:35:21 +0100 Subject: [PATCH 26/26] update snapshots --- .../testColorSchemeVariants.dark.png | 3 +++ .../testColorSchemeVariants.light.png | 3 +++ .../testDynamicTypeVariants.accessibility1.png | 3 +++ .../testDynamicTypeVariants.accessibility2.png | 3 +++ .../testDynamicTypeVariants.accessibility3.png | 3 +++ .../testDynamicTypeVariants.accessibility4.png | 3 +++ .../testDynamicTypeVariants.accessibility5.png | 3 +++ .../testDynamicTypeVariants.large.png | 3 +++ .../testDynamicTypeVariants.medium.png | 3 +++ .../testDynamicTypeVariants.small.png | 3 +++ .../testDynamicTypeVariants.xLarge.png | 3 +++ .../testDynamicTypeVariants.xSmall.png | 3 +++ .../testDynamicTypeVariants.xxLarge.png | 3 +++ .../testDynamicTypeVariants.xxxLarge.png | 3 +++ .../TeamNameViewSnapshotTests/testColorSchemeVariants.dark.png | 3 +++ .../testColorSchemeVariants.light.png | 3 +++ .../testDynamicTypeVariants.accessibility1.png | 3 +++ .../testDynamicTypeVariants.accessibility2.png | 3 +++ .../testDynamicTypeVariants.accessibility3.png | 3 +++ .../testDynamicTypeVariants.accessibility4.png | 3 +++ .../testDynamicTypeVariants.accessibility5.png | 3 +++ .../testDynamicTypeVariants.large.png | 3 +++ .../testDynamicTypeVariants.medium.png | 3 +++ .../testDynamicTypeVariants.small.png | 3 +++ .../testDynamicTypeVariants.xLarge.png | 3 +++ .../testDynamicTypeVariants.xSmall.png | 3 +++ .../testDynamicTypeVariants.xxLarge.png | 3 +++ .../testDynamicTypeVariants.xxxLarge.png | 3 +++ 28 files changed, 84 insertions(+) create mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.dark.png create mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.light.png create mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility1.png create mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility2.png create mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility3.png create mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility4.png create mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility5.png create mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.large.png create mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.medium.png create mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.small.png create mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xLarge.png create mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xSmall.png create mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxLarge.png create mode 100644 WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxxLarge.png create mode 100644 WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testColorSchemeVariants.dark.png create mode 100644 WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testColorSchemeVariants.light.png create mode 100644 WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility1.png create mode 100644 WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility2.png create mode 100644 WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility3.png create mode 100644 WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility4.png create mode 100644 WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility5.png create mode 100644 WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.large.png create mode 100644 WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.medium.png create mode 100644 WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.small.png create mode 100644 WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xLarge.png create mode 100644 WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xSmall.png create mode 100644 WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xxLarge.png create mode 100644 WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xxxLarge.png diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.dark.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.dark.png new file mode 100644 index 00000000000..8310fffa4df --- /dev/null +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.dark.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1a5fc4b803ecb3499bf898692496ddb8066486621f90ffe5098ade389c6356f8 +size 61533 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.light.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.light.png new file mode 100644 index 00000000000..7944da3c114 --- /dev/null +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testColorSchemeVariants.light.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:615da39235431cb77aa4a20290694bf32b758cc1ce605991c67c5092eba91257 +size 65725 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility1.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility1.png new file mode 100644 index 00000000000..78387449273 --- /dev/null +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:609a509326379ffc9657c554539bc8634076af71fe70c7692dd3f6af9c65f838 +size 91904 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility2.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility2.png new file mode 100644 index 00000000000..11fca3103f0 --- /dev/null +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b48d09f00623f8d402591d109c1c06dc62651963b9d74324d0c11d2161a21bd9 +size 109392 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility3.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility3.png new file mode 100644 index 00000000000..57eb6e4dbc2 --- /dev/null +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility3.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bbbe4735b685906fbd13f6da6de0924e61472683b8cfd077f94851de76d4ddc3 +size 124671 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility4.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility4.png new file mode 100644 index 00000000000..fc922c5132a --- /dev/null +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility4.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5506239e66c676951d56f30b63d7268f6c3b3e802efb9e85e1e1c974e0b84112 +size 154701 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility5.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility5.png new file mode 100644 index 00000000000..5ff1c074e06 --- /dev/null +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.accessibility5.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:543e77ff0efb21b04f28e9a043bb78366fab935fe4057363c9466b6971324661 +size 168775 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.large.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.large.png new file mode 100644 index 00000000000..7944da3c114 --- /dev/null +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.large.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:615da39235431cb77aa4a20290694bf32b758cc1ce605991c67c5092eba91257 +size 65725 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.medium.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.medium.png new file mode 100644 index 00000000000..c1e794b851d --- /dev/null +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.medium.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c22ac378485a949208a36b9f26cb677f694aa2c6297c51152544156e4ffe58df +size 63838 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.small.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.small.png new file mode 100644 index 00000000000..9e818a32dc7 --- /dev/null +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.small.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5a19fc147e340cf2b54f74828287930b968097e140fea7c175e958be0de34d38 +size 62083 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xLarge.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xLarge.png new file mode 100644 index 00000000000..92b90d31fc7 --- /dev/null +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xLarge.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c3360160213b2114c26d9e91f9c54e8e1e134c1cfcbd3c7d1373889e04c7913 +size 74296 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xSmall.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xSmall.png new file mode 100644 index 00000000000..c0c4b332d78 --- /dev/null +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xSmall.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ded377581c07025c330ecd1b0e5f9b3a279369adcf16a09f01f675ea3d423092 +size 60066 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxLarge.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxLarge.png new file mode 100644 index 00000000000..fc8df4af3fb --- /dev/null +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxLarge.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4d078e785739547e469bc0880dde2caf34f554d1c86f23e784b44251e2c726f7 +size 78411 diff --git a/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxxLarge.png b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxxLarge.png new file mode 100644 index 00000000000..49f7ac1cfaf --- /dev/null +++ b/WireUI/Tests/WireAuthenticationUITests/Resources/ReferenceImages/AuthenticationIdentityInputViewTests/testDynamicTypeVariants.xxxLarge.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5f8c6c3431cca172f2f2a52095f9a2271283c86cd9d226f45302d79030b44206 +size 82470 diff --git a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testColorSchemeVariants.dark.png b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testColorSchemeVariants.dark.png new file mode 100644 index 00000000000..c9eaee10363 --- /dev/null +++ b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testColorSchemeVariants.dark.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fabf16bc7e06d70a025fd3a1eb8a60159f7e3c6bd1b69942a10ff35632cf3a4a +size 109115 diff --git a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testColorSchemeVariants.light.png b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testColorSchemeVariants.light.png new file mode 100644 index 00000000000..2f78f8fbd48 --- /dev/null +++ b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testColorSchemeVariants.light.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4c42bfd837d25da5cdcbe4c24bc2969141dfb9aff590fa4cc4223a95702d1d5 +size 100811 diff --git a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility1.png b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility1.png new file mode 100644 index 00000000000..f84885927ea --- /dev/null +++ b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9abe0e5d7004ee07d474210f73ce90ec4c344c87f2062d29f49af1aced1c3af4 +size 124406 diff --git a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility2.png b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility2.png new file mode 100644 index 00000000000..d10a38c68f9 --- /dev/null +++ b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d65353259b7c0b97d20681681be81cbed989308fffc987d3cf4ed19bf71d3545 +size 140034 diff --git a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility3.png b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility3.png new file mode 100644 index 00000000000..16884f2100c --- /dev/null +++ b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility3.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b2874637bd8fa9d87975bd1b9484fed6f44141e600455955373b559245d26f45 +size 159223 diff --git a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility4.png b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility4.png new file mode 100644 index 00000000000..1b44c0a5414 --- /dev/null +++ b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility4.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4783d75eeed018fe7e75d00142d09404c9287d78ce30fbe58014cfc04f80aa77 +size 176219 diff --git a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility5.png b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility5.png new file mode 100644 index 00000000000..54082a91da8 --- /dev/null +++ b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.accessibility5.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cb3b18a07e1ad5d8a696bd1a25c04562fe6ca5e1f42cf9aa801f023488d0a60d +size 191242 diff --git a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.large.png b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.large.png new file mode 100644 index 00000000000..2f78f8fbd48 --- /dev/null +++ b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.large.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4c42bfd837d25da5cdcbe4c24bc2969141dfb9aff590fa4cc4223a95702d1d5 +size 100811 diff --git a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.medium.png b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.medium.png new file mode 100644 index 00000000000..1867e3f0912 --- /dev/null +++ b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.medium.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c07d6c2c9b5872c8e8442e65de5c839c560ef99b0655ee5f4c254219db148b8 +size 98565 diff --git a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.small.png b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.small.png new file mode 100644 index 00000000000..d442fea995e --- /dev/null +++ b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.small.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ccb8f4b6094ee13fb873ff58ed3915a9e9b12f5c3d544a4c11cea629993b7a65 +size 96807 diff --git a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xLarge.png b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xLarge.png new file mode 100644 index 00000000000..df80019296a --- /dev/null +++ b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xLarge.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:21a750582cc35d09077cbd76393f15ada0b297ccf0061ecf4a33a634c53c33f8 +size 105958 diff --git a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xSmall.png b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xSmall.png new file mode 100644 index 00000000000..4175e752525 --- /dev/null +++ b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xSmall.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7f8d72445409613aaa6fe7b614b156d3b8f1d3f0a61e088516c7e2d4083be4b0 +size 95371 diff --git a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xxLarge.png b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xxLarge.png new file mode 100644 index 00000000000..f310c09ac23 --- /dev/null +++ b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xxLarge.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:985bd6cdd0139b9c3b22984ce7036eec5ad64d85c38b5096d35bd14fc0935a8f +size 109200 diff --git a/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xxxLarge.png b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xxxLarge.png new file mode 100644 index 00000000000..64acceac5a5 --- /dev/null +++ b/WireUI/Tests/WireIndividualToTeamMigrationUITests/Resources/ReferenceImages/TeamNameViewSnapshotTests/testDynamicTypeVariants.xxxLarge.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ebe616c6f1d864b57800e81cb3404a6856ada26db830e37c6672caa0128c15b1 +size 113335