Skip to content

Commit

Permalink
feat(android): menu text should not be all-caps by default (#13166)
Browse files Browse the repository at this point in the history
Fixes Theme.Titanium.Dark
  • Loading branch information
jquick-axway committed Nov 5, 2021
1 parent 331bdf2 commit da00331
Showing 1 changed file with 4 additions and 14 deletions.
18 changes: 4 additions & 14 deletions android/titanium/res/values/values.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,6 @@
<attr name="titaniumSplashIcon" format="reference"/>
</declare-styleable>

<!-- Titanium's button text style is not all-caps just like Google's apps. -->
<style name="TextAppearance.Titanium.Button" parent="TextAppearance.MaterialComponents.Button">
<item name="android:textAllCaps">false</item>
</style>
<style name="Widget.Titanium.Button" parent="Widget.AppCompat.Button">
<item name="android:textAllCaps">false</item>
</style>

<!-- Titanium's dark material theme with an action bar. -->
<style name="Theme.Titanium.Dark" parent="Theme.MaterialComponents">
<item name="actionBarSize">@dimen/ti_action_bar_height</item>
Expand All @@ -47,10 +39,9 @@
<item name="colorSurface">@color/ti_dark_surface</item>
<item name="android:colorBackground">@color/ti_dark_background</item>
<item name="android:navigationBarColor">?attr/colorPrimaryDark</item>
<item name="android:buttonStyle">@style/Widget.Titanium.Button</item>
<item name="android:statusBarColor">?attr/colorPrimaryDark</item>
<item name="buttonStyle">@style/Widget.Titanium.Button</item>
<item name="textAppearanceButton">@style/TextAppearance.Titanium.Button</item>
<item name="android:textAllCaps">false</item>
<item name="textAllCaps">false</item>
</style>

<!-- Titanium's dark material theme without an action bar. -->
Expand Down Expand Up @@ -103,10 +94,9 @@
<item name="colorSurface">@color/ti_light_surface</item>
<item name="android:colorBackground">@color/ti_light_background</item>
<item name="android:navigationBarColor">?attr/colorPrimaryDark</item>
<item name="android:buttonStyle">@style/Widget.Titanium.Button</item>
<item name="android:statusBarColor">?attr/colorPrimaryDark</item>
<item name="buttonStyle">@style/Widget.Titanium.Button</item>
<item name="textAppearanceButton">@style/TextAppearance.Titanium.Button</item>
<item name="android:textAllCaps">false</item>
<item name="textAllCaps">false</item>
</style>

<!-- Titanium's light material theme without an action bar. -->
Expand Down

0 comments on commit da00331

Please sign in to comment.