From 61cc6061e9f131472ba52913efb897af71128c1d Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 4 Jan 2016 21:56:34 +0100 Subject: [PATCH] make the result and formula textview font scale automatically - works only in the app, not in the widget - we have to leave the textviews as TextView type, else the widget breaks totally --- app/build.gradle | 1 + .../simplemobiletools/com/simple_calculator/Formatter.java | 1 - .../simplemobiletools/com/simple_calculator/MainActivity.java | 2 ++ 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 3f90380d..1dfc8c50 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -25,6 +25,7 @@ dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) compile 'com.android.support:appcompat-v7:23.1.1' compile 'com.jakewharton:butterknife:7.0.1' + compile 'me.grantland:autofittextview:0.2.1' testCompile 'junit:junit:4.12' testCompile 'org.robolectric:robolectric:3.0' diff --git a/app/src/main/java/calculator/simplemobiletools/com/simple_calculator/Formatter.java b/app/src/main/java/calculator/simplemobiletools/com/simple_calculator/Formatter.java index 064da988..c5d15d3b 100644 --- a/app/src/main/java/calculator/simplemobiletools/com/simple_calculator/Formatter.java +++ b/app/src/main/java/calculator/simplemobiletools/com/simple_calculator/Formatter.java @@ -13,7 +13,6 @@ public class Formatter { symbols.setDecimalSeparator('.'); final DecimalFormat formatter = new DecimalFormat(); - formatter.setMaximumIntegerDigits(12); formatter.setMaximumFractionDigits(12); formatter.setDecimalFormatSymbols(symbols); formatter.setGroupingUsed(false); diff --git a/app/src/main/java/calculator/simplemobiletools/com/simple_calculator/MainActivity.java b/app/src/main/java/calculator/simplemobiletools/com/simple_calculator/MainActivity.java index 4b9804ae..ec642313 100644 --- a/app/src/main/java/calculator/simplemobiletools/com/simple_calculator/MainActivity.java +++ b/app/src/main/java/calculator/simplemobiletools/com/simple_calculator/MainActivity.java @@ -10,6 +10,7 @@ import butterknife.Bind; import butterknife.ButterKnife; import butterknife.OnClick; import butterknife.OnLongClick; +import me.grantland.widget.AutofitHelper; public class MainActivity extends AppCompatActivity implements Calculator { @Bind(R.id.result) TextView result; @@ -24,6 +25,7 @@ public class MainActivity extends AppCompatActivity implements Calculator { ButterKnife.bind(this); calc = new CalculatorImpl(this); setupResultView(); + AutofitHelper.create(result); } private void setupResultView() {