diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/clock/activities/SettingsActivity.kt index 96b766c3..7c03c699 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/clock/activities/SettingsActivity.kt @@ -4,6 +4,7 @@ import android.os.Bundle import com.simplemobiletools.clock.R import com.simplemobiletools.clock.extensions.config import com.simplemobiletools.commons.extensions.beVisibleIf +import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor import com.simplemobiletools.commons.extensions.updateTextColors import com.simplemobiletools.commons.extensions.useEnglishToggled import kotlinx.android.synthetic.main.activity_settings.* @@ -22,7 +23,16 @@ class SettingsActivity : SimpleActivity() { setupUseEnglish() setupAvoidWhatsNew() setupPreventPhoneFromSleeping() + setupShowSeconds() updateTextColors(settings_holder) + setupSectionColors() + } + + private fun setupSectionColors() { + val adjustedPrimaryColor = getAdjustedPrimaryColor() + arrayListOf(clock_tab_label).forEach { + it.setTextColor(adjustedPrimaryColor) + } } private fun setupCustomizeColors() { @@ -56,4 +66,12 @@ class SettingsActivity : SimpleActivity() { config.preventPhoneFromSleeping = settings_prevent_phone_from_sleeping.isChecked } } + + private fun setupShowSeconds() { + settings_show_seconds.isChecked = config.showSeconds + settings_show_seconds_holder.setOnClickListener { + settings_show_seconds.toggle() + config.showSeconds = settings_show_seconds.isChecked + } + } } diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/ClockFragment.kt b/app/src/main/kotlin/com/simplemobiletools/clock/fragments/ClockFragment.kt index f086bc1a..3197b05a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/fragments/ClockFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/clock/fragments/ClockFragment.kt @@ -4,6 +4,7 @@ import android.content.Context import android.os.Handler import android.util.AttributeSet import android.widget.RelativeLayout +import com.simplemobiletools.clock.extensions.config import com.simplemobiletools.commons.extensions.updateTextColors import kotlinx.android.synthetic.main.fragment_clock.view.* import java.util.* @@ -25,9 +26,17 @@ class ClockFragment(context: Context, attributeSet: AttributeSet) : RelativeLayo private fun updateCurrentTime() { val hours = (passedSeconds / 3600) % 24 val minutes = (passedSeconds / 60) % 60 - val seconds = passedSeconds % 60 - val format = "%02d:%02d:%02d" - clock_time.text = String.format(format, hours, minutes, seconds) + var format = "%02d:%02d" + + val formattedText = if (context.config.showSeconds) { + val seconds = passedSeconds % 60 + format += ":%02d" + String.format(format, hours, minutes, seconds) + } else { + String.format(format, hours, minutes) + } + + clock_time.text = formattedText updateHandler.postDelayed({ passedSeconds++ diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/clock/helpers/Config.kt index 04b59fc1..e82b4a31 100644 --- a/app/src/main/kotlin/com/simplemobiletools/clock/helpers/Config.kt +++ b/app/src/main/kotlin/com/simplemobiletools/clock/helpers/Config.kt @@ -7,4 +7,8 @@ class Config(context: Context) : BaseConfig(context) { companion object { fun newInstance(context: Context) = Config(context) } + + var showSeconds: Boolean + get() = prefs.getBoolean(SHOW_SECONDS, true) + set(showSeconds) = prefs.edit().putBoolean(SHOW_SECONDS, showSeconds).apply() } diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/clock/helpers/Constants.kt new file mode 100644 index 00000000..136c4df3 --- /dev/null +++ b/app/src/main/kotlin/com/simplemobiletools/clock/helpers/Constants.kt @@ -0,0 +1,4 @@ +package com.simplemobiletools.clock.helpers + +// shared preferences +const val SHOW_SECONDS = "show_seconds" diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index c3427eea..189c0554 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -101,5 +101,46 @@ android:text="@string/prevent_phone_from_sleeping"/> + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_clock.xml b/app/src/main/res/layout/fragment_clock.xml index 5a4c7850..9cfcaabf 100644 --- a/app/src/main/res/layout/fragment_clock.xml +++ b/app/src/main/res/layout/fragment_clock.xml @@ -7,6 +7,7 @@ android:layout_height="match_parent"> + Jednoduché hodinky + Hodinky + + + Okno s časom + Okno s budíkom + Okno so stopkami + Zobraziť sekundy + + + diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 82aef00c..a04cd808 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -1,3 +1,3 @@ - 54sp + 70sp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 17a02bae..5f86778e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2,6 +2,12 @@ Simple Clock Clock + + Clock tab + Alarm tab + Stopwatch tab + Show seconds +