diff --git a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationUIView.kt b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationUIView.kt index 380250d89..e74db1230 100644 --- a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationUIView.kt +++ b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationUIView.kt @@ -129,9 +129,10 @@ class CollectionCreationUIView( val selectTabsText = if (it.selectedTabs.isEmpty()) { view.context.getString(R.string.create_collection_save_to_collection_empty) } else { - view.context.resources.getQuantityString( - R.plurals.create_collection_save_to_collection_full_plural, - it.selectedTabs.size, + view.context.getString( + if (it.selectedTabs.size == 1) + R.string.create_collection_save_to_collection_tab_selected else + R.string.create_collection_save_to_collection_tabs_selected, it.selectedTabs.size ) } diff --git a/app/src/main/java/org/mozilla/fenix/collections/CreateCollectionFragment.kt b/app/src/main/java/org/mozilla/fenix/collections/CreateCollectionFragment.kt index a65d82bb9..f41f6d156 100644 --- a/app/src/main/java/org/mozilla/fenix/collections/CreateCollectionFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/collections/CreateCollectionFragment.kt @@ -100,7 +100,9 @@ class CreateCollectionFragment : DialogFragment() { context?.let { context: Context -> val rootView = context.getRootView() rootView?.let { view: View -> - val string = context.resources.getQuantityString(R.plurals.create_collection_tabs_saved, tabSize) + val string = + if (tabSize > 1) context.getString(R.string.create_collection_tabs_saved) else + context.getString(R.string.create_collection_tab_saved) FenixSnackbar.make(view, Snackbar.LENGTH_LONG).setText(string) .show() } diff --git a/app/src/main/res/layout/component_collection_creation.xml b/app/src/main/res/layout/component_collection_creation.xml index 2c077fe95..f054c99f3 100644 --- a/app/src/main/res/layout/component_collection_creation.xml +++ b/app/src/main/res/layout/component_collection_creation.xml @@ -157,6 +157,7 @@ android:textSize="16sp" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toStartOf="@+id/save_button" app:layout_constraintStart_toEndOf="@id/close_icon" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/component_collection_creation_name_collection.xml b/app/src/main/res/layout/component_collection_creation_name_collection.xml index 3cde3d30e..883c1d721 100644 --- a/app/src/main/res/layout/component_collection_creation_name_collection.xml +++ b/app/src/main/res/layout/component_collection_creation_name_collection.xml @@ -164,6 +164,7 @@ android:textSize="16sp" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toStartOf="@+id/save_button" app:layout_constraintStart_toEndOf="@id/close_icon" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/component_collection_creation_select_collection.xml b/app/src/main/res/layout/component_collection_creation_select_collection.xml index 9f372b37d..7f2c85809 100644 --- a/app/src/main/res/layout/component_collection_creation_select_collection.xml +++ b/app/src/main/res/layout/component_collection_creation_select_collection.xml @@ -165,6 +165,7 @@ android:textSize="16sp" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toStartOf="@+id/save_button" app:layout_constraintStart_toEndOf="@id/close_icon" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 929d4a2f8..0c22c4717 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -434,18 +434,17 @@ Select tabs to save - - - %d tab selected - %d tabs selected - + + %d tabs selected - - - Tab saved! - Tabs saved! - + + %d tab selected + + + Tabs saved! + + + Tab saved! Close