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

show proper date, time and colors on the widget config screen

Browse Source
This commit is contained in:
tibbi
2018-03-11 21:37:47 +01:00
parent 648efa1993
commit ef9c8fe0aa
2 changed files with 41 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/kotlin/com/simplemobiletools/clock/activities/WidgetDateTimeConfigureActivity.kt
View File

@ -8,10 +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.MyWidgetDateTimeProvider import com.simplemobiletools.clock.helpers.MyWidgetDateTimeProvider
import com.simplemobiletools.commons.dialogs.ColorPickerDialog import com.simplemobiletools.commons.dialogs.ColorPickerDialog
import com.simplemobiletools.commons.extensions.adjustAlpha import com.simplemobiletools.commons.extensions.adjustAlpha
import kotlinx.android.synthetic.main.widget_config_date_time.* import kotlinx.android.synthetic.main.widget_config_date_time.*
import java.util.*
class WidgetDateTimeConfigureActivity : SimpleActivity() { class WidgetDateTimeConfigureActivity : SimpleActivity() {
private var mBgAlpha = 0f private var mBgAlpha = 0f
@ -64,6 +66,19 @@ class WidgetDateTimeConfigureActivity : SimpleActivity() {
config_bg_seekbar.setOnSeekBarChangeListener(bgSeekbarChangeListener) config_bg_seekbar.setOnSeekBarChangeListener(bgSeekbarChangeListener)
config_bg_seekbar.progress = (mBgAlpha * 100).toInt() config_bg_seekbar.progress = (mBgAlpha * 100).toInt()
updateBgColor() updateBgColor()
updateCurrentDateTime()
}
private fun updateCurrentDateTime() {
val calendar = Calendar.getInstance()
val offset = calendar.timeZone.rawOffset
val passedSeconds = ((calendar.timeInMillis + offset) / 1000).toInt()
val hours = (passedSeconds / 3600) % 24
val minutes = (passedSeconds / 60) % 60
val format = "%02d:%02d"
config_time.text = String.format(format, hours, minutes)
config_date.text = getFormattedDate(calendar)
} }
private fun saveConfig() { private fun saveConfig() {
@ -109,12 +124,15 @@ class WidgetDateTimeConfigureActivity : SimpleActivity() {
mTextColor = mTextColorWithoutTransparency mTextColor = mTextColorWithoutTransparency
config_text_color.setBackgroundColor(mTextColor) config_text_color.setBackgroundColor(mTextColor)
config_save.setTextColor(mTextColor) config_save.setTextColor(mTextColor)
config_time.setTextColor(mTextColor)
config_date.setTextColor(mTextColor)
} }
private fun updateBgColor() { private fun updateBgColor() {
mBgColor = mBgColorWithoutTransparency.adjustAlpha(mBgAlpha) mBgColor = mBgColorWithoutTransparency.adjustAlpha(mBgAlpha)
config_bg_color.setBackgroundColor(mBgColor) config_bg_color.setBackgroundColor(mBgColor)
config_save.setBackgroundColor(mBgColor) config_save.setBackgroundColor(mBgColor)
config_date_time_wrapper.setBackgroundColor(mBgColor)
} }
private val bgSeekbarChangeListener = object : SeekBar.OnSeekBarChangeListener { private val bgSeekbarChangeListener = object : SeekBar.OnSeekBarChangeListener {

38
app/src/main/res/layout/widget_config_date_time.xml
View File

@ -8,23 +8,31 @@
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_margin="@dimen/activity_margin"> android:layout_margin="@dimen/activity_margin">
<TextView <RelativeLayout
android:id="@+id/config_time" android:id="@+id/config_date_time_wrapper"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:layout_marginTop="@dimen/big_margin"
android:gravity="center_horizontal"
android:textSize="@dimen/clock_text_size"
tools:text="00:00"/>
<TextView <TextView
android:id="@+id/config_date" android:id="@+id/config_time"
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_time" android:gravity="center_horizontal"
android:gravity="center_horizontal" android:includeFontPadding="false"
android:textSize="@dimen/big_text_size" android:textSize="@dimen/clock_text_size"
tools:text="Mon, 1 January"/> tools:text="00:00"/>
<TextView
android:id="@+id/config_date"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/config_time"
android:gravity="center_horizontal"
android:includeFontPadding="false"
android:paddingBottom="@dimen/small_margin"
android:textSize="@dimen/big_text_size"
tools:text="Mon, 1 January"/>
</RelativeLayout>
<Button <Button
android:id="@+id/config_bg_color" android:id="@+id/config_bg_color"