blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #7431: Remove extra share button

master
Tiger Oakes 2020-01-10 22:55:08 -08:00 committed by Emily Kager
parent 913c50b59f
commit 55c1b01d7b
2 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt
View File

@ -7,12 +7,12 @@ package org.mozilla.fenix.customtabs
import android.content.Context import android.content.Context
import android.graphics.Typeface import android.graphics.Typeface
import mozilla.components.browser.menu.BrowserMenuBuilder import mozilla.components.browser.menu.BrowserMenuBuilder
import mozilla.components.browser.menu.item.BrowserMenuCategory
import mozilla.components.browser.menu.item.BrowserMenuDivider import mozilla.components.browser.menu.item.BrowserMenuDivider
import mozilla.components.browser.menu.item.BrowserMenuImageSwitch
import mozilla.components.browser.menu.item.BrowserMenuImageText import mozilla.components.browser.menu.item.BrowserMenuImageText
import mozilla.components.browser.menu.item.BrowserMenuItemToolbar import mozilla.components.browser.menu.item.BrowserMenuItemToolbar
import mozilla.components.browser.menu.item.SimpleBrowserMenuItem import mozilla.components.browser.menu.item.SimpleBrowserMenuItem
import mozilla.components.browser.menu.item.BrowserMenuImageSwitch
import mozilla.components.browser.menu.item.BrowserMenuCategory
import mozilla.components.browser.session.Session import mozilla.components.browser.session.Session
import mozilla.components.browser.session.SessionManager import mozilla.components.browser.session.SessionManager
import org.mozilla.fenix.R import org.mozilla.fenix.R
@ -90,7 +90,6 @@ class CustomTabToolbarMenu(
val menuItems = listOf( val menuItems = listOf(
poweredBy, poweredBy,
BrowserMenuDivider(), BrowserMenuDivider(),
share,
desktopMode, desktopMode,
findInPage, findInPage,
openInFenix, openInFenix,
@ -100,15 +99,6 @@ class CustomTabToolbarMenu(
if (shouldReverseItems) { menuItems.reversed() } else { menuItems } if (shouldReverseItems) { menuItems.reversed() } else { menuItems }
} }
private val share = BrowserMenuImageText(
label = context.getString(R.string.browser_menu_share),
imageResource = R.drawable.mozac_ic_share,
textColorResource = primaryTextColor(),
iconTintColorResource = primaryTextColor()
) {
onItemTapped.invoke(ToolbarMenu.Item.Share)
}
private val desktopMode = BrowserMenuImageSwitch( private val desktopMode = BrowserMenuImageSwitch(
imageResource = R.drawable.ic_desktop, imageResource = R.drawable.ic_desktop,
label = context.getString(R.string.browser_menu_desktop_site), label = context.getString(R.string.browser_menu_desktop_site),

17
app/src/main/java/org/mozilla/fenix/customtabs/CustomTabsIntegration.kt
View File

@ -99,22 +99,15 @@ class CustomTabsIntegration(
menuBuilder = customTabToolbarMenu.menuBuilder, menuBuilder = customTabToolbarMenu.menuBuilder,
menuItemIndex = START_OF_MENU_ITEMS_INDEX, menuItemIndex = START_OF_MENU_ITEMS_INDEX,
window = activity.window, window = activity.window,
shareListener = { onItemTapped.invoke(ToolbarMenu.Item.Share) },
closeListener = { activity.finish() } closeListener = { activity.finish() }
) )
override fun start() { override fun start() = feature.start()
feature.start() override fun stop() = feature.stop()
} override fun onBackPressed() = feature.onBackPressed()
override fun stop() {
feature.stop()
}
override fun onBackPressed(): Boolean {
return feature.onBackPressed()
}
companion object { companion object {
const val START_OF_MENU_ITEMS_INDEX = 2 private const val START_OF_MENU_ITEMS_INDEX = 2
} }
} }