Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Refactor [#242] 추천친구 리팩토링 #268

Open
wants to merge 16 commits into
base: develop
Choose a base branch
from
Open

Refactor [#242] 추천친구 리팩토링 #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
826feca
Chore [#242] 추천 탭 폴더링 변경
chaentopia Sep 4, 2023
4ff0af7
Chore [#242] 마크 주석 추가
chaentopia Sep 4, 2023
bf409ab
Refactor [#242] 추천 친구 스켈레톤 뷰 고차함수 리팩
chaentopia Sep 9, 2023
34153b0
Merge branch 'fix/#246-searchFix' into refactor/#242-recommendRefactor
chaentopia Sep 12, 2023
d245f6e
Refactor [#242] 추천친구 BaseVC 변경
chaentopia Sep 20, 2023
c17d0cb
Chore [#242] 클래스 설명 추가
chaentopia Sep 20, 2023
d94f635
Refactor [#242] StringLiterals 사용 수정
chaentopia Sep 20, 2023
9fb168a
Refactor [#242] StringLiterals 사용 수정 추가
chaentopia Sep 20, 2023
40f950f
Refactor [#242] skeletonTableViewCell 고차함수로 변경
chaentopia Sep 20, 2023
f5673bb
Chore [#242] 파일에 대한 설명 추가
chaentopia Sep 20, 2023
dd1c44b
Chore [#242] 로티 폴더링 변경
chaentopia Sep 21, 2023
015dd66
Refactor [#242] BaseView / BaseVC 변경
chaentopia Sep 21, 2023
9c09ade
Fix [#242] 추천친구 친구 추가 버튼 색상 수정
chaentopia Oct 1, 2023
058f30a
Refactor [#242] BaseView로 변경
chaentopia Oct 1, 2023
3234601
Refactor [#242] 친구초대뷰 불필요한 코드 삭제
chaentopia Oct 1, 2023
ce3c7d4
Merge branch 'develop' into refactor/#242-recommendRefactor
chaentopia Nov 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 29 additions & 5 deletions YELLO-iOS/YELLO-iOS.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1040,10 +1040,7 @@
2AA0DBAB2A546D87002B1370 /* Recommending */ = {
isa = PBXGroup;
children = (
C3C57BEE2A5C066B00B84CAA /* ViewController */,
C3C57BED2A5C066200B84CAA /* View */,
C3C57BF12A5C087600B84CAA /* Cells */,
C3C57BF42A5C093D00B84CAA /* FriendModel.swift */,
C312C00B2AA5F80A00C73D0F /* Main */,
C31315A92A7A5F8100FB8B43 /* Search */,
);
path = Recommending;
Expand Down Expand Up @@ -1317,6 +1314,25 @@
path = Button;
sourceTree = "<group>";
};
C312C00A2AA5F7F500C73D0F /* Model */ = {
isa = PBXGroup;
children = (
C3C57BF42A5C093D00B84CAA /* FriendModel.swift */,
);
path = Model;
sourceTree = "<group>";
};
C312C00B2AA5F80A00C73D0F /* Main */ = {
isa = PBXGroup;
children = (
C3C57BEE2A5C066B00B84CAA /* ViewController */,
C3C57BED2A5C066200B84CAA /* View */,
C3C57BF12A5C087600B84CAA /* Cells */,
C312C00A2AA5F7F500C73D0F /* Model */,
);
path = Main;
sourceTree = "<group>";
};
C31315A22A78E4B800FB8B43 /* Cell */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -1347,7 +1363,7 @@
C31315AB2A7A5F8F00FB8B43 /* View */ = {
isa = PBXGroup;
children = (
C390B8082A88D63000EA5A23 /* spinner_loading.json */,
C3C227E02ABB87740036BF2B /* Lottie */,
C31315A72A7A5F7E00FB8B43 /* FriendSearchView.swift */,
);
path = View;
Expand Down Expand Up @@ -1689,6 +1705,14 @@
path = Response;
sourceTree = "<group>";
};
C3C227E02ABB87740036BF2B /* Lottie */ = {
isa = PBXGroup;
children = (
C390B8082A88D63000EA5A23 /* spinner_loading.json */,
);
path = Lottie;
sourceTree = "<group>";
};
C3C560B92A8A6E410074E988 /* Search */ = {
isa = PBXGroup;
children = (
Expand Down
4 changes: 4 additions & 0 deletions YELLO-iOS/YELLO-iOS/Global/Literals/String.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,10 @@ enum StringLiterals {
static let firstText = "친구가 내 추천인 코드로 가입하면"
static let secondText = "40분 대기 초기화 + 100포인트 지급!"
static let toastMessage = "링크가 복사되었습니다."
static let close = "닫기"
static let myRecommendCode = "내 추천인 코드"
static let copyStringHeader = "추천인코드: "
static let copyStringFooter = "\n\n우리 같이 YELL:O 해요!\nAndroid: https://play.google.com/store/apps/details?id=com.el.yello&hl=ko&gl=KR\niOS: https://apps.apple.com/app/id6451451050"
}

enum Recommending {
Expand Down
9 changes: 5 additions & 4 deletions YELLO-iOS/YELLO-iOS/Presentation/Around/Cell/AroundSkeletonTableViewCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,10 @@ final class AroundSkeletonTableViewCell: UITableViewCell {

extension AroundSkeletonTableViewCell {
func showShimmer() {
self.genderImageView.animateShimmer()
self.genderLabel.animateShimmer()
self.nameLabel.animateShimmer()
self.keywordLabel.animateShimmer()
let shimmerArray = [genderImageView, genderLabel, receiverLabel, nameLabel, keywordLabel]

shimmerArray.forEach {
$0.animateShimmer()
}
}
}
16 changes: 7 additions & 9 deletions YELLO-iOS/YELLO-iOS/Presentation/Inviting/InvitingView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ final class InvitingView: BaseView {
contentsView.backgroundColor = .white

closeButton.do {
$0.setTitle("닫기", for: .normal)
$0.setTitle(StringLiterals.Inviting.close, for: .normal)
$0.setImage(ImageLiterals.InvitingPopUp.icClose, for: .normal)
$0.setTitleColor(.grayscales600, for: .normal)
$0.imageView?.contentMode = .scaleAspectFit
Expand Down Expand Up @@ -75,7 +75,7 @@ final class InvitingView: BaseView {
}

recommender.do {
$0.text = "내 추천인 코드"
$0.text = StringLiterals.Inviting.myRecommendCode
$0.textColor = .purpleSub500
$0.font = .uiBody04
}
Expand Down Expand Up @@ -169,14 +169,13 @@ final class InvitingView: BaseView {

extension InvitingView {

@objc
func closeButtonClicked() {
// MARK: Objc function
@objc func closeButtonClicked() {
self.isHidden = true
self.removeFromSuperview()
}

@objc
func kakaoButtonClicked() {
@objc func kakaoButtonClicked() {
let templateId = Config.kakaoTempleteId

guard let filteredString = self.recommenderID.text else { return }
Expand Down Expand Up @@ -206,11 +205,10 @@ extension InvitingView {
}
}

@objc
func copyButtonClicked() {
@objc func copyButtonClicked() {
guard let recommender = self.recommenderID.text else { return }
let filteredID = String(recommender.dropFirst())
let recommenderID = "추천인코드: " + filteredID + "\n\n우리 같이 YELL:O 해요!\nAndroid: https://play.google.com/store/apps/details?id=com.el.yello&hl=ko&gl=KR\niOS: https://apps.apple.com/app/id6451451050"
let recommenderID = StringLiterals.Inviting.copyStringHeader + filteredID + StringLiterals.Inviting.copyStringFooter
UIPasteboard.general.string = recommenderID
print(UIPasteboard.general.string ?? "")
updateEvent()
Expand Down
8 changes: 5 additions & 3 deletions YELLO-iOS/YELLO-iOS/Presentation/MyYello/Cells/MyYelloSkeletonTableViewCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,10 @@ final class MyYelloSkeletonTableViewCell: UITableViewCell {

extension MyYelloSkeletonTableViewCell {
func showShimmer() {
self.genderImageView.animateShimmer()
self.titleLabel.animateShimmer()
self.timeLabel.animateShimmer()
let shimmerArray = [genderImageView, titleLabel, timeLabel]

shimmerArray.forEach {
$0.animateShimmer()
}
}
}
8 changes: 5 additions & 3 deletions YELLO-iOS/YELLO-iOS/Presentation/Profile/Main/Cell/MyFriendSkeletonTableViewCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,10 @@ extension MyFriendSkeletonTableViewCell {
}

func showShimmer() {
self.profileImageView.animateShimmer()
self.nameLabel.animateShimmer()
self.schoolLabel.animateShimmer()
let shimmerArray = [profileImageView, nameLabel, schoolLabel]

shimmerArray.forEach {
$0.animateShimmer()
}
}
}
2 changes: 2 additions & 0 deletions ...ding/Cells/FriendEmptyTableViewCell.swift → ...Main/Cells/FriendEmptyTableViewCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import Then

final class FriendEmptyTableViewCell: UITableViewCell {

/// 해당 파일은 현재 사용하지 않습니다.

// MARK: - Variables
// MARK: Constants
static let identifier = "FriendEmptyTableViewCell"
Expand Down
13 changes: 7 additions & 6 deletions ...g/Cells/FriendSkeletonTableViewCell.swift → ...n/Cells/FriendSkeletonTableViewCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,13 @@ extension FriendSkeletonTableViewCell {
$0.top.equalTo(schoolLabel.snp.bottom).offset(19.adjustedHeight)
}
}
}

extension FriendSkeletonTableViewCell {

// MARK: Custom Function
func showShimmer() {
self.profileImageView.animateShimmer()
self.nameLabel.animateShimmer()
self.schoolLabel.animateShimmer()
let shimmerArray = [profileImageView, nameLabel, schoolLabel]

shimmerArray.forEach {
$0.animateShimmer()
}
}
}
3 changes: 2 additions & 1 deletion ...ommending/Cells/FriendTableViewCell.swift → ...ding/Main/Cells/FriendTableViewCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ final class FriendTableViewCell: UITableViewCell {
let schoolLabel = UILabel()
lazy var addButton = UIButton()
let separatorLine = UIView()

var isTapped: Bool = false

weak var handleAddFriendButton: HandleAddFriendButton?
Expand Down Expand Up @@ -94,7 +95,7 @@ extension FriendTableViewCell {

addButton.do {
$0.setImage(ImageLiterals.Recommending.icAddFriendButton, for: .normal)
$0.tintColor = .yellow
$0.tintColor = .yelloMain500
$0.addTarget(self, action: #selector(addButtonTapped), for: .touchUpInside)
$0.isHidden = false
}
Expand Down
0 ...esentation/Recommending/FriendModel.swift → ...Recommending/Main/Model/FriendModel.swift
View file
Open in desktop
File renamed without changes.
28 changes: 3 additions & 25 deletions ...n/Recommending/View/EmptyFriendView.swift → ...ommending/Main/View/EmptyFriendView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import Amplitude
import SnapKit
import Then

final class EmptyFriendView: UIView {
final class EmptyFriendView: BaseView {

// MARK: - Variables
// MARK: Component
Expand All @@ -24,29 +24,8 @@ final class EmptyFriendView: UIView {
private var invitingView = InvitingView()

// MARK: - Function
// MARK: LifeCycle
override init(frame: CGRect) {
super.init(frame: frame)
setUI()
}

@available(*, unavailable)
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
}

// MARK: - extension
extension EmptyFriendView {

// MARK: Layout Helpers
private func setUI() {
invitingView = InvitingView()
setStyle()
setLayout()
}

private func setStyle() {
override func setStyle() {
self.backgroundColor = .black
emptyImageView.do {
$0.image = ImageLiterals.Recommending.imgBannerInvite
Expand All @@ -70,7 +49,7 @@ extension EmptyFriendView {
}
}

private func setLayout() {
override func setLayout() {
self.addSubview(containView)
containView.addSubviews(emptyImageView,
emptyDescriptionLabel,
Expand Down Expand Up @@ -135,6 +114,5 @@ extension EmptyFriendView {
}

Amplitude.instance().logEvent("click_invite", withEventProperties: ["invite_view": keyValue])

}
}
9 changes: 4 additions & 5 deletions .../Recommending/View/InviteBannerView.swift → ...mmending/Main/View/InviteBannerView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ final class InviteBannerView: BaseView {
// MARK: - Function
// MARK: Layout Helpers
override func setStyle() {
invitingView = InvitingView()

inviteImageView.do {
$0.image = ImageLiterals.Recommending.imgBannerInvite
Expand Down Expand Up @@ -88,17 +87,17 @@ final class InviteBannerView: BaseView {
invitingView.removeFromSuperview()

invitingView = InvitingView()
invitingView.profileUserYelloId()
invitingView.frame = viewController.view.bounds
invitingView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
self.invitingView.profileUserYelloId()
self.invitingView.frame = viewController.view.bounds
self.invitingView.autoresizingMask = [.flexibleWidth, .flexibleHeight]

if rootViewName == "kakao" {
Amplitude.instance().logEvent("click_invite", withEventProperties: ["invite_view": "recommend_kakao_yesfriend"])
} else if rootViewName == "school" {
Amplitude.instance().logEvent("click_invite", withEventProperties: ["invite_view": "recommend_school_yesfriend"])
}

invitingView.rootViewController = rootViewName
viewController.view.addSubview(invitingView)

}
}
25 changes: 9 additions & 16 deletions ...n/Recommending/View/KakaoFriendView.swift → ...ommending/Main/View/KakaoFriendView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import SnapKit
import Then
import KakaoSDKTalk

final class KakaoFriendView: UIView {
final class KakaoFriendView: BaseView {

// MARK: - Variables
// MARK: Property
Expand All @@ -37,27 +37,16 @@ final class KakaoFriendView: UIView {
// MARK: LifeCycle
override init(frame: CGRect) {
super.init(frame: frame)
setUI()
setDelegate()
}

@available(*, unavailable)
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
}

// MARK: - extension
extension KakaoFriendView {

// MARK: Layout Helpers
private func setUI() {
setStyle()
setLayout()
override func setUI() {
super.setUI()
updateView()
}

private func setStyle() {
override func setStyle() {
self.backgroundColor = .black

inviteBannerView.do {
Expand All @@ -82,7 +71,7 @@ extension KakaoFriendView {
}
}

private func setLayout() {
override func setLayout() {

self.addSubviews(
inviteBannerView,
Expand All @@ -106,6 +95,10 @@ extension KakaoFriendView {
$0.center.equalToSuperview()
}
}
}

// MARK: - extension
extension KakaoFriendView {

private func setDelegate() {
kakaoFriendTableView.dataSource = self
Expand Down
4 changes: 4 additions & 0 deletions ...tation/Recommending/View/NextButton.swift → ...n/Recommending/Main/View/NextButton.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,15 @@ import UIKit
class NextButton: UIButton {

// MARK: - Functions
// MARK: Layout Helpers

/// 배너 버튼 터치 영역 넓히기
override func point(inside point: CGPoint, with event: UIEvent?) -> Bool {
let expandedBounds = bounds.insetBy(dx: -295.adjustedWidth, dy: -98.adjustedHeight)
return expandedBounds.contains(point)
}

// MARK: LifeCycle
override init(frame: CGRect) {
super.init(frame: frame)
}
Expand Down
1 change: 0 additions & 1 deletion .../View/RecommendingNavigationBarView.swift → .../View/RecommendingNavigationBarView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,5 @@ final class RecommendingNavigationBarView: BaseView {
$0.centerY.equalToSuperview()
$0.trailing.equalToSuperview().inset(16.adjustedWidth)
}

}
}
3 changes: 2 additions & 1 deletion ...g/View/RecommendingSegmentedControl.swift → ...n/View/RecommendingSegmentedControl.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ final class RecommendingSegmentedControl: UISegmentedControl {
}()

// MARK: - Function
// MARK: init
// MARK: LifeCycle
override init(frame: CGRect) {
super.init(frame: frame)
removeBackgroundAndDivider()
Expand All @@ -60,6 +60,7 @@ final class RecommendingSegmentedControl: UISegmentedControl {
// MARK: - extension
extension RecommendingSegmentedControl {

// MARK: Layout Helpers
private func setUI() {
setStyle()
setLayout()
Expand Down
Loading