From 0af06841fc0435a9321e129c58d4a5ae01013487 Mon Sep 17 00:00:00 2001 From: SSOOYA Date: Sat, 25 Mar 2023 10:47:39 +0900 Subject: [PATCH 1/3] =?UTF-8?q?#455:=20AppDelegate=20=ED=99=9C=EC=9A=A9?= =?UTF-8?q?=ED=95=9C=20=EC=95=B1=20=EB=B9=84=ED=99=9C=EC=84=B1=ED=99=94=20?= =?UTF-8?q?=EC=97=AC=EB=B6=80=20=EC=A0=90=EA=B2=80=20=EB=B0=8F=20=EB=8B=A4?= =?UTF-8?q?=EC=9D=B4=EC=96=B4=EB=A6=AC=20=EB=A0=88=EC=9D=B4=EC=95=84?= =?UTF-8?q?=EC=9B=83=20=EC=98=A4=EB=A5=98=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Todoary-iOS/Todoary.xcodeproj/project.pbxproj | 8 ++++---- .../Todoary/Application/AppDelegate.swift | 16 ++++++++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/Todoary-iOS/Todoary.xcodeproj/project.pbxproj b/Todoary-iOS/Todoary.xcodeproj/project.pbxproj index 080f845f..ebbd2fb7 100644 --- a/Todoary-iOS/Todoary.xcodeproj/project.pbxproj +++ b/Todoary-iOS/Todoary.xcodeproj/project.pbxproj @@ -210,11 +210,11 @@ EE800B1229B1C4F100BAC862 /* UserDefaultKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE800B1129B1C4F100BAC862 /* UserDefaultKey.swift */; }; EE800B1429B1C4FE00BAC862 /* UserDefaultWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE800B1329B1C4FE00BAC862 /* UserDefaultWrapper.swift */; }; EE800B1629B1C50A00BAC862 /* UserManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE800B1529B1C50A00BAC862 /* UserManager.swift */; }; - EE813FD629C3258B0091F16E /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = EE813FD529C3258B0091F16E /* GoogleService-Info.plist */; }; EE8BCEF6299F2836004EA821 /* UITableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE8BCEF5299F2836004EA821 /* UITableView.swift */; }; EE8BCEF8299F2842004EA821 /* UICollectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE8BCEF7299F2842004EA821 /* UICollectionView.swift */; }; EE8BCEFA299F3AF9004EA821 /* ShadowDesignSystem.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE8BCEF9299F3AF9004EA821 /* ShadowDesignSystem.swift */; }; EE8BCEFC299F4F48004EA821 /* SummaryCellDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE8BCEFB299F4F48004EA821 /* SummaryCellDelegate.swift */; }; + EE938DA529CE864A003A5BF6 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = EE938DA429CE864A003A5BF6 /* GoogleService-Info.plist */; }; EED1B34E298656E600F14CAC /* TypoDesignSystem.swift in Sources */ = {isa = PBXBuildFile; fileRef = EED1B34D298656E600F14CAC /* TypoDesignSystem.swift */; }; EED1B350298656FD00F14CAC /* CategoryDesignSystem.swift in Sources */ = {isa = PBXBuildFile; fileRef = EED1B34F298656FD00F14CAC /* CategoryDesignSystem.swift */; }; EEE326A52998AEB50017DF46 /* Image.swift in Sources */ = {isa = PBXBuildFile; fileRef = EEE326A42998AEB50017DF46 /* Image.swift */; }; @@ -458,11 +458,11 @@ EE800B1129B1C4F100BAC862 /* UserDefaultKey.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDefaultKey.swift; sourceTree = ""; }; EE800B1329B1C4FE00BAC862 /* UserDefaultWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDefaultWrapper.swift; sourceTree = ""; }; EE800B1529B1C50A00BAC862 /* UserManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserManager.swift; sourceTree = ""; }; - EE813FD529C3258B0091F16E /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; EE8BCEF5299F2836004EA821 /* UITableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UITableView.swift; sourceTree = ""; }; EE8BCEF7299F2842004EA821 /* UICollectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UICollectionView.swift; sourceTree = ""; }; EE8BCEF9299F3AF9004EA821 /* ShadowDesignSystem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShadowDesignSystem.swift; sourceTree = ""; }; EE8BCEFB299F4F48004EA821 /* SummaryCellDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SummaryCellDelegate.swift; sourceTree = ""; }; + EE938DA429CE864A003A5BF6 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; EED1B34D298656E600F14CAC /* TypoDesignSystem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TypoDesignSystem.swift; sourceTree = ""; }; EED1B34F298656FD00F14CAC /* CategoryDesignSystem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CategoryDesignSystem.swift; sourceTree = ""; }; EEE326A42998AEB50017DF46 /* Image.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Image.swift; sourceTree = ""; }; @@ -573,7 +573,7 @@ isa = PBXGroup; children = ( 572E5AE4286EBDCE00D1FAA0 /* LaunchScreen.storyboard */, - EE813FD529C3258B0091F16E /* GoogleService-Info.plist */, + EE938DA429CE864A003A5BF6 /* GoogleService-Info.plist */, 572E5AE7286EBDCE00D1FAA0 /* Info.plist */, EE00BBA029ADAC25007CE728 /* Config.xcconfig */, ); @@ -1600,7 +1600,7 @@ 57DF460528A64AA60002D66C /* IBMPlexSansKR-Medium.otf in Resources */, 572E5AE1286EBDCC00D1FAA0 /* Main.storyboard in Resources */, 57DF45FA28A60B310002D66C /* GangwonEduAll-Bold.ttf in Resources */, - EE813FD629C3258B0091F16E /* GoogleService-Info.plist in Resources */, + EE938DA529CE864A003A5BF6 /* GoogleService-Info.plist in Resources */, E0BAB97D28748FBF0055BA67 /* SsoyaStoryboard.storyboard in Resources */, 57DF45F628A60B310002D66C /* NotoSerifKR-Regular.otf in Resources */, 574A703A2883FF10003C8F99 /* AppleSDGothicNeoEB.ttf in Resources */, diff --git a/Todoary-iOS/Todoary/Application/AppDelegate.swift b/Todoary-iOS/Todoary/Application/AppDelegate.swift index 6718f4a1..73b96e7e 100644 --- a/Todoary-iOS/Todoary/Application/AppDelegate.swift +++ b/Todoary-iOS/Todoary/Application/AppDelegate.swift @@ -106,6 +106,22 @@ class AppDelegate: UIResponder, UIApplicationDelegate, MessagingDelegate { func application(_ application: UIApplication, supportedInterfaceOrientationsFor window: UIWindow?) -> UIInterfaceOrientationMask { return UIInterfaceOrientationMask.portrait } + + //다른 앱으로 이동시 호출되는 메서드 + func applicationDidEnterBackground(_ application: UIApplication) { + diaryWillMoveOriginalPosition() + } + + //background에 있는 앱을 모두 보여주는 상태(홈바 스와이프)로 진입할 때 호출되는 메서드 + func applicationWillResignActive(_ application: UIApplication) { + diaryWillMoveOriginalPosition() + } + + private func diaryWillMoveOriginalPosition(){ + if let vc = window?.rootViewController?.children.last as? DiaryViewController { + vc.exitBtnDidTab() + } + } } From 5544b7a5491161fda44b655a5402a42a1731e342 Mon Sep 17 00:00:00 2001 From: SSOOYA Date: Sat, 25 Mar 2023 14:21:23 +0900 Subject: [PATCH 2/3] =?UTF-8?q?chore:=20App=20=EB=B2=84=EC=A0=84=201.0=20>?= =?UTF-8?q?=201.0.0=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Todoary-iOS/Todoary.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Todoary-iOS/Todoary.xcodeproj/project.pbxproj b/Todoary-iOS/Todoary.xcodeproj/project.pbxproj index ebbd2fb7..b934d57b 100644 --- a/Todoary-iOS/Todoary.xcodeproj/project.pbxproj +++ b/Todoary-iOS/Todoary.xcodeproj/project.pbxproj @@ -2124,7 +2124,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0; + MARKETING_VERSION = 1.0.1; PRODUCT_BUNDLE_IDENTIFIER = com.todoary.ms.app; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "Todoary Development"; @@ -2164,7 +2164,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0; + MARKETING_VERSION = 1.0.1; PRODUCT_BUNDLE_IDENTIFIER = com.todoary.ms.app; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "Ad Hoc"; From c801ae42646c13cb68c8b7d63ad974dc49ae1f9d Mon Sep 17 00:00:00 2001 From: SSOOYA Date: Sat, 25 Mar 2023 14:21:54 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=20chore:=20=ED=94=84=EB=A1=9C=EC=A0=9D?= =?UTF-8?q?=ED=8A=B8=20=EB=B2=84=EC=A0=84=201.0=20>=201.0.1=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Todoary-iOS/Todoary/Application/AppDelegate.swift | 1 - 1 file changed, 1 deletion(-) diff --git a/Todoary-iOS/Todoary/Application/AppDelegate.swift b/Todoary-iOS/Todoary/Application/AppDelegate.swift index 73b96e7e..37348b36 100644 --- a/Todoary-iOS/Todoary/Application/AppDelegate.swift +++ b/Todoary-iOS/Todoary/Application/AppDelegate.swift @@ -20,7 +20,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate, MessagingDelegate { var navigationController : UINavigationController? var delay = 2 - public func messaging(_ messaging: Messaging, didReceiveRegistrationToken fcmToken: String?) { let firebaseToken = fcmToken ?? "" UserManager.fcmToken = firebaseToken