Skip to content

Commit

Permalink
#124 Adjust default color for Today's and Past events
Browse files Browse the repository at this point in the history
  • Loading branch information
yvolk committed Aug 29, 2019
1 parent 4400dfe commit e61b06c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

import java.util.List;

import androidx.annotation.ColorInt;

public class ApplicationPreferences {
public static final String PREF_WIDGET_ID = "widgetId";

Expand Down Expand Up @@ -62,13 +64,13 @@ public class ApplicationPreferences {

// Colors
static final String PREF_WIDGET_HEADER_BACKGROUND_COLOR = "widgetHeaderBackgroundColor";
static final int PREF_WIDGET_HEADER_BACKGROUND_COLOR_DEFAULT = Color.TRANSPARENT;
@ColorInt static final int PREF_WIDGET_HEADER_BACKGROUND_COLOR_DEFAULT = Color.TRANSPARENT;
static final String PREF_PAST_EVENTS_BACKGROUND_COLOR = "pastEventsBackgroundColor";
static final int PREF_PAST_EVENTS_BACKGROUND_COLOR_DEFAULT = 0x4affff2b;
@ColorInt static final int PREF_PAST_EVENTS_BACKGROUND_COLOR_DEFAULT = 0xBF78782C;
static final String PREF_TODAYS_EVENTS_BACKGROUND_COLOR = "todaysEventsBackgroundColor";
static final int PREF_TODAYS_EVENTS_BACKGROUND_COLOR_DEFAULT = 0x4A5FFF5D;
@ColorInt static final int PREF_TODAYS_EVENTS_BACKGROUND_COLOR_DEFAULT = 0xBF3E96AB;
static final String PREF_EVENTS_BACKGROUND_COLOR = "backgroundColor";
static final int PREF_EVENTS_BACKGROUND_COLOR_DEFAULT = 0x80000000;
@ColorInt static final int PREF_EVENTS_BACKGROUND_COLOR_DEFAULT = 0x80000000;

private static volatile String lockedTimeZoneId = null;

Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/xml/preferences_colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@

<com.rarepebble.colorpicker.ColorPreference
android:key="pastEventsBackgroundColor"
android:defaultValue="#4affff2b"
android:defaultValue="#BF78782C"
android:summary="@string/appearance_past_events_background_color_desc"
android:title="@string/appearance_past_events_background_color_title"
app:colorpicker_selectNoneButtonText="@string/default_value" />

<com.rarepebble.colorpicker.ColorPreference
android:key="todaysEventsBackgroundColor"
android:defaultValue="#4A5FFF5D"
android:defaultValue="#BF3E96AB"
android:summary="@string/todays_events_background_color_desc"
android:title="@string/todays_events_background_color_title"
app:colorpicker_selectNoneButtonText="@string/default_value" />
Expand Down

0 comments on commit e61b06c

Please sign in to comment.