Merge pull request #270 from anettleship/AlignSettingsColor

Fix Issue: Languages text not visible on 'Emilia' theme #269
alisonthemonster · Jan 29, 2023 · 4f909cf · 4f909cf
2 parents c6a12a8 + b575879
commit 4f909cf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...java/journal/gratitude/com/gratitudejournal/ui/settings/CustomListPrefDialogFragCompat.kt b/...java/journal/gratitude/com/gratitudejournal/ui/settings/CustomListPrefDialogFragCompat.kt
@@ -33,7 +33,7 @@ class CustomListPrefDialogFragCompat: ListPreferenceDialogFragmentCompat() {
         val theme = context?.theme
         val attrs = IntArray(3)
         attrs[0] = R.attr.timelineBackgroundColor
-        attrs[1] = R.attr.entryBodyColor
+        attrs[1] = R.attr.timelineBodyColor
         val typedArray = theme?.obtainStyledAttributes(attrs)
 
         val backgroundColor  = typedArray?.getColor(0, Color.WHITE)

diff --git a/ui/src/main/res/values/styles.xml b/ui/src/main/res/values/styles.xml
@@ -10,17 +10,17 @@
         <!-- CHANGES THE DIALOG BACKGROUND COLOR!       -->
         <item name="android:colorBackground">?attr/timelineBackgroundColor</item>
         <!-- CHANGES BODY TEXT COLOR IN DIALOGS BUT NOT IN TIME PICKER     -->
-        <item name="android:textColorPrimary">?attr/entryBodyColor</item>
+        <item name="android:textColorPrimary">?attr/timelineBodyColor</item>
         <!-- CHANGES HEADER TEXT COLOR IN DIALOGS BUT NOT IN TIME PICKER     -->
-        <item name="android:textColor">?attr/entryBodyColor</item>
+        <item name="android:textColor">?attr/timelineBodyColor</item>
     </style>
 
     <style name="NegativeButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
         <item name="android:textColor">#8B8B8B</item>
     </style>
 
     <style name="PositiveButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
-        <item name="android:textColor">?attr/entryBodyColor</item>
+        <item name="android:textColor">?attr/timelineBodyColor</item>
     </style>
 
     <style name="TextAppearance.Title" parent="Theme.MaterialComponents.Light.NoActionBar">