corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1840210 - Rename mozac_ic_close to mozac_ic_cross_24

Browse Source
This commit is contained in:
Gabriel Luong
2023-06-24 00:57:01 -04:00
committed by mergify[bot]
parent 893f559560
commit edc8c27961
20 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/android/android-components/components/compose/tabstray/src/main/java/mozilla/components/compose/tabstray/Tab.kt
View File

@@ -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,
)

3
mobile/android/android-components/components/feature/addons/src/main/res/layout/mozac_feature_addons_section_unsupported_section_item.xml
View File

@@ -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"/>
<LinearLayout
android:layout_width="wrap_content"
@@ -58,4 +58,3 @@
</LinearLayout>

3
mobile/android/android-components/components/feature/customtabs/src/main/java/mozilla/components/feature/customtabs/CustomTabsToolbarFeature.kt
View File

@@ -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)

2
mobile/android/android-components/components/feature/downloads/src/main/res/layout/mozac_downloader_chooser_prompt.xml
View File

@@ -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" />

2
mobile/android/android-components/components/feature/downloads/src/main/res/layout/mozac_downloads_prompt.xml
View File

@@ -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" />

2
mobile/android/android-components/components/feature/findinpage/src/main/res/layout/mozac_feature_findinpage_view.xml
View File

@@ -75,7 +75,7 @@
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"

0
mobile/android/android-components/components/ui/icons/src/main/res/drawable/mozac_ic_close.xml → mobile/android/android-components/components/ui/icons/src/main/res/drawable/mozac_ic_cross_24.xml
View File

2
mobile/android/android-components/components/ui/tabcounter/src/main/java/mozilla/components/ui/tabcounter/TabCounterMenu.kt
View File

@@ -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(),

2
mobile/android/android-components/samples/toolbar/src/main/java/org/mozilla/samples/toolbar/ToolbarActivity.kt
View File

@@ -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())

2
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/compose/tabstray/TabGridItem.kt
View File

@@ -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

2
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/compose/tabstray/TabListItem.kt
View File

@@ -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,

2
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/onboarding/view/OnboardingPage.kt
View File

@@ -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,
)

2
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/quicksettings/protections/cookiebanners/dialog/CookieBannerReEngagementDialogCompose.kt
View File

@@ -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,
)

2
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tabstray/inactivetabs/InactiveTabs.kt
View File

@@ -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) },
)

2
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/wallpapers/WallpaperOnboarding.kt
View File

@@ -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

2
mobile/android/fenix/app/src/main/res/layout/start_download_dialog_layout.xml
View File

@@ -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" />

2
mobile/android/focus-android/app/src/main/java/org/mozilla/focus/fragment/onboarding/OnboardingFirstScreenCompose.kt
View File

@@ -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,
)

2
mobile/android/focus-android/app/src/main/java/org/mozilla/focus/fragment/onboarding/OnboardingSecondScreenCompose.kt
View File

@@ -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,
)

2
mobile/android/focus-android/app/src/main/java/org/mozilla/focus/searchwidget/PromoteSearchWidgetDialogCompose.kt
View File

@@ -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,
)

2
mobile/android/focus-android/app/src/main/res/layout/item_session.xml
View File

@@ -39,7 +39,7 @@
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"