Bug 1840210 - Rename mozac_ic_forward to mozac_ic_forward_24
This commit is contained in:
committed by
mergify[bot]
parent
e60ba5018e
commit
6eb3873250
@@ -393,7 +393,7 @@ open class DefaultComponents(private val applicationContext: Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
val forward = BrowserMenuItemToolbar.TwoStateButton(
|
val forward = BrowserMenuItemToolbar.TwoStateButton(
|
||||||
primaryImageResource = iconsR.drawable.mozac_ic_forward,
|
primaryImageResource = iconsR.drawable.mozac_ic_forward_24,
|
||||||
primaryContentDescription = "Forward",
|
primaryContentDescription = "Forward",
|
||||||
primaryImageTintResource = photonColors.photonBlue90,
|
primaryImageTintResource = photonColors.photonBlue90,
|
||||||
isInPrimaryState = {
|
isInPrimaryState = {
|
||||||
|
|||||||
@@ -139,7 +139,7 @@ class ToolbarActivity : AppCompatActivity() {
|
|||||||
binding.toolbar.addNavigationAction(back)
|
binding.toolbar.addNavigationAction(back)
|
||||||
|
|
||||||
val forward = BrowserToolbar.Button(
|
val forward = BrowserToolbar.Button(
|
||||||
resources.getThemedDrawable(iconsR.drawable.mozac_ic_forward)!!,
|
resources.getThemedDrawable(iconsR.drawable.mozac_ic_forward_24)!!,
|
||||||
"Forward",
|
"Forward",
|
||||||
) {
|
) {
|
||||||
simulateReload()
|
simulateReload()
|
||||||
@@ -236,7 +236,7 @@ class ToolbarActivity : AppCompatActivity() {
|
|||||||
// //////////////////////////////////////////////////////////////////////////////////////////
|
// //////////////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
val forward = BrowserMenuItemToolbar.Button(
|
val forward = BrowserMenuItemToolbar.Button(
|
||||||
iconsR.drawable.mozac_ic_forward,
|
iconsR.drawable.mozac_ic_forward_24,
|
||||||
"Forward",
|
"Forward",
|
||||||
isEnabled = { canGoForward() },
|
isEnabled = { canGoForward() },
|
||||||
) {
|
) {
|
||||||
|
|||||||
@@ -278,7 +278,7 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
|
|||||||
forwardAction = BrowserToolbar.TwoStateButton(
|
forwardAction = BrowserToolbar.TwoStateButton(
|
||||||
primaryImage = AppCompatResources.getDrawable(
|
primaryImage = AppCompatResources.getDrawable(
|
||||||
context,
|
context,
|
||||||
R.drawable.mozac_ic_forward,
|
R.drawable.mozac_ic_forward_24,
|
||||||
)!!,
|
)!!,
|
||||||
primaryContentDescription = context.getString(R.string.browser_menu_forward),
|
primaryContentDescription = context.getString(R.string.browser_menu_forward),
|
||||||
primaryImageTintResource = enableTint,
|
primaryImageTintResource = enableTint,
|
||||||
|
|||||||
@@ -109,7 +109,7 @@ open class DefaultToolbarMenu(
|
|||||||
}
|
}
|
||||||
|
|
||||||
val forward = BrowserMenuItemToolbar.TwoStateButton(
|
val forward = BrowserMenuItemToolbar.TwoStateButton(
|
||||||
primaryImageResource = mozilla.components.ui.icons.R.drawable.mozac_ic_forward,
|
primaryImageResource = mozilla.components.ui.icons.R.drawable.mozac_ic_forward_24,
|
||||||
primaryContentDescription = context.getString(R.string.browser_menu_forward),
|
primaryContentDescription = context.getString(R.string.browser_menu_forward),
|
||||||
primaryImageTintResource = primaryTextColor(),
|
primaryImageTintResource = primaryTextColor(),
|
||||||
isInPrimaryState = {
|
isInPrimaryState = {
|
||||||
|
|||||||
@@ -72,7 +72,7 @@ class CustomTabToolbarMenu(
|
|||||||
}
|
}
|
||||||
|
|
||||||
val forward = BrowserMenuItemToolbar.TwoStateButton(
|
val forward = BrowserMenuItemToolbar.TwoStateButton(
|
||||||
primaryImageResource = mozilla.components.ui.icons.R.drawable.mozac_ic_forward,
|
primaryImageResource = mozilla.components.ui.icons.R.drawable.mozac_ic_forward_24,
|
||||||
primaryContentDescription = context.getString(R.string.browser_menu_forward),
|
primaryContentDescription = context.getString(R.string.browser_menu_forward),
|
||||||
primaryImageTintResource = primaryTextColor(),
|
primaryImageTintResource = primaryTextColor(),
|
||||||
isInPrimaryState = {
|
isInPrimaryState = {
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ class NavigationButtonsIntegration(
|
|||||||
toolbar.addNavigationAction(backButton)
|
toolbar.addNavigationAction(backButton)
|
||||||
|
|
||||||
val forwardButton = BrowserToolbar.TwoStateButton(
|
val forwardButton = BrowserToolbar.TwoStateButton(
|
||||||
primaryImage = ContextCompat.getDrawable(context, R.drawable.mozac_ic_forward)!!,
|
primaryImage = ContextCompat.getDrawable(context, R.drawable.mozac_ic_forward_24)!!,
|
||||||
primaryContentDescription = context.getString(R.string.content_description_forward),
|
primaryContentDescription = context.getString(R.string.content_description_forward),
|
||||||
primaryImageTintResource = enabledColorRes,
|
primaryImageTintResource = enabledColorRes,
|
||||||
isInPrimaryState = {
|
isInPrimaryState = {
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ class CustomTabMenu(
|
|||||||
}
|
}
|
||||||
|
|
||||||
val forward = BrowserMenuItemToolbar.TwoStateButton(
|
val forward = BrowserMenuItemToolbar.TwoStateButton(
|
||||||
primaryImageResource = R.drawable.mozac_ic_forward,
|
primaryImageResource = R.drawable.mozac_ic_forward_24,
|
||||||
primaryContentDescription = context.getString(R.string.content_description_forward),
|
primaryContentDescription = context.getString(R.string.content_description_forward),
|
||||||
primaryImageTintResource = context.theme.resolveAttribute(R.attr.primaryText),
|
primaryImageTintResource = context.theme.resolveAttribute(R.attr.primaryText),
|
||||||
isInPrimaryState = {
|
isInPrimaryState = {
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ class DefaultBrowserMenu(
|
|||||||
}
|
}
|
||||||
|
|
||||||
val forward = BrowserMenuItemToolbar.TwoStateButton(
|
val forward = BrowserMenuItemToolbar.TwoStateButton(
|
||||||
primaryImageResource = R.drawable.mozac_ic_forward,
|
primaryImageResource = R.drawable.mozac_ic_forward_24,
|
||||||
primaryContentDescription = context.getString(R.string.content_description_forward),
|
primaryContentDescription = context.getString(R.string.content_description_forward),
|
||||||
primaryImageTintResource = context.theme.resolveAttribute(R.attr.primaryText),
|
primaryImageTintResource = context.theme.resolveAttribute(R.attr.primaryText),
|
||||||
isInPrimaryState = {
|
isInPrimaryState = {
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="?android:attr/selectableItemBackgroundBorderless"
|
android:background="?android:attr/selectableItemBackgroundBorderless"
|
||||||
android:contentDescription="@string/content_description_forward"
|
android:contentDescription="@string/content_description_forward"
|
||||||
android:src="@drawable/mozac_ic_forward"/>
|
android:src="@drawable/mozac_ic_forward_24"/>
|
||||||
|
|
||||||
<ImageButton
|
<ImageButton
|
||||||
android:id="@+id/refresh"
|
android:id="@+id/refresh"
|
||||||
|
|||||||
Reference in New Issue
Block a user