- Modify toolbar layout to include a two custom textviews

- Show confidential icon as a compound drawable if issue is known to beconfidential
- Modify string resource to include issue number for easier formatting

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

@@ -82,6 +82,8 @@ class IssueActivity : BaseActivity() {
     @BindView(R.id.list) lateinit var listNotes: RecyclerView
     @BindView(R.id.send_message_view) lateinit var sendMessageView: SendMessageView
     @BindView(R.id.progress) lateinit var progress: View
+    @BindView(R.id.toolbar_title) lateinit var toolbarTitle: TextView
+    @BindView(R.id.toolbar_subtitle) lateinit var toolbarSubTitle: TextView
     lateinit var menuItemOpenClose: MenuItem
     lateinit var adapterIssueDetails: IssueDetailsAdapter
@@ -244,13 +246,15 @@ class IssueActivity : BaseActivity() {
     }
     fun bindProject() {
-        toolbar.subtitle = project?.nameWithNamespace
+        toolbarSubTitle.text = project?.nameWithNamespace
     }
     fun bindIssue() {
-        toolbar.title = getString(R.string.issue_number) + issue?.iid
         setOpenCloseMenuStatus()
-        textTitle.text = issue?.title
+        toolbarTitle.text = getString(R.string.issue_number, issue?.iid)
+        if (issue?.isConfidential!!) {
+            toolbarTitle.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_confidential_24dp, 0)
+        }
         adapterIssueDetails.updateIssue(issue!!)
     }

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

@@ -8,6 +8,7 @@
     android:layout_height="match_parent">
     <LinearLayout
+        android:id="@+id/app_bar_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="?attr/actionBarSize"
@@ -21,13 +22,35 @@
             <android.support.v7.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize" />
+                android:layout_height="?attr/actionBarSize" >
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/toolbar_title"
+                        style="@style/TextAppearance.AppCompat.Widget.ActionBar.Title"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:drawablePadding="8dp"
+                        tools:text="Issue title" />
+
+                    <TextView
+                        android:id="@+id/toolbar_subtitle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        tools:text="subtitle" />
+
+                </LinearLayout>
+            </android.support.v7.widget.Toolbar>
             <TextView
                 android:id="@+id/issue_title"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:padding="16dp"
+                android:drawablePadding="8dp"
                 android:layout_marginRight="56dp"
                 tools:text="This is an issue"/>

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

@@ -190,7 +190,7 @@
     <string name="title_hint">Title</string>
     <string name="description_hint">Description</string>
     <string name="add_note_content_description">Add note</string>
-    <string name="issue_number">Issue #</string>
+    <string name="issue_number">Issue #%1$d</string>
     <string name="reopen">Reopen</string>
     <string name="close">Close</string>
     <string name="created_issue">created issue</string>