From dfc03d4580d68ea98ca97afb45f40daee8a61b66 Mon Sep 17 00:00:00 2001
From: Mihai Adrian <48995920+mcarare@users.noreply.github.com>
Date: Fri, 20 Sep 2019 16:41:04 +0300
Subject: [PATCH] [fenix] For
 https://github.com/mozilla-mobile/fenix/issues/3731 Improved UX for opening
 tabs from a Collection (https://github.com/mozilla-mobile/fenix/pull/5427)

* For https://github.com/mozilla-mobile/fenix/issues/3731 Changed order of items for a collection's overflow menu

* For https://github.com/mozilla-mobile/fenix/issues/3731 Changed the order tabs open to keep same order from collections
---
 .../org/mozilla/fenix/home/HomeFragment.kt    |  2 +-
 .../viewholders/CollectionViewHolder.kt       | 23 +++++++++++--------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
index d8e0cd116e..cdb536ce96 100644
--- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
@@ -532,7 +532,7 @@ class HomeFragment : Fragment(), AccountObserver {
                 val context = requireContext()
                 val components = context.components
 
-                action.collection.tabs.forEach {
+                action.collection.tabs.reversed().forEach {
                     val session = it.restore(
                         context = context,
                         engine = components.core.engine,
diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/CollectionViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/CollectionViewHolder.kt
index da39dfca87..2937747266 100644
--- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/CollectionViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/CollectionViewHolder.kt
@@ -132,25 +132,28 @@ class CollectionItemMenu(
     private val menuItems by lazy {
         listOf(
             SimpleBrowserMenuItem(
-                context.getString(R.string.collection_delete),
-                textColorResource = ThemeManager.resolveAttribute(R.attr.destructive, context)
+                context.getString(R.string.collection_open_tabs)
             ) {
-                onItemTapped.invoke(Item.DeleteCollection)
+                onItemTapped.invoke(Item.OpenTabs)
             },
-            SimpleBrowserMenuItem(
-                context.getString(R.string.add_tab)
-            ) {
-                onItemTapped.invoke(Item.AddTab)
-            }.apply { visible = { sessionHasOpenTabs } },
+
             SimpleBrowserMenuItem(
                 context.getString(R.string.collection_rename)
             ) {
                 onItemTapped.invoke(Item.RenameCollection)
             },
+
             SimpleBrowserMenuItem(
-                context.getString(R.string.collection_open_tabs)
+                context.getString(R.string.add_tab)
             ) {
-                onItemTapped.invoke(Item.OpenTabs)
+                onItemTapped.invoke(Item.AddTab)
+            }.apply { visible = { sessionHasOpenTabs } },
+
+            SimpleBrowserMenuItem(
+                context.getString(R.string.collection_delete),
+                textColorResource = ThemeManager.resolveAttribute(R.attr.destructive, context)
+            ) {
+                onItemTapped.invoke(Item.DeleteCollection)
             }
         )
     }