Skip to content

Commit

Permalink
Chaemin2001/social login (#309)
Browse files Browse the repository at this point in the history 
* Enable Google Login

* Update Info.plist

* Update Icons

* Enable Kakao Login

* Update UI

* Resolve Package Dependencies

* Resolve Kakao Login Error

* Delete Unnecessary Buttons

* Resolve Missing Url Scheme

* Apply SwiftFormat changes

* Change Facbook Icon Name

* Change Login Button Style

* Resolve Package

* Revert "Resolve Package"

This reverts commit 145a108.

* Resolve Packages

* Revert "Resolve Packages"

This reverts commit 0374da6.

* Fix package version issue

* Change Font Style

* Add All Possible Errors

* Apply SwiftFormat changes

* Delete 1x icons

* Update Error Message

* Improve error handling for social login

* Apply SwiftFormat changes

---------

Co-authored-by: chaemin2001 <[email protected]>
Co-authored-by: peng-u-0807 <[email protected]>
  • Loading branch information
@chaemin2001 @peng-u-0807
3 people authored Sep 19, 2024
1 parent 049948f commit 5065f38
Show file tree
Hide file tree
Showing 40 changed files with 593 additions and 185 deletions.
77 changes: 77 additions & 0 deletions SNUTT-2022/SNUTT.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,17 @@
objects = {

/* Begin PBXBuildFile section */
731C244E2C4442590015877B /* KakaoSDK in Frameworks */ = {isa = PBXBuildFile; productRef = 731C244D2C4442590015877B /* KakaoSDK */; };
731C24502C4442590015877B /* KakaoSDKAuth in Frameworks */ = {isa = PBXBuildFile; productRef = 731C244F2C4442590015877B /* KakaoSDKAuth */; };
731C24522C4442590015877B /* KakaoSDKCommon in Frameworks */ = {isa = PBXBuildFile; productRef = 731C24512C4442590015877B /* KakaoSDKCommon */; };
731D9FFD297BC5060027BA25 /* Bookmark.swift in Sources */ = {isa = PBXBuildFile; fileRef = 731D9FFC297BC5060027BA25 /* Bookmark.swift */; };
731DA001297BC54B0027BA25 /* BookmarkDto.swift in Sources */ = {isa = PBXBuildFile; fileRef = 731DA000297BC54B0027BA25 /* BookmarkDto.swift */; };
731DA003297BC5740027BA25 /* BookmarkRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 731DA002297BC5740027BA25 /* BookmarkRouter.swift */; };
731DA005297BC8990027BA25 /* BookmarkScene.swift in Sources */ = {isa = PBXBuildFile; fileRef = 731DA004297BC8990027BA25 /* BookmarkScene.swift */; };
734A831F2C2FD41200D6CB95 /* KakaoLogin.swift in Sources */ = {isa = PBXBuildFile; fileRef = 734A831E2C2FD41200D6CB95 /* KakaoLogin.swift */; };
736AF84C2C2F275E00ED9C1A /* GoogleLogin.swift in Sources */ = {isa = PBXBuildFile; fileRef = 736AF84B2C2F275E00ED9C1A /* GoogleLogin.swift */; };
736AF84F2C2F279900ED9C1A /* GoogleSignIn in Frameworks */ = {isa = PBXBuildFile; productRef = 736AF84E2C2F279900ED9C1A /* GoogleSignIn */; };
736AF8512C2F279900ED9C1A /* GoogleSignInSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 736AF8502C2F279900ED9C1A /* GoogleSignInSwift */; };
738406EE2B57107C00007E62 /* Theme.swift in Sources */ = {isa = PBXBuildFile; fileRef = 738406ED2B57107C00007E62 /* Theme.swift */; };
738406F12B5710C200007E62 /* ThemeDto.swift in Sources */ = {isa = PBXBuildFile; fileRef = 738406F02B5710C200007E62 /* ThemeDto.swift */; };
738406F32B57119100007E62 /* ThemeRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = 738406F22B57119100007E62 /* ThemeRepository.swift */; };
Expand All @@ -26,6 +33,8 @@
738407082B579F9200007E62 /* Theme.swift in Sources */ = {isa = PBXBuildFile; fileRef = 738406ED2B57107C00007E62 /* Theme.swift */; };
738407092B57B10000007E62 /* ThemeDto.swift in Sources */ = {isa = PBXBuildFile; fileRef = 738406F02B5710C200007E62 /* ThemeDto.swift */; };
738407102B6060F800007E62 /* ThemeState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 738406F82B57154400007E62 /* ThemeState.swift */; };
73AB84D22C35128B0075DE83 /* IntegrateAccountScene.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73AB84D12C35128B0075DE83 /* IntegrateAccountScene.swift */; };
73AB84D42C3514080075DE83 /* IntegrateAccountViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73AB84D32C3514080075DE83 /* IntegrateAccountViewModel.swift */; };
B800A38B2B76132C008E8D84 /* SearchTimeMaskDto.swift in Sources */ = {isa = PBXBuildFile; fileRef = B800A38A2B76132C008E8D84 /* SearchTimeMaskDto.swift */; };
B800A38C2B77BD78008E8D84 /* SearchTimeMaskDto.swift in Sources */ = {isa = PBXBuildFile; fileRef = B800A38A2B76132C008E8D84 /* SearchTimeMaskDto.swift */; };
B82EA54C2B62C8490029FDF3 /* LectureMapView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B82EA54B2B62C8490029FDF3 /* LectureMapView.swift */; };
Expand Down Expand Up @@ -344,6 +353,8 @@
731DA000297BC54B0027BA25 /* BookmarkDto.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarkDto.swift; sourceTree = "<group>"; };
731DA002297BC5740027BA25 /* BookmarkRouter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarkRouter.swift; sourceTree = "<group>"; };
731DA004297BC8990027BA25 /* BookmarkScene.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarkScene.swift; sourceTree = "<group>"; };
734A831E2C2FD41200D6CB95 /* KakaoLogin.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KakaoLogin.swift; sourceTree = "<group>"; };
736AF84B2C2F275E00ED9C1A /* GoogleLogin.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GoogleLogin.swift; sourceTree = "<group>"; };
738406ED2B57107C00007E62 /* Theme.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Theme.swift; sourceTree = "<group>"; };
738406F02B5710C200007E62 /* ThemeDto.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemeDto.swift; sourceTree = "<group>"; };
738406F22B57119100007E62 /* ThemeRepository.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemeRepository.swift; sourceTree = "<group>"; };
Expand All @@ -356,6 +367,8 @@
738407002B571D8E00007E62 /* ThemeIcon.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemeIcon.swift; sourceTree = "<group>"; };
738407022B571E6200007E62 /* ThemeBottomSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemeBottomSheet.swift; sourceTree = "<group>"; };
738407042B577E9000007E62 /* ThemeDetailScene.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemeDetailScene.swift; sourceTree = "<group>"; };
73AB84D12C35128B0075DE83 /* IntegrateAccountScene.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IntegrateAccountScene.swift; sourceTree = "<group>"; };
73AB84D32C3514080075DE83 /* IntegrateAccountViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IntegrateAccountViewModel.swift; sourceTree = "<group>"; };
B800A38A2B76132C008E8D84 /* SearchTimeMaskDto.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchTimeMaskDto.swift; sourceTree = "<group>"; };
B82EA54B2B62C8490029FDF3 /* LectureMapView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LectureMapView.swift; sourceTree = "<group>"; };
B82EA54D2B6393190029FDF3 /* KakaoMapView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KakaoMapView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -616,14 +629,19 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
731C24522C4442590015877B /* KakaoSDKCommon in Frameworks */,
BE4CD86728F5A56200BA9BBC /* FirebaseMessaging in Frameworks */,
731C244E2C4442590015877B /* KakaoSDK in Frameworks */,
B8B7501D2B6274A5004F6272 /* KakaoMapsSDK_SPM in Frameworks */,
BE4CD86328F5A56200BA9BBC /* FirebaseAnalyticsSwift in Frameworks */,
BE779B1828E3DD5B009960EB /* FacebookLogin in Frameworks */,
CEF992F72BF3B8FC00F0FFA4 /* ReactNativeKit in Frameworks */,
736AF8512C2F279900ED9C1A /* GoogleSignInSwift in Frameworks */,
BE4CD86528F5A56200BA9BBC /* FirebaseCrashlytics in Frameworks */,
BEDE34D42879A59B00525014 /* Alamofire in Frameworks */,
BE4CD86128F5A56200BA9BBC /* FirebaseAnalytics in Frameworks */,
736AF84F2C2F279900ED9C1A /* GoogleSignIn in Frameworks */,
731C24502C4442590015877B /* KakaoSDKAuth in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -670,6 +688,7 @@
BE9C90EC2948F4BE00003AA6 /* ColorSchemeSettingScene.swift */,
B8F40EAC28980D840021A2A9 /* TimetableSettingScene.swift */,
738406FA2B57173400007E62 /* ThemeSettingScene.swift */,
73AB84D12C35128B0075DE83 /* IntegrateAccountScene.swift */,
);
path = Settings;
sourceTree = "<group>";
Expand Down Expand Up @@ -719,6 +738,8 @@
BE9C90EA2948EA1800003AA6 /* ColorScheme.swift */,
CE3F37AC29C5D452009EDCCC /* Collection+Getter.swift */,
B8F0B22F2A4B27A500A2E15E /* UIDevice+Ext.swift */,
736AF84B2C2F275E00ED9C1A /* GoogleLogin.swift */,
734A831E2C2FD41200D6CB95 /* KakaoLogin.swift */,
);
path = Extensions;
sourceTree = "<group>";
Expand Down Expand Up @@ -1139,6 +1160,7 @@
BED04D3428EA966100937E4C /* OnboardViewModel.swift */,
738406FC2B57179100007E62 /* ThemeSettingViewModel.swift */,
738406FE2B5718C600007E62 /* ThemeDetailViewModel.swift */,
73AB84D32C3514080075DE83 /* IntegrateAccountViewModel.swift */,
);
path = ViewModels;
sourceTree = "<group>";
Expand Down Expand Up @@ -1210,6 +1232,11 @@
BE4CD86628F5A56200BA9BBC /* FirebaseMessaging */,
B8B7501C2B6274A5004F6272 /* KakaoMapsSDK_SPM */,
CEF992F62BF3B8FC00F0FFA4 /* ReactNativeKit */,
736AF84E2C2F279900ED9C1A /* GoogleSignIn */,
736AF8502C2F279900ED9C1A /* GoogleSignInSwift */,
731C244D2C4442590015877B /* KakaoSDK */,
731C244F2C4442590015877B /* KakaoSDKAuth */,
731C24512C4442590015877B /* KakaoSDKCommon */,
);
productName = SNUTT;
productReference = BE682BB22879E24D009EBCB7 /* SNUTT.app */;
Expand Down Expand Up @@ -1293,6 +1320,8 @@
BE4CD85F28F5A56200BA9BBC /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
CE1F49AF2A8DB5A400B81E4E /* XCRemoteSwiftPackageReference "ios-rn-prebuilt" */,
B8B7501B2B6274A5004F6272 /* XCRemoteSwiftPackageReference "KakaoMapsSDK-SPM" */,
736AF84D2C2F279900ED9C1A /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */,
734A83172C2FD39600D6CB95 /* XCRemoteSwiftPackageReference "kakao-ios-sdk" */,
);
productRefGroup = DC860F3C27E5C87D0068C94B;
projectDirPath = "";
Expand Down Expand Up @@ -1430,6 +1459,7 @@
BE9413C128C219AD00171060 /* STNotification.swift in Sources */,
B87B317328D81447005C170B /* UserDto.swift in Sources */,
BE060BD928DF4C1E00A2F1B9 /* OnboardScene.swift in Sources */,
73AB84D22C35128B0075DE83 /* IntegrateAccountScene.swift in Sources */,
BE682BFF2888056C009EBCB7 /* Quarter.swift in Sources */,
B8F40EA9289809C60021A2A9 /* LicenseView.swift in Sources */,
BEDF506D27EB740F00CDCC13 /* LectureList.swift in Sources */,
Expand All @@ -1447,6 +1477,7 @@
BE9C90EB2948EA1800003AA6 /* ColorScheme.swift in Sources */,
CE5BA50A2B2ED4BC00F15D10 /* ExpandableLectureList.swift in Sources */,
CE9820522A0A0BE9001037F5 /* NetworkLogEntryView.swift in Sources */,
736AF84C2C2F275E00ED9C1A /* GoogleLogin.swift in Sources */,
BEE86519289E287400D3D0E4 /* MenuRenameSheet.swift in Sources */,
BEDE34DC2879B40100525014 /* AppEnvironment.swift in Sources */,
CEDDCA842A6AFBF700474D4E /* VacancyDto.swift in Sources */,
Expand Down Expand Up @@ -1586,6 +1617,7 @@
BE9413C328C21D1000171060 /* NotificationRepository.swift in Sources */,
B87B315E28D5A70F005C170B /* SearchState.swift in Sources */,
BE060BD728DF43AC00A2F1B9 /* AuthService.swift in Sources */,
734A831F2C2FD41200D6CB95 /* KakaoLogin.swift in Sources */,
BE682C012888173B009EBCB7 /* TagRouter.swift in Sources */,
731DA003297BC5740027BA25 /* BookmarkRouter.swift in Sources */,
738407052B577E9000007E62 /* ThemeDetailScene.swift in Sources */,
Expand All @@ -1607,6 +1639,7 @@
731DA001297BC54B0027BA25 /* BookmarkDto.swift in Sources */,
738407032B571E6200007E62 /* ThemeBottomSheet.swift in Sources */,
BE682BF92887FB59009EBCB7 /* SearchRouter.swift in Sources */,
73AB84D42C3514080075DE83 /* IntegrateAccountViewModel.swift in Sources */,
BE9413CC28C21F1E00171060 /* NotificationListCell.swift in Sources */,
CEDDCA7B2A6AE62B00474D4E /* VacancyLectureCell.swift in Sources */,
BEEBDFB62868BA6D00DB5976 /* FilterSheetContent.swift in Sources */,
Expand Down Expand Up @@ -1777,6 +1810,7 @@
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = SNUTT/Info.plist;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity";
INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "Save Screenshots to Photo Library";
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
Expand Down Expand Up @@ -2090,6 +2124,7 @@
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = SNUTT/Info.plist;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity";
INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "Save Screenshots to Photo Library";
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
Expand Down Expand Up @@ -2134,6 +2169,7 @@
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = SNUTT/Info.plist;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity";
INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "Save Screenshots to Photo Library";
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
Expand Down Expand Up @@ -2301,6 +2337,22 @@
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
734A83172C2FD39600D6CB95 /* XCRemoteSwiftPackageReference "kakao-ios-sdk" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/kakao/kakao-ios-sdk";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 2.22.3;
};
};
736AF84D2C2F279900ED9C1A /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/google/GoogleSignIn-iOS";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 7.1.0;
};
};
B8B7501B2B6274A5004F6272 /* XCRemoteSwiftPackageReference "KakaoMapsSDK-SPM" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/kakao-mapsSDK/KakaoMapsSDK-SPM.git";
Expand Down Expand Up @@ -2344,6 +2396,31 @@
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
731C244D2C4442590015877B /* KakaoSDK */ = {
isa = XCSwiftPackageProductDependency;
package = 734A83172C2FD39600D6CB95 /* XCRemoteSwiftPackageReference "kakao-ios-sdk" */;
productName = KakaoSDK;
};
731C244F2C4442590015877B /* KakaoSDKAuth */ = {
isa = XCSwiftPackageProductDependency;
package = 734A83172C2FD39600D6CB95 /* XCRemoteSwiftPackageReference "kakao-ios-sdk" */;
productName = KakaoSDKAuth;
};
731C24512C4442590015877B /* KakaoSDKCommon */ = {
isa = XCSwiftPackageProductDependency;
package = 734A83172C2FD39600D6CB95 /* XCRemoteSwiftPackageReference "kakao-ios-sdk" */;
productName = KakaoSDKCommon;
};
736AF84E2C2F279900ED9C1A /* GoogleSignIn */ = {
isa = XCSwiftPackageProductDependency;
package = 736AF84D2C2F279900ED9C1A /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */;
productName = GoogleSignIn;
};
736AF8502C2F279900ED9C1A /* GoogleSignInSwift */ = {
isa = XCSwiftPackageProductDependency;
package = 736AF84D2C2F279900ED9C1A /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */;
productName = GoogleSignInSwift;
};
B8B7501C2B6274A5004F6272 /* KakaoMapsSDK_SPM */ = {
isa = XCSwiftPackageProductDependency;
package = B8B7501B2B6274A5004F6272 /* XCRemoteSwiftPackageReference "KakaoMapsSDK-SPM" */;
Expand Down
46 changes: 41 additions & 5 deletions SNUTT-2022/SNUTT.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"originHash" : "7c222e4a86eb2e1fd5319b24f556a74c30a45b6bea0ee72a523d512d16abc2e9",
"originHash" : "c5a43addf81097cbe1d3fca2033364f0e6e43186057dbcbd3e8d1955872a81fb",
"pins" : [
{
"identity" : "abseil-cpp-binary",
Expand All @@ -15,8 +15,17 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/Alamofire/Alamofire.git",
"state" : {
"revision" : "bc268c28fb170f494de9e9927c371b8342979ece",
"version" : "5.7.1"
"revision" : "f455c2975872ccd2d9c81594c658af65716e9b9a",
"version" : "5.9.1"
}
},
{
"identity" : "appauth-ios",
"kind" : "remoteSourceControl",
"location" : "https://github.com/openid/AppAuth-iOS.git",
"state" : {
"revision" : "c89ed571ae140f8eb1142735e6e23d7bb8c34cb2",
"version" : "1.7.5"
}
},
{
Expand Down Expand Up @@ -55,6 +64,15 @@
"version" : "9.2.5"
}
},
{
"identity" : "googlesignin-ios",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/GoogleSignIn-iOS",
"state" : {
"revision" : "a7965d134c5d3567026c523e0a8a583f73b62b0d",
"version" : "7.1.0"
}
},
{
"identity" : "googleutilities",
"kind" : "remoteSourceControl",
Expand All @@ -78,8 +96,17 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/gtm-session-fetcher.git",
"state" : {
"revision" : "d415594121c9e8a4f9d79cecee0965cf35e74dbd",
"version" : "3.1.1"
"revision" : "a2ab612cb980066ee56d90d60d8462992c07f24b",
"version" : "3.5.0"
}
},
{
"identity" : "gtmappauth",
"kind" : "remoteSourceControl",
"location" : "https://github.com/google/GTMAppAuth.git",
"state" : {
"revision" : "5d7d66f647400952b1758b230e019b07c0b4b22a",
"version" : "4.1.1"
}
},
{
Expand All @@ -91,6 +118,15 @@
"version" : "0.17.0"
}
},
{
"identity" : "kakao-ios-sdk",
"kind" : "remoteSourceControl",
"location" : "https://github.com/kakao/kakao-ios-sdk",
"state" : {
"revision" : "08089eeffc9b442da1c7343a70bf66c6de1a72c9",
"version" : "2.22.4"
}
},
{
"identity" : "kakaomapssdk-spm",
"kind" : "remoteSourceControl",
Expand Down
56 changes: 0 additions & 56 deletions SNUTT-2022/SNUTT/Assets/Assets.xcassets/Icons/apple.imageset/Contents.json
View file

This file was deleted.

1 change: 0 additions & 1 deletion .../SNUTT/Assets/Assets.xcassets/Icons/apple.imageset/apple-logo-svgrepo-com 1.svg
View file

This file was deleted.

1 change: 0 additions & 1 deletion .../SNUTT/Assets/Assets.xcassets/Icons/apple.imageset/apple-logo-svgrepo-com 2.svg
View file

This file was deleted.

Loading

0 comments on commit 5065f38

Please sign in to comment.