From d706b085a934b9e110aff2dc960dec248b5fe0b5 Mon Sep 17 00:00:00 2001
From: mcarare <mihai.carare.dev@gmail.com>
Date: Wed, 27 May 2020 14:54:39 +0300
Subject: [PATCH] For #9626: Delay cloning ConstraintSet to only when needed
 for updating.

---
 .../collections/CollectionCreationView.kt     | 36 +++++++++----------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationView.kt b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationView.kt
index 252b13a8bf..ec81bc1b40 100644
--- a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationView.kt
+++ b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationView.kt
@@ -68,16 +68,6 @@ class CollectionCreationView(
         transition.duration = TRANSITION_DURATION
         transition.excludeTarget(back_button, true)
 
-        selectTabsConstraints.clone(collection_constraint_layout)
-        selectCollectionConstraints.clone(
-            view.context,
-            R.layout.component_collection_creation_select_collection
-        )
-        nameCollectionConstraints.clone(
-            view.context,
-            R.layout.component_collection_creation_name_collection
-        )
-
         view.bottom_bar_icon_button.apply {
             increaseTapArea(increaseButtonByDps)
         }
@@ -160,9 +150,8 @@ class CollectionCreationView(
         view.bottom_bar_icon_button.setOnClickListener {
             interactor.close()
         }
-
-        val constraint = selectTabsConstraints
-        constraint.applyTo(view.collection_constraint_layout)
+        selectTabsConstraints.clone(collection_constraint_layout)
+        selectTabsConstraints.applyTo(view.collection_constraint_layout)
 
         collectionCreationTabListAdapter.updateData(state.tabs, state.selectedTabs)
 
@@ -224,8 +213,11 @@ class CollectionCreationView(
             view.collection_constraint_layout,
             transition
         )
-        val constraint = selectCollectionConstraints
-        constraint.applyTo(view.collection_constraint_layout)
+        selectCollectionConstraints.clone(
+            view.context,
+            R.layout.component_collection_creation_select_collection
+        )
+        selectCollectionConstraints.applyTo(view.collection_constraint_layout)
         back_button.text =
             view.context.getString(R.string.create_collection_select_collection)
     }
@@ -243,8 +235,11 @@ class CollectionCreationView(
         }
 
         view.name_collection_edittext.showKeyboard()
-        val constraint = nameCollectionConstraints
-        constraint.applyTo(view.collection_constraint_layout)
+        nameCollectionConstraints.clone(
+            view.context,
+            R.layout.component_collection_creation_name_collection
+        )
+        nameCollectionConstraints.applyTo(view.collection_constraint_layout)
         name_collection_edittext.setText(
             view.context.getString(
                 R.string.create_collection_default_name,
@@ -272,8 +267,11 @@ class CollectionCreationView(
                 collectionCreationTabListAdapter.updateData(tabs, tabs.toSet(), true)
             }
         }
-        val constraint = nameCollectionConstraints
-        constraint.applyTo(view.collection_constraint_layout)
+        nameCollectionConstraints.clone(
+            view.context,
+            R.layout.component_collection_creation_name_collection
+        )
+        nameCollectionConstraints.applyTo(view.collection_constraint_layout)
         name_collection_edittext.setText(state.selectedTabCollection?.title)
         name_collection_edittext.setSelection(0, name_collection_edittext.text.length)