Skip to content

Commit

Permalink
170828 - 구글 로그인 시 유저 업데이트 해주도록 변경 #207
Browse files Browse the repository at this point in the history
  • Loading branch information
@JuneBuug
JuneBuug committed Aug 28, 2017
1 parent 5251294 commit 340984b
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
6 changes: 3 additions & 3 deletions iOSProject/pyunrihae/pyunrihae.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -796,7 +796,7 @@
);
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";
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";
showEnvVarsInLog = 0;
};
587EC5AC5552B8323941BD3C /* [CP] Check Pods Manifest.lock */ = {
Expand All @@ -814,7 +814,7 @@
);
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";
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";
showEnvVarsInLog = 0;
};
628518DEB10BA5748AD8E91C /* [CP] Copy Pods Resources */ = {
Expand Down Expand Up @@ -882,7 +882,7 @@
);
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";
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";
showEnvVarsInLog = 0;
};
C827A40123A93FC24DCE78F1 /* [CP] Embed Pods Frameworks */ = {
Expand Down
2 changes: 2 additions & 0 deletions iOSProject/pyunrihae/pyunrihae/AppDelegate.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate,GIDSignInDelegate{

let user_instance = User.init(id: (user?.uid)!, email: (user?.email)!, nickname: (user?.displayName)!)
DataManager.saveUser(user: user_instance)
self.user = user_instance
NotificationCenter.default.post(name: NSNotification.Name("userLogined"), object: nil)
}

Expand All @@ -86,6 +87,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate,GIDSignInDelegate{
let firebaseAuth = Auth.auth()
do {
try firebaseAuth.signOut()
self.user = User.init()
} catch let signOutError as NSError {
print ("Error signing out: %@", signOutError)
}
Expand Down
13 changes: 6 additions & 7 deletions iOSProject/pyunrihae/pyunrihae/ReviewPopupView.xib
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12121" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12121" systemVersion="16D30" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
Expand Down Expand Up @@ -85,20 +84,20 @@
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="y5n-QR-fl5">
<rect key="frame" x="15" y="221.5" width="106.5" height="18"/>
<rect key="frame" x="15" y="221.5" width="85" height="20"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6yg-Ih-AWY">
<rect key="frame" x="0.0" y="0.0" width="142" height="24"/>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="6yg-Ih-AWY">
<rect key="frame" x="0.0" y="0.0" width="85" height="20"/>
</imageView>
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="width" secondItem="y5n-QR-fl5" secondAttribute="height" multiplier="71:12" id="Eyz-CK-lHg"/>
<constraint firstAttribute="trailing" secondItem="6yg-Ih-AWY" secondAttribute="trailing" id="Hs8-pm-38E"/>
<constraint firstAttribute="height" constant="20" id="Mki-Dl-bwX"/>
<constraint firstAttribute="bottom" secondItem="6yg-Ih-AWY" secondAttribute="bottom" id="Mwd-Du-1aa"/>
<constraint firstItem="6yg-Ih-AWY" firstAttribute="leading" secondItem="y5n-QR-fl5" secondAttribute="leading" id="SNx-j3-NmG"/>
<constraint firstAttribute="height" constant="18" id="pva-Ww-9df"/>
<constraint firstItem="6yg-Ih-AWY" firstAttribute="top" secondItem="y5n-QR-fl5" secondAttribute="top" id="xtI-2B-G1v"/>
<constraint firstAttribute="width" constant="85" id="yiV-HX-7dG"/>
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" hasAttributedTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="SZg-MJ-eTQ">
Expand Down

0 comments on commit 340984b

Please sign in to comment.