app/src/main/java/com/commit451/gitlab/fragment/PipelinesFragment.kt

@@ -17,8 +17,8 @@ import butterknife.BindView
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.activity.ProjectActivity
-import com.commit451.gitlab.adapter.PipelineAdapter
 import com.commit451.gitlab.adapter.DividerItemDecoration
+import com.commit451.gitlab.adapter.PipelineAdapter
 import com.commit451.gitlab.event.PipelineChangedEvent
 import com.commit451.gitlab.event.ProjectReloadEvent
 import com.commit451.gitlab.extension.setup
@@ -76,11 +76,11 @@ class PipelinesFragment : ButterKnifeFragment() {
         scope = scopes[0]
     }
-    override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater!!.inflate(R.layout.fragment_pipelines, container, false)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_pipelines, container, false)
     }
-    override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         App.bus().register(this)
@@ -88,7 +88,7 @@ class PipelinesFragment : ButterKnifeFragment() {
         adapterPipelines = PipelineAdapter(object : PipelineAdapter.Listener {
             override fun onPipelinesClicked(pipeline: Pipeline) {
                 if (project != null) {
-                    Navigator.navigateToPipeline(activity, project!!, pipeline)
+                    Navigator.navigateToPipeline(baseActivty, project!!, pipeline)
                 } else {
                     Snackbar.make(root, getString(R.string.wait_for_project_to_load), Snackbar.LENGTH_SHORT)
                             .show()
@@ -97,7 +97,7 @@ class PipelinesFragment : ButterKnifeFragment() {
         })
         layoutManagerPipelines = LinearLayoutManager(activity)
         listPipelines.layoutManager = layoutManagerPipelines
-        listPipelines.addItemDecoration(DividerItemDecoration(activity))
+        listPipelines.addItemDecoration(DividerItemDecoration(baseActivty))
         listPipelines.adapter = adapterPipelines
         listPipelines.addOnScrollListener(onScrollListener)

app/src/main/java/com/commit451/gitlab/fragment/ProjectFragment.kt

@@ -60,9 +60,9 @@ class ProjectFragment : ButterKnifeFragment() {
         if (project != null) {
             val owner = project.owner
             if (owner != null) {
-                Navigator.navigateToUser(activity, owner)
+                Navigator.navigateToUser(baseActivty, owner)
             } else {
-                Navigator.navigateToGroup(activity, project.namespace.id)
+                Navigator.navigateToGroup(baseActivty, project.namespace.id)
             }
         }
     }
@@ -70,7 +70,7 @@ class ProjectFragment : ButterKnifeFragment() {
     @OnClick(R.id.root_fork)
     fun onForkClicked() {
         project?.let {
-            AlertDialog.Builder(activity)
+            AlertDialog.Builder(baseActivty)
                     .setTitle(R.string.project_fork_title)
                     .setMessage(R.string.project_fork_message)
                     .setNegativeButton(R.string.cancel, null)
@@ -120,15 +120,11 @@ class ProjectFragment : ButterKnifeFragment() {
         }
     }
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_project, container, false)
     }
-    override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater!!.inflate(R.layout.fragment_project, container, false)
-    }
-
-    override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         App.bus().register(this)

app/src/main/java/com/commit451/gitlab/fragment/ProjectMembersFragment.kt

@@ -72,21 +72,21 @@ class ProjectMembersFragment : ButterKnifeFragment() {
     @OnClick(R.id.add_user_button)
     fun onAddUserClick(fab: View) {
-        Navigator.navigateToAddProjectMember(activity, fab, project!!.id)
+        Navigator.navigateToAddProjectMember(baseActivty, fab, project!!.id)
     }
-    override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater!!.inflate(R.layout.fragment_members, container, false)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_members, container, false)
     }
-    override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         App.bus().register(this)
         adapterProjectMembers = ProjectMembersAdapter(object : ProjectMembersAdapter.Listener {
             override fun onProjectMemberClicked(member: User, memberGroupViewHolder: ProjectMemberViewHolder) {
-                Navigator.navigateToUser(activity, memberGroupViewHolder.image, member)
+                Navigator.navigateToUser(baseActivty, memberGroupViewHolder.image, member)
             }
             override fun onRemoveMember(member: User) {
@@ -108,7 +108,7 @@ class ProjectMembersFragment : ButterKnifeFragment() {
             }
             override fun onChangeAccess(member: User) {
-                val accessDialog = AccessDialog(activity, member, project!!.id)
+                val accessDialog = AccessDialog(baseActivty, member, project!!.id)
                 accessDialog.setOnAccessChangedListener(object : AccessDialog.OnAccessChangedListener {
                     override fun onAccessChanged(member: User, accessLevel: String) {
                         loadData()
@@ -118,7 +118,7 @@ class ProjectMembersFragment : ButterKnifeFragment() {
             }
             override fun onSeeGroupClicked() {
-                Navigator.navigateToGroup(activity, project!!.namespace.id)
+                Navigator.navigateToGroup(baseActivty, project!!.namespace.id)
             }
         })
         layoutManagerMembers = GridLayoutManager(activity, 2)

app/src/main/java/com/commit451/gitlab/fragment/ProjectsFragment.kt

@@ -105,21 +105,21 @@ class ProjectsFragment : ButterKnifeFragment() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        mode = arguments.getInt(EXTRA_MODE)
-        query = arguments.getString(EXTRA_QUERY)
+        mode = arguments?.getInt(EXTRA_MODE)!!
+        query = arguments?.getString(EXTRA_QUERY)
     }
-    override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater!!.inflate(R.layout.fragment_projects, container, false)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_projects, container, false)
     }
-    override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        adapterProjects = ProjectAdapter(activity, object : ProjectAdapter.Listener {
+        adapterProjects = ProjectAdapter(baseActivty, object : ProjectAdapter.Listener {
             override fun onProjectClicked(project: Project) {
                 if (listener == null) {
-                    Navigator.navigateToProject(activity, project)
+                    Navigator.navigateToProject(baseActivty, project)
                 } else {
                     listener!!.onProjectClicked(project)
                 }
@@ -127,7 +127,7 @@ class ProjectsFragment : ButterKnifeFragment() {
         })
         layoutManagerProjects = LinearLayoutManager(activity)
         listProjects.layoutManager = layoutManagerProjects
-        listProjects.addItemDecoration(DividerItemDecoration(activity))
+        listProjects.addItemDecoration(DividerItemDecoration(baseActivty))
         listProjects.adapter = adapterProjects
         listProjects.addOnScrollListener(onScrollListener)
@@ -160,7 +160,7 @@ class ProjectsFragment : ButterKnifeFragment() {
             }
             MODE_GROUP -> {
                 showLoading()
-                val group = arguments.getParcelerParcelable<Group>(EXTRA_GROUP) ?: throw IllegalStateException("You must also pass a group if you want to show a groups projects")
+                val group = arguments?.getParcelerParcelable<Group>(EXTRA_GROUP) ?: throw IllegalStateException("You must also pass a group if you want to show a groups projects")
                 actuallyLoadIt(getGitLab().getGroupProjects(group.id))
             }
             else -> throw IllegalStateException(mode.toString() + " is not defined")

app/src/main/java/com/commit451/gitlab/fragment/SnippetsFragment.kt

@@ -70,7 +70,7 @@ class SnippetsFragment : ButterKnifeFragment() {
     @OnClick(R.id.add)
     fun onAddClicked(fab: View) {
         if (project != null) {
-            Navigator.navigateToAddMilestone(activity, fab, project!!)
+            Navigator.navigateToAddMilestone(baseActivty, fab, project!!)
         } else {
             Snackbar.make(root, getString(R.string.wait_for_project_to_load), Snackbar.LENGTH_SHORT)
                     .show()
@@ -83,11 +83,11 @@ class SnippetsFragment : ButterKnifeFragment() {
         states = resources.getStringArray(R.array.milestone_state_values)
     }
-    override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater!!.inflate(R.layout.fragment_snippets, container, false)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_snippets, container, false)
     }
-    override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         App.bus().register(this)
@@ -99,7 +99,7 @@ class SnippetsFragment : ButterKnifeFragment() {
         })
         layoutManagerSnippets = LinearLayoutManager(activity)
         listSnippets.layoutManager = layoutManagerSnippets
-        listSnippets.addItemDecoration(DividerItemDecoration(activity))
+        listSnippets.addItemDecoration(DividerItemDecoration(baseActivty))
         listSnippets.adapter = adapterSnippets
         listSnippets.addOnScrollListener(onScrollListener)

app/src/main/java/com/commit451/gitlab/fragment/TodoFragment.kt

@@ -68,21 +68,21 @@ class TodoFragment : ButterKnifeFragment() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        mode = arguments.getInt(EXTRA_MODE)
+        mode = arguments?.getInt(EXTRA_MODE)!!
     }
-    override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater!!.inflate(R.layout.fragment_todo, container, false)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_todo, container, false)
     }
-    override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         adapterTodos = TodoAdapter(object : TodoAdapter.Listener {
             override fun onTodoClicked(todo: Todo) {
                 val targetUrl = todo.targetUrl
                 if (targetUrl != null) {
-                    Navigator.navigateToUrl(activity, targetUrl, App.get().getAccount())
+                    Navigator.navigateToUrl(baseActivty, targetUrl, App.get().getAccount())
                 } else {
                     Snackbar.make(swipeRefreshLayout, R.string.not_a_valid_url, Snackbar.LENGTH_SHORT)
                 }

app/src/main/java/com/commit451/gitlab/fragment/UsersFragment.kt

@@ -67,19 +67,19 @@ class UsersFragment : ButterKnifeFragment() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        query = arguments.getString(EXTRA_QUERY)
+        query = arguments?.getString(EXTRA_QUERY)
     }
-    override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater!!.inflate(R.layout.fragment_projects, container, false)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_projects, container, false)
     }
-    override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         adapterUser = UserAdapter(object : UserAdapter.Listener {
             override fun onUserClicked(user: User, userViewHolder: UserViewHolder) {
-                Navigator.navigateToUser(activity, userViewHolder.image, user)
+                Navigator.navigateToUser(baseActivty, userViewHolder.image, user)
             }
         })
         layoutManagerUser = GridLayoutManager(activity, 2)

app/src/main/java/com/commit451/gitlab/model/Account.kt

 package com.commit451.gitlab.model
-import com.commit451.gitlab.model.api.User
 import com.squareup.moshi.Json
 import org.parceler.Parcel
 import java.util.*
@@ -21,34 +20,32 @@ open class Account : Comparable<Account> {
     var trustedCertificate: String? = null
     @field:Json(name = "trusted_hostname")
     var trustedHostname: String? = null
-    @field:Json(name = "private_key_alias")
-    var privateKeyAlias: String? = null
-    @field:Json(name = "user")
-    var user: User? = null
+    @field:Json(name = "email")
+    var email: String? = null
+    @field:Json(name = "username")
+    var username: String? = null
     @field:Json(name = "last_used")
     var lastUsed: Date? = null
-    override fun compareTo(another: Account): Int {
-        return lastUsed!!.compareTo(another.lastUsed)
+    override fun compareTo(other: Account): Int {
+        return lastUsed?.compareTo(other.lastUsed) ?: 0
     }
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
-        if (other?.javaClass != javaClass) return false
+        if (javaClass != other?.javaClass) return false
         other as Account
         if (serverUrl != other.serverUrl) return false
-        if (user != other.user) return false
+        if (privateToken != other.privateToken) return false
         return true
     }
     override fun hashCode(): Int {
         var result = serverUrl?.hashCode() ?: 0
-        result = 31 * result + (user?.hashCode() ?: 0)
+        result = 31 * result + (privateToken?.hashCode() ?: 0)
         return result
     }
-
-
 }

app/src/main/java/com/commit451/gitlab/navigation/Navigator.kt

@@ -10,6 +10,7 @@ import android.support.annotation.DrawableRes
 import android.support.v4.app.ActivityOptionsCompat
 import android.view.View
 import android.widget.ImageView
+import com.commit451.addendum.themeAttrColor
 import com.commit451.easel.Easel
 import com.commit451.gitlab.R
 import com.commit451.gitlab.activity.*
@@ -87,11 +88,6 @@ object Navigator {
         activity.startActivity(LoginActivity.newIntent(activity, showClose))
     }
-    fun navigateToWebSignin(activity: Activity, url: String, extractingPrivateToken: Boolean, requestCode: Int) {
-        val intent = WebLoginActivity.newIntent(activity, url, extractingPrivateToken)
-        activity.startActivityForResult(intent, requestCode)
-    }
-
     fun navigateToSearch(activity: Activity) {
         activity.startActivity(SearchActivity.newIntent(activity))
     }
@@ -206,7 +202,7 @@ object Navigator {
     private fun startMorphActivity(activity: Activity, fab: View?, @DrawableRes drawableRes: Int, intent: Intent) {
         if (Build.VERSION.SDK_INT >= 21 && fab != null) {
-            FabTransform.addExtras(intent, Easel.getThemeAttrColor(activity, R.attr.colorAccent),
+            FabTransform.addExtras(intent, activity.themeAttrColor(R.attr.colorAccent),
                     drawableRes)
             val options = ActivityOptions.makeSceneTransitionAnimation(activity, fab, activity.getString(R.string.transition_morph))
             activity.startActivity(intent, options.toBundle())

app/src/main/java/com/commit451/gitlab/ssl/CustomTrustManager.kt

@@ -17,33 +17,16 @@ class CustomTrustManager : X509TrustManager {
     private var sslSocketFactory: SSLSocketFactory? = null
     private var hostnameVerifier: HostnameVerifier? = null
-    fun setTrustedCertificate(trustedCertificate: String?) {
-        if (this.trustedCertificate == null && trustedCertificate == null || this.trustedCertificate != null && this.trustedCertificate == trustedCertificate) {
-            return
-        }
-
+    fun setTrustedCertificate(trustedCertificate: String) {
         this.trustedCertificate = trustedCertificate
         sslSocketFactory = null
     }
-    fun setTrustedHostname(trustedHostname: String?) {
-        if (this.trustedHostname == null && trustedHostname == null || this.trustedHostname != null && this.trustedHostname == trustedHostname) {
-            return
-        }
-
+    fun setTrustedHostname(trustedHostname: String) {
         this.trustedHostname = trustedHostname
         hostnameVerifier = null
     }
-    fun setPrivateKeyAlias(privateKeyAlias: String?) {
-        if (this.privateKeyAlias == null && privateKeyAlias == null || this.privateKeyAlias != null && this.privateKeyAlias == privateKeyAlias) {
-            return
-        }
-
-        this.privateKeyAlias = privateKeyAlias
-        sslSocketFactory = null
-    }
-
     @Throws(CertificateException::class)
     override fun checkClientTrusted(chain: Array<X509Certificate>, authType: String) {
         X509TrustManagerProvider.x509TrustManager.checkClientTrusted(chain, authType)

app/src/main/java/com/commit451/gitlab/util/IntentUtil.kt

@@ -4,6 +4,7 @@ import android.content.Intent
 import android.net.Uri
 import android.support.design.widget.Snackbar
 import android.view.View
+import com.commit451.addendum.themeAttrColor
 import com.commit451.easel.Easel
 import com.commit451.gitlab.R
 import com.commit451.gitlab.activity.BaseActivity
@@ -24,7 +25,7 @@ object IntentUtil {
         }
         val resolvedUrl = if (account == null) url else url.resolveUrl(account)
-        val primaryColor = Easel.getThemeAttrColor(activity, R.attr.colorPrimary)
+        val primaryColor = activity.themeAttrColor(R.attr.colorPrimary)
         SimpleChromeCustomTabs.getInstance()
                 .withFallback(BrowserFallback(activity))
                 .withIntentCustomizer(LabCoatIntentCustomizer(activity, primaryColor))

app/src/main/java/com/commit451/gitlab/view/LabCoatNavigationView.kt

@@ -14,8 +14,8 @@ import android.widget.TextView
 import butterknife.BindView
 import butterknife.ButterKnife
 import butterknife.OnClick
-import com.commit451.alakazam.HideRunnable
-import com.commit451.easel.Easel
+import com.commit451.addendum.themeAttrColor
+import com.commit451.alakazam.fadeOut
 import com.commit451.gitlab.App
 import com.commit451.gitlab.BuildConfig
 import com.commit451.gitlab.R
@@ -50,6 +50,7 @@ class LabCoatNavigationView : NavigationView {
     lateinit var listAccounts: RecyclerView
     lateinit var adapterAccounts: AccountAdapter
+    var user: User? = null
     val mOnNavigationItemSelectedListener = OnNavigationItemSelectedListener { menuItem ->
         when (menuItem.itemId) {
@@ -131,7 +132,9 @@ class LabCoatNavigationView : NavigationView {
     @OnClick(R.id.profile_image)
     fun onUserImageClick(imageView: ImageView) {
-        Navigator.navigateToUser(context as Activity, imageView, App.get().getAccount().user!!)
+        user?.let {
+            Navigator.navigateToUser(context as Activity, imageView, it)
+        }
     }
     @OnClick(R.id.button_debug)
@@ -158,7 +161,7 @@ class LabCoatNavigationView : NavigationView {
     fun init() {
         App.bus().register(this)
-        val colorPrimary = Easel.getThemeAttrColor(context, R.attr.colorPrimary)
+        val colorPrimary = context.themeAttrColor(R.attr.colorPrimary)
         setNavigationItemSelectedListener(mOnNavigationItemSelectedListener)
         inflateMenu(R.menu.navigation)
@@ -222,18 +225,13 @@ class LabCoatNavigationView : NavigationView {
                     override fun responseNonNullSuccess(userFull: User) {
                         //Store the newly retrieved user to the account so that it stays up to date
                         // in local storage
-                        val account = App.get().getAccount()
-                        account.user = userFull
-                        Prefs.updateAccount(account)
+                        this@LabCoatNavigationView.user = user
                         bindUser(userFull)
                     }
                 })
     }
     fun bindUser(user: User) {
-        if (context == null) {
-            return
-        }
         if (user.username != null) {
             textUserName.text = user.username
         }
@@ -257,7 +255,7 @@ class LabCoatNavigationView : NavigationView {
             listAccounts.animate().alpha(1.0f)
             iconArrow.animate().rotation(180.0f)
         } else {
-            listAccounts.animate().alpha(0.0f).withEndAction(HideRunnable(listAccounts))
+            listAccounts.fadeOut()
             iconArrow.animate().rotation(0.0f)
         }
     }
@@ -267,7 +265,6 @@ class LabCoatNavigationView : NavigationView {
         account.lastUsed = Date()
         App.get().setAccount(account)
         Prefs.updateAccount(account)
-        bindUser(account.user!!)
         toggleAccounts()
         App.bus().post(ReloadDataEvent())
         App.bus().post(CloseDrawerEvent())

app/src/main/java/com/commit451/gitlab/view/LabCoatProgressView.kt

@@ -3,6 +3,7 @@ package com.commit451.gitlab.view
 import android.content.Context
 import android.content.res.ColorStateList
 import android.util.AttributeSet
+import com.commit451.addendum.themeAttrColor
 import com.commit451.easel.Easel
 import com.commit451.gitlab.R
@@ -24,7 +25,7 @@ class LabCoatProgressView : MaterialProgressBar {
     }
     private fun init() {
-        val color = Easel.getThemeAttrColor(context, R.attr.colorAccent)
+        val color = context.themeAttrColor(R.attr.colorAccent)
         progressTintList = ColorStateList.valueOf(color)
     }
 }

app/src/main/java/com/commit451/gitlab/view/SendMessageView.kt

@@ -10,6 +10,7 @@ import android.widget.LinearLayout
 import butterknife.BindView
 import butterknife.ButterKnife
 import butterknife.OnClick
+import com.commit451.addendum.themeAttrColor
 import com.commit451.easel.Easel
 import com.commit451.gitlab.R
@@ -58,7 +59,7 @@ class SendMessageView : LinearLayout {
         View.inflate(context, R.layout.view_send_message, this)
         orientation = LinearLayout.HORIZONTAL
         ButterKnife.bind(this)
-        setBackgroundColor(Easel.getThemeAttrColor(context, R.attr.colorPrimary))
+        setBackgroundColor(context.themeAttrColor(R.attr.colorPrimary))
         if (Build.VERSION.SDK_INT >= 21) {
             elevation = resources.getDimensionPixelSize(R.dimen.toolbar_elevation).toFloat()
         }

app/src/main/java/com/commit451/gitlab/viewHolder/AccountViewHolder.kt

@@ -47,7 +47,7 @@ class AccountViewHolder(view: View) : RecyclerView.ViewHolder(view) {
     fun bind(account: Account, isActive: Boolean, colorSelected: Int) {
         textServer.text = account.serverUrl.toString()
-        textUsername.text = account.user!!.username
+        textUsername.text = account.email
         if (isActive) {
             itemView.setBackgroundColor(colorSelected)
@@ -56,7 +56,7 @@ class AccountViewHolder(view: View) : RecyclerView.ViewHolder(view) {
         }
         App.get().picasso
-                .load(ImageUtil.getAvatarUrl(account.user, itemView.resources.getDimensionPixelSize(R.dimen.user_list_image_size)))
+                .load(ImageUtil.getAvatarUrl(account.email, itemView.resources.getDimensionPixelSize(R.dimen.user_list_image_size)))
                 .transform(CircleTransformation())
                 .into(image)
     }

app/src/main/java/com/commit451/gitlab/viewHolder/BranchViewHolder.kt

@@ -7,6 +7,8 @@ import android.view.ViewGroup
 import android.widget.TextView
 import butterknife.BindView
 import butterknife.ButterKnife
+import com.commit451.addendum.recyclerview.context
+import com.commit451.addendum.themeAttrColor
 import com.commit451.easel.Easel
 import com.commit451.gitlab.R
 import com.commit451.gitlab.model.api.Branch
@@ -31,7 +33,7 @@ class BranchViewHolder(view: View) : RecyclerView.ViewHolder(view) {
     init {
         ButterKnife.bind(this, view)
-        colorHighlighted = Easel.getThemeAttrColor(itemView.context, R.attr.colorControlHighlight)
+        colorHighlighted = context.themeAttrColor(R.attr.colorControlHighlight)
     }
     fun bind(branch: Branch, selected: Boolean) {

app/src/main/java/com/commit451/gitlab/viewHolder/TagViewHolder.kt

@@ -7,6 +7,8 @@ import android.view.ViewGroup
 import android.widget.TextView
 import butterknife.BindView
 import butterknife.ButterKnife
+import com.commit451.addendum.recyclerview.context
+import com.commit451.addendum.themeAttrColor
 import com.commit451.easel.Easel
 import com.commit451.gitlab.R
 import com.commit451.gitlab.model.api.Tag
@@ -31,7 +33,7 @@ class TagViewHolder(view: View) : RecyclerView.ViewHolder(view) {
     init {
         ButterKnife.bind(this, view)
-        colorHighlighted = Easel.getThemeAttrColor(itemView.context, R.attr.colorControlHighlight)
+        colorHighlighted = context.themeAttrColor(R.attr.colorControlHighlight)
     }
     fun bind(tag: Tag, selected: Boolean) {

app/src/main/java/com/commit451/gitlab/widget/AccountViewHolder.kt

@@ -38,10 +38,10 @@ class AccountViewHolder(view: View) : TypedViewHolder<Account>(view) {
     override fun bind(position: Int, item: Account) {
         textServer.text = item.serverUrl.toString()
-        textUsername.text = item.user!!.username
+        textUsername.text = item.email
         Picasso.with(context)
-                .load(ImageUtil.getAvatarUrl(item.user, itemView.resources.getDimensionPixelSize(R.dimen.user_list_image_size)))
+                .load(ImageUtil.getAvatarUrl(item.email, itemView.resources.getDimensionPixelSize(R.dimen.user_list_image_size)))
                 .transform(CircleTransformation())
                 .into(image)
     }

app/src/main/java/com/commit451/gitlab/widget/ProjectFeedWidgetService.kt → app/src/main/java/com/commit451/gitlab/widget/FeedWidgetService.kt

@@ -27,7 +27,7 @@ import timber.log.Timber
 /**
  * Service that basically just defers everything to a Factory. Yay!
  */
-class ProjectFeedWidgetService : RemoteViewsService() {
+class FeedWidgetService : RemoteViewsService() {
     companion object {
@@ -42,7 +42,7 @@ class ProjectFeedWidgetService : RemoteViewsService() {
         fun newIntent(context: Context, widgetId: Int, account: Account, feedUrl: String): Intent {
             val adapter = MoshiProvider.moshi.adapter<Account>(Account::class.java)
             val accountJson = adapter.toJson(account)
-            val intent = Intent(context, ProjectFeedWidgetService::class.java)
+            val intent = Intent(context, FeedWidgetService::class.java)
             intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, widgetId)
             intent.putExtra(EXTRA_ACCOUNT_JSON, accountJson)
             intent.putExtra(EXTRA_FEED_URL, feedUrl)

app/src/main/java/com/commit451/gitlab/widget/ProjectFeedWidgetProvider.kt

@@ -49,7 +49,7 @@ class ProjectFeedWidgetProvider : AppWidgetProvider() {
             val account = ProjectFeedWidgetPrefs.getAccount(context, widgetId)
             val feedUrl = ProjectFeedWidgetPrefs.getFeedUrl(context, widgetId)
             if (account != null && feedUrl!= null) {
-                val intent = ProjectFeedWidgetService.newIntent(context, widgetId, account, feedUrl)
+                val intent = FeedWidgetService.newIntent(context, widgetId, account, feedUrl)
                 intent.data = Uri.parse(intent.toUri(Intent.URI_INTENT_SCHEME))