Archives
/
iceraven-browser
mirror of https://github.com/fork-maintainers/iceraven-browser
2
0
Fork 0
Code Issues Releases Wiki Activity

For #23121 - Replace @drawable/ic_new with @drawable/mozac_ic_new

Browse Source
upstream-sync
Gabriel Luong 2 years ago committed by mergify[bot]
parent 9352946afc
commit ae38410106
13 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File

2
app/src/main/java/org/mozilla/fenix/collections/CollectionCreationBottomBarView.kt
Unescape Escape View File

@ -84,7 +84,7 @@ class CollectionCreationBottomBarView(
iconButton.apply {
val drawable = context.getDrawableWithTint(
R.drawable.ic_new,
R.drawable.mozac_ic_new,
ContextCompat.getColor(context, R.color.photonWhite)
)
setImageDrawable(drawable)

2
app/src/main/java/org/mozilla/fenix/collections/CollectionsListAdapter.kt
Unescape Escape View File

@ -49,7 +49,7 @@ class CollectionsListAdapter(
holder.textView.putCompoundDrawablesRelativeWithIntrinsicBounds(
start = AppCompatResources.getDrawable(
holder.textView.context,
R.drawable.ic_new
R.drawable.mozac_ic_new
)
)
} else {

2
app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
Unescape Escape View File

@ -197,7 +197,7 @@ open class DefaultToolbarMenu(
val newTabItem = BrowserMenuImageText(
context.getString(R.string.library_new_tab),
R.drawable.ic_new,
R.drawable.mozac_ic_new,
primaryTextColor()
) {
onItemTapped.invoke(ToolbarMenu.Item.NewTab)

2
app/src/main/java/org/mozilla/fenix/settings/creditcards/CreditCardsSettingFragment.kt
Unescape Escape View File

@ -157,7 +157,7 @@ class CreditCardsSettingFragment : BiometricPromptPreferenceFragment() {
manageSavedCardsPreference.title =
getString(R.string.preferences_credit_cards_manage_saved_cards)
} else {
manageSavedCardsPreference.setIcon(R.drawable.ic_new)
manageSavedCardsPreference.setIcon(R.drawable.mozac_ic_new)
manageSavedCardsPreference.title =
getString(R.string.preferences_credit_cards_add_credit_card)
}

4
app/src/main/java/org/mozilla/fenix/tabstray/FloatingActionButtonBinding.kt
Unescape Escape View File

@ -44,7 +44,7 @@ class FloatingActionButtonBinding(
shrink()
show()
contentDescription = context.getString(R.string.add_tab)
setIconResource(R.drawable.ic_new)
setIconResource(R.drawable.mozac_ic_new)
setOnClickListener {
browserTrayInteractor.onFabClicked(false)
}
@ -56,7 +56,7 @@ class FloatingActionButtonBinding(
extend()
show()
contentDescription = context.getString(R.string.add_private_tab)
setIconResource(R.drawable.ic_new)
setIconResource(R.drawable.mozac_ic_new)
setOnClickListener {
browserTrayInteractor.onFabClicked(true)
}

13
app/src/main/res/drawable/ic_new.xml
Unescape Escape View File

@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="?primaryText"
android:pathData="M19.25 12.75c0.207 0 0.395-0.084 0.53-0.22C19.916 12.394 20 12.207 20 12c0-0.414-0.336-0.75-0.75-0.75h-5.7l-0.8-0.8v-5.7C12.75 4.336 12.414 4 12 4s-0.75 0.336-0.75 0.75v5.7l-0.8 0.8h-5.7C4.336 11.25 4 11.586 4 12s0.336 0.75 0.75 0.75h5.7l0.8 0.8v5.7c0 0.414 0.336 0.75 0.75 0.75 0.207 0 0.395-0.084 0.53-0.22 0.136-0.136 0.22-0.323 0.22-0.53v-5.7l0.8-0.8h5.7z" />
</vector>

2
app/src/main/res/layout/component_collection_creation_select_collection.xml
Unescape Escape View File

@ -131,7 +131,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_new"
app:srcCompat="@drawable/mozac_ic_new"
app:tint="?neutral" />
<TextView

2
app/src/main/res/layout/component_tabstray_fab.xml
Unescape Escape View File

@ -20,5 +20,5 @@
android:visibility="gone"
app:elevation="99dp"
app:borderWidth="0dp"
app:icon="@drawable/ic_new"
app:icon="@drawable/mozac_ic_new"
app:iconTint="@color/photonWhite" />

2
app/src/main/res/layout/layout_add_credit_card.xml
Unescape Escape View File

@ -17,7 +17,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/credit_cards_saved_cards_item_margin_start"
app:srcCompat="@drawable/ic_new"
app:srcCompat="@drawable/mozac_ic_new"
android:importantForAccessibility="no"
app:layout_constraintBottom_toBottomOf="@id/add_credit_card_text"
app:layout_constraintStart_toStartOf="parent"

2
app/src/main/res/layout/layout_add_login.xml
Unescape Escape View File

@ -17,7 +17,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/credit_cards_saved_cards_item_margin_start"
app:srcCompat="@drawable/ic_new"
app:srcCompat="@drawable/mozac_ic_new"
android:importantForAccessibility="no"
app:layout_constraintBottom_toBottomOf="@id/add_login_text"
app:layout_constraintStart_toStartOf="parent"

2
app/src/main/res/layout/preference_search_add_engine.xml
Unescape Escape View File

@ -22,7 +22,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_new" />
app:srcCompat="@drawable/mozac_ic_new" />
<TextView
android:id="@+id/add_engine_text"

2
app/src/main/res/menu/bookmarks_select_folder.xml
Unescape Escape View File

@ -6,7 +6,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/add_folder_button"
android:icon="@drawable/ic_new"
android:icon="@drawable/mozac_ic_new"
app:iconTint="?primaryText"
android:title="@string/bookmark_add_folder"
app:showAsAction="ifRoom" />

4
app/src/test/java/org/mozilla/fenix/tabstray/FloatingActionButtonBindingTest.kt
Unescape Escape View File

@ -99,7 +99,7 @@ class FloatingActionButtonBindingTest {
verify(exactly = 1) { actionButton.show() }
verify(exactly = 0) { actionButton.extend() }
verify(exactly = 0) { actionButton.hide() }
verify(exactly = 1) { actionButton.setIconResource(R.drawable.ic_new) }
verify(exactly = 1) { actionButton.setIconResource(R.drawable.mozac_ic_new) }
verify(exactly = 1) { actionButton.contentDescription = any() }
tabsTrayStore.dispatch(TabsTrayAction.PageSelected(Page.positionToPage(Page.PrivateTabs.ordinal)))
@ -110,7 +110,7 @@ class FloatingActionButtonBindingTest {
verify(exactly = 1) { actionButton.extend() }
verify(exactly = 0) { actionButton.hide() }
verify(exactly = 1) { actionButton.setText(R.string.tab_drawer_fab_content) }
verify(exactly = 2) { actionButton.setIconResource(R.drawable.ic_new) }
verify(exactly = 2) { actionButton.setIconResource(R.drawable.mozac_ic_new) }
verify(exactly = 2) { actionButton.contentDescription = any() }
tabsTrayStore.dispatch(TabsTrayAction.PageSelected(Page.positionToPage(Page.SyncedTabs.ordinal)))

Write Preview
Loading…
Cancel
Save