From 464b34abf8a9bb65bd5bdcee2ededebfd389040e Mon Sep 17 00:00:00 2001 From: Jae-eun Date: Sun, 26 May 2019 23:44:31 +0900 Subject: [PATCH 1/3] Fix feed height constraint --- Podfile.lock | 24 +++++++++++++++++-- .../xcschemes/xcschememanagement.plist | 5 ++++ .../Feed/Controller/FeedViewController.swift | 12 ++++------ Toonie/Info.plist | 4 ++-- Toonie/Main/MainViewController.swift | 20 ++++++++-------- ToonieWidget/Info.plist | 2 +- 6 files changed, 44 insertions(+), 23 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index 30fffa9..9c2dfb9 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -8,6 +8,9 @@ PODS: - FirebaseAnalytics (= 6.0.0) - Firebase/CoreOnly (6.0.0): - FirebaseCore (= 6.0.0) + - Firebase/Messaging (6.0.0): + - Firebase/CoreOnly + - FirebaseMessaging (~> 4.0.0) - FirebaseAnalytics (6.0.0): - FirebaseCore (~> 6.0) - FirebaseInstanceID (~> 4.0) @@ -17,6 +20,7 @@ PODS: - GoogleUtilities/Network (~> 6.0) - "GoogleUtilities/NSData+zlib (~> 6.0)" - nanopb (~> 0.3) + - FirebaseAnalyticsInterop (1.2.0) - FirebaseCore (6.0.0): - GoogleUtilities/Environment (~> 6.0) - GoogleUtilities/Logger (~> 6.0) @@ -24,6 +28,15 @@ PODS: - FirebaseCore (~> 6.0) - GoogleUtilities/Environment (~> 6.0) - GoogleUtilities/UserDefaults (~> 6.0) + - FirebaseMessaging (4.0.0): + - FirebaseAnalyticsInterop (~> 1.1) + - FirebaseCore (~> 6.0) + - FirebaseInstanceID (~> 4.0) + - GoogleUtilities/AppDelegateSwizzler (~> 6.0) + - GoogleUtilities/Environment (~> 6.0) + - GoogleUtilities/Reachability (~> 6.0) + - GoogleUtilities/UserDefaults (~> 6.0) + - Protobuf (~> 3.1) - GoogleAppMeasurement (6.0.0): - GoogleUtilities/AppDelegateSwizzler (~> 6.0) - GoogleUtilities/MethodSwizzler (~> 6.0) @@ -56,6 +69,7 @@ PODS: - nanopb/encode (= 0.3.901) - nanopb/decode (0.3.901) - nanopb/encode (0.3.901) + - Protobuf (3.7.0) - SnapKit (4.2.0) - SwiftLint (0.32.0) @@ -64,6 +78,7 @@ DEPENDENCIES: - Crashlytics - Fabric - Firebase/Core + - Firebase/Messaging - Kingfisher (~> 4.2) - KTCenterFlowLayout - lottie-ios @@ -77,14 +92,17 @@ SPEC REPOS: - Fabric - Firebase - FirebaseAnalytics + - FirebaseAnalyticsInterop - FirebaseCore - FirebaseInstanceID + - FirebaseMessaging - GoogleAppMeasurement - GoogleUtilities - Kingfisher - KTCenterFlowLayout - lottie-ios - nanopb + - Protobuf - SnapKit - SwiftLint @@ -94,18 +112,20 @@ SPEC CHECKSUMS: Fabric: f6f21452846788bb44595d73e9909d79d328e617 Firebase: fa80b9d987ca014a1ba9357496ef2a0178b28b12 FirebaseAnalytics: 1743c5f4de3687d0745709dfdc4b1dea1484f44c + FirebaseAnalyticsInterop: efbe45c8385ec626e29f9525e5ebd38520dfb6c1 FirebaseCore: e38f025287b413255a53acc1945d048a112047f7 FirebaseInstanceID: 0e0348a3c00a734fa376a070f5ad4533ad975cb5 + FirebaseMessaging: c796d50864dc822a3c06c9c1c1444b37732b795b GoogleAppMeasurement: 7f028ea162b72c8f326daec74afc95d94f7a47d6 GoogleUtilities: 84df567c76ca84f67b7bb40e769fdd4acc746a10 Kingfisher: c148cd7b47ebde9989f6bc7c27dcaa79d81279a0 KTCenterFlowLayout: 6e02b50ab2bd865025ae82fe266ed13b6d9eaf97 lottie-ios: d030b6cda141cfd8bbaa3db89264785e6fdf675a nanopb: 2901f78ea1b7b4015c860c2fdd1ea2fee1a18d48 + Protobuf: 7a877b7f3e5964e3fce995e2eb323dbc6831bb5a SnapKit: fe8a619752f3f27075cc9a90244d75c6c3f27e2a SwiftLint: 009a898ef2a1c851f45e1b59349bf6ff2ddc990d - -PODFILE CHECKSUM: 4847d5263c714f8aac7d771ef37e48459ee484fb +PODFILE CHECKSUM: 39749f2b3a245296c1d77d2376094762ba01e7f9 COCOAPODS: 1.6.1 diff --git a/Toonie.xcodeproj/xcuserdata/ijaeeun.xcuserdatad/xcschemes/xcschememanagement.plist b/Toonie.xcodeproj/xcuserdata/ijaeeun.xcuserdatad/xcschemes/xcschememanagement.plist index aa176dd..5376d68 100644 --- a/Toonie.xcodeproj/xcuserdata/ijaeeun.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/Toonie.xcodeproj/xcuserdata/ijaeeun.xcuserdatad/xcschemes/xcschememanagement.plist @@ -9,6 +9,11 @@ orderHint 0 + ToonieWidget.xcscheme_^#shared#^_ + + orderHint + 22 + diff --git a/Toonie/Feed/Controller/FeedViewController.swift b/Toonie/Feed/Controller/FeedViewController.swift index ed6258d..ef2f84a 100644 --- a/Toonie/Feed/Controller/FeedViewController.swift +++ b/Toonie/Feed/Controller/FeedViewController.swift @@ -61,6 +61,8 @@ final class FeedViewController: GestureViewController { loadForYouToonList() loadLatestToonList() loadFavoriteToonList() + updateView(&recentViewHeightConstraint, 0) + updateView(&favoriteViewHeightConstraint, 0) } override func viewWillAppear(_ animated: Bool) { @@ -115,10 +117,7 @@ final class FeedViewController: GestureViewController { number: 10) } } - if self.latestToonLists == nil - || self.latestToonLists?.count == 0 { - self.updateView(&self.recentViewHeightConstraint, 0) - } else { + if self.latestToonLists?.count ?? 0 > 0 { self.updateView(&self.recentViewHeightConstraint, self.recentViewHeight) } self.recentCollectionView.reloadData() @@ -137,10 +136,7 @@ final class FeedViewController: GestureViewController { number: 10) } } - if result == nil - || result?.count == 0 { - self.updateView(&self.favoriteViewHeightConstraint, 0) - } else { + if self.favoriteToonLists?.count ?? 0 > 0 { self.updateView(&self.favoriteViewHeightConstraint, self.favoriteViewHeight) } self.favoriteCollectionView.reloadData() diff --git a/Toonie/Info.plist b/Toonie/Info.plist index 9fa3b20..e82a30b 100644 --- a/Toonie/Info.plist +++ b/Toonie/Info.plist @@ -15,9 +15,9 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0.0 + 1.1.1 CFBundleVersion - 6 + 1 Fabric APIKey diff --git a/Toonie/Main/MainViewController.swift b/Toonie/Main/MainViewController.swift index 24a50de..e84e647 100644 --- a/Toonie/Main/MainViewController.swift +++ b/Toonie/Main/MainViewController.swift @@ -79,16 +79,16 @@ final class MainViewController: GestureViewController { override func prepare(for segue: UIStoryboardSegue, sender: Any?) { - if segue.identifier == "Feed" { - if let feedNavigationController = segue.destination as? FeedNavigationController { - if let feedViewController = feedNavigationController.rootViewController as? FeedViewController { - self.feedDidTapClosure = { - feedViewController.viewWillAppear(true) - // feedViewController.loadToon() - } - } - } - } +// if segue.identifier == "Feed" { +// if let feedNavigationController = segue.destination as? FeedNavigationController { +// if let feedViewController = feedNavigationController.rootViewController as? FeedViewController { +// self.feedDidTapClosure = { +// feedViewController.viewWillAppear(true) +// // feedViewController.loadToon() +// } +// } +// } +// } if segue.identifier == "MyPage" { if let myPageNavigationController = segue.destination as? MyPageNavigationController { diff --git a/ToonieWidget/Info.plist b/ToonieWidget/Info.plist index 79a1276..42a4c73 100644 --- a/ToonieWidget/Info.plist +++ b/ToonieWidget/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 1.0 + 1.1.1 CFBundleVersion 1 NSExtension From 4dfcb00462672dd894751e1e9db3ffdb74358707 Mon Sep 17 00:00:00 2001 From: Jae-eun Date: Sun, 26 May 2019 23:44:50 +0900 Subject: [PATCH 2/3] pbxproj file --- Toonie.xcodeproj/project.pbxproj | 35 ++++++++------------------------ 1 file changed, 9 insertions(+), 26 deletions(-) diff --git a/Toonie.xcodeproj/project.pbxproj b/Toonie.xcodeproj/project.pbxproj index 655c623..abc02ea 100644 --- a/Toonie.xcodeproj/project.pbxproj +++ b/Toonie.xcodeproj/project.pbxproj @@ -822,23 +822,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - E3FD9A369F6F2BDED02CF8C41034A4E5 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - ); - outputFileListPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Fabric/run\" 2930b75a1fc5ef7b545e8b1cd650c5ffbbdeb39a dd398cf8d7aa4bcacd21cfd6ab35a158a0ebe458a5af8a2917fa1033064bd14d\n"; - }; 0A03A8E701D8806A7558B618CCC2B0D5 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -883,7 +866,7 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 130436991E1155E6C5F84FFA8B34B848 /* ShellScript */ = { + 4039ED9FF2DB05B090E76221D04E96A3 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -891,16 +874,21 @@ inputFileListPaths = ( ); inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", ); + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( ); outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-ToonieTests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "${PODS_ROOT}/SwiftLint/swiftlint\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; }; - 4039ED9FF2DB05B090E76221D04E96A3 /* [CP] Check Pods Manifest.lock */ = { + E3FD9A369F6F2BDED02CF8C41034A4E5 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -908,19 +896,14 @@ inputFileListPaths = ( ); inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", ); - name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-ToonieTests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; + shellScript = "\"${PODS_ROOT}/Fabric/run\" 2930b75a1fc5ef7b545e8b1cd650c5ffbbdeb39a dd398cf8d7aa4bcacd21cfd6ab35a158a0ebe458a5af8a2917fa1033064bd14d\n"; }; F6B7743005D9067ED5559530A50CE69C /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; From bbfc8729743655af103ec62b88d1286eac3c80e0 Mon Sep 17 00:00:00 2001 From: Jae-eun Date: Mon, 27 May 2019 00:04:02 +0900 Subject: [PATCH 3/3] Update version --- Toonie/Info.plist | 4 ++-- ToonieWidget/Info.plist | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Toonie/Info.plist b/Toonie/Info.plist index e82a30b..b60d7d1 100644 --- a/Toonie/Info.plist +++ b/Toonie/Info.plist @@ -15,9 +15,9 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.1.1 + 1.0.0 CFBundleVersion - 1 + 8 Fabric APIKey diff --git a/ToonieWidget/Info.plist b/ToonieWidget/Info.plist index 42a4c73..f79326c 100644 --- a/ToonieWidget/Info.plist +++ b/ToonieWidget/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 1.1.1 + 1.0.0 CFBundleVersion - 1 + 8 NSExtension NSExtensionMainStoryboard