Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjust event color opacity/disable #234

Closed
wants to merge 1 commit into from
Closed

Adjust event color opacity/disable #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion ...alendar-widget/src/main/java/com/plusonelabs/calendar/calendar/CalendarEventProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ private CalendarEvent createCalendarEvent(Cursor cursor) {
event.setLocation(cursor.getString(cursor.getColumnIndex(Instances.EVENT_LOCATION)));
event.setAlarmActive(cursor.getInt(cursor.getColumnIndex(Instances.HAS_ALARM)) > 0);
event.setRecurring(cursor.getString(cursor.getColumnIndex(Instances.RRULE)) != null);
event.setColor(getAsOpaque(getEventColor(cursor)));
event.setColor(getAsConfiguredOpacity(getEventColor(cursor)));
if (event.isAllDay()) {
fixAllDayEvent(event);
}
Expand Down Expand Up @@ -267,4 +267,12 @@ private int getEventColor(Cursor cursor) {
private int getAsOpaque(int color) {
return argb(255, red(color), green(color), blue(color));
}

private int getAsConfiguredOpacity(int color) {
if (CalendarPreferences.getEventColorOpacity(context) ==
CalendarPreferences.PREF_EVENT_COLOR_OPACITY_DISABLED) {
return argb(0, red(color), green(color), blue(color));
}
return argb(CalendarPreferences.getEventColorOpacity(context), red(color), green(color), blue(color));
}
}
8 changes: 6 additions & 2 deletions ...endar-widget/src/main/java/com/plusonelabs/calendar/calendar/CalendarEventVisualizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public RemoteViews getRemoteView(WidgetEntry eventEntry) {
setEventDetails(event, rv);
setAlarmActive(event, rv);
setRecurring(event, rv);
setColor(event, rv);
setColor(event, R.id.event_entry_color, rv);
return rv;
}

Expand Down Expand Up @@ -104,10 +104,14 @@ private void setIndicator(RemoteViews rv, boolean showIndication, int viewId, in
}
}

private void setColor(CalendarEntry entry, RemoteViews rv) {
private void setColor(CalendarEntry entry, int viewId, RemoteViews rv) {
setBackgroundColor(rv, R.id.event_entry_color, entry.getColor());
rv.setViewVisibility(viewId, View.VISIBLE);
if (entry.getEndDate().isBefore(DateUtil.now())) {
setBackgroundColor(rv, R.id.event_entry, CalendarPreferences.getPastEventsBackgroundColor(context));
} else if (CalendarPreferences.getEventColorOpacity(context) ==
CalendarPreferences.PREF_EVENT_COLOR_OPACITY_DISABLED) {
rv.setViewVisibility(viewId, View.GONE);
} else {
setBackgroundColor(rv, R.id.event_entry, 0);
}
Expand Down
4 changes: 4 additions & 0 deletions ...ar-widget/src/main/java/com/plusonelabs/calendar/prefs/AppearancePreferencesFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preferen
new BackgroundTransparencyDialog().show(getFragmentManager(),
CalendarPreferences.PREF_PAST_EVENTS_BACKGROUND_COLOR);
}
/* if (preference.getKey().equals(CalendarPreferences.PREF_EVENT_COLOR_OPACITY)) {
new OpacitySlider().show(getFragmentManager(),
CalendarPreferences.PREF_EVENT_COLOR_OPACITY);
} */// TODO: Implement OpacitySlider for variable event color opacity setting
return super.onPreferenceTreeClick(preferenceScreen, preference);
}

Expand Down
8 changes: 8 additions & 0 deletions app/calendar-widget/src/main/java/com/plusonelabs/calendar/prefs/CalendarPreferences.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ public class CalendarPreferences {
public static final int PREF_PAST_EVENTS_BACKGROUND_COLOR_DEFAULT = 0x4affff2b;
public static final String PREF_HIDE_BASED_ON_KEYWORDS = "hideBasedOnKeywords";
static final String KEY_SHARE_EVENTS_FOR_DEBUGGING = "shareEventsForDebugging";
public static final String PREF_EVENT_COLOR_OPACITY = "eventColorOpacity";
public static final String PREF_EVENT_COLOR_OPACITY_DEFAULT = "255";
public static final int PREF_EVENT_COLOR_OPACITY_DISABLED = -1;

private CalendarPreferences() {
// prohibit instantiation
Expand Down Expand Up @@ -175,6 +178,11 @@ public static String getDateFormat(Context context) {
PREF_DATE_FORMAT, PREF_DATE_FORMAT_DEFAULT);
}

public static int getEventColorOpacity(Context context) {
return Integer.valueOf(PreferenceManager.getDefaultSharedPreferences(context)
.getString(PREF_EVENT_COLOR_OPACITY, PREF_EVENT_COLOR_OPACITY_DEFAULT));
}

private static void setBooleanPreference(Context context, String key, boolean value) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
SharedPreferences.Editor editor = prefs.edit();
Expand Down
1 change: 1 addition & 0 deletions app/calendar-widget/src/main/res/layout/event_entry.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<TextView
android:id="@+id/event_entry_color"
style="@style/EventEntryColor"
android:visibility="visible"
android:layout_width="8dp"
android:layout_height="fill_parent"
tools:ignore="SelectableText" />
Expand Down
12 changes: 12 additions & 0 deletions app/calendar-widget/src/main/res/values/arrays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,16 @@
<item>TODAY</item>
<item>YESTERDAY</item>
</string-array>
<string-array name="pref_event_color_opacity_entries">
<item>@string/one_hundred_percent</item>
<item>@string/fifty_percent</item>
<item>@string/zero_percent</item>
<item>@string/disable</item>
</string-array>
<string-array name="pref_event_color_opacity_values" tools:ignore="MissingTranslation">
<item>255</item>
<item>127</item>
<item>0</item>
<item>-1</item>
</string-array>
</resources>
6 changes: 6 additions & 0 deletions app/calendar-widget/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@
<string name="appearance_theme_dark">Light</string>
<string name="appearance_theme_light">Dark</string>
<string name="appearance_theme_white">Black</string>
<string name="appearance_event_color_opacity_desc">Adjust opacity of event color bars</string>
<string name="appearance_event_color_opacity_title">Event color opacity</string>

<!-- Preference header: Event details -->
<string name="event_details_prefs">Event details</string>
Expand Down Expand Up @@ -98,6 +100,10 @@
<string name="ended_today">Ended today</string>
<string name="ended_yesterday">Ended yesterday</string>
<string name="pref_hide_based_on_keywords_title">Hide based on keywords in a title</string>
<string name="one_hundred_percent">100%</string>
<string name="fifty_percent">50%</string>
<string name="zero_percent">0%</string>
<string name="disable">Disable</string>

<!-- Preference header: Feedback -->
<string name="feedback_prefs">Feedback</string>
Expand Down
9 changes: 9 additions & 0 deletions app/calendar-widget/src/main/res/xml/preferences_appearance.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,15 @@
android:key="entryTheme"
android:summary="@string/appearance_entries_theme_desc"
android:title="@string/appearance_entries_theme_title" />

<ListPreference
android:defaultValue="255"
android:entries="@array/pref_event_color_opacity_entries"
android:entryValues="@array/pref_event_color_opacity_values"
android:key="eventColorOpacity"
android:summary="@string/appearance_event_color_opacity_desc"
android:title="@string/appearance_event_color_opacity_title">
</ListPreference>
</PreferenceCategory>

</PreferenceScreen>