Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Auth] Convert LoginView to SwiftUI #13628

Draft
wants to merge 17 commits into
base: main
Choose a base branch
from
Draft

[Auth] Convert LoginView to SwiftUI #13628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
540d83d
[Auth] Convert LoginView to SwiftUI
ncooke3 Sep 10, 2024
aff55c3
Refactor button logic into custom view
ncooke3 Sep 11, 2024
62d639a
Style FirebaseAuth/Tests/SampleSwift/AuthenticationExample/Utility/Ex…
ncooke3 Sep 11, 2024
4411673
Disable buttons if textfields are empty
ncooke3 Sep 11, 2024
413e9a2
Implement action handlers
ncooke3 Sep 11, 2024
aea8b4b
Style FirebaseAuth/Tests/SampleSwift/AuthenticationExample/CustomVie…
ncooke3 Sep 11, 2024
589ade5
Merge branch 'main' into nc/swiftui-auth
ncooke3 Oct 9, 2024
bb0e4ff
Add title and description
ncooke3 Oct 9, 2024
7d96b99
Bump minimum deployment target to iOS 15
ncooke3 Oct 11, 2024
243afcb
Implement verification code flow in new SwiftUI view
ncooke3 Oct 11, 2024
7a6c843
Remove UIKit-based LoginView.swift
ncooke3 Oct 11, 2024
44dad32
Rename LoginViewSwiftUI.swift to LoginView.swift
ncooke3 Oct 11, 2024
49dfae1
Remove unneeded extension and finish renaming
ncooke3 Oct 11, 2024
c71e9fe
Refactor out login button action handler
ncooke3 Oct 14, 2024
8424f5f
[skip ci] Refactor out login button action handler (2)
ncooke3 Oct 14, 2024
12758ed
[skip ci] Refactor out login button action handler (3)
ncooke3 Oct 14, 2024
da98405
[skip ci] Move alert view code
ncooke3 Oct 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 11 additions & 13 deletions FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
EA20B50C249E8F0700B5E581 /* AuthMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA20B50B249E8F0700B5E581 /* AuthMenu.swift */; };
EA20B510249FDB4400B5E581 /* OtherAuthMethods.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA20B50F249FDB4400B5E581 /* OtherAuthMethods.swift */; };
EA217895248979E200736757 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EA217894248979E200736757 /* LaunchScreen.storyboard */; };
EA3348322C90EFF40091D7C2 /* LoginViewSwiftUI.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA3348312C90EFE40091D7C2 /* LoginViewSwiftUI.swift */; };
EA527CAA24A0766D00ADB9A2 /* OtherAuthViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA527CA924A0766D00ADB9A2 /* OtherAuthViewController.swift */; };
EA527CAC24A0EE9600ADB9A2 /* LoginView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA527CAB24A0EE9600ADB9A2 /* LoginView.swift */; };
EAB3A1792494433500385291 /* DataSourceProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAB3A1782494433500385291 /* DataSourceProvider.swift */; };
Expand All @@ -56,7 +57,6 @@
EAE4CBC924855E3A00245E92 /* AuthViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAE4CBC824855E3A00245E92 /* AuthViewController.swift */; };
EAE4CBCE24855E3D00245E92 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EAE4CBCD24855E3D00245E92 /* Assets.xcassets */; };
EAE4CBE724855E3E00245E92 /* AuthenticationExampleUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAE4CBE624855E3E00245E92 /* AuthenticationExampleUITests.swift */; };
EAE4CBF524857A5100245E92 /* LoginController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAE4CBF424857A5100245E92 /* LoginController.swift */; };
EAEBCE0F2489FFDE00FCEA92 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAEBCE0E2489FFDE00FCEA92 /* Extensions.swift */; };
EAEBCE11248A9AA000FCEA92 /* Section.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAEBCE10248A9AA000FCEA92 /* Section.swift */; };
EAFDF2BE2490439F0082B6F1 /* Animator.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAFDF2BD2490439F0082B6F1 /* Animator.swift */; };
Expand Down Expand Up @@ -124,8 +124,8 @@
EA20B50B249E8F0700B5E581 /* AuthMenu.swift */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.swift; path = AuthMenu.swift; sourceTree = "<group>"; };
EA20B50F249FDB4400B5E581 /* OtherAuthMethods.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OtherAuthMethods.swift; sourceTree = "<group>"; };
EA217894248979E200736757 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
EA3348312C90EFE40091D7C2 /* LoginView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginView.swift; sourceTree = "<group>"; };
EA527CA924A0766D00ADB9A2 /* OtherAuthViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OtherAuthViewController.swift; sourceTree = "<group>"; };
EA527CAB24A0EE9600ADB9A2 /* LoginView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginView.swift; sourceTree = "<group>"; };
EAB3A1782494433500385291 /* DataSourceProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataSourceProvider.swift; sourceTree = "<group>"; };
EAB3A17B2494628200385291 /* UserViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserViewController.swift; sourceTree = "<group>"; };
EAE08EB424CF5D09006FA3A5 /* AccountLinkingViewController.swift */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.swift; path = AccountLinkingViewController.swift; sourceTree = "<group>"; };
Expand All @@ -138,7 +138,6 @@
EAE4CBE224855E3E00245E92 /* AuthenticationExampleUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AuthenticationExampleUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
EAE4CBE624855E3E00245E92 /* AuthenticationExampleUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationExampleUITests.swift; sourceTree = "<group>"; };
EAE4CBE824855E3E00245E92 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
EAE4CBF424857A5100245E92 /* LoginController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginController.swift; sourceTree = "<group>"; };
EAEBCE0E2489FFDE00FCEA92 /* Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = "<group>"; };
EAEBCE10248A9AA000FCEA92 /* Section.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Section.swift; sourceTree = "<group>"; };
EAFDF2BD2490439F0082B6F1 /* Animator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Animator.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -222,7 +221,6 @@
children = (
EAE08EB424CF5D09006FA3A5 /* AccountLinkingViewController.swift */,
EAE4CBC824855E3A00245E92 /* AuthViewController.swift */,
EAE4CBF424857A5100245E92 /* LoginController.swift */,
EAB3A17B2494628200385291 /* UserViewController.swift */,
EA02F68E24A0714B0079D000 /* OtherAuthMethodControllers */,
DEC2E5DC2A95331D0090260A /* SettingsViewController.swift */,
Expand All @@ -245,7 +243,7 @@
isa = PBXGroup;
children = (
EA20B46B2495A9F900B5E581 /* SignedOutView.swift */,
EA527CAB24A0EE9600ADB9A2 /* LoginView.swift */,
EA3348312C90EFE40091D7C2 /* LoginView.swift */,
);
path = CustomViews;
sourceTree = "<group>";
Expand Down Expand Up @@ -547,6 +545,7 @@
buildActionMask = 2147483647;
files = (
EA20B46E2495B2C700B5E581 /* DataSourceProtocols.swift in Sources */,
EA3348322C90EFF40091D7C2 /* LoginView.swift in Sources */,
EAB3A1792494433500385291 /* DataSourceProvider.swift in Sources */,
EA20B46C2495A9F900B5E581 /* SignedOutView.swift in Sources */,
EA527CAA24A0766D00ADB9A2 /* OtherAuthViewController.swift in Sources */,
Expand All @@ -557,7 +556,6 @@
EA02F68524A000E00079D000 /* UserActions.swift in Sources */,
EA02F68D24A063E90079D000 /* LoginDelegate.swift in Sources */,
EA20B50A249D3D8600B5E581 /* PasswordlessViewController.swift in Sources */,
EAE4CBF524857A5100245E92 /* LoginController.swift in Sources */,
EA20B510249FDB4400B5E581 /* OtherAuthMethods.swift in Sources */,
EA12697F29E33A5D00D79E66 /* CryptoUtils.swift in Sources */,
EAEBCE11248A9AA000FCEA92 /* Section.swift in Sources */,
Expand All @@ -568,7 +566,6 @@
EAFDF2BE2490439F0082B6F1 /* Animator.swift in Sources */,
EAE4CBC724855E3A00245E92 /* SceneDelegate.swift in Sources */,
EAE08EB524CF5D09006FA3A5 /* AccountLinkingViewController.swift in Sources */,
EA527CAC24A0EE9600ADB9A2 /* LoginView.swift in Sources */,
EAEBCE0F2489FFDE00FCEA92 /* Extensions.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -713,7 +710,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
Expand Down Expand Up @@ -768,7 +765,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
OTHER_LDFLAGS = "-ObjC";
Expand All @@ -789,7 +786,7 @@
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = AuthenticationExample/SwiftApplication.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -811,8 +808,9 @@
"CODE_SIGN_IDENTITY[sdk=*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = EQHXZ8M8AV;
INFOPLIST_FILE = AuthenticationExample/SwiftApplication.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -835,7 +833,7 @@
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = SwiftApiTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -860,7 +858,7 @@
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = SwiftApiTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down
6 changes: 3 additions & 3 deletions FirebaseAuth/Tests/SampleSwift/AuthenticationExample/Assets.xcassets/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
}
21 changes: 0 additions & 21 deletions ...sts/SampleSwift/AuthenticationExample/Assets.xcassets/firebaseLogo.imageset/Contents.json
View file
Open in desktop

This file was deleted.

Binary file removed ...ift/AuthenticationExample/Assets.xcassets/firebaseLogo.imageset/logo-1024px.png
View file
Open in desktop
Binary file not shown.
Loading