Skip to content

Commit

Permalink
Merge pull request #378 from dlwns33/feature/#371
Browse files Browse the repository at this point in the history
feat: 근처의 명함 뷰 UI #374
  • Loading branch information
dlwns33 authored Apr 11, 2023
2 parents b6dbaf8 + 40458aa commit 57dff94
Show file tree
Hide file tree
Showing 32 changed files with 873 additions and 7 deletions.
1 change: 1 addition & 0 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ disabled_rules:
- function_parameter_count
- function_body_length
- cyclomatic_complexity
- force_cast
excluded:
- Pods
- NADA-iOS-forRelease/Sources/AppDelegate.swift
Expand Down
121 changes: 119 additions & 2 deletions NADA-iOS-forRelease.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,17 @@
777FF89F27364B7B00BF69D3 /* GroupEditRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 777FF89E27364B7B00BF69D3 /* GroupEditRequest.swift */; };
77812947275F6EA3004B34F4 /* CardDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77812946275F6EA3004B34F4 /* CardDetailViewController.swift */; };
7781294A275F6ED7004B34F4 /* CardDetail.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 77812949275F6ED7004B34F4 /* CardDetail.storyboard */; };
77A4D5EB29AE20CB00367B7C /* makeVibrate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77A4D5EA29AE20CB00367B7C /* makeVibrate.swift */; };
77A4D5EF29AE269B00367B7C /* AroundMeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77A4D5EE29AE269B00367B7C /* AroundMeViewController.swift */; };
77A4D5F429AE291F00367B7C /* CustomNavigationBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77A4D5F329AE291F00367B7C /* CustomNavigationBar.swift */; };
77A4D5F629BC304C00367B7C /* UIStackView+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77A4D5F529BC304C00367B7C /* UIStackView+Extension.swift */; };
77A4D5F929BC320600367B7C /* AroundMeCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77A4D5F829BC320600367B7C /* AroundMeCollectionViewCell.swift */; };
77A4D5FC29BD6F4600367B7C /* AroundMeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77A4D5FB29BD6F4600367B7C /* AroundMeViewModel.swift */; };
77A4D5FE29BD6F9500367B7C /* ViewModelType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77A4D5FD29BD6F9500367B7C /* ViewModelType.swift */; };
77A4D60129BD708C00367B7C /* AroundMeResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77A4D60029BD708C00367B7C /* AroundMeResponse.swift */; };
77A4D60429BD743600367B7C /* ModuleFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77A4D60329BD743600367B7C /* ModuleFactory.swift */; };
77A4D60629BD747300367B7C /* controllerFromStoryBoard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77A4D60529BD747300367B7C /* controllerFromStoryBoard.swift */; };
77A4D60829BD74BC00367B7C /* getClassName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77A4D60729BD74BC00367B7C /* getClassName.swift */; };
77AA68EA273E0EC4009C89B0 /* CardAddInGroupRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77AA68E9273E0EC4009C89B0 /* CardAddInGroupRequest.swift */; };
77B4E7482990E420006098DC /* Home.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 77B4E7472990E420006098DC /* Home.storyboard */; };
77B4E74B2990E50E006098DC /* HomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77B4E74A2990E50E006098DC /* HomeViewController.swift */; };
Expand Down Expand Up @@ -312,6 +323,17 @@
777FF89E27364B7B00BF69D3 /* GroupEditRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupEditRequest.swift; sourceTree = "<group>"; };
77812946275F6EA3004B34F4 /* CardDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardDetailViewController.swift; sourceTree = "<group>"; };
77812949275F6ED7004B34F4 /* CardDetail.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = CardDetail.storyboard; sourceTree = "<group>"; };
77A4D5EA29AE20CB00367B7C /* makeVibrate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = makeVibrate.swift; sourceTree = "<group>"; };
77A4D5EE29AE269B00367B7C /* AroundMeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AroundMeViewController.swift; sourceTree = "<group>"; };
77A4D5F329AE291F00367B7C /* CustomNavigationBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomNavigationBar.swift; sourceTree = "<group>"; };
77A4D5F529BC304C00367B7C /* UIStackView+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIStackView+Extension.swift"; sourceTree = "<group>"; };
77A4D5F829BC320600367B7C /* AroundMeCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AroundMeCollectionViewCell.swift; sourceTree = "<group>"; };
77A4D5FB29BD6F4600367B7C /* AroundMeViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AroundMeViewModel.swift; sourceTree = "<group>"; };
77A4D5FD29BD6F9500367B7C /* ViewModelType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewModelType.swift; sourceTree = "<group>"; };
77A4D60029BD708C00367B7C /* AroundMeResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AroundMeResponse.swift; sourceTree = "<group>"; };
77A4D60329BD743600367B7C /* ModuleFactory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModuleFactory.swift; sourceTree = "<group>"; };
77A4D60529BD747300367B7C /* controllerFromStoryBoard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = controllerFromStoryBoard.swift; sourceTree = "<group>"; };
77A4D60729BD74BC00367B7C /* getClassName.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = getClassName.swift; sourceTree = "<group>"; };
77AA68E9273E0EC4009C89B0 /* CardAddInGroupRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardAddInGroupRequest.swift; sourceTree = "<group>"; };
77B4E7422990E00B006098DC /* Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
77B4E7432990E015006098DC /* Beta.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Beta.xcconfig; sourceTree = "<group>"; };
Expand Down Expand Up @@ -738,6 +760,83 @@
path = CardDetail;
sourceTree = "<group>";
};
77A4D5E929AE20A600367B7C /* Utils */ = {
isa = PBXGroup;
children = (
77A4D5EA29AE20CB00367B7C /* makeVibrate.swift */,
77A4D60729BD74BC00367B7C /* getClassName.swift */,
);
path = Utils;
sourceTree = "<group>";
};
77A4D5ED29AE267F00367B7C /* AroundMe */ = {
isa = PBXGroup;
children = (
77A4D5FA29BD6F3600367B7C /* ViewModel */,
77A4D5F729BC31EC00367B7C /* View */,
77A4D5F029AE26A600367B7C /* VC */,
);
path = AroundMe;
sourceTree = "<group>";
};
77A4D5F029AE26A600367B7C /* VC */ = {
isa = PBXGroup;
children = (
77A4D5EE29AE269B00367B7C /* AroundMeViewController.swift */,
);
path = VC;
sourceTree = "<group>";
};
77A4D5F129AE28EA00367B7C /* CardView */ = {
isa = PBXGroup;
children = (
7705CF3D2752C7DB005195DF /* CardView.swift */,
7705CF3F2752C844005195DF /* CardView.xib */,
);
path = CardView;
sourceTree = "<group>";
};
77A4D5F229AE28F200367B7C /* CustomNavigationBar */ = {
isa = PBXGroup;
children = (
77A4D5F329AE291F00367B7C /* CustomNavigationBar.swift */,
);
path = CustomNavigationBar;
sourceTree = "<group>";
};
77A4D5F729BC31EC00367B7C /* View */ = {
isa = PBXGroup;
children = (
77A4D5F829BC320600367B7C /* AroundMeCollectionViewCell.swift */,
);
path = View;
sourceTree = "<group>";
};
77A4D5FA29BD6F3600367B7C /* ViewModel */ = {
isa = PBXGroup;
children = (
77A4D5FB29BD6F4600367B7C /* AroundMeViewModel.swift */,
);
path = ViewModel;
sourceTree = "<group>";
};
77A4D5FF29BD705B00367B7C /* AroundMe */ = {
isa = PBXGroup;
children = (
77A4D60029BD708C00367B7C /* AroundMeResponse.swift */,
);
path = AroundMe;
sourceTree = "<group>";
};
77A4D60229BD741C00367B7C /* Factory */ = {
isa = PBXGroup;
children = (
77A4D60329BD743600367B7C /* ModuleFactory.swift */,
77A4D60529BD747300367B7C /* controllerFromStoryBoard.swift */,
);
path = Factory;
sourceTree = "<group>";
};
77B4E7462990E415006098DC /* Home */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -1045,6 +1144,7 @@
F87122722733032300A24E74 /* Card */,
777FF89927359B1000BF69D3 /* Group */,
7734D5B027778EC8004360E4 /* Util */,
77A4D5FF29BD705B00367B7C /* AroundMe */,
F8F00C3729DD46B300A15377 /* Update */,
);
path = NetworkModel;
Expand Down Expand Up @@ -1116,6 +1216,7 @@
F8562C94296ADC0A00DA1109 /* Lottie */,
F8FC43A326C01F420033E151 /* Constants */,
F8FC43A426C01F5B0033E151 /* Extensions */,
77A4D5E929AE20A600367B7C /* Utils */,
F8FC43A226C01F2B0033E151 /* Storyboards */,
);
path = Resouces;
Expand All @@ -1124,6 +1225,7 @@
F8FC439A26C01EA90033E151 /* Sources */ = {
isa = PBXGroup;
children = (
77A4D60229BD741C00367B7C /* Factory */,
F8FC438526C01CDD0033E151 /* AppDelegate.swift */,
F8FC438726C01CDD0033E151 /* SceneDelegate.swift */,
F8FC439B26C01EC30033E151 /* Cells */,
Expand Down Expand Up @@ -1178,6 +1280,7 @@
children = (
F88C8DE829B8919700196A33 /* ViewModelType.swift */,
F8915A1F275713A10013D609 /* CardCreation */,
77A4D5FD29BD6F9500367B7C /* ViewModelType.swift */,
);
path = Protocols;
sourceTree = "<group>";
Expand All @@ -1187,6 +1290,7 @@
children = (
F805588329C993D0002E8EA3 /* Update */,
77B4E7492990E4FC006098DC /* Home */,
77A4D5ED29AE267F00367B7C /* AroundMe */,
397B750E2763A5DD004AEB03 /* OpenSource */,
397B75182763B5DA004AEB03 /* TeamNADA */,
77812945275F6E6A004B34F4 /* CardDetail */,
Expand All @@ -1208,8 +1312,8 @@
F8FC43A126C01F1F0033E151 /* Views */ = {
isa = PBXGroup;
children = (
7705CF3D2752C7DB005195DF /* CardView.swift */,
7705CF3F2752C844005195DF /* CardView.xib */,
77A4D5F229AE28F200367B7C /* CustomNavigationBar */,
77A4D5F129AE28EA00367B7C /* CardView */,
);
path = Views;
sourceTree = "<group>";
Expand Down Expand Up @@ -1263,6 +1367,7 @@
F8D74DD7276C7FB60071E5FC /* UIImageView+Extension.swift */,
7734D5B72777A8E8004360E4 /* String+Extension.swift */,
F835EF6E29800F51001ABAAF /* UIApplication+Extension.swift */,
77A4D5F529BC304C00367B7C /* UIStackView+Extension.swift */,
);
path = Extensions;
sourceTree = "<group>";
Expand Down Expand Up @@ -1575,6 +1680,7 @@
F88C8DE929B8919700196A33 /* ViewModelType.swift in Sources */,
F858079E2700354E00872484 /* BackgroundCollectionViewCell.swift in Sources */,
F8C83FBD272F9F430009DF0D /* GenericResponse.swift in Sources */,
77A4D5F629BC304C00367B7C /* UIStackView+Extension.swift in Sources */,
F835EF6F29800F51001ABAAF /* UIApplication+Extension.swift in Sources */,
398413B7274A7A1E005550BC /* AddGroupBottomSheetViewController.swift in Sources */,
77DFB871274F92F9000CD36F /* AddWithIdBottomSheetViewController.swift in Sources */,
Expand All @@ -1587,6 +1693,8 @@
F8F00C4129DD48A000A15377 /* UpdateService.swift in Sources */,
F8D92E0A29D5324E002ACC73 /* Taste.swift in Sources */,
F85711A5274A6B2200F59F0B /* CardCreationPreviewViewController.swift in Sources */,
39DC069A2778BEFB00C8ECCC /* CardListLookUp.swift in Sources */,
77A4D60829BD74BC00367B7C /* getClassName.swift in Sources */,
777FF89B27359B7800BF69D3 /* Groups.swift in Sources */,
77F47D93276C79B600414659 /* Header.swift in Sources */,
397B75102763A5F5004AEB03 /* OpenSourceViewController.swift in Sources */,
Expand All @@ -1607,6 +1715,7 @@
770E58862778A78900498C2E /* Status.swift in Sources */,
F851805B275D047C006BD5ED /* OnboardingViewController.swift in Sources */,
392BAF7B2793E90D0013DCB3 /* KeyChainKey.swift in Sources */,
77A4D5FC29BD6F4600367B7C /* AroundMeViewModel.swift in Sources */,
F843DD6D29A5F83000D8D20D /* CardCreationCategoryViewModel.swift in Sources */,
39C1E88F270EC762006D2089 /* UIColor+Extension.swift in Sources */,
F8C83FC9272FA3190009DF0D /* GroupAPI.swift in Sources */,
Expand All @@ -1615,9 +1724,11 @@
394F314C27081B3A00C83291 /* FrontViewController.swift in Sources */,
777FF89D2735B16B00BF69D3 /* GroupAddRequest.swift in Sources */,
7734D5AA27719520004360E4 /* CardShareBottomSheetViewController.swift in Sources */,
77A4D5F429AE291F00367B7C /* CustomNavigationBar.swift in Sources */,
F8F5D0AA270800FD00D99D2E /* Xib.swift in Sources */,
F82FF8252702000000E57F8B /* RequiredFlavorCollectionViewCell.swift in Sources */,
F8C83FC7272FA2A20009DF0D /* CardService.swift in Sources */,
77A4D5EB29AE20CB00367B7C /* makeVibrate.swift in Sources */,
39D88B662745FE5F00A72164 /* TabBarViewController.swift in Sources */,
77607EDA274A68BE00204CD2 /* GroupCollectionViewCell.swift in Sources */,
F871227827330A3800A24E74 /* CardCreationRequest.swift in Sources */,
Expand Down Expand Up @@ -1647,10 +1758,15 @@
392BAF792793BAF80013DCB3 /* KeyChain.swift in Sources */,
7766A40F274FEBE200714912 /* CardInGroupCollectionViewCell.swift in Sources */,
3927A7D7275F2A9B008BCD2A /* UserDefaults.swift in Sources */,
77A4D60129BD708C00367B7C /* AroundMeResponse.swift in Sources */,
7734D5B82777A8E8004360E4 /* String+Extension.swift in Sources */,
77A4D5FE29BD6F9500367B7C /* ViewModelType.swift in Sources */,
77A4D60429BD743600367B7C /* ModuleFactory.swift in Sources */,
F8C83FC3272FA17B0009DF0D /* URL.swift in Sources */,
392F7FB4274621F1008CDBF5 /* MoreListTableViewCell.swift in Sources */,
77AA68EA273E0EC4009C89B0 /* CardAddInGroupRequest.swift in Sources */,
77A4D5EF29AE269B00367B7C /* AroundMeViewController.swift in Sources */,
77A4D60629BD747300367B7C /* controllerFromStoryBoard.swift in Sources */,
3936993E274A53E000684420 /* GroupEditViewController.swift in Sources */,
F8C83FAE272F99940009DF0D /* MoyaLoggerPlugin.swift in Sources */,
F84BAFAD26FDB543004CA335 /* FrontCardCreationCollectionViewCell.swift in Sources */,
Expand All @@ -1670,6 +1786,7 @@
393E3345275F69EE00965BBF /* SplashViewController.swift in Sources */,
F8C83FB8272F9E3F0009DF0D /* UtilAPI.swift in Sources */,
F8FC438826C01CDD0033E151 /* SceneDelegate.swift in Sources */,
77A4D5F929BC320600367B7C /* AroundMeCollectionViewCell.swift in Sources */,
39C394D4277CD33500DBA566 /* EmptyCardListTableViewCell.swift in Sources */,
77B4E74B2990E50E006098DC /* HomeViewController.swift in Sources */,
7734D5B427778EFB004360E4 /* HarmonyResponse.swift in Sources */,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"scale" : "1x",
"filename" : "icnPlusCircle.png",
"idiom" : "universal"
},
{
"scale" : "2x",
"idiom" : "universal",
"filename" : "icnPlusCircle@2x.png"
},
{
"filename" : "icnPlusCircle@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "iconRefreshLocation.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "iconRefreshLocation@2x.png",
"scale" : "2x"
},
{
"scale" : "3x",
"idiom" : "universal",
"filename" : "iconRefreshLocation@3x.png"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "imgProfileSmall.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "imgProfileSmall@2x.png",
"scale" : "2x"
},
{
"scale" : "3x",
"filename" : "imgProfileSmall@3x.png",
"idiom" : "universal"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
36 changes: 36 additions & 0 deletions NADA-iOS-forRelease/Resouces/Constants/Storyboard.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,42 @@
//

import Foundation
import UIKit

/*
- Description:
enum형태로 Storybaords 값을 안전하게 가져오기 위해 사용합니다.
스토리보드를 추가할때마다 case 과 값을 추가하면 됩니다!
- UIStoryboard.list(.base)와 같이 사용
@creds to Song jihun (github: https://github.com/i-colours-u)
*/

enum Storyboards: String {
case cardCreation = "CardCreation"
case login = "Login"
case cardList = "CardList"
case front = "Front"
case group = "Group"
case groupEdit = "GroupEdit"
case qrScan = "QRScan"
case cardDetail = "CardDetail"
case cardHarmony = "CardHarmony"
case tabBar = "TabBar"
case cardCreationPreview = "CardCreationPreview"
case more = "More"
case splash = "Splash"
case onboarding = "Onboarding"
case openSource = "OpenSource"
case teamNADA = "TeamNADA"
}

extension UIStoryboard {
static func list(_ name: Storyboards) -> UIStoryboard {
return UIStoryboard(name: name.rawValue, bundle: nil)
}
}

extension Const {
struct Storyboard {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
//
// UIStackView+Extension.swift
// NADA-iOS-forRelease
//
// Created by Yi Joon Choi on 2023/03/11.
//

import UIKit

extension UIStackView {
public func addArrangedSubviews(_ view: [UIView]) {
view.forEach { self.addArrangedSubview($0) }
}
}
Loading

0 comments on commit 57dff94

Please sign in to comment.