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.

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

[IDLE-000] 1.1버전 출시전 QA #95

Merged
merged 6 commits into from
Oct 28, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public enum IdleInfoPlist {

"CFBundleDisplayName": "$(BUNDLE_DISPLAY_NAME)",

"CFBundleShortVersionString" : "1.0.2",
"CFBundleShortVersionString" : "1.0.3",

"NSAppTransportSecurity" : [
"NSAllowsArbitraryLoads" : true
Expand Down
4 changes: 2 additions & 2 deletions project/Projects/App/Sources/DIAssembly/DataAssembly.swift
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ public struct DataAssembly: Assembly {

// MARK: Key-value store for datasource
container.register(KeyValueStore.self) { _ in
return KeyChainList()
KeyChainList()
}
.inObjectScope(.container)

// MARK: Service
container.register(LocalStorageService.self) { _ in
return DefaultLocalStorageService()
DefaultLocalStorageService()
}
container.register((any ApplyService).self) { _ in
DefaultApplyService()
Expand Down
6 changes: 3 additions & 3 deletions project/Projects/App/Sources/DIAssembly/LoggerAssembly.swift
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ public struct LoggerAssembly: Assembly {
#endif
return AmplitudeLogger()
}
.inObjectScope(.container)

// MARK: Overall logger
container.register(OverallLogger.self) { resolver in
let messagePublisher = resolver.resolve(LoggerMessagePublisher.self)!
return DefaultOverallLogger(publisher: messagePublisher)
container.register(OverallLogger.self) { _ in
DefaultOverallLogger()
}
.inObjectScope(.container)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ extension NotificationItemDTO: EntityRepresentable {

public func toEntity() -> Entity {

let dateFormatter = ISO8601DateFormatter()
let dateFormatter = DateFormatter()
dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss"
var createdDate: Date = .now

if let formatted = dateFormatter.date(from: createdAt) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public class MultiLineTextField: UITextView {
placeHolderLabel.topAnchor.constraint(equalTo: frameGuide.topAnchor, constant: textContainerInset.top),
placeHolderLabel.leftAnchor.constraint(equalTo: frameGuide.leftAnchor, constant: textContainerInset.left),
placeHolderLabel.rightAnchor.constraint(equalTo: frameGuide.rightAnchor, constant: -textContainerInset.right),
placeHolderLabel.bottomAnchor.constraint(equalTo: frameGuide.bottomAnchor, constant: -textContainerInset.bottom),

])
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
//
// PopToDismissNC.swift
// BaseFeature
//
// Created by choijunios on 10/28/24.
//

import UIKit

public class PopToDismissNavigationController: UINavigationController {

private var duringTransition = false

public override func viewDidLoad() {
super.viewDidLoad()

interactivePopGestureRecognizer?.delegate = self
delegate = self
}

public override func pushViewController(_ viewController: UIViewController, animated: Bool) {
duringTransition = true

super.pushViewController(viewController, animated: animated)
}

}

extension PopToDismissNavigationController: UINavigationControllerDelegate {
public func navigationController(_ navigationController: UINavigationController, didShow viewController: UIViewController, animated: Bool) {
self.duringTransition = false
}
}

extension PopToDismissNavigationController: UIGestureRecognizerDelegate {
public func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
guard gestureRecognizer == interactivePopGestureRecognizer,
let _ = topViewController else {
return true // default value
}

return viewControllers.count > 1 && duringTransition == false
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ public final class Router: NSObject, RouterProtocol {

guard let keyWindow = UIWindow.keyWindow else { return }

let navigationController = UINavigationController(rootViewController: module)
let navigationController = PopToDismissNavigationController(rootViewController: module)
navigationController.setNavigationBarHidden(true, animated: false)

self.rootController = navigationController
Expand Down Expand Up @@ -245,7 +245,7 @@ public final class Router: NSObject, RouterProtocol {

public func setRootModuleTo(module: Module, popCompletion: RoutingCompletion?) {
guard let keyWindow = UIWindow.keyWindow else { return }
let navigationController = UINavigationController(rootViewController: module)
let navigationController = PopToDismissNavigationController(rootViewController: module)
navigationController.setNavigationBarHidden(true, animated: false)

if let popCompletion {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ enum SectionInfo: Int, CaseIterable {
}


class NotificationPageVC: BaseViewController {
class NotificationPageVC: BaseViewController, UIGestureRecognizerDelegate {

typealias Cell = NotificationCell

Expand Down Expand Up @@ -118,7 +118,7 @@ class NotificationPageVC: BaseViewController {
tableView.dataSource = tableViewDataSource
tableView.delegate = self
tableView.rowHeight = UITableView.automaticDimension
tableView.estimatedRowHeight = 93
tableView.estimatedRowHeight = 102
tableView.sectionHeaderTopPadding = 10
// MARK: Cell
tableView.separatorStyle = .none
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class NotificationCell: UITableViewCell {
let mainStack = HStack([
profileImageView,
labelStack,
], spacing: 16, alignment: .top)
], spacing: 20, alignment: .center)

[
mainStack
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ class NotificationPageViewModel: BaseViewModel, NotificationPageViewModelable {

// 날짜순 정렬
let sortedInfo = accum.sorted { lhs, rhs in
lhs.createdDate < rhs.createdDate
lhs.createdDate > rhs.createdDate
}

var result: [SectionInfo: [NotificationVO]] = [:]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@
//

import Foundation

import PresentationCore
import AuthFeature
import CenterMainPageFeature
import Domain
import Core

public protocol OverallLogger:
CenterRegisterLogger,
Expand All @@ -20,11 +22,9 @@ public protocol OverallLogger:

public class DefaultOverallLogger {

let publisher: LoggerMessagePublisher
@Injected var publisher: LoggerMessagePublisher

public init(publisher: LoggerMessagePublisher) {
self.publisher = publisher
}
public init() { }
}

extension DefaultOverallLogger: OverallLogger {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ class CenterProfileViewModel: BaseViewModel, CenterProfileViewModelable {

let editingRequestResult = mapEndLoading(imageProcessingFinishWithSuccess
.unretained(self)
.observe(on: ConcurrentDispatchQueueScheduler(qos: .default))
.flatMap { (obj, imageInfo) in
let (phoneNumber, introduction) = obj.checkTextInputModification()

Expand Down
Loading