Skip to content
Snippets Groups Projects
Commit 6d00dbb9 authored by John's avatar John
Browse files

Build with API 27

parent dae8af3b
No related branches found
No related tags found
No related merge requests found
Showing
with 69 additions and 74 deletions
Loading
Loading
@@ -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)
Loading
Loading
Loading
Loading
@@ -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() }
Loading
Loading
@@ -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)
Loading
Loading
@@ -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 {
Loading
Loading
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
Loading
Loading
@@ -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
Loading
Loading
@@ -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() }
Loading
Loading
@@ -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)
Loading
Loading
@@ -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 {
Loading
Loading
Loading
Loading
@@ -17,8 +17,8 @@ import butterknife.BindView
import com.commit451.gitlab.App
import com.commit451.gitlab.R
import com.commit451.gitlab.activity.ProjectActivity
import com.commit451.gitlab.adapter.PipelineAdapter
import com.commit451.gitlab.adapter.DividerItemDecoration
import com.commit451.gitlab.adapter.PipelineAdapter
import com.commit451.gitlab.event.PipelineChangedEvent
import com.commit451.gitlab.event.ProjectReloadEvent
import com.commit451.gitlab.extension.setup
Loading
Loading
@@ -76,11 +76,11 @@ class PipelinesFragment : ButterKnifeFragment() {
scope = scopes[0]
}
 
override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? {
return inflater!!.inflate(R.layout.fragment_pipelines, container, false)
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
return inflater.inflate(R.layout.fragment_pipelines, container, false)
}
 
override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
 
App.bus().register(this)
Loading
Loading
@@ -88,7 +88,7 @@ class PipelinesFragment : ButterKnifeFragment() {
adapterPipelines = PipelineAdapter(object : PipelineAdapter.Listener {
override fun onPipelinesClicked(pipeline: Pipeline) {
if (project != null) {
Navigator.navigateToPipeline(activity, project!!, pipeline)
Navigator.navigateToPipeline(baseActivty, project!!, pipeline)
} else {
Snackbar.make(root, getString(R.string.wait_for_project_to_load), Snackbar.LENGTH_SHORT)
.show()
Loading
Loading
@@ -97,7 +97,7 @@ class PipelinesFragment : ButterKnifeFragment() {
})
layoutManagerPipelines = LinearLayoutManager(activity)
listPipelines.layoutManager = layoutManagerPipelines
listPipelines.addItemDecoration(DividerItemDecoration(activity))
listPipelines.addItemDecoration(DividerItemDecoration(baseActivty))
listPipelines.adapter = adapterPipelines
listPipelines.addOnScrollListener(onScrollListener)
 
Loading
Loading
Loading
Loading
@@ -60,9 +60,9 @@ class ProjectFragment : ButterKnifeFragment() {
if (project != null) {
val owner = project.owner
if (owner != null) {
Navigator.navigateToUser(activity, owner)
Navigator.navigateToUser(baseActivty, owner)
} else {
Navigator.navigateToGroup(activity, project.namespace.id)
Navigator.navigateToGroup(baseActivty, project.namespace.id)
}
}
}
Loading
Loading
@@ -70,7 +70,7 @@ class ProjectFragment : ButterKnifeFragment() {
@OnClick(R.id.root_fork)
fun onForkClicked() {
project?.let {
AlertDialog.Builder(activity)
AlertDialog.Builder(baseActivty)
.setTitle(R.string.project_fork_title)
.setMessage(R.string.project_fork_message)
.setNegativeButton(R.string.cancel, null)
Loading
Loading
@@ -120,15 +120,11 @@ class ProjectFragment : ButterKnifeFragment() {
}
}
 
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
return inflater.inflate(R.layout.fragment_project, container, false)
}
 
override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? {
return inflater!!.inflate(R.layout.fragment_project, container, false)
}
override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
 
App.bus().register(this)
Loading
Loading
Loading
Loading
@@ -72,21 +72,21 @@ class ProjectMembersFragment : ButterKnifeFragment() {
 
@OnClick(R.id.add_user_button)
fun onAddUserClick(fab: View) {
Navigator.navigateToAddProjectMember(activity, fab, project!!.id)
Navigator.navigateToAddProjectMember(baseActivty, fab, project!!.id)
}
 
override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? {
return inflater!!.inflate(R.layout.fragment_members, container, false)
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
return inflater.inflate(R.layout.fragment_members, container, false)
}
 
override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
 
App.bus().register(this)
 
adapterProjectMembers = ProjectMembersAdapter(object : ProjectMembersAdapter.Listener {
override fun onProjectMemberClicked(member: User, memberGroupViewHolder: ProjectMemberViewHolder) {
Navigator.navigateToUser(activity, memberGroupViewHolder.image, member)
Navigator.navigateToUser(baseActivty, memberGroupViewHolder.image, member)
}
 
override fun onRemoveMember(member: User) {
Loading
Loading
@@ -108,7 +108,7 @@ class ProjectMembersFragment : ButterKnifeFragment() {
}
 
override fun onChangeAccess(member: User) {
val accessDialog = AccessDialog(activity, member, project!!.id)
val accessDialog = AccessDialog(baseActivty, member, project!!.id)
accessDialog.setOnAccessChangedListener(object : AccessDialog.OnAccessChangedListener {
override fun onAccessChanged(member: User, accessLevel: String) {
loadData()
Loading
Loading
@@ -118,7 +118,7 @@ class ProjectMembersFragment : ButterKnifeFragment() {
}
 
override fun onSeeGroupClicked() {
Navigator.navigateToGroup(activity, project!!.namespace.id)
Navigator.navigateToGroup(baseActivty, project!!.namespace.id)
}
})
layoutManagerMembers = GridLayoutManager(activity, 2)
Loading
Loading
Loading
Loading
@@ -105,21 +105,21 @@ class ProjectsFragment : ButterKnifeFragment() {
 
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
mode = arguments.getInt(EXTRA_MODE)
query = arguments.getString(EXTRA_QUERY)
mode = arguments?.getInt(EXTRA_MODE)!!
query = arguments?.getString(EXTRA_QUERY)!!
}
 
override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? {
return inflater!!.inflate(R.layout.fragment_projects, container, false)
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
return inflater.inflate(R.layout.fragment_projects, container, false)
}
 
override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
 
adapterProjects = ProjectAdapter(activity, object : ProjectAdapter.Listener {
adapterProjects = ProjectAdapter(baseActivty, object : ProjectAdapter.Listener {
override fun onProjectClicked(project: Project) {
if (listener == null) {
Navigator.navigateToProject(activity, project)
Navigator.navigateToProject(baseActivty, project)
} else {
listener!!.onProjectClicked(project)
}
Loading
Loading
@@ -127,7 +127,7 @@ class ProjectsFragment : ButterKnifeFragment() {
})
layoutManagerProjects = LinearLayoutManager(activity)
listProjects.layoutManager = layoutManagerProjects
listProjects.addItemDecoration(DividerItemDecoration(activity))
listProjects.addItemDecoration(DividerItemDecoration(baseActivty))
listProjects.adapter = adapterProjects
listProjects.addOnScrollListener(onScrollListener)
 
Loading
Loading
@@ -160,7 +160,7 @@ class ProjectsFragment : ButterKnifeFragment() {
}
MODE_GROUP -> {
showLoading()
val group = arguments.getParcelerParcelable<Group>(EXTRA_GROUP) ?: throw IllegalStateException("You must also pass a group if you want to show a groups projects")
val group = arguments?.getParcelerParcelable<Group>(EXTRA_GROUP) ?: throw IllegalStateException("You must also pass a group if you want to show a groups projects")
actuallyLoadIt(getGitLab().getGroupProjects(group.id))
}
else -> throw IllegalStateException(mode.toString() + " is not defined")
Loading
Loading
Loading
Loading
@@ -70,7 +70,7 @@ class SnippetsFragment : ButterKnifeFragment() {
@OnClick(R.id.add)
fun onAddClicked(fab: View) {
if (project != null) {
Navigator.navigateToAddMilestone(activity, fab, project!!)
Navigator.navigateToAddMilestone(baseActivty, fab, project!!)
} else {
Snackbar.make(root, getString(R.string.wait_for_project_to_load), Snackbar.LENGTH_SHORT)
.show()
Loading
Loading
@@ -83,11 +83,11 @@ class SnippetsFragment : ButterKnifeFragment() {
states = resources.getStringArray(R.array.milestone_state_values)
}
 
override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? {
return inflater!!.inflate(R.layout.fragment_snippets, container, false)
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
return inflater.inflate(R.layout.fragment_snippets, container, false)
}
 
override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
 
App.bus().register(this)
Loading
Loading
@@ -99,7 +99,7 @@ class SnippetsFragment : ButterKnifeFragment() {
})
layoutManagerSnippets = LinearLayoutManager(activity)
listSnippets.layoutManager = layoutManagerSnippets
listSnippets.addItemDecoration(DividerItemDecoration(activity))
listSnippets.addItemDecoration(DividerItemDecoration(baseActivty))
listSnippets.adapter = adapterSnippets
listSnippets.addOnScrollListener(onScrollListener)
 
Loading
Loading
Loading
Loading
@@ -68,21 +68,21 @@ class TodoFragment : ButterKnifeFragment() {
 
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
mode = arguments.getInt(EXTRA_MODE)
mode = arguments?.getInt(EXTRA_MODE)!!
}
 
override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? {
return inflater!!.inflate(R.layout.fragment_todo, container, false)
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
return inflater.inflate(R.layout.fragment_todo, container, false)
}
 
override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
 
adapterTodos = TodoAdapter(object : TodoAdapter.Listener {
override fun onTodoClicked(todo: Todo) {
val targetUrl = todo.targetUrl
if (targetUrl != null) {
Navigator.navigateToUrl(activity, targetUrl, App.get().getAccount())
Navigator.navigateToUrl(baseActivty, targetUrl, App.get().getAccount())
} else {
Snackbar.make(swipeRefreshLayout, R.string.not_a_valid_url, Snackbar.LENGTH_SHORT)
}
Loading
Loading
Loading
Loading
@@ -67,19 +67,19 @@ class UsersFragment : ButterKnifeFragment() {
 
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
query = arguments.getString(EXTRA_QUERY)
query = arguments?.getString(EXTRA_QUERY)
}
 
override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? {
return inflater!!.inflate(R.layout.fragment_projects, container, false)
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
return inflater.inflate(R.layout.fragment_projects, container, false)
}
 
override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
 
adapterUser = UserAdapter(object : UserAdapter.Listener {
override fun onUserClicked(user: User, userViewHolder: UserViewHolder) {
Navigator.navigateToUser(activity, userViewHolder.image, user)
Navigator.navigateToUser(baseActivty, userViewHolder.image, user)
}
})
layoutManagerUser = GridLayoutManager(activity, 2)
Loading
Loading
Loading
Loading
@@ -9,7 +9,7 @@ import timber.log.Timber
*/
class CrashlyticsWtfTree : Timber.Tree() {
 
override fun log(priority: Int, tag: String?, message: String?, t: Throwable?) {
override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
if (priority == Log.ASSERT) {
Crashlytics.log(Log.ASSERT, tag, message)
}
Loading
Loading
// Top-level build file where you can add configuration options common to all sub-projects/modules.
apply plugin: 'com.github.ben-manes.versions'
apply plugin: 'com.commit451.updatewrapper'
buildscript {
ext.kotlinVersion = '1.1.4-3'
ext.kotlinVersion = '1.1.60'
repositories {
jcenter()
maven { url "https://jitpack.io" }
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.0-beta6'
classpath 'com.android.tools.build:gradle:3.0.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
classpath 'com.github.ben-manes:gradle-versions-plugin:0.15.0'
classpath 'com.github.ben-manes:gradle-versions-plugin:0.17.0'
classpath 'com.github.Commit451:updatewrapper:1.1.2'
}
}
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment