diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SimpleActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SimpleActivity.kt index 5d6dd50d4..734270507 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SimpleActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SimpleActivity.kt @@ -3,7 +3,6 @@ package com.simplemobiletools.calendar.activities import android.os.Bundle import android.support.v7.app.AppCompatActivity import android.view.MenuItem - import com.simplemobiletools.calendar.Config import com.simplemobiletools.calendar.R diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventsListAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventsListAdapter.kt index 048792eb6..ba0dbfe40 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventsListAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventsListAdapter.kt @@ -20,10 +20,17 @@ class EventsListAdapter(context: Context, val mEvents: List) : BaseAda private val mInflater: LayoutInflater private var mTopDivider: Drawable? = null + private var mNow = (System.currentTimeMillis() / 1000).toInt() + private var mOrangeColor = 0 + private var mGreyColor = 0 + private var mTodayDate = "" init { mInflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater mTopDivider = context.resources.getDrawable(R.drawable.divider) + mOrangeColor = context.resources.getColor(R.color.colorPrimary) + val mTodayCode = Formatter.getDayCodeFromTS(mNow) + mTodayDate = Formatter.getEventDate(context, mTodayCode) } override fun getView(position: Int, convertView: View?, parent: ViewGroup): View { @@ -57,11 +64,22 @@ class EventsListAdapter(context: Context, val mEvents: List) : BaseAda end?.text = Formatter.getTime(item.endTS) end?.visibility = View.VISIBLE } + + val currTextColor = if (item.startTS <= mNow) mOrangeColor else mGreyColor + start?.setTextColor(currTextColor) + end?.setTextColor(currTextColor) + title.setTextColor(currTextColor) + description?.setTextColor(currTextColor) } } else { val item = mEvents[position] as ListSection viewHolder.title.text = item.title viewHolder.title.setCompoundDrawablesWithIntrinsicBounds(null, if (position == 0) null else mTopDivider, null, null) + + if (mGreyColor == 0) + mGreyColor = viewHolder.title.currentTextColor + + viewHolder.title.setTextColor(if (item.title == mTodayDate) mOrangeColor else mGreyColor) } return view