diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/DayEventsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/DayEventsAdapter.kt index 5f5446217..cfd368269 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/DayEventsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/DayEventsAdapter.kt @@ -71,7 +71,7 @@ class DayEventsAdapter(activity: SimpleActivity, val events: ArrayList, r event_item_description.text = if (replaceDescriptionWithLocation) event.location else event.description event_item_start.text = if (event.getIsAllDay()) allDayString else Formatter.getTimeFromTS(context, event.startTS) event_item_end.beInvisibleIf(event.startTS == event.endTS) - event_item_color.applyColorFilter(event.color) + event_item_color_bar.background.applyColorFilter(event.color) if (event.startTS != event.endTS) { val startCode = Formatter.getDayCodeFromTS(event.startTS) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventListAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventListAdapter.kt index dde134288..4ebb1d9d1 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventListAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventListAdapter.kt @@ -136,7 +136,7 @@ class EventListAdapter(activity: SimpleActivity, var listItems: ArrayList + + + + + + + + + diff --git a/app/src/main/res/layout/event_item_day_view.xml b/app/src/main/res/layout/event_item_day_view.xml index 946492adf..a33b7c948 100644 --- a/app/src/main/res/layout/event_item_day_view.xml +++ b/app/src/main/res/layout/event_item_day_view.xml @@ -18,10 +18,22 @@ android:paddingBottom="@dimen/medium_margin" android:paddingTop="@dimen/medium_margin"> + + @@ -30,6 +42,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_below="@+id/event_item_start" + android:layout_toRightOf="@+id/event_item_color_bar" android:text="15:00" android:textSize="@dimen/day_text_size"/> @@ -38,7 +51,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/activity_margin" - android:layout_toLeftOf="@+id/event_item_color" android:layout_toRightOf="@+id/event_item_start" android:ellipsize="end" android:maxLines="1" @@ -52,7 +64,6 @@ android:layout_height="wrap_content" android:layout_below="@+id/event_item_title" android:layout_marginLeft="@dimen/activity_margin" - android:layout_toLeftOf="@+id/event_item_color" android:layout_toRightOf="@+id/event_item_end" android:ellipsize="end" android:maxLines="1" @@ -60,16 +71,5 @@ android:textSize="@dimen/day_text_size" tools:text="Event description"/> - - diff --git a/app/src/main/res/layout/event_list_item.xml b/app/src/main/res/layout/event_list_item.xml index a0fb32fb9..61b2902c5 100644 --- a/app/src/main/res/layout/event_list_item.xml +++ b/app/src/main/res/layout/event_list_item.xml @@ -16,14 +16,25 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingBottom="@dimen/medium_margin" - android:paddingLeft="@dimen/activity_margin" android:paddingRight="@dimen/activity_margin" android:paddingTop="@dimen/small_margin"> + + @@ -32,6 +43,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_below="@+id/event_item_start" + android:layout_toRightOf="@+id/event_item_color_bar" android:includeFontPadding="false" android:text="15:00" android:textSize="@dimen/day_text_size"/> @@ -41,7 +53,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/activity_margin" - android:layout_toLeftOf="@+id/event_item_color" android:layout_toRightOf="@+id/event_item_start" android:ellipsize="end" android:maxLines="1" @@ -55,7 +66,6 @@ android:layout_height="wrap_content" android:layout_below="@+id/event_item_title" android:layout_marginLeft="@dimen/activity_margin" - android:layout_toLeftOf="@+id/event_item_color" android:layout_toRightOf="@+id/event_item_end" android:ellipsize="end" android:includeFontPadding="false" @@ -64,16 +74,5 @@ android:textSize="@dimen/day_text_size" tools:text="Event description"/> - - diff --git a/app/src/main/res/layout/event_list_item_simple.xml b/app/src/main/res/layout/event_list_item_simple.xml index 83deda7dc..e20b4eeb8 100644 --- a/app/src/main/res/layout/event_list_item_simple.xml +++ b/app/src/main/res/layout/event_list_item_simple.xml @@ -16,14 +16,25 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingBottom="@dimen/medium_margin" - android:paddingLeft="@dimen/activity_margin" android:paddingRight="@dimen/activity_margin" android:paddingTop="@dimen/small_margin"> + + @@ -32,7 +43,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/activity_margin" - android:layout_toLeftOf="@+id/event_item_color" android:layout_toRightOf="@+id/event_item_start" android:ellipsize="end" android:maxLines="1" @@ -40,16 +50,5 @@ android:textSize="@dimen/day_text_size" tools:text="Event title"/> - - diff --git a/app/src/main/res/layout/event_list_item_widget.xml b/app/src/main/res/layout/event_list_item_widget.xml index 042a69ae4..013662606 100644 --- a/app/src/main/res/layout/event_list_item_widget.xml +++ b/app/src/main/res/layout/event_list_item_widget.xml @@ -7,20 +7,31 @@ android:layout_height="wrap_content" android:layout_marginBottom="@dimen/medium_margin"> + + + android:layout_toRightOf="@+id/event_item_color_bar" + android:text="13:00" + android:textSize="@dimen/day_text_size"/> @@ -30,7 +41,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/normal_margin" - android:layout_toLeftOf="@+id/event_item_color" android:layout_toRightOf="@+id/event_item_start" android:ellipsize="end" android:maxLines="1" @@ -44,7 +54,6 @@ android:layout_height="wrap_content" android:layout_below="@+id/event_item_title" android:layout_marginLeft="@dimen/normal_margin" - android:layout_toLeftOf="@+id/event_item_color" android:layout_toRightOf="@+id/event_item_end" android:ellipsize="end" android:includeFontPadding="false" @@ -53,15 +62,4 @@ android:textSize="@dimen/day_text_size" tools:text="Event description"/> - - diff --git a/app/src/main/res/layout/event_list_item_widget_simple.xml b/app/src/main/res/layout/event_list_item_widget_simple.xml index 64cd9e244..1dd7dc437 100644 --- a/app/src/main/res/layout/event_list_item_widget_simple.xml +++ b/app/src/main/res/layout/event_list_item_widget_simple.xml @@ -7,11 +7,22 @@ android:layout_height="wrap_content" android:layout_marginBottom="@dimen/medium_margin"> + + @@ -20,7 +31,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/normal_margin" - android:layout_toLeftOf="@+id/event_item_color" android:layout_toRightOf="@+id/event_item_start" android:ellipsize="end" android:maxLines="1" @@ -28,15 +38,4 @@ android:textSize="@dimen/day_text_size" tools:text="Event title"/> - - diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 7975ac94d..7cd978d17 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -25,4 +25,7 @@ 22sp 8sp + + 4dp + 100dp