Skip to content

Commit

Permalink
Merge pull request #132 from hyun99999/feature/#128
Browse files Browse the repository at this point in the history
[FEAT] #128 - mbti, 생년월일 바텀시트 dismiss 수정 및 명함 배경 추가
  • Loading branch information
hyun99999 authored Dec 10, 2021
2 parents 424a7f1 + 6290951 commit 79af30e
Show file tree
Hide file tree
Showing 65 changed files with 381 additions and 35 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "imageDefaultBg01.png"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "imageDefaultBg01@2x.png"
},
{
"filename" : "imageDefaultBg01@3x.png",
"scale" : "3x",
"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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"scale" : "1x",
"filename" : "imageDefaultBg02.png",
"idiom" : "universal"
},
{
"scale" : "2x",
"idiom" : "universal",
"filename" : "imageDefaultBg02@2x.png"
},
{
"idiom" : "universal",
"scale" : "3x",
"filename" : "imageDefaultBg02@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" : "imageDefaultBg03.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "imageDefaultBg03@2x.png",
"scale" : "2x"
},
{
"filename" : "imageDefaultBg03@3x.png",
"scale" : "3x",
"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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"scale" : "1x",
"idiom" : "universal",
"filename" : "imageDefaultBg04.png"
},
{
"filename" : "imageDefaultBg04@2x.png",
"scale" : "2x",
"idiom" : "universal"
},
{
"filename" : "imageDefaultBg04@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" : "imageDefaultBg05.png",
"scale" : "1x"
},
{
"filename" : "imageDefaultBg05@2x.png",
"scale" : "2x",
"idiom" : "universal"
},
{
"idiom" : "universal",
"filename" : "imageDefaultBg05@3x.png",
"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" : [
{
"filename" : "imageDefaultBg06.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"scale" : "2x",
"filename" : "imageDefaultBg06@2x.png",
"idiom" : "universal"
},
{
"scale" : "3x",
"filename" : "imageDefaultBg06@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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "imageDefaultBg07.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "imageDefaultBg07@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "imageDefaultBg07@3x.png",
"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" : "imgCardBg01.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "imgCardBg01@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "imgCardBg01@3x.png",
"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" : "imgCardBg02.png",
"scale" : "1x"
},
{
"filename" : "imgCardBg02@2x.png",
"scale" : "2x",
"idiom" : "universal"
},
{
"scale" : "3x",
"idiom" : "universal",
"filename" : "imgCardBg02@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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "imgCardBg03.png",
"scale" : "1x",
"idiom" : "universal"
},
{
"scale" : "2x",
"idiom" : "universal",
"filename" : "imgCardBg03@2x.png"
},
{
"scale" : "3x",
"idiom" : "universal",
"filename" : "imgCardBg03@3x.png"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "imgCardBg04.png"
},
{
"scale" : "2x",
"idiom" : "universal",
"filename" : "imgCardBg04@2x.png"
},
{
"idiom" : "universal",
"filename" : "imgCardBg04@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "imgCardBg05.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "imgCardBg05@2x.png",
"scale" : "2x"
},
{
"scale" : "3x",
"idiom" : "universal",
"filename" : "imgCardBg05@3x.png"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "imgCardBg06.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "imgCardBg06@2x.png"
},
{
"scale" : "3x",
"filename" : "imgCardBg06@3x.png",
"idiom" : "universal"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"scale" : "1x",
"idiom" : "universal",
"filename" : "imgCardBg07.png"
},
{
"filename" : "imgCardBg07@2x.png",
"scale" : "2x",
"idiom" : "universal"
},
{
"scale" : "3x",
"idiom" : "universal",
"filename" : "imgCardBg07@3x.png"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</imageView>
<view alpha="0.40000000000000002" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Q9H-oG-tzn">
<view alpha="0.20000000000000001" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Q9H-oG-tzn">
<rect key="frame" x="0.0" y="0.0" width="327" height="540"/>
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<userDefinedRuntimeAttributes>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</imageView>
<view alpha="0.40000000000000002" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="S8I-Fv-fkf">
<view alpha="0.20000000000000001" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="S8I-Fv-fkf">
<rect key="frame" x="0.0" y="0.0" width="327" height="540"/>
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<userDefinedRuntimeAttributes>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,13 @@ class BackgroundCollectionViewCell: UICollectionViewCell {

extension BackgroundCollectionViewCell {
private func setUI() {
bgView.backgroundColor = .tertiary
bgView.backgroundColor = .mainColorNadaMain
bgView.isHidden = true
bgView.layer.cornerRadius = bgViewCornerRadius

opacityView.layer.cornerRadius = imageviewCornerRadius
imageView.layer.cornerRadius = imageviewCornerRadius
imageView.contentMode = .scaleAspectFill
}
func initCell(image: UIImage, isFirst: Bool) {
imageView.image = image
Expand Down
Loading

0 comments on commit 79af30e

Please sign in to comment.