Use primary color in recurrence picker

pull/848/head
Alex Baker 6 years ago
parent 54755570ec
commit 3a722ff949

@ -303,11 +303,11 @@ public class CustomRecurrenceDialog extends InjectingDialogFragment {
new int[] {android.R.attr.state_checked}, new int[] {-android.R.attr.state_checked} new int[] {android.R.attr.state_checked}, new int[] {-android.R.attr.state_checked}
}, },
new int[] { new int[] {
ResourceResolver.getData(context, R.attr.colorOnSecondary), ResourceResolver.getData(context, R.attr.weekdayButtonText),
getColor(context, R.color.text_primary) getColor(context, R.color.text_primary)
}); });
int inset = (int) context.getResources().getDimension(R.dimen.week_button_inset); int inset = (int) context.getResources().getDimension(R.dimen.week_button_inset);
int accentColor = ResourceResolver.getData(context, R.attr.colorAccent); int accentColor = ResourceResolver.getData(context, R.attr.weekdayButtonBackground);
int animationDuration = int animationDuration =
context.getResources().getInteger(android.R.integer.config_shortAnimTime); context.getResources().getInteger(android.R.integer.config_shortAnimTime);

@ -17,7 +17,7 @@
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?colorAccentDialog"> android:background="?attr/colorPrimary">
<androidx.appcompat.widget.AppCompatSpinner <androidx.appcompat.widget.AppCompatSpinner
android:id="@+id/frequency" android:id="@+id/frequency"
@ -31,7 +31,7 @@
android:paddingEnd="@dimen/keyline_first" android:paddingEnd="@dimen/keyline_first"
android:paddingLeft="@dimen/keyline_first" android:paddingLeft="@dimen/keyline_first"
android:paddingRight="@dimen/keyline_first" android:paddingRight="@dimen/keyline_first"
app:backgroundTint="?attr/colorOnSecondary"/> app:backgroundTint="?attr/colorOnPrimary"/>
</FrameLayout> </FrameLayout>

@ -13,4 +13,4 @@
android:ellipsize="end" android:ellipsize="end"
android:singleLine="true" android:singleLine="true"
android:textAlignment="viewStart" android:textAlignment="viewStart"
android:textColor="?attr/colorOnSecondary"/> android:textColor="?attr/colorOnPrimary"/>

@ -22,6 +22,8 @@
<attr format="reference" name="materialButtonBackground"/> <attr format="reference" name="materialButtonBackground"/>
<attr format="reference" name="materialButtonRipple"/> <attr format="reference" name="materialButtonRipple"/>
<attr format="reference" name="materialButtonStroke"/> <attr format="reference" name="materialButtonStroke"/>
<attr format="reference" name="weekdayButtonBackground"/>
<attr format="reference" name="weekdayButtonText"/>
<declare-styleable name="TimePreference"> <declare-styleable name="TimePreference">
<attr format="string" name="summary"/> <attr format="string" name="summary"/>

@ -35,6 +35,8 @@
<item name="materialButtonBackground">@color/mtrl_btn_text_btn_bg_color_selector</item> <item name="materialButtonBackground">@color/mtrl_btn_text_btn_bg_color_selector</item>
<item name="materialButtonRipple">@color/mtrl_btn_text_btn_ripple_color</item> <item name="materialButtonRipple">@color/mtrl_btn_text_btn_ripple_color</item>
<item name="materialButtonStroke">@color/mtrl_btn_stroke_color_selector</item> <item name="materialButtonStroke">@color/mtrl_btn_stroke_color_selector</item>
<item name="weekdayButtonBackground">?attr/colorPrimary</item>
<item name="weekdayButtonText">?attr/colorOnPrimary</item>
</style> </style>
<style name="Tasks" parent="TasksBase"/> <style name="Tasks" parent="TasksBase"/>

@ -14,6 +14,8 @@
<item name="materialButtonBackground">@color/button_accent_background</item> <item name="materialButtonBackground">@color/button_accent_background</item>
<item name="materialButtonRipple">@color/button_accent_ripple</item> <item name="materialButtonRipple">@color/button_accent_ripple</item>
<item name="materialButtonStroke">@color/button_accent_stroke</item> <item name="materialButtonStroke">@color/button_accent_stroke</item>
<item name="weekdayButtonBackground">?attr/colorAccent</item>
<item name="weekdayButtonText">?attr/colorOnSecondary</item>
</style> </style>
<style name="AlertButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog.Flush"> <style name="AlertButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog.Flush">

Loading…
Cancel
Save