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

use TextClock at the clock tab, always show seconds

Browse Source
This commit is contained in:
tibbi
2022-04-21 13:58:23 +02:00
parent b59c89a587
commit 4e644dbfd5
7 changed files with 5 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/kotlin/com/simplemobiletools/clock/activities/SettingsActivity.kt
View File

@ -4,7 +4,6 @@ import android.content.Intent
import android.os.Bundle
import com.simplemobiletools.clock.R
import com.simplemobiletools.clock.extensions.config
import com.simplemobiletools.clock.extensions.updateWidgets
import com.simplemobiletools.clock.helpers.DEFAULT_MAX_ALARM_REMINDER_SECS
import com.simplemobiletools.clock.helpers.DEFAULT_MAX_TIMER_REMINDER_SECS
import com.simplemobiletools.commons.extensions.*
@ -27,7 +26,6 @@ class SettingsActivity : SimpleActivity() {
setupUseEnglish()
setupPreventPhoneFromSleeping()
setupSundayFirst()
setupShowSeconds()
setupAlarmMaxReminder()
setupUseSameSnooze()
setupSnoozeTime()
@ -40,7 +38,6 @@ class SettingsActivity : SimpleActivity() {
arrayOf(
settings_color_customization_label,
settings_general_settings_label,
settings_clock_tab_label,
settings_alarm_tab_label,
settings_stopwatch_tab_label,
settings_timer_tab_label,
@ -51,7 +48,6 @@ class SettingsActivity : SimpleActivity() {
arrayOf(
settings_color_customization_holder,
settings_general_settings_holder,
settings_clock_tab_holder,
settings_alarm_tab_holder,
settings_stopwatch_tab_holder,
settings_timer_tab_holder,
@ -111,14 +107,6 @@ class SettingsActivity : SimpleActivity() {
}
}
private fun setupShowSeconds() {
settings_show_seconds.isChecked = config.showSeconds
settings_show_seconds_holder.setOnClickListener {
settings_show_seconds.toggle()
config.showSeconds = settings_show_seconds.isChecked
}
}
private fun setupAlarmMaxReminder() {
updateAlarmMaxReminderText()
settings_alarm_max_reminder_holder.setOnClickListener {

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

@ -70,6 +70,7 @@ class ClockFragment : Fragment() {
private fun setupViews() {
view.apply {
requireContext().updateTextColors(clock_fragment)
clock_time.setTextColor(requireContext().getProperTextColor())
clock_fab.setOnClickListener {
fabClicked()
}
@ -82,7 +83,6 @@ class ClockFragment : Fragment() {
val hours = (passedSeconds / 3600) % 24
val minutes = (passedSeconds / 60) % 60
val seconds = passedSeconds % 60
view.clock_time.text = requireContext().getFormattedTime(passedSeconds, requireContext().config.showSeconds, true)
if (!DateFormat.is24HourFormat(requireContext())) {
view.clock_time.textSize = resources.getDimension(R.dimen.clock_text_size_smaller) / resources.displayMetrics.density

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

@ -16,10 +16,6 @@ class Config(context: Context) : BaseConfig(context) {
fun newInstance(context: Context) = Config(context)
}
var showSeconds: Boolean
get() = prefs.getBoolean(SHOW_SECONDS, true)
set(showSeconds) = prefs.edit().putBoolean(SHOW_SECONDS, showSeconds).apply()
var selectedTimeZones: Set<String>
get() = prefs.getStringSet(SELECTED_TIME_ZONES, HashSet())!!
set(selectedTimeZones) = prefs.edit().putStringSet(SELECTED_TIME_ZONES, selectedTimeZones).apply()

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

@ -7,7 +7,6 @@ import java.util.TimeZone
import kotlin.math.pow
// shared preferences
const val SHOW_SECONDS = "show_seconds"
const val SELECTED_TIME_ZONES = "selected_time_zones"
const val EDITED_TIME_ZONE_TITLES = "edited_time_zone_titles"
const val TIMER_SECONDS = "timer_seconds"