diff --git a/librx/Base.lproj/Main.storyboard b/librx/Base.lproj/Main.storyboard
index 96fe4a0..d7188b2 100644
--- a/librx/Base.lproj/Main.storyboard
+++ b/librx/Base.lproj/Main.storyboard
@@ -272,6 +272,19 @@
+
@@ -284,10 +297,13 @@
+
+
+
@@ -325,6 +341,7 @@
+
@@ -362,6 +379,8 @@
+
+
@@ -401,6 +420,7 @@
+
diff --git a/librx/ExploreTableViewController.swift b/librx/ExploreTableViewController.swift
index 4b97d8b..291cdea 100644
--- a/librx/ExploreTableViewController.swift
+++ b/librx/ExploreTableViewController.swift
@@ -88,7 +88,7 @@ class ExploreTableViewController: UITableViewController {
targetUserName = source.title
performSegueWithIdentifier("showUserDetailsSegue", sender: self)
}
-
+
}
}
diff --git a/librx/ProfileViewController.swift b/librx/ProfileViewController.swift
index a79d54e..4ec9f90 100644
--- a/librx/ProfileViewController.swift
+++ b/librx/ProfileViewController.swift
@@ -17,6 +17,7 @@ class ProfileViewController: UIViewController{
@IBOutlet weak var follosNumLabel: UILabel!
@IBOutlet weak var avatarImageView: UIImageView!
@IBOutlet weak var contentView: UIView!
+ @IBOutlet weak var followButton: UIButton!
private var containerViewController: ContainerViewController!
private var screenSize: CGRect!
@@ -35,19 +36,20 @@ class ProfileViewController: UIViewController{
super.viewDidLoad()
self.navigationController?.navigationBar.backgroundColor = UIColor(red: 0, green: 0, blue: 0, alpha: 0.1)
-
self.navigationController?.navigationBar.titleTextAttributes = [NSForegroundColorAttributeName: UIColor.whiteColor()]
screenSize = UIScreen.mainScreen().bounds
screenWidth = screenSize.width
screenHeight = screenSize.height
-
self.avatarImageView.layer.cornerRadius = self.avatarImageView.frame.width / 2
self.avatarImageView.clipsToBounds = true
self.avatarImageView.layer.borderWidth = 2
self.avatarImageView.layer.borderColor = UIColor.whiteColor().CGColor
+ self.followButton.layer.borderWidth = 1
+ self.followButton.layer.borderColor = UIColor.whiteColor().CGColor
+
navigationController?.navigationBar.backgroundColor = UIColor.whiteColor()
navigationController?.navigationBar.tintColor = UIColor.whiteColor()
@@ -58,11 +60,12 @@ class ProfileViewController: UIViewController{
override func viewDidAppear(animated: Bool) {
super.viewDidDisappear(animated)
-
if self.isMe {
loadMeProfile()
} else{
loadUserProfile(userId!)
+ print(">>>> \(LocalStore.accessUserId())")
+
}
}
@@ -72,8 +75,6 @@ class ProfileViewController: UIViewController{
LibrxService.profile(userId) { [weak self](profile) -> () in
if let selfView = self {
-
- print(profile.avatar)
let avatar = NSURL(string: profile.avatar)
selfView.avatarImageView.sd_setImageWithURL(avatar, placeholderImage: UIImage(named: "default"))
selfView.nameLabel.text = profile.name