Commit 2af4201c authored by Romain Hunault's avatar Romain Hunault
Browse files

Merge branch '235-search_field_color_fix' into 'master'

Fix search field

See merge request !82
parents c44ad713 6e6ce127
Pipeline #183139 failed with stage
in 2 minutes and 2 seconds
...@@ -31,7 +31,8 @@ ...@@ -31,7 +31,8 @@
android:inputType="text" android:inputType="text"
android:maxLines="1" android:maxLines="1"
android:textColor="@color/on_surface_high_emphasis" android:textColor="@color/on_surface_high_emphasis"
android:textColorHint="@color/search_hint_color" /> android:textColorHint="@color/on_surface_medium_emphasis"
android:theme="?searchBarTheme" />
<ImageView <ImageView
android:id="@+id/clearSuggestionImageView" android:id="@+id/clearSuggestionImageView"
......
...@@ -49,5 +49,6 @@ ...@@ -49,5 +49,6 @@
<attr name="widgetPrimaryTextColor" format="color" /> <attr name="widgetPrimaryTextColor" format="color" />
<attr name="widgetSecondaryTextColor" format="color" /> <attr name="widgetSecondaryTextColor" format="color" />
<attr name="widgetSettingsIconColor" format="color" /> <attr name="widgetSettingsIconColor" format="color" />
<attr name="searchBarTheme" format="reference" />
</resources> </resources>
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
<item name="android:windowDrawsSystemBarBackgrounds">true</item> <item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:enforceNavigationBarContrast">false</item> <item name="android:enforceNavigationBarContrast">false</item>
<item name="android:enforceStatusBarContrast">false</item> <item name="android:enforceStatusBarContrast">false</item>
<item name="searchBarTheme">@style/SearchBar</item>
</style> </style>
<style name="HomeScreenTheme" parent="BaseHomeScreenTheme"> <style name="HomeScreenTheme" parent="BaseHomeScreenTheme">
...@@ -61,4 +62,9 @@ ...@@ -61,4 +62,9 @@
<item name="android:textAllCaps">true</item> <item name="android:textAllCaps">true</item>
<item name="android:fontFamily">sans-serif</item> <item name="android:fontFamily">sans-serif</item>
</style> </style>
<style name="SearchBar">
<item name="android:colorAccent">#000000</item>
<item name="android:colorControlActivated">#000000</item>
</style>
</resources> </resources>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment