From 23466523df397e4f5cc797f827338fa41fef9956 Mon Sep 17 00:00:00 2001 From: Alinson Xavier Date: Sun, 15 May 2016 08:21:46 -0400 Subject: [PATCH] Remove minTextSize This was causing problems, since some launchers completely ignore minimum widget sizes. When widgets were too small, the text started to overflow. --- .../java/org/isoron/uhabits/views/HabitHistoryView.java | 5 ++--- .../main/java/org/isoron/uhabits/views/HabitScoreView.java | 7 +++---- 2 files changed, 5 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 cfd2bb3f1..96899585e 100644 --- a/app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java +++ b/app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java @@ -134,10 +134,9 @@ public class HabitHistoryView extends ScrollableDataView implements HabitDataVie setScrollerBucketSize((int) baseSize); squareSpacing = UIHelper.dpToPixels(getContext(), 1.0f); - 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); + float textSize = height * 0.06f; + textSize = Math.min(textSize, maxTextSize); pSquareFg.setTextSize(textSize); pTextHeader.setTextSize(textSize); 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 35c58d5eb..6258e7b13 100644 --- a/app/src/main/java/org/isoron/uhabits/views/HabitScoreView.java +++ b/app/src/main/java/org/isoron/uhabits/views/HabitScoreView.java @@ -151,10 +151,9 @@ public class HabitScoreView extends ScrollableDataView implements HabitDataView { if(height < 9) height = 200; - 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)); + float maxTextSize = getResources().getDimension(R.dimen.tinyTextSize); + float textSize = height * 0.06f; + pText.setTextSize(Math.min(textSize, maxTextSize)); em = pText.getFontSpacing(); footerHeight = (int)(3 * em);