-
Notifications
You must be signed in to change notification settings - Fork 5
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: 명함 공유 뷰 수정 (#349) #350
Merged
Merged
Changes from all commits
Commits
Show all changes
27 commits
Select commit
Hold shift + click to select a range
2885740
Merge branch 'feature/#347' of https://github.com/TeamNADA/NADA-iOS-F…
hyun99999 3ba5ff1
add: 명함 공유 바텀시트를 위한 이미지 에셋 추가 (#349)
hyun99999 ad541d8
chore: pod update (#349)
hyun99999 6e103d4
fix: 바텀시트 높이 변경 (#349)
hyun99999 a5beac6
feat: UIView Extension 추가 (#349)
hyun99999 33a315e
feat: addSubviews(_:) 함수 적용 (#349)
hyun99999 cc27170
refactor: 접근 제어자 수정 (#349)
hyun99999 d3cfebe
add: UI Components 추가 (#349)
hyun99999 7280ee9
feat: 명함 활성화 유무에 따른 UI 구현 (#349)
hyun99999 6ea26dc
delete: FIXME 주석 삭제 (#349)
hyun99999 c2c79a8
fix: 명함 공유 바텀시트의 수정으로 QR Code 의 배경 변경 (#349)
hyun99999 d841a23
fix: QR Code 크기 변경 (#349)
hyun99999 861ec6d
design: UI layout 수정 (#349)
hyun99999 e5785b6
feat: nearBySwitch 의 액션 메서드 구현 (#349)
hyun99999 64c48a4
refactor: 삼항연산자 사용한 nearBySwitch 액션메서드 리펙토링 (#349)
hyun99999 0ae2411
chore: import Lottie (#349)
hyun99999 14e5657
feat: 명함 공유 바텀시트가 가지는 변수 설정 (#349)
hyun99999 74073da
add: lottieImage 추가 (#349)
hyun99999 8c0040c
design: lottieImage 레이아웃 설정 (#349)
hyun99999 32632a8
feat: isActivate 변수에 따른 UI 설정 (#349)
hyun99999 857bb48
feat: nearBySwitch 액션 메서드에 lottieImage 설정 추가 (#349)
hyun99999 e67e4c7
refactor: SwiftLint (self_in_property_initialization) 워닝 제거 (#349)
hyun99999 4127d92
refactor: 명함의 활성화 유무를 가지고 UI 를 설정해주는 함수로 리펙토링 (#349)
hyun99999 99c3f33
Merge branch 'develop' of https://github.com/TeamNADA/NADA-iOS-ForRel…
hyun99999 6dafb5f
chore: Podfile 특정 버전 다운로드하는 옵션 삭제 (#349)
hyun99999 fa04290
chore: GoogleService-info.plist 파일이 빠져있어 다시 추가 (#349)
hyun99999 82d5ef4
Merge branch 'develop' of https://github.com/TeamNADA/NADA-iOS-ForRel…
hyun99999 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
23 changes: 23 additions & 0 deletions
23
NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnNearbyOff.imageset/Contents.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"idiom" : "universal", | ||
"scale" : "1x", | ||
"filename" : "icnNearbyOff.png" | ||
}, | ||
{ | ||
"idiom" : "universal", | ||
"filename" : "icnNearbyOff@2x.png", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
"filename" : "icnNearbyOff@3x.png", | ||
"scale" : "3x", | ||
"idiom" : "universal" | ||
} | ||
], | ||
"info" : { | ||
"version" : 1, | ||
"author" : "xcode" | ||
} | ||
} |
Binary file added
BIN
+368 Bytes
...rRelease/Resouces/Assets/Assets.xcassets/icnNearbyOff.imageset/icnNearbyOff.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+504 Bytes
...lease/Resouces/Assets/Assets.xcassets/icnNearbyOff.imageset/icnNearbyOff@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+669 Bytes
...lease/Resouces/Assets/Assets.xcassets/icnNearbyOff.imageset/icnNearbyOff@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions
23
NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/icnNearbyOn.imageset/Contents.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"idiom" : "universal", | ||
"filename" : "icnNearbyOn.png", | ||
"scale" : "1x" | ||
}, | ||
{ | ||
"idiom" : "universal", | ||
"filename" : "icnNearbyOn@2x.png", | ||
"scale" : "2x" | ||
}, | ||
{ | ||
"idiom" : "universal", | ||
"filename" : "icnNearbyOn@3x.png", | ||
"scale" : "3x" | ||
} | ||
], | ||
"info" : { | ||
"version" : 1, | ||
"author" : "xcode" | ||
} | ||
} |
Binary file added
BIN
+361 Bytes
...forRelease/Resouces/Assets/Assets.xcassets/icnNearbyOn.imageset/icnNearbyOn.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+548 Bytes
...Release/Resouces/Assets/Assets.xcassets/icnNearbyOn.imageset/icnNearbyOn@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+715 Bytes
...Release/Resouces/Assets/Assets.xcassets/icnNearbyOn.imageset/icnNearbyOn@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions
23
NADA-iOS-forRelease/Resouces/Assets/Assets.xcassets/nadaLogoTxt.imageset/Contents.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"idiom" : "universal", | ||
"filename" : "nadaLogoTxt.png", | ||
"scale" : "1x" | ||
}, | ||
{ | ||
"filename" : "nadaLogoTxt@2x.png", | ||
"scale" : "2x", | ||
"idiom" : "universal" | ||
}, | ||
{ | ||
"filename" : "nadaLogoTxt@3x.png", | ||
"scale" : "3x", | ||
"idiom" : "universal" | ||
} | ||
], | ||
"info" : { | ||
"version" : 1, | ||
"author" : "xcode" | ||
} | ||
} |
Binary file added
BIN
+624 Bytes
...forRelease/Resouces/Assets/Assets.xcassets/nadaLogoTxt.imageset/nadaLogoTxt.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.07 KB
...Release/Resouces/Assets/Assets.xcassets/nadaLogoTxt.imageset/nadaLogoTxt@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.59 KB
...Release/Resouces/Assets/Assets.xcassets/nadaLogoTxt.imageset/nadaLogoTxt@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
와우 이거 스냅킷 안쓰시고 하셨군요...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
놀랍게도 이 프로젝트는 스냅킷이 인스톨되어있지 않아요 ㅋㅋㅋㅋㅋ 우리가 그때 없이 해보자고 한거 같아여
불편하면 추가해도 좋아요!