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

Commit fd2eb6fe authored by Sayantan Roychowdhury's avatar Sayantan Roychowdhury
Browse files

Merge branch '1382-q-text_color' into 'v1-q' 

Issue 1382: Consistent text color for inactive edit text box

See merge request !40
parents 5745a52f b5cc62a1

res/layout/edit_event_all.xml

+3 −0
Original line number Diff line number Diff line
@@ -410,6 +410,7 @@ 
            android:layout_height="wrap_content"

            android:layout_marginStart="12dp"

            android:layout_marginEnd="32dp"

            android:textColorHint="@color/edit_event_hint_text_color"

            app:layout_constraintEnd_toEndOf="parent"

            app:layout_constraintStart_toEndOf="@+id/attendees_icon"

            app:layout_constraintTop_toBottomOf="@+id/view2">
@@ -441,6 +442,7 @@ 
            android:layout_height="wrap_content"

            android:layout_marginStart="12dp"

            android:layout_marginEnd="32dp"

            android:textColorHint="@color/edit_event_hint_text_color"

            app:layout_constraintEnd_toEndOf="parent"

            app:layout_constraintStart_toEndOf="@+id/where_icon"

            app:layout_constraintTop_toBottomOf="@+id/add_attendees_row">
@@ -473,6 +475,7 @@ 
            android:layout_height="wrap_content"

            android:layout_marginStart="12dp"

            android:layout_marginEnd="32dp"

            android:textColorHint="@color/edit_event_hint_text_color"

            app:layout_constraintEnd_toEndOf="parent"

            app:layout_constraintStart_toEndOf="@+id/description_icon"

            app:layout_constraintTop_toBottomOf="@+id/where_row">

res/values-night-v21/colors.xml

+3 −0
Original line number Diff line number Diff line
@@ -19,4 +19,7 @@ 
    <color name="calendar_grid_line_inner_horizontal_color">#1fffffff</color>

    <color name="calendar_grid_line_inner_vertical_color">#1fffffff</color>

    <color name="month_grid_lines">#1fffffff</color>



    <!-- Hint text color of event edit screen -->

    <color name="edit_event_hint_text_color">#898989</color>

</resources>
 
 No newline at end of file

res/values/colors.xml

+2 −0
Original line number Diff line number Diff line
@@ -143,6 +143,8 @@ 
    <color name="agenda_selected_text_color">@color/color_default_primary_text</color>

    <!-- Text color of the "new event" hint in day and week views -->

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

    <!-- Hint text color of event edit screen -->

    <color name="edit_event_hint_text_color">#9e9e9e</color>



    <!-- Text color of a clicked event in the day/week view -->

    <color name="day_event_clicked_background_color">@color/colorAccent</color>