diff --git a/NADA-iOS-forRelease.xcodeproj/project.pbxproj b/NADA-iOS-forRelease.xcodeproj/project.pbxproj index e57fd817..530092b7 100644 --- a/NADA-iOS-forRelease.xcodeproj/project.pbxproj +++ b/NADA-iOS-forRelease.xcodeproj/project.pbxproj @@ -146,6 +146,7 @@ 3903CC1F2769F4F40094C458 /* EmptyCardCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = EmptyCardCell.xib; sourceTree = ""; }; 390515B72706CEBB00C5F7A5 /* Colors.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Colors.xcassets; sourceTree = ""; }; 3909242E26FA15E800236C51 /* UIView+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+Extension.swift"; sourceTree = ""; }; + 3918F6652771682F00984648 /* NADA-iOS-forRelease.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "NADA-iOS-forRelease.entitlements"; sourceTree = ""; }; 3927A7D6275F2A9B008BCD2A /* UserDefaults.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDefaults.swift; sourceTree = ""; }; 39288E11273F52B20072F403 /* CardListLookUpRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardListLookUpRequest.swift; sourceTree = ""; }; 392F7FB2274621F1008CDBF5 /* MoreListTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoreListTableViewCell.swift; sourceTree = ""; }; @@ -768,6 +769,7 @@ F8FC438426C01CDD0033E151 /* NADA-iOS-forRelease */ = { isa = PBXGroup; children = ( + 3918F6652771682F00984648 /* NADA-iOS-forRelease.entitlements */, F8FC439326C01CDE0033E151 /* Info.plist */, F8FC439926C01E2B0033E151 /* Resouces */, F8FC439A26C01EA90033E151 /* Sources */, @@ -1329,6 +1331,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CODE_SIGN_ENTITLEMENTS = "NADA-iOS-forRelease/NADA-iOS-forRelease.entitlements"; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = T3VFJ764ZC; INFOPLIST_FILE = "NADA-iOS-forRelease/Info.plist"; @@ -1349,6 +1352,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CODE_SIGN_ENTITLEMENTS = "NADA-iOS-forRelease/NADA-iOS-forRelease.entitlements"; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = T3VFJ764ZC; INFOPLIST_FILE = "NADA-iOS-forRelease/Info.plist"; diff --git a/NADA-iOS-forRelease/NADA-iOS-forRelease.entitlements b/NADA-iOS-forRelease/NADA-iOS-forRelease.entitlements new file mode 100644 index 00000000..a812db50 --- /dev/null +++ b/NADA-iOS-forRelease/NADA-iOS-forRelease.entitlements @@ -0,0 +1,10 @@ + + + + + com.apple.developer.applesignin + + Default + + + diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/AppleLogin.imageset/AppleLogin-1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/AppleLogin.imageset/AppleLogin-1.png new file mode 100644 index 00000000..5d723ad7 Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/AppleLogin.imageset/AppleLogin-1.png differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/AppleLogin.imageset/AppleLogin-1@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/AppleLogin.imageset/AppleLogin-1@2x.png new file mode 100644 index 00000000..57c664d2 Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/AppleLogin.imageset/AppleLogin-1@2x.png differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/AppleLogin.imageset/AppleLogin-1@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/AppleLogin.imageset/AppleLogin-1@3x.png new file mode 100644 index 00000000..65287e20 Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/AppleLogin.imageset/AppleLogin-1@3x.png differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/AppleLogin.imageset/AppleLogin.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/AppleLogin.imageset/AppleLogin.png new file mode 100644 index 00000000..77336e32 Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/AppleLogin.imageset/AppleLogin.png differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/AppleLogin.imageset/AppleLogin@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/AppleLogin.imageset/AppleLogin@2x.png new file mode 100644 index 00000000..c2c21d34 Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/AppleLogin.imageset/AppleLogin@2x.png differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/AppleLogin.imageset/AppleLogin@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/AppleLogin.imageset/AppleLogin@3x.png new file mode 100644 index 00000000..bbbf3983 Binary files /dev/null and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/AppleLogin.imageset/AppleLogin@3x.png differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/AppleLogin.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/AppleLogin.imageset/Contents.json new file mode 100644 index 00000000..c1a4d884 --- /dev/null +++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/AppleLogin.imageset/Contents.json @@ -0,0 +1,56 @@ +{ + "images" : [ + { + "filename" : "AppleLogin.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "AppleLogin-1.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "AppleLogin@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "AppleLogin-1@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "AppleLogin@3x.png", + "idiom" : "universal", + "scale" : "3x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "filename" : "AppleLogin-1@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd-1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd-1.png index 8d0e3b12..e21184db 100644 Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd-1.png and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd-1.png differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd.png index d93a2f06..601ad310 100644 Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd.png and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd.png differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd@2x-1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd@2x-1.png index 1164374f..2fa34047 100644 Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd@2x-1.png and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd@2x-1.png differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd@2x.png index b40b9293..f29e85ae 100644 Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd@2x.png and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd@2x.png differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd@3x-1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd@3x-1.png index a167d186..0bc0f690 100644 Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd@3x-1.png and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd@3x-1.png differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd@3x.png index 40b10e0c..7fa7fc55 100644 Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd@3x.png and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconAdd.imageset/iconAdd@3x.png differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList-1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList-1.png index 6bc2b8c8..7b4928be 100644 Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList-1.png and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList-1.png differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList.png index 5c5e3a41..ff324b37 100644 Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList.png and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList.png differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList@2x-1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList@2x-1.png index 65eee809..76a853db 100644 Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList@2x-1.png and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList@2x-1.png differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList@2x.png index ed2207ed..a40e5db9 100644 Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList@2x.png and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList@2x.png differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList@3x-1.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList@3x-1.png index c0e43dde..e0b3a0ae 100644 Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList@3x-1.png and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList@3x-1.png differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList@3x.png index b01ec7c0..2fb9cac2 100644 Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList@3x.png and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/iconList.imageset/iconList@3x.png differ diff --git a/NADA-iOS-forRelease/Resouces/Constants/UserDefaults.swift b/NADA-iOS-forRelease/Resouces/Constants/UserDefaults.swift index 0bd3cfcd..f0628d1d 100644 --- a/NADA-iOS-forRelease/Resouces/Constants/UserDefaults.swift +++ b/NADA-iOS-forRelease/Resouces/Constants/UserDefaults.swift @@ -12,5 +12,6 @@ extension Const { static let darkModeState = "darkModeState" static let accessToken = "accessToken" static let refreshToken = "refreshToken" + static let userID = "userID" } } diff --git a/NADA-iOS-forRelease/Resouces/Storyboards/Login/Login.storyboard b/NADA-iOS-forRelease/Resouces/Storyboards/Login/Login.storyboard index de0898fa..e52c5d08 100644 --- a/NADA-iOS-forRelease/Resouces/Storyboards/Login/Login.storyboard +++ b/NADA-iOS-forRelease/Resouces/Storyboards/Login/Login.storyboard @@ -8,11 +8,6 @@ - - - NotoSansCJKkr-Regular - - @@ -27,51 +22,10 @@ - - - - + + + + @@ -87,8 +41,7 @@ - - + @@ -97,14 +50,9 @@ - - - - - diff --git a/NADA-iOS-forRelease/Resouces/Storyboards/Main/Front.storyboard b/NADA-iOS-forRelease/Resouces/Storyboards/Main/Front.storyboard index 60540dd3..e0db3e03 100644 --- a/NADA-iOS-forRelease/Resouces/Storyboards/Main/Front.storyboard +++ b/NADA-iOS-forRelease/Resouces/Storyboards/Main/Front.storyboard @@ -32,10 +32,10 @@