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

fill in some initial timer values

Browse Source
This commit is contained in:
tibbi 2018-03-08 23:28:53 +01:00
parent 3fb0d57527
commit 8b429a5006
4 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,7 +67,7 @@ fun Context.getAlarms(): ArrayList<AlarmSound> {
val cursor = manager.cursor
val alarms = ArrayList<AlarmSound>()
val defaultAlarm = AlarmSound(getDefaultAlarmTitle(this), getDefaultAlarmUri().toString())
val defaultAlarm = AlarmSound(getDefaultAlarmTitle(), getDefaultAlarmUri().toString())
alarms.add(defaultAlarm)
while (cursor.moveToNext()) {
@ -80,11 +80,11 @@ fun Context.getAlarms(): ArrayList<AlarmSound> {
return alarms
}
private fun getDefaultAlarmUri() = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_ALARM)
fun Context.getDefaultAlarmUri() = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_ALARM)
private fun getDefaultAlarmTitle(context: Context) = RingtoneManager.getRingtone(context, getDefaultAlarmUri()).getTitle(context)
fun Context.getDefaultAlarmTitle() = RingtoneManager.getRingtone(this, getDefaultAlarmUri()).getTitle(this)
fun Context.createNewAlarm(timeInMinutes: Int, weekDays: Int) = Alarm(0, timeInMinutes, weekDays, false, false, getDefaultAlarmTitle(this), getDefaultAlarmUri().toString(), "")
fun Context.createNewAlarm(timeInMinutes: Int, weekDays: Int) = Alarm(0, timeInMinutes, weekDays, false, false, getDefaultAlarmTitle(), getDefaultAlarmUri().toString(), "")
fun Context.scheduleNextAlarm(alarm: Alarm, showToast: Boolean) {
val calendar = Calendar.getInstance()

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

@ -46,6 +46,7 @@ class TimerFragment : Fragment() {
timer_vibrate_holder.setOnClickListener {
timer_vibrate.toggle()
context!!.config.timerVibrate = timer_vibrate.isChecked
}
timer_sound.setOnClickListener {
@ -53,7 +54,7 @@ class TimerFragment : Fragment() {
}
}
initialSecs = context!!.config.lastTimerSeconds
initialSecs = context!!.config.timerSeconds
updateDisplayedText()
return view
}
@ -70,13 +71,20 @@ class TimerFragment : Fragment() {
}
private fun setupViews() {
val textColor = context!!.config.textColor
val config = context!!.config
val textColor = config.textColor
view.apply {
context!!.updateTextColors(timer_fragment)
timer_play_pause.background = resources.getColoredDrawableWithColor(R.drawable.circle_background_filled, context!!.getAdjustedPrimaryColor())
timer_reset.applyColorFilter(textColor)
timer_initial_time.text = config.timerSeconds.getFormattedDuration()
timer_initial_time.colorLeftDrawable(textColor)
timer_vibrate.isChecked = config.timerVibrate
timer_vibrate.colorLeftDrawable(textColor)
timer_sound.text = config.timerSoundTitle
timer_sound.colorLeftDrawable(textColor)
}
@ -110,7 +118,7 @@ class TimerFragment : Fragment() {
isRunning = false
currentTicks = 0
totalTicks = 0
initialSecs = context!!.config.lastTimerSeconds
initialSecs = context!!.config.timerSeconds
updateDisplayedText()
updateIcons()
view.timer_reset.beGone()

20
app/src/main/kotlin/com/simplemobiletools/clock/helpers/Config.kt
View File

@ -1,6 +1,8 @@
package com.simplemobiletools.clock.helpers
import android.content.Context
import com.simplemobiletools.clock.extensions.getDefaultAlarmTitle
import com.simplemobiletools.clock.extensions.getDefaultAlarmUri
import com.simplemobiletools.commons.helpers.BaseConfig
class Config(context: Context) : BaseConfig(context) {
@ -24,7 +26,19 @@ class Config(context: Context) : BaseConfig(context) {
get() = prefs.getStringSet(EDITED_TIME_ZONE_TITLES, HashSet())
set(editedTimeZoneTitles) = prefs.edit().putStringSet(EDITED_TIME_ZONE_TITLES, editedTimeZoneTitles).apply()
var lastTimerSeconds: Int
get() = prefs.getInt(LAST_TIMER_SECONDS, 300)
set(lastTimerSeconds) = prefs.edit().putInt(LAST_TIMER_SECONDS, lastTimerSeconds).apply()
var timerSeconds: Int
get() = prefs.getInt(TIMER_SECONDS, 300)
set(lastTimerSeconds) = prefs.edit().putInt(TIMER_SECONDS, lastTimerSeconds).apply()
var timerVibrate: Boolean
get() = prefs.getBoolean(TIMER_VIBRATE, false)
set(timerVibrate) = prefs.edit().putBoolean(TIMER_VIBRATE, timerVibrate).apply()
var timerSoundUri: String
get() = prefs.getString(TIMER_SOUND_URI, context.getDefaultAlarmUri().toString())
set(timerSoundUri) = prefs.edit().putString(TIMER_SOUND_URI, timerSoundUri).apply()
var timerSoundTitle: String
get() = prefs.getString(TIMER_SOUND_TITLE, context.getDefaultAlarmTitle())
set(timerSoundTitle) = prefs.edit().putString(TIMER_SOUND_TITLE, timerSoundTitle).apply()
}

5
app/src/main/kotlin/com/simplemobiletools/clock/helpers/Constants.kt
View File

@ -7,7 +7,10 @@ const val SHOW_SECONDS = "show_seconds"
const val DISPLAY_OTHER_TIME_ZONES = "display_other_time_zones"
const val SELECTED_TIME_ZONES = "selected_time_zones"
const val EDITED_TIME_ZONE_TITLES = "edited_time_zone_titles"
const val LAST_TIMER_SECONDS = "last_timer_seconds"
const val TIMER_SECONDS = "timer_seconds"
const val TIMER_VIBRATE = "timer_vibrate"
const val TIMER_SOUND_URI = "timer_sound_uri"
const val TIMER_SOUND_TITLE = "timer_sound_title"
const val TABS_COUNT = 4
const val EDITED_TIME_ZONE_SEPARATOR = ":"