use the new way of marking events and today at widget config too
This commit is contained in:
parent
17ae73da68
commit
3c51e933f9
|
@ -5,9 +5,9 @@ import android.appwidget.AppWidgetManager
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.content.res.Resources
|
import android.content.res.Resources
|
||||||
import android.graphics.Color
|
import android.graphics.Color
|
||||||
|
import android.graphics.Paint
|
||||||
import android.graphics.PorterDuff
|
import android.graphics.PorterDuff
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.support.v7.app.AppCompatActivity
|
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import android.widget.SeekBar
|
import android.widget.SeekBar
|
||||||
import android.widget.TextView
|
import android.widget.TextView
|
||||||
|
@ -26,7 +26,7 @@ import kotlinx.android.synthetic.main.widget_config_monthly.*
|
||||||
import org.joda.time.DateTime
|
import org.joda.time.DateTime
|
||||||
import yuku.ambilwarna.AmbilWarnaDialog
|
import yuku.ambilwarna.AmbilWarnaDialog
|
||||||
|
|
||||||
class WidgetMonthlyConfigureActivity : AppCompatActivity(), MonthlyCalendar {
|
class WidgetMonthlyConfigureActivity : SimpleActivity(), MonthlyCalendar {
|
||||||
lateinit var mRes: Resources
|
lateinit var mRes: Resources
|
||||||
private var mDays: List<Day>? = null
|
private var mDays: List<Day>? = null
|
||||||
private var mPackageName = ""
|
private var mPackageName = ""
|
||||||
|
@ -177,23 +177,26 @@ class WidgetMonthlyConfigureActivity : AppCompatActivity(), MonthlyCalendar {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
val todayCircle = resources.getDrawable(R.drawable.circle_empty)
|
||||||
|
todayCircle.setColorFilter(mTextColor.adjustAlpha(HIGH_ALPHA), PorterDuff.Mode.SRC_IN)
|
||||||
|
|
||||||
for (i in 0..len - 1) {
|
for (i in 0..len - 1) {
|
||||||
val day = mDays!![i]
|
val day = mDays!![i]
|
||||||
var curTextColor = mWeakTextColor
|
var curTextColor = mWeakTextColor
|
||||||
var curTextSize = mDayTextSize
|
|
||||||
|
|
||||||
if (day.isThisMonth) {
|
if (day.isThisMonth) {
|
||||||
curTextColor = mTextColor
|
curTextColor = mTextColor
|
||||||
}
|
}
|
||||||
|
|
||||||
if (day.isToday) {
|
|
||||||
curTextSize = mTodayTextSize
|
|
||||||
}
|
|
||||||
|
|
||||||
(findViewById(mRes.getIdentifier("day_$i", "id", mPackageName)) as TextView).apply {
|
(findViewById(mRes.getIdentifier("day_$i", "id", mPackageName)) as TextView).apply {
|
||||||
text = day.value.toString()
|
text = day.value.toString()
|
||||||
setTextColor(curTextColor)
|
setTextColor(curTextColor)
|
||||||
textSize = curTextSize
|
|
||||||
|
if (day.hasEvent)
|
||||||
|
paintFlags = paintFlags or Paint.UNDERLINE_TEXT_FLAG
|
||||||
|
|
||||||
|
if (day.isToday)
|
||||||
|
background = todayCircle
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -180,8 +180,8 @@ class MonthFragment : Fragment(), MonthlyCalendar {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
val eventBackground = resources.getDrawable(R.drawable.circle_empty)
|
val todayCircle = resources.getDrawable(R.drawable.circle_empty)
|
||||||
eventBackground.setColorFilter(mTextColor.adjustAlpha(HIGH_ALPHA), PorterDuff.Mode.SRC_IN)
|
todayCircle.setColorFilter(mTextColor.adjustAlpha(HIGH_ALPHA), PorterDuff.Mode.SRC_IN)
|
||||||
|
|
||||||
for (i in 0..len - 1) {
|
for (i in 0..len - 1) {
|
||||||
val day = days[i]
|
val day = days[i]
|
||||||
|
@ -200,7 +200,7 @@ class MonthFragment : Fragment(), MonthlyCalendar {
|
||||||
paintFlags = paintFlags or Paint.UNDERLINE_TEXT_FLAG
|
paintFlags = paintFlags or Paint.UNDERLINE_TEXT_FLAG
|
||||||
|
|
||||||
if (day.isToday)
|
if (day.isToday)
|
||||||
background = eventBackground
|
background = todayCircle
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<RelativeLayout
|
<RelativeLayout
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:id="@+id/config_list_holder"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_centerHorizontal="true"
|
android:layout_centerHorizontal="true"
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<RelativeLayout
|
<RelativeLayout
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:id="@+id/config_holder"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_centerHorizontal="true"
|
android:layout_centerHorizontal="true"
|
||||||
|
|
Loading…
Reference in New Issue