blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #11182: Fix back button text update according to save step.

master
mcarare 2020-06-04 17:46:19 +03:00 committed by Emily Kager
parent a910698007
commit 5a23fb33f8
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/java/org/mozilla/fenix/collections/CollectionCreationView.kt
View File

@ -141,20 +141,28 @@ class CollectionCreationView(
private fun updateForSelectCollection() {
tab_list.isClickable = false
back_button.setOnClickListener {
interactor.onBackPressed(SaveCollectionStep.SelectCollection)
}
TransitionManager.beginDelayedTransition(collection_constraint_layout, transition)
selectCollectionConstraints.clone(
containerView.context,
R.layout.component_collection_creation_select_collection
)
selectCollectionConstraints.applyTo(collection_constraint_layout)
back_button.apply {
text = context.getString(R.string.create_collection_select_collection)
setOnClickListener {
interactor.onBackPressed(SaveCollectionStep.SelectCollection)
}
}
TransitionManager.beginDelayedTransition(collection_constraint_layout, transition)
}
private fun updateForNameCollection(state: CollectionCreationState) {
tab_list.isClickable = false
nameCollectionConstraints.clone(
containerView.context,
R.layout.component_collection_creation_name_collection
)
nameCollectionConstraints.applyTo(collection_constraint_layout)
collectionCreationTabListAdapter.updateData(state.selectedTabs.toList(), state.selectedTabs, true)
back_button.apply {
@ -169,11 +177,7 @@ class CollectionCreationView(
}
name_collection_edittext.showKeyboard()
nameCollectionConstraints.clone(
containerView.context,
R.layout.component_collection_creation_name_collection
)
nameCollectionConstraints.applyTo(collection_constraint_layout)
name_collection_edittext.setText(
containerView.context.getString(
R.string.create_collection_default_name,