Skip to content
Snippets Groups Projects
Commit 31bf450a authored by John Carlson's avatar John Carlson
Browse files

Use addendum for parceler

parent d0a8ca52
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 56 additions and 54 deletions
app/src/main/java/com/commit451/gitlab/fragment/BuildDescriptionFragment.kt
+ 4
− 5
View file @ 31bf450a
@@ -8,18 +8,17 @@ import android.view.View
import android.view.ViewGroup
import android.widget.TextView
import butterknife.BindView
import com.commit451.addendum.parceler.getParcelerParcelable
import com.commit451.addendum.parceler.putParcelerParcelable
import com.commit451.gitlab.App
import com.commit451.gitlab.R
import com.commit451.gitlab.event.BuildChangedEvent
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.rx.CustomSingleObserver
import com.commit451.gitlab.util.DateUtil
import com.trello.rxlifecycle2.android.FragmentEvent
import org.greenrobot.eventbus.Subscribe
import org.parceler.Parcels
import timber.log.Timber
import java.util.*
 
@@ -36,8 +35,8 @@ class BuildDescriptionFragment : ButterKnifeFragment() {
fun newInstance(project: Project, build: Build): BuildDescriptionFragment {
val fragment = BuildDescriptionFragment()
val args = Bundle()
args.putParcelParcelableExtra(KEY_PROJECT, project)
args.putParcelParcelableExtra(KEY_BUILD, build)
args.putParcelerParcelable(KEY_PROJECT, project)
args.putParcelerParcelable(KEY_BUILD, build)
fragment.arguments = args
return fragment
}
app/src/main/java/com/commit451/gitlab/fragment/BuildLogFragment.kt
+ 4
− 5
View file @ 31bf450a
@@ -7,19 +7,18 @@ import android.view.View
import android.view.ViewGroup
import android.widget.TextView
import butterknife.BindView
import com.commit451.addendum.parceler.getParcelerParcelable
import com.commit451.addendum.parceler.putParcelerParcelable
import com.commit451.gitlab.App
import com.commit451.gitlab.R
import com.commit451.gitlab.event.BuildChangedEvent
import com.commit451.gitlab.extension.getParcelerParcelable
import com.commit451.gitlab.extension.getRawBuildUrl
import com.commit451.gitlab.extension.putParcelParcelableExtra
import com.commit451.gitlab.extension.setup
import com.commit451.gitlab.model.api.Build
import com.commit451.gitlab.model.api.Project
import com.commit451.gitlab.rx.CustomSingleObserver
import com.trello.rxlifecycle2.android.FragmentEvent
import org.greenrobot.eventbus.Subscribe
import org.parceler.Parcels
import timber.log.Timber
 
/**
@@ -35,8 +34,8 @@ class BuildLogFragment : ButterKnifeFragment() {
fun newInstance(project: Project, build: Build): BuildLogFragment {
val fragment = BuildLogFragment()
val args = Bundle()
args.putParcelParcelableExtra(KEY_PROJECT, project)
args.putParcelParcelableExtra(KEY_BUILD, build)
args.putParcelerParcelable(KEY_PROJECT, project)
args.putParcelerParcelable(KEY_BUILD, build)
fragment.arguments = args
return fragment
}
app/src/main/java/com/commit451/gitlab/fragment/GroupMembersFragment.kt
+ 3
− 3
View file @ 31bf450a
@@ -13,13 +13,13 @@ import android.widget.TextView
import butterknife.BindView
import butterknife.OnClick
import com.alexgwyn.recyclerviewsquire.DynamicGridLayoutManager
import com.commit451.addendum.parceler.getParcelerParcelable
import com.commit451.addendum.parceler.putParcelerParcelable
import com.commit451.gitlab.App
import com.commit451.gitlab.R
import com.commit451.gitlab.adapter.GroupMembersAdapter
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
@@ -42,7 +42,7 @@ class GroupMembersFragment : ButterKnifeFragment() {
 
fun newInstance(group: Group): GroupMembersFragment {
val args = Bundle()
args.putParcelParcelableExtra(KEY_GROUP, group)
args.putParcelerParcelable(KEY_GROUP, group)
 
val fragment = GroupMembersFragment()
fragment.arguments = args
app/src/main/java/com/commit451/gitlab/fragment/IssueDiscussionFragment.kt
+ 6
− 5
View file @ 31bf450a
@@ -12,13 +12,14 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import butterknife.BindView
import com.commit451.addendum.parceler.getParcelerParcelable
import com.commit451.addendum.parceler.getParcelerParcelableExtra
import com.commit451.addendum.parceler.putParcelerParcelable
import com.commit451.gitlab.App
import com.commit451.gitlab.R
import com.commit451.gitlab.activity.AttachActivity
import com.commit451.gitlab.adapter.MergeRequestDetailAdapter
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.*
import com.commit451.gitlab.navigation.TransitionFactory
@@ -46,8 +47,8 @@ class IssueDiscussionFragment : ButterKnifeFragment() {
fun newInstance(project: Project, issue: Issue): IssueDiscussionFragment{
val fragment = IssueDiscussionFragment()
val args = Bundle()
args.putParcelParcelableExtra(KEY_PROJECT, project)
args.putParcelParcelableExtra(KEY_MERGE_REQUEST, issue)
args.putParcelerParcelable(KEY_PROJECT, project)
args.putParcelerParcelable(KEY_MERGE_REQUEST, issue)
fragment.arguments = args
return fragment
}
@@ -123,7 +124,7 @@ class IssueDiscussionFragment : ButterKnifeFragment() {
when (requestCode) {
REQUEST_ATTACH -> {
if (resultCode == 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/fragment/MergeRequestCommitsFragment.kt
+ 4
− 4
View file @ 31bf450a
@@ -9,13 +9,13 @@ import android.view.View
import android.view.ViewGroup
import android.widget.TextView
import butterknife.BindView
import com.commit451.addendum.parceler.getParcelerParcelable
import com.commit451.addendum.parceler.putParcelerParcelable
import com.commit451.gitlab.App
import com.commit451.gitlab.R
import com.commit451.gitlab.adapter.CommitAdapter
import com.commit451.gitlab.adapter.DividerItemDecoration
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
@@ -39,8 +39,8 @@ class MergeRequestCommitsFragment : ButterKnifeFragment() {
fun newInstance(project: Project, mergeRequest: MergeRequest): MergeRequestCommitsFragment {
val fragment = MergeRequestCommitsFragment()
val args = Bundle()
args.putParcelParcelableExtra(KEY_PROJECT, project)
args.putParcelParcelableExtra(KEY_MERGE_REQUEST, mergeRequest)
args.putParcelerParcelable(KEY_PROJECT, project)
args.putParcelerParcelable(KEY_MERGE_REQUEST, mergeRequest)
fragment.arguments = args
return fragment
}
app/src/main/java/com/commit451/gitlab/fragment/MergeRequestDiscussionFragment.kt
+ 6
− 5
View file @ 31bf450a
@@ -12,13 +12,14 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import butterknife.BindView
import com.commit451.addendum.parceler.getParcelerParcelable
import com.commit451.addendum.parceler.getParcelerParcelableExtra
import com.commit451.addendum.parceler.putParcelerParcelable
import com.commit451.gitlab.App
import com.commit451.gitlab.R
import com.commit451.gitlab.activity.AttachActivity
import com.commit451.gitlab.adapter.MergeRequestDetailAdapter
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.FileUploadResponse
import com.commit451.gitlab.model.api.MergeRequest
@@ -49,8 +50,8 @@ class MergeRequestDiscussionFragment : ButterKnifeFragment() {
fun newInstance(project: Project, mergeRequest: MergeRequest): MergeRequestDiscussionFragment {
val fragment = MergeRequestDiscussionFragment()
val args = Bundle()
args.putParcelParcelableExtra(KEY_PROJECT, project)
args.putParcelParcelableExtra(KEY_MERGE_REQUEST, mergeRequest)
args.putParcelerParcelable(KEY_PROJECT, project)
args.putParcelerParcelable(KEY_MERGE_REQUEST, mergeRequest)
fragment.arguments = args
return fragment
}
@@ -126,7 +127,7 @@ class MergeRequestDiscussionFragment : ButterKnifeFragment() {
when (requestCode) {
REQUEST_ATTACH -> {
if (resultCode == 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/fragment/PickBranchFragment.kt
+ 5
− 4
View file @ 31bf450a
@@ -10,12 +10,13 @@ import android.view.View
import android.view.ViewGroup
import android.widget.TextView
import butterknife.BindView
import com.commit451.addendum.parceler.getParcelerParcelable
import com.commit451.addendum.parceler.putParcelerParcelable
import com.commit451.addendum.parceler.putParcelerParcelableExtra
import com.commit451.gitlab.App
import com.commit451.gitlab.R
import com.commit451.gitlab.activity.PickBranchOrTagActivity
import com.commit451.gitlab.adapter.BranchAdapter
import com.commit451.gitlab.extension.getParcelerParcelable
import com.commit451.gitlab.extension.putParcelParcelableExtra
import com.commit451.gitlab.extension.setup
import com.commit451.gitlab.model.Ref
import com.commit451.gitlab.model.api.Branch
@@ -37,7 +38,7 @@ class PickBranchFragment : ButterKnifeFragment() {
val fragment = PickBranchFragment()
val args = Bundle()
args.putLong(EXTRA_PROJECT_ID, projectId)
args.putParcelParcelableExtra(EXTRA_REF, ref)
args.putParcelerParcelable(EXTRA_REF, ref)
fragment.arguments = args
return fragment
}
@@ -68,7 +69,7 @@ class PickBranchFragment : ButterKnifeFragment() {
override fun onBranchClicked(entry: Branch) {
val data = Intent()
val ref = Ref(Ref.TYPE_BRANCH, entry.name)
data.putParcelParcelableExtra(PickBranchOrTagActivity.EXTRA_REF, ref)
data.putParcelerParcelableExtra(PickBranchOrTagActivity.EXTRA_REF, ref)
activity.setResult(Activity.RESULT_OK, data)
activity.finish()
}
app/src/main/java/com/commit451/gitlab/fragment/PickTagFragment.kt
+ 5
− 5
View file @ 31bf450a
@@ -10,18 +10,18 @@ import android.view.View
import android.view.ViewGroup
import android.widget.TextView
import butterknife.BindView
import com.commit451.addendum.parceler.getParcelerParcelable
import com.commit451.addendum.parceler.putParcelerParcelable
import com.commit451.addendum.parceler.putParcelerParcelableExtra
import com.commit451.gitlab.App
import com.commit451.gitlab.R
import com.commit451.gitlab.activity.PickBranchOrTagActivity
import com.commit451.gitlab.adapter.TagAdapter
import com.commit451.gitlab.extension.getParcelerParcelable
import com.commit451.gitlab.extension.putParcelParcelableExtra
import com.commit451.gitlab.extension.setup
import com.commit451.gitlab.model.Ref
import com.commit451.gitlab.model.api.Tag
import com.commit451.gitlab.rx.CustomSingleObserver
import com.trello.rxlifecycle2.android.FragmentEvent
import org.parceler.Parcels
import timber.log.Timber
 
/**
@@ -38,7 +38,7 @@ class PickTagFragment : ButterKnifeFragment() {
val fragment = PickTagFragment()
val args = Bundle()
args.putLong(EXTRA_PROJECT_ID, projectId)
args.putParcelParcelableExtra(EXTRA_CURRENT_REF, ref)
args.putParcelerParcelable(EXTRA_CURRENT_REF, ref)
fragment.arguments = args
return fragment
}
@@ -69,7 +69,7 @@ class PickTagFragment : ButterKnifeFragment() {
override fun onTagClicked(entry: Tag) {
val data = Intent()
val newRef = Ref(Ref.TYPE_TAG, entry.name)
data.putParcelParcelableExtra(PickBranchOrTagActivity.EXTRA_REF, newRef)
data.putParcelerParcelableExtra(PickBranchOrTagActivity.EXTRA_REF, newRef)
activity.setResult(Activity.RESULT_OK, data)
activity.finish()
}
app/src/main/java/com/commit451/gitlab/fragment/PipelineDescriptionFragment.kt
+ 7
− 7
View file @ 31bf450a
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,18 +8,19 @@ import android.view.View
import android.view.ViewGroup
import android.widget.TextView
import butterknife.BindView
import com.commit451.addendum.parceler.getParcelerParcelable
import com.commit451.addendum.parceler.putParcelerParcelable
import com.commit451.gitlab.App
import com.commit451.gitlab.R
import com.commit451.gitlab.event.PipelineChangedEvent
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.model.api.CommitUser
import com.commit451.gitlab.model.api.Pipeline
import com.commit451.gitlab.model.api.Project
import com.commit451.gitlab.rx.CustomSingleObserver
import com.commit451.gitlab.util.DateUtil
import com.trello.rxlifecycle2.android.FragmentEvent
import org.greenrobot.eventbus.Subscribe
import org.parceler.Parcels
import timber.log.Timber
import java.util.*
 
@@ -36,8 +36,8 @@ class PipelineDescriptionFragment : ButterKnifeFragment() {
fun newInstance(project: Project, pipeline: Pipeline): PipelineDescriptionFragment {
val fragment = PipelineDescriptionFragment()
val args = Bundle()
args.putParcelParcelableExtra(KEY_PROJECT, project)
args.putParcelParcelableExtra(KEY_PIPELINE, pipeline)
args.putParcelerParcelable(KEY_PROJECT, project)
args.putParcelerParcelable(KEY_PIPELINE, pipeline)
fragment.arguments = args
return fragment
}
app/src/main/java/com/commit451/gitlab/fragment/ProjectsFragment.kt
+ 3
− 3
View file @ 31bf450a
@@ -11,13 +11,13 @@ import android.view.View
import android.view.ViewGroup
import android.widget.TextView
import butterknife.BindView
import com.commit451.addendum.parceler.getParcelerParcelable
import com.commit451.addendum.parceler.putParcelerParcelable
import com.commit451.gitlab.App
import com.commit451.gitlab.R
import com.commit451.gitlab.adapter.DividerItemDecoration
import com.commit451.gitlab.adapter.ProjectAdapter
import com.commit451.gitlab.api.GitLabService
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.Project
@@ -64,7 +64,7 @@ class ProjectsFragment : ButterKnifeFragment() {
fun newInstance(group: Group): ProjectsFragment {
val args = Bundle()
args.putInt(EXTRA_MODE, MODE_GROUP)
args.putParcelParcelableExtra(EXTRA_GROUP, group)
args.putParcelerParcelable(EXTRA_GROUP, group)
val fragment = ProjectsFragment()
fragment.arguments = args
return fragment
app/src/main/java/com/commit451/gitlab/widget/ProjectFeedWidgetConfigureActivity.kt
+ 2
− 2
View file @ 31bf450a
@@ -11,10 +11,10 @@ import android.view.View
import android.widget.TextView
import butterknife.BindView
import butterknife.ButterKnife
import com.commit451.addendum.parceler.getParcelerParcelableExtra
import com.commit451.gitlab.R
import com.commit451.gitlab.activity.BaseActivity
import com.commit451.gitlab.data.Prefs
import com.commit451.gitlab.extension.getParcelerParcelable
import com.commit451.gitlab.model.Account
import com.commit451.gitlab.model.api.Project
import timber.log.Timber
@@ -78,7 +78,7 @@ class ProjectFeedWidgetConfigureActivity : BaseActivity() {
when (requestCode) {
REQUEST_PROJECT -> {
if (resultCode == Activity.RESULT_OK) {
val project = data?.getParcelerParcelable<Project>(ProjectFeedWidgetConfigureProjectActivity.EXTRA_PROJECT)!!
val project = data?.getParcelerParcelableExtra<Project>(ProjectFeedWidgetConfigureProjectActivity.EXTRA_PROJECT)!!
saveWidgetConfig(account!!, project)
}
}
app/src/main/java/com/commit451/gitlab/widget/ProjectFeedWidgetConfigureProjectActivity.kt
+ 5
− 5
View file @ 31bf450a
@@ -8,14 +8,14 @@ import android.support.design.widget.TabLayout
import android.support.v4.view.ViewPager
import butterknife.BindView
import butterknife.ButterKnife
import com.commit451.addendum.parceler.getParcelerParcelableExtra
import com.commit451.addendum.parceler.putParcelerParcelableExtra
import com.commit451.gitlab.R
import com.commit451.gitlab.activity.BaseActivity
import com.commit451.gitlab.adapter.ProjectPagerAdapter
import com.commit451.gitlab.api.GitLabFactory
import com.commit451.gitlab.api.GitLabService
import com.commit451.gitlab.api.OkHttpClientFactory
import com.commit451.gitlab.extension.getParcelerParcelable
import com.commit451.gitlab.extension.putParcelParcelableExtra
import com.commit451.gitlab.fragment.ProjectsFragment
import com.commit451.gitlab.model.Account
import com.commit451.gitlab.model.api.Project
@@ -32,7 +32,7 @@ class ProjectFeedWidgetConfigureProjectActivity : BaseActivity(), ProjectsFragme
 
fun newIntent(context: Context, account: Account): Intent {
val intent = Intent(context, ProjectFeedWidgetConfigureProjectActivity::class.java)
intent.putParcelParcelableExtra(EXTRA_ACCOUNT, account)
intent.putParcelerParcelableExtra(EXTRA_ACCOUNT, account)
return intent
}
}
@@ -49,7 +49,7 @@ class ProjectFeedWidgetConfigureProjectActivity : BaseActivity(), ProjectsFragme
setContentView(R.layout.activity_project_feed_widget_configure)
ButterKnife.bind(this)
 
val account = intent.getParcelerParcelable<Account>(EXTRA_ACCOUNT)!!
val account = intent.getParcelerParcelableExtra<Account>(EXTRA_ACCOUNT)!!
gitLabInstance = GitLabFactory.create(account, OkHttpClientFactory.create(account, false).build())
 
viewPager.adapter = ProjectPagerAdapter(this, supportFragmentManager)
@@ -58,7 +58,7 @@ class ProjectFeedWidgetConfigureProjectActivity : BaseActivity(), ProjectsFragme
 
override fun onProjectClicked(project: Project) {
val data = Intent()
data.putParcelParcelableExtra(EXTRA_PROJECT, project)
data.putParcelerParcelableExtra(EXTRA_PROJECT, project)
setResult(Activity.RESULT_OK, data)
finish()
}
app/src/test/java/com/commit451/gitlab/RoutingTests.kt
+ 2
− 1
View file @ 31bf450a
@@ -2,7 +2,8 @@ package com.commit451.gitlab
 
import android.net.Uri
import com.commit451.gitlab.navigation.RoutingRouter
import junit.framework.Assert
import org.junit.Assert
import org.junit.BeforeClass
import org.junit.Test
import org.junit.runner.RunWith
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment