blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Closes #412: Enforces consistent naming in colors.xml

master
Sawyer Blatz 2019-02-08 10:37:04 -08:00 committed by Colin Lee
parent 3ff95880eb
commit a4fe413537
14 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/mozilla/fenix/search/toolbar/ToolbarUIView.kt
View File

@ -44,10 +44,10 @@ class ToolbarUIView(
browserActionMargin = resources.pxToDp(browserActionMarginDp)
urlBoxView = urlBackground
textColor = ContextCompat.getColor(context, R.color.searchText)
textColor = ContextCompat.getColor(context, R.color.search_text)
textSize = toolbarTextSizeSp
hint = context.getString(R.string.search_hint)
hintColor = ContextCompat.getColor(context, R.color.searchText)
hintColor = ContextCompat.getColor(context, R.color.search_text)
setOnEditListener(object : mozilla.components.concept.toolbar.Toolbar.OnEditListener {
override fun onTextChanged(text: String) {

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="@color/searchDarkBackground"/>
<solid android:color="@color/search_dark_background"/>
<stroke android:width="1dp"
android:color="@color/searchStrokeAlternative"/>
android:color="@color/search_stroke_alternative"/>
<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="@color/searchDarkBackgroundAlternative"/>
<solid android:color="@color/search_dark_background_alternative"/>
<corners android:bottomRightRadius="8dp"
android:bottomLeftRadius="8dp"

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

@ -6,7 +6,7 @@
<solid android:color="#FFFFFF"/>
<stroke android:width="1dp"
android:color="@color/searchStroke"/>
android:color="@color/search_stroke"/>
<corners android:radius="8dp"/>
</shape>

4
app/src/main/res/drawable/home_search_background_private.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="@color/searchPrivateBackground"/>
<solid android:color="@color/search_private_background"/>
<stroke android:width="1dp"
android:color="@color/searchStrokePrivate"/>
android:color="@color/search_stroke_private"/>
<corners android:radius="8dp"/>
</shape>

4
app/src/main/res/drawable/home_search_background_private_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="@color/searchDarkPrivateBackground"/>
<solid android:color="@color/search_dark_private_background"/>
<stroke android:width="1dp"
android:color="@color/searchStrokePrivate"/>
android:color="@color/search_stroke_private"/>
<corners android:radius="8dp"/>
</shape>

2
app/src/main/res/drawable/home_search_background_private_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="@color/searchDarkPrivateBackgroundAlternative"/>
<solid android:color="@color/search_dark_private_background_alternative"/>
<corners android:bottomRightRadius="8dp"
android:bottomLeftRadius="8dp"

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

File diff suppressed because one or more lines are too long

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

@ -8,7 +8,7 @@
<path android:fillType="evenOdd"
android:pathData="M0,0h108v108h-108z">
<aapt:attr name="android:fillColor">
<solid android:color="@color/colorAccent"/>
<solid android:color="@color/color_accent"/>
</aapt:attr>
</path>
</vector>

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

@ -12,7 +12,7 @@
</item>
<item>
<shape>
<solid android:color="@color/offwhite" />
<solid android:color="@color/off_white" />
<corners android:radius="32dp" />
</shape>
</item>

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

@ -17,5 +17,5 @@
app:layout_constraintBottom_toTopOf="@id/pill_wrapper"
mozac:awesomeBarTitleTextColor="?attr/awesomeBarTitleTextColor"
mozac:awesomeBarDescriptionTextColor="?attr/awesomeBarDescriptionTextColor"
mozac:awesomeBarChipTextColor="@color/offwhite"
mozac:awesomeBarChipBackgroundColor="@color/photonBlue40" />
mozac:awesomeBarChipTextColor="@color/off_white"
mozac:awesomeBarChipBackgroundColor="@color/photonBlue40"/>

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

@ -38,7 +38,7 @@
android:layout_width="match_parent"
android:layout_height="56dp"
android:layout_gravity="bottom"
android:background="@color/offwhite"
android:background="@color/off_white"
mozac:findInPageResultCountTextColor="?android:attr/colorPrimary"
mozac:findInPageButtonsTint="?android:attr/colorPrimary"
android:visibility="gone"

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

@ -3,22 +3,22 @@
- 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/. -->
<resources>
<color name="colorPrimary">#544CD9</color>
<color name="colorPrimaryDark">#202340</color>
<color name="colorAccent">#D81B60</color>
<color name="color_primary">#544CD9</color>
<color name="color_primary_dark">#202340</color>
<color name="color_accent">#D81B60</color>
<color name="awesomeBarTitleColor">#212121</color>
<color name="awesomeBarDescriptionColor">#6b6b6b</color>
<color name="searchDarkBackground">#F2F2F5</color>
<color name="searchDarkBackgroundAlternative">#E9E9ED</color>
<color name="searchPrivateBackground">#4f4e75</color>
<color name="searchDarkPrivateBackground">#42416b</color>
<color name="searchDarkPrivateBackgroundAlternative">#393863</color>
<color name="searchStroke">#c5c8d7</color>
<color name="searchStrokeAlternative">#0A202340</color>
<color name="searchStrokePrivate">#2d2e5f</color>
<color name="searchText">#0C0C0D</color>
<color name="offwhite">#f9f9fa</color>
<color name="awesome_bar_title_color">#212121</color>
<color name="awesome_bar_description_color">#6b6b6b</color>
<color name="search_dark_background">#F2F2F5</color>
<color name="search_dark_background_alternative">#E9E9ED</color>
<color name="search_private_background">#4f4e75</color>
<color name="search_dark_private_background">#42416b</color>
<color name="search_dark_private_background_alternative">#393863</color>
<color name="search_stroke">#c5c8d7</color>
<color name="search_stroke_alternative">#0A202340</color>
<color name="search_stroke_private">#2d2e5f</color>
<color name="search_text">#0C0C0D</color>
<color name="off_white">#f9f9fa</color>
<color name="url_box_view">#E9E9ED</color>
<color name="icons">#20233E</color>

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

@ -7,31 +7,31 @@
<style name="LightThemeBase" parent="Theme.AppCompat.Light.NoActionBar">
<item name="android:statusBarColor">@android:color/black</item>
<item name="android:windowAnimationStyle">@style/WindowAnimationTransition</item>
<item name="android:colorPrimary">@color/offwhite</item>
<item name="android:colorPrimary">@color/off_white</item>
<!-- Style the navigation bar -->
<item name="android:navigationBarColor">@android:color/transparent</item>
<!-- Home fragment colors -->
<item name="homeBackgroundTopGradient">@color/offwhite</item>
<item name="homeBackgroundBottomGradient">@color/offwhite</item>
<item name="homeBackgroundTopGradient">@color/off_white</item>
<item name="homeBackgroundBottomGradient">@color/off_white</item>
<item name="homeBackgroundGradient">@drawable/home_background_gradient</item>
<item name="privateBrowsingButtonBackground">@drawable/private_browsing_button_white_background</item>
<item name="privateBrowsingButtonTint">@color/offwhite</item>
<item name="privateBrowsingButtonTint">@color/off_white</item>
<item name="fenixLogo">@drawable/ic_logo_wordmark</item>
<item name="menuButtonTint">@android:color/black</item>
<item name="toolbarWrapperBackground">@drawable/home_search_background_light</item>
<item name="toolbarTextColor">@color/searchText</item>
<item name="toolbarTextColor">@color/search_text</item>
<!-- Search fragment colors -->
<item name="searchBackground">@color/offwhite</item>
<item name="searchShortcutsTextColor">@color/awesomeBarTitleColor</item>
<item name="pillWrapperBackground">@color/offwhite</item>
<item name="awesomeBarTitleTextColor">@color/awesomeBarTitleColor</item>
<item name="awesomeBarDescriptionTextColor">@color/awesomeBarDescriptionColor</item>
<item name="searchBackground">@color/off_white</item>
<item name="searchShortcutsTextColor">@color/awesome_bar_title_color</item>
<item name="pillWrapperBackground">@color/off_white</item>
<item name="awesomeBarTitleTextColor">@color/awesome_bar_title_color</item>
<item name="awesomeBarDescriptionTextColor">@color/awesome_bar_description_color</item>
<!-- Browser fragment colors -->
<item name="browserToolbarBackground">@color/offwhite</item>
<item name="browserToolbarBackground">@color/off_white</item>
<item name="browserToolbarIcons">@color/icons</item>
<item name="browserToolbarHomeIcon">@drawable/ic_home</item>
</style>
@ -54,22 +54,22 @@
<item name="homeBackgroundBottomGradient">@color/private_browsing_bottom_gradient</item>
<item name="homeBackgroundGradient">@drawable/home_background_gradient</item>
<item name="privateBrowsingButtonBackground">@drawable/private_browsing_button_background</item>
<item name="privateBrowsingButtonTint">@color/offwhite</item>
<item name="privateBrowsingButtonTint">@color/off_white</item>
<item name="fenixLogo">@drawable/ic_logo_wordmark_white</item>
<item name="menuButtonTint">@color/offwhite</item>
<item name="menuButtonTint">@color/off_white</item>
<item name="toolbarWrapperBackground">@drawable/home_search_background_private</item>
<item name="toolbarTextColor">@color/offwhite</item>
<item name="toolbarTextColor">@color/off_white</item>
<!-- Search fragment colors -->
<item name="searchBackground">@color/private_browsing_bottom_gradient</item>
<item name="searchShortcutsTextColor">@color/offwhite</item>
<item name="searchShortcutsTextColor">@color/off_white</item>
<item name="pillWrapperBackground">@color/private_browsing_top_gradient</item>
<item name="awesomeBarTitleTextColor">@color/offwhite</item>
<item name="awesomeBarTitleTextColor">@color/off_white</item>
<item name="awesomeBarDescriptionTextColor">@color/photonGrey40</item>
<!-- Browser fragment colors -->
<item name="browserToolbarBackground">@color/private_browsing_bottom_gradient</item>
<item name="browserToolbarIcons">@color/offwhite</item>
<item name="browserToolbarIcons">@color/off_white</item>
<item name="browserToolbarHomeIcon">@drawable/ic_home_white</item>
</style>
@ -84,8 +84,8 @@
</style>
<style name="SettingsThemeBase" parent="Theme.MaterialComponents.Light">
<item name="colorPrimary">@color/offwhite</item>
<item name="colorPrimaryDark">@color/offwhite</item>
<item name="colorPrimary">@color/off_white</item>
<item name="colorPrimaryDark">@color/off_white</item>
<item name="colorAccent">@color/icons</item>
<item name="android:statusBarColor">@android:color/transparent</item>
</style>