* For #3731 Changed order of items for a collection's overflow menu * For #3731 Changed the order tabs open to keep same order from collectionsmaster
parent
05a4faec78
commit
a1c8fc0698
|
@ -532,7 +532,7 @@ class HomeFragment : Fragment(), AccountObserver {
|
||||||
val context = requireContext()
|
val context = requireContext()
|
||||||
val components = context.components
|
val components = context.components
|
||||||
|
|
||||||
action.collection.tabs.forEach {
|
action.collection.tabs.reversed().forEach {
|
||||||
val session = it.restore(
|
val session = it.restore(
|
||||||
context = context,
|
context = context,
|
||||||
engine = components.core.engine,
|
engine = components.core.engine,
|
||||||
|
|
|
@ -132,25 +132,28 @@ class CollectionItemMenu(
|
||||||
private val menuItems by lazy {
|
private val menuItems by lazy {
|
||||||
listOf(
|
listOf(
|
||||||
SimpleBrowserMenuItem(
|
SimpleBrowserMenuItem(
|
||||||
context.getString(R.string.collection_delete),
|
context.getString(R.string.collection_open_tabs)
|
||||||
textColorResource = ThemeManager.resolveAttribute(R.attr.destructive, context)
|
|
||||||
) {
|
) {
|
||||||
onItemTapped.invoke(Item.DeleteCollection)
|
onItemTapped.invoke(Item.OpenTabs)
|
||||||
},
|
},
|
||||||
SimpleBrowserMenuItem(
|
|
||||||
context.getString(R.string.add_tab)
|
|
||||||
) {
|
|
||||||
onItemTapped.invoke(Item.AddTab)
|
|
||||||
}.apply { visible = { sessionHasOpenTabs } },
|
|
||||||
SimpleBrowserMenuItem(
|
SimpleBrowserMenuItem(
|
||||||
context.getString(R.string.collection_rename)
|
context.getString(R.string.collection_rename)
|
||||||
) {
|
) {
|
||||||
onItemTapped.invoke(Item.RenameCollection)
|
onItemTapped.invoke(Item.RenameCollection)
|
||||||
},
|
},
|
||||||
|
|
||||||
SimpleBrowserMenuItem(
|
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)
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue