From ef9c8fe0aaa8ea5857b798551eab3eb77a226376 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 11 Mar 2018 21:37:47 +0100
Subject: [PATCH] show proper date, time and colors on the widget config screen

---
 .../WidgetDateTimeConfigureActivity.kt        | 18 +++++++++
 .../res/layout/widget_config_date_time.xml    | 38 +++++++++++--------
 2 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/activities/WidgetDateTimeConfigureActivity.kt b/app/src/main/kotlin/com/simplemobiletools/clock/activities/WidgetDateTimeConfigureActivity.kt
index 1c3e5677..db1e7f7c 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/activities/WidgetDateTimeConfigureActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/activities/WidgetDateTimeConfigureActivity.kt
@@ -8,10 +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.MyWidgetDateTimeProvider
 import com.simplemobiletools.commons.dialogs.ColorPickerDialog
 import com.simplemobiletools.commons.extensions.adjustAlpha
 import kotlinx.android.synthetic.main.widget_config_date_time.*
+import java.util.*
 
 class WidgetDateTimeConfigureActivity : SimpleActivity() {
     private var mBgAlpha = 0f
@@ -64,6 +66,19 @@ class WidgetDateTimeConfigureActivity : SimpleActivity() {
         config_bg_seekbar.setOnSeekBarChangeListener(bgSeekbarChangeListener)
         config_bg_seekbar.progress = (mBgAlpha * 100).toInt()
         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() {
@@ -109,12 +124,15 @@ class WidgetDateTimeConfigureActivity : SimpleActivity() {
         mTextColor = mTextColorWithoutTransparency
         config_text_color.setBackgroundColor(mTextColor)
         config_save.setTextColor(mTextColor)
+        config_time.setTextColor(mTextColor)
+        config_date.setTextColor(mTextColor)
     }
 
     private fun updateBgColor() {
         mBgColor = mBgColorWithoutTransparency.adjustAlpha(mBgAlpha)
         config_bg_color.setBackgroundColor(mBgColor)
         config_save.setBackgroundColor(mBgColor)
+        config_date_time_wrapper.setBackgroundColor(mBgColor)
     }
 
     private val bgSeekbarChangeListener = object : SeekBar.OnSeekBarChangeListener {
diff --git a/app/src/main/res/layout/widget_config_date_time.xml b/app/src/main/res/layout/widget_config_date_time.xml
index d1cb3d23..9099dc77 100644
--- a/app/src/main/res/layout/widget_config_date_time.xml
+++ b/app/src/main/res/layout/widget_config_date_time.xml
@@ -8,23 +8,31 @@
     android:layout_centerHorizontal="true"
     android:layout_margin="@dimen/activity_margin">
 
-    <TextView
-        android:id="@+id/config_time"
+    <RelativeLayout
+        android:id="@+id/config_date_time_wrapper"
         android:layout_width="match_parent"
-        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"/>
+        android:layout_height="wrap_content">
 
-    <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:textSize="@dimen/big_text_size"
-        tools:text="Mon, 1 January"/>
+        <TextView
+            android:id="@+id/config_time"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:includeFontPadding="false"
+            android:textSize="@dimen/clock_text_size"
+            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
         android:id="@+id/config_bg_color"