Use addendum for parceler

app/build.gradle

@@ -99,6 +99,7 @@ ext {
     adapterLayout = '1.1.1'
     materialDialogsVersion = '0.9.4.5'
     leakCanaryVersion = '1.5'
+    addendumVersion = '1.2.1'
 }
 dependencies {
@@ -175,6 +176,9 @@ dependencies {
     compile 'com.github.Commit451:RetrofitProguardRules:2.2.0.0'
     compile 'com.github.Commit451:LoganSquareProGuardRules:1.3.7.0'
     compile 'com.github.Commit451:EventBusProGuardRules:3.0.0.0'
+    compile "com.github.Commit451.Addendum:addendum:$addendumVersion"
+    compile "com.github.Commit451.Addendum:addendum-parceler:$addendumVersion"
+
     compile 'com.github.chrisbanes:PhotoView:2.1.2'
     compile 'me.zhanghai.android.materialprogressbar:library:1.4.1'

app/src/main/java/com/commit451/gitlab/activity/AddIssueActivity.kt

@@ -18,6 +18,8 @@ import butterknife.BindView
 import butterknife.ButterKnife
 import butterknife.OnClick
 import com.commit451.adapterflowlayout.AdapterFlowLayout
+import com.commit451.addendum.parceler.getParcelerParcelableExtra
+import com.commit451.addendum.parceler.putParcelerParcelableExtra
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.adapter.AddIssueLabelAdapter
@@ -26,8 +28,6 @@ import com.commit451.gitlab.adapter.MilestoneSpinnerAdapter
 import com.commit451.gitlab.event.IssueChangedEvent
 import com.commit451.gitlab.event.IssueCreatedEvent
 import com.commit451.gitlab.extension.checkValid
-import com.commit451.gitlab.extension.getParcelerParcelable
-import com.commit451.gitlab.extension.putParcelParcelableExtra
 import com.commit451.gitlab.extension.setup
 import com.commit451.gitlab.model.api.*
 import com.commit451.gitlab.navigation.Navigator
@@ -54,9 +54,9 @@ class AddIssueActivity : MorphActivity() {
         fun newIntent(context: Context, project: Project, issue: Issue?): Intent {
             val intent = Intent(context, AddIssueActivity::class.java)
-            intent.putParcelParcelableExtra(KEY_PROJECT, project)
+            intent.putParcelerParcelableExtra(KEY_PROJECT, project)
             if (issue != null) {
-                intent.putParcelParcelableExtra(KEY_ISSUE, issue)
+                intent.putParcelerParcelableExtra(KEY_ISSUE, issue)
             }
             return intent
         }
@@ -96,8 +96,8 @@ class AddIssueActivity : MorphActivity() {
         morph(root)
         teleprinter = Teleprinter(this)
-        project = intent.getParcelerParcelable<Project>(KEY_PROJECT)!!
-        issue = intent.getParcelerParcelable<Issue>(KEY_ISSUE)
+        project = intent.getParcelerParcelableExtra<Project>(KEY_PROJECT)!!
+        issue = intent.getParcelerParcelableExtra<Issue>(KEY_ISSUE)
         members = HashSet<Member>()
         adapterLabels = AddIssueLabelAdapter(object : AddIssueLabelAdapter.Listener {
             override fun onLabelClicked(label: Label) {
@@ -257,7 +257,7 @@ class AddIssueActivity : MorphActivity() {
         when (requestCode) {
             REQUEST_LABEL ->
                 if (resultCode == Activity.RESULT_OK) {
-                    val label = data?.getParcelerParcelable<Label>(AddLabelActivity.KEY_LABEL)!!
+                    val label = data?.getParcelerParcelableExtra<Label>(AddLabelActivity.KEY_LABEL)!!
                     if (adapterLabels.containsLabel(label)) {
                         Snackbar.make(root, R.string.label_already_added, Snackbar.LENGTH_SHORT)
                                 .show()

app/src/main/java/com/commit451/gitlab/activity/AddLabelActivity.kt

@@ -13,12 +13,12 @@ import android.view.ViewGroup
 import android.widget.TextView
 import butterknife.BindView
 import butterknife.ButterKnife
+import com.commit451.addendum.parceler.getParcelerParcelableExtra
+import com.commit451.addendum.parceler.putParcelerParcelableExtra
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.R.string.labels
 import com.commit451.gitlab.adapter.LabelAdapter
-import com.commit451.gitlab.extension.getParcelerParcelable
-import com.commit451.gitlab.extension.putParcelParcelableExtra
 import com.commit451.gitlab.extension.setup
 import com.commit451.gitlab.model.api.Label
 import com.commit451.gitlab.navigation.Navigator
@@ -76,7 +76,7 @@ class AddLabelActivity : BaseActivity() {
         adapterLabel = LabelAdapter(object : LabelAdapter.Listener {
             override fun onLabelClicked(label: Label, viewHolder: LabelViewHolder) {
                 val data = Intent()
-                data.putParcelParcelableExtra(KEY_LABEL, label)
+                data.putParcelerParcelableExtra(KEY_LABEL, label)
                 setResult(Activity.RESULT_OK, data)
                 finish()
             }
@@ -94,7 +94,7 @@ class AddLabelActivity : BaseActivity() {
         super.onActivityResult(requestCode, resultCode, data)
         when (requestCode) {
             REQUEST_NEW_LABEL -> if (resultCode == Activity.RESULT_OK) {
-                val newLabel = data?.getParcelerParcelable<Label>(AddNewLabelActivity.KEY_NEW_LABEL)!!
+                val newLabel = data?.getParcelerParcelableExtra<Label>(AddNewLabelActivity.KEY_NEW_LABEL)!!
                 adapterLabel.addLabel(newLabel)
             }
         }

app/src/main/java/com/commit451/gitlab/activity/AddMilestoneActivity.kt

@@ -13,14 +13,14 @@ import android.widget.FrameLayout
 import butterknife.BindView
 import butterknife.ButterKnife
 import butterknife.OnClick
+import com.commit451.addendum.parceler.getParcelerParcelableExtra
+import com.commit451.addendum.parceler.putParcelerParcelableExtra
 import com.commit451.easel.Easel
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.event.MilestoneChangedEvent
 import com.commit451.gitlab.event.MilestoneCreatedEvent
 import com.commit451.gitlab.extension.checkValid
-import com.commit451.gitlab.extension.getParcelerParcelable
-import com.commit451.gitlab.extension.putParcelParcelableExtra
 import com.commit451.gitlab.extension.setup
 import com.commit451.gitlab.model.api.Milestone
 import com.commit451.gitlab.rx.CustomSingleObserver
@@ -41,7 +41,7 @@ class AddMilestoneActivity : MorphActivity() {
             val intent = Intent(context, AddMilestoneActivity::class.java)
             intent.putExtra(KEY_PROJECT_ID, projectId)
             if (milestone != null) {
-                intent.putParcelParcelableExtra(KEY_MILESTONE, milestone)
+                intent.putParcelerParcelableExtra(KEY_MILESTONE, milestone)
             }
             return intent
         }
@@ -93,7 +93,7 @@ class AddMilestoneActivity : MorphActivity() {
         morph(root)
         teleprinter = Teleprinter(this)
         projectId = intent.getLongExtra(KEY_PROJECT_ID, -1)
-        milestone = intent.getParcelerParcelable<Milestone>(KEY_MILESTONE)
+        milestone = intent.getParcelerParcelableExtra<Milestone>(KEY_MILESTONE)
         if (milestone != null) {
             bind(milestone!!)
             toolbar.inflateMenu(R.menu.edit)

app/src/main/java/com/commit451/gitlab/activity/AddNewLabelActivity.kt

@@ -17,17 +17,16 @@ import butterknife.BindView
 import butterknife.ButterKnife
 import butterknife.OnClick
 import com.afollestad.materialdialogs.color.ColorChooserDialog
+import com.commit451.addendum.parceler.putParcelerParcelableExtra
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.extension.checkValid
-import com.commit451.gitlab.extension.putParcelParcelableExtra
 import com.commit451.gitlab.extension.text
 import com.commit451.gitlab.model.api.Label
 import com.commit451.gitlab.rx.CustomResponseSingleObserver
 import com.commit451.gitlab.util.ColorUtil
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
-import org.parceler.Parcels
 import retrofit2.HttpException
 import retrofit2.Response
 import timber.log.Timber
@@ -139,7 +138,7 @@ class AddNewLabelActivity : BaseActivity(), ColorChooserDialog.ColorCallback {
                         override fun responseNonNullSuccess(label: Label) {
                             val data = Intent()
-                            data.putParcelParcelableExtra(KEY_NEW_LABEL, label)
+                            data.putParcelerParcelableExtra(KEY_NEW_LABEL, label)
                             setResult(Activity.RESULT_OK, data)
                             finish()
                         }

app/src/main/java/com/commit451/gitlab/activity/AddUserActivity.kt

@@ -13,14 +13,14 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.EditText
 import butterknife.*
+import com.commit451.addendum.parceler.getParcelerParcelableExtra
+import com.commit451.addendum.parceler.putParcelerParcelableExtra
 import com.commit451.alakazam.HideRunnable
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.adapter.UserAdapter
 import com.commit451.gitlab.dialog.AccessDialog
 import com.commit451.gitlab.event.MemberAddedEvent
-import com.commit451.gitlab.extension.getParcelerParcelable
-import com.commit451.gitlab.extension.putParcelParcelableExtra
 import com.commit451.gitlab.extension.setup
 import com.commit451.gitlab.model.api.Group
 import com.commit451.gitlab.model.api.Member
@@ -52,7 +52,7 @@ class AddUserActivity : MorphActivity() {
         fun newIntent(context: Context, group: Group): Intent {
             val intent = Intent(context, AddUserActivity::class.java)
-            intent.putParcelParcelableExtra(KEY_GROUP, group)
+            intent.putParcelerParcelableExtra(KEY_GROUP, group)
             return intent
         }
     }
@@ -112,7 +112,7 @@ class AddUserActivity : MorphActivity() {
         ButterKnife.bind(this)
         teleprinter = Teleprinter(this)
         projectId = intent.getLongExtra(KEY_PROJECT_ID, -1)
-        group = intent.getParcelerParcelable<Group>(KEY_GROUP)
+        group = intent.getParcelerParcelableExtra<Group>(KEY_GROUP)
         dialogAccess = AccessDialog(this, object : AccessDialog.Listener {
             override fun onAccessApplied(accessLevel: Int) {
                 dialogAccess.showLoading()

app/src/main/java/com/commit451/gitlab/activity/AttachActivity.kt

 package com.commit451.gitlab.activity
-import android.animation.TimeInterpolator
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
@@ -12,10 +11,10 @@ import android.view.animation.AccelerateDecelerateInterpolator
 import butterknife.BindView
 import butterknife.ButterKnife
 import butterknife.OnClick
+import com.commit451.addendum.parceler.getParcelerParcelableExtra
+import com.commit451.addendum.parceler.putParcelerParcelableExtra
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
-import com.commit451.gitlab.extension.getParcelerParcelable
-import com.commit451.gitlab.extension.putParcelParcelableExtra
 import com.commit451.gitlab.extension.setup
 import com.commit451.gitlab.extension.toPart
 import com.commit451.gitlab.model.api.FileUploadResponse
@@ -40,7 +39,7 @@ class AttachActivity : BaseActivity() {
         fun newIntent(context: Context, project: Project): Intent {
             val intent = Intent(context, AttachActivity::class.java)
-            intent.putParcelParcelableExtra(KEY_PROJECT, project)
+            intent.putParcelerParcelableExtra(KEY_PROJECT, project)
             return intent
         }
     }
@@ -85,11 +84,11 @@ class AttachActivity : BaseActivity() {
             val animator = ViewAnimationUtils
                     .createCircularReveal(card, 0, card.height, 0f, finalRadius)
             animator.duration = 500
-            animator.interpolator = AccelerateDecelerateInterpolator() as TimeInterpolator?
+            animator.interpolator = AccelerateDecelerateInterpolator()
             animator.start()
         }
-        project = intent.getParcelerParcelable<Project>(KEY_PROJECT)
+        project = intent.getParcelerParcelableExtra<Project>(KEY_PROJECT)
     }
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
@@ -128,7 +127,7 @@ class AttachActivity : BaseActivity() {
                     override fun success(fileUploadResponse: FileUploadResponse) {
                         val data = Intent()
-                        data.putParcelParcelableExtra(KEY_FILE_UPLOAD_RESPONSE, fileUploadResponse)
+                        data.putParcelerParcelableExtra(KEY_FILE_UPLOAD_RESPONSE, fileUploadResponse)
                         setResult(Activity.RESULT_OK, data)
                         finish()
                     }

app/src/main/java/com/commit451/gitlab/activity/BuildActivity.kt

@@ -16,13 +16,13 @@ import android.view.View
 import android.view.ViewGroup
 import butterknife.BindView
 import butterknife.ButterKnife
+import com.commit451.addendum.parceler.getParcelerParcelableExtra
+import com.commit451.addendum.parceler.putParcelerParcelableExtra
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.adapter.BuildSectionsPagerAdapter
 import com.commit451.gitlab.event.BuildChangedEvent
 import com.commit451.gitlab.extension.getDownloadBuildUrl
-import com.commit451.gitlab.extension.getParcelerParcelable
-import com.commit451.gitlab.extension.putParcelParcelableExtra
 import com.commit451.gitlab.model.api.Build
 import com.commit451.gitlab.model.api.Project
 import com.commit451.gitlab.rx.CustomSingleObserver
@@ -45,8 +45,8 @@ class BuildActivity : BaseActivity() {
         fun newIntent(context: Context, project: Project, build: Build): Intent {
             val intent = Intent(context, BuildActivity::class.java)
-            intent.putParcelParcelableExtra(KEY_PROJECT, project)
-            intent.putParcelParcelableExtra(KEY_BUILD, build)
+            intent.putParcelerParcelableExtra(KEY_PROJECT, project)
+            intent.putParcelerParcelableExtra(KEY_BUILD, build)
             return intent
         }
     }
@@ -149,8 +149,8 @@ class BuildActivity : BaseActivity() {
         setContentView(R.layout.activity_build)
         ButterKnife.bind(this)
-        project = intent.getParcelerParcelable<Project>(KEY_PROJECT)!!
-        build = intent.getParcelerParcelable<Build>(KEY_BUILD)!!
+        project = intent.getParcelerParcelableExtra<Project>(KEY_PROJECT)!!
+        build = intent.getParcelerParcelableExtra<Build>(KEY_BUILD)!!
         toolbar.title = String.format(getString(R.string.build_number), build.id)
         toolbar.setNavigationIcon(R.drawable.ic_back_24dp)

app/src/main/java/com/commit451/gitlab/activity/DiffActivity.kt

@@ -12,11 +12,11 @@ import android.view.ViewGroup
 import android.widget.TextView
 import butterknife.BindView
 import butterknife.ButterKnife
+import com.commit451.addendum.parceler.getParcelerParcelableExtra
+import com.commit451.addendum.parceler.putParcelerParcelableExtra
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.adapter.DiffAdapter
-import com.commit451.gitlab.extension.getParcelerParcelable
-import com.commit451.gitlab.extension.putParcelParcelableExtra
 import com.commit451.gitlab.extension.setup
 import com.commit451.gitlab.model.api.Diff
 import com.commit451.gitlab.model.api.Project
@@ -36,8 +36,8 @@ class DiffActivity : BaseActivity() {
         fun newIntent(context: Context, project: Project, commit: RepositoryCommit): Intent {
             val intent = Intent(context, DiffActivity::class.java)
-            intent.putParcelParcelableExtra(EXTRA_PROJECT, project)
-            intent.putParcelParcelableExtra(EXTRA_COMMIT, commit)
+            intent.putParcelerParcelableExtra(EXTRA_PROJECT, project)
+            intent.putParcelerParcelableExtra(EXTRA_COMMIT, commit)
             return intent
         }
     }
@@ -58,8 +58,8 @@ class DiffActivity : BaseActivity() {
         setContentView(R.layout.activity_diff)
         ButterKnife.bind(this)
-        project = intent.getParcelerParcelable<Project>(EXTRA_PROJECT)!!
-        commit = intent.getParcelerParcelable<RepositoryCommit>(EXTRA_COMMIT)!!
+        project = intent.getParcelerParcelableExtra<Project>(EXTRA_PROJECT)!!
+        commit = intent.getParcelerParcelableExtra<RepositoryCommit>(EXTRA_COMMIT)!!
         toolbar.setNavigationIcon(R.drawable.ic_back_24dp)
         toolbar.setNavigationOnClickListener { onBackPressed() }

app/src/main/java/com/commit451/gitlab/activity/FullscreenImageActivity.kt

@@ -7,10 +7,10 @@ import android.support.v7.widget.Toolbar
 import android.widget.ImageView
 import butterknife.BindView
 import butterknife.ButterKnife
+import com.commit451.addendum.parceler.getParcelerParcelableExtra
+import com.commit451.addendum.parceler.putParcelerParcelableExtra
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
-import com.commit451.gitlab.extension.getParcelerParcelable
-import com.commit451.gitlab.extension.putParcelParcelableExtra
 import com.commit451.gitlab.model.api.Project
 import com.github.chrisbanes.photoview.PhotoView
@@ -26,7 +26,7 @@ class FullscreenImageActivity : BaseActivity() {
         fun newIntent(context: Context, project: Project, url: String): Intent {
             val intent = Intent(context, FullscreenImageActivity::class.java)
-            intent.putParcelParcelableExtra(KEY_PROJECT, project)
+            intent.putParcelerParcelableExtra(KEY_PROJECT, project)
             intent.putExtra(KEY_URL, url)
             return intent
         }
@@ -42,7 +42,7 @@ class FullscreenImageActivity : BaseActivity() {
         setContentView(R.layout.activity_fullscreen_image)
         ButterKnife.bind(this)
-        project = intent.getParcelerParcelable(KEY_PROJECT)!!
+        project = intent.getParcelerParcelableExtra(KEY_PROJECT)!!
         toolbar.setNavigationIcon(R.drawable.ic_back_24dp)
         toolbar.setNavigationOnClickListener {

app/src/main/java/com/commit451/gitlab/activity/GroupActivity.kt

@@ -17,13 +17,13 @@ import android.view.View
 import android.widget.ImageView
 import butterknife.BindView
 import butterknife.ButterKnife
+import com.commit451.addendum.parceler.getParcelerParcelableExtra
+import com.commit451.addendum.parceler.putParcelerParcelableExtra
 import com.commit451.alakazam.Alakazam
 import com.commit451.easel.Easel
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.adapter.GroupPagerAdapter
-import com.commit451.gitlab.extension.getParcelerParcelable
-import com.commit451.gitlab.extension.putParcelParcelableExtra
 import com.commit451.gitlab.extension.setup
 import com.commit451.gitlab.model.api.Group
 import com.commit451.gitlab.model.api.GroupDetail
@@ -43,7 +43,7 @@ class GroupActivity : BaseActivity() {
         fun newIntent(context: Context, group: Group): Intent {
             val intent = Intent(context, GroupActivity::class.java)
-            intent.putParcelParcelableExtra(KEY_GROUP, group)
+            intent.putParcelerParcelableExtra(KEY_GROUP, group)
             return intent
         }
@@ -73,7 +73,7 @@ class GroupActivity : BaseActivity() {
         toolbar.setNavigationOnClickListener { onBackPressed() }
         if (intent.hasExtra(KEY_GROUP)) {
-            val group = intent.getParcelerParcelable<Group>(KEY_GROUP)!!
+            val group = intent.getParcelerParcelableExtra<Group>(KEY_GROUP)!!
             bind(group)
         } else {
             progress.visibility = View.VISIBLE

app/src/main/java/com/commit451/gitlab/activity/IssueActivity.kt

@@ -18,14 +18,14 @@ import android.widget.Toast
 import butterknife.BindView
 import butterknife.ButterKnife
 import butterknife.OnClick
+import com.commit451.addendum.parceler.getParcelerParcelableExtra
+import com.commit451.addendum.parceler.putParcelerParcelableExtra
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.adapter.IssueDetailsAdapter
 import com.commit451.gitlab.event.IssueChangedEvent
 import com.commit451.gitlab.event.IssueReloadEvent
-import com.commit451.gitlab.extension.getParcelerParcelable
 import com.commit451.gitlab.extension.getUrl
-import com.commit451.gitlab.extension.putParcelParcelableExtra
 import com.commit451.gitlab.extension.setup
 import com.commit451.gitlab.model.api.FileUploadResponse
 import com.commit451.gitlab.model.api.Issue
@@ -62,8 +62,8 @@ class IssueActivity : BaseActivity() {
         fun newIntent(context: Context, project: Project, issue: Issue): Intent {
             val intent = Intent(context, IssueActivity::class.java)
-            intent.putParcelParcelableExtra(EXTRA_PROJECT, project)
-            intent.putParcelParcelableExtra(EXTRA_SELECTED_ISSUE, issue)
+            intent.putParcelerParcelableExtra(EXTRA_PROJECT, project)
+            intent.putParcelerParcelableExtra(EXTRA_SELECTED_ISSUE, issue)
             return intent
         }
@@ -180,8 +180,8 @@ class IssueActivity : BaseActivity() {
         swipeRefreshLayout.setOnRefreshListener { loadNotes() }
         if (intent.hasExtra(EXTRA_SELECTED_ISSUE)) {
-            project = intent.getParcelerParcelable<Project>(EXTRA_PROJECT)
-            issue = intent.getParcelerParcelable<Issue>(EXTRA_SELECTED_ISSUE)
+            project = intent.getParcelerParcelableExtra<Project>(EXTRA_PROJECT)
+            issue = intent.getParcelerParcelableExtra<Issue>(EXTRA_SELECTED_ISSUE)
             adapterIssueDetails = IssueDetailsAdapter(this@IssueActivity, issue, project!!)
             listNotes.adapter = adapterIssueDetails
             bindIssue()
@@ -232,7 +232,7 @@ class IssueActivity : BaseActivity() {
         when (requestCode) {
             REQUEST_ATTACH ->
                 if (resultCode == Activity.RESULT_OK) {
-                    val response = data?.getParcelerParcelable<FileUploadResponse>(AttachActivity.KEY_FILE_UPLOAD_RESPONSE)!!
+                    val response = data?.getParcelerParcelableExtra<FileUploadResponse>(AttachActivity.KEY_FILE_UPLOAD_RESPONSE)!!
                     progress.visibility = View.GONE
                     sendMessageView.appendText(response.markdown)
                 } else {

app/src/main/java/com/commit451/gitlab/activity/MergeRequestActivity.kt

@@ -11,12 +11,12 @@ import android.view.View
 import android.view.ViewGroup
 import butterknife.BindView
 import butterknife.ButterKnife
+import com.commit451.addendum.parceler.getParcelerParcelableExtra
+import com.commit451.addendum.parceler.putParcelerParcelableExtra
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.adapter.MergeRequestSectionsPagerAdapter
 import com.commit451.gitlab.event.MergeRequestChangedEvent
-import com.commit451.gitlab.extension.getParcelerParcelable
-import com.commit451.gitlab.extension.putParcelParcelableExtra
 import com.commit451.gitlab.extension.setup
 import com.commit451.gitlab.model.api.MergeRequest
 import com.commit451.gitlab.model.api.Project
@@ -36,8 +36,8 @@ class MergeRequestActivity : BaseActivity() {
         fun newIntent(context: Context, project: Project, mergeRequest: MergeRequest): Intent {
             val intent = Intent(context, MergeRequestActivity::class.java)
-            intent.putParcelParcelableExtra(KEY_PROJECT, project)
-            intent.putParcelParcelableExtra(KEY_MERGE_REQUEST, mergeRequest)
+            intent.putParcelerParcelableExtra(KEY_PROJECT, project)
+            intent.putParcelerParcelableExtra(KEY_MERGE_REQUEST, mergeRequest)
             return intent
         }
     }
@@ -56,8 +56,8 @@ class MergeRequestActivity : BaseActivity() {
         setContentView(R.layout.activity_merge_request)
         ButterKnife.bind(this)
-        project = intent.getParcelerParcelable<Project>(KEY_PROJECT)!!
-        mergeRequest = intent.getParcelerParcelable<MergeRequest>(KEY_MERGE_REQUEST)!!
+        project = intent.getParcelerParcelableExtra<Project>(KEY_PROJECT)!!
+        mergeRequest = intent.getParcelerParcelableExtra<MergeRequest>(KEY_MERGE_REQUEST)!!
         toolbar.title = getString(R.string.merge_request_number) + mergeRequest.iid
         toolbar.setNavigationIcon(R.drawable.ic_back_24dp)

app/src/main/java/com/commit451/gitlab/activity/MilestoneActivity.kt

@@ -16,13 +16,13 @@ import android.widget.TextView
 import butterknife.BindView
 import butterknife.ButterKnife
 import butterknife.OnClick
+import com.commit451.addendum.parceler.getParcelerParcelableExtra
+import com.commit451.addendum.parceler.putParcelerParcelableExtra
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.adapter.DividerItemDecoration
 import com.commit451.gitlab.adapter.MilestoneIssueAdapter
 import com.commit451.gitlab.event.MilestoneChangedEvent
-import com.commit451.gitlab.extension.getParcelerParcelable
-import com.commit451.gitlab.extension.putParcelParcelableExtra
 import com.commit451.gitlab.extension.setup
 import com.commit451.gitlab.model.api.Issue
 import com.commit451.gitlab.model.api.Milestone
@@ -44,8 +44,8 @@ class MilestoneActivity : BaseActivity() {
         fun newIntent(context: Context, project: Project, milestone: Milestone): Intent {
             val intent = Intent(context, MilestoneActivity::class.java)
-            intent.putParcelParcelableExtra(EXTRA_PROJECT, project)
-            intent.putParcelParcelableExtra(EXTRA_MILESTONE, milestone)
+            intent.putParcelerParcelableExtra(EXTRA_PROJECT, project)
+            intent.putParcelerParcelableExtra(EXTRA_MILESTONE, milestone)
             return intent
         }
     }
@@ -94,8 +94,8 @@ class MilestoneActivity : BaseActivity() {
         ButterKnife.bind(this)
         App.bus().register(this)
-        project = intent.getParcelerParcelable<Project>(EXTRA_PROJECT)!!
-        milestone = intent.getParcelerParcelable<Milestone>(EXTRA_MILESTONE)!!
+        project = intent.getParcelerParcelableExtra<Project>(EXTRA_PROJECT)!!
+        milestone = intent.getParcelerParcelableExtra<Milestone>(EXTRA_MILESTONE)!!
         toolbar.setNavigationIcon(R.drawable.ic_back_24dp)
         toolbar.setNavigationOnClickListener { onBackPressed() }

app/src/main/java/com/commit451/gitlab/activity/PickBranchOrTagActivity.kt

@@ -9,10 +9,10 @@ import android.support.v7.app.AppCompatActivity
 import butterknife.BindView
 import butterknife.ButterKnife
 import butterknife.OnClick
+import com.commit451.addendum.parceler.getParcelerParcelableExtra
+import com.commit451.addendum.parceler.putParcelerParcelableExtra
 import com.commit451.gitlab.R
 import com.commit451.gitlab.adapter.PickBranchOrTagPagerAdapter
-import com.commit451.gitlab.extension.getParcelerParcelable
-import com.commit451.gitlab.extension.putParcelParcelableExtra
 import com.commit451.gitlab.model.Ref
@@ -31,7 +31,7 @@ class PickBranchOrTagActivity : AppCompatActivity() {
         fun newIntent(context: Context, projectId: Long, currentRef: Ref?): Intent {
             val intent = Intent(context, PickBranchOrTagActivity::class.java)
             intent.putExtra(EXTRA_PROJECT_ID, projectId)
-            intent.putParcelParcelableExtra(EXTRA_CURRENT_REF, currentRef)
+            intent.putParcelerParcelableExtra(EXTRA_CURRENT_REF, currentRef)
             return intent
         }
     }
@@ -49,7 +49,7 @@ class PickBranchOrTagActivity : AppCompatActivity() {
         setContentView(R.layout.activity_pick_branch_or_tag)
         ButterKnife.bind(this)
         val projectId = intent.getLongExtra(EXTRA_PROJECT_ID, -1)
-        val currentRef = intent.getParcelerParcelable<Ref>(EXTRA_CURRENT_REF)
+        val currentRef = intent.getParcelerParcelableExtra<Ref>(EXTRA_CURRENT_REF)
         viewPager.adapter = PickBranchOrTagPagerAdapter(this, supportFragmentManager, projectId, currentRef)
         tabLayout.setupWithViewPager(viewPager)
         if (currentRef != null) {

app/src/main/java/com/commit451/gitlab/activity/PipelineActivity.kt

@@ -11,12 +11,12 @@ import android.view.View
 import android.view.ViewGroup
 import butterknife.BindView
 import butterknife.ButterKnife
+import com.commit451.addendum.parceler.getParcelerParcelableExtra
+import com.commit451.addendum.parceler.putParcelerParcelableExtra
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.adapter.PipelineSectionsPagerAdapter
 import com.commit451.gitlab.event.PipelineChangedEvent
-import com.commit451.gitlab.extension.getParcelerParcelable
-import com.commit451.gitlab.extension.putParcelParcelableExtra
 import com.commit451.gitlab.model.api.Pipeline
 import com.commit451.gitlab.model.api.Project
 import com.commit451.gitlab.rx.CustomSingleObserver
@@ -38,8 +38,8 @@ class PipelineActivity : BaseActivity() {
         fun newIntent(context: Context, project: Project, pipeline: Pipeline): Intent {
             val intent = Intent(context, PipelineActivity::class.java)
-            intent.putParcelParcelableExtra(KEY_PROJECT, project)
-            intent.putParcelParcelableExtra(KEY_PIPELINE, pipeline)
+            intent.putParcelerParcelableExtra(KEY_PROJECT, project)
+            intent.putParcelerParcelableExtra(KEY_PIPELINE, pipeline)
             return intent
         }
     }
@@ -112,8 +112,8 @@ class PipelineActivity : BaseActivity() {
         setContentView(R.layout.activity_pipeline)
         ButterKnife.bind(this)
-        project = intent.getParcelerParcelable<Project>(KEY_PROJECT)!!
-        pipeline = intent.getParcelerParcelable<Pipeline>(KEY_PIPELINE)!!
+        project = intent.getParcelerParcelableExtra<Project>(KEY_PROJECT)!!
+        pipeline = intent.getParcelerParcelableExtra<Pipeline>(KEY_PIPELINE)!!
         toolbar.title = String.format(getString(R.string.pipeline_number), pipeline.id)
         toolbar.setNavigationIcon(R.drawable.ic_back_24dp)

app/src/main/java/com/commit451/gitlab/activity/ProjectActivity.kt

@@ -16,14 +16,16 @@ import android.view.ViewGroup
 import android.widget.Toast
 import butterknife.BindView
 import butterknife.ButterKnife
+import com.commit451.addendum.parceler.getParcelerParcelable
+import com.commit451.addendum.parceler.getParcelerParcelableExtra
+import com.commit451.addendum.parceler.putParcelerParcelable
+import com.commit451.addendum.parceler.putParcelerParcelableExtra
 import com.commit451.alakazam.HideRunnable
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
 import com.commit451.gitlab.adapter.ProjectSectionsPagerAdapter
 import com.commit451.gitlab.data.Prefs
 import com.commit451.gitlab.event.ProjectReloadEvent
-import com.commit451.gitlab.extension.getParcelerParcelable
-import com.commit451.gitlab.extension.putParcelParcelableExtra
 import com.commit451.gitlab.extension.setup
 import com.commit451.gitlab.fragment.BaseFragment
 import com.commit451.gitlab.model.Ref
@@ -50,7 +52,7 @@ class ProjectActivity : BaseActivity() {
         fun newIntent(context: Context, project: Project): Intent {
             val intent = Intent(context, ProjectActivity::class.java)
-            intent.putParcelParcelableExtra(EXTRA_PROJECT, project)
+            intent.putParcelerParcelableExtra(EXTRA_PROJECT, project)
             return intent
         }
@@ -120,7 +122,7 @@ class ProjectActivity : BaseActivity() {
         Prefs.startingView = Prefs.STARTING_VIEW_PROJECTS
         setContentView(R.layout.activity_project)
         ButterKnife.bind(this)
-        var project: Project? = intent.getParcelerParcelable(EXTRA_PROJECT)
+        var project: Project? = intent.getParcelerParcelableExtra(EXTRA_PROJECT)
         if (savedInstanceState != null) {
             project = savedInstanceState.getParcelerParcelable<Project>(STATE_PROJECT)
@@ -151,7 +153,7 @@ class ProjectActivity : BaseActivity() {
         super.onActivityResult(requestCode, resultCode, data)
         when (requestCode) {
             REQUEST_BRANCH_OR_TAG -> if (resultCode == Activity.RESULT_OK) {
-                ref = data?.getParcelerParcelable<Ref>(PickBranchOrTagActivity.EXTRA_REF)
+                ref = data?.getParcelerParcelableExtra<Ref>(PickBranchOrTagActivity.EXTRA_REF)
                 broadcastLoad()
             }
         }
@@ -159,8 +161,8 @@ class ProjectActivity : BaseActivity() {
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        outState.putParcelParcelableExtra(STATE_REF, ref)
-        outState.putParcelParcelableExtra(STATE_PROJECT, project)
+        outState.putParcelerParcelable(STATE_REF, ref)
+        outState.putParcelerParcelable(STATE_PROJECT, project)
     }
     override fun onBackPressed() {

app/src/main/java/com/commit451/gitlab/activity/UserActivity.kt

@@ -13,12 +13,12 @@ import android.support.v7.widget.Toolbar
 import android.widget.ImageView
 import butterknife.BindView
 import butterknife.ButterKnife
+import com.commit451.addendum.parceler.getParcelerParcelableExtra
+import com.commit451.addendum.parceler.putParcelerParcelableExtra
 import com.commit451.alakazam.Alakazam
 import com.commit451.easel.Easel
 import com.commit451.gitlab.App
 import com.commit451.gitlab.R
-import com.commit451.gitlab.extension.getParcelerParcelable
-import com.commit451.gitlab.extension.putParcelParcelableExtra
 import com.commit451.gitlab.fragment.FeedFragment
 import com.commit451.gitlab.model.api.UserBasic
 import com.commit451.gitlab.transformation.PaletteTransformation
@@ -35,7 +35,7 @@ class UserActivity : BaseActivity() {
         fun newIntent(context: Context, user: UserBasic): Intent {
             val intent = Intent(context, UserActivity::class.java)
-            intent.putParcelParcelableExtra(KEY_USER, user)
+            intent.putParcelerParcelableExtra(KEY_USER, user)
             return intent
         }
     }
@@ -50,7 +50,7 @@ class UserActivity : BaseActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_user)
         ButterKnife.bind(this)
-        user = intent.getParcelerParcelable<UserBasic>(KEY_USER)!!
+        user = intent.getParcelerParcelableExtra<UserBasic>(KEY_USER)!!
         // Default content and scrim colors
         collapsingToolbarLayout.setCollapsedTitleTextColor(Color.WHITE)

app/src/main/java/com/commit451/gitlab/extension/Bundle.kt

-package com.commit451.gitlab.extension
-
-import android.os.Bundle
-import org.parceler.Parcels
-
-//Bundle extensions
-
-fun Bundle.putParcelParcelableExtra(key: String, thing: Any?) {
-    this.putParcelable(key, org.parceler.Parcels.wrap(thing))
-}
-
-/**
- * Get Parcelable that was put in the bundle using Parceler
- */
-fun <T> Bundle.getParcelerParcelable(key: String): T? {
-    return Parcels.unwrap<T>(getParcelable(key))
-}
\ No newline at end of file

app/src/main/java/com/commit451/gitlab/extension/Intent.kt

-package com.commit451.gitlab.extension
-
-import android.content.Intent
-import org.parceler.Parcels
-
-/**
- * Get Parcelable that was put in the intent using Parceler
- */
-fun <T> Intent.getParcelerParcelable(key: String): T? {
-    return Parcels.unwrap<T>(getParcelableExtra(key))
-}
-
-fun Intent.putParcelParcelableExtra(key: String, thing: Any?) {
-    this.putExtra(key, org.parceler.Parcels.wrap(thing))
-}