Skip to content

Commit

Permalink
Design changes
Browse files Browse the repository at this point in the history
  • Loading branch information
rakeshtatekonda committed Jan 3, 2018
1 parent 950feda commit 5663b37
Show file tree
Hide file tree
Showing 13 changed files with 19 additions and 6 deletions.
2 changes: 1 addition & 1 deletion ANAChat.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
Pod::Spec.new do |s|

s.name = 'ANAChat'
s.version = '0.3.5'
s.version = '0.3.6'
s.summary = 'ANAChat iOS'

# This description is used to generate tags and improve search results.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
{
"idiom" : "universal",
"filename" : "tick@3x.png",
"filename" : "tick.png",
"scale" : "3x"
}
],
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ class ChatCarouselCollectionCell: UICollectionViewCell {
// Initialization code
titleLabel.font = UIConfigurationUtility.Fonts.carouselTitleFont
descriptionLabel.font = UIConfigurationUtility.Fonts.carouselDescriptionFont
titleLabel.textColor = UIConfigurationUtility.Colors.TextColor
self.buttonsTableView.delegate = self
self.buttonsTableView.dataSource = self
// self.buttonsTableView.delegate = self
Expand Down Expand Up @@ -64,6 +65,8 @@ class ChatCarouselCollectionCell: UICollectionViewCell {
}else{
self.imageViewHeightConstraint.constant = 130
}
self.imageView.image = CommonUtility.getImageFromBundle(name: "placeholder")

if item.mediaType == 0{
self.playButton.isHidden = true
if let url = item.mediaUrl{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ class ChatReceiveTextCell: UITableViewCell {
cellBackgroundView?.layer.cornerRadius = 10.0
self.arrowView.backgroundColor = UIColor.clear
textLbl?.font = PreferencesManager.sharedInstance.getContentFont()
textLbl.textColor = UIConfigurationUtility.Colors.TextColor
timeLbl?.font = UIConfigurationUtility.Fonts.TimeLblFont
timeLbl?.alpha = 0.5

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ class ChatReceiverMediaCell: UITableViewCell {
let myActivityIndicator = UIActivityIndicatorView(activityIndicatorStyle: UIActivityIndicatorViewStyle.gray)
myActivityIndicator.center = (self.cellImage.center)
myActivityIndicator.startAnimating()
self.cellImage.image = CommonUtility.getImageFromBundle(name: "placeholder")
// self.cellImage.addSubview(myActivityIndicator)
if let simpleMessage = messageObject as? Simple{
switch simpleMessage.mediaType {
Expand Down
7 changes: 5 additions & 2 deletions ANAChat/Classes/UIComponents/Cells/ChatSenderTextCell.swift
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ class ChatSenderTextCell: UITableViewCell {
paddingImageView.backgroundColor = PreferencesManager.sharedInstance.getSenderThemeColor()
cellBackgroundView?.layer.cornerRadius = 10.0
textLbl?.font = PreferencesManager.sharedInstance.getContentFont()
textLbl.textColor = UIConfigurationUtility.Colors.TextColor
timeLbl?.font = UIConfigurationUtility.Fonts.TimeLblFont
timeLbl?.alpha = 0.5

Expand Down Expand Up @@ -69,11 +70,13 @@ class ChatSenderTextCell: UITableViewCell {
}

if messageObject.syncedWithServer == true{
self.statusImageView.image = CommonUtility.getImageFromBundle(name: "sentImage")
self.statusImageView.image = CommonUtility.getImageFromBundle(name: "sentImage").withRenderingMode(.alwaysTemplate)
}else{
self.statusImageView.image = CommonUtility.getImageFromBundle(name: "sendingImage")
self.statusImageView.image = CommonUtility.getImageFromBundle(name: "sendingImage").withRenderingMode(.alwaysTemplate)
}

self.statusImageView.tintColor = PreferencesManager.sharedInstance.getBaseThemeColor()

self.setNeedsLayout()
if let simpleMessage = messageObject as? Simple{
if let text = simpleMessage.text{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ import MobileCoreServices
public var headerLogoImageName : String = "chatty"
public var baseThemeColor : UIColor = PreferencesManager.sharedInstance.getBaseThemeColor()
public var senderThemeColor : UIColor = PreferencesManager.sharedInstance.getSenderThemeColor()
public var botTitleColor : UIColor = UIColor.white

public var baseAPIUrl : String!

var contentFont : UIFont?
Expand Down Expand Up @@ -325,6 +327,8 @@ import MobileCoreServices
if let contentFont = self.contentFont{
PreferencesManager.sharedInstance.configureContentText(withFont: contentFont)
}
self.headerTitleLabel.textColor = self.botTitleColor
self.headerDescriptionLabel.textColor = self.botTitleColor
PreferencesManager.sharedInstance.configureSenderTheme(withColor: senderThemeColor)
PreferencesManager.sharedInstance.configureBaseTheme(withColor: baseThemeColor)
PreferencesManager.sharedInstance.configureBusinessId(withText: businessId)
Expand Down
1 change: 1 addition & 0 deletions ANAChat/Classes/Utilities/UIConfigurationUtility.swift
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ struct UIConfigurationUtility{
static let BackgroundColor = UIColor.init(hexString: "#F1F2F4")
static let SenderThemeColor = UIColor.init(hexString: "#3C3C3C")
static let MediaDescriptionColor = UIColor.init(hexString: "#FFFFFF")
static let TextColor = UIColor.init(hexString: "#3c3c3c")
}

}
Expand Down
4 changes: 2 additions & 2 deletions Example/Pods/Pods.xcodeproj/project.pbxproj

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 5663b37

Please sign in to comment.