Merge pull request #5765 from chagai95/fix-setting-transfer-title

bmarty · web-flow · commit c58b8acdccb4 · 2022-04-14T17:11:09.000+02:00
Fix setting transfer title
diff --git a/changelog.d/5765.bugfix b/changelog.d/5765.bugfix
@@ -0,0 +1 @@
+Fixing setting transfer title in call transfer.
diff --git a/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferActivity.kt b/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferActivity.kt
@@ -70,7 +70,6 @@ class CallTransferActivity : VectorBaseActivity<ActivityCallTransferBinding>() {
         }.attach()
         setupToolbar(views.callTransferToolbar)
                 .allowBack()
-        views.callTransferToolbar.title = getString(R.string.call_transfer_title)
         setupConnectAction()
     }
 
diff --git a/vector/src/main/res/layout/activity_call_transfer.xml b/vector/src/main/res/layout/activity_call_transfer.xml
@@ -17,6 +17,7 @@
 
             <com.google.android.material.appbar.MaterialToolbar
                 android:id="@+id/callTransferToolbar"
+                app:title="@string/call_transfer_title"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
 
@@ -86,4 +87,4 @@
             layout="@layout/merge_overlay_waiting_view" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Fixing setting transfer title in call transfer.`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,6 @@ class CallTransferActivity : VectorBaseActivity<ActivityCallTransferBinding>() {`
`70`	`70`	`}.attach()`
`71`	`71`	`setupToolbar(views.callTransferToolbar)`
`72`	`72`	`.allowBack()`
`73`		`- views.callTransferToolbar.title = getString(R.string.call_transfer_title)`
`74`	`73`	`setupConnectAction()`
`75`	`74`	`}`
`76`	`75`