From c757ce65482740bf26a8e4a08764d306989b7dee Mon Sep 17 00:00:00 2001
From: Alinson Xavier <axavier@uwaterloo.ca>
Date: Sat, 16 Apr 2016 07:36:39 -0400
Subject: [PATCH] Enforce min text size on HabitScoreView

---
 .../main/java/org/isoron/uhabits/views/HabitScoreView.java  | 6 ++++--
 app/src/main/res/values/dimens.xml                          | 2 +-
 app/src/main/res/xml/widget_score_info.xml                  | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/isoron/uhabits/views/HabitScoreView.java b/app/src/main/java/org/isoron/uhabits/views/HabitScoreView.java
index c4f64b981..c80f6db94 100644
--- a/app/src/main/java/org/isoron/uhabits/views/HabitScoreView.java
+++ b/app/src/main/java/org/isoron/uhabits/views/HabitScoreView.java
@@ -156,8 +156,10 @@ public class HabitScoreView extends ScrollableDataView implements HabitDataView
     {
         if(height < 9) height = 200;
 
-        int maxTextSize = getResources().getDimensionPixelSize(R.dimen.regularTextSize);
-        pText.setTextSize(Math.min(height * 0.047f, maxTextSize));
+        float minTextSize = getResources().getDimension(R.dimen.tinyTextSize);
+        float maxTextSize = getResources().getDimension(R.dimen.regularTextSize);
+        float textSize = height * 0.045f;
+        pText.setTextSize(Math.max(Math.min(textSize, maxTextSize), minTextSize));
         em = pText.getFontSpacing();
 
         footerHeight = (int)(3 * em);
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index f64e8bf66..c3b21c081 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -26,7 +26,7 @@
     <dimen name="history_max_font_size">@dimen/regularTextSize</dimen>
     <dimen name="regularTextSize">16sp</dimen>
     <dimen name="smallTextSize">14sp</dimen>
-    <dimen name="tinyTextSize">12sp</dimen>
+    <dimen name="tinyTextSize">10sp</dimen>
     <dimen name="habitNameWidth">160dp</dimen>
 
     <string-array name="snooze_interval_names">
diff --git a/app/src/main/res/xml/widget_score_info.xml b/app/src/main/res/xml/widget_score_info.xml
index f7dc8d7d2..e2be33252 100644
--- a/app/src/main/res/xml/widget_score_info.xml
+++ b/app/src/main/res/xml/widget_score_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_score"
                     android:resizeMode="vertical|horizontal"