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

[fenix] For https://github.com/mozilla-mobile/fenix/issues/21973 - Use destructive_normal_theme in place of R.color.design_color

Browse Source
pull/600/head
Gabriel Luong 3 years ago committed by mergify[bot]
parent a08a575365
commit 5408bc5178
5 changed files with 8 additions and 15 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.design_error)
ContextCompat.getColor(requireContext(), R.color.destructive_normal_theme)
)
)
}

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

@ -252,7 +252,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.design_error)
ContextCompat.getColor(requireContext(), R.color.destructive_normal_theme)
)
)
}
@ -263,7 +263,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.design_error)
ContextCompat.getColor(requireContext(), R.color.destructive_normal_theme)
)
)
}
@ -286,7 +286,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.design_error)
ContextCompat.getColor(requireContext(), R.color.destructive_normal_theme)
)
)
}
@ -299,7 +299,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.design_error)
ContextCompat.getColor(requireContext(), R.color.destructive_normal_theme)
)
)
}

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.design_error)
ContextCompat.getColor(requireContext(), R.color.destructive_normal_theme)
)
)
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.design_error)
ContextCompat.getColor(requireContext(), R.color.destructive_normal_theme)
)
)
}

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

@ -19,7 +19,7 @@
<color name="neutral_normal_theme">@color/neutral_dark_theme</color>
<color name="neutral_faded_normal_theme">@color/neutral_faded_dark_theme</color>
<color name="shadow_normal_theme">@color/shadow_dark_theme</color>
<color name="destructive_normal_theme">@color/destructive_dark_theme</color>
<color name="destructive_normal_theme">@color/photonRed40</color>
<color name="disabled_normal_theme">@color/disabled_dark_theme</color>
<color name="scrimStart_normal_theme">@color/scrimStart_dark_theme</color>
<color name="scrimEnd_normal_theme">@color/scrimEnd_dark_theme</color>
@ -103,9 +103,6 @@
<!-- Reader View colors -->
<color name="mozac_feature_readerview_text_color">@color/primary_text_dark_theme</color>
<!-- TextInputLayout default Error Color -->
<color name="design_error" tools:override="true">@color/destructive_dark_theme</color>
<!-- Tab Counter colors -->
<color name="mozac_ui_tabcounter_default_tint">@color/primary_text_dark_theme</color>
<color name="mozac_ui_tabcounter_default_text">@color/primary_text_dark_theme</color>

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

@ -90,7 +90,6 @@
<color name="neutral_dark_theme">@color/photonGrey20</color>
<color name="neutral_faded_dark_theme">#1FFBFBFE</color>
<color name="shadow_dark_theme">#050505</color>
<color name="destructive_dark_theme">@color/photonRed40</color>
<color name="disabled_dark_theme">#66FBFBFE</color>
<color name="scrimStart_dark_theme">#F520123A</color>
<color name="scrimEnd_dark_theme">#F515141A</color>
@ -349,9 +348,6 @@
<!-- SearchView Hint Color -->
<color name="search_view_hint_color">@color/photonDarkGrey05</color>
<!-- TextInputLayout default Error Color -->
<color name="design_error" tools:override="true">@color/destructive_light_theme</color>
<!-- Tab Counter colors -->
<color name="mozac_ui_tabcounter_default_tint">@color/primary_text_light_theme</color>
<color name="mozac_ui_tabcounter_default_text">@color/primary_text_light_theme</color>

Write Preview
Loading…
Cancel
Save