diff --git a/DooRiBon/DooRiBon.xcodeproj/project.pbxproj b/DooRiBon/DooRiBon.xcodeproj/project.pbxproj index 3b14a56..4a4049b 100644 --- a/DooRiBon/DooRiBon.xcodeproj/project.pbxproj +++ b/DooRiBon/DooRiBon.xcodeproj/project.pbxproj @@ -1395,7 +1395,6 @@ BD75C300268B5BA800C4F233 /* UIFont+Extension.swift in Sources */, BD6074B7269DF92700CA62F3 /* BoardResponse.swift in Sources */, 39FC9D8F269F6604002E12A5 /* CheckTripViewController.swift in Sources */, - BD6074B7269DF92700CA62F3 /* BoardResponse.swift in Sources */, BD5EEC9426986AB100D09B11 /* BoardNoDataTableViewCell.swift in Sources */, 4029D7AD26A0401C00C4F5A0 /* EditPlanService.swift in Sources */, 40A0EA42269C4596009EDE74 /* NibConstants.swift in Sources */, @@ -1549,7 +1548,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.dooriboncorp.DooRiBon; + PRODUCT_BUNDLE_IDENTIFIER = com.codershigh.dooribon; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1569,7 +1568,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.dooriboncorp.DooRiBon; + PRODUCT_BUNDLE_IDENTIFIER = com.codershigh.dooribon; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/DooRiBon/DooRiBon/Resources/Colors.xcassets/iconBackWhite.imageset/Contents.json b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconAirplaneFillWhite.imageset/Contents.json similarity index 54% rename from DooRiBon/DooRiBon/Resources/Colors.xcassets/iconBackWhite.imageset/Contents.json rename to DooRiBon/DooRiBon/Resources/Assets.xcassets/iconAirplaneFillWhite.imageset/Contents.json index 9255c6c..766e40b 100644 --- a/DooRiBon/DooRiBon/Resources/Colors.xcassets/iconBackWhite.imageset/Contents.json +++ b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconAirplaneFillWhite.imageset/Contents.json @@ -2,16 +2,16 @@ "images" : [ { "idiom" : "universal", - "filename" : "iconBackWhite.png", - "scale" : "1x" + "scale" : "1x", + "filename" : "iconAirplaneFillWhite.png" }, { - "filename" : "iconBackWhite@2x.png", + "scale" : "2x", "idiom" : "universal", - "scale" : "2x" + "filename" : "iconAirplaneFillWhite@2x.png" }, { - "filename" : "iconBackWhite@3x.png", + "filename" : "iconAirplaneFillWhite@3x.png", "scale" : "3x", "idiom" : "universal" } diff --git a/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconAirplaneFillWhite.imageset/iconAirplaneFillWhite.png b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconAirplaneFillWhite.imageset/iconAirplaneFillWhite.png new file mode 100644 index 0000000..aefcf49 Binary files /dev/null and b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconAirplaneFillWhite.imageset/iconAirplaneFillWhite.png differ diff --git a/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconAirplaneFillWhite.imageset/iconAirplaneFillWhite@2x.png b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconAirplaneFillWhite.imageset/iconAirplaneFillWhite@2x.png new file mode 100644 index 0000000..c17b4f1 Binary files /dev/null and b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconAirplaneFillWhite.imageset/iconAirplaneFillWhite@2x.png differ diff --git a/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconAirplaneFillWhite.imageset/iconAirplaneFillWhite@3x.png b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconAirplaneFillWhite.imageset/iconAirplaneFillWhite@3x.png new file mode 100644 index 0000000..4f217cf Binary files /dev/null and b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconAirplaneFillWhite.imageset/iconAirplaneFillWhite@3x.png differ diff --git a/DooRiBon/DooRiBon/Resources/Assets.xcassets/mainhomeIllust031.imageset/Contents.json b/DooRiBon/DooRiBon/Resources/Assets.xcassets/mainhomeIllust031.imageset/Contents.json new file mode 100644 index 0000000..1cd43ae --- /dev/null +++ b/DooRiBon/DooRiBon/Resources/Assets.xcassets/mainhomeIllust031.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "mainhomeIllust031.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "mainhomeIllust031@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "mainhomeIllust031@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/DooRiBon/DooRiBon/Resources/Assets.xcassets/mainhomeIllust031.imageset/mainhomeIllust031.png b/DooRiBon/DooRiBon/Resources/Assets.xcassets/mainhomeIllust031.imageset/mainhomeIllust031.png new file mode 100644 index 0000000..a35fcc7 Binary files /dev/null and b/DooRiBon/DooRiBon/Resources/Assets.xcassets/mainhomeIllust031.imageset/mainhomeIllust031.png differ diff --git a/DooRiBon/DooRiBon/Resources/Assets.xcassets/mainhomeIllust031.imageset/mainhomeIllust031@2x.png b/DooRiBon/DooRiBon/Resources/Assets.xcassets/mainhomeIllust031.imageset/mainhomeIllust031@2x.png new file mode 100644 index 0000000..a83671a Binary files /dev/null and b/DooRiBon/DooRiBon/Resources/Assets.xcassets/mainhomeIllust031.imageset/mainhomeIllust031@2x.png differ diff --git a/DooRiBon/DooRiBon/Resources/Assets.xcassets/mainhomeIllust031.imageset/mainhomeIllust031@3x.png b/DooRiBon/DooRiBon/Resources/Assets.xcassets/mainhomeIllust031.imageset/mainhomeIllust031@3x.png new file mode 100644 index 0000000..cff6080 Binary files /dev/null and b/DooRiBon/DooRiBon/Resources/Assets.xcassets/mainhomeIllust031.imageset/mainhomeIllust031@3x.png differ diff --git a/DooRiBon/DooRiBon/Resources/Colors.xcassets/iconBackWhite.imageset/iconBackWhite.png b/DooRiBon/DooRiBon/Resources/Colors.xcassets/iconBackWhite.imageset/iconBackWhite.png deleted file mode 100644 index 1a36dca..0000000 Binary files a/DooRiBon/DooRiBon/Resources/Colors.xcassets/iconBackWhite.imageset/iconBackWhite.png and /dev/null differ diff --git a/DooRiBon/DooRiBon/Resources/Colors.xcassets/iconBackWhite.imageset/iconBackWhite@2x.png b/DooRiBon/DooRiBon/Resources/Colors.xcassets/iconBackWhite.imageset/iconBackWhite@2x.png deleted file mode 100644 index ed4bc33..0000000 Binary files a/DooRiBon/DooRiBon/Resources/Colors.xcassets/iconBackWhite.imageset/iconBackWhite@2x.png and /dev/null differ diff --git a/DooRiBon/DooRiBon/Resources/Colors.xcassets/iconBackWhite.imageset/iconBackWhite@3x.png b/DooRiBon/DooRiBon/Resources/Colors.xcassets/iconBackWhite.imageset/iconBackWhite@3x.png deleted file mode 100644 index 3cf9245..0000000 Binary files a/DooRiBon/DooRiBon/Resources/Colors.xcassets/iconBackWhite.imageset/iconBackWhite@3x.png and /dev/null differ diff --git a/DooRiBon/DooRiBon/Sources/Base/Board/BoardStoryboard.storyboard b/DooRiBon/DooRiBon/Sources/Base/Board/BoardStoryboard.storyboard index 3bb561c..252b4db 100644 --- a/DooRiBon/DooRiBon/Sources/Base/Board/BoardStoryboard.storyboard +++ b/DooRiBon/DooRiBon/Sources/Base/Board/BoardStoryboard.storyboard @@ -222,9 +222,7 @@ - - - + diff --git a/DooRiBon/DooRiBon/Sources/Base/Member/MemberOur/Cell/MemberStart.xib b/DooRiBon/DooRiBon/Sources/Base/Member/MemberOur/Cell/MemberStart.xib index 3d21605..60cc357 100644 --- a/DooRiBon/DooRiBon/Sources/Base/Member/MemberOur/Cell/MemberStart.xib +++ b/DooRiBon/DooRiBon/Sources/Base/Member/MemberOur/Cell/MemberStart.xib @@ -24,7 +24,7 @@ - + @@ -66,12 +66,12 @@ - + - + - + diff --git a/DooRiBon/DooRiBon/Sources/Base/Member/MemberOur/MemberOurStoryboard.storyboard b/DooRiBon/DooRiBon/Sources/Base/Member/MemberOur/MemberOurStoryboard.storyboard index ca7982b..0ca2b5d 100644 --- a/DooRiBon/DooRiBon/Sources/Base/Member/MemberOur/MemberOurStoryboard.storyboard +++ b/DooRiBon/DooRiBon/Sources/Base/Member/MemberOur/MemberOurStoryboard.storyboard @@ -26,7 +26,7 @@ - + @@ -224,8 +224,8 @@ - - + + diff --git a/DooRiBon/DooRiBon/Sources/Base/Member/MemberOur/MemberOurViewController.swift b/DooRiBon/DooRiBon/Sources/Base/Member/MemberOur/MemberOurViewController.swift index b4fbc21..0726acf 100644 --- a/DooRiBon/DooRiBon/Sources/Base/Member/MemberOur/MemberOurViewController.swift +++ b/DooRiBon/DooRiBon/Sources/Base/Member/MemberOur/MemberOurViewController.swift @@ -41,7 +41,7 @@ class MemberOurViewController: UIViewController, PageComponentProtocol { memberOurTableView.register(NibConstants.MemberStartViewNib, forCellReuseIdentifier: "MemberStartView") memberOurTableView.register(NibConstants.MemberStartNib, forCellReuseIdentifier: "MemberStartTableViewCell") memberOurTableView.register(NibConstants.MemberCodeCopyNib, forCellReuseIdentifier: "MemberCodeCopyTableViewCell") - memberOurTableView.backgroundColor = .clear +// memberOurTableView.backgroundColor = .clear } private func getStyleData() { diff --git a/DooRiBon/DooRiBon/Sources/Base/Member/MemberStoryboard.storyboard b/DooRiBon/DooRiBon/Sources/Base/Member/MemberStoryboard.storyboard index 47a989d..fb4617f 100644 --- a/DooRiBon/DooRiBon/Sources/Base/Member/MemberStoryboard.storyboard +++ b/DooRiBon/DooRiBon/Sources/Base/Member/MemberStoryboard.storyboard @@ -41,9 +41,7 @@ - - - + diff --git a/DooRiBon/DooRiBon/Sources/Base/Member/MemberViewController.swift b/DooRiBon/DooRiBon/Sources/Base/Member/MemberViewController.swift index 972a2da..15e158b 100644 --- a/DooRiBon/DooRiBon/Sources/Base/Member/MemberViewController.swift +++ b/DooRiBon/DooRiBon/Sources/Base/Member/MemberViewController.swift @@ -130,57 +130,3 @@ extension MemberViewController { ToastView.show("참여코드 복사 완료! 원하는 곳에 붙여넣기 하세요.") } } - -class PagerTabSampleComponent1ViewController: UIViewController, PageComponentProtocol { - var pageTitle: String { - "component1" - } - - override func viewDidLoad() { - super.viewDidLoad() - view.backgroundColor = .purple - } -} - -class PagerTabSampleComponent2ViewController: UITableViewController, PageComponentProtocol { - var pageTitle: String { - "component2" - } - - override func viewDidLoad() { - super.viewDidLoad() - view.backgroundColor = .systemIndigo - } - - override func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { - 100 - } - - override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { - 30 - } - - override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { - let cell = UITableViewCell() - let label = UILabel() - cell.addSubview(label) - label.snp.makeConstraints { - $0.center.equalToSuperview() - } - label.text = "IndexPath : \(indexPath)" - cell.backgroundColor = .systemTeal - return cell - } -} - -class PagerTabSampleComponent3ViewController: UIViewController, PageComponentProtocol { - var pageTitle: String { - "component3" - } - - override func viewDidLoad() { - super.viewDidLoad() - view.backgroundColor = .magenta - } -} - diff --git a/DooRiBon/DooRiBon/Sources/Base/Member/TakeLook/TakeLookStoryboard.storyboard b/DooRiBon/DooRiBon/Sources/Base/Member/TakeLook/TakeLookStoryboard.storyboard index 139326f..1ca0bc2 100644 --- a/DooRiBon/DooRiBon/Sources/Base/Member/TakeLook/TakeLookStoryboard.storyboard +++ b/DooRiBon/DooRiBon/Sources/Base/Member/TakeLook/TakeLookStoryboard.storyboard @@ -111,7 +111,7 @@ - + @@ -99,7 +98,7 @@ - + - + - - + + - - - + + - + @@ -126,20 +125,20 @@ - + - + - + - + @@ -177,11 +176,11 @@ - + - + @@ -278,6 +277,9 @@ + + + - + - + @@ -323,6 +326,9 @@ + + + - + @@ -360,19 +375,23 @@ + + + - - @@ -390,10 +409,11 @@ + - + @@ -401,15 +421,21 @@ + + + - - @@ -425,7 +450,6 @@ - @@ -440,12 +464,16 @@ + + + + @@ -465,13 +493,16 @@ + + + @@ -484,9 +515,7 @@ - - - + @@ -519,7 +548,7 @@ - + @@ -540,10 +569,13 @@ - + @@ -570,8 +602,12 @@ + + + + + + + - + @@ -598,15 +637,20 @@ + + + - @@ -616,7 +660,6 @@ - @@ -628,10 +671,11 @@ + - + @@ -639,15 +683,21 @@ + + + - - @@ -679,6 +727,7 @@ + @@ -686,30 +735,44 @@ + - + - - + + + + + + + + + + @@ -718,9 +781,12 @@ + + + - + @@ -733,7 +799,7 @@ - + @@ -743,7 +809,7 @@ - - + @@ -840,7 +908,7 @@ - + @@ -853,6 +921,7 @@ + @@ -864,6 +933,7 @@ + @@ -877,7 +947,7 @@ - + @@ -887,6 +957,7 @@ + @@ -909,6 +980,7 @@ + @@ -940,12 +1012,13 @@ + - + @@ -964,6 +1037,9 @@ + + + diff --git a/DooRiBon/DooRiBon/Sources/Main/MainViewController.swift b/DooRiBon/DooRiBon/Sources/Main/MainViewController.swift index 32cdf6c..188ea88 100644 --- a/DooRiBon/DooRiBon/Sources/Main/MainViewController.swift +++ b/DooRiBon/DooRiBon/Sources/Main/MainViewController.swift @@ -24,6 +24,9 @@ class MainViewController: UIViewController { @IBOutlet weak var lastTripMenuLabel: UILabel! @IBOutlet weak var styleTripMenuLabel: UILabel! + // 버튼 + @IBOutlet weak var startNewTripButton: UIButton! + /// 뷰 @IBOutlet weak var mainContentView: UIView! @IBOutlet weak var backgroundView: UIView! @@ -50,12 +53,7 @@ class MainViewController: UIViewController { var comeTripList : [Group] = [] var lastTripList : [Group] = [] - var allTripData: MainDataModel? { - didSet { - comeTripCollectionView.reloadData() - lastTripTableView.reloadData() - } - } + var allTripData: MainDataModel? let formatter = DateFormatter() let calendar = Calendar.current @@ -65,15 +63,22 @@ class MainViewController: UIViewController { setUI() shadowSet() + collectionViewSet() + tableViewSet() + setTripData() + DispatchQueue.main.asyncAfter(deadline: .now() + 3, execute: { + self.setTripData() + }) } // MARK: - viewWillAppear override func viewWillAppear(_ animated: Bool) { super.viewWillAppear(animated) - - setTripData() - collectionViewSet() - tableViewSet() + } + + override func viewDidAppear(_ animated: Bool) { + super.viewDidAppear(animated) + setupSkeletionUI(.show) } // MARK: - 액션 @@ -132,7 +137,6 @@ class MainViewController: UIViewController { // 두근두근, 다가오는 여행 부분 데이터 func setTripData() { - self.setupSkeletionUI(.show) GetMainDataService.shared.getPersonInfo{ [self] (response) in switch(response) { @@ -142,8 +146,9 @@ class MainViewController: UIViewController { comeTripCollectionView.reloadData() lastTripTableView.reloadData() setDevideTripData() + setupSkeletionUI(.hide) } - setupSkeletionUI(.hide) + case .requestErr(let message): print("requestERR", message) case .pathErr: @@ -216,9 +221,12 @@ class MainViewController: UIViewController { lastTripTableView.delegate = self lastTripTableView.dataSource = self // automaticDimension - lastTripTableView.estimatedRowHeight = 133 + lastTripTableView.estimatedRowHeight = 150 lastTripTableView.rowHeight = UITableView.automaticDimension + let footerView = UIView() + footerView.frame.size.height = 1 + lastTripTableView.tableFooterView = footerView } // 쉐도우 @@ -267,7 +275,8 @@ extension MainViewController: UICollectionViewDataSource location: comeTripList[indexPath.row].destination, members: comeTripList[indexPath.row].members[0]) } - + + comeTripCell.hideAnimation() return comeTripCell } @@ -288,17 +297,13 @@ extension MainViewController: UICollectionViewDelegate extension MainViewController: UICollectionViewDelegateFlowLayout { func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize { - - let width = UIScreen.main.bounds.width // 현재 사용하는 기기의 width를 가져와서 저장 - let cellWidth = width * (340/375) // 제플린에서의 비율만큼 곱해서 width를 결정 - let cellHeight = cellWidth * (140/340) // 제플린에서의 비율만큼 곱해서 height를 결정 - - return CGSize(width: cellWidth, height: cellHeight) // 정해진 가로/세로를 CGSize형으로 return + + return CGSize.init(width: comeTripCollectionView.bounds.width, height: comeTripCollectionView.bounds.height) // 정해진 가로/세로를 CGSize형으로 return } // ContentInset 메서드: Cell에서 Content 외부에 존재하는 Inset의 크기를 결정 func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, insetForSectionAt section: Int) -> UIEdgeInsets { - return UIEdgeInsets.zero // Inset을 사용하지 않는다는 뜻x + return UIEdgeInsets.zero } // minimumLineSpacing 메서드: Cell 들의 위, 아래 간격 지정 @@ -308,7 +313,7 @@ extension MainViewController: UICollectionViewDelegateFlowLayout // minimumInteritemSpacing 메서드: Cell 들의 좌,우 간격 지정 func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, minimumInteritemSpacingForSectionAt section: Int) -> CGFloat { - return 35 + return 0 } } @@ -331,6 +336,7 @@ extension MainViewController: UITableViewDataSource, UITableViewDelegate func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { guard let tripCell = tableView.dequeueReusableCell(withIdentifier: LastTripTableViewCell.identifier, for: indexPath) as? LastTripTableViewCell else {return UITableViewCell() } + tripCell.setdata(imageName: lastTripList[indexPath.row].image, title: lastTripList[indexPath.row].travelName, location: lastTripList[indexPath.row].destination, @@ -350,43 +356,44 @@ extension MainViewController { // Skeleton UI private func setupSkeletionUI(_ type: SkeletonState) { + SkeletonAppearance.default.tintColor = Colors.backgroundBlue.color + if type == .show { - nowTripImageView.showAnimatedSkeleton() - nowTripDateLabel.showAnimatedSkeleton() - nowTripTitleLabel.showAnimatedSkeleton() - nowTripLocationLabel.showAnimatedSkeleton() - nowTripMembersLabel.showAnimatedSkeleton() - comeTripCollectionView.showAnimatedSkeleton() - lastTripTableView.showAnimatedSkeleton() - mainTitleLabel.showAnimatedSkeleton() - comeTripMenuLabel.showAnimatedSkeleton() - lastTripMenuLabel.showAnimatedSkeleton() - styleTripMenuLabel.showAnimatedSkeleton() + // MARK: - 진행중인 여행 + + self.comeTripCollectionView.showAnimatedSkeleton() + self.lastTripTableView.showAnimatedSkeleton() + + [nowTripImageView, nowTripStateView, nowTripDateLabel, + nowTripTitleLabel, nowTripLocationView, nowTripMemberView].forEach { $0?.showAnimatedSkeleton() } + + // MARK: - 각 카테고리 라벨 + [mainTitleLabel, comeTripMenuLabel, lastTripMenuLabel, styleTripMenuLabel].forEach { $0?.showAnimatedSkeleton() } + + // MARK: - 다가오는 여행 backgroundView.showAnimatedSkeleton() - indicatorBar.showAnimatedSkeleton() styleTripView.showAnimatedSkeleton() - nowTripStateView.showAnimatedSkeleton() - nowTripLocationView.showAnimatedSkeleton() - nowTripMemberView.showAnimatedSkeleton() + + nowTripLocationLabel.isHidden = true + nowTripMembersLabel.isHidden = true } else { - nowTripImageView.hideSkeleton(reloadDataAfter: true, transition: .crossDissolve(0.5)) - nowTripDateLabel.hideSkeleton(reloadDataAfter: true, transition: .crossDissolve(0.5)) - nowTripTitleLabel.hideSkeleton(reloadDataAfter: true, transition: .crossDissolve(0.5)) - nowTripLocationLabel.hideSkeleton(reloadDataAfter: true, transition: .crossDissolve(0.5)) - nowTripMembersLabel.hideSkeleton(reloadDataAfter: true, transition: .crossDissolve(0.5)) comeTripCollectionView.hideSkeleton(reloadDataAfter: true, transition: .crossDissolve(0.5)) lastTripTableView.hideSkeleton(reloadDataAfter: true, transition: .crossDissolve(0.5)) - mainTitleLabel.hideSkeleton(reloadDataAfter: true, transition: .crossDissolve(0.5)) - comeTripMenuLabel.hideSkeleton(reloadDataAfter: true, transition: .crossDissolve(0.5)) - lastTripMenuLabel.hideSkeleton(reloadDataAfter: true, transition: .crossDissolve(0.5)) - styleTripMenuLabel.hideSkeleton(reloadDataAfter: true, transition: .crossDissolve(0.5)) + + [nowTripImageView, nowTripStateView, nowTripDateLabel, + nowTripTitleLabel, nowTripLocationView, nowTripMemberView].forEach { + $0?.hideSkeleton(reloadDataAfter: true, transition: .crossDissolve(0.5)) + } + + [mainTitleLabel, comeTripMenuLabel, lastTripMenuLabel, styleTripMenuLabel].forEach { + $0?.hideSkeleton(reloadDataAfter: true, transition: .crossDissolve(0.5)) + } + backgroundView.hideSkeleton(reloadDataAfter: true, transition: .crossDissolve(0.5)) - indicatorBar.hideSkeleton(reloadDataAfter: true, transition: .crossDissolve(0.5)) styleTripView.hideSkeleton(reloadDataAfter: true, transition: .crossDissolve(0.5)) - nowTripStateView.hideSkeleton(reloadDataAfter: true, transition: .crossDissolve(0.5)) - nowTripLocationView.hideSkeleton(reloadDataAfter: true, transition: .crossDissolve(0.5)) - nowTripMemberView.hideSkeleton(reloadDataAfter: true, transition: .crossDissolve(0.5)) + + nowTripLocationLabel.isHidden = false + nowTripMembersLabel.isHidden = false } - } } diff --git a/DooRiBon/DooRiBon/Sources/Main/StyleTest/Service/StyleTestService.swift b/DooRiBon/DooRiBon/Sources/Main/StyleTest/Service/StyleTestService.swift index 673a9d3..82a35c0 100644 --- a/DooRiBon/DooRiBon/Sources/Main/StyleTest/Service/StyleTestService.swift +++ b/DooRiBon/DooRiBon/Sources/Main/StyleTest/Service/StyleTestService.swift @@ -15,7 +15,6 @@ struct StyleTestService { { let url = APIConstants.styleQuestionURL - let header : HTTPHeaders = NetworkInfo.header let dataRequest = AF.request(url, method: .get, encoding: JSONEncoding.default) dataRequest.responseData { dataResponse in diff --git a/DooRiBon/Podfile.lock b/DooRiBon/Podfile.lock index 1433317..9da597c 100644 --- a/DooRiBon/Podfile.lock +++ b/DooRiBon/Podfile.lock @@ -42,4 +42,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 91b9fe361384338c0b3bc166b8cc09b9f88e5abf -COCOAPODS: 1.10.1 +COCOAPODS: 1.10.0