Skip to content

Commit

Permalink
Merge branch 'develop' into feature/TeamNADA#85
Browse files Browse the repository at this point in the history
  • Loading branch information
@dlwns33
dlwns33 committed Nov 29, 2021
2 parents 17de62c + c285a2b commit 0cd29be
Show file tree
Hide file tree
Showing 19 changed files with 172 additions and 144 deletions.
6 changes: 3 additions & 3 deletions NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/quaternary.colorset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x76",
"green" : "0x6C",
"red" : "0x66"
"blue" : "118",
"green" : "108",
"red" : "102"
}
},
"idiom" : "universal"
Expand Down
6 changes: 3 additions & 3 deletions NADA-iOS-forRelease/Resouces/Assets/Colors.xcassets/secondary.colorset/Contents.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xF5",
"green" : "0xF3",
"red" : "0xF1"
"blue" : "245",
"green" : "243",
"red" : "241"
}
},
"idiom" : "universal"
Expand Down
15 changes: 15 additions & 0 deletions NADA-iOS-forRelease/Resouces/Extensions/UIColor+Extension.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,4 +119,19 @@ extension UIColor {
return UIColor(white: 1.0, alpha: 1.0)
}
}

@nonobjc class var bottomDimmedBackground: UIColor {
if #available(iOS 13, *) {
return UIColor { (traitCollection: UITraitCollection) -> UIColor in
if traitCollection.userInterfaceStyle == .light {
return UIColor(white: 0.0, alpha: 0.4)
} else {
return UIColor(white: 0.0, alpha: 0.6)
}
}
} else {
return UIColor(white: 0.0, alpha: 0.4)
}
}

}
15 changes: 7 additions & 8 deletions NADA-iOS-forRelease/Resouces/Storyboards/Group/GroupEdit.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19454"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<customFonts key="customFonts">
Expand All @@ -18,7 +17,7 @@
<!--Group Edit View Controller-->
<scene sceneID="s0d-6b-0kx">
<objects>
<viewController storyboardIdentifier="GroupEditViewController" id="Y6W-OH-hqX" customClass="GroupEditViewController" customModule="NADA_iOS_forRelease" customModuleProvider="target" sceneMemberID="viewController">
<viewController storyboardIdentifier="GroupEditViewController" hidesBottomBarWhenPushed="YES" id="Y6W-OH-hqX" customClass="GroupEditViewController" customModule="NADA_iOS_forRelease" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="5EZ-qb-Rvc">
<rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
Expand Down Expand Up @@ -57,7 +56,7 @@
</connections>
</button>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<color key="backgroundColor" name="background"/>
<constraints>
<constraint firstItem="mXl-nw-qPB" firstAttribute="centerY" secondItem="eav-KN-kMH" secondAttribute="centerY" id="4S4-cU-g9Y"/>
<constraint firstAttribute="bottom" secondItem="tEu-WC-9Nx" secondAttribute="bottom" constant="11" id="6C5-Bp-ykI"/>
Expand All @@ -73,11 +72,11 @@
</view>
<tableView 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="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="8fV-n9-E62">
<rect key="frame" x="0.0" y="104" width="375" height="674"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<color key="backgroundColor" name="background"/>
</tableView>
</subviews>
<viewLayoutGuide key="safeArea" id="vDu-zF-Fre"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<color key="backgroundColor" name="background"/>
<constraints>
<constraint firstItem="vDu-zF-Fre" firstAttribute="trailing" secondItem="eav-KN-kMH" secondAttribute="trailing" id="a6h-10-vxg"/>
<constraint firstItem="8fV-n9-E62" firstAttribute="leading" secondItem="vDu-zF-Fre" secondAttribute="leading" id="ifP-wA-ht6"/>
Expand All @@ -100,11 +99,11 @@
<resources>
<image name="iconAdd" width="30" height="30"/>
<image name="iconArrow" width="24" height="24"/>
<namedColor name="background">
<color red="1" green="1" blue="1" 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>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
</resources>
</document>
6 changes: 4 additions & 2 deletions NADA-iOS-forRelease/Resouces/Storyboards/More/More.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,11 @@
</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="625"/>
<rect key="frame" x="0.0" y="104" width="375" height="466"/>
<color key="backgroundColor" name="textBox"/>
<constraints>
<constraint firstAttribute="height" constant="466" id="F5a-T6-amW"/>
</constraints>
</tableView>
</subviews>
<viewLayoutGuide key="safeArea" id="vDu-zF-Fre"/>
Expand All @@ -52,7 +55,6 @@
<constraint firstAttribute="trailing" secondItem="wb8-4G-Pj8" secondAttribute="trailing" id="GkL-m8-eem"/>
<constraint firstItem="vDu-zF-Fre" firstAttribute="trailing" secondItem="WnB-Ge-3qg" secondAttribute="trailing" id="VnA-Ln-U3x"/>
<constraint firstItem="wb8-4G-Pj8" firstAttribute="top" secondItem="vDu-zF-Fre" secondAttribute="top" id="aaY-jG-Ypx"/>
<constraint firstItem="vDu-zF-Fre" firstAttribute="bottom" secondItem="WnB-Ge-3qg" secondAttribute="bottom" id="cgm-yU-GKk"/>
<constraint firstItem="WnB-Ge-3qg" firstAttribute="top" secondItem="wb8-4G-Pj8" secondAttribute="bottom" constant="10" id="fKt-Z9-LvS"/>
<constraint firstItem="wb8-4G-Pj8" firstAttribute="leading" secondItem="vDu-zF-Fre" secondAttribute="leading" id="qq9-dH-GCJ"/>
</constraints>
Expand Down
72 changes: 37 additions & 35 deletions NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ class BackCardCell: CardCell {

// MARK: - @IBOutlet Properties
@IBOutlet weak var backgroundImageView: UIImageView!
@IBOutlet weak var tasteTitleLabel: UILabel!
@IBOutlet weak var mintImageView: UIImageView!
@IBOutlet weak var noMintImageView: UIImageView!
@IBOutlet weak var sojuImageView: UIImageView!
Expand All @@ -20,6 +21,7 @@ class BackCardCell: CardCell {
@IBOutlet weak var putSauceEatImageView: UIImageView!
@IBOutlet weak var sauceChickenImageView: UIImageView!
@IBOutlet weak var friedChickenImageView: UIImageView!
@IBOutlet weak var tmiTitleLabel: UILabel!
@IBOutlet weak var firstTmiLabel: UILabel!
@IBOutlet weak var secondTmiLabel: UILabel!
@IBOutlet weak var thirdTmiLabel: UILabel!
Expand All @@ -32,56 +34,56 @@ class BackCardCell: CardCell {

// MARK: - Functions
static func nib() -> UINib {
return UINib(nibName: Const.Xib.backCardCell, bundle: nil)
return UINib(nibName: Const.Xib.backCardCell, bundle: Bundle(for: BackCardCell.self))
}
}

// MARK: - Extensions
extension BackCardCell {
private func setUI() {

tasteTitleLabel.font = .title02
tasteTitleLabel.textColor = .white
tmiTitleLabel.font = .title02
tmiTitleLabel.textColor = .white
firstTmiLabel.font = .textRegular04
firstTmiLabel.textColor = .white
secondTmiLabel.font = .textRegular04
secondTmiLabel.textColor = .white
thirdTmiLabel.font = .textRegular04
thirdTmiLabel.textColor = .white
}

func initCell(_ backgroundImage: String,
_ mintImage: String,
_ noMintImage: String,
_ sojuImage: String,
_ beerImage: String,
_ pourImage: String,
_ putSauceImage: String,
_ yangnyumImage: String,
_ friedImage: String,
_ isMintImage: Bool,
_ isNoMintImage: Bool,
_ isSojuImage: Bool,
_ isBeerImage: Bool,
_ isPourImage: Bool,
_ isPutSauceImage: Bool,
_ isYangnyumImage: Bool,
_ isFriedImage: Bool,
_ firstTmi: String,
_ secondTmi: String,
_ thirdTmi: String) {
if let bgImage = UIImage(named: backgroundImage) {
self.backgroundImageView.image = bgImage
}
if let mtImage = UIImage(named: mintImage) {
self.mintImageView.image = mtImage
}
if let noMtImage = UIImage(named: noMintImage) {
self.noMintImageView.image = noMtImage
}
if let sojuImage = UIImage(named: sojuImage) {
self.sojuImageView.image = sojuImage
}
if let beerImage = UIImage(named: beerImage) {
self.beerImageView.image = beerImage
}
if let bumukImage = UIImage(named: pourImage) {
self.pourEatImageView.image = bumukImage
}
if let jjikmukImage = UIImage(named: putSauceImage) {
self.putSauceEatImageView.image = jjikmukImage
}
if let yangnyumImage = UIImage(named: yangnyumImage) {
self.sauceChickenImageView.image = yangnyumImage
}
if let friedImage = UIImage(named: friedImage) {
self.friedChickenImageView.image = friedImage
}

self.mintImageView.image = isMintImage == true ?
UIImage(named: "iconTasteOnMincho") : UIImage(named: "iconTasteOffMincho")
self.noMintImageView.image = isNoMintImage == true ?
UIImage(named: "iconTasteOnBanmincho") : UIImage(named: "iconTasteOffBanmincho")
self.sojuImageView.image = isSojuImage == true ?
UIImage(named: "iconTasteOnSoju") : UIImage(named: "iconTasteOffSoju")
self.beerImageView.image = isBeerImage == true ?
UIImage(named: "iconTasteOnBeer") : UIImage(named: "iconTasteOffBeer")
self.pourEatImageView.image = isPourImage == true ?
UIImage(named: "iconTasteOnBumeok") : UIImage(named: "iconTasteOffBumeok")
self.putSauceEatImageView.image = isPutSauceImage == true ?
UIImage(named: "iconTasteOnZzik") : UIImage(named: "iconTasteOffZzik")
self.sauceChickenImageView.image = isYangnyumImage == true ?
UIImage(named: "iconTasteOnSeasoned") : UIImage(named: "iconTasteOffSeasoned")
self.friedChickenImageView.image = isFriedImage == true ?
UIImage(named: "iconTasteOnFried") : UIImage(named: "iconTasteOffFried")
self.firstTmiLabel.text = firstTmi
self.secondTmiLabel.text = secondTmi
self.thirdTmiLabel.text = thirdTmi
Expand Down
34 changes: 14 additions & 20 deletions NADA-iOS-forRelease/Sources/Cells/CardCell/BackCardCell.xib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,6 @@
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<customFonts key="customFonts">
<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>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
Expand All @@ -39,15 +31,15 @@
<state key="normal" image="iconShare"/>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="😎 나의 취향" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dHb-jJ-jng">
<rect key="frame" x="24" y="50" width="96.5" height="22"/>
<fontDescription key="fontDescription" name="SpoqaHanSansNeo-Bold" family="Spoqa Han Sans Neo" pointSize="18"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<rect key="frame" x="24" y="50" width="95.5" height="22"/>
<fontDescription key="fontDescription" type="system" pointSize="18"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="🤓 나의 TMI" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XT5-iW-6kG">
<rect key="frame" x="24" y="377" width="96" height="22"/>
<fontDescription key="fontDescription" name="SpoqaHanSansNeo-Bold" family="Spoqa Han Sans Neo" pointSize="18"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<rect key="frame" x="24" y="377" width="95" height="22"/>
<fontDescription key="fontDescription" type="system" pointSize="18"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="qum-Iq-vKj">
Expand Down Expand Up @@ -108,20 +100,20 @@
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ch6-5U-VOL">
<rect key="frame" x="24" y="415" width="279" height="17"/>
<fontDescription key="fontDescription" name="SpoqaHanSansNeo-Regular" family="Spoqa Han Sans Neo" pointSize="14"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IFb-AS-8IM">
<rect key="frame" x="24" y="444" width="279" height="17"/>
<fontDescription key="fontDescription" name="SpoqaHanSansNeo-Regular" family="Spoqa Han Sans Neo" pointSize="14"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9yf-Qs-VBg">
<rect key="frame" x="24" y="473" width="279" height="17"/>
<fontDescription key="fontDescription" name="SpoqaHanSansNeo-Regular" family="Spoqa Han Sans Neo" pointSize="14"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
</subviews>
Expand Down Expand Up @@ -197,7 +189,9 @@
<outlet property="sauceChickenImageView" destination="Nx7-Vx-MTP" id="EBI-QU-BQH"/>
<outlet property="secondTmiLabel" destination="IFb-AS-8IM" id="huF-sy-GN1"/>
<outlet property="sojuImageView" destination="yJZ-UI-FTC" id="a17-57-8Jd"/>
<outlet property="tasteTitleLabel" destination="dHb-jJ-jng" id="s2A-b9-Osl"/>
<outlet property="thirdTmiLabel" destination="9yf-Qs-VBg" id="e4s-7p-WmB"/>
<outlet property="tmiTitleLabel" destination="XT5-iW-6kG" id="75E-sq-FUS"/>
</connections>
<point key="canvasLocation" x="131.15942028985509" y="79.6875"/>
</collectionViewCell>
Expand Down
4 changes: 2 additions & 2 deletions NADA-iOS-forRelease/Sources/Cells/CardCell/FrontCardCell.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ extension FrontCardCell {
birthLabel.textColor = .white
mbtiLabel.font = .textRegular02
mbtiLabel.textColor = .white
instagramIDLabel.font = .textRegular02
instagramIDLabel.font = .textRegular03
instagramIDLabel.textColor = .white
linkURLLabel.font = .textRegular02
linkURLLabel.font = .textRegular04
linkURLLabel.textColor = .white
}

Expand Down
2 changes: 1 addition & 1 deletion NADA-iOS-forRelease/Sources/Cells/CardCell/FrontCardCell.xib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<rect key="frame" x="0.0" y="0.0" width="327" height="540"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
<real key="value" value="10"/>
<real key="value" value="20"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</imageView>
Expand Down
Loading

0 comments on commit 0cd29be

Please sign in to comment.