Skip to content
Snippets Groups Projects
Commit e41e580f authored by Kateryna Kostiuk's avatar Kateryna Kostiuk
Browse files

UI: fix conversation request view

Change-Id: Icba597077f417388cd31a8f7780ce1dc393536ab
parent 6a3f1dd0
No related branches found
No related tags found
No related merge requests found
...@@ -39,6 +39,11 @@ class ContactRequestCell: UITableViewCell, NibReusable { ...@@ -39,6 +39,11 @@ class ContactRequestCell: UITableViewCell, NibReusable {
}) })
} }
override func willMove(toWindow newWindow: UIWindow?) {
super.willMove(toWindow: newWindow)
drawBanButtonImage()
}
override func setHighlighted(_ highlighted: Bool, animated: Bool) { override func setHighlighted(_ highlighted: Bool, animated: Bool) {
if highlighted { if highlighted {
self.backgroundColor = UIColor.jamiUITableViewCellSelection self.backgroundColor = UIColor.jamiUITableViewCellSelection
...@@ -51,7 +56,6 @@ class ContactRequestCell: UITableViewCell, NibReusable { ...@@ -51,7 +56,6 @@ class ContactRequestCell: UITableViewCell, NibReusable {
override func prepareForReuse() { override func prepareForReuse() {
super.prepareForReuse() super.prepareForReuse()
drawBanButtonImage()
self.disposeBag = DisposeBag() self.disposeBag = DisposeBag()
} }
......
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
</state> </state>
<userDefinedRuntimeAttributes> <userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius"> <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
<real key="value" value="17"/> <real key="value" value="20"/>
</userDefinedRuntimeAttribute> </userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="borderColor"> <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
<color key="value" red="0.0" green="0.69803921568627447" blue="0.043137254901960784" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="value" red="0.0" green="0.69803921568627447" blue="0.043137254901960784" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
<color key="value" red="1" green="0.5" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> <color key="value" red="1" green="0.5" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
</userDefinedRuntimeAttribute> </userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius"> <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
<real key="value" value="17"/> <real key="value" value="20"/>
</userDefinedRuntimeAttribute> </userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes> </userDefinedRuntimeAttributes>
</button> </button>
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
<color key="value" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> <color key="value" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
</userDefinedRuntimeAttribute> </userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius"> <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
<real key="value" value="17"/> <real key="value" value="20"/>
</userDefinedRuntimeAttribute> </userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="boolean" keyPath="roundedCorners" value="YES"/> <userDefinedRuntimeAttribute type="boolean" keyPath="roundedCorners" value="YES"/>
</userDefinedRuntimeAttributes> </userDefinedRuntimeAttributes>
......
...@@ -90,7 +90,9 @@ class ContactRequestsViewController: UIViewController, StoryboardBased, ViewMode ...@@ -90,7 +90,9 @@ class ContactRequestsViewController: UIViewController, StoryboardBased, ViewMode
cell.acceptButton.rx.tap cell.acceptButton.rx.tap
.subscribe(onNext: { [weak self] in .subscribe(onNext: { [weak self] in
self?.acceptButtonTapped(withItem: item) self?.acceptButtonTapped(withItem: item)
if self?.tableView.numberOfRows(inSection: 0) ?? 0 <= 1 {
self?.view.isHidden = true self?.view.isHidden = true
}
}) })
.disposed(by: cell.disposeBag) .disposed(by: cell.disposeBag)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment