From c4bf31e7785ad0290a1dc01a78d02b7e4c3503f2 Mon Sep 17 00:00:00 2001
From: Alinson Xavier <axavier@uwaterloo.ca>
Date: Sat, 16 Apr 2016 08:06:01 -0400
Subject: [PATCH] Adjust text size and position on HistoryView and StreakView

---
 .../org/isoron/uhabits/views/HabitHistoryView.java     | 10 +++++++---
 .../java/org/isoron/uhabits/views/HabitStreakView.java |  7 ++++---
 app/src/main/res/xml/widget_history_info.xml           |  2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java b/app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java
index 7709c994d..cfd2bb3f1 100644
--- a/app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java
+++ b/app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java
@@ -134,8 +134,10 @@ public class HabitHistoryView extends ScrollableDataView implements HabitDataVie
         setScrollerBucketSize((int) baseSize);
 
         squareSpacing = UIHelper.dpToPixels(getContext(), 1.0f);
-        float maxTextSize = getResources().getDimensionPixelSize(R.dimen.regularTextSize);
-        float textSize = Math.min(baseSize * 0.5f, maxTextSize);
+        float minTextSize = getResources().getDimension(R.dimen.tinyTextSize);
+        float maxTextSize = getResources().getDimension(R.dimen.regularTextSize);
+        float textSize = height * 0.045f;
+        textSize = Math.max(Math.min(textSize, maxTextSize), minTextSize);
 
         pSquareFg.setTextSize(textSize);
         pTextHeader.setTextSize(textSize);
@@ -301,11 +303,13 @@ public class HabitHistoryView extends ScrollableDataView implements HabitDataVie
 
     private void drawAxis(Canvas canvas, RectF location)
     {
+        float verticalOffset = pTextHeader.getFontSpacing() * 0.4f;
+
         for (String day : DateHelper.getLocaleDayNames(Calendar.SHORT))
         {
             location.offset(0, columnWidth);
             canvas.drawText(day, location.left + headerTextOffset,
-                    location.bottom - headerTextOffset, pTextHeader);
+                    location.centerY() + verticalOffset, pTextHeader);
         }
     }
 
diff --git a/app/src/main/java/org/isoron/uhabits/views/HabitStreakView.java b/app/src/main/java/org/isoron/uhabits/views/HabitStreakView.java
index bf86541a2..5d3cc0043 100644
--- a/app/src/main/java/org/isoron/uhabits/views/HabitStreakView.java
+++ b/app/src/main/java/org/isoron/uhabits/views/HabitStreakView.java
@@ -111,10 +111,11 @@ public class HabitStreakView extends View implements HabitDataView
         maxStreakCount = height / baseSize;
         this.width = width;
 
-        int maxTextSize = getResources().getDimensionPixelSize(R.dimen.regularTextSize);
-        float regularTextSize = Math.min(baseSize * 0.56f, maxTextSize);
+        float minTextSize = getResources().getDimension(R.dimen.tinyTextSize);
+        float maxTextSize = getResources().getDimension(R.dimen.regularTextSize);
+        float textSize = baseSize * 0.5f;
 
-        paint.setTextSize(regularTextSize);
+        paint.setTextSize(Math.max(Math.min(textSize, maxTextSize), minTextSize));
         em = paint.getFontSpacing();
         textMargin = 0.5f * em;
 
diff --git a/app/src/main/res/xml/widget_history_info.xml b/app/src/main/res/xml/widget_history_info.xml
index c2545fe77..5b8d501af 100644
--- a/app/src/main/res/xml/widget_history_info.xml
+++ b/app/src/main/res/xml/widget_history_info.xml
@@ -22,7 +22,7 @@
                     android:minHeight="80dp"
                     android:minWidth="80dp"
                     android:minResizeWidth="40dp"
-                    android:minResizeHeight="40dp"
+                    android:minResizeHeight="80dp"
                     android:initialLayout="@layout/widget_graph"
                     android:previewImage="@drawable/widget_preview_history"
                     android:resizeMode="vertical|horizontal"