Merge branch 'develop' into 'develop'

New Build Naming, More Info in Build Description, & Fixed Build ID Bug

See merge request !23

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

@@ -156,7 +156,7 @@ class BuildActivity : BaseActivity() {
         project = Parcels.unwrap<Project>(intent.getParcelableExtra<Parcelable>(KEY_PROJECT))
         build = Parcels.unwrap<Build>(intent.getParcelableExtra<Parcelable>(KEY_BUILD))
-        toolbar.title = getString(R.string.build_number) + build.id
+        toolbar.title = String.format(getString(R.string.build_number), build.id)
         toolbar.setNavigationIcon(R.drawable.ic_back_24dp)
         toolbar.setNavigationOnClickListener { onBackPressed() }
         toolbar.subtitle = project.nameWithNamespace

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

@@ -17,6 +17,7 @@ import com.commit451.gitlab.model.api.Build
 import com.commit451.gitlab.model.api.Project
 import com.commit451.gitlab.model.api.RepositoryCommit
 import com.commit451.gitlab.model.api.Runner
+import com.commit451.gitlab.model.api.Pipeline
 import com.commit451.gitlab.rx.CustomSingleObserver
 import com.commit451.gitlab.util.DateUtil
 import com.trello.rxlifecycle2.android.FragmentEvent
@@ -47,6 +48,9 @@ class BuildDescriptionFragment : ButterKnifeFragment() {
     @BindView(R.id.root) lateinit var root: ViewGroup
     @BindView(R.id.swipe_layout) lateinit var swipeRefreshLayout: SwipeRefreshLayout
+    @BindView(R.id.text_name) lateinit var textName: TextView
+    @BindView(R.id.text_pipeline) lateinit var textPipeline: TextView
+    @BindView(R.id.text_stage) lateinit var textStage: TextView
     @BindView(R.id.text_status) lateinit var textStatus: TextView
     @BindView(R.id.text_duration) lateinit var textDuration: TextView
     @BindView(R.id.text_created) lateinit var textCreated: TextView
@@ -111,6 +115,12 @@ class BuildDescriptionFragment : ButterKnifeFragment() {
         if (startedTime == null) {
             startedTime = Date()
         }
+        val name = String.format(getString(R.string.build_name), build.name)
+        textName.text = name
+        val pipeline = String.format(getString(R.string.build_pipeline), build.pipeline)
+        textPipeline.text = pipeline
+        val stage = String.format(getString(R.string.build_stage), build.stage)
+        textStage.text = stage
         val status = String.format(getString(R.string.build_status), build.status)
         textStatus.text = status
         val timeTaken = DateUtil.getTimeTaken(startedTime, finishedTime)
@@ -130,6 +140,9 @@ class BuildDescriptionFragment : ButterKnifeFragment() {
         if (build.runner != null) {
             bindRunner(build.runner)
         }
+        if (build.pipeline != null) {
+            bindPipeline(build.pipeline)
+        }
         if (build.commit != null) {
             bindCommit(build.commit)
         }
@@ -139,6 +152,10 @@ class BuildDescriptionFragment : ButterKnifeFragment() {
         val runnerNum = String.format(getString(R.string.runner_number), runner.id.toString())
         textRunner.text = runnerNum
     }
+    fun bindPipeline(pipeline: Pipeline) {
+        val pipelineNum = String.format(getString(R.string.build_pipeline), pipeline.id.toString())
+        textPipeline.text = pipelineNum
+    }
     fun bindCommit(commit: RepositoryCommit) {
         val authorText = String.format(getString(R.string.build_commit_author), commit.authorName)

app/src/main/java/com/commit451/gitlab/model/api/Build.java

@@ -32,6 +32,8 @@ public class Build {
     String ref;
     @JsonField(name = "runner")
     Runner runner;
+    @JsonField(name = "pipeline")
+    Pipeline pipeline;
     @JsonField(name = "stage")
     String stage;
     @JsonField(name = "started_at")
@@ -79,6 +81,10 @@ public class Build {
         return runner;
     }
+    public Pipeline getPipeline() {
+        return pipeline;
+    }
+
     public String getStage() {
         return stage;
     }

app/src/main/java/com/commit451/gitlab/model/api/Pipeline.java

+package com.commit451.gitlab.model.api;
+
+import com.bluelinelabs.logansquare.annotation.JsonField;
+import com.bluelinelabs.logansquare.annotation.JsonObject;
+
+import org.parceler.Parcel;
+
+/**
+ * A pipeline.
+ */
+@Parcel
+@JsonObject
+public class Pipeline {
+
+    @JsonField(name = "id")
+    long id;
+    @JsonField(name = "sha")
+    String sha;
+    @JsonField(name = "ref")
+    String ref;
+    @JsonField(name = "status")
+    String status;
+
+    public long getId() {
+        return id;
+    }
+
+    public String getSha() {
+        return sha;
+    }
+
+    public String getRef() {
+        return ref;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+}

app/src/main/java/com/commit451/gitlab/viewHolder/BuildViewHolder.kt

@@ -26,6 +26,7 @@ class BuildViewHolder(view: View) : RecyclerView.ViewHolder(view) {
         }
     }
+    @BindView(R.id.name) lateinit var textBuildName: TextView
     @BindView(R.id.number) lateinit var textBuildNumber: TextView
     @BindView(R.id.status) lateinit var textStatus: TextView
     @BindView(R.id.duration) lateinit var textDuration: TextView
@@ -35,7 +36,12 @@ class BuildViewHolder(view: View) : RecyclerView.ViewHolder(view) {
     }
     fun bind(build: Build) {
-        textBuildNumber.text = "${itemView.resources.getString(R.string.build_number)}  $build.id"
+        val buildNameText = String.format(itemView.resources.getString(R.string.build_name), build.name)
+        textBuildName.text = buildNameText
+
+        val buildNumberText = String.format(itemView.resources.getString(R.string.build_number), build.id)
+        textBuildNumber.text = buildNumberText
+
         val statusText = String.format(itemView.resources.getString(R.string.build_status), build.status)
         textStatus.text = statusText
         var finishedTime: Date? = build.finishedAt

app/src/main/res/layout/fragment_build_description.xml

@@ -32,6 +32,33 @@
                         android:orientation="vertical"
                         android:padding="8dp">
+                        <TextView
+                            android:id="@+id/text_pipeline"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="16dp"
+                            android:layout_marginRight="16dp"
+                            android:layout_marginTop="16dp"
+                            android:textAppearance="?android:attr/textAppearanceMedium"
+                            tools:text="Pipeline: #123"/>
+                        <TextView
+                            android:id="@+id/text_stage"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="16dp"
+                            android:layout_marginRight="16dp"
+                            android:layout_marginTop="16dp"
+                            android:textAppearance="?android:attr/textAppearanceMedium"
+                            tools:text="Stage: build"/>
+                        <TextView
+                            android:id="@+id/text_name"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="16dp"
+                            android:layout_marginRight="16dp"
+                            android:layout_marginTop="16dp"
+                            android:textAppearance="?android:attr/textAppearanceMedium"
+                            tools:text="Name: build"/>
                         <TextView
                             android:id="@+id/text_status"
                             android:layout_width="wrap_content"

app/src/main/res/layout/item_build.xml

@@ -9,6 +9,15 @@
     android:orientation="horizontal"
     android:padding="16dp">
+    <TextView
+        android:id="@+id/name"
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_margin="8dp"
+        android:textSize="@dimen/text_size_small"
+        tools:text="Name: build"/>
     <TextView
         android:id="@+id/number"
         android:layout_width="0dp"

app/src/main/res/values/strings.xml

@@ -42,7 +42,7 @@
     <string name="title_files">Files</string>
     <string name="title_merge_requests">Merge Requests</string>
     <string name="title_members">Members</string>
-    <string name="title_builds">Builds</string>
+    <string name="title_builds">Jobs</string>
     <string name="title_snippets">Snippets</string>
     <string-array name="main_tabs">
@@ -372,8 +372,8 @@
     <string name="settings">Settings</string>
     <!-- Builds -->
-    <string name="no_builds">No builds</string>
-    <string name="failed_to_load_builds">Failed to load builds</string>
+    <string name="no_builds">No jobs</string>
+    <string name="failed_to_load_builds">Failed to load jobs</string>
     <string-array name="build_scope_names">
         <item>All</item>
@@ -391,18 +391,21 @@
         <item>success</item>
         <item>canceled</item>
     </string-array>
-    <string name="build_number">Build #</string>
-    <string name="build_started">Build started</string>
-    <string name="build_erased">Build erased</string>
-    <string name="build_canceled">Build canceled</string>
-    <string name="unable_to_retry_build">Unable to retry build</string>
-    <string name="unable_to_erase_build">Unable to erase build</string>
-    <string name="unable_to_cancel_build">Unable to cancel build</string>
-    <string name="unable_to_load_build">Unable to load build</string>
+    <string name="build_number">Job #%1$s</string>
+    <string name="build_started">Job started</string>
+    <string name="build_erased">Job erased</string>
+    <string name="build_canceled">Job canceled</string>
+    <string name="unable_to_retry_build">Unable to retry job</string>
+    <string name="unable_to_erase_build">Unable to erase job</string>
+    <string name="unable_to_cancel_build">Unable to cancel job</string>
+    <string name="unable_to_load_build">Unable to load job</string>
     <string-array name="build_tabs">
         <item>Details</item>
         <item>Log</item>
     </string-array>
+    <string name="build_pipeline">Pipeline: #%1$s</string>
+    <string name="build_name">Name: %1$s</string>
+    <string name="build_stage">Stage: %1$s</string>
     <string name="build_ref">Ref: %1$s</string>
     <string name="build_status">Status: %1$s</string>
     <string name="build_duration">Duration: %1$s</string>