From 94599b9dd74be8afe0ddea44ba5231feda5ebbea Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Tue, 13 Mar 2018 18:32:34 +0100
Subject: [PATCH] couple widget UI adjustments

---
 .../clock/helpers/MyWidgetDateTimeProvider.kt               | 3 +--
 app/src/main/res/layout/widget_date_time.xml                | 6 ++++--
 app/src/main/res/layout/widget_date_time_with_shadow.xml    | 6 ++++--
 app/src/main/res/values/dimens.xml                          | 4 ++--
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/helpers/MyWidgetDateTimeProvider.kt b/app/src/main/kotlin/com/simplemobiletools/clock/helpers/MyWidgetDateTimeProvider.kt
index 17419b02..41521579 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/helpers/MyWidgetDateTimeProvider.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/helpers/MyWidgetDateTimeProvider.kt
@@ -59,8 +59,7 @@ class MyWidgetDateTimeProvider : AppWidgetProvider() {
             setVisibleIf(R.id.widget_time_am_pm, !use24HourFormat)
 
             val nextAlarm = getFormattedNextAlarm(context)
-            setVisibleIf(R.id.widget_next_alarm, nextAlarm.isNotEmpty())
-            setVisibleIf(R.id.widget_next_alarm_image, nextAlarm.isNotEmpty())
+            setVisibleIf(R.id.widget_alarm_holder, nextAlarm.isNotEmpty())
             setText(R.id.widget_next_alarm, nextAlarm)
         }
     }
diff --git a/app/src/main/res/layout/widget_date_time.xml b/app/src/main/res/layout/widget_date_time.xml
index 0f001060..5733c432 100644
--- a/app/src/main/res/layout/widget_date_time.xml
+++ b/app/src/main/res/layout/widget_date_time.xml
@@ -5,7 +5,7 @@
     android:id="@+id/widget_date_time_holder"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingBottom="@dimen/small_margin">
+    android:paddingBottom="@dimen/tiny_margin">
 
     <RelativeLayout
         android:id="@+id/widget_time_holder"
@@ -17,6 +17,7 @@
             android:id="@+id/widget_time"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/widget_time_height"
+            android:layout_marginTop="-2dp"
             android:includeFontPadding="false"
             android:textSize="@dimen/widget_time_text_size"
             tools:text="00:00"/>
@@ -46,7 +47,7 @@
     <RelativeLayout
         android:id="@+id/widget_alarm_holder"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="@dimen/widget_alarm_icon_size"
         android:layout_below="@+id/widget_date"
         android:gravity="center_horizontal">
 
@@ -60,6 +61,7 @@
             android:id="@+id/widget_next_alarm"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
             android:layout_toRightOf="@+id/widget_next_alarm_image"
             android:includeFontPadding="false"
             android:paddingLeft="@dimen/small_margin"
diff --git a/app/src/main/res/layout/widget_date_time_with_shadow.xml b/app/src/main/res/layout/widget_date_time_with_shadow.xml
index b67165d6..f5cfa610 100644
--- a/app/src/main/res/layout/widget_date_time_with_shadow.xml
+++ b/app/src/main/res/layout/widget_date_time_with_shadow.xml
@@ -5,7 +5,7 @@
     android:id="@+id/widget_date_time_holder"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingBottom="@dimen/small_margin">
+    android:paddingBottom="@dimen/tiny_margin">
 
     <RelativeLayout
         android:id="@+id/widget_time_holder"
@@ -17,6 +17,7 @@
             android:id="@+id/widget_time"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/widget_time_height"
+            android:layout_marginTop="-2dp"
             android:includeFontPadding="false"
             android:shadowColor="@android:color/black"
             android:shadowDy="1"
@@ -55,7 +56,7 @@
     <RelativeLayout
         android:id="@+id/widget_alarm_holder"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="@dimen/widget_alarm_icon_size"
         android:layout_below="@+id/widget_date"
         android:gravity="center_horizontal">
 
@@ -69,6 +70,7 @@
             android:id="@+id/widget_next_alarm"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
             android:layout_toRightOf="@+id/widget_next_alarm_image"
             android:includeFontPadding="false"
             android:paddingLeft="@dimen/small_margin"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 51d9b7e2..991c783c 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -4,7 +4,7 @@
     <dimen name="stopwatch_button_size">64dp</dimen>
     <dimen name="lap_time_size">80dp</dimen>
     <dimen name="widget_alarm_icon_size">18dp</dimen>
-    <dimen name="widget_time_height">50dp</dimen>
+    <dimen name="widget_time_height">48dp</dimen>
     <dimen name="min_widget_height">30dp</dimen>
     <dimen name="min_widget_width">180dp</dimen>
     <dimen name="min_widget_resize_width">110dp</dimen>
@@ -13,5 +13,5 @@
     <dimen name="clock_text_size_smaller">60sp</dimen>
     <dimen name="alarm_text_size">46sp</dimen>
     <dimen name="stopwatch_text_size">60sp</dimen>
-    <dimen name="widget_time_text_size">50sp</dimen>
+    <dimen name="widget_time_text_size">48sp</dimen>
 </resources>