wbrawner/Simple-Calendar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add day events to the monthly view

Browse source
This commit is contained in:
tibbi 2017-10-07 18:08:55 +02:00
parent efd77aed41
commit b6c635ffd9
5 changed files with 50 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/kotlin/com/simplemobiletools/calendar/activities/DayActivity.kt
View file

@ -88,7 +88,7 @@ class DayActivity : SimpleActivity(), NavigationListener, ViewPager.OnPageChange
}
private fun getDays(code: String) {
mPagerDays = ArrayList<String>(PREFILLED_DAYS)
mPagerDays = ArrayList(PREFILLED_DAYS)
val today = Formatter.getDateTimeFromCode(code)
for (i in -PREFILLED_DAYS / 2..PREFILLED_DAYS / 2) {
mPagerDays!!.add(Formatter.getDayCodeFromDateTime(today.plusDays(i)))

4
app/src/main/kotlin/com/simplemobiletools/calendar/fragments/DayFragment.kt
View file

@ -85,7 +85,7 @@ class DayFragment : Fragment(), DBHelper.EventUpdateListener, DeleteEventsListen
mListener = listener
}
fun pickDay() {
private fun pickDay() {
activity.setTheme(context.getAppropriateTheme())
val view = getLayoutInflater(arguments).inflate(R.layout.date_picker, null)
val datePicker = view.findViewById(R.id.date_picker) as DatePicker
@ -135,7 +135,7 @@ class DayFragment : Fragment(), DBHelper.EventUpdateListener, DeleteEventsListen
}
mHolder.day_events.adapter = eventsAdapter
DividerItemDecoration(context, DividerItemDecoration.VERTICAL).apply {
setDrawable(context.resources.getDrawable(com.simplemobiletools.commons.R.drawable.divider))
setDrawable(context.resources.getDrawable(R.drawable.divider))
mHolder.day_events.addItemDecoration(this)
}
}

36
app/src/main/kotlin/com/simplemobiletools/calendar/views/DayMonthlyView.kt
View file

@ -13,7 +13,9 @@ import android.widget.TextView
import com.simplemobiletools.calendar.R
import com.simplemobiletools.calendar.extensions.config
import com.simplemobiletools.calendar.helpers.LOW_ALPHA
import com.simplemobiletools.calendar.helpers.MEDIUM_ALPHA
import com.simplemobiletools.calendar.models.DayMonthly
import com.simplemobiletools.calendar.models.Event
import com.simplemobiletools.commons.extensions.adjustAlpha
import com.simplemobiletools.commons.extensions.getContrastColor
import com.simplemobiletools.commons.extensions.onGlobalLayout
@ -23,6 +25,8 @@ class DayMonthlyView(context: Context, attrs: AttributeSet, defStyle: Int) : Lin
private var textColor = context.config.textColor
private var weakTextColor = textColor.adjustAlpha(LOW_ALPHA)
private var res = context.resources
private var dividerMargin = res.displayMetrics.density.toInt()
init {
orientation = LinearLayout.VERTICAL
@ -31,6 +35,14 @@ class DayMonthlyView(context: Context, attrs: AttributeSet, defStyle: Int) : Lin
fun setDay(day: DayMonthly) {
removeAllViews()
addDayNumber(day)
day.dayEvents.forEach {
addDayEvent(it)
}
}
private fun addDayNumber(day: DayMonthly) {
(View.inflate(context, R.layout.day_monthly_item_view, null) as TextView).apply {
setTextColor(if (day.isThisMonth) textColor else weakTextColor)
text = day.value.toString()
@ -40,19 +52,35 @@ class DayMonthlyView(context: Context, attrs: AttributeSet, defStyle: Int) : Lin
if (day.isToday) {
val primaryColor = context.config.primaryColor
setTextColor(primaryColor.getContrastColor())
setTextColor(primaryColor.getContrastColor().adjustAlpha(MEDIUM_ALPHA))
onGlobalLayout {
val height = this@apply.height
if (height > 0) {
val baseDrawable = context.resources.getDrawable(R.drawable.monthly_today_circle)
val baseDrawable = res.getDrawable(R.drawable.monthly_today_circle)
val bitmap = (baseDrawable as BitmapDrawable).bitmap
val scaledDrawable = BitmapDrawable(resources, Bitmap.createScaledBitmap(bitmap, height, height, true))
scaledDrawable.setColorFilter(primaryColor, PorterDuff.Mode.SRC_IN)
val scaledDrawable = BitmapDrawable(res, Bitmap.createScaledBitmap(bitmap, height, height, true))
scaledDrawable.mutate().setColorFilter(primaryColor, PorterDuff.Mode.SRC_IN)
background = scaledDrawable
}
}
}
}
}
private fun addDayEvent(event: Event) {
val backgroundDrawable = res.getDrawable(R.drawable.day_monthly_event_background)
backgroundDrawable.mutate().setColorFilter(event.color, PorterDuff.Mode.SRC_IN)
val eventLayoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
eventLayoutParams.setMargins(dividerMargin, dividerMargin, dividerMargin, dividerMargin)
(View.inflate(context, R.layout.day_monthly_item_view, null) as TextView).apply {
setTextColor(event.color.getContrastColor().adjustAlpha(MEDIUM_ALPHA))
text = event.title
gravity = Gravity.START
background = backgroundDrawable
layoutParams = eventLayoutParams
addView(this)
}
}
}

8
app/src/main/res/drawable/day_monthly_event_background.xml Normal file
View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="4dp"/>
<solid android:color="@android:color/white"/>
</shape>

8
app/src/main/res/layout/day_monthly_item_view.xml
View file

@ -5,5 +5,11 @@
android:id="@+id/day_monthly_number_id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/smaller_text_size"
android:layout_marginLeft="@dimen/tiny_margin"
android:layout_marginRight="@dimen/tiny_margin"
android:ellipsize="none"
android:maxLines="1"
android:paddingLeft="@dimen/tiny_margin"
android:paddingRight="@dimen/tiny_margin"
android:textSize="@dimen/small_text_size"
tools:text="1"/>