From 33cf3d3032947bc1d3b5f99a758e5c58abb617bf Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Mon, 19 Sep 2022 16:20:05 +0200
Subject: [PATCH] Setup a custom toolbar

---
 .../devices/v2/rename/RenameSessionActivity.kt   |  9 ++++++---
 .../devices/v2/rename/RenameSessionFragment.kt   |  5 ++---
 .../main/res/layout/fragment_session_rename.xml  | 16 +++++++++++++++-
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionActivity.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionActivity.kt
index 36161610cd..11b3d5aebc 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionActivity.kt
@@ -22,20 +22,23 @@ import android.os.Bundle
 import com.airbnb.mvrx.Mavericks
 import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.core.extensions.addFragment
-import im.vector.app.core.platform.SimpleFragmentActivity
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.databinding.ActivitySimpleBinding
 
 /**
  * Display the screen to rename a Session.
  */
 @AndroidEntryPoint
-class RenameSessionActivity : SimpleFragmentActivity() {
+class RenameSessionActivity : VectorBaseActivity<ActivitySimpleBinding>() {
+
+    override fun getBinding() = ActivitySimpleBinding.inflate(layoutInflater)
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         if (isFirstCreation()) {
             addFragment(
-                    container = views.container,
+                    container = views.simpleFragmentContainer,
                     fragmentClass = RenameSessionFragment::class.java,
                     params = intent.getParcelableExtra(Mavericks.KEY_ARG)
             )
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionFragment.kt
index 49b2ee2cdf..ade23b5ee2 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/rename/RenameSessionFragment.kt
@@ -53,9 +53,8 @@ class RenameSessionFragment :
     }
 
     private fun initToolbar() {
-        (activity as? AppCompatActivity)
-                ?.supportActionBar
-                ?.setTitle(R.string.device_manager_session_rename)
+        setupToolbar(views.renameSessionToolbar)
+                .allowBack(useCross = true)
     }
 
     private fun observeViewEvents() {
diff --git a/vector/src/main/res/layout/fragment_session_rename.xml b/vector/src/main/res/layout/fragment_session_rename.xml
index cd0a47ae82..8ce1cbc453 100644
--- a/vector/src/main/res/layout/fragment_session_rename.xml
+++ b/vector/src/main/res/layout/fragment_session_rename.xml
@@ -4,6 +4,20 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appBarLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/renameSessionToolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?actionBarSize"
+            app:title="@string/device_manager_session_rename"/>
+
+    </com.google.android.material.appbar.AppBarLayout>
+
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/renameSessionInputLayout"
         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
@@ -14,7 +28,7 @@
         android:hint="@string/device_manager_session_rename_edit_hint"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintTop_toBottomOf="@id/appBarLayout">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/renameSessionEditText"