Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 767b60f2 authored by Jonas Häusler's avatar Jonas Häusler Committed by Michael Bestas
Browse files

fix calendar and organizer text colors being barely visible sometimes 

`setTextCommon(...)` changes the text color so its legible when being
displayed on top of the event color, but neither the calendar name nor
the organizer name is displayed on top of the event color.

Change-Id: I741acfb07c7399498c775fe33c44acfd02a2a05d
parent 86ed71da

app/src/main/java/com/android/calendar/EventInfoFragment.java

+7 −3
Original line number Diff line number Diff line
@@ -366,6 +366,8 @@ public class EventInfoFragment extends DialogFragment implements OnCheckedChange 
    private TextView mWhenDateTime;

    private TextView mWhere;

    private TextView mWhenRepeat;

    private TextView mEventOrganizer;

    private TextView mCalendarName;

    private ExpandableTextView mDesc;

    private AttendeesView mLongAttendees;

    private Button emailAttendeesButton;
@@ -791,6 +793,8 @@ public class EventInfoFragment extends DialogFragment implements OnCheckedChange 
        mWhenDateTime = (TextView) mView.findViewById(R.id.when_datetime);

        mWhere = (TextView) mView.findViewById(R.id.where);

        mWhenRepeat = (TextView) mView.findViewById(R.id.when_repeat);

        mEventOrganizer = (TextView) mView.findViewById(R.id.organizer);

        mCalendarName = (TextView) mView.findViewById(R.id.calendar_name);



        mDesc =  mView.findViewById(R.id.description);

        mHeadlines = mView.findViewById(R.id.event_info_headline);
@@ -967,7 +971,7 @@ public class EventInfoFragment extends DialogFragment implements OnCheckedChange 
                            mEventOrganizerDisplayName = name;

                            if (!mIsOrganizer) {

                                setVisibilityCommon(view, R.id.organizer_container, View.VISIBLE);

                                setTextCommon(view, R.id.organizer, mEventOrganizerDisplayName);

                                mEventOrganizer.setText(mEventOrganizerDisplayName);

                            }

                        }

                    }
@@ -1819,7 +1823,7 @@ public class EventInfoFragment extends DialogFragment implements OnCheckedChange 
            }



            if (!mIsOrganizer && !TextUtils.isEmpty(mEventOrganizerDisplayName)) {

                setTextCommon(view, R.id.organizer, mEventOrganizerDisplayName);

                mEventOrganizer.setText(mEventOrganizerDisplayName);

                setVisibilityCommon(view, R.id.organizer_container, View.VISIBLE);

            } else {

                setVisibilityCommon(view, R.id.organizer_container, View.GONE);
@@ -2496,7 +2500,7 @@ public class EventInfoFragment extends DialogFragment implements OnCheckedChange 
                    }



                    setVisibilityCommon(mView, R.id.calendar_container, View.VISIBLE);

                    setTextCommon(mView, R.id.calendar_name, sb);

                    mCalendarName.setText(sb);

                    break;

            }

            cursor.close();

app/src/main/res/values/colors.xml

+3 −3
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ 
    <color name="event_info_headline_color">#FFFFFFFF</color>

    <color name="event_info_headline_transparent_color">#B3FFFFFF</color>

    <color name="event_info_headline_link_color">#FFFFFFFF</color>

    <color name="event_info_organizer_color">#FF666666</color>

    <color name="event_info_organizer_color">#99000000</color>

    <color name="event_info_description_color">#FF666666</color>

    <color name="event_info_body_color">#FF666666</color>

    <color name="event_info_label_color">#FF999999</color>
@@ -283,7 +283,7 @@ 
    <color name="event_info_headline_color_black">#FFFFFFFF</color>

    <color name="event_info_headline_transparent_color_black">#B3FFFFFF</color>

    <color name="event_info_headline_link_color_black">#FFFFFFFF</color>

    <color name="event_info_organizer_color_black">#757575</color>

    <color name="event_info_organizer_color_black">#DEFFFFFF</color>

    <color name="event_info_description_color_black">#bdbdbd</color>

    <color name="event_info_body_color_black">#bdbdbd</color>

    <color name="event_info_label_color_black">#ffffff</color>
@@ -388,7 +388,7 @@ 
    <color name="event_info_headline_color_dark">#FFFFFFFF</color>

    <color name="event_info_headline_transparent_color_dark">#B3FFFFFF</color>

    <color name="event_info_headline_link_color_dark">#FFFFFFFF</color>

    <color name="event_info_organizer_color_dark">#757575</color>

    <color name="event_info_organizer_color_dark">#DEFFFFFF</color>

    <color name="event_info_description_color_dark">#bdbdbd</color>

    <color name="event_info_body_color_dark">#bdbdbd</color>

    <color name="event_info_label_color_dark">#ffffff</color>