Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/TeamNADA/NADA-iOS-ForRel…
Browse files Browse the repository at this point in the history 
…ease into feature/#111

# Conflicts:
#	NADA-iOS-forRelease/Sources/SceneDelegate.swift
  • Loading branch information
@hyun99999
hyun99999 committed Dec 7, 2021
2 parents 27c1652 + b54ef10 commit 52159f9
Show file tree
Hide file tree
Showing 13 changed files with 371 additions and 112 deletions.
8 changes: 6 additions & 2 deletions NADA-iOS-forRelease.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
39007F2C27080D8200E7143E /* UIViewController+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39007F2B27080D8200E7143E /* UIViewController+Extension.swift */; };
390515B82706CEBB00C5F7A5 /* Colors.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 390515B72706CEBB00C5F7A5 /* Colors.xcassets */; };
3909242F26FA15E800236C51 /* UIView+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3909242E26FA15E800236C51 /* UIView+Extension.swift */; };
3927A7D7275F2A9B008BCD2A /* UserDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3927A7D6275F2A9B008BCD2A /* UserDefaults.swift */; };
39288E12273F52B20072F403 /* CardListLookUpRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39288E11273F52B20072F403 /* CardListLookUpRequest.swift */; };
392F7FB4274621F1008CDBF5 /* MoreListTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 392F7FB2274621F1008CDBF5 /* MoreListTableViewCell.swift */; };
392F7FB5274621F1008CDBF5 /* MoreListTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 392F7FB3274621F1008CDBF5 /* MoreListTableViewCell.xib */; };
Expand Down Expand Up @@ -124,6 +125,7 @@
39007F2B27080D8200E7143E /* UIViewController+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+Extension.swift"; sourceTree = "<group>"; };
390515B72706CEBB00C5F7A5 /* Colors.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Colors.xcassets; sourceTree = "<group>"; };
3909242E26FA15E800236C51 /* UIView+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+Extension.swift"; sourceTree = "<group>"; };
3927A7D6275F2A9B008BCD2A /* UserDefaults.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDefaults.swift; sourceTree = "<group>"; };
39288E11273F52B20072F403 /* CardListLookUpRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardListLookUpRequest.swift; sourceTree = "<group>"; };
392F7FB2274621F1008CDBF5 /* MoreListTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoreListTableViewCell.swift; sourceTree = "<group>"; };
392F7FB3274621F1008CDBF5 /* MoreListTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MoreListTableViewCell.xib; sourceTree = "<group>"; };
Expand Down Expand Up @@ -782,6 +784,7 @@
F8F5D0A9270800FD00D99D2E /* Xib.swift */,
F822E7A82709CEB60020452C /* Notification.swift */,
F8C83FC2272FA17B0009DF0D /* URL.swift */,
3927A7D6275F2A9B008BCD2A /* UserDefaults.swift */,
);
path = Constants;
sourceTree = "<group>";
Expand Down Expand Up @@ -1019,6 +1022,7 @@
F8FC43BC26C022A20033E151 /* Storyboard.swift in Sources */,
F8C83FC1272FA06E0009DF0D /* UserAPI.swift in Sources */,
7766A40F274FEBE200714912 /* CardInGroupCollectionViewCell.swift in Sources */,
3927A7D7275F2A9B008BCD2A /* UserDefaults.swift in Sources */,
F8C83FC3272FA17B0009DF0D /* URL.swift in Sources */,
392F7FB4274621F1008CDBF5 /* MoreListTableViewCell.swift in Sources */,
77AA68EA273E0EC4009C89B0 /* CardAddInGroupRequest.swift in Sources */,
Expand Down Expand Up @@ -1178,7 +1182,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = T3VFJ764ZC;
DEVELOPMENT_TEAM = 4QG3GC35LA;
INFOPLIST_FILE = "NADA-iOS-forRelease/Info.plist";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -1198,7 +1202,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = T3VFJ764ZC;
DEVELOPMENT_TEAM = 4QG3GC35LA;
INFOPLIST_FILE = "NADA-iOS-forRelease/Info.plist";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
Expand Down
60 changes: 37 additions & 23 deletions NADA-iOS-forRelease/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,6 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSPhotoLibraryAddUsageDescription</key>
<string>명함을 이미지로 저장하기 위해 갤러리 권한 허용이 필요해요.</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>명함 배경을 설정하기 위해 갤러리 권한 허용이 필요해요.</string>
<key>NSCameraUsageDescription</key>
<string>QR코드를 인식하여 명함을 추가하기 위해 카메라 권한 허용이 필요해요.</string>
<key>UIUserInterfaceStyle</key>
<string></string>
<key>UIAppFonts</key>
<array>
<string>NotoSansCJKkr-Bold.otf</string>
<string>NotoSansCJKkr-Medium.otf</string>
<string>NotoSansCJKkr-Regular.otf</string>
<string>Spoqa Han Sans Neo Bold.otf</string>
<string>Spoqa Han Sans Neo Regular.otf</string>
</array>
<key>LSApplicationCategoryType</key>
<string></string>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
<true/>
</dict>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleDisplayName</key>
Expand All @@ -41,10 +18,47 @@
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
<key>CFBundleTypeRole</key>
<string>Editor</string>
<key>CFBundleURLSchemes</key>
<array>
<string>kakao5b8dd8cc878344bb7532eeca4365a4aa</string>
</array>
</dict>
</array>
<key>CFBundleVersion</key>
<string>1</string>
<key>LSApplicationCategoryType</key>
<string></string>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>kakaokompassauth</string>
<string>kakaolink</string>
</array>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
<true/>
</dict>
<key>NSCameraUsageDescription</key>
<string>QR코드를 인식하여 명함을 추가하기 위해 카메라 권한 허용이 필요해요.</string>
<key>NSPhotoLibraryAddUsageDescription</key>
<string>명함을 이미지로 저장하기 위해 갤러리 권한 허용이 필요해요.</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>명함 배경을 설정하기 위해 갤러리 권한 허용이 필요해요.</string>
<key>UIAppFonts</key>
<array>
<string>NotoSansCJKkr-Bold.otf</string>
<string>NotoSansCJKkr-Medium.otf</string>
<string>NotoSansCJKkr-Regular.otf</string>
<string>Spoqa Han Sans Neo Bold.otf</string>
<string>Spoqa Han Sans Neo Regular.otf</string>
</array>
<key>UIApplicationSceneManifest</key>
<dict>
<key>UIApplicationSupportsMultipleScenes</key>
Expand Down
14 changes: 14 additions & 0 deletions NADA-iOS-forRelease/Resouces/Constants/UserDefaults.swift
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
//
// UserDefaults.swift
// NADA-iOS-forRelease
//
// Created by 민 on 2021/12/07.
//

import Foundation

extension Const {
struct UserDefaults {
static let darkModeState = "darkModeState"
}
}
11 changes: 8 additions & 3 deletions NADA-iOS-forRelease/Resouces/Storyboards/Login.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,13 @@
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5pM-UL-MTg">
<rect key="frame" x="0.0" y="0.0" width="327" height="48"/>
<color key="backgroundColor" name="background"/>
<constraints>
<constraint firstAttribute="height" constant="48" id="3RT-Mz-xhr"/>
</constraints>
<fontDescription key="fontDescription" name="NotoSansCJKkr-Regular" family="Noto Sans CJK KR" pointSize="14"/>
<inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="75" maxY="0.0"/>
<inset key="titleEdgeInsets" minX="0.0" minY="0.0" maxX="15" maxY="0.0"/>
<inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="163" maxY="0.0"/>
<state key="normal" title="카카오 로그인" image="icnKakao">
<color key="titleColor" name="primary"/>
</state>
Expand All @@ -55,8 +57,10 @@
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CFr-2z-xuP">
<rect key="frame" x="0.0" y="62" width="327" height="48"/>
<color key="backgroundColor" name="background"/>
<fontDescription key="fontDescription" name="NotoSansCJKkr-Regular" family="Noto Sans CJK KR" pointSize="14"/>
<inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="68" maxY="0.0"/>
<inset key="titleEdgeInsets" minX="0.0" minY="0.0" maxX="15" maxY="0.0"/>
<inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="150" maxY="0.0"/>
<state key="normal" title="Apple로 로그인" image="icnApple">
<color key="titleColor" name="primary"/>
</state>
Expand Down Expand Up @@ -89,10 +93,11 @@
<constraint firstItem="vDu-zF-Fre" firstAttribute="bottom" secondItem="Bjc-le-F1v" secondAttribute="bottom" constant="110" id="oqH-i3-LWh"/>
</constraints>
</view>
<navigationItem key="navigationItem" id="FOs-Km-lor"/>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="Ief-a0-LHa" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="120.8" y="83.497536945812811"/>
<point key="canvasLocation" x="1063.2" y="83.497536945812811"/>
</scene>
</scenes>
<resources>
Expand Down
50 changes: 47 additions & 3 deletions NADA-iOS-forRelease/Resouces/Storyboards/More/More.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
<array key="Spoqa Han Sans Neo Bold.otf">
<string>SpoqaHanSansNeo-Bold</string>
</array>
<array key="Spoqa Han Sans Neo Regular.otf">
<string>SpoqaHanSansNeo-Regular</string>
</array>
</customFonts>
<scenes>
<!--More View Controller-->
Expand Down Expand Up @@ -40,12 +43,48 @@
<constraint firstItem="DVO-N6-tSR" firstAttribute="leading" secondItem="wb8-4G-Pj8" secondAttribute="leading" constant="24" id="x8c-f6-C4o"/>
</constraints>
</view>
<tableView autoresizesSubviews="NO" clipsSubviews="YES" contentMode="scaleToFill" bounces="NO" alwaysBounceVertical="YES" scrollEnabled="NO" bouncesZoom="NO" dataMode="prototypes" style="plain" separatorStyle="none" allowsSelection="NO" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" estimatedSectionHeaderHeight="-1" sectionFooterHeight="28" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="WnB-Ge-3qg">
<rect key="frame" x="0.0" y="104" width="375" height="404"/>
<tableView autoresizesSubviews="NO" clipsSubviews="YES" contentMode="scaleToFill" bounces="NO" alwaysBounceVertical="YES" scrollEnabled="NO" bouncesZoom="NO" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" estimatedSectionHeaderHeight="-1" sectionFooterHeight="28" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="WnB-Ge-3qg">
<rect key="frame" x="0.0" y="104" width="375" height="467"/>
<color key="backgroundColor" name="textBox"/>
<constraints>
<constraint firstAttribute="height" constant="404" id="F5a-T6-amW"/>
<constraint firstAttribute="height" constant="467" id="F5a-T6-amW"/>
</constraints>
<view key="tableFooterView" contentMode="scaleToFill" id="OX6-in-bQj">
<rect key="frame" x="0.0" y="0.0" width="375" height="63"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mih-Er-ble">
<rect key="frame" x="0.0" y="58" width="375" height="5"/>
<color key="backgroundColor" name="textBox"/>
<constraints>
<constraint firstAttribute="height" constant="5" id="8nx-O6-Z1N"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="다크 모드" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BTD-ru-0RA">
<rect key="frame" x="32" y="20" width="55" height="23"/>
<fontDescription key="fontDescription" name="SpoqaHanSansNeo-Regular" family="Spoqa Han Sans Neo" pointSize="14"/>
<color key="textColor" name="secondary"/>
<nil key="highlightedColor"/>
</label>
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="FnJ-er-eRd">
<rect key="frame" x="302" y="16" width="51" height="31"/>
<connections>
<action selector="darkModeChangeSwitch:" destination="Y6W-OH-hqX" eventType="valueChanged" id="JH8-Ek-Bre"/>
</connections>
</switch>
</subviews>
<color key="backgroundColor" name="background"/>
<constraints>
<constraint firstItem="BTD-ru-0RA" firstAttribute="leading" secondItem="OX6-in-bQj" secondAttribute="leading" constant="32" id="03u-Ii-WhP"/>
<constraint firstAttribute="bottom" secondItem="mih-Er-ble" secondAttribute="bottom" id="0Bf-43-DAL"/>
<constraint firstItem="mih-Er-ble" firstAttribute="leading" secondItem="OX6-in-bQj" secondAttribute="leading" id="1oC-st-I7M"/>
<constraint firstItem="BTD-ru-0RA" firstAttribute="centerY" secondItem="OX6-in-bQj" secondAttribute="centerY" id="42o-mq-2HZ"/>
<constraint firstAttribute="trailing" secondItem="mih-Er-ble" secondAttribute="trailing" id="4q7-gU-zrX"/>
<constraint firstAttribute="trailing" secondItem="FnJ-er-eRd" secondAttribute="trailing" constant="24" id="54R-MK-Iix"/>
<constraint firstItem="FnJ-er-eRd" firstAttribute="centerY" secondItem="OX6-in-bQj" secondAttribute="centerY" id="B8t-ob-V3Z"/>
<constraint firstItem="BTD-ru-0RA" firstAttribute="top" secondItem="OX6-in-bQj" secondAttribute="top" constant="20" id="Kry-LA-uSN"/>
</constraints>
</view>
</tableView>
</subviews>
<viewLayoutGuide key="safeArea" id="vDu-zF-Fre"/>
Expand All @@ -62,6 +101,8 @@
<tabBarItem key="tabBarItem" title="" image="iconMoreHoriz" selectedImage="iconMoreHorizSelected" id="mtN-II-w2Y"/>
<simulatedTabBarMetrics key="simulatedBottomBarMetrics"/>
<connections>
<outlet property="darkModeHeaderView" destination="OX6-in-bQj" id="i9G-xo-r1q"/>
<outlet property="modeSwitch" destination="FnJ-er-eRd" id="flX-Hr-utB"/>
<outlet property="moreListTableView" destination="WnB-Ge-3qg" id="D85-S9-fqH"/>
</connections>
</viewController>
Expand All @@ -79,6 +120,9 @@
<namedColor name="primary">
<color red="0.074509803921568626" green="0.078431372549019607" blue="0.086274509803921567" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="secondary">
<color red="0.16862745098039217" green="0.17647058823529413" blue="0.19215686274509805" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="textBox">
<color red="0.94509803921568625" green="0.95294117647058818" blue="0.96078431372549022" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
Expand Down
16 changes: 9 additions & 7 deletions NADA-iOS-forRelease/Sources/AppDelegate.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,33 @@
//

import UIKit
import KakaoSDKCommon

@main
class AppDelegate: UIResponder, UIApplicationDelegate {



func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
// Override point for customization after application launch.
KakaoSDKCommon.initSDK(appKey: "5b8dd8cc878344bb7532eeca4365a4aa")
return true
}

// MARK: UISceneSession Lifecycle

func application(_ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options: UIScene.ConnectionOptions) -> UISceneConfiguration {
// Called when a new scene session is being created.
// Use this method to select a configuration to create the new scene with.
return UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role)
}

func application(_ application: UIApplication, didDiscardSceneSessions sceneSessions: Set<UISceneSession>) {
// Called when the user discards a scene session.
// If any sessions were discarded while the application was not running, this will be called shortly after application:didFinishLaunchingWithOptions.
// Use this method to release any resources that were specific to the discarded scenes, as they will not return.
}


}

Loading

0 comments on commit 52159f9

Please sign in to comment.