Skip to content

Commit 0d6bb0e

Browse files
@W-17875985: [MSDK Android] Template App Styles And Themes Changed With MSDK 13 (#2683)
1 parent c362ba7 commit 0d6bb0e

2 files changed

Lines changed: 9 additions & 6 deletions

File tree

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33
<declare-styleable name="MobileSDKAttributes">
4-
<attr name="sfLayoutBackground" format="color"/>
5-
<attr name="sfColorSecondary" format="color"/>
6-
<attr name="sfNegativeButtonTextColor" format="color"/>
7-
<attr name="sfNegativeButtonBorderColor" format="color"/>
8-
<attr name="sfBorderColor" format="color"/>
4+
<attr name="sfLayoutBackground" format="color" />
5+
<attr name="sfColorOnPrimary" format="color" />
6+
<attr name="sfColorSecondary" format="color" />
7+
<attr name="sfNegativeButtonTextColor" format="color" />
8+
<attr name="sfNegativeButtonBorderColor" format="color" />
9+
<attr name="sfBorderColor" format="color" />
910
</declare-styleable>
1011
</resources>

libs/SalesforceSDK/res/values/sf__styles.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@
1111

1212
<style name="SalesforceSDK" parent="Theme.AppCompat.Light.DarkActionBar">
1313
<item name="colorPrimary">@color/sf__primary_color</item>
14-
<item name="titleTextColor">@color/sf__secondary_color</item>
14+
<item name="titleTextColor">@color/sf__on_primary</item>
1515
<item name="android:actionBarStyle">@style/SalesforceSDKActionBar</item>
1616
<item name="android:colorPrimary">@color/sf__primary_color</item>
1717
<item name="android:colorPrimaryDark">@color/sf__primary_color</item>
1818
<item name="sfColorSecondary">@color/sf__secondary_color</item>
19+
<item name="sfColorOnPrimary">@color/sf__on_primary</item>
1920
<item name="sfLayoutBackground">@color/sf__layout_background</item>
2021
<item name="android:colorBackground">@color/sf__background</item>
2122
<item name="sfBorderColor">@color/sf__border_color</item>
@@ -38,6 +39,7 @@
3839
<item name="android:colorPrimary">@color/sf__primary_color</item>
3940
<item name="android:colorPrimaryDark">@color/sf__primary_color</item>
4041
<item name="sfColorSecondary">@color/sf__secondary_color_dark</item>
42+
<item name="sfColorOnPrimary">@color/sf__on_primary_dark</item>
4143
<item name="sfLayoutBackground">@color/sf__layout_background_dark</item>
4244
<item name="android:colorBackground">@color/sf__background_dark</item>
4345
<item name="sfBorderColor">@color/sf__border_color_dark</item>

0 commit comments

Comments
 (0)