Skip to content

Commit

Permalink
Merge branch 'develop' into feature/team-popo#43
Browse files Browse the repository at this point in the history
  • Loading branch information
jeongchoyi authored Oct 4, 2021
2 parents bda5625 + 4ab0741 commit 0c31d5e
Show file tree
Hide file tree
Showing 13 changed files with 60 additions and 58 deletions.
49 changes: 25 additions & 24 deletions popo/popo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,18 @@
F8731B02265BE4B400770760 /* Onboarding.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F8731B01265BE4B400770760 /* Onboarding.storyboard */; };
F8731B0A265C019200770760 /* ConceptSelectViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8731B09265C019200770760 /* ConceptSelectViewController.swift */; };
F8731B0C265C01A800770760 /* ConceptSelect.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F8731B0B265C01A800770760 /* ConceptSelect.storyboard */; };
F8731B0F265C05E900770760 /* ConceptSelectCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8731B0D265C05E900770760 /* ConceptSelectCell.swift */; };
F8731B10265C05E900770760 /* ConceptSelectCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F8731B0E265C05E900770760 /* ConceptSelectCell.xib */; };
F8731B0F265C05E900770760 /* ConceptSelectCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8731B0D265C05E900770760 /* ConceptSelectCollectionViewCell.swift */; };
F8731B10265C05E900770760 /* ConceptSelectCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F8731B0E265C05E900770760 /* ConceptSelectCollectionViewCell.xib */; };
F873648226A668DE00F121DC /* OnboardingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F873648126A668DE00F121DC /* OnboardingViewController.swift */; };
F873648526A6A5E500F121DC /* OnboardingCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F873648326A6A5E500F121DC /* OnboardingCell.swift */; };
F873648626A6A5E500F121DC /* OnboardingCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F873648426A6A5E500F121DC /* OnboardingCell.xib */; };
F873648526A6A5E500F121DC /* OnboardingCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F873648326A6A5E500F121DC /* OnboardingCollectionViewCell.swift */; };
F873648626A6A5E500F121DC /* OnboardingCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F873648426A6A5E500F121DC /* OnboardingCollectionViewCell.xib */; };
F873648B26A6A92600F121DC /* OnboardingDescriptionModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F873648A26A6A92600F121DC /* OnboardingDescriptionModel.swift */; };
F881A73E26FC191400AEE21E /* ConceptData.swift in Sources */ = {isa = PBXBuildFile; fileRef = F881A73D26FC191400AEE21E /* ConceptData.swift */; };
F881A74026FC50B200AEE21E /* GenericResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = F881A73F26FC50B200AEE21E /* GenericResponse.swift */; };
F881A74226FC588400AEE21E /* NetworkResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = F881A74126FC588400AEE21E /* NetworkResult.swift */; };
F8967D8E26F9FA6100F034E3 /* CategoryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8967D8C26F9FA6100F034E3 /* CategoryViewController.swift */; };
F8967D9326FA01F300F034E3 /* CategoryCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8967D9126FA01F300F034E3 /* CategoryCell.swift */; };
F8967D9426FA01F300F034E3 /* CategoryCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F8967D9226FA01F300F034E3 /* CategoryCell.xib */; };
F8967D9326FA01F300F034E3 /* CategoryCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8967D9126FA01F300F034E3 /* CategoryCollectionViewCell.swift */; };
F8967D9426FA01F300F034E3 /* CategoryCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F8967D9226FA01F300F034E3 /* CategoryCollectionViewCell.xib */; };
F8967D9626FA090500F034E3 /* Category.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F8967D9526FA090500F034E3 /* Category.storyboard */; };
F8C284DC265CCD2300B41054 /* CoverColor.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F8C284DB265CCD2300B41054 /* CoverColor.storyboard */; };
F8C284DE265CCD4500B41054 /* CoverColorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8C284DD265CCD4500B41054 /* CoverColorViewController.swift */; };
Expand Down Expand Up @@ -107,18 +107,18 @@
F8731B01265BE4B400770760 /* Onboarding.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Onboarding.storyboard; sourceTree = "<group>"; };
F8731B09265C019200770760 /* ConceptSelectViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConceptSelectViewController.swift; sourceTree = "<group>"; };
F8731B0B265C01A800770760 /* ConceptSelect.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = ConceptSelect.storyboard; sourceTree = "<group>"; };
F8731B0D265C05E900770760 /* ConceptSelectCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConceptSelectCell.swift; sourceTree = "<group>"; };
F8731B0E265C05E900770760 /* ConceptSelectCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ConceptSelectCell.xib; sourceTree = "<group>"; };
F8731B0D265C05E900770760 /* ConceptSelectCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConceptSelectCollectionViewCell.swift; sourceTree = "<group>"; };
F8731B0E265C05E900770760 /* ConceptSelectCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ConceptSelectCollectionViewCell.xib; sourceTree = "<group>"; };
F873648126A668DE00F121DC /* OnboardingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingViewController.swift; sourceTree = "<group>"; };
F873648326A6A5E500F121DC /* OnboardingCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingCell.swift; sourceTree = "<group>"; };
F873648426A6A5E500F121DC /* OnboardingCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = OnboardingCell.xib; sourceTree = "<group>"; };
F873648326A6A5E500F121DC /* OnboardingCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingCollectionViewCell.swift; sourceTree = "<group>"; };
F873648426A6A5E500F121DC /* OnboardingCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = OnboardingCollectionViewCell.xib; sourceTree = "<group>"; };
F873648A26A6A92600F121DC /* OnboardingDescriptionModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingDescriptionModel.swift; sourceTree = "<group>"; };
F881A73D26FC191400AEE21E /* ConceptData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConceptData.swift; sourceTree = "<group>"; };
F881A73F26FC50B200AEE21E /* GenericResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GenericResponse.swift; sourceTree = "<group>"; };
F881A74126FC588400AEE21E /* NetworkResult.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkResult.swift; sourceTree = "<group>"; };
F8967D8C26F9FA6100F034E3 /* CategoryViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CategoryViewController.swift; sourceTree = "<group>"; };
F8967D9126FA01F300F034E3 /* CategoryCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CategoryCell.swift; sourceTree = "<group>"; };
F8967D9226FA01F300F034E3 /* CategoryCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CategoryCell.xib; sourceTree = "<group>"; };
F8967D9126FA01F300F034E3 /* CategoryCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CategoryCollectionViewCell.swift; sourceTree = "<group>"; };
F8967D9226FA01F300F034E3 /* CategoryCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CategoryCollectionViewCell.xib; sourceTree = "<group>"; };
F8967D9526FA090500F034E3 /* Category.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Category.storyboard; sourceTree = "<group>"; };
F8C284DB265CCD2300B41054 /* CoverColor.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = CoverColor.storyboard; sourceTree = "<group>"; };
F8C284DD265CCD4500B41054 /* CoverColorViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoverColorViewController.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -366,10 +366,10 @@
F873648726A6A60100F121DC /* Onboarding */ = {
isa = PBXGroup;
children = (
F873648326A6A5E500F121DC /* OnboardingCell.swift */,
F873648426A6A5E500F121DC /* OnboardingCell.xib */,
F8731B0D265C05E900770760 /* ConceptSelectCell.swift */,
F8731B0E265C05E900770760 /* ConceptSelectCell.xib */,
F873648326A6A5E500F121DC /* OnboardingCollectionViewCell.swift */,
F873648426A6A5E500F121DC /* OnboardingCollectionViewCell.xib */,
F8731B0D265C05E900770760 /* ConceptSelectCollectionViewCell.swift */,
F8731B0E265C05E900770760 /* ConceptSelectCollectionViewCell.xib */,
);
path = Onboarding;
sourceTree = "<group>";
Expand Down Expand Up @@ -445,8 +445,8 @@
F8967D9026FA01C400F034E3 /* PopoConcept */ = {
isa = PBXGroup;
children = (
F8967D9126FA01F300F034E3 /* CategoryCell.swift */,
F8967D9226FA01F300F034E3 /* CategoryCell.xib */,
F8967D9126FA01F300F034E3 /* CategoryCollectionViewCell.swift */,
F8967D9226FA01F300F034E3 /* CategoryCollectionViewCell.xib */,
);
path = PopoConcept;
sourceTree = "<group>";
Expand Down Expand Up @@ -517,14 +517,15 @@
F8731B02265BE4B400770760 /* Onboarding.storyboard in Resources */,
565A1F0827056C7E000CAB1B /* Calendar.storyboard in Resources */,
562F556C26452208000F8CAB /* Colors.xcassets in Resources */,
F8967D9426FA01F300F034E3 /* CategoryCell.xib in Resources */,
F8967D9426FA01F300F034E3 /* CategoryCollectionViewCell.xib in Resources */,
F8967D9626FA090500F034E3 /* Category.storyboard in Resources */,
565A1F162706F58F000CAB1B /* CalendarCollectionViewCell.xib in Resources */,
F8731B0C265C01A800770760 /* ConceptSelect.storyboard in Resources */,
565A1F0B2705EEC8000CAB1B /* LoginMethod.storyboard in Resources */,
F8C284DC265CCD2300B41054 /* CoverColor.storyboard in Resources */,
F8731B10265C05E900770760 /* ConceptSelectCell.xib in Resources */,
F873648626A6A5E500F121DC /* OnboardingCell.xib in Resources */,
F8731B10265C05E900770760 /* ConceptSelectCollectionViewCell.xib in Resources */,
F873648626A6A5E500F121DC /* OnboardingCollectionViewCell.xib in Resources */,
56924E07265635DA00745273 /* LoginMethod.storyboard in Resources */,
562F555626452103000F8CAB /* Assets.xcassets in Resources */,
F8C284E0265CD4DE00B41054 /* CoverGradient.storyboard in Resources */,
567BF244265A571300285956 /* CoverCalendar.storyboard in Resources */,
Expand Down Expand Up @@ -617,9 +618,9 @@
562F556E26452218000F8CAB /* Const.swift in Sources */,
F873648B26A6A92600F121DC /* OnboardingDescriptionModel.swift in Sources */,
F8967D8E26F9FA6100F034E3 /* CategoryViewController.swift in Sources */,
F8731B0F265C05E900770760 /* ConceptSelectCell.swift in Sources */,
F8731B0F265C05E900770760 /* ConceptSelectCollectionViewCell.swift in Sources */,
F873648226A668DE00F121DC /* OnboardingViewController.swift in Sources */,
F8967D9326FA01F300F034E3 /* CategoryCell.swift in Sources */,
F8967D9326FA01F300F034E3 /* CategoryCollectionViewCell.swift in Sources */,
F8C284E2265CD4EB00B41054 /* CoverGradientViewController.swift in Sources */,
F816E65A26FC62FD000C0270 /* PopoService.swift in Sources */,
F881A73E26FC191400AEE21E /* ConceptData.swift in Sources */,
Expand All @@ -631,7 +632,7 @@
565A1F1B2707073E000CAB1B /* Calendar.swift in Sources */,
567BF24A265A626100285956 /* Storyboard.swift in Sources */,
567840FD265E211300BDBF26 /* UINavigationController+Extension.swift in Sources */,
F873648526A6A5E500F121DC /* OnboardingCell.swift in Sources */,
F873648526A6A5E500F121DC /* OnboardingCollectionViewCell.swift in Sources */,
562F554F26452101000F8CAB /* SceneDelegate.swift in Sources */,
565A1F152706F58F000CAB1B /* CalendarCollectionViewCell.swift in Sources */,
565A1F0227056B9F000CAB1B /* AppDate.swift in Sources */,
Expand Down
6 changes: 3 additions & 3 deletions popo/popo/Resources/Constant/Xib.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import Foundation

extension Const {
struct Xib {
static let CategoryCell = "CategoryCell"
static let OnboardingCell = "OnboardingCell"
static let ConceptSelectCell = "ConceptSelectCell"
static let categoryCell = "CategoryCollectionViewCell"
static let onboardingCell = "OnboardingCollectionViewCell"
static let conceptSelectCell = "ConceptSelectCollectionViewCell"
static let calendarCollectionViewCell = "CalendarCollectionViewCell"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import UIKit

class ConceptSelectCell: UICollectionViewCell {
class ConceptSelectCollectionViewCell: UICollectionViewCell {

@IBOutlet weak var backImage: UIImageView!

Expand All @@ -19,7 +19,7 @@ class ConceptSelectCell: UICollectionViewCell {

// MARK: - Methods

func setBackgroundImage(image: String) {
func initBackgroundImage(image: String) {
backImage.image = UIImage(named: image)
backImage.sizeToFit()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="gTV-IL-0wX" customClass="ConceptSelectCell" customModule="popo" customModuleProvider="target">
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="gTV-IL-0wX" customClass="ConceptSelectCollectionViewCell" customModule="popo" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="238" height="227"/>
<autoresizingMask key="autoresizingMask"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import UIKit

class OnboardingCell: UICollectionViewCell {
class OnboardingCollectionViewCell: UICollectionViewCell {

// MARK: - @IBOutlet Properties

Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19162" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19144"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="gTV-IL-0wX" customClass="OnboardingCell" customModule="popo" customModuleProvider="target">
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="gTV-IL-0wX" customClass="OnboardingCollectionViewCell" customModule="popo" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="363" height="733"/>
<autoresizingMask key="autoresizingMask"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import UIKit

class CategoryCell: UICollectionViewCell {
class CategoryCollectionViewCell: UICollectionViewCell {

// MARK: - @IBOutlet Properties

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="gTV-IL-0wX" customClass="CategoryCell" customModule="popo" customModuleProvider="target">
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="gTV-IL-0wX" customClass="CategoryCollectionViewCell" customModule="popo" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="269" height="210"/>
<autoresizingMask key="autoresizingMask"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ extension ConceptSelectViewController {
private func registerCell() {
conceptCollectionView.delegate = self
conceptCollectionView.dataSource = self
let conceptCell = UINib(nibName: "ConceptSelectCell", bundle: nil)
conceptCollectionView.register(conceptCell, forCellWithReuseIdentifier: "ConceptSelectCell")
let conceptCell = UINib(nibName: Const.Xib.conceptSelectCell, bundle: nil)
conceptCollectionView.register(conceptCell, forCellWithReuseIdentifier: Const.Xib.conceptSelectCell)
}
}

Expand All @@ -59,10 +59,10 @@ extension ConceptSelectViewController: UICollectionViewDataSource {
}

func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
guard let cell = collectionView.dequeueReusableCell(withReuseIdentifier: Const.Xib.ConceptSelectCell, for: indexPath) as? ConceptSelectCell else {
guard let cell = collectionView.dequeueReusableCell(withReuseIdentifier: Const.Xib.conceptSelectCell, for: indexPath) as? ConceptSelectCollectionViewCell else {
return UICollectionViewCell()
}
cell.setBackgroundImage(image: conceptList[indexPath.row])
cell.initBackgroundImage(image: conceptList[indexPath.row])

return cell
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class CoverColorViewController: UIViewController {
// MARK: - @IBAction Methods

@IBAction func touchPopo(_ sender: Any) {
_ = coverColorViewList.map { $0.backgroundColor = setRandomColor() }
_ = coverColorViewList.map { $0.backgroundColor = initRandomColor() }
}

@IBAction func touchCompleteButton(_ sender: Any) {
Expand All @@ -69,10 +69,10 @@ extension CoverColorViewController {

// 온보딩과정에서 커버를 제공할 때 랜덤으로 색을 초기화할 것인지 우리가 어울리는 것을 제공할 것인지
// 우선 랜덤 적용
_ = coverColorViewList.map { $0.backgroundColor = setRandomColor() }
_ = coverColorViewList.map { $0.backgroundColor = initRandomColor() }
}

private func setRandomColor() -> UIColor {
private func initRandomColor() -> UIColor {
let randomRed = CGFloat(drand48())
let randomGreen = CGFloat(drand48())
let randomBlue = CGFloat(drand48())
Expand Down
Loading

0 comments on commit 0c31d5e

Please sign in to comment.