Skip to content

Commit 4e37415

Browse files
Use ThemeOverlay as a base for AlertDialogTheme, apply correct text styles.
1 parent 2e0e6d7 commit 4e37415

File tree

1 file changed

+21
-6
lines changed
  • OpenScienceJournal/whistlepunk_library/src/main/res/values

1 file changed

+21
-6
lines changed

OpenScienceJournal/whistlepunk_library/src/main/res/values/styles.xml

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,25 +49,40 @@
4949

5050
<!-- MaterialAlertDialog -->
5151
<!-- Use in conjunction with new MaterialAlertDialogBuilder(parentReference.get().requireContext(), R.style.AlertDialogTheme); -->
52-
<style name="AlertDialogTheme" parent="Theme.MaterialComponents.Light.Dialog.Alert">
53-
<item name="buttonBarPositiveButtonStyle">@style/Alert.Button.Positive</item>
54-
<item name="buttonBarNegativeButtonStyle">@style/Alert.Button.Negative</item>
55-
<item name="buttonBarNeutralButtonStyle">@style/Alert.Button.Negative</item>
52+
<style name="AlertDialogTheme" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
53+
<item name="buttonBarPositiveButtonStyle">@style/AlertDialogPositiveButton</item>
54+
<item name="buttonBarNegativeButtonStyle">@style/AlertDialogNegativeButton</item>
55+
<item name="buttonBarNeutralButtonStyle">@style/AlertDialogNegativeButton</item>
56+
57+
<item name="materialAlertDialogTitleTextStyle">@style/MaterialAlertDialogTitle</item>
58+
<item name="materialAlertDialogBodyTextStyle">@style/MaterialAlertDialogMessage</item>
5659
</style>
5760

58-
<style name="Alert.Button.Positive" parent="Widget.MaterialComponents.Button">
61+
<style name="AlertDialogPositiveButton" parent="Widget.MaterialComponents.Button">
5962
<item name="backgroundTint">@color/color_accent</item>
6063
<item name="android:layout_marginStart">16dp</item>
6164
<item name="cornerRadius">24dp</item>
6265
<item name="android:textColor">@color/text_color_white</item>
6366
</style>
6467

65-
<style name="Alert.Button.Negative" parent="Widget.MaterialComponents.Button.OutlinedButton">
68+
<style name="AlertDialogNegativeButton" parent="Widget.MaterialComponents.Button.OutlinedButton">
6669
<item name="cornerRadius">24dp</item>
6770
<item name="strokeColor">@color/color_accent</item>
6871
<item name="rippleColor">@color/color_accent</item>
6972
<item name="android:textColor">@color/color_accent</item>
7073
</style>
74+
75+
<style name="MaterialAlertDialogTitle" parent="MaterialAlertDialog.MaterialComponents.Title.Text">
76+
<item name="android:fontFamily">@font/open_sans</item>
77+
<item name="android:textStyle">bold</item>
78+
<item name="android:textSize">16sp</item>
79+
</style>
80+
81+
<style name="MaterialAlertDialogMessage" parent="MaterialAlertDialog.MaterialComponents.Body.Text">
82+
<item name="android:fontFamily">@font/open_sans</item>
83+
<item name="android:textSize">14sp</item>
84+
</style>
85+
7186
<!-- END MaterialAlertDialog -->
7287

7388
<!-- Metadata update activities for triggers have a different primary color. -->

0 commit comments

Comments
 (0)