Merge pull request #155 from Jae-eun/height

피드 데이터 없을 때 뷰 높이 함수 수정
yapp-project · May 27, 2019 · 9a983bb · 9a983bb
2 parents e2fc470 + bbfc872
commit 9a983bb
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 49 deletions.
diff --git 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,13 +20,23 @@ 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)
   - FirebaseInstanceID (4.0.0):
     - 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/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,44 +866,44 @@
 			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 = (
 			);
 			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 = (
 			);
 			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;

diff --git a/Toonie.xcodeproj/xcuserdata/ijaeeun.xcuserdatad/xcschemes/xcschememanagement.plist b/Toonie.xcodeproj/xcuserdata/ijaeeun.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -9,6 +9,11 @@
 			<key>orderHint</key>
 			<integer>0</integer>
 		</dict>
+		<key>ToonieWidget.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>22</integer>
+		</dict>
 	</dict>
 </dict>
 </plist>
diff --git 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
@@ -17,7 +17,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0.0</string>
 	<key>CFBundleVersion</key>
-	<string>6</string>
+	<string>8</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>

diff --git 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
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.0.0</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>8</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionMainStoryboard</key>