Skip to content
Snippets Groups Projects
Unverified Commit ce3e4839 authored by Noah Prail's avatar Noah Prail
Browse files

Work on pipeline status

parent 32241f31
No related branches found
No related tags found
No related merge requests found
Pipeline #
Loading
@@ -384,6 +384,10 @@ interface GitLabService {
Loading
@@ -384,6 +384,10 @@ interface GitLabService {
fun getPipelines(@Url url: String, fun getPipelines(@Url url: String,
@Query("scope") state: String?): Single<Response<List<Pipeline>>> @Query("scope") state: String?): Single<Response<List<Pipeline>>>
   
@GET(API_VERSION + "/projects/{id}/pipelines")
fun getLatestPipeline(@Path("id") projectId: Long,
@Query("per_page") perPage: Int? = 1): Single<Pipeline>
@GET(API_VERSION + "/projects/{id}/pipelines/{pipeline_id}/jobs") @GET(API_VERSION + "/projects/{id}/pipelines/{pipeline_id}/jobs")
fun getPipelineJobs(@Path("id") projectId: Long, @Path("pipeline_id") pipelineId: Long, fun getPipelineJobs(@Path("id") projectId: Long, @Path("pipeline_id") pipelineId: Long,
@Query("scope") scope: String?): Single<Response<List<Pipeline>>> @Query("scope") scope: String?): Single<Response<List<Pipeline>>>
Loading
Loading
Loading
@@ -20,6 +20,7 @@ import com.commit451.gitlab.extension.setMarkdownText
Loading
@@ -20,6 +20,7 @@ import com.commit451.gitlab.extension.setMarkdownText
import com.commit451.gitlab.extension.setup import com.commit451.gitlab.extension.setup
import com.commit451.gitlab.model.api.Project import com.commit451.gitlab.model.api.Project
import com.commit451.gitlab.model.api.RepositoryFile import com.commit451.gitlab.model.api.RepositoryFile
import com.commit451.gitlab.model.api.Pipeline
import com.commit451.gitlab.model.api.RepositoryTreeObject import com.commit451.gitlab.model.api.RepositoryTreeObject
import com.commit451.gitlab.navigation.Navigator import com.commit451.gitlab.navigation.Navigator
import com.commit451.gitlab.rx.CustomSingleObserver import com.commit451.gitlab.rx.CustomSingleObserver
Loading
@@ -55,9 +56,11 @@ class ProjectFragment : ButterKnifeFragment() {
Loading
@@ -55,9 +56,11 @@ class ProjectFragment : ButterKnifeFragment() {
@BindView(R.id.creator) lateinit var textCreator: TextView @BindView(R.id.creator) lateinit var textCreator: TextView
@BindView(R.id.star_count) lateinit var textStarCount: TextView @BindView(R.id.star_count) lateinit var textStarCount: TextView
@BindView(R.id.forks_count) lateinit var textForksCount: TextView @BindView(R.id.forks_count) lateinit var textForksCount: TextView
@BindView(R.id.build_status_text) lateinit var textBuildStatus: TextView
@BindView(R.id.overview_text) lateinit var textOverview: TextView @BindView(R.id.overview_text) lateinit var textOverview: TextView
   
var project: Project? = null var project: Project? = null
var pipeline: Pipeline? = null
var branchName: String? = null var branchName: String? = null
   
@OnClick(R.id.creator) @OnClick(R.id.creator)
Loading
@@ -221,6 +224,9 @@ class ProjectFragment : ButterKnifeFragment() {
Loading
@@ -221,6 +224,9 @@ class ProjectFragment : ButterKnifeFragment() {
} }
} }
}) })
val latestPipeline = App.get().gitLab.getLatestPipeline(project!!.id)
.blockingGet()
result.latestPipeline = latestPipeline
} }
   
fun bindProject(project: Project?) { fun bindProject(project: Project?) {
Loading
@@ -235,6 +241,7 @@ class ProjectFragment : ButterKnifeFragment() {
Loading
@@ -235,6 +241,7 @@ class ProjectFragment : ButterKnifeFragment() {
} }
textStarCount.text = project.starCount.toString() textStarCount.text = project.starCount.toString()
textForksCount.text = project.forksCount.toString() textForksCount.text = project.forksCount.toString()
textForksCount.text = pipeline.latestPipeline.toString()
} }
   
fun getReadmeType(filename: String): Int { fun getReadmeType(filename: String): Int {
Loading
@@ -274,5 +281,6 @@ class ProjectFragment : ButterKnifeFragment() {
Loading
@@ -274,5 +281,6 @@ class ProjectFragment : ButterKnifeFragment() {
class ReadmeResult { class ReadmeResult {
var bytes: ByteArray? = null var bytes: ByteArray? = null
var repositoryFile: RepositoryFile? = null var repositoryFile: RepositoryFile? = null
var latestPipeline: Pipeline? = null
} }
} }
Loading
@@ -33,7 +33,32 @@
Loading
@@ -33,7 +33,32 @@
android:paddingRight="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin"
android:textSize="14sp" android:textSize="14sp"
tools:text="Created by Commit451"/> tools:text="Created by Commit451"/>
<LinearLayout
android:id="@+id/build_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="?attr/selectableItemBackgroundBorderless"
android:orientation="horizontal">
   
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:contentDescription="@null"
app:srcCompat="@drawable/ic_check_circle_black_24dp"/>
<TextView
android:id="@+id/build_status_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:paddingRight="@dimen/activity_horizontal_margin"
tools:text="success"/>
</LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/root_star" android:id="@+id/root_star"
android:layout_width="wrap_content" android:layout_width="wrap_content"
Loading
Loading
Loading
@@ -5,7 +5,7 @@ buildscript {
Loading
@@ -5,7 +5,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.3.3' classpath 'com.android.tools.build:gradle:3.0.0-alpha9'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
} }
} }
Loading
Loading
#Wed Jun 21 10:01:42 CDT 2017 #Sat Aug 05 07:07:47 EDT 2017
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-rc-1-all.zip
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