Skip to content
This repository has been archived by the owner on Dec 14, 2021. It is now read-only.

Commit

Permalink
1035 - Handles and context menus have solid backgrounds instead of tr…
Browse files Browse the repository at this point in the history
…ansparent

* fixed use of android:background in root theme
fixed text selection handles in filter / search
added background tags where required

* fixes #1035

* Create styles to set white background for backable filter, onboarding confirmation, settings, and nav header.

* removed unused styles
  • Loading branch information
lucacataldo authored and eliserichards committed Nov 15, 2019
1 parent f7adf1d commit 5ee9c43
Show file tree
Hide file tree
Showing 9 changed files with 75 additions and 19 deletions.
13 changes: 7 additions & 6 deletions app/src/main/res/layout/fragment_account_setting.xml
Expand Up @@ -5,12 +5,13 @@
~ file, You can obtain one at http://mozilla.org/MPL/2.0/.
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".view.AccountSettingFragment"
android:orientation="vertical">
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:theme="@style/AccountSettings"
tools:context=".view.AccountSettingFragment" >

<include layout="@layout/include_backable"/>

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/fragment_filter.xml
Expand Up @@ -10,7 +10,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:backgroundTint="@color/background_grey"
android:theme="@style/Filter"
android:importantForAutofill="noExcludeDescendants"
tools:context=".view.FilterFragment"
tools:ignore="UnusedAttribute">
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/layout/fragment_item_list.xml
Expand Up @@ -18,7 +18,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="false"
android:orientation="vertical">
android:orientation="vertical"
android:background="@color/background_white">

<androidx.appcompat.widget.Toolbar
android:id="@+id/navToolbar"
Expand Down
Expand Up @@ -9,7 +9,7 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:theme="@style/AppTheme"
android:theme="@style/OnboardingConfirmation"
android:id="@+id/fragment_onboarding_confirmation">

<TextView
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/fragment_setting.xml
Expand Up @@ -11,8 +11,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:theme="@style/AppTheme"
tools:context=".view.SettingFragment">
android:theme="@style/AppSettings"
tools:context=".view.SettingFragment" >

<include layout="@layout/include_backable"/>

Expand Down
9 changes: 6 additions & 3 deletions app/src/main/res/layout/include_backable_filter.xml
Expand Up @@ -4,12 +4,14 @@
~ 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/.
-->
<androidx.appcompat.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.appcompat.widget.Toolbar
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:theme="@style/BackableToolBar">
android:theme="@style/BackableToolBar" >

<LinearLayout android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="match_parent">
Expand All @@ -26,7 +28,8 @@
android:textColorHint="@color/white_60_percent"
android:textCursorDrawable="@null"
android:inputType="textAutoComplete"
tools:ignore="Autofill" />
tools:ignore="Autofill"
android:theme="@style/NoBackgroundTheme"/>

<ImageButton
android:id="@+id/cancelButton"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/layout/list_cell_item.xml
Expand Up @@ -10,6 +10,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="64dp"
android:theme="@style/ListCellItem"
xmlns:tools="http://schemas.android.com/tools">

<TextView
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/res/layout/nav_header.xml
Expand Up @@ -11,8 +11,7 @@
android:orientation="vertical"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:theme="@style/AppTheme"
android:backgroundTint="@color/color_primary_dark"
android:theme="@style/NavHeader"
android:id="@+id/menuHeader"
tools:ignore="UseCompoundDrawables">

Expand Down
57 changes: 54 additions & 3 deletions app/src/main/res/values/styles.xml
Expand Up @@ -7,18 +7,18 @@
<resources>
<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/color_primary</item>
<item name="colorPrimaryDark">@color/color_primary_dark</item>
<item name="android:textColor">@color/text_white</item>
<item name="android:windowTranslucentStatus">false</item>
<item name="android:windowBackground">@null</item>
<item name="android:windowBackground">@color/background_white</item>
<item name="android:colorControlActivated">@color/switch_activated</item>
<item name="android:background">@color/background_white</item>
<item name="android:background">@android:color/transparent</item>
<item name="actionMenuTextAppearance">@style/NavDrawerStyle</item>
<item name="android:actionMenuTextAppearance">@style/NavDrawerStyle</item>
<item name="actionMenuTextColor">@style/NavDrawerStyle</item>
<item name="android:titleTextAppearance">@style/NavDrawerStyle</item>
<item name="android:colorAccent">@color/violet_70</item>
<item name="popupMenuStyle">@style/PopupMenu</item>
</style>

Expand Down Expand Up @@ -51,8 +51,16 @@

<style name="BackableToolBar" parent="ToolBar">
<item name="android:background">@color/color_primary</item>
<item name="android:colorControlActivated">@color/violet_70</item>
<item name="android:textColor">@color/violet_70</item>
<item name="android:colorAccent">@color/violet_70</item>
<item name="android:editTextColor">@color/violet_70</item>
<item name="colorPrimary">@color/color_primary</item>
<item name="colorPrimaryDark">@color/color_primary_dark</item>
<item name="android:colorControlNormal">@color/violet_70</item>
</style>


<style name="EditItemDetail" parent="Theme.AppCompat.Light.NoActionBar">
<item name="android:popupBackground">@android:color/transparent</item>
<item name="android:background">@android:color/transparent</item>
Expand Down Expand Up @@ -87,22 +95,26 @@
<item name="android:background">@color/color_primary</item>
<item name="android:popupBackground">@android:color/transparent</item>
</style>

<style name="TextAppearance">
<item name="android:letterSpacing">0.02</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:textSize">14sp</item>
<item name="android:lineSpacingExtra">6sp</item>
<item name="android:popupBackground">@android:color/transparent</item>
</style>

<style name="TextAppearanceSortMenuItem" parent="@style/TextAppearance">
<item name="android:textColor">@color/black_87_percent</item>
</style>

<style name="ToolbarButton">
<item name="android:tint">@android:color/white</item>
<item name="android:background">@null</item>
<item name="android:textColorPrimary">@android:color/white</item>
<item name="android:textColorSecondary">@android:color/white</item>
</style>

<style name="EditTextStyle" parent="@android:style/Widget.EditText">
<item name="android:textSize">16sp</item>
<item name="android:fontFamily">sans-serif</item>
Expand All @@ -127,11 +139,50 @@
<item name="android:backgroundTint">@color/background_white</item>
<item name="android:popupBackground">@android:color/transparent</item>
</style>

<style name="WelcomeScreen" parent="AppTheme">
<item name="android:background">@color/color_primary</item>
<item name="android:windowBackground">@color/color_primary</item>
<item name="android:colorBackground">@color/color_primary</item>
<item name="android:colorControlActivated">@color/violet_70</item>
</style>

<style name="AccountSettings" parent="AppTheme">
<item name="android:background">@color/background_white</item>
<item name="android:colorControlActivated">@color/violet_70</item>
</style>

<style name="AppSettings" parent="AppTheme">
<item name="android:background">@color/background_white</item>
<item name="android:colorControlActivated">@color/violet_70</item>
</style>

<style name="NavHeader" parent="AppTheme">
<item name="android:background">@color/color_primary_dark</item>
<item name="android:colorControlActivated">@color/violet_70</item>
</style>

<style name="ListCellItem" parent="AppTheme">
<item name="android:background">@color/background_white</item>
<item name="android:colorControlActivated">@color/violet_70</item>
</style>

<style name="Filter" parent="AppTheme">
<item name="android:background">@color/background_grey</item>
<item name="android:colorControlActivated">@color/violet_70</item>
<item name="android:textColor">@color/violet_70</item>
<item name="android:colorAccent">@color/violet_70</item>
<item name="android:editTextColor">@color/violet_70</item>
<item name="colorPrimary">@color/color_primary</item>
<item name="colorPrimaryDark">@color/color_primary_dark</item>
<item name="android:colorControlNormal">@color/violet_70</item>
</style>

<style name="OnboardingConfirmation" parent="AppTheme">
<item name="android:background">@color/background_white</item>
<item name="android:colorControlActivated">@color/violet_70</item>
</style>

<style name="AlertDialogStyle" parent="Theme.AppCompat.Light.Dialog">
<item name="android:windowBackground">@drawable/rounded_corner_bg_white</item>
<item name="android:textColorPrimary">@color/text_ink</item>
Expand Down

0 comments on commit 5ee9c43

Please sign in to comment.