diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt index 442c577fa..c22f2a341 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt @@ -299,7 +299,7 @@ fun Context.addDayNumber(rawTextColor: Int, day: DayMonthly, linearLayout: Linea } private fun addTodaysBackground(textView: TextView, res: Resources, dayLabelHeight: Int, mPrimaryColor: Int) = - textView.addResizedBackgroundDrawable(res, dayLabelHeight, mPrimaryColor) + textView.addResizedBackgroundDrawable(res, dayLabelHeight, mPrimaryColor, R.drawable.monthly_today_circle) fun Context.addDayEvents(day: DayMonthly, linearLayout: LinearLayout, res: Resources, dividerMargin: Int) { day.dayEvents.forEach { diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/TextView.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/TextView.kt index 066ff3146..ee457da0d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/TextView.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/extensions/TextView.kt @@ -5,10 +5,9 @@ import android.graphics.Bitmap import android.graphics.PorterDuff import android.graphics.drawable.BitmapDrawable import android.widget.TextView -import com.simplemobiletools.calendar.R -fun TextView.addResizedBackgroundDrawable(res: Resources, drawableHeight: Int, primaryColor: Int) { - val baseDrawable = res.getDrawable(R.drawable.monthly_today_circle) +fun TextView.addResizedBackgroundDrawable(res: Resources, drawableHeight: Int, primaryColor: Int, drawableId: Int) { + val baseDrawable = res.getDrawable(drawableId) val bitmap = (baseDrawable as BitmapDrawable).bitmap val scaledDrawable = BitmapDrawable(res, Bitmap.createScaledBitmap(bitmap, drawableHeight, drawableHeight, true)) scaledDrawable.mutate().setColorFilter(primaryColor, PorterDuff.Mode.SRC_IN) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragment.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragment.kt index cdac73bc5..4c04a9223 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragment.kt @@ -170,7 +170,7 @@ class MonthFragment : Fragment(), MonthlyCalendar { for (i in 0..5) { (mHolder.findViewById(mRes.getIdentifier("week_num_$i", "id", mPackageName)) as TextView).apply { - text = "${days[i * 7 + 3].weekOfYear}:" + text = "${days[i * 7 + 3].weekOfYear}:" // fourth day of the week matters setTextColor(mTextColor) beVisibleIf(displayWeekNumbers) } diff --git a/app/src/main/res/layout/day_monthly_item_view.xml b/app/src/main/res/layout/day_monthly_item_view.xml index 16d5bc61c..33c9f75d0 100644 --- a/app/src/main/res/layout/day_monthly_item_view.xml +++ b/app/src/main/res/layout/day_monthly_item_view.xml @@ -1,5 +1,5 @@ -