Skip to content

Commit d3ba407

Browse files
18changsung18changsung
committed
iOS Application (For Final Presentation)
교수용, 학생용 앱에 대한 UI 컴퍼넌트 배치를 완성. Firebase DB, Storage와 연동하는 작업 점검.
1 parent 5d4df1a commit d3ba407

5 files changed

Lines changed: 71 additions & 69 deletions

File tree

‎Nepp_Professor/Nepp.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
67A6FD6122C49DE9009AC9BC /* ClassViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67A6FD6022C49DE9009AC9BC /* ClassViewController.swift */; };
2323
67A6FD6322C4AF15009AC9BC /* AttendanceTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67A6FD6222C4AF15009AC9BC /* AttendanceTableViewController.swift */; };
2424
67A6FD6722C4BA24009AC9BC /* dataCenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67A6FD6622C4BA24009AC9BC /* dataCenter.swift */; };
25-
67A6FDA222C5B1CF009AC9BC /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 67A6FDA122C5B1CF009AC9BC /* GoogleService-Info.plist */; };
2625
/* End PBXBuildFile section */
2726

2827
/* Begin PBXContainerItemProxy section */
@@ -64,7 +63,6 @@
6463
67A6FD6022C49DE9009AC9BC /* ClassViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClassViewController.swift; sourceTree = "<group>"; };
6564
67A6FD6222C4AF15009AC9BC /* AttendanceTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AttendanceTableViewController.swift; sourceTree = "<group>"; };
6665
67A6FD6622C4BA24009AC9BC /* dataCenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = dataCenter.swift; sourceTree = "<group>"; };
67-
67A6FDA122C5B1CF009AC9BC /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
6866
7B2E2A434664835EED59A0F9 /* Pods-NeppUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NeppUITests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-NeppUITests/Pods-NeppUITests.debug.xcconfig"; sourceTree = "<group>"; };
6967
A69A9C4D2744B69A00935BA7 /* Pods-Nepp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Nepp.release.xcconfig"; path = "Pods/Target Support Files/Pods-Nepp/Pods-Nepp.release.xcconfig"; sourceTree = "<group>"; };
7068
BEACA6FCB7EFA3366284E169 /* Pods-Nepp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Nepp.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Nepp/Pods-Nepp.debug.xcconfig"; sourceTree = "<group>"; };
@@ -137,7 +135,6 @@
137135
6777E4AD22C3D08C0015D4AD /* LaunchScreen.storyboard */,
138136
6777E4AB22C3D08C0015D4AD /* Assets.xcassets */,
139137
6777E4B022C3D08C0015D4AD /* Info.plist */,
140-
67A6FDA122C5B1CF009AC9BC /* GoogleService-Info.plist */,
141138
);
142139
path = Nepp;
143140
sourceTree = "<group>";
@@ -292,7 +289,6 @@
292289
buildActionMask = 2147483647;
293290
files = (
294291
6777E4AF22C3D08C0015D4AD /* LaunchScreen.storyboard in Resources */,
295-
67A6FDA222C5B1CF009AC9BC /* GoogleService-Info.plist in Resources */,
296292
6777E4AC22C3D08C0015D4AD /* Assets.xcassets in Resources */,
297293
6777E4AA22C3D08B0015D4AD /* Main.storyboard in Resources */,
298294
);

‎Nepp_Professor/Nepp/AttendanceViewController.swift‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,15 @@ class AttendanceViewController: UIViewController {
2525
startButton.setImage(UIImage(named: "buttonEndclass"), for: .normal)
2626
startButton.setImage(UIImage(named: "buttonEndclassHover"), for: .highlighted)
2727
start = true
28+
// guard let url = URL(string: "http://157b74b3.ngrok.io/encode/") else {
29+
// return //be safe
30+
// }
31+
//
32+
// if #available(iOS 10.0, *) {
33+
// UIApplication.shared.open(url, options: [:], completionHandler: nil)
34+
// } else {
35+
// UIApplication.shared.openURL(url)
36+
// }
2837
} else {
2938
// 버튼을 한 번 더 누르면 뒤로 가기
3039
// start가 true가 되면서

‎Nepp_Professor/Nepp/Base.lproj/Main.storyboard‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@
197197
<color key="textColor" red="0.29225039479999998" green="0.34559094909999999" blue="0.61963731050000004" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
198198
<nil key="highlightedColor"/>
199199
</label>
200-
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="임창성" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DFr-f5-N8m">
200+
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="임창성" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DFr-f5-N8m">
201201
<rect key="frame" x="106.5" y="0.0" width="36.5" height="17"/>
202202
<fontDescription key="fontDescription" type="system" pointSize="14"/>
203203
<color key="textColor" red="0.29225039479999998" green="0.34559094909999999" blue="0.61963731050000004" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
@@ -272,10 +272,10 @@
272272
<rect key="frame" x="80" y="340" width="204" height="17"/>
273273
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
274274
<color key="textColor" red="0.2784313725" green="0.34901960780000002" blue="0.63921568630000003" alpha="1" colorSpace="calibratedRGB"/>
275-
<fontDescription key="fontDescription" type="system" weight="heavy" pointSize="16"/>
275+
<fontDescription key="fontDescription" type="boldSystem" pointSize="16"/>
276276
<textInputTraits key="textInputTraits" returnKeyType="next"/>
277277
</textField>
278-
<textField opaque="NO" contentMode="scaleToFill" fixedFrame="YES" restorationIdentifier="pw" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="비밀번호" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="kuv-O5-jbG">
278+
<textField opaque="NO" contentMode="scaleToFill" fixedFrame="YES" restorationIdentifier="pw" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="비밀번호" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="kuv-O5-jbG" userLabel="PW Field">
279279
<rect key="frame" x="80" y="400" width="204" height="16"/>
280280
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
281281
<color key="textColor" red="0.2784313725" green="0.34901960780000002" blue="0.63921568630000003" alpha="1" colorSpace="calibratedRGB"/>
@@ -299,7 +299,7 @@
299299
<connections>
300300
<outlet property="idField" destination="xJG-sM-Ikm" id="822-2U-3X2"/>
301301
<outlet property="loginButton" destination="7ql-eQ-D2r" id="Bcc-BE-gaU"/>
302-
<outlet property="passwordField" destination="kuv-O5-jbG" id="xfT-5r-NP8"/>
302+
<outlet property="passwordField" destination="kuv-O5-jbG" id="eg9-D2-wgq"/>
303303
</connections>
304304
</viewController>
305305
<placeholder placeholderIdentifier="IBFirstResponder" id="oV6-Wd-GPT" sceneMemberID="firstResponder"/>

‎Nepp_Students/Nepp_Students.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
67A6FD8B22C54218009AC9BC /* FrameExtractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67A6FD8A22C54218009AC9BC /* FrameExtractor.swift */; };
2525
67A6FD9122C5468D009AC9BC /* ios_conversions.mm in Sources */ = {isa = PBXBuildFile; fileRef = 67A6FD8E22C5468D009AC9BC /* ios_conversions.mm */; };
2626
67A6FD9222C5468D009AC9BC /* OpenCVWrapper.mm in Sources */ = {isa = PBXBuildFile; fileRef = 67A6FD9022C5468D009AC9BC /* OpenCVWrapper.mm */; };
27-
67A6FDA422C5B1E9009AC9BC /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 67A6FDA322C5B1E9009AC9BC /* GoogleService-Info.plist */; };
2827
B1032A5BD393735F9BD88D22 /* Pods_Nepp_Students.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 915EE519B1ACA5E9EED58D48 /* Pods_Nepp_Students.framework */; };
2928
/* End PBXBuildFile section */
3029

@@ -52,7 +51,6 @@
5251
67A6FD8F22C5468D009AC9BC /* OpenCVWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenCVWrapper.h; sourceTree = "<group>"; };
5352
67A6FD9022C5468D009AC9BC /* OpenCVWrapper.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = OpenCVWrapper.mm; sourceTree = "<group>"; };
5453
67A6FD9622C54C6F009AC9BC /* Nepp_Students-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Nepp_Students-Bridging-Header.h"; sourceTree = "<group>"; };
55-
67A6FDA322C5B1E9009AC9BC /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
5654
915EE519B1ACA5E9EED58D48 /* Pods_Nepp_Students.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Nepp_Students.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5755
C54ED692DB99779CFA57EA5D /* Pods-Nepp_Students.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Nepp_Students.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Nepp_Students/Pods-Nepp_Students.debug.xcconfig"; sourceTree = "<group>"; };
5856
/* End PBXFileReference section */
@@ -125,7 +123,6 @@
125123
67A6FD4722C46972009AC9BC /* Assets.xcassets */,
126124
67A6FD4922C46972009AC9BC /* LaunchScreen.storyboard */,
127125
67A6FD4C22C46972009AC9BC /* Info.plist */,
128-
67A6FDA322C5B1E9009AC9BC /* GoogleService-Info.plist */,
129126
);
130127
path = Nepp_Students;
131128
sourceTree = "<group>";
@@ -210,7 +207,6 @@
210207
buildActionMask = 2147483647;
211208
files = (
212209
67A6FD4B22C46972009AC9BC /* LaunchScreen.storyboard in Resources */,
213-
67A6FDA422C5B1E9009AC9BC /* GoogleService-Info.plist in Resources */,
214210
67A6FD4822C46972009AC9BC /* Assets.xcassets in Resources */,
215211
67A6FD4622C4696E009AC9BC /* Main.storyboard in Resources */,
216212
);

0 commit comments

Comments
 (0)