diff --git a/Whale-iOS/Whale-iOS.xcodeproj/project.pbxproj b/Whale-iOS/Whale-iOS.xcodeproj/project.pbxproj index e0e06a1..736034a 100644 --- a/Whale-iOS/Whale-iOS.xcodeproj/project.pbxproj +++ b/Whale-iOS/Whale-iOS.xcodeproj/project.pbxproj @@ -1188,7 +1188,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1.6; + CURRENT_PROJECT_VERSION = 1.8; DEVELOPMENT_TEAM = 2ZS26WP93H; INFOPLIST_FILE = "$(SRCROOT)/Whale-iOS/Support/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 14.1; @@ -1211,7 +1211,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1.6; + CURRENT_PROJECT_VERSION = 1.8; DEVELOPMENT_TEAM = 2ZS26WP93H; INFOPLIST_FILE = "$(SRCROOT)/Whale-iOS/Support/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 14.1; diff --git a/Whale-iOS/Whale-iOS/Global/View/CircularGradientProgressBar.swift b/Whale-iOS/Whale-iOS/Global/View/CircularGradientProgressBar.swift index b3a5fd5..e480965 100644 --- a/Whale-iOS/Whale-iOS/Global/View/CircularGradientProgressBar.swift +++ b/Whale-iOS/Whale-iOS/Global/View/CircularGradientProgressBar.swift @@ -14,13 +14,11 @@ class CircularGradientProgressBar: UIView { @IBInspectable public lazy var foregroundCircleColor: UIColor = UIColor.red @IBInspectable public lazy var startGradientColor: UIColor = UIColor.red @IBInspectable public lazy var endGradientColor: UIColor = UIColor.orange - // @IBInspectable public lazy var textColor: UIColor = UIColor.white private lazy var fillColor: UIColor = UIColor.clear private var backgroundLayer: CAShapeLayer! private var progressLayer: CAShapeLayer! - // private var textLayer: CATextLayer! public var progress: CGFloat = 0 { didSet { @@ -59,12 +57,9 @@ class CircularGradientProgressBar: UIView { gradientLayer.colors = [startGradientColor.cgColor, endGradientColor.cgColor] gradientLayer.frame = self.bounds gradientLayer.mask = progressLayer - - // textLayer = createTextLayer(textColor: textColor) layer.addSublayer(backgroundLayer) layer.addSublayer(gradientLayer) - // layer.addSublayer(textLayer) } private func createCircularLayer(strokeColor: CGColor, fillColor: CGColor, lineWidth: CGFloat) -> CAShapeLayer { @@ -91,29 +86,8 @@ class CircularGradientProgressBar: UIView { return shapeLayer } - -// private func createTextLayer(textColor: UIColor) -> CATextLayer { -// -// let width = frame.size.width -// let height = frame.size.height -// -// let fontSize = min(width, height) / 4 - 5 -// let offset = min(width, height) * 0.1 -// -// let layer = CATextLayer() -// layer.string = "\(Int(progress * 100))" -// layer.backgroundColor = UIColor.clear.cgColor -// layer.foregroundColor = textColor.cgColor -// layer.fontSize = fontSize -// layer.frame = CGRect(x: 0, y: (height - fontSize - offset) / 2, width: width, height: height) -// layer.alignmentMode = .center -// -// return layer -// } - - private func didProgressUpdated() { - // textLayer?.string = "\(Int(progress * 100))" + private func didProgressUpdated() { progressLayer?.strokeEnd = progress } } @@ -135,15 +109,6 @@ extension CircularGradientProgressBar { basicAnimation.delegate = self timer = AppTimer(duration: maxDuration, tickInterval: tickInterval) - -// timer?.timerFired = { [weak self] value in -// self?.textLayer.string = "\(value)" -// } -// -// timer?.timerStopped = { [weak self] in -// self?.textLayer.string = "" -// } - timer?.timerCompleted = {} progressLayer.add(basicAnimation, forKey: "recording") diff --git a/Whale-iOS/Whale-iOS/Screens/PraiseCardTab/VC/PraiseCardVC.swift b/Whale-iOS/Whale-iOS/Screens/PraiseCardTab/VC/PraiseCardVC.swift index b908738..f26e50b 100644 --- a/Whale-iOS/Whale-iOS/Screens/PraiseCardTab/VC/PraiseCardVC.swift +++ b/Whale-iOS/Whale-iOS/Screens/PraiseCardTab/VC/PraiseCardVC.swift @@ -476,14 +476,9 @@ extension PraiseCardVC { func praiseCardService(_ year: String, _ month: String) { var convertMonthString: String = "0" - if month < 10.toString() { - convertMonthString = "0" + month - } - else { - convertMonthString = month - } + convertMonthString = Int(month) ?? 0 < 10 ? "0" + month : month - PraiseService.shared.praiseDateService(year: year, month: convertMonthString) { [self](networkResult) -> (Void) in + PraiseService.shared.praiseDateService(year: year, month: convertMonthString) { [self] (networkResult) -> (Void) in switch networkResult { case .success(let data): if let praiseData = data as? PraiseData { @@ -519,7 +514,6 @@ extension PraiseCardVC { switch networkResult { case .success(let data): if let praiseRank = data as? PraiseRankData { - print(praiseRank.rankingCountResult) praiseRankData = praiseRank.rankingCountResult if praiseRank.totalPraiserCount == 0 { diff --git a/Whale-iOS/Whale-iOS/Support/Info.plist b/Whale-iOS/Whale-iOS/Support/Info.plist index ac1b760..58d18a8 100644 --- a/Whale-iOS/Whale-iOS/Support/Info.plist +++ b/Whale-iOS/Whale-iOS/Support/Info.plist @@ -4,6 +4,8 @@ CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + 칭찬할고래 CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier