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

@@ -61,15 +61,15 @@ class BuildDescriptionFragment : ButterKnifeFragment() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        project = arguments.getParcelerParcelable<Project>(KEY_PROJECT)!!
-        build = arguments.getParcelerParcelable<Build>(KEY_BUILD)!!
+        project = arguments?.getParcelerParcelable<Project>(KEY_PROJECT)!!
+        build = arguments?.getParcelerParcelable<Build>(KEY_BUILD)!!
     }
-    override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater!!.inflate(R.layout.fragment_build_description, container, false)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_build_description, container, false)
     }
-    override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         swipeRefreshLayout.setOnRefreshListener { load() }
@@ -122,13 +122,13 @@ class BuildDescriptionFragment : ButterKnifeFragment() {
         val timeTaken = DateUtil.getTimeTaken(startedTime, finishedTime)
         val duration = String.format(getString(R.string.build_duration), timeTaken)
         textDuration.text = duration
-        val created = String.format(getString(R.string.build_created), DateUtil.getRelativeTimeSpanString(activity, build.createdAt))
+        val created = String.format(getString(R.string.build_created), DateUtil.getRelativeTimeSpanString(baseActivty, build.createdAt))
         textCreated.text = created
         val ref = String.format(getString(R.string.build_ref), build.ref)
         textRef.text = ref
         val finishedAt = build.finishedAt
         if (finishedAt != null) {
-            val finished = String.format(getString(R.string.build_finished), DateUtil.getRelativeTimeSpanString(activity, finishedAt))
+            val finished = String.format(getString(R.string.build_finished), DateUtil.getRelativeTimeSpanString(baseActivty, finishedAt))
             textFinished.text = finished
             textFinished.visibility = View.VISIBLE
         } else {

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

@@ -50,15 +50,15 @@ class BuildLogFragment : ButterKnifeFragment() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        project = arguments.getParcelerParcelable<Project>(KEY_PROJECT)!!
-        build = arguments.getParcelerParcelable<Build>(KEY_BUILD)!!
+        project = arguments?.getParcelerParcelable<Project>(KEY_PROJECT)!!
+        build = arguments?.getParcelerParcelable<Build>(KEY_BUILD)!!
     }
-    override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater!!.inflate(R.layout.fragment_build_log, container, false)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_build_log, container, false)
     }
-    override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         swipeRefreshLayout.setOnRefreshListener { loadData() }

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

@@ -76,11 +76,11 @@ class BuildsFragment : ButterKnifeFragment() {
         scope = scopes[0]
     }
-    override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater!!.inflate(R.layout.fragment_builds, container, false)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_builds, 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 BuildsFragment : ButterKnifeFragment() {
         adapterBuilds = BuildAdapter(object : BuildAdapter.Listener {
             override fun onBuildClicked(build: Build) {
                 if (project != null) {
-                    Navigator.navigateToBuild(activity, project!!, build)
+                    Navigator.navigateToBuild(baseActivty, project!!, build)
                 } else {
                     Snackbar.make(root, getString(R.string.wait_for_project_to_load), Snackbar.LENGTH_SHORT)
                             .show()
@@ -97,7 +97,7 @@ class BuildsFragment : ButterKnifeFragment() {
         })
         layoutManagerBuilds = LinearLayoutManager(activity)
         listBuilds.layoutManager = layoutManagerBuilds
-        listBuilds.addItemDecoration(DividerItemDecoration(activity))
+        listBuilds.addItemDecoration(DividerItemDecoration(baseActivty))
         listBuilds.adapter = adapterBuilds
         listBuilds.addOnScrollListener(onScrollListener)

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

@@ -11,11 +11,11 @@ import butterknife.Unbinder
  */
 open class ButterKnifeFragment : BaseFragment() {
-    var unbinder: Unbinder? = null
-    override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
+    private var unbinder: Unbinder? = null
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        unbinder = ButterKnife.bind(this, view!!)
+        unbinder = ButterKnife.bind(this, view)
     }
     override fun onDestroyView() {

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

@@ -57,23 +57,23 @@ class CommitsFragment : ButterKnifeFragment() {
         }
     }
-    override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater!!.inflate(R.layout.fragment_commits, container, false)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_commits, container, false)
     }
-    override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         App.bus().register(this)
         adapterCommits = CommitAdapter(object : CommitAdapter.Listener {
             override fun onCommitClicked(commit: RepositoryCommit) {
-                Navigator.navigateToDiffActivity(activity, project!!, commit)
+                Navigator.navigateToDiffActivity(baseActivty, project!!, commit)
             }
         })
         layoutManagerCommits = LinearLayoutManager(activity)
         listCommits.layoutManager = layoutManagerCommits
-        listCommits.addItemDecoration(DividerItemDecoration(activity))
+        listCommits.addItemDecoration(DividerItemDecoration(baseActivty))
         listCommits.adapter = adapterCommits
         listCommits.addOnScrollListener(onScrollListener)

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

@@ -53,14 +53,14 @@ class FeedFragment : ButterKnifeFragment() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        feedUrl = Uri.parse(arguments.getString(EXTRA_FEED_URL))
+        feedUrl = Uri.parse(arguments?.getString(EXTRA_FEED_URL))
     }
-    override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater!!.inflate(R.layout.fragment_feed, container, false)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_feed, container, false)
     }
-    override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         adapterFeed = FeedAdapter(object : FeedAdapter.Listener {
@@ -69,12 +69,12 @@ class FeedFragment : ButterKnifeFragment() {
                     Snackbar.make(swipeRefreshLayout, R.string.not_a_valid_url, Snackbar.LENGTH_SHORT)
                             .show()
                 } else {
-                    Navigator.navigateToUrl(activity, entry.link.href, App.get().getAccount())
+                    Navigator.navigateToUrl(baseActivty, entry.link.href, App.get().getAccount())
                 }
             }
         })
         listEntries.layoutManager = LinearLayoutManager(activity)
-        listEntries.addItemDecoration(DividerItemDecoration(activity))
+        listEntries.addItemDecoration(DividerItemDecoration(baseActivty))
         listEntries.adapter = adapterFeed
         swipeRefreshLayout.setOnRefreshListener { loadData() }
@@ -84,12 +84,12 @@ class FeedFragment : ButterKnifeFragment() {
     override fun onResume() {
         super.onResume()
-        SimpleChromeCustomTabs.getInstance().connectTo(activity)
+        SimpleChromeCustomTabs.getInstance().connectTo(baseActivty)
     }
     override fun onPause() {
         if (SimpleChromeCustomTabs.getInstance().isConnected) {
-            SimpleChromeCustomTabs.getInstance().disconnectFrom(activity)
+            SimpleChromeCustomTabs.getInstance().disconnectFrom(baseActivty)
         }
         super.onPause()
     }

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

@@ -62,11 +62,11 @@ class FilesFragment : ButterKnifeFragment() {
         override fun onFileClicked(treeItem: RepositoryTreeObject) {
             val path = currentPath + treeItem.name
-            Navigator.navigateToFile(activity, project!!.id, path, ref!!)
+            Navigator.navigateToFile(baseActivty, project!!.id, path, ref!!)
         }
         override fun onCopyClicked(treeItem: RepositoryTreeObject) {
-            val clipboard = activity.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+            val clipboard = baseActivty.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
             // Creates a new text clip to put on the clipboard
             val clip = ClipData.newPlainText(treeItem.name, treeItem.getUrl(project!!, ref!!, currentPath).toString())
@@ -84,16 +84,16 @@ class FilesFragment : ButterKnifeFragment() {
         }
     }
-    override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater?.inflate(R.layout.fragment_files, container, false)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_files, container, false)
     }
-    override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         adapterFiles = FileAdapter(filesAdapterListener)
         list.layoutManager = LinearLayoutManager(activity)
-        list.addItemDecoration(DividerItemDecoration(activity))
+        list.addItemDecoration(DividerItemDecoration(baseActivty))
         list.adapter = adapterFiles
         adapterBreadcrumb = BreadcrumbAdapter()

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

@@ -77,7 +77,7 @@ class GroupMembersFragment : ButterKnifeFragment() {
     private val listener = object : GroupMembersAdapter.Listener {
         override fun onUserClicked(member: User, holder: ProjectMemberViewHolder) {
-            Navigator.navigateToUser(activity, holder.image, member)
+            Navigator.navigateToUser(baseActivty, holder.image, member)
         }
         override fun onUserRemoveClicked(member: User) {
@@ -99,7 +99,7 @@ class GroupMembersFragment : ButterKnifeFragment() {
         }
         override fun onUserChangeAccessClicked(member: User) {
-            val accessDialog = AccessDialog(activity, member, group)
+            val accessDialog = AccessDialog(baseActivty, member, group)
             accessDialog.setOnAccessChangedListener(object : AccessDialog.OnAccessChangedListener {
                 override fun onAccessChanged(member: User, accessLevel: String) {
                     loadData()
@@ -111,14 +111,14 @@ class GroupMembersFragment : ButterKnifeFragment() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        group = arguments.getParcelerParcelable<Group>(KEY_GROUP)!!
+        group = arguments?.getParcelerParcelable<Group>(KEY_GROUP)!!
     }
-    override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater!!.inflate(R.layout.fragment_group_members, container, false)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_group_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)
@@ -150,7 +150,7 @@ class GroupMembersFragment : ButterKnifeFragment() {
     @OnClick(R.id.add_user_button)
     fun onAddUserClick(fab: View) {
-        Navigator.navigateToAddGroupMember(activity, fab, group)
+        Navigator.navigateToAddGroupMember(baseActivty, fab, group)
     }
     override fun loadData() {

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

@@ -59,15 +59,15 @@ class IssueDetailsFragment : ButterKnifeFragment() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        project = arguments.getParcelerParcelable<Project>(KEY_PROJECT)!!
-        issue = arguments.getParcelerParcelable<Issue>(KEY_ISSUE)!!
+        project = arguments?.getParcelerParcelable<Project>(KEY_PROJECT)!!
+        issue = arguments?.getParcelerParcelable<Issue>(KEY_ISSUE)!!
     }
-    override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater?.inflate(R.layout.fragment_issue_details, container, false)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_issue_details, container, false)
     }
-    override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         adapterLabels = IssueLabelsAdapter(object : IssueLabelsAdapter.Listener {
@@ -108,7 +108,7 @@ class IssueDetailsFragment : ButterKnifeFragment() {
         }
         author += resources.getString(R.string.created_issue)
         if (issue.createdAt != null) {
-            author = author + " " + DateUtil.getRelativeTimeSpanString(context, issue.createdAt)
+            author = author + " " + DateUtil.getRelativeTimeSpanString(baseActivty, issue.createdAt)
         }
         textAuthor.text = author
         if (issue.milestone != null) {

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

@@ -86,15 +86,15 @@ class IssueDiscussionFragment : ButterKnifeFragment() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        project = arguments.getParcelerParcelable<Project>(KEY_PROJECT)!!
-        issue = arguments.getParcelerParcelable<Issue>(KEY_ISSUE)!!
+        project = arguments?.getParcelerParcelable<Project>(KEY_PROJECT)!!
+        issue = arguments?.getParcelerParcelable<Issue>(KEY_ISSUE)!!
     }
-    override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater?.inflate(R.layout.fragment_merge_request_discussion, container, false)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_merge_request_discussion, container, false)
     }
-    override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         teleprinter = Teleprinter(activity)
@@ -110,8 +110,8 @@ class IssueDiscussionFragment : ButterKnifeFragment() {
             }
             override fun onAttachmentClicked() {
-                val intent = AttachActivity.newIntent(activity, project)
-                val activityOptions = TransitionFactory.createFadeInOptions(activity)
+                val intent = AttachActivity.newIntent(baseActivty, project)
+                val activityOptions = TransitionFactory.createFadeInOptions(baseActivty)
                 startActivityForResult(intent, REQUEST_ATTACH, activityOptions.toBundle())
             }
         }

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

@@ -75,7 +75,7 @@ class IssuesFragment : ButterKnifeFragment() {
     @OnClick(R.id.add_issue_button)
     fun onAddIssueClick(fab: View) {
         if (project != null) {
-            Navigator.navigateToAddIssue(activity, fab, project!!)
+            Navigator.navigateToAddIssue(baseActivty, fab, project!!)
         } else {
             Snackbar.make(root, getString(R.string.wait_for_project_to_load), Snackbar.LENGTH_SHORT)
                     .show()
@@ -88,11 +88,11 @@ class IssuesFragment : ButterKnifeFragment() {
         states = resources.getStringArray(R.array.issue_state_values)
     }
-    override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater!!.inflate(R.layout.fragment_issues, container, false)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_issues, container, false)
     }
-    override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         App.bus().register(this)
@@ -100,7 +100,7 @@ class IssuesFragment : ButterKnifeFragment() {
         adapterIssue = IssueAdapter(object : IssueAdapter.Listener {
             override fun onIssueClicked(issue: Issue) {
                 if (project != null) {
-                    Navigator.navigateToIssue(activity, project!!, issue)
+                    Navigator.navigateToIssue(baseActivty, project!!, issue)
                 } else {
                     Snackbar.make(root, getString(R.string.wait_for_project_to_load), Snackbar.LENGTH_SHORT)
                             .show()
@@ -109,7 +109,7 @@ class IssuesFragment : ButterKnifeFragment() {
         })
         layoutManagerIssues = LinearLayoutManager(activity)
         listIssues.layoutManager = layoutManagerIssues
-        listIssues.addItemDecoration(DividerItemDecoration(activity))
+        listIssues.addItemDecoration(DividerItemDecoration(baseActivty))
         listIssues.adapter = adapterIssue
         listIssues.addOnScrollListener(onScrollListener)

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

@@ -72,25 +72,25 @@ class MergeRequestCommitsFragment : ButterKnifeFragment() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        project = arguments.getParcelerParcelable<Project>(KEY_PROJECT)
-        mergeRequest = arguments.getParcelerParcelable<MergeRequest>(KEY_MERGE_REQUEST)
+        project = arguments?.getParcelerParcelable<Project>(KEY_PROJECT)
+        mergeRequest = arguments?.getParcelerParcelable<MergeRequest>(KEY_MERGE_REQUEST)
     }
-    override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater!!.inflate(R.layout.fragment_merge_request_commits, container, false)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_merge_request_commits, container, false)
     }
-    override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         adapterCommits = CommitAdapter(object : CommitAdapter.Listener {
             override fun onCommitClicked(commit: RepositoryCommit) {
-                Navigator.navigateToDiffActivity(activity, project!!, commit)
+                Navigator.navigateToDiffActivity(baseActivty, project!!, commit)
             }
         })
         layoutManagerCommits = LinearLayoutManager(activity)
         listCommits.layoutManager = layoutManagerCommits
-        listCommits.addItemDecoration(DividerItemDecoration(activity))
+        listCommits.addItemDecoration(DividerItemDecoration(baseActivty))
         listCommits.adapter = adapterCommits
         listCommits.addOnScrollListener(onScrollListener)

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

@@ -59,15 +59,15 @@ class MergeRequestDetailsFragment : ButterKnifeFragment() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        project = arguments.getParcelerParcelable<Project>(KEY_PROJECT)!!
-        mergeRequest = arguments.getParcelerParcelable<MergeRequest>(KEY_MERGE_REQUEST)!!
+        project = arguments?.getParcelerParcelable<Project>(KEY_PROJECT)!!
+        mergeRequest = arguments?.getParcelerParcelable<MergeRequest>(KEY_MERGE_REQUEST)!!
     }
-    override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater?.inflate(R.layout.fragment_issue_details, container, false)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_issue_details, container, false)
     }
-    override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         adapterLabels = IssueLabelsAdapter(object : IssueLabelsAdapter.Listener {
@@ -108,7 +108,7 @@ class MergeRequestDetailsFragment : ButterKnifeFragment() {
         }
         author += resources.getString(R.string.created_issue)
         if (mergeRequest.createdAt != null) {
-            author = author + " " + DateUtil.getRelativeTimeSpanString(context, mergeRequest.createdAt)
+            author = author + " " + DateUtil.getRelativeTimeSpanString(baseActivty, mergeRequest.createdAt)
         }
         textAuthor.text = author
         if (mergeRequest.milestone != null) {

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

@@ -86,15 +86,15 @@ class MergeRequestDiscussionFragment : ButterKnifeFragment() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        project = arguments.getParcelerParcelable<Project>(KEY_PROJECT)!!
-        mergeRequest = arguments.getParcelerParcelable<MergeRequest>(KEY_MERGE_REQUEST)!!
+        project = arguments?.getParcelerParcelable<Project>(KEY_PROJECT)!!
+        mergeRequest = arguments?.getParcelerParcelable<MergeRequest>(KEY_MERGE_REQUEST)!!
     }
-    override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater?.inflate(R.layout.fragment_merge_request_discussion, container, false)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_merge_request_discussion, container, false)
     }
-    override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         teleprinter = Teleprinter(activity)
@@ -110,8 +110,8 @@ class MergeRequestDiscussionFragment : ButterKnifeFragment() {
             }
             override fun onAttachmentClicked() {
-                val intent = AttachActivity.newIntent(activity, project)
-                val activityOptions = TransitionFactory.createFadeInOptions(activity)
+                val intent = AttachActivity.newIntent(baseActivty, project)
+                val activityOptions = TransitionFactory.createFadeInOptions(baseActivty)
                 startActivityForResult(intent, REQUEST_ATTACH, activityOptions.toBundle())
             }
         }

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

@@ -76,27 +76,27 @@ class MergeRequestsFragment : ButterKnifeFragment() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        state = context.resources.getString(R.string.merge_request_state_value_default)
-        states = context.resources.getStringArray(R.array.merge_request_state_values)
+        state = baseActivty.resources.getString(R.string.merge_request_state_value_default)
+        states = baseActivty.resources.getStringArray(R.array.merge_request_state_values)
     }
-    override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater!!.inflate(R.layout.fragment_merge_request, container, false)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_merge_request, container, false)
     }
-    override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         App.bus().register(this)
         adapterMergeRequests = MergeRequestAdapter(object : MergeRequestAdapter.Listener {
             override fun onMergeRequestClicked(mergeRequest: MergeRequest) {
-                Navigator.navigateToMergeRequest(activity, project!!, mergeRequest)
+                Navigator.navigateToMergeRequest(baseActivty, project!!, mergeRequest)
             }
         })
         layoutManagerMergeRequests = LinearLayoutManager(activity)
         listMergeRequests.layoutManager = layoutManagerMergeRequests
-        listMergeRequests.addItemDecoration(DividerItemDecoration(activity))
+        listMergeRequests.addItemDecoration(DividerItemDecoration(baseActivty))
         listMergeRequests.adapter = adapterMergeRequests
         listMergeRequests.addOnScrollListener(onScrollListener)

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

@@ -72,7 +72,7 @@ class MilestonesFragment : 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()
@@ -85,23 +85,23 @@ class MilestonesFragment : 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_milestones, container, false)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_milestones, container, false)
     }
-    override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         App.bus().register(this)
         adapterMilestones = MilestoneAdapter(object : MilestoneAdapter.Listener {
             override fun onMilestoneClicked(milestone: Milestone) {
-                Navigator.navigateToMilestone(activity, project!!, milestone)
+                Navigator.navigateToMilestone(baseActivty, project!!, milestone)
             }
         })
         layoutManagerMilestones = LinearLayoutManager(activity)
         listMilestones.layoutManager = layoutManagerMilestones
-        listMilestones.addItemDecoration(DividerItemDecoration(activity))
+        listMilestones.addItemDecoration(DividerItemDecoration(baseActivty))
         listMilestones.adapter = adapterMilestones
         listMilestones.addOnScrollListener(mOnScrollListener)

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

@@ -54,24 +54,24 @@ class PickBranchFragment : ButterKnifeFragment() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        projectId = arguments.getLong(EXTRA_PROJECT_ID)
+        projectId = arguments?.getLong(EXTRA_PROJECT_ID)!!
     }
-    override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater!!.inflate(R.layout.fragment_pick_branch, container, false)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_pick_branch, container, false)
     }
-    override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        val existingRef = arguments.getParcelerParcelable<Ref>(EXTRA_REF)
+        val existingRef = arguments?.getParcelerParcelable<Ref>(EXTRA_REF)!!
         adapterBranches = BranchAdapter(existingRef, object : BranchAdapter.Listener {
             override fun onBranchClicked(entry: Branch) {
                 val data = Intent()
                 val ref = Ref(Ref.TYPE_BRANCH, entry.name)
                 data.putParcelerParcelableExtra(PickBranchOrTagActivity.EXTRA_REF, ref)
-                activity.setResult(Activity.RESULT_OK, data)
-                activity.finish()
+                activity?.setResult(Activity.RESULT_OK, data)
+                activity?.finish()
             }
         })
         listProjects.layoutManager = LinearLayoutManager(activity)

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

@@ -54,24 +54,24 @@ class PickTagFragment : ButterKnifeFragment() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        projectId = arguments.getLong(EXTRA_PROJECT_ID)
+        projectId = arguments?.getLong(EXTRA_PROJECT_ID)!!
     }
-    override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater!!.inflate(R.layout.fragment_pick_tag, container, false)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_pick_tag, container, false)
     }
-    override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        val ref = arguments.getParcelerParcelable<Ref>(EXTRA_CURRENT_REF)
+        val ref = arguments?.getParcelerParcelable<Ref>(EXTRA_CURRENT_REF)!!
         adapterTags = TagAdapter(ref, object : TagAdapter.Listener {
             override fun onTagClicked(entry: Tag) {
                 val data = Intent()
                 val newRef = Ref(Ref.TYPE_TAG, entry.name)
                 data.putParcelerParcelableExtra(PickBranchOrTagActivity.EXTRA_REF, newRef)
-                activity.setResult(Activity.RESULT_OK, data)
-                activity.finish()
+                activity?.setResult(Activity.RESULT_OK, data)
+                activity?.finish()
             }
         })
         listProjects.layoutManager = LinearLayoutManager(activity)

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

@@ -60,15 +60,15 @@ class PipelineDescriptionFragment : ButterKnifeFragment() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        project = arguments.getParcelerParcelable<Project>(KEY_PROJECT)!!
-        pipeline = arguments.getParcelerParcelable<Pipeline>(KEY_PIPELINE)!!
+        project = arguments?.getParcelerParcelable<Project>(KEY_PROJECT)!!
+        pipeline = arguments?.getParcelerParcelable<Pipeline>(KEY_PIPELINE)!!
     }
-    override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater!!.inflate(R.layout.fragment_pipeline_description, container, false)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_pipeline_description, container, false)
     }
-    override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         swipeRefreshLayout.setOnRefreshListener { load() }
@@ -123,7 +123,7 @@ class PipelineDescriptionFragment : ButterKnifeFragment() {
         val name = String.format(getString(R.string.pipeline_name), pipeline.id)
         textName.text = name
-        val created = String.format(getString(R.string.pipeline_created), DateUtil.getRelativeTimeSpanString(activity, createdTime))
+        val created = String.format(getString(R.string.pipeline_created), DateUtil.getRelativeTimeSpanString(baseActivty, createdTime))
         textCreated.text = created
         val finished = String.format(getString(R.string.pipeline_finished), pipeline.finishedAt)
@@ -141,7 +141,7 @@ class PipelineDescriptionFragment : ButterKnifeFragment() {
         if (pipeline.finishedAt != null) {
-            val finished = String.format(getString(R.string.pipeline_finished), DateUtil.getRelativeTimeSpanString(activity, pipeline.finishedAt))
+            val finished = String.format(getString(R.string.pipeline_finished), DateUtil.getRelativeTimeSpanString(baseActivty, pipeline.finishedAt))
             textFinished.text = finished
             textFinished.visibility = View.VISIBLE
         } else {

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

 package com.commit451.gitlab.fragment
 import android.os.Bundle
-import android.os.Parcelable
 import android.support.design.widget.Snackbar
 import android.support.v4.widget.SwipeRefreshLayout
 import android.view.LayoutInflater
@@ -9,6 +8,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import butterknife.BindView
+import com.commit451.addendum.parceler.getParcelerParcelable
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.event.PipelineChangedEvent
@@ -61,15 +61,15 @@ class PipelineJobsFragment : ButterKnifeFragment() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        project = Parcels.unwrap<Project>(arguments.getParcelable<Parcelable>(KEY_PROJECT))
-        pipeline = Parcels.unwrap<Pipeline>(arguments.getParcelable<Parcelable>(KEY_PIPELINE))
+        project = arguments?.getParcelerParcelable(KEY_PROJECT)!!
+        pipeline = arguments?.getParcelerParcelable(KEY_PIPELINE)!!
     }
-    override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater!!.inflate(R.layout.fragment_pipeline_description, container, false)
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_pipeline_description, container, false)
     }
-    override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         swipeRefreshLayout.setOnRefreshListener { load() }
@@ -117,7 +117,7 @@ class PipelineJobsFragment : ButterKnifeFragment() {
         val name = String.format(getString(R.string.pipeline_name), pipeline.id)
         textName.text = name
-        val created = String.format(getString(R.string.build_created), DateUtil.getRelativeTimeSpanString(activity, pipeline.createdAt))
+        val created = String.format(getString(R.string.build_created), DateUtil.getRelativeTimeSpanString(baseActivty, pipeline.createdAt))
         textCreated.text = created
         val finished = String.format(getString(R.string.pipeline_finished), pipeline.finishedAt)
@@ -135,7 +135,7 @@ class PipelineJobsFragment : ButterKnifeFragment() {
         if (pipeline.finishedAt != null) {
-            val finished = String.format(getString(R.string.pipeline_finished), DateUtil.getRelativeTimeSpanString(activity, pipeline.finishedAt))
+            val finished = String.format(getString(R.string.pipeline_finished), DateUtil.getRelativeTimeSpanString(baseActivty, pipeline.finishedAt))
             textFinished.text = finished
             textFinished.visibility = View.VISIBLE
         } else {