Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions Wable-iOS.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3444,7 +3444,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = HGVD26K7DP;
GENERATE_INFOPLIST_FILE = YES;
Expand All @@ -3462,7 +3462,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.6.0;
MARKETING_VERSION = 1.6.1;
PRODUCT_BUNDLE_IDENTIFIER = "com.wable.Wable-iOS";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand All @@ -3487,7 +3487,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = HGVD26K7DP;
GENERATE_INFOPLIST_FILE = YES;
Expand All @@ -3505,7 +3505,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.6.0;
MARKETING_VERSION = 1.6.1;
PRODUCT_BUNDLE_IDENTIFIER = "com.wable.Wable-iOS";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down
2 changes: 2 additions & 0 deletions Wable-iOS/Data/Mapper/CommentMapper.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ extension CommentMapper {
let dateFormatter = DateFormatter()
dateFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss"
dateFormatter.timeZone = TimeZone(abbreviation: "KST")
dateFormatter.locale = Locale(identifier: "en_US_POSIX")

return response.map { comment in
let url = URL(string: comment.memberProfileURL)
Expand Down Expand Up @@ -54,6 +55,7 @@ extension CommentMapper {
static func toDomain(_ contentID: Int, _ response: [DTO.Response.FetchContentComments]) -> [Comment] {
let dateFormatter = DateFormatter()
dateFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss"
dateFormatter.locale = Locale(identifier: "en_US_POSIX")

return response.map { comment in
let url = URL(string: comment.memberProfileURL)
Expand Down
9 changes: 6 additions & 3 deletions Wable-iOS/Data/Mapper/ContentMapper.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ enum ContentMapper { }
extension ContentMapper {
static func toDomain(_ response: DTO.Response.FetchContent, _ id: Int) -> Content {
let dateFormatter = DateFormatter()
dateFormatter.dateFormat = "yyyy-MM-dd HH:mm:SS"
dateFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss"
dateFormatter.timeZone = TimeZone(abbreviation: "KST")
dateFormatter.locale = Locale(identifier: "en_US_POSIX")

let memberProfileURL = URL(string: response.memberProfileURL)
let contentImageURL = URL(string: response.contentImageURL ?? "")
Expand Down Expand Up @@ -52,8 +53,9 @@ extension ContentMapper {

static func toDomain(_ response: [DTO.Response.FetchContents]) -> [Content] {
let dateFormatter = DateFormatter()
dateFormatter.dateFormat = "yyyy-MM-dd HH:mm:SS"
dateFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss"
dateFormatter.timeZone = TimeZone(abbreviation: "KST")
dateFormatter.locale = Locale(identifier: "en_US_POSIX")

return response.map { content in
let memberProfileURL = URL(string: content.memberProfileURL)
Expand Down Expand Up @@ -94,8 +96,9 @@ extension ContentMapper {

static func toDomain(_ response: [DTO.Response.FetchUserContents]) -> [Content] {
let dateFormatter = DateFormatter()
dateFormatter.dateFormat = "yyyy-MM-dd HH:mm:SS"
dateFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss"
dateFormatter.timeZone = TimeZone(abbreviation: "KST")
dateFormatter.locale = Locale(identifier: "en_US_POSIX")

return response.map { content in
let memberProfileURL = URL(string: content.memberProfileURL)
Expand Down
2 changes: 2 additions & 0 deletions Wable-iOS/Data/Mapper/InformationMapper.swift
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ enum InformationMapper {
let dateFormatter = DateFormatter()
dateFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss"
dateFormatter.timeZone = TimeZone(abbreviation: "KST")
dateFormatter.locale = Locale(identifier: "en_US_POSIX")

return dtos.compactMap { dto in
Announcement(
Expand Down Expand Up @@ -84,6 +85,7 @@ enum InformationMapper {
let dateFormatter = DateFormatter()
dateFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss"
dateFormatter.timeZone = TimeZone(abbreviation: "KST")
dateFormatter.locale = Locale(identifier: "en_US_POSIX")

return dtos.compactMap { dto in
guard let url = URL(string: dto.urlString),
Expand Down
2 changes: 2 additions & 0 deletions Wable-iOS/Data/Mapper/NotificationMapper.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ enum NotificationMapper {
let dateFormatter = DateFormatter()
dateFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss"
dateFormatter.timeZone = TimeZone(abbreviation: "KST")
dateFormatter.locale = Locale(identifier: "en_US_POSIX")

return dtos.compactMap { dto in
InformationNotification(
Expand All @@ -27,6 +28,7 @@ enum NotificationMapper {
let dateFormatter = DateFormatter()
dateFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss"
dateFormatter.timeZone = TimeZone(abbreviation: "KST")
dateFormatter.locale = Locale(identifier: "en_US_POSIX")

return dtos.compactMap { dto in
ActivityNotification(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -242,19 +242,17 @@ extension CommentCollectionViewCell {
configurePostStatus(info: info)

contentTextView.text = info.text
replyButton.configureButton()
likeButton.configureButton(isLiked: info.isLiked, likeCount: info.likeCount, postType: .comment)

guard let createdDate = info.createdDate else { return }
infoView.configureView(
userProfileURL: info.author.profileURL,
userName: info.author.nickname,
userFanTeam: info.author.fanTeam,
opacity: info.opacity.value,
createdDate: createdDate,
createdDate: info.createdDate,
postType: .comment
)

replyButton.configureButton()
likeButton.configureButton(isLiked: info.isLiked, likeCount: info.likeCount, postType: .comment)
}

func configureCommentType(info: Comment, commentType: CommentType) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -271,14 +271,12 @@ extension ContentCollectionViewCell {
self.profileImageViewTapHandler = profileImageViewTapHandler
self.settingButtonTapHandler = settingButtonTapHandler

guard let createdDate = info.createdDate else { return }

infoView.configureView(
userProfileURL: info.author.profileURL,
userName: info.author.nickname,
userFanTeam: info.author.fanTeam,
opacity: info.opacity.value,
createdDate: createdDate,
createdDate: info.createdDate,
postType: .content
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,9 @@ private extension PostUserInfoView {
/// 게시물 작성 시간을 상대적인 시간 문자열로 변환
/// - Parameter date: 게시물 작성 날짜
/// - Returns: "지금", "n분 전", "n시간 전" 등의 형식으로 변환된 문자열
func configurePostTime(date: Date) -> String {
func configurePostTime(date: Date?) -> String {
guard let date = date else { return "" }

let now = Date()
let timeInterval = now.timeIntervalSince(date)
let seconds = Int(timeInterval)
Expand Down Expand Up @@ -187,7 +189,7 @@ extension PostUserInfoView {
userName: String,
userFanTeam: LCKTeam?,
opacity: Int,
createdDate: Date,
createdDate: Date?,
postType: PostType
) {
switch postType {
Expand Down
2 changes: 2 additions & 0 deletions Wable-iOS/Resource/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>UIDesignRequiresCompatibility</key>
<true/>
<key>AMPLITUDE_APP_KEY</key>
<string>$(AMPLITUDE_APP_KEY)</string>
<key>BASE_URL</key>
Expand Down