Demo + screenshots

Author: maltaisn

README.md

@@ -16,7 +16,7 @@ If you haven't migrated to AndroidX, use version 1.3.2. Versions 1.4.0 and up us
 - Learn how to [style the dialog](https://github.com/maltaisn/calcdialoglib/wiki/Styling-the-calculator) with the attributes
 
 ## Screenshots
-<img src="screenshots/demo.gif" alt="Demo" width="400px"/> <img src="screenshots/errors.gif" alt="Errors" width="400px"/>
+<img src="screenshots/demo.gif" alt="Demo" width="400px"/> <img src="screenshots/currency.gif" alt="Errors" width="400px"/>
 (Screenshots date back to version 1.0.0)
 
 ## Changelog

app/src/main/java/com/maltaisn/calcdialoglib/MainActivity.java

@@ -31,6 +31,7 @@
 import java.math.BigDecimal;
 import java.text.NumberFormat;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.FragmentManager;
@@ -44,6 +45,9 @@ public class MainActivity extends AppCompatActivity implements CalcDialog.CalcDi
     @Nullable
     private BigDecimal value;
 
+    @NonNull
+    private NumberFormat nbFmt = NumberFormat.getInstance();
+
     @Override
     protected void onCreate(Bundle state) {
         super.onCreate(state);
@@ -125,20 +129,19 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
             @Override
             public void onClick(View v) {
                 // Set dialog settings
-                NumberFormat nbFmt;
                 if (nbFmtTypeGroup.getCheckedRadioButtonId() == R.id.radio_nbfmt_default) {
                     nbFmt = NumberFormat.getInstance();
                 } else {
                     nbFmt = NumberFormat.getCurrencyInstance();
                 }
                 nbFmt.setMaximumIntegerDigits(maxIntChk.isChecked() ?
                         Integer.valueOf(maxIntEdt.getText().toString()) : Integer.MAX_VALUE);
-                nbFmt.setMaximumFractionDigits(maxFracChk.isChecked() ?
+                nbFmt.setMaximumFractionDigits(maxFracChk.isChecked() && minValEdt.length() > 0 ?
                         Integer.valueOf(maxFracEdt.getText().toString()) : Integer.MAX_VALUE);
 
-                BigDecimal minValue = minValChk.isChecked() ?
+                BigDecimal minValue = minValChk.isChecked() && minValEdt.length() > 0 ?
                         new BigDecimal(minValEdt.getText().toString()) : null;
-                BigDecimal maxValue = maxValChk.isChecked() ?
+                BigDecimal maxValue = maxValChk.isChecked() && maxValEdt.length() > 0 ?
                         new BigDecimal(maxValEdt.getText().toString()) : null;
                 CalcNumpadLayout numpadLayout = numpadLayoutGroup.getCheckedRadioButtonId() == R.id.radio_numpad_calc ?
                         CalcNumpadLayout.CALCULATOR : CalcNumpadLayout.PHONE;
@@ -192,7 +195,7 @@ private void updateValueText() {
         if (value == null) {
             valueTxv.setText(R.string.result_value_none);
         } else {
-            valueTxv.setText(value.toPlainString());
+            valueTxv.setText(nbFmt.format(value));
         }
     }