From 812cd14bf5401bd7d8ac89cf644fc4ee1864a2f3 Mon Sep 17 00:00:00 2001 From: Marceau Tonelli Date: Wed, 18 Dec 2024 09:44:51 +0100 Subject: [PATCH 1/3] Resolve warnings in BaseAlphaStackView --- .../Client/Frontend/Components/BaseContentStackView.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firefox-ios/Client/Frontend/Components/BaseContentStackView.swift b/firefox-ios/Client/Frontend/Components/BaseContentStackView.swift index 72ed00cae18e..aeb6845aabe7 100644 --- a/firefox-ios/Client/Frontend/Components/BaseContentStackView.swift +++ b/firefox-ios/Client/Frontend/Components/BaseContentStackView.swift @@ -37,7 +37,7 @@ class BaseAlphaStackView: UIStackView, AlphaDimmable, ThemeApplicable { // MARK: - Spacer view - private var keyboardSpacerHeight: NSLayoutConstraint! + private var keyboardSpacerHeight: NSLayoutConstraint? private var keyboardSpacer: UIView? func addKeyboardSpacer(spacerHeight: CGFloat) { From 723ea4657938e03eb48908e22d9379053b40eb9b Mon Sep 17 00:00:00 2001 From: Marceau Tonelli Date: Wed, 18 Dec 2024 09:46:02 +0100 Subject: [PATCH 2/3] Update filename to match class name --- .../{BaseContentStackView.swift => BaseAlphaStackView.swift} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename firefox-ios/Client/Frontend/Components/{BaseContentStackView.swift => BaseAlphaStackView.swift} (100%) diff --git a/firefox-ios/Client/Frontend/Components/BaseContentStackView.swift b/firefox-ios/Client/Frontend/Components/BaseAlphaStackView.swift similarity index 100% rename from firefox-ios/Client/Frontend/Components/BaseContentStackView.swift rename to firefox-ios/Client/Frontend/Components/BaseAlphaStackView.swift From ff623ca28ffc07969892b55b38cd006cfdcb3fe4 Mon Sep 17 00:00:00 2001 From: Marceau Tonelli Date: Wed, 18 Dec 2024 09:53:11 +0100 Subject: [PATCH 3/3] Update filepath in xcode proj --- firefox-ios/Client.xcodeproj/project.pbxproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/firefox-ios/Client.xcodeproj/project.pbxproj b/firefox-ios/Client.xcodeproj/project.pbxproj index 4673b656bf09..bc00a0ff8fd4 100644 --- a/firefox-ios/Client.xcodeproj/project.pbxproj +++ b/firefox-ios/Client.xcodeproj/project.pbxproj @@ -1053,7 +1053,7 @@ 8AEAD9F32C3D7B3E001A2C5A /* FeatureFlagsSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8AEAD9F22C3D7B3E001A2C5A /* FeatureFlagsSettings.swift */; }; 8AEAD9F52C3D7BA9001A2C5A /* FeatureFlagsDebugViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8AEAD9F42C3D7BA9001A2C5A /* FeatureFlagsDebugViewController.swift */; }; 8AEAD9F92C3DB0CD001A2C5A /* MicrosurveyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8AEAD9F62C3DB0BF001A2C5A /* MicrosurveyTests.swift */; }; - 8AED23C527AC1F9500DE7E97 /* BaseContentStackView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8AED23C427AC1F9500DE7E97 /* BaseContentStackView.swift */; }; + 8AED23C527AC1F9500DE7E97 /* BaseAlphaStackView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8AED23C427AC1F9500DE7E97 /* BaseAlphaStackView.swift */; }; 8AED868328CA3B3400351A50 /* BookmarkPanelViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8AED868228CA3B3400351A50 /* BookmarkPanelViewModelTests.swift */; }; 8AEDB11529F9F00400F2A53B /* SceneContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8AEDB11429F9F00400F2A53B /* SceneContainer.swift */; }; 8AEE284B276A973400C7104D /* RatingPromptManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8AEE284A276A973400C7104D /* RatingPromptManagerTests.swift */; }; @@ -7632,7 +7632,7 @@ 8AEAD9F22C3D7B3E001A2C5A /* FeatureFlagsSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeatureFlagsSettings.swift; sourceTree = ""; }; 8AEAD9F42C3D7BA9001A2C5A /* FeatureFlagsDebugViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeatureFlagsDebugViewController.swift; sourceTree = ""; }; 8AEAD9F62C3DB0BF001A2C5A /* MicrosurveyTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MicrosurveyTests.swift; sourceTree = ""; }; - 8AED23C427AC1F9500DE7E97 /* BaseContentStackView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseContentStackView.swift; sourceTree = ""; }; + 8AED23C427AC1F9500DE7E97 /* BaseAlphaStackView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseAlphaStackView.swift; sourceTree = ""; }; 8AED868228CA3B3400351A50 /* BookmarkPanelViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarkPanelViewModelTests.swift; sourceTree = ""; }; 8AEDB11429F9F00400F2A53B /* SceneContainer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneContainer.swift; sourceTree = ""; }; 8AEDFE832C9DAB9C00821359 /* FennecTesting.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = FennecTesting.xcconfig; sourceTree = ""; }; @@ -12009,7 +12009,7 @@ isa = PBXGroup; children = ( E17496362991A2480096900A /* SwiftUI */, - 8AED23C427AC1F9500DE7E97 /* BaseContentStackView.swift */, + 8AED23C427AC1F9500DE7E97 /* BaseAlphaStackView.swift */, 43AB6F9E25DC53D20016B015 /* LegacyLabelButtonHeaderView.swift */, 8A36BE2829EDBC6900AC1C5C /* ContentContainer.swift */, 8ACE9BFA2A54A010001E7A73 /* ExpandButtonState.swift */, @@ -16359,7 +16359,7 @@ 9636D92827F5D72D00771F5E /* GleanPlumbMessageManager.swift in Sources */, C80685D126A0C93900DCD895 /* UserResearch.swift in Sources */, B2999FF52B194AB200F0FEC1 /* FormAutofillHelperError.swift in Sources */, - 8AED23C527AC1F9500DE7E97 /* BaseContentStackView.swift in Sources */, + 8AED23C527AC1F9500DE7E97 /* BaseAlphaStackView.swift in Sources */, C8699131289176A5007ACC5C /* WallpaperNetworking.swift in Sources */, 5A271ABD2860B0D700471CE4 /* WebServerUtil.swift in Sources */, 964FA97528A1A8F20024BB3B /* ContextualHintEligibilityUtility.swift in Sources */,