blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #724: Adds contrastText color for buttons using accent backgrounds

master
Sawyer Blatz 2019-04-22 08:19:18 -07:00 committed by Emily Kager
parent 441cda278f
commit 41e8acf05f
14 changed files with 42 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkAdapter.kt
View File

@ -184,7 +184,7 @@ class BookmarkAdapter(val emptyView: View, val actionEmitter: Observer<BookmarkA
private fun setColorsAndIcons(selected: Boolean, item: BookmarkNode) { private fun setColorsAndIcons(selected: Boolean, item: BookmarkNode) {
val backgroundTint = val backgroundTint =
if (selected) { if (selected) {
DefaultThemeManager.resolveAttribute(R.attr.accent, containerView!!.context) DefaultThemeManager.resolveAttribute(R.attr.accentHighContrast, containerView!!.context)
} else { } else {
DefaultThemeManager.resolveAttribute(R.attr.neutral, containerView!!.context) DefaultThemeManager.resolveAttribute(R.attr.neutral, containerView!!.context)
} }
@ -256,7 +256,7 @@ class BookmarkAdapter(val emptyView: View, val actionEmitter: Observer<BookmarkA
setMenu(item, containerView!!) setMenu(item, containerView!!)
val backgroundTint = if (selected) { val backgroundTint = if (selected) {
DefaultThemeManager.resolveAttribute(R.attr.accent, containerView.context) DefaultThemeManager.resolveAttribute(R.attr.accentHighContrast, containerView.context)
} else { } else {
DefaultThemeManager.resolveAttribute(R.attr.neutral, containerView.context) DefaultThemeManager.resolveAttribute(R.attr.neutral, containerView.context)
} }

2
app/src/main/res/drawable/ic_folder_icon.xml
View File

File diff suppressed because one or more lines are too long

4
app/src/main/res/drawable/toolbar_background.xml
View File

@ -11,13 +11,13 @@
<item android:gravity="top"> <item android:gravity="top">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<size android:height="1dp" /> <size android:height="1dp" />
<solid android:color="?neutral" /> <solid android:color="?neutralFaded" />
</shape> </shape>
</item> </item>
<item android:gravity="bottom"> <item android:gravity="bottom">
<shape android:shape="rectangle"> <shape android:shape="rectangle">
<size android:height="1dp" /> <size android:height="1dp" />
<solid android:color="?neutral" /> <solid android:color="?neutralFaded" />
</shape> </shape>
</item> </item>
</layer-list> </layer-list>

5
app/src/main/res/layout/bookmark_row.xml
View File

@ -28,7 +28,6 @@
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="1:1" app:layout_constraintDimensionRatio="1:1"
android:foregroundTint="?primaryText"
tools:src="@drawable/ic_folder_icon" /> tools:src="@drawable/ic_folder_icon" />
<TextView <TextView
@ -40,7 +39,7 @@
android:ellipsize="end" android:ellipsize="end"
android:lines="1" android:lines="1"
android:textSize="16sp" android:textSize="16sp"
android:textColor="?secondaryText" android:textColor="?primaryText"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/bookmark_overflow" app:layout_constraintEnd_toStartOf="@id/bookmark_overflow"
app:layout_constraintHorizontal_bias="0" app:layout_constraintHorizontal_bias="0"
@ -72,7 +71,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/bookmark_overflow" app:layout_constraintEnd_toStartOf="@id/bookmark_overflow"
android:background="?neutral" android:background="?neutralFaded"
android:visibility="gone"/> android:visibility="gone"/>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/layout/delete_tabs_button.xml
View File

@ -28,6 +28,6 @@
android:textStyle="bold" android:textStyle="bold"
android:gravity="center" android:gravity="center"
android:text="@string/session_delete" android:text="@string/session_delete"
android:textColor="@color/primary_text_light_theme" android:textColor="?contrastText"
android:textSize="16sp" /> android:textSize="16sp" />
</FrameLayout> </FrameLayout>

8
app/src/main/res/layout/fragment_crash_reporter.xml
View File

@ -27,7 +27,7 @@
android:layout_marginTop="6dp" android:layout_marginTop="6dp"
android:lineSpacingExtra="8sp" android:lineSpacingExtra="8sp"
android:singleLine="false" android:singleLine="false"
android:textColor="@color/primary_text_normal_theme" android:textColor="?primaryText"
android:textSize="24sp" android:textSize="24sp"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -42,7 +42,7 @@
android:buttonTint="?accentHighContrast" android:buttonTint="?accentHighContrast"
android:checked="true" android:checked="true"
android:text="@string/tab_crash_send_report" android:text="@string/tab_crash_send_report"
android:textColor="@color/primary_text_normal_theme" android:textColor="?primaryText"
android:textSize="15sp" android:textSize="15sp"
app:layout_constraintBottom_toTopOf="@id/close_tab_button" app:layout_constraintBottom_toTopOf="@id/close_tab_button"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -59,7 +59,7 @@
android:backgroundTint="?accentHighContrast" android:backgroundTint="?accentHighContrast"
android:text="@string/tab_crash_restore" android:text="@string/tab_crash_restore"
android:fontFamily="Sharp Sans" android:fontFamily="Sharp Sans"
android:textColor="@color/foundation_normal_theme" android:textColor="?contrastText"
android:textStyle="bold" android:textStyle="bold"
android:textAllCaps="false" android:textAllCaps="false"
android:textSize="14sp" android:textSize="14sp"
@ -78,7 +78,7 @@
android:backgroundTint="?neutral" android:backgroundTint="?neutral"
android:text="@string/tab_crash_close" android:text="@string/tab_crash_close"
android:fontFamily="Sharp Sans" android:fontFamily="Sharp Sans"
android:textColor="?primaryText" android:textColor="@color/primary_text_light_theme"
android:textStyle="bold" android:textStyle="bold"
android:textAllCaps="false" android:textAllCaps="false"
android:textSize="14sp" android:textSize="14sp"

2
app/src/main/res/layout/fragment_home.xml
View File

@ -81,7 +81,7 @@
android:id="@+id/homeDivider" android:id="@+id/homeDivider"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:background="?neutral" android:background="?neutralFaded"
app:layout_constraintTop_toBottomOf="@id/toolbar_wrapper" app:layout_constraintTop_toBottomOf="@id/toolbar_wrapper"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

4
app/src/main/res/layout/fragment_quick_settings_dialog_sheet.xml
View File

@ -40,7 +40,7 @@
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:background="?neutral" android:background="?neutralFaded"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/security_info" /> app:layout_constraintTop_toBottomOf="@id/security_info" />
@ -75,7 +75,7 @@
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:background="?neutral" android:background="?neutralFaded"
app:layout_constraintBottom_toTopOf="@id/camera_icon" app:layout_constraintBottom_toTopOf="@id/camera_icon"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />

4
app/src/main/res/layout/save_tab_group_button.xml
View File

@ -22,12 +22,12 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:clickable="false" android:clickable="false"
android:drawableTint="@color/foundation_light_theme" android:drawableTint="?foundation"
android:drawableStart="@drawable/ic_archive" android:drawableStart="@drawable/ic_archive"
android:drawablePadding="8dp" android:drawablePadding="8dp"
android:focusable="false" android:focusable="false"
android:gravity="center" android:gravity="center"
android:textStyle="bold" android:textStyle="bold"
android:text="@string/save_tab_group" android:text="@string/save_tab_group"
android:textColor="@color/foundation_light_theme"/> android:textColor="?contrastText"/>
</FrameLayout> </FrameLayout>

2
app/src/main/res/layout/session_bottom_sheet.xml
View File

@ -93,7 +93,7 @@
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:background="?neutral" /> android:background="?neutralFaded"/>
<TextView <TextView
android:id="@+id/archive_session_button" android:id="@+id/archive_session_button"

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

@ -6,6 +6,7 @@
<!-- Normal theme colors for dark mode --> <!-- Normal theme colors for dark mode -->
<color name="primary_text_normal_theme">@color/primary_text_dark_theme</color> <color name="primary_text_normal_theme">@color/primary_text_dark_theme</color>
<color name="secondary_text_normal_theme">@color/secondary_text_dark_theme</color> <color name="secondary_text_normal_theme">@color/secondary_text_dark_theme</color>
<color name="contrast_text_normal_theme">@color/contrast_text_dark_theme</color>
<color name="foundation_normal_theme">@color/foundation_dark_theme</color> <color name="foundation_normal_theme">@color/foundation_dark_theme</color>
<color name="above_normal_theme">@color/above_dark_theme</color> <color name="above_normal_theme">@color/above_dark_theme</color>
<color name="inset_normal_theme">@color/inset_dark_theme</color> <color name="inset_normal_theme">@color/inset_dark_theme</color>
@ -13,6 +14,7 @@
<color name="accent_bright_normal_theme">@color/accent_bright_dark_theme</color> <color name="accent_bright_normal_theme">@color/accent_bright_dark_theme</color>
<color name="accent_high_contrast_normal_theme">@color/accent_high_contrast_dark_theme</color> <color name="accent_high_contrast_normal_theme">@color/accent_high_contrast_dark_theme</color>
<color name="neutral_normal_theme">@color/neutral_dark_theme</color> <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="shadow_normal_theme">@color/shadow_dark_theme</color>
<color name="destructive_normal_theme">@color/destructive_dark_theme</color> <color name="destructive_normal_theme">@color/destructive_dark_theme</color>
</resources> </resources>

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

@ -6,6 +6,7 @@
<!-- Color palette attributes --> <!-- Color palette attributes -->
<attr name="primaryText" format="reference" /> <attr name="primaryText" format="reference" />
<attr name="secondaryText" format="reference" /> <attr name="secondaryText" format="reference" />
<attr name="contrastText" format="reference" />
<attr name="accent" format="reference" /> <attr name="accent" format="reference" />
<attr name="accentBright" format="reference" /> <attr name="accentBright" format="reference" />
<attr name="accentHighContrast" format="reference" /> <attr name="accentHighContrast" format="reference" />
@ -13,6 +14,7 @@
<attr name="above" format="reference" /> <attr name="above" format="reference" />
<attr name="inset" format="reference" /> <attr name="inset" format="reference" />
<attr name="neutral" format="reference" /> <attr name="neutral" format="reference" />
<attr name="neutralFaded" format="reference" />
<attr name="shadow" format="reference" /> <attr name="shadow" format="reference" />
<attr name="destructive" format="reference"/> <attr name="destructive" format="reference"/>

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

@ -6,45 +6,52 @@
<!-- Light theme color palette --> <!-- Light theme color palette -->
<color name="primary_text_light_theme">#20123A</color> <color name="primary_text_light_theme">#20123A</color>
<color name="secondary_text_light_theme">@color/photonGrey50</color> <color name="secondary_text_light_theme">@color/photonGrey50</color>
<color name="contrast_text_light_theme">@color/primary_text_dark_theme</color>
<color name="foundation_light_theme">#F9F9FB</color> <color name="foundation_light_theme">#F9F9FB</color>
<color name="inset_light_theme">#F2F2F5</color> <color name="inset_light_theme">#F2F2F5</color>
<color name="above_light_theme">#FFF</color> <color name="above_light_theme">#FFF</color>
<color name="accent_light_theme">#312A65</color> <color name="accent_light_theme">#312A65</color>
<color name="accent_bright_light_theme">#592ACB</color> <color name="accent_bright_light_theme">#592ACB</color>
<color name="accent_high_contrast_light_theme">@color/accent_light_theme</color> <color name="accent_high_contrast_light_theme">@color/accent_light_theme</color>
<color name="neutral_light_theme">#1F000000</color> <color name="neutral_light_theme">@color/photonGrey30</color>
<color name="neutral_faded_light_theme">@color/photonGrey20</color>
<color name="shadow_light_theme">#1F000000</color> <color name="shadow_light_theme">#1F000000</color>
<color name="destructive_light_theme">@color/photonRed60</color> <color name="destructive_light_theme">@color/photonRed60</color>
<!-- Dark theme color palette --> <!-- Dark theme color palette -->
<color name="primary_text_dark_theme">#FBFBFE</color> <color name="primary_text_dark_theme">#FBFBFE</color>
<color name="secondary_text_dark_theme">#A7A2B7</color> <color name="secondary_text_dark_theme">#A7A2B7</color>
<color name="contrast_text_dark_theme">@color/primary_text_light_theme</color>
<color name="foundation_dark_theme">#1C1B22</color> <color name="foundation_dark_theme">#1C1B22</color>
<color name="inset_dark_theme">#3F3E46</color> <color name="inset_dark_theme">#3F3E46</color>
<color name="above_dark_theme">#32313C</color> <color name="above_dark_theme">#32313C</color>
<color name="accent_dark_theme">#e6e6ea</color> <color name="accent_dark_theme">#E6E6EA</color>
<color name="accent_bright_dark_theme">#592ACB</color> <color name="accent_bright_dark_theme">#592ACB</color>
<color name="accent_high_contrast_dark_theme">#AB71FF</color> <color name="accent_high_contrast_dark_theme">#AB71FF</color>
<color name="neutral_dark_theme">#1FFBFBFE</color> <color name="neutral_dark_theme">@color/photonGrey20</color>
<color name="neutral_faded_dark_theme">#1FEDEDF0</color>
<color name="shadow_dark_theme">#050505</color> <color name="shadow_dark_theme">#050505</color>
<color name="destructive_dark_theme">#FF4F5E</color> <color name="destructive_dark_theme">#FF4F5E</color>
<!-- Private theme color palette --> <!-- Private theme color palette -->
<color name="primary_text_private_theme">#FBFBFE</color> <color name="primary_text_private_theme">#FBFBFE</color>
<color name="secondary_text_private_theme">#A7A2B7</color> <color name="secondary_text_private_theme">#A7A2B7</color>
<color name="contrast_text_private_theme">@color/primary_text_light_theme</color>
<color name="foundation_private_theme">#492E85</color> <color name="foundation_private_theme">#492E85</color>
<color name="inset_private_theme">#362A5C</color> <color name="inset_private_theme">#362A5C</color>
<color name="above_private_theme">#291D4F</color> <color name="above_private_theme">#291D4F</color>
<color name="accent_private_theme">#E6E6EA</color> <color name="accent_private_theme">#E6E6EA</color>
<color name="accent_bright_private_theme">#F565FF</color> <color name="accent_bright_private_theme">#AA71FF</color>
<color name="accent_high_contrast_private_theme">#F565FF</color> <color name="accent_high_contrast_private_theme">#AA71FF</color>
<color name="neutral_private_theme">#1FFBFBFE</color> <color name="neutral_private_theme">@color/photonGrey20</color>
<color name="neutral_faded_private_theme">#1FEDEDF0</color>
<color name="shadow_private_theme">#2B1067</color> <color name="shadow_private_theme">#2B1067</color>
<color name="destructive_private_theme">#FF4F5E</color> <color name="destructive_private_theme">#FF4F5E</color>
<!-- Normal theme colors for light mode --> <!-- Normal theme colors for light mode -->
<color name="primary_text_normal_theme">@color/primary_text_light_theme</color> <color name="primary_text_normal_theme">@color/primary_text_light_theme</color>
<color name="secondary_text_normal_theme">@color/secondary_text_light_theme</color> <color name="secondary_text_normal_theme">@color/secondary_text_light_theme</color>
<color name="contrast_text_normal_theme">@color/contrast_text_light_theme</color>
<color name="foundation_normal_theme">@color/foundation_light_theme</color> <color name="foundation_normal_theme">@color/foundation_light_theme</color>
<color name="above_normal_theme">@color/above_light_theme</color> <color name="above_normal_theme">@color/above_light_theme</color>
<color name="inset_normal_theme">@color/inset_light_theme</color> <color name="inset_normal_theme">@color/inset_light_theme</color>
@ -52,6 +59,7 @@
<color name="accent_bright_normal_theme">@color/accent_bright_light_theme</color> <color name="accent_bright_normal_theme">@color/accent_bright_light_theme</color>
<color name="accent_high_contrast_normal_theme">@color/accent_high_contrast_light_theme</color> <color name="accent_high_contrast_normal_theme">@color/accent_high_contrast_light_theme</color>
<color name="neutral_normal_theme">@color/neutral_light_theme</color> <color name="neutral_normal_theme">@color/neutral_light_theme</color>
<color name="neutral_faded_normal_theme">@color/neutral_faded_light_theme</color>
<color name="shadow_normal_theme">@color/shadow_light_theme</color> <color name="shadow_normal_theme">@color/shadow_light_theme</color>
<color name="destructive_normal_theme">@color/destructive_light_theme</color> <color name="destructive_normal_theme">@color/destructive_light_theme</color>

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

@ -17,12 +17,15 @@
<!-- Updated color attributes --> <!-- Updated color attributes -->
<item name="primaryText">@color/primary_text_normal_theme</item> <item name="primaryText">@color/primary_text_normal_theme</item>
<item name="secondaryText">@color/secondary_text_normal_theme</item> <item name="secondaryText">@color/secondary_text_normal_theme</item>
<item name="contrastText">@color/contrast_text_normal_theme</item>
<item name="accent">@color/accent_normal_theme</item> <item name="accent">@color/accent_normal_theme</item>
<item name="accentBright">@color/accent_bright_normal_theme</item> <item name="accentBright">@color/accent_bright_normal_theme</item>
<item name="accentHighContrast">@color/accent_high_contrast_normal_theme</item>
<item name="foundation">@color/foundation_normal_theme</item> <item name="foundation">@color/foundation_normal_theme</item>
<item name="above">@color/above_normal_theme</item> <item name="above">@color/above_normal_theme</item>
<item name="inset">@color/inset_normal_theme</item> <item name="inset">@color/inset_normal_theme</item>
<item name="neutral">@color/neutral_normal_theme</item> <item name="neutral">@color/neutral_normal_theme</item>
<item name="neutralFaded">@color/neutral_faded_normal_theme</item>
<item name="shadow">@color/shadow_normal_theme</item> <item name="shadow">@color/shadow_normal_theme</item>
<item name="destructive">@color/destructive_normal_theme</item> <item name="destructive">@color/destructive_normal_theme</item>
@ -48,12 +51,15 @@
<!-- Updated color attributes --> <!-- Updated color attributes -->
<item name="primaryText">@color/primary_text_private_theme</item> <item name="primaryText">@color/primary_text_private_theme</item>
<item name="secondaryText">@color/secondary_text_private_theme</item> <item name="secondaryText">@color/secondary_text_private_theme</item>
<item name="contrastText">@color/contrast_text_private_theme</item>
<item name="accent">@color/accent_private_theme</item> <item name="accent">@color/accent_private_theme</item>
<item name="accentBright">@color/accent_bright_private_theme</item> <item name="accentBright">@color/accent_bright_private_theme</item>
<item name="accentHighContrast">@color/accent_high_contrast_private_theme</item>
<item name="foundation">@color/foundation_private_theme</item> <item name="foundation">@color/foundation_private_theme</item>
<item name="above">@color/above_private_theme</item> <item name="above">@color/above_private_theme</item>
<item name="inset">@color/inset_private_theme</item> <item name="inset">@color/inset_private_theme</item>
<item name="neutral">@color/neutral_private_theme</item> <item name="neutral">@color/neutral_private_theme</item>
<item name="neutralFaded">@color/neutral_faded_private_theme</item>
<item name="shadow">@color/shadow_private_theme</item> <item name="shadow">@color/shadow_private_theme</item>
<item name="destructive">@color/destructive_private_theme</item> <item name="destructive">@color/destructive_private_theme</item>