From f612f685bfca6f258c077b19425b38dc0808fc04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Mon, 23 Sep 2024 22:36:40 +0100
Subject: [PATCH] Tweak margins and paddings

---
 .../gadgetbridge/activities/ActivitySummaryDetail.java   | 2 +-
 app/src/main/res/layout/fragment_sleepchart.xml          | 9 ++++-----
 app/src/main/res/layout/fragment_stresschart.xml         | 5 +----
 app/src/main/res/layout/fragment_weeksleep_chart.xml     | 7 ++-----
 app/src/main/res/values/styles.xml                       | 2 +-
 5 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummaryDetail.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummaryDetail.java
index dc13d1fd55..53305d6ad3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummaryDetail.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ActivitySummaryDetail.java
@@ -579,7 +579,7 @@ public class ActivitySummaryDetail extends AbstractGBActivity {
         linearLayout.setLayoutParams(layoutParams);
         linearLayout.setOrientation(LinearLayout.VERTICAL);
         linearLayout.setGravity(Gravity.CENTER);
-        linearLayout.setPadding(dpToPx(20), dpToPx(20),dpToPx(20), dpToPx(20));
+        linearLayout.setPadding(dpToPx(15), dpToPx(15),dpToPx(15), dpToPx(15));
         linearLayout.setBackgroundColor(GBApplication.getWindowBackgroundColor(ActivitySummaryDetail.this));
         int marginLeft = 0;
         int marginTop = 0;
diff --git a/app/src/main/res/layout/fragment_sleepchart.xml b/app/src/main/res/layout/fragment_sleepchart.xml
index 2c184017db..116226be11 100644
--- a/app/src/main/res/layout/fragment_sleepchart.xml
+++ b/app/src/main/res/layout/fragment_sleepchart.xml
@@ -20,7 +20,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:text="-"
+            android:text="@string/stats_empty_value"
             android:textSize="12sp" />
 
         <com.github.mikephil.charting.charts.PieChart
@@ -28,7 +28,9 @@
             android:layout_width="fill_parent"
             android:layout_height="200dp"
             android:layout_marginTop="15dp"
+            android:layout_marginBottom="10dp"
             android:layout_weight="2" />
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
@@ -53,7 +55,6 @@
                         android:id="@+id/sleep_chart_legend_deep_time"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="10dp"
                         android:text="@string/stats_empty_value"
                         android:textSize="20sp" />
 
@@ -79,7 +80,6 @@
                         android:id="@+id/sleep_chart_legend_light_time"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="10dp"
                         android:text="@string/stats_empty_value"
                         android:textSize="20sp" />
 
@@ -98,7 +98,6 @@
                         android:id="@+id/sleep_chart_legend_rem_time_wrapper"
                         android:layout_width="fill_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="10dp"
                         android:gravity="center"
                         android:orientation="vertical"
                         >
@@ -148,7 +147,6 @@
                             android:id="@+id/sleep_chart_legend_awake_time"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="10dp"
                             android:text="@string/stats_empty_value"
                             android:textSize="20sp" />
 
@@ -167,6 +165,7 @@
             android:id="@+id/sleepchart"
             android:layout_width="fill_parent"
             android:layout_height="300dp"
+            android:layout_marginTop="15dp"
             android:layout_marginBottom="25dp"
             android:layout_weight="4" />
 
diff --git a/app/src/main/res/layout/fragment_stresschart.xml b/app/src/main/res/layout/fragment_stresschart.xml
index 5641ce8392..28dffeec3a 100644
--- a/app/src/main/res/layout/fragment_stresschart.xml
+++ b/app/src/main/res/layout/fragment_stresschart.xml
@@ -41,7 +41,6 @@
                     />
 
                 <TextView
-                    android:layout_marginTop="10dp"
                     android:id="@+id/stress_chart_relaxed_time"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -69,7 +68,6 @@
                     />
 
                 <TextView
-                    android:layout_marginTop="10dp"
                     android:id="@+id/stress_chart_mild_time"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -95,7 +93,6 @@
                     />
 
                 <TextView
-                    android:layout_marginTop="10dp"
                     android:id="@+id/stress_chart_moderate_time"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -124,7 +121,6 @@
                     />
 
                 <TextView
-                    android:layout_marginTop="10dp"
                     android:id="@+id/stress_chart_high_time"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -145,6 +141,7 @@
             android:id="@+id/stress_line_chart"
             android:layout_width="fill_parent"
             android:layout_height="300dp"
+            android:layout_marginTop="15dp"
             android:layout_marginBottom="25dp"
             android:layout_weight="2" />
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_weeksleep_chart.xml b/app/src/main/res/layout/fragment_weeksleep_chart.xml
index 62cac6c35e..b397b2dd7e 100644
--- a/app/src/main/res/layout/fragment_weeksleep_chart.xml
+++ b/app/src/main/res/layout/fragment_weeksleep_chart.xml
@@ -16,6 +16,7 @@
                 android:gravity="center"
                 android:textSize="20sp"
                 android:layout_marginTop="15dp"
+                android:layout_marginBottom="10dp"
         />
 
         <GridLayout
@@ -35,10 +36,9 @@
                     android:layout_marginBottom="10dp"
                     />
                 <TextView
-                    android:layout_marginTop="20dip"
                     android:id="@+id/sleep_chart_legend_deep_time"
                     android:text="@string/stats_empty_value"
-                    android:textSize="10dp"
+                    android:textSize="20sp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     />
@@ -61,7 +61,6 @@
                     android:layout_marginBottom="10dp"
                     />
                 <TextView
-                    android:layout_marginTop="10dp"
                     android:id="@+id/sleep_chart_legend_light_time"
                     android:text="@string/stats_empty_value"
                     android:textSize="20sp"
@@ -88,7 +87,6 @@
                     android:layout_marginBottom="10dp"
                     />
                 <TextView
-                    android:layout_marginTop="10dp"
                     android:id="@+id/sleep_chart_legend_rem_time"
                     android:text="@string/stats_empty_value"
                     android:textSize="20sp"
@@ -121,7 +119,6 @@
                         android:layout_marginBottom="10dp"
                         />
                     <TextView
-                        android:layout_marginTop="10dp"
                         android:id="@+id/sleep_chart_legend_awake_time"
                         android:text="@string/stats_empty_value"
                         android:textSize="20sp"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 75aef0f06d..9837817ed5 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -201,7 +201,7 @@
     </style>
     <style name="GridTile">
         <item name="android:background">?android:attr/windowBackground</item>
-        <item name="android:padding">20dp</item>
+        <item name="android:padding">15dp</item>
         <item name="android:gravity">center</item>
         <item name="android:orientation">vertical</item>
         <item name="android:layout_columnWeight">1</item>