fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-02-19 13:10:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove HIGH_ALPHA modifier, use full alpha

Browse Source
This commit is contained in:
tibbi 2017-01-03 23:43:38 +01:00
parent eb9c69ad31
commit 53651ce6bb
11 changed files with 18 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/kotlin/com/simplemobiletools/calendar/activities/WidgetListConfigureActivity.kt
View File

@ -12,7 +12,6 @@ import com.simplemobiletools.calendar.R
import com.simplemobiletools.calendar.adapters.EventListWidgetAdapterOld
import com.simplemobiletools.calendar.helpers.Config
import com.simplemobiletools.calendar.helpers.Formatter
import com.simplemobiletools.calendar.helpers.HIGH_ALPHA
import com.simplemobiletools.calendar.helpers.MyWidgetListProvider
import com.simplemobiletools.calendar.models.ListEvent
import com.simplemobiletools.calendar.models.ListItem
@ -130,7 +129,7 @@ class WidgetListConfigureActivity : AppCompatActivity() {
}
private fun updateTextColors() {
mTextColor = mTextColorWithoutTransparency.adjustAlpha(HIGH_ALPHA)
mTextColor = mTextColorWithoutTransparency
mEventsAdapter?.setTextColor(mTextColor)
config_text_color.setBackgroundColor(mTextColor)
config_save.setTextColor(mTextColor)

16
app/src/main/kotlin/com/simplemobiletools/calendar/activities/WidgetMonthlyConfigureActivity.kt
View File

@ -8,13 +8,13 @@ import android.graphics.Color
import android.graphics.Paint
import android.graphics.PorterDuff
import android.os.Bundle
import android.support.v7.app.AppCompatActivity
import android.view.View
import android.widget.SeekBar
import android.widget.TextView
import com.simplemobiletools.calendar.MonthlyCalendarImpl
import com.simplemobiletools.calendar.R
import com.simplemobiletools.calendar.helpers.Config
import com.simplemobiletools.calendar.helpers.HIGH_ALPHA
import com.simplemobiletools.calendar.helpers.LOW_ALPHA
import com.simplemobiletools.calendar.helpers.MyWidgetMonthlyProvider
import com.simplemobiletools.calendar.interfaces.MonthlyCalendar
@ -26,7 +26,7 @@ import kotlinx.android.synthetic.main.widget_config_monthly.*
import org.joda.time.DateTime
import yuku.ambilwarna.AmbilWarnaDialog
class WidgetMonthlyConfigureActivity : SimpleActivity(), MonthlyCalendar {
class WidgetMonthlyConfigureActivity : AppCompatActivity(), MonthlyCalendar {
lateinit var mRes: Resources
private var mDays: List<Day>? = null
private var mPackageName = ""
@ -38,8 +38,6 @@ class WidgetMonthlyConfigureActivity : SimpleActivity(), MonthlyCalendar {
private var mTextColorWithoutTransparency = 0
private var mTextColor = 0
private var mWeakTextColor = 0
private var mDayTextSize = 0f
private var mTodayTextSize = 0f
public override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
@ -62,11 +60,6 @@ class WidgetMonthlyConfigureActivity : SimpleActivity(), MonthlyCalendar {
private fun initVariables() {
mRes = resources
mDayTextSize = mRes.getDimension(R.dimen.day_text_size)
mDayTextSize /= mRes.displayMetrics.density
mTodayTextSize = mRes.getDimension(R.dimen.today_text_size)
mTodayTextSize /= mRes.displayMetrics.density
val config = Config.newInstance(this)
mTextColorWithoutTransparency = config.widgetTextColor
@ -143,7 +136,7 @@ class WidgetMonthlyConfigureActivity : SimpleActivity(), MonthlyCalendar {
}
private fun updateTextColors() {
mTextColor = mTextColorWithoutTransparency.adjustAlpha(HIGH_ALPHA)
mTextColor = mTextColorWithoutTransparency
mWeakTextColor = mTextColorWithoutTransparency.adjustAlpha(LOW_ALPHA)
top_left_arrow.drawable.mutate().setColorFilter(mTextColor, PorterDuff.Mode.SRC_ATOP)
@ -178,7 +171,7 @@ class WidgetMonthlyConfigureActivity : SimpleActivity(), MonthlyCalendar {
}
val todayCircle = resources.getDrawable(R.drawable.circle_empty)
todayCircle.setColorFilter(mTextColor.adjustAlpha(HIGH_ALPHA), PorterDuff.Mode.SRC_IN)
todayCircle.setColorFilter(mTextColor, PorterDuff.Mode.SRC_IN)
for (i in 0..len - 1) {
val day = mDays!![i]
@ -231,7 +224,6 @@ class WidgetMonthlyConfigureActivity : SimpleActivity(), MonthlyCalendar {
private fun updateLabels() {
for (i in 0..6) {
(findViewById(mRes.getIdentifier("label_$i", "id", mPackageName)) as TextView).apply {
textSize = mDayTextSize
setTextColor(mTextColor)
}
}

7
app/src/main/kotlin/com/simplemobiletools/calendar/adapters/EventListWidgetAdapter.kt
View File

@ -7,13 +7,14 @@ import android.widget.RemoteViews
import android.widget.RemoteViewsService
import com.simplemobiletools.calendar.R
import com.simplemobiletools.calendar.R.id.event_item_holder
import com.simplemobiletools.calendar.helpers.*
import com.simplemobiletools.calendar.helpers.Config
import com.simplemobiletools.calendar.helpers.DBHelper
import com.simplemobiletools.calendar.helpers.EVENT_ID
import com.simplemobiletools.calendar.helpers.Formatter
import com.simplemobiletools.calendar.models.Event
import com.simplemobiletools.calendar.models.ListEvent
import com.simplemobiletools.calendar.models.ListItem
import com.simplemobiletools.calendar.models.ListSection
import com.simplemobiletools.commons.extensions.adjustAlpha
import org.joda.time.DateTime
import java.util.*
import kotlin.comparisons.compareBy
@ -27,7 +28,7 @@ class EventListWidgetAdapter(val context: Context, val intent: Intent) : RemoteV
val textColor: Int
init {
textColor = Config.newInstance(context).widgetTextColor.adjustAlpha(HIGH_ALPHA)
textColor = Config.newInstance(context).widgetTextColor
appWidgetId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID)
events = ArrayList<ListItem>()
}

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

@ -20,7 +20,6 @@ import com.simplemobiletools.calendar.helpers.*
import com.simplemobiletools.calendar.helpers.Formatter
import com.simplemobiletools.calendar.interfaces.NavigationListener
import com.simplemobiletools.calendar.models.Event
import com.simplemobiletools.commons.extensions.adjustAlpha
import com.simplemobiletools.commons.extensions.setupDialogStuff
import com.simplemobiletools.commons.views.RecyclerViewDivider
import kotlinx.android.synthetic.main.fragment_day.view.*
@ -64,8 +63,7 @@ class DayFragment : Fragment(), DBHelper.EventUpdateListener, DBHelper.GetEvents
}
private fun setupButtons() {
val baseColor = mConfig.textColor
mTextColor = baseColor.adjustAlpha(HIGH_ALPHA)
mTextColor = mConfig.textColor
mHolder.apply {
top_left_arrow.drawable.mutate().setColorFilter(mTextColor, PorterDuff.Mode.SRC_ATOP)

14
app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragment.kt
View File

@ -30,13 +30,9 @@ import kotlinx.android.synthetic.main.top_navigation.view.*
import org.joda.time.DateTime
class MonthFragment : Fragment(), MonthlyCalendar {
private var mDayTextSize = 0f
private var mTodayTextSize = 0f
private var mPackageName = ""
private var mTextColor = 0
private var mWeakTextColor = 0
private var mTextColorWithEvent = 0
private var mWeakTextColorWithEvent = 0
private var mSundayFirst = false
private var mDayCode = ""
@ -59,8 +55,6 @@ class MonthFragment : Fragment(), MonthlyCalendar {
setupButtons()
mPackageName = activity.packageName
mDayTextSize = mRes.getDimension(R.dimen.day_text_size) / mRes.displayMetrics.density
mTodayTextSize = mRes.getDimension(R.dimen.today_text_size) / mRes.displayMetrics.density
setupLabels()
mCalendar = MonthlyCalendarImpl(this, context)
@ -98,11 +92,8 @@ class MonthFragment : Fragment(), MonthlyCalendar {
private fun setupButtons() {
val baseColor = mConfig.textColor
val primaryColor = mConfig.primaryColor
mTextColor = baseColor.adjustAlpha(HIGH_ALPHA)
mTextColorWithEvent = primaryColor.adjustAlpha(HIGH_ALPHA)
mTextColor = baseColor
mWeakTextColor = baseColor.adjustAlpha(LOW_ALPHA)
mWeakTextColorWithEvent = primaryColor.adjustAlpha(LOW_ALPHA)
mHolder.apply {
top_left_arrow.drawable.mutate().setColorFilter(mTextColor, PorterDuff.Mode.SRC_ATOP)
@ -155,7 +146,6 @@ class MonthFragment : Fragment(), MonthlyCalendar {
index = (index + 1) % letters.size
(mHolder.findViewById(mRes.getIdentifier("label_$i", "id", mPackageName)) as TextView).apply {
textSize = mDayTextSize
setTextColor(mTextColor)
text = getString(letters[index])
}
@ -181,7 +171,7 @@ class MonthFragment : Fragment(), MonthlyCalendar {
}
val todayCircle = resources.getDrawable(R.drawable.circle_empty)
todayCircle.setColorFilter(mTextColor.adjustAlpha(HIGH_ALPHA), PorterDuff.Mode.SRC_IN)
todayCircle.setColorFilter(mTextColor, PorterDuff.Mode.SRC_IN)
for (i in 0..len - 1) {
val day = days[i]

4
app/src/main/kotlin/com/simplemobiletools/calendar/fragments/YearFragment.kt
View File

@ -11,12 +11,10 @@ import android.widget.TextView
import com.simplemobiletools.calendar.R
import com.simplemobiletools.calendar.YearlyCalendarImpl
import com.simplemobiletools.calendar.helpers.Config
import com.simplemobiletools.calendar.helpers.HIGH_ALPHA
import com.simplemobiletools.calendar.helpers.YEAR_LABEL
import com.simplemobiletools.calendar.interfaces.NavigationListener
import com.simplemobiletools.calendar.interfaces.YearlyCalendar
import com.simplemobiletools.calendar.views.SmallMonthView
import com.simplemobiletools.commons.extensions.adjustAlpha
import com.simplemobiletools.commons.extensions.updateTextColors
import kotlinx.android.synthetic.main.fragment_year.view.*
import org.joda.time.DateTime
@ -77,7 +75,7 @@ class YearFragment : Fragment(), YearlyCalendar {
val now = DateTime()
if (now.year == mYear) {
val monthLabel = mView.findViewById(res.getIdentifier("month_${now.monthOfYear}_label", "id", activity.packageName)) as TextView
monthLabel.setTextColor(Config.newInstance(context).primaryColor.adjustAlpha(HIGH_ALPHA))
monthLabel.setTextColor(Config.newInstance(context).primaryColor)
val monthView = mView.findViewById(res.getIdentifier("month_${now.monthOfYear}", "id", activity.packageName)) as SmallMonthView
monthView.setTodaysId(now.dayOfMonth)

1
app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Constants.kt
View File

@ -4,7 +4,6 @@ import com.simplemobiletools.calendar.R
val LOW_ALPHA = .3f
val MEDIUM_ALPHA = .6f
val HIGH_ALPHA = .8f
val DAY_CODE = "day_code"
val YEAR_LABEL = "year"

3
app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MyWidgetListProvider.kt
View File

@ -12,7 +12,6 @@ import android.widget.RemoteViews
import com.simplemobiletools.calendar.R
import com.simplemobiletools.calendar.activities.EventActivity
import com.simplemobiletools.calendar.services.WidgetService
import com.simplemobiletools.commons.extensions.adjustAlpha
class MyWidgetListProvider : AppWidgetProvider() {
companion object {
@ -35,7 +34,7 @@ class MyWidgetListProvider : AppWidgetProvider() {
mRes = mContext.resources
val config = Config.newInstance(context)
mTextColor = config.widgetTextColor.adjustAlpha(HIGH_ALPHA)
mTextColor = config.widgetTextColor
mWidgetManager = AppWidgetManager.getInstance(mContext)

18
app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MyWidgetMonthlyProvider.kt
View File

@ -26,8 +26,6 @@ class MyWidgetMonthlyProvider : AppWidgetProvider(), MonthlyCalendar {
private val PREV = "prev"
private val NEXT = "next"
private var mDayTextSize = 0f
private var mTodayTextSize = 0f
private var mTextColor = 0
private var mWeakTextColor = 0
private var mCalendar: MonthlyCalendarImpl? = null
@ -51,11 +49,9 @@ class MyWidgetMonthlyProvider : AppWidgetProvider(), MonthlyCalendar {
mCalendar = MonthlyCalendarImpl(this, mContext)
val config = Config.newInstance(context)
mTextColor = config.widgetTextColor.adjustAlpha(HIGH_ALPHA)
mTextColor = config.widgetTextColor
mWeakTextColor = config.widgetTextColor.adjustAlpha(LOW_ALPHA)
mDayTextSize = mRes.getDimension(R.dimen.day_text_size) / mRes.displayMetrics.density
mTodayTextSize = mRes.getDimension(R.dimen.today_text_size) / mRes.displayMetrics.density
mWidgetManager = AppWidgetManager.getInstance(mContext)
mRemoteViews = RemoteViews(mContext.packageName, R.layout.fragment_month)
@ -118,7 +114,7 @@ class MyWidgetMonthlyProvider : AppWidgetProvider(), MonthlyCalendar {
mRemoteViews.setViewVisibility(R.id.week_num, if (displayWeekNumbers) View.VISIBLE else View.GONE)
for (i in 0..5) {
val id = mRes.getIdentifier("week_num_" + i, "id", packageName)
val id = mRes.getIdentifier("week_num_$i", "id", packageName)
mRemoteViews.apply {
setTextViewText(id, days[i * 7].weekOfYear.toString() + ":")
setInt(id, "setTextColor", mWeakTextColor)
@ -128,18 +124,13 @@ class MyWidgetMonthlyProvider : AppWidgetProvider(), MonthlyCalendar {
for (i in 0..len - 1) {
val day = days[i]
val id = mRes.getIdentifier("day_" + i, "id", packageName)
val id = mRes.getIdentifier("day_$i", "id", packageName)
var curTextColor = mWeakTextColor
var curTextSize = mDayTextSize
if (day.isThisMonth) {
curTextColor = mTextColor
}
if (day.isToday) {
curTextSize = mTodayTextSize
}
val text = day.value.toString()
if (day.hasEvent) {
val underlinedText = SpannableString(text)
@ -149,7 +140,6 @@ class MyWidgetMonthlyProvider : AppWidgetProvider(), MonthlyCalendar {
mRemoteViews.setTextViewText(id, text)
}
mRemoteViews.setInt(id, "setTextColor", curTextColor)
mRemoteViews.setFloat(id, "setTextSize", curTextSize)
setupDayOpenIntent(id, day.code)
}
}
@ -179,7 +169,7 @@ class MyWidgetMonthlyProvider : AppWidgetProvider(), MonthlyCalendar {
val packageName = mContext.packageName
val letters = letterIDs
for (i in 0..6) {
val id = mRes.getIdentifier("label_" + i, "id", packageName)
val id = mRes.getIdentifier("label_$i", "id", packageName)
mRemoteViews.setInt(id, "setTextColor", mTextColor)
var index = i

1
app/src/main/res/values-sw600dp/dimens.xml
View File

@ -4,7 +4,6 @@
<dimen name="normal_text_size">18sp</dimen>
<dimen name="day_text_size">24sp</dimen>
<dimen name="today_text_size">34sp</dimen>
<dimen name="month_text_size">30sp</dimen>
<dimen name="big_text_size">22sp</dimen>
</resources>

1
app/src/main/res/values/dimens.xml
View File

@ -8,5 +8,4 @@
<dimen name="day_text_size">16sp</dimen>
<dimen name="month_text_size">22sp</dimen>
<dimen name="today_text_size">26sp</dimen>
</resources>