fenix/Simple-Clock
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Clock.git synced 2025-06-05 22:19:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

updating gradle, commons, kotlin

Browse Source
This commit is contained in:
tibbi
2019-10-09 21:28:58 +02:00
parent 0d01b69cfd
commit 2cd196a35a
16 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt
View File

@ -273,7 +273,7 @@ fun Context.getTimerNotification(pendingIntent: PendingIntent, addDeleteIntent:
.setAutoCancel(true)
.setSound(Uri.parse(soundUri), AudioManager.STREAM_ALARM)
.setChannelId(channelId)
.addAction(R.drawable.ic_cross, getString(R.string.dismiss), if (addDeleteIntent) reminderActivityIntent else getHideTimerPendingIntent())
.addAction(R.drawable.ic_cross_vector, getString(R.string.dismiss), if (addDeleteIntent) reminderActivityIntent else getHideTimerPendingIntent())
if (addDeleteIntent) {
builder.setDeleteIntent(reminderActivityIntent)
@ -343,8 +343,8 @@ fun Context.getAlarmNotification(pendingIntent: PendingIntent, alarm: Alarm): No
.setAutoCancel(true)
.setSound(Uri.parse(soundUri), AudioManager.STREAM_ALARM)
.setChannelId(channelId)
.addAction(R.drawable.ic_snooze, getString(R.string.snooze), getSnoozePendingIntent(alarm))
.addAction(R.drawable.ic_cross, getString(R.string.dismiss), getHideAlarmPendingIntent(alarm))
.addAction(R.drawable.ic_snooze_vector, getString(R.string.snooze), getSnoozePendingIntent(alarm))
.addAction(R.drawable.ic_cross_vector, getString(R.string.dismiss), getHideAlarmPendingIntent(alarm))
builder.setVisibility(Notification.VISIBILITY_PUBLIC)

2
app/src/main/kotlin/com/simplemobiletools/clock/fragments/StopwatchFragment.kt
View File

@ -195,7 +195,7 @@ class StopwatchFragment : Fragment() {
}
private fun updateIcons() {
val drawableId = if (isRunning) R.drawable.ic_pause else R.drawable.ic_play
val drawableId = if (isRunning) R.drawable.ic_pause_vector else R.drawable.ic_play_vector
val iconColor = if (context!!.getAdjustedPrimaryColor() == Color.WHITE) Color.BLACK else context!!.config.textColor
view.stopwatch_play_pause.setImageDrawable(resources.getColoredDrawableWithColor(drawableId, iconColor))
}

2
app/src/main/kotlin/com/simplemobiletools/clock/fragments/TimerFragment.kt
View File

@ -199,7 +199,7 @@ class TimerFragment : Fragment() {
}
private fun updateIcons() {
val drawableId = if (isRunning) R.drawable.ic_pause else R.drawable.ic_play
val drawableId = if (isRunning) R.drawable.ic_pause_vector else R.drawable.ic_play_vector
val iconColor = if (context!!.getAdjustedPrimaryColor() == Color.WHITE) Color.BLACK else context!!.config.textColor
view.timer_play_pause.setImageDrawable(resources.getColoredDrawableWithColor(drawableId, iconColor))
}

2
app/src/main/kotlin/com/simplemobiletools/clock/helpers/MyWidgetDateTimeProvider.kt
View File

@ -81,7 +81,7 @@ class MyWidgetDateTimeProvider : AppWidgetProvider() {
val bitmap = getMultiplyColoredBitmap(R.drawable.ic_clock_shadowed, widgetTextColor, context)
setImageViewBitmap(R.id.widget_next_alarm_image, bitmap)
} else {
setImageViewBitmap(R.id.widget_next_alarm_image, context.resources.getColoredBitmap(R.drawable.ic_clock, widgetTextColor))
setImageViewBitmap(R.id.widget_next_alarm_image, context.resources.getColoredBitmap(R.drawable.ic_clock_vector, widgetTextColor))
}
}
}