add vibrations on button press at the stopwatch tab

This commit is contained in:
tibbi
2018-03-08 17:16:02 +01:00
parent 5570de136e
commit 610892230b
4 changed files with 64 additions and 2 deletions

View File

@ -24,13 +24,14 @@ class SettingsActivity : SimpleActivity() {
setupDisplayOtherTimeZones()
setupUseSameSnooze()
setupSnoozeTime()
setupVibrate()
updateTextColors(settings_holder)
setupSectionColors()
}
private fun setupSectionColors() {
val adjustedPrimaryColor = getAdjustedPrimaryColor()
arrayListOf(clock_tab_label, alarm_tab_label).forEach {
arrayListOf(clock_tab_label, alarm_tab_label, stopwatch_tab_label).forEach {
it.setTextColor(adjustedPrimaryColor)
}
}
@ -103,6 +104,14 @@ class SettingsActivity : SimpleActivity() {
}
}
private fun setupVibrate() {
settings_vibrate.isChecked = config.vibrateOnButtonPress
settings_vibrate_holder.setOnClickListener {
settings_vibrate.toggle()
config.vibrateOnButtonPress = settings_vibrate.isChecked
}
}
private fun updateSnoozeText() {
settings_snooze_time.text = formatMinutesToTimeString(config.snoozeTime)
}

View File

@ -45,26 +45,32 @@ class StopwatchFragment : Fragment() {
view = (inflater.inflate(R.layout.fragment_stopwatch, container, false) as ViewGroup).apply {
stopwatch_time.setOnClickListener {
togglePlayPause()
checkHaptic(this)
}
stopwatch_play_pause.setOnClickListener {
togglePlayPause()
checkHaptic(this)
}
stopwatch_reset.setOnClickListener {
resetStopwatch()
checkHaptic(this)
}
stopwatch_sorting_indicator_1.setOnClickListener {
changeSorting(SORT_BY_LAP)
checkHaptic(this)
}
stopwatch_sorting_indicator_2.setOnClickListener {
changeSorting(SORT_BY_LAP_TIME)
checkHaptic(this)
}
stopwatch_sorting_indicator_3.setOnClickListener {
changeSorting(SORT_BY_TOTAL_TIME)
checkHaptic(this)
}
stopwatch_lap.setOnClickListener {
@ -73,6 +79,7 @@ class StopwatchFragment : Fragment() {
laps.add(0, lap)
lapTicks = 0
updateLaps()
checkHaptic(this)
}
stopwatchAdapter = StopwatchAdapter(activity as SimpleActivity, ArrayList(), stopwatch_list) {
@ -204,6 +211,12 @@ class StopwatchFragment : Fragment() {
stopwatchAdapter.updateItems(laps)
}
private fun checkHaptic(view: View) {
if (context!!.config.vibrateOnButtonPress) {
view.performHapticFeedback()
}
}
private val updateRunnable = object : Runnable {
override fun run() {
if (isRunning) {