From 5663b37093c3149ca6add0ffc630b016148557a0 Mon Sep 17 00:00:00 2001
From: Rakesh Tatekonda <rakesh.tatekonda@nowfloats.com>
Date: Wed, 3 Jan 2018 13:17:26 +0530
Subject: [PATCH] Design changes

---
 ANAChat.podspec                                 |   2 +-
 .../sentImage.imageset/Contents.json            |   2 +-
 .../sentImage.imageset/tick.png                 | Bin 0 -> 696 bytes
 .../sentImage.imageset/tick@1x.png              | Bin 634 -> 650 bytes
 .../sentImage.imageset/tick@2x.png              | Bin 764 -> 833 bytes
 .../sentImage.imageset/tick@3x.png              | Bin 853 -> 0 bytes
 .../Cells/ChatCarouselCollectionCell.swift      |   3 +++
 .../Cells/ChatReceiveTextCell.swift             |   1 +
 .../Cells/ChatReceiverMediaCell.swift           |   1 +
 .../UIComponents/Cells/ChatSenderTextCell.swift |   7 +++++--
 .../ViewControllers/ChatViewController.swift    |   4 ++++
 .../Utilities/UIConfigurationUtility.swift      |   1 +
 Example/Pods/Pods.xcodeproj/project.pbxproj     |   4 ++--
 13 files changed, 19 insertions(+), 6 deletions(-)
 create mode 100644 ANAChat/Classes/SDKAssets.xcassets/sentImage.imageset/tick.png
 delete mode 100644 ANAChat/Classes/SDKAssets.xcassets/sentImage.imageset/tick@3x.png

diff --git a/ANAChat.podspec b/ANAChat.podspec
index 1a2f96d..2e87251 100644
--- a/ANAChat.podspec
+++ b/ANAChat.podspec
@@ -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.
diff --git a/ANAChat/Classes/SDKAssets.xcassets/sentImage.imageset/Contents.json b/ANAChat/Classes/SDKAssets.xcassets/sentImage.imageset/Contents.json
index 23cc0f1..7d824c8 100644
--- a/ANAChat/Classes/SDKAssets.xcassets/sentImage.imageset/Contents.json
+++ b/ANAChat/Classes/SDKAssets.xcassets/sentImage.imageset/Contents.json
@@ -12,7 +12,7 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "tick@3x.png",
+      "filename" : "tick.png",
       "scale" : "3x"
     }
   ],
diff --git a/ANAChat/Classes/SDKAssets.xcassets/sentImage.imageset/tick.png b/ANAChat/Classes/SDKAssets.xcassets/sentImage.imageset/tick.png
new file mode 100644
index 0000000000000000000000000000000000000000..11e115cc8eb39f09f259cc78a0c676edad8be785
GIT binary patch
literal 696
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX0wgC|rfC8xmUKs7M+SzC{oH>NS%G|oWRD<U
z28Jp%28M<f28Lfip@tU>45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VX;-`;;_Kaj^>
z;_2(k{*XtQ&s2rUre+oc1LFZt7sn8b(|50&^qZV0((sV|m-@DV&TW5X4{YJNYnihl
zr0^-L#=+B{=DFMn+2|(B<YK0vBBj(U@FGF;L6g%=FCA;!)9;_0tzK61XY$2D)@8vV
z{Vfp%tUqS$es}ui+l<|pR&1HWZj`r$`}mitte8VRQx}|#Gj4m@Vs>^`K6{^6^`oUr
zEM4Vm`EPCbc3N8SRzS#xB{EwQ&q_}=TAXoel9r?NwK*w=cda>d|DgM|C6TVd(?a=#
z8&}xwp8n3X_|9u}*3(|@CmmK~ZB~`L`g)_`_8QyV)(&we!z*v*Za$Xs<SFk>qm>DP
zCl7l5*t+I6)9SNDed|~H-_wr#tR||XG2eyr$`M<UV58jFw-twCd$YZME?tpu@Z8OL
zO51WzN|nSeH@)5aU60wVSK1)^5PNs}+V&4!v!=96$+Ir|vu*wD1%b-Hax1F$T~~_<
z{}_CB!j>I;t6#C%8mr~rk`CUtGOk6aa6yuDY>?B6XxB>}iIT6?`0{@wP2pIvI%>1_
z>iA2_=UbooRNcRIt7WCx8}rt8FF!7BoEEj%_lHC5(N(ML8ujmOo%P|Rt^Cn_rlPwa
zJ+hm<Gh_Yq`n`g-?>cU5Sz7Zh=Ku5`%<?bhZJOL7{u3CzswJ)wB`Jv|saDBFsX&Us
z$iUEC*U(7U&@#l(*viz{%GgZXz|hLTVE2o#2PhhH^HVa@DsgK#we?*LPy>UftDnm{
Hr-UW|c>*PT

literal 0
HcmV?d00001

diff --git a/ANAChat/Classes/SDKAssets.xcassets/sentImage.imageset/tick@1x.png b/ANAChat/Classes/SDKAssets.xcassets/sentImage.imageset/tick@1x.png
index 4386bed57fb1203807e71e50c9aaa979eaeb4bed..5f1edd7f5ca91b34e1363eba902ddf03c048b0eb 100644
GIT binary patch
delta 200
zcmV;(05|{o1d0WaXA27x000XU0RWnu7_o9_0e_oGL_t&-8GVqu4Z=VW1rJ+P0CeGI
z2ndO&0EyH&B0wSmDxw9bfesKKF?04>1Sg&}+TXjqvs3!7D#oKo3bCg5hAAv9O6D-l
zn78nNtY5Px<)$;NE!4ORd2^U1^iD9C^z5K9>E)&)Y@$J|+~DaI+~5h@KHn3SU;c@=
z%`qt!;K2(VKxLDO1I<@>!5w^?8cbbT{ylM1c+wYc{S>sv64NLE0000<MNUMnLSTXr
Ca8#H8

delta 184
zcmV;p07w6d1^NV#XA2G2000fw0YWI7c(HP50e_20L_t&-8Dn4|444QjVPJqM(qROu
z266sj(ZvE3`vb&IK&%0ihv|gznV}4jqAZx8Ig|l19fV<uoPq3Ys2tc@T_DE?i2nmI
z$hyBk><Gl_Ks*(QK>%)J5|9%B7Ghv<0n%{mV2VIi!9Wy{ArHjQfOsKP5M&bEqsWS_
mp&<%D6x=!_F|a4_@fiRn{R~w5`g!F50000<MNUMnLSTX*H%W>B

diff --git a/ANAChat/Classes/SDKAssets.xcassets/sentImage.imageset/tick@2x.png b/ANAChat/Classes/SDKAssets.xcassets/sentImage.imageset/tick@2x.png
index c660746515079ec75b5861e858df3edbb96f613d..53fdf09406bd555fdd5e55d98711ae11f12cd04c 100644
GIT binary patch
delta 384
zcmV-`0e}Ad1;GZ8XA27x000XU0RWnu7_o9_0e@0SL_t(I5#7^ED+OU3$MHG2Up7c0
z3zzIpv5>o>$P2J!Ll(qq@K#WYlv|1g$-A&dxu=L?A--QVWpd7xF)P3N=$skz>;F9S
zoFGUynRM%DORKSzu2!W{SVmC~#*i)K&tGC$J7!RY<0KRM%m-ZN0H#ri1MDMFEE~l#
zj(;$VS|mz2PmN#+CzwK{>^IA{Y!K@>gv+f*B-MNiUrt<kG5<G&HMn2%h)l-!pa2V~
z!84waD<xd)$0QoDhfUlf5(^iRh08g^3rsj|1)qB{fi}3@EnMSAEWCuLybndN)M<@n
z-IzliR^idOLe5xtjt4ZrbLH|ZeZ??55@{ab9qi%;d1Iluz$04F2`6pFINbPcxM%l>
zP3GHOOS<4oa$2W)!wP%}v6FHCE8&C|zrzXKf+l!v10IpQd&a#;d?<{c{f#<l2Yl<N
exP#aKNj?FE1vsF_S*$Mr0000<MNUMnLSTY3<*f$*

delta 315
zcmV-B0mS~n2K)t(XA2G2000fw0YWI7c(HP50e=liL_t(I5xtR34go<Bg~#v4S`aJO
z5^P<-ni&#DaRLWuEUXE)vGCrgn$$2dGp3`HmzsXn^?AC3!1Jnk<dIeP#cTKik<%1d
z2X$LDB4H1R3HMMXo+jhn9iR;quU{U<!W<}JOfm_}L{%7Pm@G1|RJbB9r7#XUXq^Sy
z!G9b{qb)V7D2&M*w30*Ir;^QKT%f)jXi2rj!VYL;CbI)mY;Mp{ObfLzhkht$K9Y$a
z=<o~%p*?BP*L&qKlZ6o1SJ<l^B+v<rD>TpsD(}ZZ5yZtGp_jWfDgXW*>dM3sbt&Ju
z$>dy8Ec6Wb1nFxQPL|N*Lmy#`{X)Fb$t2#P`WW;p!xT=ard99%^$GgV8Q~>%RM7wc
N002ovPDHLkV1izsjP(Ej

diff --git a/ANAChat/Classes/SDKAssets.xcassets/sentImage.imageset/tick@3x.png b/ANAChat/Classes/SDKAssets.xcassets/sentImage.imageset/tick@3x.png
deleted file mode 100644
index ab1fc8ad7425bf3ae4fe200ecd45a769bc88d234..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 853
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3Ea{HEjtmSN`?>!lvI6-E$sR$z
z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8X6a5m^j0`#K0SI%&+V
zU|?X3%nXSriSYHYO3u&KOH9d6O4X~#EdZ)!V6dsM0y1+`OA-|-a&z*EttxDlz$&bO
zY>=?Nk^)#sNw%$0gl~X?bAC~(f~lT~o`I4bmx6+VO;JjkRgjAtR6CGotCUevQedU8
zUtV6WS8lAAUzDzIXlZGwZ(yWvWTXpJp<7&;SCUwvn^&w1F$89gOKNd)QD#9&W`3Rm
z$lS!F{L&IzB_)tWZ~$><NoE?tro3XPw}2kh2g&Fg>KW+6%?4_<0f}1q7iFdbZ3dZd
zXJ`Xfi6REI$3`DyIg(=_J_U;cy=up0qYn=@J1(C?>XE=ePV;ne4DsN7I@Q<juz^5p
zbVh5!`PeFkt{Y!9I`%6UOuSUYlgFqn_GUL@nXXQS|0ievuvtg8PF6C!G<j~J&HQvL
zKlbMTX@_l9Y8aj+-j8vrHb4Jqi~g?@4(2oLZx*Kqx8G~p)b`GLaq9uYFWmoj*E-BB
zTpl)crE~4x8;&*_i8}eJQ_5Fg`MauVQ+Mh<z4&j}k2Gstj(WlJVsXQF?|;>c#3oDZ
zIyf&%BiYWGf5Iu-WyS}~nvDMO{A!T<DX>QO&cZVjdauk_sUWlbg8CGu{3f%1Ilr<+
zYEDjOxjn7YY|6*KR)Xg?T|X!rb#-s=Od+k}AChx!KQNqfw|cFD#N-9H#1G%!_+X~|
zYuBDLTR1`tWzTIA-q-MAx@f!BhQp!XDkJtB`N5kyJ$yq&$q!bs`wPM|SXJ)^@0p*&
zXMg;i_={7EDi+V&eP&9*%}zCm@>g-U?`L`Kurs>zpgmJm;kjy4<gK`cmhAtktLquQ
WxtZ^)i!eI?O1z$~elF{r5}E*jFh0Zp

diff --git a/ANAChat/Classes/UIComponents/Cells/ChatCarouselCollectionCell.swift b/ANAChat/Classes/UIComponents/Cells/ChatCarouselCollectionCell.swift
index 81dfff5..ef825c6 100644
--- a/ANAChat/Classes/UIComponents/Cells/ChatCarouselCollectionCell.swift
+++ b/ANAChat/Classes/UIComponents/Cells/ChatCarouselCollectionCell.swift
@@ -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
@@ -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{
diff --git a/ANAChat/Classes/UIComponents/Cells/ChatReceiveTextCell.swift b/ANAChat/Classes/UIComponents/Cells/ChatReceiveTextCell.swift
index 1f99ddb..5767681 100644
--- a/ANAChat/Classes/UIComponents/Cells/ChatReceiveTextCell.swift
+++ b/ANAChat/Classes/UIComponents/Cells/ChatReceiveTextCell.swift
@@ -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
         
diff --git a/ANAChat/Classes/UIComponents/Cells/ChatReceiverMediaCell.swift b/ANAChat/Classes/UIComponents/Cells/ChatReceiverMediaCell.swift
index cdb3453..437b266 100644
--- a/ANAChat/Classes/UIComponents/Cells/ChatReceiverMediaCell.swift
+++ b/ANAChat/Classes/UIComponents/Cells/ChatReceiverMediaCell.swift
@@ -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 {
diff --git a/ANAChat/Classes/UIComponents/Cells/ChatSenderTextCell.swift b/ANAChat/Classes/UIComponents/Cells/ChatSenderTextCell.swift
index 8a8b5a6..e38c8e1 100644
--- a/ANAChat/Classes/UIComponents/Cells/ChatSenderTextCell.swift
+++ b/ANAChat/Classes/UIComponents/Cells/ChatSenderTextCell.swift
@@ -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
 
@@ -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{
diff --git a/ANAChat/Classes/UIComponents/ViewControllers/ChatViewController.swift b/ANAChat/Classes/UIComponents/ViewControllers/ChatViewController.swift
index b9074cd..6983494 100644
--- a/ANAChat/Classes/UIComponents/ViewControllers/ChatViewController.swift
+++ b/ANAChat/Classes/UIComponents/ViewControllers/ChatViewController.swift
@@ -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?
@@ -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)
diff --git a/ANAChat/Classes/Utilities/UIConfigurationUtility.swift b/ANAChat/Classes/Utilities/UIConfigurationUtility.swift
index 328a746..2015421 100644
--- a/ANAChat/Classes/Utilities/UIConfigurationUtility.swift
+++ b/ANAChat/Classes/Utilities/UIConfigurationUtility.swift
@@ -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")
     }
     
 }
diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
index fd66828..a559ea9 100644
--- a/Example/Pods/Pods.xcodeproj/project.pbxproj
+++ b/Example/Pods/Pods.xcodeproj/project.pbxproj
@@ -42,7 +42,6 @@
 		3027C5881FA85BE8002DE921 /* Chat_iOSSDK.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Chat_iOSSDK.xcdatamodel; sourceTree = "<group>"; };
 		3059CC091FA76C5E007C4C47 /* FCMMessagesManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FCMMessagesManager.swift; sourceTree = "<group>"; };
 		3059CC0A1FA76CD5007C4C47 /* ChatViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatViewController.swift; sourceTree = "<group>"; };
-		30A969131FD94457009C0121 /* SDKAssets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = SDKAssets.xcassets; sourceTree = "<group>"; };
 		30A969141FD9446D009C0121 /* ChatSenderMediaCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ChatSenderMediaCell.xib; sourceTree = "<group>"; };
 		30A969151FD9446D009C0121 /* ChatSenderTextCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatSenderTextCell.swift; sourceTree = "<group>"; };
 		30A969161FD9446D009C0121 /* ChatSenderTextCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ChatSenderTextCell.xib; sourceTree = "<group>"; };
@@ -148,6 +147,7 @@
 		30C499DD1FCD6393005B2095 /* AddressView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AddressView.xib; sourceTree = "<group>"; };
 		30CFC5091FB5D24200DD95A9 /* ChatCarouselCollectionCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatCarouselCollectionCell.swift; sourceTree = "<group>"; };
 		30CFC50A1FB5D24200DD95A9 /* ChatCarouselCollectionCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ChatCarouselCollectionCell.xib; sourceTree = "<group>"; };
+		30ED78B51FFCC088007CEA67 /* SDKAssets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = SDKAssets.xcassets; sourceTree = "<group>"; };
 		30F60ED81FACB0120010C26F /* InputTextFieldView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = InputTextFieldView.xib; sourceTree = "<group>"; };
 		3AA8E5965D48453B1D3AD48D2FC928BD /* ANAChat-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "ANAChat-umbrella.h"; sourceTree = "<group>"; };
 		3B0AFD2491288033548D6D938C0DCED9 /* Pods-ANAChat_Tests-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-ANAChat_Tests-acknowledgements.markdown"; sourceTree = "<group>"; };
@@ -251,7 +251,7 @@
 		30BE4AB91FA7593100F64363 /* Classes */ = {
 			isa = PBXGroup;
 			children = (
-				30A969131FD94457009C0121 /* SDKAssets.xcassets */,
+				30ED78B51FFCC088007CEA67 /* SDKAssets.xcassets */,
 				30BE4ABC1FA7594500F64363 /* APIHelpers */,
 				30BE4B081FA7594500F64363 /* DBHelpers */,
 				30BE4B061FA7594500F64363 /* MockJson */,