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

For #23769 - Replace @color/destructive_normal_theme with @color/fx_mobile_text_color_warning

Browse Source
upstream-sync
Gabriel Luong 2 years ago committed by mergify[bot]
parent 0602021771
commit c3a2c355a2
7 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File

2
app/src/main/java/org/mozilla/fenix/library/bookmarks/edit/EditBookmarkFragment.kt
Unescape Escape View File

@ -280,7 +280,7 @@ class EditBookmarkFragment : Fragment(R.layout.fragment_edit_bookmark) {
binding.inputLayoutBookmarkUrl.setErrorIconDrawable(R.drawable.mozac_ic_warning_with_bottom_padding)
binding.inputLayoutBookmarkUrl.setErrorIconTintList(
ColorStateList.valueOf(
ContextCompat.getColor(requireContext(), R.color.destructive_normal_theme)
ContextCompat.getColor(requireContext(), R.color.fx_mobile_text_color_warning)
)
)
}

8
app/src/main/java/org/mozilla/fenix/settings/logins/fragment/AddLoginFragment.kt
Unescape Escape View File

@ -248,7 +248,7 @@ class AddLoginFragment : Fragment(R.layout.fragment_add_login) {
layout.setErrorIconDrawable(R.drawable.mozac_ic_warning_with_bottom_padding)
layout.setErrorIconTintList(
ColorStateList.valueOf(
ContextCompat.getColor(requireContext(), R.color.destructive_normal_theme)
ContextCompat.getColor(requireContext(), R.color.fx_mobile_text_color_warning)
)
)
}
@ -259,7 +259,7 @@ class AddLoginFragment : Fragment(R.layout.fragment_add_login) {
layout.setErrorIconDrawable(R.drawable.mozac_ic_warning_with_bottom_padding)
layout.setErrorIconTintList(
ColorStateList.valueOf(
ContextCompat.getColor(requireContext(), R.color.destructive_normal_theme)
ContextCompat.getColor(requireContext(), R.color.fx_mobile_text_color_warning)
)
)
}
@ -282,7 +282,7 @@ class AddLoginFragment : Fragment(R.layout.fragment_add_login) {
layout.setErrorIconDrawable(R.drawable.mozac_ic_warning_with_bottom_padding)
layout.setErrorIconTintList(
ColorStateList.valueOf(
ContextCompat.getColor(requireContext(), R.color.destructive_normal_theme)
ContextCompat.getColor(requireContext(), R.color.fx_mobile_text_color_warning)
)
)
}
@ -295,7 +295,7 @@ class AddLoginFragment : Fragment(R.layout.fragment_add_login) {
layout.setErrorIconDrawable(R.drawable.mozac_ic_warning_with_bottom_padding)
layout.setErrorIconTintList(
ColorStateList.valueOf(
ContextCompat.getColor(requireContext(), R.color.destructive_normal_theme)
ContextCompat.getColor(requireContext(), R.color.fx_mobile_text_color_warning)
)
)
}

4
app/src/main/java/org/mozilla/fenix/settings/logins/fragment/EditLoginFragment.kt
Unescape Escape View File

@ -233,7 +233,7 @@ class EditLoginFragment : Fragment(R.layout.fragment_edit_login) {
layout.setErrorIconDrawable(R.drawable.mozac_ic_warning_with_bottom_padding)
layout.setErrorIconTintList(
ColorStateList.valueOf(
ContextCompat.getColor(requireContext(), R.color.destructive_normal_theme)
ContextCompat.getColor(requireContext(), R.color.fx_mobile_text_color_warning)
)
)
clearButton.isVisible = false
@ -250,7 +250,7 @@ class EditLoginFragment : Fragment(R.layout.fragment_edit_login) {
layout.setErrorIconDrawable(R.drawable.mozac_ic_warning_with_bottom_padding)
layout.setErrorIconTintList(
ColorStateList.valueOf(
ContextCompat.getColor(requireContext(), R.color.destructive_normal_theme)
ContextCompat.getColor(requireContext(), R.color.fx_mobile_text_color_warning)
)
)
}

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

@ -182,7 +182,7 @@
android:padding="10dp"
android:text="@string/credit_cards_delete_card_button"
android:textAllCaps="false"
android:textColor="@color/destructive_normal_theme"
android:textColor="@color/fx_mobile_text_color_warning"
android:visibility="gone"
app:fontFamily="@font/metropolis_semibold"
app:layout_constraintBottom_toBottomOf="parent"

3
app/src/main/res/values-night/colors.xml
Unescape Escape View File

@ -58,7 +58,7 @@
<!-- Disabled text -->
<color name="fx_mobile_text_color_disabled">@color/photonLightGrey05A40</color>
<!-- Warning text -->
<color name="fx_mobile_text_color_warning" tools:ignore="UnusedResources">@color/photonRed20</color>
<color name="fx_mobile_text_color_warning">@color/photonRed20</color>
<!-- Warning text on Secondary button -->
<color name="fx_mobile_text_color_warning_button" tools:ignore="UnusedResources">@color/photonRed70</color>
<!-- Small heading, Text link -->
@ -131,7 +131,6 @@
<color name="tab_ring_normal_theme">@color/accent_normal_theme</color>
<color name="neutral_normal_theme">@color/photonGrey20</color>
<color name="neutral_faded_normal_theme">#1FFBFBFE</color>
<color name="destructive_normal_theme">@color/photonRed40</color>
<color name="toggle_off_knob_normal_theme">@color/toggle_off_knob_dark_theme</color>
<color name="toggle_off_track_normal_theme">@color/toggle_off_track_dark_theme</color>
<color name="fill_link_from_clipboard_normal_theme">@color/photonViolet40</color>

3
app/src/main/res/values/colors.xml
Unescape Escape View File

@ -58,7 +58,7 @@
<!-- Disabled text -->
<color name="fx_mobile_text_color_disabled">@color/photonDarkGrey90A40</color>
<!-- Warning text -->
<color name="fx_mobile_text_color_warning" tools:ignore="UnusedResources">@color/photonRed70</color>
<color name="fx_mobile_text_color_warning">@color/photonRed70</color>
<!-- Warning text on Secondary button -->
<color name="fx_mobile_text_color_warning_button" tools:ignore="UnusedResources">@color/photonRed70</color>
<!-- Small heading, Text link -->
@ -205,7 +205,6 @@
<color name="tab_ring_normal_theme">@color/photonInk20</color>
<color name="neutral_normal_theme">@color/photonGrey30</color>
<color name="neutral_faded_normal_theme">@color/photonGrey20</color>
<color name="destructive_normal_theme">@color/photonRed70</color>
<color name="fill_link_from_clipboard_normal_theme">@color/photonInk20</color>
<color name="sync_disconnected_icon_fill_normal_theme">@color/photonYellow70</color>
<color name="sync_disconnected_background_normal_theme">#FFFDE2</color>

10
app/src/main/res/values/styles.xml
Unescape Escape View File

@ -25,9 +25,9 @@
<item name="android:textColorLink">@color/fx_mobile_text_color_accent</item>
<item name="mozacInputLayoutErrorTextColor"
tools:ignore="UnusedResources">@color/destructive_normal_theme</item>
tools:ignore="UnusedResources">@color/fx_mobile_text_color_warning</item>
<item name="mozacInputLayoutErrorIconColor"
tools:ignore="UnusedResources">@color/destructive_normal_theme</item>
tools:ignore="UnusedResources">@color/fx_mobile_text_color_warning</item>
<item name="mozacLoginSelectHeaderTextStyle" tools:ignore="UnusedResources">@style/SelectPromptHeaderTextStyle</item>
<item name="mozacSelectCreditCardHeaderTextStyle" tools:ignore="UnusedResources">@style/SelectPromptHeaderTextStyle</item>
@ -59,7 +59,7 @@
<item name="tabRing">@color/tab_ring_normal_theme</item>
<item name="neutral">@color/neutral_normal_theme</item>
<item name="neutralFaded">@color/neutral_faded_normal_theme</item>
<item name="destructive">@color/destructive_normal_theme</item>
<item name="destructive">@color/fx_mobile_text_color_warning</item>
<item name="disabled">@color/fx_mobile_text_color_disabled</item>
<item name="scrimStart">@color/fx_mobile_layer_color_scrim_start</item>
<item name="scrimEnd">@color/fx_mobile_layer_color_scrim_end</item>
@ -327,8 +327,8 @@
</style>
<style name="DestructiveButton" parent="NeutralButton">
<item name="iconTint">@color/destructive_normal_theme</item>
<item name="android:textColor">@color/destructive_normal_theme</item>
<item name="iconTint">@color/fx_mobile_text_color_warning</item>
<item name="android:textColor">@color/fx_mobile_text_color_warning</item>
</style>
<style name="PositiveButton" parent="NeutralButton">

Write Preview
Loading…
Cancel
Save