use TextClock for date too to make it more reliable

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

View File

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

View File

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

View File

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

View File

@ -22,11 +22,13 @@
android:textSize="@dimen/clock_text_size" android:textSize="@dimen/clock_text_size"
tools:text="00:00:00" /> tools:text="00:00:00" />
<com.simplemobiletools.commons.views.MyTextView <TextClock
android:id="@+id/clock_date" android:id="@+id/clock_date"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/clock_time" android:layout_below="@+id/clock_time"
android:format12Hour="EEE, d MMM"
android:format24Hour="EEE, d MMM"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:textSize="@dimen/big_text_size" android:textSize="@dimen/big_text_size"
tools:text="Mon, 1 January" /> tools:text="Mon, 1 January" />

View File

@ -37,11 +37,13 @@
android:textSize="@dimen/widget_time_text_size_small" android:textSize="@dimen/widget_time_text_size_small"
tools:text="00:00" /> tools:text="00:00" />
<TextView <TextClock
android:id="@+id/config_digital_date" android:id="@+id/config_digital_date"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/config_digital_time" android:layout_below="@+id/config_digital_time"
android:format12Hour="EEE, d MMM"
android:format24Hour="EEE, d MMM"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:includeFontPadding="false" android:includeFontPadding="false"
android:paddingBottom="@dimen/small_margin" android:paddingBottom="@dimen/small_margin"

View File

@ -44,7 +44,7 @@
android:textSize="@dimen/normal_text_size" android:textSize="@dimen/normal_text_size"
tools:text="00:00" /> tools:text="00:00" />
<TextView <TextClock
android:id="@+id/widget_date" android:id="@+id/widget_date"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
@ -52,6 +52,8 @@
android:autoSizeMinTextSize="2sp" android:autoSizeMinTextSize="2sp"
android:autoSizeStepGranularity="1sp" android:autoSizeStepGranularity="1sp"
android:autoSizeTextType="uniform" android:autoSizeTextType="uniform"
android:format12Hour="EEE, d MMM"
android:format24Hour="EEE, d MMM"
android:gravity="center" android:gravity="center"
android:includeFontPadding="false" android:includeFontPadding="false"
android:maxLines="1" android:maxLines="1"