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

SDK-2873_TimerTemplateWithProgressView #31

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

SDK-2873_TimerTemplateWithProgressView #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0d0b103
Merge pull request #29 from CleverTap/develop
akashvercetti Jan 17, 2023
956f604
- Added optional progress view in Timer template
AishwaryaNanna Apr 11, 2023
c3049a3
- Updated constraints to fix height of content view when timer expired
AishwaryaNanna Apr 17, 2023
3de1f81
- Removed custom progress view colour
AishwaryaNanna Apr 17, 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
96 changes: 84 additions & 12 deletions CTNotificationContent/Templates/Timer/Controller/CTTimerTemplateController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,15 @@ import UserNotificationsUI
var jsonContent: TimerTemplateProperties? = nil
var timer: Timer = Timer()
var thresholdSeconds = 0
var progressViewHeight: CGFloat = 0.0
var captionLabelTopConstraint: NSLayoutConstraint?
var subCaptionBottomConstraint: NSLayoutConstraint?
var subCaptionTopConstraint: NSLayoutConstraint?
var timerLabelTopConstraint: NSLayoutConstraint?
var timerLabelBottomConstraint: NSLayoutConstraint?
var imageViewBottomConstraint: NSLayoutConstraint?
var isImageAdded = false

private var imageView: UIImageView = {
let imageView = UIImageView()
imageView.contentMode = .scaleAspectFit
Expand Down Expand Up @@ -49,6 +58,12 @@ import UserNotificationsUI
timerLabel.translatesAutoresizingMaskIntoConstraints = false
return timerLabel
}()
private var timerProgressView: UIProgressView = {
let timerProgressView = UIProgressView()
timerProgressView.setProgress(0.0, animated: true)
timerProgressView.translatesAutoresizingMaskIntoConstraints = false
return timerProgressView
}()

@objc public override func viewDidLoad() {
super.viewDidLoad()
Expand All @@ -73,6 +88,7 @@ import UserNotificationsUI
contentView.addSubview(captionLabel)
contentView.addSubview(subcaptionLabel)
contentView.addSubview(timerLabel)
contentView.addSubview(timerProgressView)

captionLabel.text = templateCaption
subcaptionLabel.text = templateSubcaption
Expand Down Expand Up @@ -120,6 +136,7 @@ import UserNotificationsUI
CTUtiltiy.checkImageUrlValid(imageUrl: bigImg) { [weak self] (imageData) in
DispatchQueue.main.async {
if imageData != nil {
self?.isImageAdded = true
self?.imageView.image = imageData
self?.activateImageViewContraints()
self?.createFrameWithImage()
Expand All @@ -128,7 +145,15 @@ import UserNotificationsUI
}
}
}

if let timerProgressView = jsonContent.pt_timer_progress_view, timerProgressView{
if thresholdSeconds > 0 {
// Load progress view only if timer is not ended.
progressViewHeight = Constraints.kProgressViewHeight
self.activateProgressViewContraints()
self.createFrameWithoutImage()
}
}

view.backgroundColor = UIColor(hex: bgColor)
imageView.backgroundColor = UIColor(hex: bgColor)
captionLabel.textColor = UIColor(hex: captionColor)
Expand All @@ -137,22 +162,27 @@ import UserNotificationsUI
}

func setupConstraints() {
captionLabelTopConstraint = captionLabel.topAnchor.constraint(equalTo: contentView.bottomAnchor, constant: -(CTUtiltiy.getCaptionHeight() - Constraints.kCaptionTopPadding + progressViewHeight))
captionLabelTopConstraint?.isActive = true
subCaptionTopConstraint = subcaptionLabel.topAnchor.constraint(equalTo: contentView.bottomAnchor, constant: -(Constraints.kSubCaptionHeight + Constraints.kSubCaptionTopPadding + progressViewHeight))
subCaptionTopConstraint?.isActive = true
subCaptionBottomConstraint = subcaptionLabel.bottomAnchor.constraint(equalTo: contentView.bottomAnchor, constant: -(Constraints.kSubCaptionTopPadding + progressViewHeight))
subCaptionBottomConstraint?.isActive = true
timerLabelTopConstraint = timerLabel.topAnchor.constraint(equalTo: contentView.bottomAnchor, constant: -(CTUtiltiy.getCaptionHeight() + progressViewHeight))
timerLabelTopConstraint?.isActive = true
timerLabelBottomConstraint = timerLabel.bottomAnchor.constraint(equalTo: contentView.bottomAnchor, constant: -(Constraints.kSubCaptionTopPadding + progressViewHeight))
timerLabelBottomConstraint?.isActive = true
NSLayoutConstraint.activate([
captionLabel.topAnchor.constraint(equalTo: contentView.bottomAnchor, constant: -(CTUtiltiy.getCaptionHeight() - Constraints.kCaptionTopPadding)),
captionLabel.leadingAnchor.constraint(equalTo: contentView.leadingAnchor, constant: Constraints.kCaptionLeftPadding),
captionLabel.trailingAnchor.constraint(equalTo: contentView.trailingAnchor, constant: -Constraints.kTimerLabelWidth),
captionLabel.heightAnchor.constraint(equalToConstant: Constraints.kCaptionHeight),

subcaptionLabel.topAnchor.constraint(equalTo: contentView.bottomAnchor, constant: -(Constraints.kSubCaptionHeight + Constraints.kSubCaptionTopPadding)),
subcaptionLabel.leadingAnchor.constraint(equalTo: contentView.leadingAnchor, constant: Constraints.kCaptionLeftPadding),
subcaptionLabel.trailingAnchor.constraint(equalTo: contentView.trailingAnchor, constant: -Constraints.kTimerLabelWidth),
subcaptionLabel.bottomAnchor.constraint(equalTo: contentView.bottomAnchor, constant: -Constraints.kSubCaptionTopPadding),
subcaptionLabel.heightAnchor.constraint(equalToConstant: Constraints.kSubCaptionHeight),

timerLabel.topAnchor.constraint(equalTo: contentView.bottomAnchor, constant: -CTUtiltiy.getCaptionHeight()),
timerLabel.leadingAnchor.constraint(equalTo: captionLabel.trailingAnchor, constant: Constraints.kCaptionLeftPadding),
timerLabel.trailingAnchor.constraint(equalTo: contentView.trailingAnchor, constant: -Constraints.kCaptionLeftPadding),
timerLabel.bottomAnchor.constraint(equalTo: contentView.bottomAnchor, constant: -Constraints.kSubCaptionTopPadding),
timerLabel.heightAnchor.constraint(equalToConstant: CTUtiltiy.getCaptionHeight())
])
}
Expand All @@ -168,6 +198,9 @@ import UserNotificationsUI
else {
self.timerLabel.text = String(format: "%02i:%02i:%02i", hr, min, sec)
}
if let progressView = jsonContent?.pt_timer_progress_view, progressView{
timerProgressView.setProgress(Float(thresholdSeconds), animated: true)
}
thresholdSeconds -= 1
} else {
timer.invalidate()
Expand All @@ -178,6 +211,17 @@ import UserNotificationsUI

func updateViewForExpiredTime() {
if let jsonContent = jsonContent {
if let progressView = jsonContent.pt_timer_progress_view, progressView{
timerProgressView.removeFromSuperview()
progressViewHeight = 0.0
updateConstraints()
if isImageAdded{
createFrameWithImage()
}else{
createFrameWithoutImage()
}
}

if let title = jsonContent.pt_title_alt, !title.isEmpty {
captionLabel.text = title
}
Expand All @@ -193,15 +237,33 @@ import UserNotificationsUI
self?.createFrameWithImage()
self?.activateImageViewContraints()
}
else{
if let imageAdded = self?.isImageAdded, imageAdded{
self?.createFrameWithImage()
}else{
self?.createFrameWithoutImage()
}
}
}
}
}
}
}

func updateConstraints(){
captionLabelTopConstraint?.constant = -(CTUtiltiy.getCaptionHeight() - Constraints.kCaptionTopPadding + progressViewHeight)
subCaptionTopConstraint?.constant = -(Constraints.kSubCaptionHeight + Constraints.kSubCaptionTopPadding + progressViewHeight)
subCaptionBottomConstraint?.constant = -(Constraints.kSubCaptionTopPadding + progressViewHeight)
timerLabelTopConstraint?.constant = -(CTUtiltiy.getCaptionHeight() + progressViewHeight)
timerLabelBottomConstraint?.constant = -(Constraints.kSubCaptionTopPadding + progressViewHeight)
if isImageAdded{
imageViewBottomConstraint?.constant = -(CTUtiltiy.getCaptionHeight() + progressViewHeight)
}
}

func createFrameWithoutImage() {
let viewWidth = view.frame.size.width
let viewHeight = CTUtiltiy.getCaptionHeight()
let viewHeight = CTUtiltiy.getCaptionHeight() + progressViewHeight
let frame: CGRect = CGRect(x: 0, y: 0, width: viewWidth, height: viewHeight)
view.frame = frame
contentView.frame = frame
Expand All @@ -210,22 +272,32 @@ import UserNotificationsUI

func createFrameWithImage() {
let viewWidth = view.frame.size.width
var viewHeight = viewWidth + CTUtiltiy.getCaptionHeight()
var viewHeight = viewWidth + CTUtiltiy.getCaptionHeight() + progressViewHeight
// For view in Landscape
viewHeight = (viewWidth * (Constraints.kLandscapeMultiplier)) + CTUtiltiy.getCaptionHeight()
viewHeight = (viewWidth * (Constraints.kLandscapeMultiplier)) + CTUtiltiy.getCaptionHeight() + progressViewHeight

let frame: CGRect = CGRect(x: 0, y: 0, width: viewWidth, height: viewHeight)
view.frame = frame
contentView.frame = frame
preferredContentSize = CGSize(width: viewWidth, height: viewHeight)
}

func activateImageViewContraints() {
imageViewBottomConstraint = imageView.bottomAnchor.constraint(equalTo: contentView.bottomAnchor, constant: -(CTUtiltiy.getCaptionHeight() + progressViewHeight))
imageViewBottomConstraint?.isActive = true
NSLayoutConstraint.activate([
imageView.topAnchor.constraint(equalTo: contentView.topAnchor, constant: -Constraints.kImageBorderWidth),
imageView.leadingAnchor.constraint(equalTo: contentView.leadingAnchor, constant: -Constraints.kImageBorderWidth),
imageView.trailingAnchor.constraint(equalTo: contentView.trailingAnchor, constant: Constraints.kImageBorderWidth),
imageView.bottomAnchor.constraint(equalTo: contentView.bottomAnchor, constant: -CTUtiltiy.getCaptionHeight())
imageView.trailingAnchor.constraint(equalTo: contentView.trailingAnchor, constant: Constraints.kImageBorderWidth)
])
}

func activateProgressViewContraints() {
NSLayoutConstraint.activate([
timerProgressView.topAnchor.constraint(equalTo: contentView.bottomAnchor, constant: -Constraints.kProgressViewHeight),
timerProgressView.leadingAnchor.constraint(equalTo: contentView.leadingAnchor, constant: Constraints.kCaptionLeftPadding),
timerProgressView.trailingAnchor.constraint(equalTo: contentView.trailingAnchor, constant: -Constraints.kCaptionLeftPadding),
timerProgressView.bottomAnchor.constraint(equalTo: contentView.bottomAnchor, constant: -Constraints.kCaptionTopPadding)
])
}

Expand Down
16 changes: 15 additions & 1 deletion CTNotificationContent/Templates/Timer/Model/TimerTemplateProperties.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,10 @@ struct TimerTemplateProperties: Decodable {
let pt_timer_end: Int?
let pt_title_clr: String?
let pt_msg_clr: String?
let pt_timer_progress_view: Bool?

enum CodingKeys: String, CodingKey {
case pt_title, pt_title_alt, pt_msg, pt_msg_alt, pt_msg_summary, pt_dl1, pt_big_img, pt_big_img_alt, pt_bg, pt_chrono_title_clr, pt_timer_threshold, pt_timer_end, pt_title_clr, pt_msg_clr
case pt_title, pt_title_alt, pt_msg, pt_msg_alt, pt_msg_summary, pt_dl1, pt_big_img, pt_big_img_alt, pt_bg, pt_chrono_title_clr, pt_timer_threshold, pt_timer_end, pt_title_clr, pt_msg_clr, pt_timer_progress_view
}

init(from decoder: Decoder) throws {
Expand Down Expand Up @@ -67,5 +68,18 @@ struct TimerTemplateProperties: Decodable {
}
}
pt_timer_end = timerEndValue

// Value for pt_timer_progress_view key can be Bool or String if received from JSON data or individual keys respectively, so checked for both case if present or else nil.
var progressViewValue: Bool? = nil
do {
if let boolValue = try container.decodeIfPresent(Bool.self, forKey: .pt_timer_progress_view) {
progressViewValue = boolValue
}
} catch {
if let stringValue = try container.decodeIfPresent(String.self, forKey: .pt_timer_progress_view) {
progressViewValue = Bool(stringValue)
}
}
pt_timer_progress_view = progressViewValue
}
}
1 change: 1 addition & 0 deletions CTNotificationContent/Templates/Utility/GlobalConstants.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ enum Constraints {
static let kTimerLabelWidth: CGFloat = 100.0
static let kLandscapeMultiplier: CGFloat = 0.5625 // 16:9 in landscape
static let kPortraitMultiplier: CGFloat = 1.777 // 16:9 in portrait
static let kProgressViewHeight: CGFloat = 12.0
}

enum ConstantKeys {
Expand Down