diff options
| author | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-09-09 18:42:17 -0400 |
|---|---|---|
| committer | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-09-09 18:42:17 -0400 |
| commit | 2c3f7921d212f3769c8308cf56d51573da541dfc (patch) | |
| tree | 12c13c898d160484e1cc7edea2ecb1fdf3714496 | |
| parent | 2555df3bd21a44b60f70534fab32f4bc19adcb1c (diff) | |
| parent | 11e70e32938bd6db1d509a8e1aa05a4197a38203 (diff) | |
| download | AntennaPod-2c3f7921d212f3769c8308cf56d51573da541dfc.zip | |
Merge pull request #1181 from mfietz/buttons_not_uppercase
Button text capitalized, not uppercase
| -rw-r--r-- | core/src/main/res/values-v21/styles.xml | 8 | ||||
| -rw-r--r-- | core/src/main/res/values/styles.xml | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/core/src/main/res/values-v21/styles.xml b/core/src/main/res/values-v21/styles.xml new file mode 100644 index 000000000..42bd358c7 --- /dev/null +++ b/core/src/main/res/values-v21/styles.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + + <style name="Widget.AntennaPod.Button" parent="Widget.AppCompat.Button"> + <item name="textAllCaps">true</item> + </style> + +</resources>
\ No newline at end of file diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml index f6b66cc8a..ccaaf9c3c 100644 --- a/core/src/main/res/values/styles.xml +++ b/core/src/main/res/values/styles.xml @@ -4,6 +4,7 @@ <style name="Theme.AntennaPod.Light" parent="@style/Theme.AppCompat.Light"> <item name="colorPrimary">@color/primary_light</item> <item name="colorAccent">@color/color_accent</item> + <item name="buttonStyle">@style/Widget.AntennaPod.Button</item> <item name="attr/action_bar_icon_color">@color/grey600</item> <item name="attr/action_about">@drawable/ic_info_grey600_24dp</item> <item name="attr/action_search">@drawable/ic_search_grey600_24dp</item> @@ -50,6 +51,7 @@ <style name="Theme.AntennaPod.Dark" parent="@style/Theme.AppCompat"> <item name="colorAccent">@color/color_accent</item> + <item name="buttonStyle">@style/Widget.AntennaPod.Button</item> <item name="attr/action_bar_icon_color">@color/white</item> <item name="attr/action_about">@drawable/ic_info_white_24dp</item> <item name="attr/action_search">@drawable/ic_search_white_24dp</item> @@ -99,6 +101,7 @@ <item name="windowActionModeOverlay">true</item> <item name="colorPrimary">@color/primary_light</item> <item name="colorAccent">@color/color_accent</item> + <item name="buttonStyle">@style/Widget.AntennaPod.Button</item> <item name="attr/action_about">@drawable/ic_info_grey600_24dp</item> <item name="attr/action_search">@drawable/ic_search_grey600_24dp</item> <item name="attr/action_stream">@drawable/ic_settings_input_antenna_grey600_24dp</item> @@ -146,6 +149,7 @@ <item name="windowActionBar">false</item> <item name="windowActionModeOverlay">true</item> <item name="colorAccent">@color/color_accent</item> + <item name="buttonStyle">@style/Widget.AntennaPod.Button</item> <item name="attr/action_about">@drawable/ic_info_white_24dp</item> <item name="attr/action_search">@drawable/ic_search_white_24dp</item> <item name="attr/action_stream">@drawable/ic_settings_input_antenna_white_24dp</item> @@ -263,6 +267,10 @@ <item name="android:text">@string/new_label</item> </style> + <style name="Widget.AntennaPod.Button" parent="Widget.AppCompat.Button"> + <item name="textAllCaps">false</item> + </style> + <style name="BigBlurryBackground"> <item name="android:scaleType">centerCrop</item> <!-- <item name="android:tint">@color/image_readability_tint</item> --> |