From 306637a196c3a12f4d9f2bace6907c4413dcfb6e Mon Sep 17 00:00:00 2001 From: Gabriel Luong Date: Sun, 25 Jun 2023 12:54:01 -0400 Subject: [PATCH] Bug 1840210 - Rename mozac_ic_refresh to mozac_ic_arrow_clockwise_24 --- .../{mozac_ic_refresh.xml => mozac_ic_arrow_clockwise_24.xml} | 0 .../src/main/java/org/mozilla/samples/browser/DefaultComponents.kt | 2 +- .../src/main/java/org/mozilla/samples/toolbar/ToolbarActivity.kt | 4 ++-- .../app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt | 2 +- .../java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt | 2 +- .../main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt | 2 +- .../mozilla/focus/browser/integration/NavigationButtonsIntegration.kt | 2 +- .../app/src/main/java/org/mozilla/focus/menu/browser/CustomTabMenu.kt | 2 +- .../main/java/org/mozilla/focus/menu/browser/DefaultBrowserMenu.kt | 2 +- .../android/focus-android/app/src/main/res/layout/menu_navigation.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) rename mobile/android/android-components/components/ui/icons/src/main/res/drawable/{mozac_ic_refresh.xml => mozac_ic_arrow_clockwise_24.xml} (100%) diff --git a/mobile/android/android-components/components/ui/icons/src/main/res/drawable/mozac_ic_refresh.xml b/mobile/android/android-components/components/ui/icons/src/main/res/drawable/mozac_ic_arrow_clockwise_24.xml similarity index 100% rename from mobile/android/android-components/components/ui/icons/src/main/res/drawable/mozac_ic_refresh.xml rename to mobile/android/android-components/components/ui/icons/src/main/res/drawable/mozac_ic_arrow_clockwise_24.xml diff --git a/mobile/android/android-components/samples/browser/src/main/java/org/mozilla/samples/browser/DefaultComponents.kt b/mobile/android/android-components/samples/browser/src/main/java/org/mozilla/samples/browser/DefaultComponents.kt index 8ac43935435c..6782f392a111 100644 --- a/mobile/android/android-components/samples/browser/src/main/java/org/mozilla/samples/browser/DefaultComponents.kt +++ b/mobile/android/android-components/samples/browser/src/main/java/org/mozilla/samples/browser/DefaultComponents.kt @@ -406,7 +406,7 @@ open class DefaultComponents(private val applicationContext: Context) { } val refresh = BrowserMenuItemToolbar.TwoStateButton( - primaryImageResource = iconsR.drawable.mozac_ic_refresh, + primaryImageResource = iconsR.drawable.mozac_ic_arrow_clockwise_24, primaryContentDescription = "Refresh", primaryImageTintResource = photonColors.photonBlue90, isInPrimaryState = { diff --git a/mobile/android/android-components/samples/toolbar/src/main/java/org/mozilla/samples/toolbar/ToolbarActivity.kt b/mobile/android/android-components/samples/toolbar/src/main/java/org/mozilla/samples/toolbar/ToolbarActivity.kt index a73bb52f8e2b..7eaecc142568 100644 --- a/mobile/android/android-components/samples/toolbar/src/main/java/org/mozilla/samples/toolbar/ToolbarActivity.kt +++ b/mobile/android/android-components/samples/toolbar/src/main/java/org/mozilla/samples/toolbar/ToolbarActivity.kt @@ -152,7 +152,7 @@ class ToolbarActivity : AppCompatActivity() { // ////////////////////////////////////////////////////////////////////////////////////////// val reload = BrowserToolbar.TwoStateButton( - primaryImage = resources.getThemedDrawable(iconsR.drawable.mozac_ic_refresh)!!, + primaryImage = resources.getThemedDrawable(iconsR.drawable.mozac_ic_arrow_clockwise_24)!!, primaryContentDescription = "Reload", secondaryImage = resources.getThemedDrawable(iconsR.drawable.mozac_ic_stop)!!, secondaryContentDescription = "Stop", @@ -244,7 +244,7 @@ class ToolbarActivity : AppCompatActivity() { } val reload = BrowserMenuItemToolbar.TwoStateButton( - primaryImageResource = iconsR.drawable.mozac_ic_refresh, + primaryImageResource = iconsR.drawable.mozac_ic_arrow_clockwise_24, primaryContentDescription = "Reload", secondaryImageResource = iconsR.drawable.mozac_ic_stop, secondaryContentDescription = "Stop", diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt index 020f496dc36a..4e183572d435 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt @@ -306,7 +306,7 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler { refreshAction = BrowserToolbar.TwoStateButton( primaryImage = AppCompatResources.getDrawable( context, - R.drawable.mozac_ic_refresh, + R.drawable.mozac_ic_arrow_clockwise_24, )!!, primaryContentDescription = context.getString(R.string.browser_menu_refresh), primaryImageTintResource = enableTint, diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt index 80c7ed03fb8b..a9936b1a0869 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt @@ -123,7 +123,7 @@ open class DefaultToolbarMenu( } val refresh = BrowserMenuItemToolbar.TwoStateButton( - primaryImageResource = mozilla.components.ui.icons.R.drawable.mozac_ic_refresh, + primaryImageResource = mozilla.components.ui.icons.R.drawable.mozac_ic_arrow_clockwise_24, primaryContentDescription = context.getString(R.string.browser_menu_refresh), primaryImageTintResource = primaryTextColor(), isInPrimaryState = { diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt index 06b042d83434..9d61488348a1 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt @@ -89,7 +89,7 @@ class CustomTabToolbarMenu( } val refresh = BrowserMenuItemToolbar.TwoStateButton( - primaryImageResource = mozilla.components.ui.icons.R.drawable.mozac_ic_refresh, + primaryImageResource = mozilla.components.ui.icons.R.drawable.mozac_ic_arrow_clockwise_24, primaryContentDescription = context.getString(R.string.browser_menu_refresh), primaryImageTintResource = primaryTextColor(), isInPrimaryState = { diff --git a/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/browser/integration/NavigationButtonsIntegration.kt b/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/browser/integration/NavigationButtonsIntegration.kt index 3205f435968b..bcf374a2a2b3 100644 --- a/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/browser/integration/NavigationButtonsIntegration.kt +++ b/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/browser/integration/NavigationButtonsIntegration.kt @@ -80,7 +80,7 @@ class NavigationButtonsIntegration( val reloadOrStopButton = BrowserToolbar.TwoStateButton( primaryImage = ContextCompat.getDrawable(context, R.drawable.mozac_ic_stop)!!, - secondaryImage = ContextCompat.getDrawable(context, R.drawable.mozac_ic_refresh)!!, + secondaryImage = ContextCompat.getDrawable(context, R.drawable.mozac_ic_arrow_clockwise_24)!!, primaryContentDescription = context.getString(R.string.content_description_stop), secondaryContentDescription = context.getString(R.string.content_description_reload), primaryImageTintResource = enabledColorRes, diff --git a/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/menu/browser/CustomTabMenu.kt b/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/menu/browser/CustomTabMenu.kt index bfd69cfc1519..f72ccc899e7f 100644 --- a/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/menu/browser/CustomTabMenu.kt +++ b/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/menu/browser/CustomTabMenu.kt @@ -68,7 +68,7 @@ class CustomTabMenu( } val refresh = BrowserMenuItemToolbar.TwoStateButton( - primaryImageResource = R.drawable.mozac_ic_refresh, + primaryImageResource = R.drawable.mozac_ic_arrow_clockwise_24, primaryContentDescription = context.getString(R.string.content_description_reload), primaryImageTintResource = context.theme.resolveAttribute(R.attr.primaryText), isInPrimaryState = { diff --git a/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/menu/browser/DefaultBrowserMenu.kt b/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/menu/browser/DefaultBrowserMenu.kt index cac207fc27aa..a60572117e0e 100644 --- a/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/menu/browser/DefaultBrowserMenu.kt +++ b/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/menu/browser/DefaultBrowserMenu.kt @@ -75,7 +75,7 @@ class DefaultBrowserMenu( } val refresh = BrowserMenuItemToolbar.TwoStateButton( - primaryImageResource = R.drawable.mozac_ic_refresh, + primaryImageResource = R.drawable.mozac_ic_arrow_clockwise_24, primaryContentDescription = context.getString(R.string.content_description_reload), primaryImageTintResource = context.theme.resolveAttribute(R.attr.primaryText), isInPrimaryState = { diff --git a/mobile/android/focus-android/app/src/main/res/layout/menu_navigation.xml b/mobile/android/focus-android/app/src/main/res/layout/menu_navigation.xml index e55fc2042936..0bec4926c3f7 100644 --- a/mobile/android/focus-android/app/src/main/res/layout/menu_navigation.xml +++ b/mobile/android/focus-android/app/src/main/res/layout/menu_navigation.xml @@ -25,7 +25,7 @@ android:layout_weight="1" android:background="?android:attr/selectableItemBackgroundBorderless" android:contentDescription="@string/content_description_reload" - android:src="@drawable/mozac_ic_refresh"/> + android:src="@drawable/mozac_ic_arrow_clockwise_24"/>