blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #724: Corrects colors for all themes

master
Sawyer Blatz 2019-04-18 09:26:03 -07:00 committed by Jeff Boek
parent 052ab2383f
commit 0f367a018a
28 changed files with 103 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/mozilla/fenix/ThemeManager.kt
View File

@ -120,7 +120,7 @@ class DefaultThemeManager : ThemeManager {
window.navigationBarColor = ContextCompat
.getColor(
context, DefaultThemeManager
.resolveAttribute(R.attr.above, context)
.resolveAttribute(R.attr.foundation, context)
)
} else {
window.navigationBarColor = ContextCompat

6
app/src/main/java/org/mozilla/fenix/home/SessionBottomSheetFragment.kt
View File

@ -16,6 +16,7 @@ import kotlinx.android.synthetic.main.session_bottom_sheet.view.*
import org.mozilla.fenix.DefaultThemeManager
import org.mozilla.fenix.utils.ItsNotBrokenSnack
import org.mozilla.fenix.R
import org.mozilla.fenix.ext.getColorFromAttr
class SessionBottomSheetFragment : BottomSheetDialogFragment(), LayoutContainer {
sealed class SessionType {
@ -58,10 +59,7 @@ class SessionBottomSheetFragment : BottomSheetDialogFragment(), LayoutContainer
view.delete_session_button.apply {
val drawable = ContextCompat.getDrawable(context!!, R.drawable.ic_delete)
drawable?.setColorFilter(
ContextCompat.getColor(
context!!,
R.color.delete_color
), PorterDuff.Mode.SRC_IN
R.attr.destructive.getColorFromAttr(context), PorterDuff.Mode.SRC_IN
)
setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null)
}

3
app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkItemMenu.kt
View File

@ -9,6 +9,7 @@ import mozilla.components.browser.menu.BrowserMenuBuilder
import mozilla.components.browser.menu.item.SimpleBrowserMenuItem
import mozilla.components.concept.storage.BookmarkNode
import mozilla.components.concept.storage.BookmarkNodeType
import org.mozilla.fenix.DefaultThemeManager
import org.mozilla.fenix.R
class BookmarkItemMenu(
@ -63,7 +64,7 @@ class BookmarkItemMenu(
} else null,
SimpleBrowserMenuItem(
context.getString(R.string.bookmark_menu_delete_button),
textColorResource = R.color.delete_color
textColorResource = DefaultThemeManager.resolveAttribute(R.attr.destructive, context)
) {
onItemTapped.invoke(BookmarkItemMenu.Item.Delete)
}

3
app/src/main/java/org/mozilla/fenix/library/history/HistoryItemMenu.kt
View File

@ -7,6 +7,7 @@ package org.mozilla.fenix.library.history
import android.content.Context
import mozilla.components.browser.menu.BrowserMenuBuilder
import mozilla.components.browser.menu.item.SimpleBrowserMenuItem
import org.mozilla.fenix.DefaultThemeManager
import org.mozilla.fenix.R
class HistoryItemMenu(
@ -23,7 +24,7 @@ class HistoryItemMenu(
listOf(
SimpleBrowserMenuItem(
context.getString(R.string.history_delete_item),
textColorResource = R.color.delete_color
textColorResource = DefaultThemeManager.resolveAttribute(R.attr.destructive, context)
) {
onItemTapped.invoke(Item.Delete)
}

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

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
android:startColor="?above"
android:startColor="?shadow"
android:endColor="@android:color/transparent"
android:angle="270" />
</shape>

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

@ -3,10 +3,10 @@
- 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/. -->
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="?aboveDarkened"/>
<solid android:color="?inset"/>
<stroke android:width="1dp"
android:color="?aboveDarkened"/>
android:color="?inset"/>
<corners android:bottomRightRadius="8dp"
android:bottomLeftRadius="8dp"

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

@ -3,7 +3,7 @@
- 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/. -->
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="?aboveDarkened"/>
<solid android:color="?inset"/>
<corners android:bottomRightRadius="8dp"
android:bottomLeftRadius="8dp"

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

File diff suppressed because one or more lines are too long

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

@ -23,7 +23,7 @@
android:viewportHeight="24">
<path
android:pathData="M17.5,17c-2.1,0 -3.5,-2.5 -5.5,-2.5S8.4,17 6.5,17C3.9,17 2,14.6 2,10.4 2,7.8 2.8,7 6.1,7s4.3,1.4 5.9,1.4c1.6,0 2.6,-1.4 5.9,-1.4 3.3,0 4.1,0.8 4.1,3.4 0,4.2 -1.9,6.6 -4.5,6.6zM7.7,10.2c-2,0.1 -2.9,1.3 -2.9,1.6 0,0.3 1.3,1.1 2.7,1.1 1.3,0 2.9,-0.5 2.9,-0.9 0,-0.5 -0.8,-1.9 -2.7,-1.8zM16.3,10.2c-1.9,-0.1 -2.7,1.3 -2.7,1.8 0,0.4 1.5,0.9 2.9,0.9s2.7,-0.8 2.7,-1.1c-0.1,-0.3 -0.9,-1.5 -2.9,-1.6z"
android:fillColor="?attr/primaryText" />
android:fillColor="?privateBrowsingButtonAccent" />
</vector>
</item>
</layer-list>

7
app/src/main/res/drawable/home_background_gradient.xml → app/src/main/res/drawable/private_home_background_gradient.xml
View File

@ -6,9 +6,10 @@
<item>
<shape>
<gradient
android:angle="270"
android:startColor="?foundation"
android:endColor="?above"
android:angle="45"
android:startColor="#7529A7"
android:centerColor="#492E85"
android:endColor="#383372"
android:type="linear" />
</shape>
</item>

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

@ -4,9 +4,5 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="?foundation"/>
<stroke android:width="1dp"
android:color="?neutral"/>
<corners android:radius="16dp"/>
</shape>

15
app/src/main/res/drawable/search_url_background.xml 100644
View File

@ -0,0 +1,15 @@
<?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/. -->
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="?inset"/>
<stroke android:width="1dp"
android:color="?inset"/>
<corners android:bottomRightRadius="8dp"
android:bottomLeftRadius="8dp"
android:topLeftRadius="8dp"
android:topRightRadius="8dp"/>
</shape>

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

@ -19,7 +19,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/history_delete_all"
android:textColor="@color/delete_color"
android:textColor="?destructive"
android:drawablePadding="8dp"
android:textSize="16sp"
android:gravity="center"

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

@ -10,7 +10,7 @@
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:background="@drawable/button_background"
android:backgroundTint="?neutral"
android:backgroundTint="?accent"
android:clickable="true"
android:focusable="true"
android:foreground="?android:attr/selectableItemBackground"

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

@ -39,7 +39,7 @@
android:layout_width="0dp"
android:layout_height="32dp"
android:layout_marginBottom="20dp"
android:buttonTint="?accent"
android:buttonTint="?accentHighContrast"
android:checked="true"
android:text="@string/tab_crash_send_report"
android:textColor="@color/primary_text_normal_theme"
@ -56,7 +56,7 @@
android:layout_marginStart="@dimen/crash_reporter_close_tab_button_horizontal_margin"
android:layout_marginEnd="@dimen/crash_reporter_close_tab_button_horizontal_margin"
android:layout_marginBottom="@dimen/crash_reporter_close_tab_button_bottom_margin"
android:backgroundTint="?accent"
android:backgroundTint="?accentHighContrast"
android:text="@string/tab_crash_restore"
android:fontFamily="Sharp Sans"
android:textColor="@color/foundation_normal_theme"

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

@ -12,7 +12,7 @@
android:id="@+id/homeLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/home_background_gradient"
android:background="?homeBackground"
app:layoutDescription="@xml/home_scene"
tools:context=".home.HomeFragment">
<ImageButton

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

@ -18,7 +18,7 @@
android:layout_marginStart="16dp"
android:layout_marginTop="24dp"
android:layout_marginEnd="16dp"
android:background="@drawable/home_search_background_dark"
android:background="@drawable/search_url_background"
android:outlineProvider="paddedBounds"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

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

@ -11,5 +11,5 @@
android:layout_width="wrap_content"
android:layout_height="40dp"
android:layout_gravity="center_vertical"
android:background="@drawable/home_search_background_dark"/>
android:background="@drawable/home_search_background_normal"/>
</FrameLayout>

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

@ -15,7 +15,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="16dp"
app:cardBackgroundColor="?foundation"
app:cardBackgroundColor="?above"
android:background="?foundation"
android:elevation="5dp"
android:padding="10dp"
@ -81,12 +81,12 @@
android:background="?foundation"
android:drawableStart="@drawable/ic_delete"
android:drawablePadding="14dp"
android:drawableTint="@color/delete_color"
android:drawableTint="?destructive"
android:paddingStart="20dp"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:text="@string/current_session_delete"
android:textColor="@color/delete_color"
android:textColor="?destructive"
android:textSize="16sp"
tools:targetApi="m" />

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

@ -12,7 +12,7 @@
android:clickable="true"
android:focusable="true"
android:foreground="?android:attr/selectableItemBackground"
app:cardBackgroundColor="?foundation"
app:cardBackgroundColor="?above"
app:cardCornerRadius="10dp"
app:cardElevation="5dp">

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

@ -12,7 +12,7 @@
android:clipToPadding="false"
android:focusable="true"
android:foreground="?android:attr/selectableItemBackground"
app:cardBackgroundColor="?foundation"
app:cardBackgroundColor="?above"
app:cardCornerRadius="@dimen/tab_corner_radius"
app:cardElevation="5dp">

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

@ -8,8 +8,11 @@
<color name="secondary_text_normal_theme">@color/secondary_text_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_darkened_normal_theme">@color/above_darkened_dark_theme</color>
<color name="inset_normal_theme">@color/inset_dark_theme</color>
<color name="accent_normal_theme">@color/accent_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="neutral_normal_theme">@color/neutral_dark_theme</color>
<color name="shadow_normal_theme">@color/shadow_dark_theme</color>
<color name="destructive_normal_theme">@color/destructive_dark_theme</color>
</resources>

5
app/src/main/res/values-v23/styles.xml
View File

@ -9,6 +9,9 @@
sure we also get them in 27+ -->
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:windowLightStatusBar">@bool/theme_is_light</item>
<!-- Style the navigation bar -->
<item name="android:navigationBarColor">?foundation</item>
</style>
<style name="PrivateTheme" parent="PrivateThemeBase">
@ -19,6 +22,6 @@
<item name="android:windowLightStatusBar">false</item>
<!-- Style the navigation bar -->
<item name="android:navigationBarColor">@color/foundation_private_theme</item>
<item name="android:navigationBarColor">?foundation</item>
</style>
</resources>

1
app/src/main/res/values-v27/styles.xml
View File

@ -11,7 +11,6 @@
<item name="android:windowLightStatusBar">@bool/theme_is_light</item>
<!-- Style the navigation bar -->
<item name="android:navigationBarColor">@android:color/transparent</item>
<item name="android:navigationBarDividerColor">@android:color/transparent</item>
<item name="android:windowLightNavigationBar">@bool/theme_is_light</item>
</style>

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

@ -8,13 +8,18 @@
<attr name="secondaryText" format="reference" />
<attr name="accent" format="reference" />
<attr name="accentBright" format="reference" />
<attr name="accentHighContrast" format="reference" />
<attr name="foundation" format="reference" />
<attr name="above" format="reference" />
<attr name="aboveDarkened" format="reference" />
<attr name="inset" format="reference" />
<attr name="neutral" format="reference" />
<attr name="shadow" format="reference" />
<attr name="destructive" format="reference"/>
<!-- Misc -->
<attr name="homeBackground" format="reference"/>
<attr name="privateBrowsingButtonBackground" format="reference" />
<attr name="privateBrowsingButtonAccent" format="reference" />
<attr name="fenixLogo" format="reference" />
<attr name="fenixSnackbarBackground" format="reference" />

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

@ -7,41 +7,53 @@
<color name="primary_text_light_theme">#20123A</color>
<color name="secondary_text_light_theme">@color/photonGrey50</color>
<color name="foundation_light_theme">#F9F9FB</color>
<color name="inset_light_theme">#F2F2F5</color>
<color name="above_light_theme">#FFF</color>
<color name="above_darkened_light_theme">#F2F2F5</color>
<color name="accent_light_theme">#312A65</color>
<color name="accent_bright_light_theme">#592ACB</color>
<color name="neutral_light_theme">@color/photonGrey20</color>
<color name="accent_high_contrast_light_theme">@color/accent_light_theme</color>
<color name="neutral_light_theme">#1F000000</color>
<color name="shadow_light_theme">#1F000000</color>
<color name="destructive_light_theme">@color/photonRed60</color>
<!-- Dark theme color palette -->
<color name="primary_text_dark_theme">#FBFBFE</color>
<color name="secondary_text_dark_theme">#A4A3AA</color>
<color name="secondary_text_dark_theme">#A7A2B7</color>
<color name="foundation_dark_theme">#1C1B22</color>
<color name="inset_dark_theme">#3F3E46</color>
<color name="above_dark_theme">#32313C</color>
<color name="above_darkened_dark_theme">#252432</color>
<color name="accent_dark_theme">#312A65</color>
<color name="accent_bright_dark_theme">#AB71FF</color>
<color name="neutral_dark_theme">@color/photonGrey40</color>
<color name="accent_dark_theme">#e6e6ea</color>
<color name="accent_bright_dark_theme">#592ACB</color>
<color name="accent_high_contrast_dark_theme">#AB71FF</color>
<color name="neutral_dark_theme">#1FFBFBFE</color>
<color name="shadow_dark_theme">#050505</color>
<color name="destructive_dark_theme">#FF4F5E</color>
<!-- Private theme color palette -->
<color name="primary_text_private_theme">#FBFBFE</color>
<color name="secondary_text_private_theme">#A4A3AA</color>
<color name="foundation_private_theme">#242251</color>
<color name="above_private_theme">#393862</color>
<color name="above_darkened_private_theme">#2c2b58</color>
<color name="accent_private_theme">#AD3BFF</color>
<color name="accent_bright_private_theme">#AD3BFF</color>
<color name="neutral_private_theme">@color/photonGrey40</color>
<color name="secondary_text_private_theme">#A7A2B7</color>
<color name="foundation_private_theme">#492E85</color>
<color name="inset_private_theme">#362A5C</color>
<color name="above_private_theme">#291D4F</color>
<color name="accent_private_theme">#E6E6EA</color>
<color name="accent_bright_private_theme">#F565FF</color>
<color name="accent_high_contrast_private_theme">#F565FF</color>
<color name="neutral_private_theme">#1FFBFBFE</color>
<color name="shadow_private_theme">#2B1067</color>
<color name="destructive_private_theme">#FF4F5E</color>
<!-- Normal theme colors for light mode -->
<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="foundation_normal_theme">@color/foundation_light_theme</color>
<color name="above_normal_theme">@color/above_light_theme</color>
<color name="above_darkened_normal_theme">@color/above_darkened_light_theme</color>
<color name="inset_normal_theme">@color/inset_light_theme</color>
<color name="accent_normal_theme">@color/accent_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="neutral_normal_theme">@color/neutral_light_theme</color>
<color name="shadow_normal_theme">@color/shadow_light_theme</color>
<color name="destructive_normal_theme">@color/destructive_light_theme</color>
<!-- Bookmark buttons -->
<color name="bookmark_favicon_background">#DFDFE3</color>
@ -81,6 +93,7 @@
<!-- Misc colors applied universally-->
<color name="suggestion_highlight_color">#5C592ACB</color>
<color name="delete_color">@color/photonRed60</color>
<!-- <color name="private_browsing_button_accent_color">#722291</color> -->
<color name="private_browsing_button_accent_color">@color/foundation_private_theme</color>
<color name="white_color">#FBFBFE</color>
</resources>

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

@ -21,12 +21,16 @@
<item name="accentBright">@color/accent_bright_normal_theme</item>
<item name="foundation">@color/foundation_normal_theme</item>
<item name="above">@color/above_normal_theme</item>
<item name="aboveDarkened">@color/above_darkened_normal_theme</item>
<item name="inset">@color/inset_normal_theme</item>
<item name="neutral">@color/neutral_normal_theme</item>
<item name="shadow">@color/shadow_normal_theme</item>
<item name="destructive">@color/destructive_normal_theme</item>
<!-- Drawables -->
<item name="fenixLogo">@drawable/ic_logo_wordmark</item>
<item name="homeBackground">@color/foundation_normal_theme</item>
<item name="privateBrowsingButtonBackground">@android:color/transparent</item>
<item name="privateBrowsingButtonAccent">@color/primary_text_normal_theme</item>
</style>
<style name="NormalTheme" parent="NormalThemeBase"/>
@ -48,12 +52,21 @@
<item name="accentBright">@color/accent_bright_private_theme</item>
<item name="foundation">@color/foundation_private_theme</item>
<item name="above">@color/above_private_theme</item>
<item name="aboveDarkened">@color/above_darkened_private_theme</item>
<item name="inset">@color/inset_private_theme</item>
<item name="neutral">@color/neutral_private_theme</item>
<item name="shadow">@color/shadow_private_theme</item>
<item name="destructive">@color/destructive_private_theme</item>
<!-- Drawables -->
<item name="fenixLogo">@drawable/ic_logo_wordmark_white</item>
<item name="homeBackground">@drawable/private_home_background_gradient</item>
<item name="privateBrowsingButtonBackground">@color/accent_private_theme</item>
<item name="privateBrowsingButtonAccent">@color/above_private_theme</item>
</style>
<style name="Mozac.Browser.Menu" parent="" tools:ignore="UnusedResources">
<item name="cardBackgroundColor">?above</item>
</style>
<style name="PrivateTheme" parent="PrivateThemeBase"/>

1
app/src/main/res/xml/home_scene.xml
View File

@ -139,6 +139,7 @@
<Constraint
android:id="@+id/homeDivider"
android:layout_height="1dp"
android:alpha="0"
android:layout_marginStart="0dp"
android:layout_marginEnd="0dp"
android:layout_marginTop="8dp"