blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #10244: Creates drawable for add-ons private browsing label. 

The drawable is sent to AddonsManagerAdapter.Style constructor and is displayed
near the add-on name if it is allowed to run in private browsing
master
ValentinTimisica 2020-04-29 18:14:09 +03:00 committed by Emily Kager
parent a01881067f
commit f63cb4e09f
6 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt
View File

@ -130,7 +130,8 @@ class AddonsManagementFragment : Fragment(R.layout.fragment_add_ons_management),
addonNameTextColor = ThemeManager.resolveAttribute(R.attr.primaryText, context),
addonSummaryTextColor = ThemeManager.resolveAttribute(R.attr.secondaryText, context),
sectionsTypeFace = ResourcesCompat.getFont(context, R.font.metropolis_semibold),
addonBackgroundIconColor = ThemeManager.resolveAttribute(R.attr.inset, requireContext())
addonBackgroundIconColor = ThemeManager.resolveAttribute(R.attr.inset, requireContext()),
addonAllowPrivateBrowsingLabelDrawableRes = R.drawable.ic_add_on_private_browsing_label
)
}

16
app/src/main/res/drawable/ic_add_on_private_browsing_label.xml 100644
View File

File diff suppressed because one or more lines are too long

2
app/src/main/res/values-night/colors.xml
View File

@ -42,6 +42,8 @@
<color name="onboarding_finish_button_text_normal_theme">@color/primary_text_dark_theme</color>
<color name="onboarding_illustration_selected_normal_theme">@color/onboarding_illustration_selected_dark_theme</color>
<color name="onboarding_illustration_deselected_normal_theme">@color/onboarding_illustration_deselected_dark_theme</color>
<color name="add_on_private_browsing_exterior_circle_background_normal_theme">@color/add_on_private_browsing_exterior_circle_background_dark_theme</color>
<color name="add_on_private_browsing_interior_icon_background_normal_theme">@color/add_on_private_browsing_interior_icon_background_dark_theme</color>
<!-- Tab tray -->
<color name="tab_tray_item_text_normal_theme">@color/tab_tray_item_text_dark_theme</color>

2
app/src/main/res/values/attrs.xml
View File

@ -47,6 +47,8 @@
<attr name="onboardingDarkGradientEndBackground" format="reference" />
<attr name="onboardingSelected" format="reference"/>
<attr name="onboardingDeselected" format="reference"/>
<attr name="addOnPrivateBrowsingExteriorCircleBackground" format="reference"/>
<attr name="addOnPrivateBrowsingInteriorIconBackground" format="reference"/>
<!-- Tab tray -->
<attr name="tabTrayItemText" format="reference"/>

10
app/src/main/res/values/colors.xml
View File

@ -17,7 +17,7 @@
<color name="light_grey_60">#AFAFBB</color>
<color name="violet_50_32a">#529059FF</color>
<color name="violet_70_12a">#1F592ACB</color>
<!-- Light theme color palette -->
<color name="primary_text_light_theme">#20123A</color>
<color name="secondary_text_light_theme">@color/photonGrey50</color>
@ -56,6 +56,8 @@
<color name="onboarding_card_finish_button_light_theme">@color/accent_light_theme</color>
<color name="onboarding_illustration_selected_light_theme">@color/accent_bright_light_theme</color>
<color name="onboarding_illustration_deselected_light_theme">#9915141A</color>
<color name="add_on_private_browsing_exterior_circle_background_light_theme">@color/accent_bright_light_theme</color>
<color name="add_on_private_browsing_interior_icon_background_light_theme">#FFFFFF</color>
<!-- Tab Tray -->
<color name="tab_tray_item_text_light_theme">@color/ink_80</color>
@ -103,6 +105,8 @@
<color name="onboarding_card_finish_button_dark_theme">@color/accent_high_contrast_dark_theme</color>
<color name="onboarding_illustration_selected_dark_theme">@color/accent_dark_theme</color>
<color name="onboarding_illustration_deselected_dark_theme">#99FBFBFE</color>
<color name="add_on_private_browsing_exterior_circle_background_dark_theme">@color/accent_dark_theme</color>
<color name="add_on_private_browsing_interior_icon_background_dark_theme">#FFFFFF</color>
<!-- Tab Tray -->
<color name="tab_tray_item_text_dark_theme">@color/light_grey_05</color>
@ -149,6 +153,8 @@
<color name="onboarding_finish_button_text_private_theme">@color/accent_light_theme</color>
<color name="onboarding_illustration_selected_private_theme">@color/accent_private_theme</color>
<color name="onboarding_illustration_deselected_private_theme">@color/onboarding_illustration_deselected_dark_theme</color>
<color name="add_on_private_browsing_exterior_circle_background_private_theme">@color/accent_private_theme</color>
<color name="add_on_private_browsing_interior_icon_background_private_theme">#FFFFFF</color>
<!-- Tab Tray -->
<color name="tab_tray_item_text_private_theme">@color/light_grey_05</color>
@ -194,6 +200,8 @@
<color name="onboarding_finish_button_text_normal_theme">@color/primary_text_dark_theme</color>
<color name="onboarding_illustration_selected_normal_theme">@color/onboarding_illustration_selected_light_theme</color>
<color name="onboarding_illustration_deselected_normal_theme">@color/onboarding_illustration_deselected_light_theme</color>
<color name="add_on_private_browsing_exterior_circle_background_normal_theme">@color/add_on_private_browsing_exterior_circle_background_light_theme</color>
<color name="add_on_private_browsing_interior_icon_background_normal_theme">@color/add_on_private_browsing_interior_icon_background_light_theme</color>
<!-- Tab tray -->
<color name="tab_tray_item_text_normal_theme">@color/tab_tray_item_text_light_theme</color>

4
app/src/main/res/values/styles.xml
View File

@ -70,6 +70,8 @@
<item name="onboardingDarkGradientEndBackground">@color/onboarding_card_background_end_gradient_normal_theme</item>
<item name="onboardingSelected">@color/onboarding_illustration_selected_normal_theme</item>
<item name="onboardingDeselected">@color/onboarding_illustration_deselected_normal_theme</item>
<item name="addOnPrivateBrowsingExteriorCircleBackground">@color/add_on_private_browsing_exterior_circle_background_normal_theme</item>
<item name="addOnPrivateBrowsingInteriorIconBackground">@color/add_on_private_browsing_interior_icon_background_normal_theme</item>
<item name="tabTrayItemText">@color/tab_tray_item_text_normal_theme</item>
<item name="tabTrayItemUrl">@color/tab_tray_item_url_normal_theme</item>
@ -190,6 +192,8 @@
<item name="onboardingDarkGradientEndBackground">@color/onboarding_card_background_end_gradient_private_theme</item>
<item name="onboardingSelected">@color/onboarding_illustration_selected_private_theme</item>
<item name="onboardingDeselected">@color/onboarding_illustration_deselected_private_theme</item>
<item name="addOnPrivateBrowsingExteriorCircleBackground">@color/add_on_private_browsing_exterior_circle_background_private_theme</item>
<item name="addOnPrivateBrowsingInteriorIconBackground">@color/add_on_private_browsing_interior_icon_background_private_theme</item>
<!-- Tab Tray -->
<item name="tabTrayItemText">@color/tab_tray_item_text_private_theme</item>