Refactor conversation screen action bar setup

app/src/main/AndroidManifest.xml

@@ -221,7 +221,7 @@
         <activity
             android:name="org.thoughtcrime.securesms.conversation.v2.ConversationActivityV2"
             android:screenOrientation="portrait"
-            android:theme="@style/Theme.TextSecure.DayNight.NoActionBar" />
+            android:theme="@style/Theme.Session.DayNight.FlatActionBar" />
         <activity
             android:name="org.thoughtcrime.securesms.loki.activities.OpenGroupGuidelinesActivity"
             android:screenOrientation="portrait"

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt

@@ -8,6 +8,7 @@ import androidx.loader.content.Loader
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import kotlinx.android.synthetic.main.activity_conversation_v2.*
+import kotlinx.android.synthetic.main.activity_conversation_v2_action_bar.*
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
 import org.thoughtcrime.securesms.database.DatabaseFactory
@@ -71,7 +72,9 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity() {
     }
 
     private fun setUpToolbar() {
-        backButton.setOnClickListener { onBackPressed() }
+        val actionBar = supportActionBar!!
+        actionBar.setCustomView(R.layout.activity_conversation_v2_action_bar)
+        actionBar.setDisplayShowCustomEnabled(true)
         conversationTitleView.text = thread.toShortString()
         profilePictureView.glide = glide
         profilePictureView.update(thread, threadID)

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

@@ -7,59 +7,6 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/conversationToolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?colorPrimary"
-        app:contentInsetStart="0dp">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:layout_marginLeft="20dp"
-            android:layout_marginRight="20dp">
-
-            <LinearLayout
-                android:id="@+id/backButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:layout_alignParentLeft="true"
-                android:layout_centerVertical="true"
-                android:orientation="horizontal"
-                android:background="@drawable/conversation_back_button_background">
-
-                <ImageView
-                    android:layout_width="18dp"
-                    android:layout_height="18dp"
-                    android:src="@drawable/ic_baseline_arrow_back_compact_24"
-                    android:layout_marginRight="-2dp"
-                    android:layout_marginLeft="8dp" />
-
-                <org.thoughtcrime.securesms.loki.views.ProfilePictureView
-                    android:id="@+id/profilePictureView"
-                    android:layout_width="@dimen/small_profile_picture_size"
-                    android:layout_height="@dimen/small_profile_picture_size" />
-
-            </LinearLayout>
-
-            <TextView
-                android:id="@+id/conversationTitleView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_centerVertical="true"
-                android:layout_marginLeft="67dp"
-                android:text="Elon"
-                android:textColor="@color/text"
-                android:textStyle="bold"
-                android:textSize="@dimen/very_large_font_size" />
-
-        </RelativeLayout>
-
-    </androidx.appcompat.widget.Toolbar>
-
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/conversationRecyclerView"
         android:layout_width="match_parent"

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

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="?attr/actionBarSize"
+    android:orientation="horizontal"
+    android:gravity="center_vertical">
+
+    <org.thoughtcrime.securesms.loki.views.ProfilePictureView
+        android:id="@+id/profilePictureView"
+        android:layout_width="@dimen/small_profile_picture_size"
+        android:layout_height="@dimen/small_profile_picture_size" />
+
+    <TextView
+        android:id="@+id/conversationTitleView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
+        android:text="Elon"
+        android:textColor="@color/text"
+        android:textStyle="bold"
+        android:textSize="@dimen/very_large_font_size" />
+
+</LinearLayout>