Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/Team-Wable/WABLE-iOS int…
Browse files Browse the repository at this point in the history 
…o fix/#80

# Conflicts:
#	Wable-iOS/Presentation/TabBar/WableTabBarItem.swift
  • Loading branch information
@JinUng41
JinUng41 committed Jan 18, 2025
2 parents e38b3ef + 1fa6fc7 commit 4a9ad06
Show file tree
Hide file tree
Showing 33 changed files with 1,727 additions and 41 deletions.
28 changes: 28 additions & 0 deletions Wable-iOS.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@
0573B8C42CEC63EC00B5A434 /* FlattenReplyModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0573B8C32CEC63EC00B5A434 /* FlattenReplyModel.swift */; };
0586D89B2D09A68200436080 /* Pretendard-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 0586D8992D09A68200436080 /* Pretendard-Regular.otf */; };
0586D89C2D09A68200436080 /* Pretendard-SemiBold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 0586D89A2D09A68200436080 /* Pretendard-SemiBold.otf */; };
0589AECF2D38311A004F531E /* PopupType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0589AECE2D383119004F531E /* PopupType.swift */; };
0593F6D62C96D6C100FFAD82 /* WablePhotoDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0593F6D52C96D6C100FFAD82 /* WablePhotoDetailView.swift */; };
0593F6DB2C96E75600FFAD82 /* FirebaseAnalytics in Frameworks */ = {isa = PBXBuildFile; productRef = 0593F6DA2C96E75600FFAD82 /* FirebaseAnalytics */; };
0593F6DD2C96E75600FFAD82 /* FirebaseMessaging in Frameworks */ = {isa = PBXBuildFile; productRef = 0593F6DC2C96E75600FFAD82 /* FirebaseMessaging */; };
Expand All @@ -102,6 +103,12 @@
05B4F47D2CF8BE360033FF67 /* Array+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 05B4F47C2CF8BE360033FF67 /* Array+.swift */; };
05B4F47F2CF8C2450033FF67 /* BanRequestDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 05B4F47E2CF8C2450033FF67 /* BanRequestDTO.swift */; };
05F1FF422D11C95F00982033 /* BanTargetInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 05F1FF412D11C95F00982033 /* BanTargetInfo.swift */; };
05F1FF442D17EA1D00982033 /* MigratedHomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 05F1FF432D17EA1D00982033 /* MigratedHomeViewController.swift */; };
05F1FF462D1AAAE300982033 /* MigratedHomeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 05F1FF452D1AAAE300982033 /* MigratedHomeViewModel.swift */; };
05F1FF482D1AB39000982033 /* MigratedHomeFeedCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 05F1FF472D1AB39000982033 /* MigratedHomeFeedCell.swift */; };
05F1FF4A2D1AB42A00982033 /* MigratedHomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 05F1FF492D1AB42A00982033 /* MigratedHomeView.swift */; };
05F1FF4C2D32685A00982033 /* PopupViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 05F1FF4B2D32685A00982033 /* PopupViewModel.swift */; };
05F1FF502D33DF9600982033 /* HomePopupViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 05F1FF4F2D33DF9600982033 /* HomePopupViewController.swift */; };
05FBEED22C886A0200E4BF17 /* HomeFeedContentDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 05FBEED12C886A0200E4BF17 /* HomeFeedContentDTO.swift */; };
3C3531822C6F15D30015A8FA /* KeychainWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C3531812C6F15D30015A8FA /* KeychainWrapper.swift */; };
3C3531842C6F16D00015A8FA /* Config.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C3531832C6F16D00015A8FA /* Config.swift */; };
Expand Down Expand Up @@ -314,6 +321,7 @@
0573B8C32CEC63EC00B5A434 /* FlattenReplyModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlattenReplyModel.swift; sourceTree = "<group>"; };
0586D8992D09A68200436080 /* Pretendard-Regular.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Regular.otf"; sourceTree = "<group>"; };
0586D89A2D09A68200436080 /* Pretendard-SemiBold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-SemiBold.otf"; sourceTree = "<group>"; };
0589AECE2D383119004F531E /* PopupType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PopupType.swift; sourceTree = "<group>"; };
0593F6D52C96D6C100FFAD82 /* WablePhotoDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WablePhotoDetailView.swift; sourceTree = "<group>"; };
0593F6E32C9AFC1B00FFAD82 /* WablePushAlarmHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WablePushAlarmHelper.swift; sourceTree = "<group>"; };
05AD1EB42CE4C1D900F36D6B /* Dev.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Dev.xcconfig; sourceTree = "<group>"; };
Expand All @@ -322,6 +330,12 @@
05B4F47C2CF8BE360033FF67 /* Array+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Array+.swift"; sourceTree = "<group>"; };
05B4F47E2CF8C2450033FF67 /* BanRequestDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BanRequestDTO.swift; sourceTree = "<group>"; };
05F1FF412D11C95F00982033 /* BanTargetInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BanTargetInfo.swift; sourceTree = "<group>"; };
05F1FF432D17EA1D00982033 /* MigratedHomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MigratedHomeViewController.swift; sourceTree = "<group>"; };
05F1FF452D1AAAE300982033 /* MigratedHomeViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MigratedHomeViewModel.swift; sourceTree = "<group>"; };
05F1FF472D1AB39000982033 /* MigratedHomeFeedCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MigratedHomeFeedCell.swift; sourceTree = "<group>"; };
05F1FF492D1AB42A00982033 /* MigratedHomeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MigratedHomeView.swift; sourceTree = "<group>"; };
05F1FF4B2D32685A00982033 /* PopupViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PopupViewModel.swift; sourceTree = "<group>"; };
05F1FF4F2D33DF9600982033 /* HomePopupViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomePopupViewController.swift; sourceTree = "<group>"; };
05FBEED12C886A0200E4BF17 /* HomeFeedContentDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeFeedContentDTO.swift; sourceTree = "<group>"; };
3C3531812C6F15D30015A8FA /* KeychainWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeychainWrapper.swift; sourceTree = "<group>"; };
3C3531832C6F16D00015A8FA /* Config.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Config.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -501,6 +515,7 @@
050E0CB42C74B85800326EEA /* HomeView.swift */,
050E0CB62C74B87400326EEA /* FeedDetailView.swift */,
3C8B4E522C83FB7C00174943 /* HomeBottomSheetView.swift */,
05F1FF492D1AB42A00982033 /* MigratedHomeView.swift */,
);
path = Views;
sourceTree = "<group>";
Expand All @@ -511,6 +526,8 @@
050E0CC82C74B92A00326EEA /* HomeViewModel.swift */,
3C8B4E472C80E1C900174943 /* FeedDetailViewModel.swift */,
3C8B4E4E2C83F01500174943 /* LikeViewModel.swift */,
05F1FF452D1AAAE300982033 /* MigratedHomeViewModel.swift */,
05F1FF4B2D32685A00982033 /* PopupViewModel.swift */,
);
path = ViewModels;
sourceTree = "<group>";
Expand All @@ -519,6 +536,7 @@
isa = PBXGroup;
children = (
050E0CCC2C74B95B00326EEA /* Team.swift */,
0589AECE2D383119004F531E /* PopupType.swift */,
);
path = Supports;
sourceTree = "<group>";
Expand All @@ -528,6 +546,7 @@
children = (
050E0CC42C74B8F000326EEA /* HomeFeedTableViewCell.swift */,
050E0CC62C74B8FD00326EEA /* FeedDetailTableViewCell.swift */,
05F1FF472D1AB39000982033 /* MigratedHomeFeedCell.swift */,
);
path = Cells;
sourceTree = "<group>";
Expand Down Expand Up @@ -855,6 +874,8 @@
children = (
0547F4F42C64C76A001E3039 /* HomeViewController.swift */,
050E0CCA2C74B94800326EEA /* FeedDetailViewController.swift */,
05F1FF432D17EA1D00982033 /* MigratedHomeViewController.swift */,
05F1FF4F2D33DF9600982033 /* HomePopupViewController.swift */,
);
path = ViewController;
sourceTree = "<group>";
Expand Down Expand Up @@ -1778,6 +1799,7 @@
3C8B4E182C78E21900174943 /* SocialLoginResponseDTO.swift in Sources */,
0547F49A2C60D968001E3039 /* AppDelegate.swift in Sources */,
050E0CC32C74B8B600326EEA /* FeedBottomView.swift in Sources */,
0589AECF2D38311A004F531E /* PopupType.swift in Sources */,
0547F4DF2C62486C001E3039 /* APIConstants.swift in Sources */,
050E0CD92C74BFC200326EEA /* InfoPageLogoView.swift in Sources */,
DE54C3E42CF4EB6B00753129 /* NoticeCell.swift in Sources */,
Expand Down Expand Up @@ -1809,6 +1831,7 @@
3CF344DE2C74AB3B0038BB53 /* MyPageAccountInfoViewModel.swift in Sources */,
050E0CF12C750F6300326EEA /* NotificationContentView.swift in Sources */,
3C8B4E1B2C78E55200174943 /* TokenManager.swift in Sources */,
05F1FF4C2D32685A00982033 /* PopupViewModel.swift in Sources */,
3CDE2E1D2C723325004A84CB /* NotificationSegmentedControl.swift in Sources */,
050E0CB52C74B85800326EEA /* HomeView.swift in Sources */,
DE9D0E342CF087B30024BB1F /* LCKGameTypeDTO.swift in Sources */,
Expand All @@ -1820,6 +1843,7 @@
050E0D162C8252B200326EEA /* NotificationAPI.swift in Sources */,
050E0CDF2C74C8B400326EEA /* MatchSessionTableViewCell.swift in Sources */,
3C8B4E3B2C79119700174943 /* MyPageMemberContentResponseDTO.swift in Sources */,
05F1FF442D17EA1D00982033 /* MigratedHomeViewController.swift in Sources */,
3C8B4E352C79117C00174943 /* MyPageMemberDeleteDTO.swift in Sources */,
05FBEED22C886A0200E4BF17 /* HomeFeedContentDTO.swift in Sources */,
0547F4C02C62166C001E3039 /* Adjusted+.swift in Sources */,
Expand Down Expand Up @@ -1861,6 +1885,7 @@
3C8B4E2A2C78EBC800174943 /* Empty.swift in Sources */,
0547F4FC2C64C797001E3039 /* MyPageViewController.swift in Sources */,
3CF344E72C750DBD0038BB53 /* MyPageSignOutReasonViewModel.swift in Sources */,
05F1FF502D33DF9600982033 /* HomePopupViewController.swift in Sources */,
3C8B4E1D2C78E55C00174943 /* TokenReissueResponseDTO.swift in Sources */,
3C8B4E372C79118500174943 /* MyPageAccountInfoResponseDTO.swift in Sources */,
050E0CCD2C74B95B00326EEA /* Team.swift in Sources */,
Expand Down Expand Up @@ -1892,10 +1917,12 @@
050E0CEA2C74DC4B00326EEA /* MatchProgress.swift in Sources */,
3C8B4E262C78E61B00174943 /* HttpMethod.swift in Sources */,
DE8001B32CF323B100D9DAD9 /* InfoNewsViewController.swift in Sources */,
05F1FF4A2D1AB42A00982033 /* MigratedHomeView.swift in Sources */,
05B4F47D2CF8BE360033FF67 /* Array+.swift in Sources */,
05B4F47F2CF8C2450033FF67 /* BanRequestDTO.swift in Sources */,
DE8001B62CF3250800D9DAD9 /* NewsCell.swift in Sources */,
DE8001A82CF31ECE00D9DAD9 /* InfoNewsViewModel.swift in Sources */,
05F1FF462D1AAAE300982033 /* MigratedHomeViewModel.swift in Sources */,
050E0CD12C74B9A700326EEA /* WriteViewController.swift in Sources */,
050E0CAA2C74B7A900326EEA /* FeedDetailReplyDTO.swift in Sources */,
3C35319C2C6F22050015A8FA /* ViewModelType.swift in Sources */,
Expand All @@ -1908,6 +1935,7 @@
DEAD9CBD2CF2618F00D5CD11 /* SessionCell.swift in Sources */,
050E0CA42C74B35500326EEA /* UIApplication+.swift in Sources */,
050E0CB72C74B87400326EEA /* FeedDetailView.swift in Sources */,
05F1FF482D1AB39000982033 /* MigratedHomeFeedCell.swift in Sources */,
DEFF2F7E2D13052500DC1A16 /* AnyPublisher+.swift in Sources */,
DE7119322D2CBDCC00C47EBB /* UserDefaultsKey.swift in Sources */,
050E0CF92C7516C900326EEA /* InfoNotificationDTO.swift in Sources */,
Expand Down
59 changes: 59 additions & 0 deletions Wable-iOS/Global/Extention/UIView+.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
// Created by 박윤빈 on 8/6/24.
//

import Combine
import UIKit

extension UIView {
Expand All @@ -30,3 +31,61 @@ extension UIView {
return superview as? T ?? superview?.superview(of: type)
}
}

// MARK: - UIGestureRecognizer Combine Publisher

extension UIView {
func gesturePublisher<T: UIGestureRecognizer>(_ gestureRecognizer: T) -> AnyPublisher<T, Never> {
GesturePublisher(view: self, gestureRecognizer: gestureRecognizer).eraseToAnyPublisher()
}
}

// MARK: - GesturePublisher 정의

struct GesturePublisher<T: UIGestureRecognizer>: Publisher {
typealias Output = T
typealias Failure = Never

private let view: UIView
private let gestureRecognizer: T

init(view: UIView, gestureRecognizer: T) {
self.view = view
self.gestureRecognizer = gestureRecognizer
}

func receive<S>(subscriber: S) where S : Subscriber, Failure == S.Failure, Output == S.Input {
let subscription = GestureSubscription(subscriber: subscriber, view: view, gestureRecognizer: gestureRecognizer)
subscriber.receive(subscription: subscription)
}
}

// MARK: - GestureSubscription 정의

final class GestureSubscription<S: Subscriber, T: UIGestureRecognizer>: Subscription where S.Input == T {
private var subscriber: S?
private let gestureRecognizer: T
private weak var view: UIView?

init(subscriber: S, view: UIView, gestureRecognizer: T) {
self.subscriber = subscriber
self.gestureRecognizer = gestureRecognizer
self.view = view

self.view?.isUserInteractionEnabled = true
self.view?.addGestureRecognizer(gestureRecognizer)
self.gestureRecognizer.addTarget(self, action: #selector(handleGesture))
}

func request(_ demand: Subscribers.Demand) {
}

func cancel() {
subscriber = nil
view?.removeGestureRecognizer(gestureRecognizer)
}

@objc private func handleGesture() {
_ = subscriber?.receive(gestureRecognizer)
}
}
1 change: 1 addition & 0 deletions Wable-iOS/Global/Literals/ImageLiterals.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ enum ImageLiterals {
static var toastSuccess: UIImage { .load(name: "toast_success") }
static var toastWarning: UIImage { .load(name: "toast_warning") }
static var toastGhost: UIImage { .load(name: "toast_ghost") }
static var toastBan: UIImage { .load(name: "toast_ban") }
static var toastReport: UIImage { .load(name: "toast_report") }
static var toastAgreementLoading: UIImage { .load(name: "toast_agreement_loading") }
}
Expand Down
11 changes: 11 additions & 0 deletions Wable-iOS/Global/Literals/StringLiterals.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,17 @@ enum StringLiterals {
return "v3/content/\(contentID)/comment"
}
static let postBan = "v1/report/ban"
static func postFeedLike(contentID: Int) -> String {
return "v1/content/\(contentID)/liked"
}
static func deleteFeedLike(contentID: Int) -> String {
return "v1/content/\(contentID)/unliked"
}
static func deleteFeed(contentID: Int) -> String {
return "v1/content/\(contentID)"
}
static let postOpacityDown = "v1/ghost2"
static let postReport = "v1/report/slack"
}

enum Info {
Expand Down
23 changes: 23 additions & 0 deletions Wable-iOS/Global/Resources/Assets.xcassets/Toast/toast_ban.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "toast.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Binary file added Wable-iOS/Global/Resources/Assets.xcassets/Toast/toast_ban.imageset/toast.png
View file
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 Wable-iOS/Global/Resources/Assets.xcassets/Toast/toast_ban.imageset/[email protected]
View file
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 Wable-iOS/Global/Resources/Assets.xcassets/Toast/toast_ban.imageset/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
65 changes: 65 additions & 0 deletions Wable-iOS/Network/Home/HomeAPI.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,71 @@ extension HomeAPI {
}
}

func migratedGetHomeFeed(cursor: Int) -> AnyPublisher<[HomeFeedDTO]?, WableNetworkError> {
homeProvider.requestPublisher(.getContent(param: cursor))
.tryMap { [weak self] response -> [HomeFeedDTO]? in
return try self?.parseResponse(statusCode: response.statusCode, data: response.data)
}
.mapError { $0 as? WableNetworkError ?? .unknownError($0.localizedDescription) }
.eraseToAnyPublisher()
}

func postFeedLike(contentID: Int) -> AnyPublisher<EmptyDTO?, WableNetworkError> {
homeProvider.requestPublisher(.postFeedLike(contentID: contentID))
.tryMap { [weak self] response -> EmptyDTO? in
return try self?.parseResponse(statusCode: response.statusCode, data: response.data)
}
.mapError { $0 as? WableNetworkError ?? .unknownError($0.localizedDescription) }
.eraseToAnyPublisher()
}

func deleteFeedLike(contentID: Int) -> AnyPublisher<EmptyDTO?, WableNetworkError> {
homeProvider.requestPublisher(.deleteFeedLike(contentID: contentID))
.tryMap { [weak self] response -> EmptyDTO? in
return try self?.parseResponse(statusCode: response.statusCode, data: response.data)
}
.mapError { $0 as? WableNetworkError ?? .unknownError($0.localizedDescription) }
.eraseToAnyPublisher()
}

func deleteFeed(contentID: Int) -> AnyPublisher<EmptyDTO?, WableNetworkError> {
homeProvider.requestPublisher(.deleteFeed(contentID: contentID))
.tryMap { [weak self] response -> EmptyDTO? in
return try self?.parseResponse(statusCode: response.statusCode, data: response.data)
}
.mapError { $0 as? WableNetworkError ?? .unknownError($0.localizedDescription) }
.eraseToAnyPublisher()
}

func postReport(nickname: String, relateText: String) -> AnyPublisher<EmptyDTO?, WableNetworkError> {
homeProvider.requestPublisher(.postReport(param: ReportRequestDTO(
reportTargetNickname: nickname,
relateText: relateText
)))
.tryMap { [weak self] response -> EmptyDTO? in
return try self?.parseResponse(statusCode: response.statusCode, data: response.data)
}
.mapError { $0 as? WableNetworkError ??
.unknownError($0.localizedDescription) }
.eraseToAnyPublisher()
}

func postBeGhost(triggerType: String, memberID: Int, triggerID: Int) -> AnyPublisher<EmptyDTO?, WableNetworkError> {
let param = PostTransparencyRequestDTO(
alarmTriggerType: triggerType,
targetMemberId: memberID,
alarmTriggerId: triggerID,
ghostReason: ""
)
return homeProvider.requestPublisher(.postBeGhost(param: param))
.tryMap { [weak self] response -> EmptyDTO? in
return try self?.parseResponse(statusCode: response.statusCode, data: response.data)
}
.mapError { $0 as? WableNetworkError ??
.unknownError($0.localizedDescription) }
.eraseToAnyPublisher()
}

func postReply(contentID: Int, requestBody: WriteReplyRequestV3DTO) -> AnyPublisher<EmptyDTO?, WableNetworkError> {
homeProvider.requestPublisher(.postReply(param: contentID, requestBody: requestBody))
.tryMap { [weak self] response -> EmptyDTO? in
Expand Down
Loading

0 comments on commit 4a9ad06

Please sign in to comment.