fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-02-24 15:39:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

adjustment to events list view for events lasting over midnight

Browse Source
This commit is contained in:
tibbi 2016-11-03 20:54:01 +01:00
parent c826ef12ac
commit 792f972c96
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventsListAdapter.kt
View File

@ -14,7 +14,7 @@ import com.simplemobiletools.calendar.models.ListItem
import com.simplemobiletools.calendar.models.ListSection import com.simplemobiletools.calendar.models.ListSection
import kotlinx.android.synthetic.main.event_item.view.* import kotlinx.android.synthetic.main.event_item.view.*
class EventsListAdapter(context: Context, val mEvents: List<ListItem>) : BaseAdapter() { class EventsListAdapter(val context: Context, val mEvents: List<ListItem>) : BaseAdapter() {
val ITEM_EVENT = 0 val ITEM_EVENT = 0
val ITEM_HEADER = 1 val ITEM_HEADER = 1
@ -63,6 +63,12 @@ class EventsListAdapter(context: Context, val mEvents: List<ListItem>) : BaseAda
} else { } else {
end?.text = Formatter.getTime(item.endTS) end?.text = Formatter.getTime(item.endTS)
end?.visibility = View.VISIBLE end?.visibility = View.VISIBLE
val startCode = Formatter.getDayCodeFromTS(item.startTS)
val endCode = Formatter.getDayCodeFromTS(item.endTS)
if (startCode != endCode) {
end?.append(" (${Formatter.getEventDate(context, endCode)})")
}
} }
val currTextColor = if (item.startTS <= mNow) mOrangeColor else mGreyColor val currTextColor = if (item.startTS <= mNow) mOrangeColor else mGreyColor

3
app/src/main/res/layout/event_list_item.xml
View File

@ -7,6 +7,7 @@
android:background="@drawable/event_item_background" android:background="@drawable/event_item_background"
android:paddingBottom="@dimen/event_padding" android:paddingBottom="@dimen/event_padding"
android:paddingLeft="@dimen/activity_margin" android:paddingLeft="@dimen/activity_margin"
android:paddingRight="@dimen/activity_margin"
android:paddingTop="@dimen/small_padding"> android:paddingTop="@dimen/small_padding">
<TextView <TextView
@ -40,7 +41,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/event_item_title" android:layout_below="@+id/event_item_title"
android:layout_marginLeft="@dimen/activity_margin" android:layout_marginLeft="@dimen/activity_margin"
android:layout_toRightOf="@+id/event_item_start" android:layout_toRightOf="@+id/event_item_end"
android:alpha=".4" android:alpha=".4"
android:maxLines="1" android:maxLines="1"
android:text="Event description" android:text="Event description"