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 for date too to make it more reliable

Browse Source
This commit is contained in:
tibbi
2022-05-19 10:16:40 +02:00
parent b8e04553bd
commit d77dd0e992
6 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/kotlin/com/simplemobiletools/clock/activities/WidgetDigitalConfigureActivity.kt
View File

@ -8,14 +8,12 @@ import android.os.Bundle
import android.widget.SeekBar
import com.simplemobiletools.clock.R
import com.simplemobiletools.clock.extensions.config
import com.simplemobiletools.clock.extensions.getFormattedDate
import com.simplemobiletools.clock.helpers.MyDigitalTimeWidgetProvider
import com.simplemobiletools.commons.dialogs.ColorPickerDialog
import com.simplemobiletools.commons.dialogs.WidgetLockedDialog
import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.IS_CUSTOMIZING_COLORS
import kotlinx.android.synthetic.main.widget_config_digital.*
import java.util.*
class WidgetDigitalConfigureActivity : SimpleActivity() {
private var mBgAlpha = 0f
@ -72,16 +70,11 @@ class WidgetDigitalConfigureActivity : SimpleActivity() {
config_digital_bg_seekbar.setOnSeekBarChangeListener(bgSeekbarChangeListener)
config_digital_bg_seekbar.progress = (mBgAlpha * 100).toInt()
updateBackgroundColor()
updateCurrentDateTime()
mTextColor = config.widgetTextColor
updateTextColor()
}
private fun updateCurrentDateTime() {
config_digital_date.text = getFormattedDate(Calendar.getInstance())
}
private fun saveConfig() {
storeWidgetColors()
requestWidgetUpdate()

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

@ -18,6 +18,7 @@ import com.simplemobiletools.clock.models.MyTimeZone
import com.simplemobiletools.commons.extensions.beVisibleIf
import com.simplemobiletools.commons.extensions.getProperTextColor
import com.simplemobiletools.commons.extensions.updateTextColors
import kotlinx.android.synthetic.main.fragment_clock.*
import kotlinx.android.synthetic.main.fragment_clock.view.*
import java.util.*
@ -46,6 +47,8 @@ class ClockFragment : Fragment() {
if (storedTextColor != configTextColor) {
(view.time_zones_list.adapter as? TimeZonesAdapter)?.updateTextColor(configTextColor)
}
view.clock_date.setTextColor(configTextColor)
}
override fun onPause() {
@ -105,7 +108,6 @@ class ClockFragment : Fragment() {
private fun updateDate() {
calendar = Calendar.getInstance()
val formattedDate = requireContext().getFormattedDate(calendar)
view.clock_date.text = formattedDate
(view.time_zones_list.adapter as? TimeZonesAdapter)?.todayDateString = formattedDate
}

3
app/src/main/kotlin/com/simplemobiletools/clock/helpers/MyDigitalTimeWidgetProvider.kt
View File

@ -12,13 +12,11 @@ import android.widget.RemoteViews
import com.simplemobiletools.clock.R
import com.simplemobiletools.clock.activities.SplashActivity
import com.simplemobiletools.clock.extensions.config
import com.simplemobiletools.clock.extensions.getFormattedDate
import com.simplemobiletools.clock.extensions.getNextAlarm
import com.simplemobiletools.commons.extensions.applyColorFilter
import com.simplemobiletools.commons.extensions.getLaunchIntent
import com.simplemobiletools.commons.extensions.setText
import com.simplemobiletools.commons.extensions.setVisibleIf
import java.util.*
class MyDigitalTimeWidgetProvider : AppWidgetProvider() {
override fun onUpdate(context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray) {
@ -41,7 +39,6 @@ class MyDigitalTimeWidgetProvider : AppWidgetProvider() {
private fun updateTexts(context: Context, views: RemoteViews) {
val nextAlarm = context.getNextAlarm()
views.apply {
setText(R.id.widget_date, context.getFormattedDate(Calendar.getInstance()))
setText(R.id.widget_next_alarm, nextAlarm)
setVisibleIf(R.id.widget_alarm_holder, nextAlarm.isNotEmpty())
}