From bc568d54a92e2d4e578e2f77aaed057c5e258234 Mon Sep 17 00:00:00 2001
From: nixzhu <zhuhongxu@gmail.com>
Date: Thu, 22 Oct 2015 15:59:42 +0800
Subject: [PATCH] skills

---
 .../NewFeed/NewFeedViewController.swift         | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/Yep/ViewControllers/NewFeed/NewFeedViewController.swift b/Yep/ViewControllers/NewFeed/NewFeedViewController.swift
index 794729e9..e047f09e 100644
--- a/Yep/ViewControllers/NewFeed/NewFeedViewController.swift
+++ b/Yep/ViewControllers/NewFeed/NewFeedViewController.swift
@@ -40,23 +40,12 @@ class NewFeedViewController: UIViewController {
 
     let max = Int(INT16_MAX)
 
-    let masterSkills: [Skill] = {
+    let skills: [Skill] = {
         if let
             myUserID = YepUserDefaults.userID.value,
             realm = try? Realm(),
             me = userWithUserID(myUserID, inRealm: realm) {
-                return skillsFromUserSkillList(me.masterSkills)
-        }
-
-        return []
-        }()
-
-    let learningSkills: [Skill] = {
-        if let
-            myUserID = YepUserDefaults.userID.value,
-            realm = try? Realm(),
-            me = userWithUserID(myUserID, inRealm: realm) {
-                return skillsFromUserSkillList(me.learningSkills)
+                return skillsFromUserSkillList(me.masterSkills) + skillsFromUserSkillList(me.learningSkills)
         }
 
         return []
@@ -309,7 +298,7 @@ extension NewFeedViewController: UIPickerViewDataSource, UIPickerViewDelegate {
 
     func pickerView(pickerView: UIPickerView, viewForRow row: Int, forComponent component: Int, reusingView view: UIView?) -> UIView {
 
-        let skill = masterSkills[row % masterSkills.count]
+        let skill = skills[row % skills.count]
 
         if let view = view as? FeedSkillPickerItemView {
             view.configureWithSkill(skill)