diff --git a/IntentsExtension/IntentHandler.swift b/IntentsExtension/IntentHandler.swift index 6fe01160..4b48ba64 100644 --- a/IntentsExtension/IntentHandler.swift +++ b/IntentsExtension/IntentHandler.swift @@ -89,8 +89,7 @@ extension IntentHandler { guard let url = URL(string: "http://3.35.107.3:8080/api/v1/card") else { return } var urlRequest = URLRequest(url: url) urlRequest.httpMethod = "GET" - urlRequest.addValue("Bearer \(UserDefaults.appGroup.string(forKey: "accessToken") ?? "")", forHTTPHeaderField: "Authorization") - print("๐Ÿ˜€", UserDefaults.appGroup.string(forKey: "accessToken") ?? "") + urlRequest.addValue("Bearer \(UserDefaults.appGroup.string(forKey: "AccessToken") ?? "")", forHTTPHeaderField: "Authorization") URLSession.shared.dataTask(with: urlRequest) { data, response, error in guard let status = (response as? HTTPURLResponse)?.statusCode else { return } @@ -108,7 +107,7 @@ extension IntentHandler { } else { if let result { if result.status != 200 { - completion(.failure(WidgetError.networkFail(status: status, + completion(.failure(WidgetError.networkFail(status: result.status, code: result.code ?? "none code", message: result.message ?? "none message"))) } else { diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg01.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg01.imageset/Contents.json index 3926d1ea..c34e73f9 100644 --- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg01.imageset/Contents.json +++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg01.imageset/Contents.json @@ -1,23 +1,23 @@ { "images" : [ { - "idiom" : "universal", "filename" : "imgCardBg01.png", + "idiom" : "universal", "scale" : "1x" }, { - "idiom" : "universal", "filename" : "imgCardBg01@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "idiom" : "universal", "filename" : "imgCardBg01@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg01.imageset/imgCardBg01.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg01.imageset/imgCardBg01.png index 30dc3ed4..f933229a 100644 Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg01.imageset/imgCardBg01.png and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg01.imageset/imgCardBg01.png differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg01.imageset/imgCardBg01@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg01.imageset/imgCardBg01@2x.png index 9ddc6464..f933229a 100644 Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg01.imageset/imgCardBg01@2x.png and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg01.imageset/imgCardBg01@2x.png differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg01.imageset/imgCardBg01@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg01.imageset/imgCardBg01@3x.png index 74da59a4..f933229a 100644 Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg01.imageset/imgCardBg01@3x.png and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg01.imageset/imgCardBg01@3x.png differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg02.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg02.imageset/Contents.json index f0e762fa..aa5ceb44 100644 --- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg02.imageset/Contents.json +++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg02.imageset/Contents.json @@ -1,23 +1,23 @@ { "images" : [ { - "idiom" : "universal", "filename" : "imgCardBg02.png", + "idiom" : "universal", "scale" : "1x" }, { "filename" : "imgCardBg02@2x.png", - "scale" : "2x", - "idiom" : "universal" + "idiom" : "universal", + "scale" : "2x" }, { - "scale" : "3x", + "filename" : "imgCardBg02@3x.png", "idiom" : "universal", - "filename" : "imgCardBg02@3x.png" + "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg02.imageset/imgCardBg02.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg02.imageset/imgCardBg02.png index 4e22cb1b..e62cdd28 100644 Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg02.imageset/imgCardBg02.png and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg02.imageset/imgCardBg02.png differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg02.imageset/imgCardBg02@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg02.imageset/imgCardBg02@2x.png index 21d33cb1..e62cdd28 100644 Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg02.imageset/imgCardBg02@2x.png and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg02.imageset/imgCardBg02@2x.png differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg02.imageset/imgCardBg02@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg02.imageset/imgCardBg02@3x.png index 4223d4eb..e62cdd28 100644 Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg02.imageset/imgCardBg02@3x.png and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg02.imageset/imgCardBg02@3x.png differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg03.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg03.imageset/Contents.json index ff1b7c29..6260818e 100644 --- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg03.imageset/Contents.json +++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg03.imageset/Contents.json @@ -2,22 +2,22 @@ "images" : [ { "filename" : "imgCardBg03.png", - "scale" : "1x", - "idiom" : "universal" + "idiom" : "universal", + "scale" : "1x" }, { - "scale" : "2x", + "filename" : "imgCardBg03@2x.png", "idiom" : "universal", - "filename" : "imgCardBg03@2x.png" + "scale" : "2x" }, { - "scale" : "3x", + "filename" : "imgCardBg03@3x.png", "idiom" : "universal", - "filename" : "imgCardBg03@3x.png" + "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg03.imageset/imgCardBg03.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg03.imageset/imgCardBg03.png index abc9f05b..3ccdeee6 100644 Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg03.imageset/imgCardBg03.png and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg03.imageset/imgCardBg03.png differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg03.imageset/imgCardBg03@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg03.imageset/imgCardBg03@2x.png index c6c6c488..3ccdeee6 100644 Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg03.imageset/imgCardBg03@2x.png and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg03.imageset/imgCardBg03@2x.png differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg03.imageset/imgCardBg03@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg03.imageset/imgCardBg03@3x.png index 3e45f225..3ccdeee6 100644 Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg03.imageset/imgCardBg03@3x.png and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg03.imageset/imgCardBg03@3x.png differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg04.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg04.imageset/Contents.json index 9b60a0df..fdb03f08 100644 --- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg04.imageset/Contents.json +++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg04.imageset/Contents.json @@ -1,23 +1,23 @@ { "images" : [ { + "filename" : "imgCardBg04.png", "idiom" : "universal", - "scale" : "1x", - "filename" : "imgCardBg04.png" + "scale" : "1x" }, { - "scale" : "2x", + "filename" : "imgCardBg04@2x.png", "idiom" : "universal", - "filename" : "imgCardBg04@2x.png" + "scale" : "2x" }, { - "idiom" : "universal", "filename" : "imgCardBg04@3x.png", + "idiom" : "universal", "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg04.imageset/imgCardBg04.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg04.imageset/imgCardBg04.png index 23519197..88f69f69 100644 Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg04.imageset/imgCardBg04.png and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg04.imageset/imgCardBg04.png differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg04.imageset/imgCardBg04@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg04.imageset/imgCardBg04@2x.png index 7cd6564f..88f69f69 100644 Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg04.imageset/imgCardBg04@2x.png and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg04.imageset/imgCardBg04@2x.png differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg04.imageset/imgCardBg04@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg04.imageset/imgCardBg04@3x.png index 07709b48..88f69f69 100644 Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg04.imageset/imgCardBg04@3x.png and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg04.imageset/imgCardBg04@3x.png differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg05.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg05.imageset/Contents.json index b44f8e55..8b47037b 100644 --- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg05.imageset/Contents.json +++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg05.imageset/Contents.json @@ -6,18 +6,18 @@ "scale" : "1x" }, { - "idiom" : "universal", "filename" : "imgCardBg05@2x.png", + "idiom" : "universal", "scale" : "2x" }, { - "scale" : "3x", + "filename" : "imgCardBg05@3x.png", "idiom" : "universal", - "filename" : "imgCardBg05@3x.png" + "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg05.imageset/imgCardBg05.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg05.imageset/imgCardBg05.png index c71bfc8f..e44d3cfb 100644 Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg05.imageset/imgCardBg05.png and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg05.imageset/imgCardBg05.png differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg05.imageset/imgCardBg05@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg05.imageset/imgCardBg05@2x.png index 51b32ca1..e44d3cfb 100644 Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg05.imageset/imgCardBg05@2x.png and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg05.imageset/imgCardBg05@2x.png differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg05.imageset/imgCardBg05@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg05.imageset/imgCardBg05@3x.png index 6eaf502d..e44d3cfb 100644 Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg05.imageset/imgCardBg05@3x.png and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg05.imageset/imgCardBg05@3x.png differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg06.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg06.imageset/Contents.json index 6d72ad76..1cd565de 100644 --- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg06.imageset/Contents.json +++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg06.imageset/Contents.json @@ -6,18 +6,18 @@ "scale" : "1x" }, { + "filename" : "imgCardBg06@2x.png", "idiom" : "universal", - "scale" : "2x", - "filename" : "imgCardBg06@2x.png" + "scale" : "2x" }, { - "scale" : "3x", "filename" : "imgCardBg06@3x.png", - "idiom" : "universal" + "idiom" : "universal", + "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg06.imageset/imgCardBg06.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg06.imageset/imgCardBg06.png index 43b8d8f6..dd36a7ca 100644 Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg06.imageset/imgCardBg06.png and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg06.imageset/imgCardBg06.png differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg06.imageset/imgCardBg06@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg06.imageset/imgCardBg06@2x.png index c77da0d2..dd36a7ca 100644 Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg06.imageset/imgCardBg06@2x.png and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg06.imageset/imgCardBg06@2x.png differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg06.imageset/imgCardBg06@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg06.imageset/imgCardBg06@3x.png index 8d65e3ba..dd36a7ca 100644 Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg06.imageset/imgCardBg06@3x.png and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg06.imageset/imgCardBg06@3x.png differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg07.imageset/Contents.json b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg07.imageset/Contents.json index 95e22c93..eb8e1e20 100644 --- a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg07.imageset/Contents.json +++ b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg07.imageset/Contents.json @@ -1,23 +1,23 @@ { "images" : [ { - "scale" : "1x", + "filename" : "imgCardBg07.png", "idiom" : "universal", - "filename" : "imgCardBg07.png" + "scale" : "1x" }, { "filename" : "imgCardBg07@2x.png", - "scale" : "2x", - "idiom" : "universal" + "idiom" : "universal", + "scale" : "2x" }, { - "scale" : "3x", + "filename" : "imgCardBg07@3x.png", "idiom" : "universal", - "filename" : "imgCardBg07@3x.png" + "scale" : "3x" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg07.imageset/imgCardBg07.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg07.imageset/imgCardBg07.png index 0c8c36bb..7a4c87d7 100644 Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg07.imageset/imgCardBg07.png and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg07.imageset/imgCardBg07.png differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg07.imageset/imgCardBg07@2x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg07.imageset/imgCardBg07@2x.png index 71366175..7a4c87d7 100644 Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg07.imageset/imgCardBg07@2x.png and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg07.imageset/imgCardBg07@2x.png differ diff --git a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg07.imageset/imgCardBg07@3x.png b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg07.imageset/imgCardBg07@3x.png index 1f2f025f..7a4c87d7 100644 Binary files a/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg07.imageset/imgCardBg07@3x.png and b/NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/imgCardBg07.imageset/imgCardBg07@3x.png differ diff --git a/NADA-iOS-forRelease/Sources/NetworkModel/Group/CardAddInGroupRequest.swift b/NADA-iOS-forRelease/Sources/NetworkModel/Group/CardAddInGroupRequest.swift index 0672920e..39a12711 100644 --- a/NADA-iOS-forRelease/Sources/NetworkModel/Group/CardAddInGroupRequest.swift +++ b/NADA-iOS-forRelease/Sources/NetworkModel/Group/CardAddInGroupRequest.swift @@ -8,6 +8,6 @@ import Foundation struct CardAddInGroupRequest: Codable { - var cardGroupName: String? + var cardGroupName: String var cardUUID: String } diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/AddGroupBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/AddGroupBottomSheetViewController.swift index e240be1c..83bbc39a 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/AddGroupBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/AddGroupBottomSheetViewController.swift @@ -98,7 +98,7 @@ class AddGroupBottomSheetViewController: CommonBottomSheetViewController, UIText let safeAreaHeight = view.safeAreaLayoutGuide.layoutFrame.height let bottomPadding = view.safeAreaInsets.bottom bottomSheetViewTopConstraint?.constant = safeAreaHeight + bottomPadding - UIView.animate(withDuration: 0.5, delay: 0, options: .curveEaseOut, animations: { + UIView.animate(withDuration: 0.2, delay: 0, options: .curveEaseOut, animations: { self.dimmedBackView.alpha = 0.0 self.view.layoutIfNeeded() self.bottomSheetCoverView.isHidden = false diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CommonBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CommonBottomSheetViewController.swift index ae551350..01aea534 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CommonBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/CommonBottomSheetViewController.swift @@ -26,6 +26,7 @@ class CommonBottomSheetViewController: UIViewController { // bottomSheet๊ฐ€ view์˜ ์ƒ๋‹จ์—์„œ ๋–จ์–ด์ง„ ๊ฑฐ๋ฆฌ private var bottomSheetViewTopConstraint: NSLayoutConstraint! + private var hideAnimationDuration: Float = 0.2 // ๊ธฐ์กด ํ™”๋ฉด์„ ํ๋ ค์ง€๊ฒŒ ๋งŒ๋“ค๊ธฐ ์œ„ํ•œ ๋ทฐ let dimmedBackView: UIView = { @@ -176,12 +177,17 @@ class CommonBottomSheetViewController: UIViewController { }) } + // ๋ฐ”ํ…€ ์‹œํŠธ ์‚ฌ๋ผ์ง€๋Š” ์†๋„ ์กฐ์ ˆ + func setHideAnimationDuration(_ duration: Float) { + self.hideAnimationDuration = duration + } + // ๋ฐ”ํ…€ ์‹œํŠธ ์‚ฌ๋ผ์ง€๋Š” ์• ๋‹ˆ๋ฉ”์ด์…˜ func hideBottomSheetAndGoBack() { let safeAreaHeight = view.safeAreaLayoutGuide.layoutFrame.height let bottomPadding = view.safeAreaInsets.bottom bottomSheetViewTopConstraint.constant = safeAreaHeight + bottomPadding - UIView.animate(withDuration: 0.5, delay: 0, options: .curveEaseOut, animations: { + UIView.animate(withDuration: TimeInterval(hideAnimationDuration), delay: 0, options: .curveEaseOut, animations: { self.dimmedBackView.alpha = 0.0 self.view.layoutIfNeeded() self.bottomSheetCoverView.isHidden = false @@ -197,7 +203,7 @@ class CommonBottomSheetViewController: UIViewController { let safeAreaHeight = view.safeAreaLayoutGuide.layoutFrame.height let bottomPadding = view.safeAreaInsets.bottom bottomSheetViewTopConstraint.constant = safeAreaHeight + bottomPadding - UIView.animate(withDuration: 0.2, delay: 0, options: .curveEaseOut, animations: { + UIView.animate(withDuration: TimeInterval(hideAnimationDuration), delay: 0, options: .curveEaseOut, animations: { self.dimmedBackView.alpha = 0.0 self.view.layoutIfNeeded() self.bottomSheetCoverView.isHidden = false @@ -217,7 +223,7 @@ class CommonBottomSheetViewController: UIViewController { let safeAreaHeight = view.safeAreaLayoutGuide.layoutFrame.height let bottomPadding = view.safeAreaInsets.bottom bottomSheetViewTopConstraint.constant = safeAreaHeight + bottomPadding - UIView.animate(withDuration: 0.2, delay: 0, options: .curveEaseOut, animations: { + UIView.animate(withDuration: TimeInterval(hideAnimationDuration), delay: 0, options: .curveEaseOut, animations: { self.dimmedBackView.alpha = 0.0 self.view.layoutIfNeeded() self.bottomSheetCoverView.isHidden = false diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/FirstCardAlertBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/FirstCardAlertBottomSheetViewController.swift index 89471935..51d32236 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/FirstCardAlertBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/FirstCardAlertBottomSheetViewController.swift @@ -10,6 +10,8 @@ import UIKit class FirstCardAlertBottomSheetViewController: CommonBottomSheetViewController { // MARK: - Properties + + private var bottomSheetViewTopConstraint: NSLayoutConstraint? private let cardImageView: UIImageView = { let imageView = UIImageView() @@ -71,6 +73,7 @@ class FirstCardAlertBottomSheetViewController: CommonBottomSheetViewController { super.viewDidLoad() setupUI() + setHideAnimationDuration(0.5) } // MARK: - Methods @@ -94,8 +97,7 @@ class FirstCardAlertBottomSheetViewController: CommonBottomSheetViewController { cardImageView.translatesAutoresizingMaskIntoConstraints = false NSLayoutConstraint.activate([ cardImageView.topAnchor.constraint(equalTo: titleLabel.bottomAnchor, constant: 16), - cardImageView.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: 70), - cardImageView.trailingAnchor.constraint(equalTo: view.trailingAnchor, constant: -70) + cardImageView.centerXAnchor.constraint(equalTo: self.view.centerXAnchor) ]) bgView.translatesAutoresizingMaskIntoConstraints = false diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/GroupNameEditBottomSheetViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/GroupNameEditBottomSheetViewController.swift index 855ce00a..9128d5d0 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/GroupNameEditBottomSheetViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/BottomSheet/GroupNameEditBottomSheetViewController.swift @@ -71,7 +71,7 @@ class GroupNameEditBottomSheetViewController: CommonBottomSheetViewController, U let safeAreaHeight = view.safeAreaLayoutGuide.layoutFrame.height let bottomPadding = view.safeAreaInsets.bottom bottomSheetViewTopConstraint?.constant = safeAreaHeight + bottomPadding - UIView.animate(withDuration: 0.5, delay: 0, options: .curveEaseOut, animations: { + UIView.animate(withDuration: 0.2, delay: 0, options: .curveEaseOut, animations: { self.dimmedBackView.alpha = 0.0 self.view.layoutIfNeeded() self.bottomSheetCoverView.isHidden = false diff --git a/NADA-iOS-forRelease/Sources/ViewControllers/TabBar/TabBarViewController.swift b/NADA-iOS-forRelease/Sources/ViewControllers/TabBar/TabBarViewController.swift index 41e96776..ea0f9a63 100644 --- a/NADA-iOS-forRelease/Sources/ViewControllers/TabBar/TabBarViewController.swift +++ b/NADA-iOS-forRelease/Sources/ViewControllers/TabBar/TabBarViewController.swift @@ -121,7 +121,7 @@ extension TabBarViewController { } } private func cardAddInGroupWithAPI(cardUUID: String, completion: @escaping () -> Void) { - GroupAPI.shared.cardAddInGroup(cardRequest: CardAddInGroupRequest(cardGroupName: nil, cardUUID: cardUUID)) { response in + GroupAPI.shared.cardAddInGroup(cardRequest: CardAddInGroupRequest(cardGroupName: "๋ฏธ๋ถ„๋ฅ˜", cardUUID: cardUUID)) { response in switch response { case .success: completion()