diff --git a/mobile/android/android-components/components/compose/tabstray/src/main/java/mozilla/components/compose/tabstray/Tab.kt b/mobile/android/android-components/components/compose/tabstray/src/main/java/mozilla/components/compose/tabstray/Tab.kt index 36d378c2ab03..20801e06090b 100644 --- a/mobile/android/android-components/components/compose/tabstray/src/main/java/mozilla/components/compose/tabstray/Tab.kt +++ b/mobile/android/android-components/components/compose/tabstray/src/main/java/mozilla/components/compose/tabstray/Tab.kt @@ -87,7 +87,7 @@ fun Tab( onClick = { onClose.invoke(tab.id) }, ) { Icon( - painter = painterResource(R.drawable.mozac_ic_close), + painter = painterResource(R.drawable.mozac_ic_cross_24), contentDescription = "close", tint = Color.White, ) diff --git a/mobile/android/android-components/components/feature/addons/src/main/res/layout/mozac_feature_addons_section_unsupported_section_item.xml b/mobile/android/android-components/components/feature/addons/src/main/res/layout/mozac_feature_addons_section_unsupported_section_item.xml index ae387411818d..bb217ebe3fb7 100644 --- a/mobile/android/android-components/components/feature/addons/src/main/res/layout/mozac_feature_addons_section_unsupported_section_item.xml +++ b/mobile/android/android-components/components/feature/addons/src/main/res/layout/mozac_feature_addons_section_unsupported_section_item.xml @@ -32,7 +32,7 @@ android:contentDescription="@string/mozac_feature_addons_remove" android:layout_gravity="center_vertical" app:tint="@android:color/darker_gray" - app:srcCompat="@drawable/mozac_ic_close"/> + app:srcCompat="@drawable/mozac_ic_cross_24"/> - diff --git a/mobile/android/android-components/components/feature/customtabs/src/main/java/mozilla/components/feature/customtabs/CustomTabsToolbarFeature.kt b/mobile/android/android-components/components/feature/customtabs/src/main/java/mozilla/components/feature/customtabs/CustomTabsToolbarFeature.kt index b0700c286bda..9fc17bfbeef6 100644 --- a/mobile/android/android-components/components/feature/customtabs/src/main/java/mozilla/components/feature/customtabs/CustomTabsToolbarFeature.kt +++ b/mobile/android/android-components/components/feature/customtabs/src/main/java/mozilla/components/feature/customtabs/CustomTabsToolbarFeature.kt @@ -14,7 +14,6 @@ import androidx.appcompat.content.res.AppCompatResources.getDrawable import androidx.core.graphics.drawable.toDrawable import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.cancel -import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.mapNotNull import mozilla.components.browser.menu.BrowserMenuBuilder import mozilla.components.browser.menu.BrowserMenuItem @@ -165,7 +164,7 @@ class CustomTabsToolbarFeature( @VisibleForTesting internal fun addCloseButton(tab: CustomTabSessionState, bitmap: Bitmap?) { val drawableIcon = bitmap?.toDrawable(context.resources) - ?: getDrawable(context, iconsR.drawable.mozac_ic_close)!!.mutate() + ?: getDrawable(context, iconsR.drawable.mozac_ic_cross_24)!!.mutate() drawableIcon.setTint(readableColor) diff --git a/mobile/android/android-components/components/feature/downloads/src/main/res/layout/mozac_downloader_chooser_prompt.xml b/mobile/android/android-components/components/feature/downloads/src/main/res/layout/mozac_downloader_chooser_prompt.xml index 605fe7894be5..2509ab8a6b70 100644 --- a/mobile/android/android-components/components/feature/downloads/src/main/res/layout/mozac_downloader_chooser_prompt.xml +++ b/mobile/android/android-components/components/feature/downloads/src/main/res/layout/mozac_downloader_chooser_prompt.xml @@ -54,7 +54,7 @@ android:contentDescription="@string/mozac_feature_downloads_button_close" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" - app:srcCompat="@drawable/mozac_ic_close" + app:srcCompat="@drawable/mozac_ic_cross_24" app:tint="?android:attr/textColorPrimary" tools:textColor="#000000" /> diff --git a/mobile/android/android-components/components/feature/downloads/src/main/res/layout/mozac_downloads_prompt.xml b/mobile/android/android-components/components/feature/downloads/src/main/res/layout/mozac_downloads_prompt.xml index 993eed20aefc..485533ce1bad 100644 --- a/mobile/android/android-components/components/feature/downloads/src/main/res/layout/mozac_downloads_prompt.xml +++ b/mobile/android/android-components/components/feature/downloads/src/main/res/layout/mozac_downloads_prompt.xml @@ -52,7 +52,7 @@ android:scaleType="centerInside" android:background="@null" android:contentDescription="@string/mozac_feature_downloads_button_close" - app:srcCompat="@drawable/mozac_ic_close" + app:srcCompat="@drawable/mozac_ic_cross_24" app:tint="?android:attr/textColorPrimary" tools:textColor="#000000" /> diff --git a/mobile/android/android-components/components/feature/findinpage/src/main/res/layout/mozac_feature_findinpage_view.xml b/mobile/android/android-components/components/feature/findinpage/src/main/res/layout/mozac_feature_findinpage_view.xml index 4f8dea0716e2..8ef497b94849 100644 --- a/mobile/android/android-components/components/feature/findinpage/src/main/res/layout/mozac_feature_findinpage_view.xml +++ b/mobile/android/android-components/components/feature/findinpage/src/main/res/layout/mozac_feature_findinpage_view.xml @@ -75,9 +75,9 @@ android:id="@+id/find_in_page_close_btn" style="@style/Mozac.Feature.FindInPage.Buttons" android:contentDescription="@string/mozac_feature_findindpage_dismiss" - app:srcCompat="@drawable/mozac_ic_close" + app:srcCompat="@drawable/mozac_ic_cross_24" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/find_in_page_next_btn" app:layout_constraintTop_toTopOf="parent"/> - \ No newline at end of file + diff --git a/mobile/android/android-components/components/ui/icons/src/main/res/drawable/mozac_ic_close.xml b/mobile/android/android-components/components/ui/icons/src/main/res/drawable/mozac_ic_cross_24.xml similarity index 100% rename from mobile/android/android-components/components/ui/icons/src/main/res/drawable/mozac_ic_close.xml rename to mobile/android/android-components/components/ui/icons/src/main/res/drawable/mozac_ic_cross_24.xml diff --git a/mobile/android/android-components/components/ui/tabcounter/src/main/java/mozilla/components/ui/tabcounter/TabCounterMenu.kt b/mobile/android/android-components/components/ui/tabcounter/src/main/java/mozilla/components/ui/tabcounter/TabCounterMenu.kt index 7c85d28b0f4f..43f416f41ccb 100644 --- a/mobile/android/android-components/components/ui/tabcounter/src/main/java/mozilla/components/ui/tabcounter/TabCounterMenu.kt +++ b/mobile/android/android-components/components/ui/tabcounter/src/main/java/mozilla/components/ui/tabcounter/TabCounterMenu.kt @@ -78,7 +78,7 @@ open class TabCounterMenu( text = context.getString(R.string.mozac_close_tab), start = DrawableMenuIcon( context, - iconsR.drawable.mozac_ic_close, + iconsR.drawable.mozac_ic_cross_24, tint = iconColor ?: getColor(context, R.color.mozac_ui_tabcounter_default_text), ), textStyle = TextStyle(), 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 fc305b218db7..3aa6562a4409 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 @@ -430,7 +430,7 @@ class ToolbarActivity : AppCompatActivity() { binding.toolbar.url = "https://www.mozilla.org/en-US/firefox/mobile/" - val drawableIcon = ContextCompat.getDrawable(this, iconsR.drawable.mozac_ic_close) + val drawableIcon = ContextCompat.getDrawable(this, iconsR.drawable.mozac_ic_cross_24) drawableIcon?.apply { setTint(0xFF20123a.toInt()) diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/compose/tabstray/TabGridItem.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/compose/tabstray/TabGridItem.kt index 2c25e59d8c2c..6c59aa2c6681 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/compose/tabstray/TabGridItem.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/compose/tabstray/TabGridItem.kt @@ -205,7 +205,7 @@ fun TabGridItem( if (!multiSelectionEnabled) { Icon( - painter = painterResource(id = R.drawable.mozac_ic_close), + painter = painterResource(id = R.drawable.mozac_ic_cross_24), contentDescription = stringResource(id = R.string.close_tab), tint = FirefoxTheme.colors.iconPrimary, modifier = Modifier diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/compose/tabstray/TabListItem.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/compose/tabstray/TabListItem.kt index ceb161d6475c..e603f40b035c 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/compose/tabstray/TabListItem.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/compose/tabstray/TabListItem.kt @@ -168,7 +168,7 @@ fun TabListItem( .testTag(TabsTrayTestTag.tabItemClose), ) { Icon( - painter = painterResource(id = R.drawable.mozac_ic_close), + painter = painterResource(id = R.drawable.mozac_ic_cross_24), contentDescription = stringResource( id = R.string.close_tab_title, tab.content.title, diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingPage.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingPage.kt index 25368cd4119d..9593e99ff073 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingPage.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingPage.kt @@ -104,7 +104,7 @@ fun OnboardingPage( modifier = Modifier.align(Alignment.End), ) { Icon( - painter = painterResource(id = R.drawable.mozac_ic_close), + painter = painterResource(id = R.drawable.mozac_ic_cross_24), contentDescription = stringResource(R.string.onboarding_home_content_description_close_button), tint = FirefoxTheme.colors.iconPrimary, ) diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/dialog/CookieBannerReEngagementDialogCompose.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/dialog/CookieBannerReEngagementDialogCompose.kt index 6b564ba0aa9c..79a93c2434bd 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/dialog/CookieBannerReEngagementDialogCompose.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/dialog/CookieBannerReEngagementDialogCompose.kt @@ -89,7 +89,7 @@ fun CookieBannerReEngagementDialogCompose( onClick = onCloseButtonClicked, ) { Icon( - painter = painterResource(R.drawable.mozac_ic_close), + painter = painterResource(R.drawable.mozac_ic_cross_24), contentDescription = stringResource(R.string.content_description_close_button), tint = FirefoxTheme.colors.iconPrimary, ) diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tabstray/inactivetabs/InactiveTabs.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tabstray/inactivetabs/InactiveTabs.kt index 8152b9e05237..64357dd938b1 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tabstray/inactivetabs/InactiveTabs.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tabstray/inactivetabs/InactiveTabs.kt @@ -114,7 +114,7 @@ fun InactiveTabsList( faviconPainter = faviconPainter, onClick = { onTabClick(tab) }, url = tabUrl, - iconPainter = painterResource(R.drawable.mozac_ic_close), + iconPainter = painterResource(R.drawable.mozac_ic_cross_24), iconDescription = stringResource(R.string.content_description_close_button), onIconClick = { onTabCloseClick(tab) }, ) diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/wallpapers/WallpaperOnboarding.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/wallpapers/WallpaperOnboarding.kt index 36d56da61a33..916d34e553f4 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/wallpapers/WallpaperOnboarding.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/wallpapers/WallpaperOnboarding.kt @@ -61,7 +61,7 @@ fun WallpaperOnboarding( horizontalAlignment = Alignment.CenterHorizontally, ) { Icon( - painter = painterResource(id = R.drawable.mozac_ic_close), + painter = painterResource(id = R.drawable.mozac_ic_cross_24), contentDescription = stringResource(id = R.string.close_tab), tint = FirefoxTheme.colors.iconPrimary, modifier = Modifier diff --git a/mobile/android/fenix/app/src/main/res/layout/start_download_dialog_layout.xml b/mobile/android/fenix/app/src/main/res/layout/start_download_dialog_layout.xml index 186778e45ef2..0ac7400fd689 100644 --- a/mobile/android/fenix/app/src/main/res/layout/start_download_dialog_layout.xml +++ b/mobile/android/fenix/app/src/main/res/layout/start_download_dialog_layout.xml @@ -56,7 +56,7 @@ android:scaleType="centerInside" android:background="@null" android:contentDescription="@string/mozac_feature_downloads_button_close" - app:srcCompat="@drawable/mozac_ic_close" + app:srcCompat="@drawable/mozac_ic_cross_24" app:tint="?android:attr/textColorPrimary" tools:textColor="#000000" /> diff --git a/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/fragment/onboarding/OnboardingFirstScreenCompose.kt b/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/fragment/onboarding/OnboardingFirstScreenCompose.kt index 76c10a019b38..fb705e1ed070 100644 --- a/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/fragment/onboarding/OnboardingFirstScreenCompose.kt +++ b/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/fragment/onboarding/OnboardingFirstScreenCompose.kt @@ -135,7 +135,7 @@ private fun CloseButton(onCloseButtonClick: () -> Unit) { onClick = onCloseButtonClick, ) { Icon( - painter = painterResource(R.drawable.mozac_ic_close), + painter = painterResource(R.drawable.mozac_ic_cross_24), contentDescription = stringResource(R.string.onboarding_close_button_content_description), tint = focusColors.closeIcon, ) diff --git a/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/fragment/onboarding/OnboardingSecondScreenCompose.kt b/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/fragment/onboarding/OnboardingSecondScreenCompose.kt index de621a89243b..67323f34b0f7 100644 --- a/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/fragment/onboarding/OnboardingSecondScreenCompose.kt +++ b/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/fragment/onboarding/OnboardingSecondScreenCompose.kt @@ -146,7 +146,7 @@ private fun CloseButton(onCloseButtonClick: () -> Unit) { onClick = onCloseButtonClick, ) { Icon( - painter = painterResource(R.drawable.mozac_ic_close), + painter = painterResource(R.drawable.mozac_ic_cross_24), contentDescription = stringResource(R.string.onboarding_close_button_content_description), tint = focusColors.closeIcon, ) diff --git a/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/searchwidget/PromoteSearchWidgetDialogCompose.kt b/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/searchwidget/PromoteSearchWidgetDialogCompose.kt index 3a3c7af0ff12..ca42e12be592 100644 --- a/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/searchwidget/PromoteSearchWidgetDialogCompose.kt +++ b/mobile/android/focus-android/app/src/main/java/org/mozilla/focus/searchwidget/PromoteSearchWidgetDialogCompose.kt @@ -193,7 +193,7 @@ private fun CloseButton( .padding(10.dp), ) { Icon( - painter = painterResource(R.drawable.mozac_ic_close), + painter = painterResource(R.drawable.mozac_ic_cross_24), contentDescription = stringResource(id = R.string.promote_search_widget_dialog_content_description), tint = focusColors.closeIcon, ) diff --git a/mobile/android/focus-android/app/src/main/res/layout/item_session.xml b/mobile/android/focus-android/app/src/main/res/layout/item_session.xml index 3e97e6849b6b..d7d84be94e24 100644 --- a/mobile/android/focus-android/app/src/main/res/layout/item_session.xml +++ b/mobile/android/focus-android/app/src/main/res/layout/item_session.xml @@ -39,9 +39,9 @@ android:layout_centerVertical="true" android:contentDescription="@string/close_tab" android:scaleType="center" - android:src="@drawable/mozac_ic_close" + android:src="@drawable/mozac_ic_cross_24" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/session_title" app:layout_constraintTop_toTopOf="parent" /> - \ No newline at end of file +