isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-07 09:38:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove minTextSize

Browse Source 
This was causing problems, since some launchers completely
ignore minimum widget sizes. When widgets were too small,
the text started to overflow.
This commit is contained in:
Alinson S. Xavier
2016-05-15 08:21:46 -04:00
parent 83ca136346
commit 23466523df
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java
View File

@@ -134,10 +134,9 @@ public class HabitHistoryView extends ScrollableDataView implements HabitDataVie
setScrollerBucketSize((int) baseSize); setScrollerBucketSize((int) baseSize);
squareSpacing = UIHelper.dpToPixels(getContext(), 1.0f); squareSpacing = UIHelper.dpToPixels(getContext(), 1.0f);
float minTextSize = getResources().getDimension(R.dimen.tinyTextSize);
float maxTextSize = getResources().getDimension(R.dimen.regularTextSize); float maxTextSize = getResources().getDimension(R.dimen.regularTextSize);
float textSize = height * 0.045f; float textSize = height * 0.06f;
textSize = Math.max(Math.min(textSize, maxTextSize), minTextSize); textSize = Math.min(textSize, maxTextSize);
pSquareFg.setTextSize(textSize); pSquareFg.setTextSize(textSize);
pTextHeader.setTextSize(textSize); pTextHeader.setTextSize(textSize);

7
app/src/main/java/org/isoron/uhabits/views/HabitScoreView.java
View File

@@ -151,10 +151,9 @@ public class HabitScoreView extends ScrollableDataView implements HabitDataView
{ {
if(height < 9) height = 200; if(height < 9) height = 200;
float minTextSize = getResources().getDimension(R.dimen.tinyTextSize); float maxTextSize = getResources().getDimension(R.dimen.tinyTextSize);
float maxTextSize = getResources().getDimension(R.dimen.regularTextSize); float textSize = height * 0.06f;
float textSize = height * 0.045f; pText.setTextSize(Math.min(textSize, maxTextSize));
pText.setTextSize(Math.max(Math.min(textSize, maxTextSize), minTextSize));
em = pText.getFontSpacing(); em = pText.getFontSpacing();
footerHeight = (int)(3 * em); footerHeight = (int)(3 * em);