Skip to content

Commit c362ba7

Browse files
JohnsonEricAtSalesforceJohnsonEricAtSalesforce
authored
W-17867667: [MSDK Android] Mobile SDK Developer Support Dialog Has White Corners In Dark Theme (#2681)
1 parent f39e3aa commit c362ba7

4 files changed

Lines changed: 28 additions & 26 deletions

File tree

‎libs/SalesforceSDK/res/drawable/sf__dialog.xml‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<shape xmlns:android="http://schemas.android.com/apk/res/android">
3-
<solid
4-
android:color="@color/sf__layout_background"/>
5-
<corners
6-
android:radius="5dp" />
3+
<solid android:color="@color/sf__layout_background" />
4+
<corners android:radius="10dp" />
75
<padding
6+
android:bottom="5dp"
87
android:left="5dp"
9-
android:right="5dp"
10-
android:bottom="5dp" />
11-
</shape>
8+
android:right="5dp" />
9+
</shape>

‎libs/SalesforceSDK/res/drawable/sf__dialog_dark.xml‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<shape xmlns:android="http://schemas.android.com/apk/res/android">
3-
<solid
4-
android:color="@color/sf__layout_background_dark"/>
5-
<corners
6-
android:radius="5dp" />
3+
<solid android:color="@color/sf__layout_background_dark" />
4+
<corners android:radius="10dp" />
75
<padding
6+
android:bottom="5dp"
87
android:left="5dp"
9-
android:right="5dp"
10-
android:bottom="5dp" />
11-
</shape>
8+
android:right="5dp" />
9+
</shape>

‎libs/SalesforceSDK/res/values/sf__styles.xml‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22

33
<resources xmlns:android="http://schemas.android.com/apk/res/android">
4-
4+
55
<style name="AccountSwitcher" parent="Theme.Material3.Dark.NoActionBar">
66
<item name="android:windowIsTranslucent">true</item>
77
<item name="android:windowBackground">@android:color/transparent</item>
@@ -67,23 +67,27 @@
6767
</style>
6868

6969
<style name="SalesforceSDK.AlertDialog" parent="@style/Theme.Material3.DayNight.Dialog.Alert">
70-
<item name="android:textColor">@color/sf__text_color</item>
7170
<item name="android:colorBackground">@color/sf__layout_background</item>
72-
<item name="android:background">@drawable/sf__dialog</item>
73-
<item name="buttonBarPositiveButtonStyle">@style/PositiveButtonStyle</item>
74-
<item name="buttonBarNegativeButtonStyle">@style/NegativeButtonStyle</item>
75-
<item name="android:windowNoTitle">false</item>
71+
<item name="android:colorPrimary">@color/sf__primary_color</item>
72+
<item name="android:textColor">@color/sf__text_color</item>
73+
<item name="android:textColorHint">@color/sf__hint_color</item>
74+
<item name="android:windowBackground">@drawable/sf__dialog</item>
7675
<item name="android:windowIsFloating">true</item>
76+
<item name="android:windowNoTitle">false</item>
77+
<item name="buttonBarNegativeButtonStyle">@style/NegativeButtonStyle</item>
78+
<item name="buttonBarPositiveButtonStyle">@style/PositiveButtonStyle</item>
7779
</style>
7880

79-
<style name="SalesforceSDK.AlertDialog.Dark">
81+
<style name="SalesforceSDK.AlertDialog.Dark" parent="@style/Theme.Material3.Dark.Dialog.Alert">
82+
<item name="android:colorBackground">@color/sf__layout_background_dark</item>
83+
<item name="android:colorPrimary">@color/sf__primary_color_dark</item>
8084
<item name="android:textColor">@color/sf__text_color_dark</item>
8185
<item name="android:textColorHint">@color/sf__hint_color_dark</item>
82-
<item name="android:colorBackground">@color/sf__layout_background_dark</item>
83-
<item name="android:colorPrimary">@color/sf__primary_color</item>
84-
<item name="android:background">@drawable/sf__dialog_dark</item>
85-
<item name="buttonBarPositiveButtonStyle">@style/PositiveButtonStyleDark</item>
86+
<item name="android:windowBackground">@drawable/sf__dialog_dark</item>
87+
<item name="android:windowIsFloating">true</item>
88+
<item name="android:windowNoTitle">false</item>
8689
<item name="buttonBarNegativeButtonStyle">@style/NegativeButtonStyleDark</item>
90+
<item name="buttonBarPositiveButtonStyle">@style/PositiveButtonStyleDark</item>
8791
</style>
8892

8993
<style name="PositiveButtonStyle" parent="Widget.MaterialComponents.Button">

‎libs/SalesforceSDK/src/com/salesforce/androidsdk/app/SalesforceSDKManager.kt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1188,7 +1188,9 @@ open class SalesforceSDKManager protected constructor(
11881188
fun showDevSupportDialog(frontActivity: Activity?) {
11891189
if (!isDevSupportEnabled() || frontActivity == null) return
11901190

1191-
devActionsDialog?.dismiss()
1191+
runCatching {
1192+
devActionsDialog?.dismiss()
1193+
}
11921194

11931195
CoroutineScope(Main).launch {
11941196
val devActions = getDevActions(frontActivity)

0 commit comments

Comments
 (0)