diff --git a/README.md b/README.md index e15eb6ee..487dcfc6 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![License](https://img.shields.io/badge/license-GNU_GPLv3-orange.svg)](https://github.com/mkulesh/microMathematics/blob/master/LICENSE) [![Build Status](https://travis-ci.org/mkulesh/microMathematics.svg?branch=master)](https://travis-ci.org/mkulesh/microMathematics) [![Download unsigned APK from latest autobuild](https://img.shields.io/badge/APK-autobuild-blue.svg)](https://github.com/mkulesh/microMathematics/raw/autobuild/autobuild/microMathematics-v2.17.0.apk) +[![License](https://img.shields.io/badge/license-GNU_GPLv3-orange.svg)](https://github.com/mkulesh/microMathematics/blob/master/LICENSE) [![Build Status](https://travis-ci.org/mkulesh/microMathematics.svg?branch=master)](https://travis-ci.org/mkulesh/microMathematics) [![Download unsigned APK from latest autobuild](https://img.shields.io/badge/APK-autobuild-blue.svg)](https://github.com/mkulesh/microMathematics/raw/autobuild/autobuild/microMathematics-v2.17.1.apk) # "microMathematics Plus - Extended visual calculator" @@ -42,7 +42,7 @@ For more screenshots, see directory images/screenshots. ## Documentation * [Supported Functions Overview](http://htmlpreview.github.io/?https://github.com/mkulesh/microMathematics/blob/master/doc/html/functions_overview.html) * [Supported Units Overview](http://htmlpreview.github.io/?https://github.com/mkulesh/microMathematics/blob/master/doc/html/units_overview.html) -* [The latest PDF version of the User Manual](https://docs.google.com/viewer?url=https://github.com/mkulesh/microMathematics/raw/supplement/doc/microMathematics-v2.17.0.pdf) +* [The latest PDF version of the User Manual](https://docs.google.com/viewer?url=https://github.com/mkulesh/microMathematics/raw/supplement/doc/microMathematics-v2.17.1.pdf) ## Posts on Habrahabr (in Russian) diff --git a/app/build.gradle b/app/build.gradle index 45fee1b1..fb8b37df 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,7 +8,7 @@ android { minSdkVersion 14 targetSdkVersion 26 versionCode 308 - versionName "2.17.0" + versionName "2.17.1" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { diff --git a/app/src/main/java/com/mkulesh/micromath/BaseFragment.java b/app/src/main/java/com/mkulesh/micromath/BaseFragment.java index eaf150f9..82dd2131 100644 --- a/app/src/main/java/com/mkulesh/micromath/BaseFragment.java +++ b/app/src/main/java/com/mkulesh/micromath/BaseFragment.java @@ -182,7 +182,7 @@ protected void setWorksheetName(CharSequence name) protected void onSaveFinished() { // Allow save button (for the case if a read-only asset is saved on SD card) - final MenuItem saveItem = (mainMenu == null)? null : mainMenu.findItem(R.id.action_save); + final MenuItem saveItem = (mainMenu == null) ? null : mainMenu.findItem(R.id.action_save); if (saveItem != null) { saveItem.setVisible(true); diff --git a/app/src/main/java/com/mkulesh/micromath/dialogs/DialogResultDetails.java b/app/src/main/java/com/mkulesh/micromath/dialogs/DialogResultDetails.java index afac84f4..9a23c6b9 100644 --- a/app/src/main/java/com/mkulesh/micromath/dialogs/DialogResultDetails.java +++ b/app/src/main/java/com/mkulesh/micromath/dialogs/DialogResultDetails.java @@ -146,7 +146,7 @@ public ArgumentValueAdapter(Context context, ArrayList list, { super(context, 0, list); this.docProp = docProp; - this.targetUnit = resProp != null? TermParser.parseUnits(resProp.units) : null; + this.targetUnit = resProp != null ? TermParser.parseUnits(resProp.units) : null; } @Override diff --git a/app/src/main/java/com/mkulesh/micromath/formula/PaletteButton.java b/app/src/main/java/com/mkulesh/micromath/formula/PaletteButton.java index 08a42e80..469fdbcf 100644 --- a/app/src/main/java/com/mkulesh/micromath/formula/PaletteButton.java +++ b/app/src/main/java/com/mkulesh/micromath/formula/PaletteButton.java @@ -157,6 +157,7 @@ public void setEnabled(Category t, boolean value) *********************************************************/ private int colorAttrId = Integer.MIN_VALUE; + public void setColorAttr(@AttrRes int attrId) { if (this.colorAttrId != attrId) diff --git a/app/src/main/java/com/mkulesh/micromath/formula/TermField.java b/app/src/main/java/com/mkulesh/micromath/formula/TermField.java index e0d6a9d6..29a4f710 100644 --- a/app/src/main/java/com/mkulesh/micromath/formula/TermField.java +++ b/app/src/main/java/com/mkulesh/micromath/formula/TermField.java @@ -519,7 +519,7 @@ public void readFromXml(XmlPullParser parser) throws Exception } else if (unit != null && !unit.isEmpty()) { - setText(text.isEmpty()? unit : text + TermParser.UNIT_SEPARATOR + unit); + setText(text.isEmpty() ? unit : text + TermParser.UNIT_SEPARATOR + unit); } else { @@ -558,7 +558,7 @@ public void writeToXml(XmlSerializer serializer) throws Exception { if (isEmptyOrAutoContent()) { - serializer.attribute(FormulaList.XML_NS, FormulaList.XML_PROP_TEXT, ""); + serializer.attribute(FormulaList.XML_NS, FormulaList.XML_PROP_TEXT, ""); } else if (parser.getUnit() != null && parser.getUnitTags() != null) { diff --git a/app/src/main/java/com/mkulesh/micromath/formula/terms/Intervals.java b/app/src/main/java/com/mkulesh/micromath/formula/terms/Intervals.java index ffea6ed6..6f2dce6b 100644 --- a/app/src/main/java/com/mkulesh/micromath/formula/terms/Intervals.java +++ b/app/src/main/java/com/mkulesh/micromath/formula/terms/Intervals.java @@ -165,7 +165,7 @@ public Intervals(Context context, AttributeSet attrs) @Override public CalculatedValue.ValueType getValue(CalculaterTask thread, CalculatedValue outValue) throws CancelException { - Pair units = compareUnits(new TermField []{minValueTerm, nextValueTerm, maxValueTerm}); + Pair units = compareUnits(new TermField[]{ minValueTerm, nextValueTerm, maxValueTerm }); if (units.getFirst() != null && units.getSecond() != 3) { return outValue.invalidate(CalculatedValue.ErrorType.INCOMPATIBLE_UNIT); @@ -280,7 +280,7 @@ else if (v.getText().toString() * FormulaTermInterval-specific methods *********************************************************/ - private Pair compareUnits(TermField [] terms) + private Pair compareUnits(TermField[] terms) { Unit unit = terms[0].getParser().getUnit(); int compatibleNumber = 0; @@ -296,7 +296,7 @@ private Pair compareUnits(TermField [] terms) unit = tp; } } - return new Pair<>(unit == null? null : unit.getStandardUnit(), compatibleNumber); + return new Pair<>(unit == null ? null : unit.getStandardUnit(), compatibleNumber); } /** @@ -304,7 +304,7 @@ private Pair compareUnits(TermField [] terms) */ public ArrayList getInterval(CalculaterTask thread) throws CancelException { - Pair units = compareUnits(new TermField []{minValueTerm, nextValueTerm, maxValueTerm}); + Pair units = compareUnits(new TermField[]{ minValueTerm, nextValueTerm, maxValueTerm }); if (units.getFirst() != null && units.getSecond() != 3) { return null; diff --git a/app/src/main/java/com/mkulesh/micromath/formula/terms/TermFactory.java b/app/src/main/java/com/mkulesh/micromath/formula/terms/TermFactory.java index 52e00522..1f1189e9 100644 --- a/app/src/main/java/com/mkulesh/micromath/formula/terms/TermFactory.java +++ b/app/src/main/java/com/mkulesh/micromath/formula/terms/TermFactory.java @@ -63,7 +63,7 @@ public static void prepare() allTerms.addAll(Arrays.asList(SeriesIntegrals.LoopType.values())); termMap = new HashMap<>(); - for(TermTypeIf t : allTerms) + for (TermTypeIf t : allTerms) { termMap.put(t.getLowerCaseName(), t); } diff --git a/app/src/main/java/com/mkulesh/micromath/io/ExportToLatex.java b/app/src/main/java/com/mkulesh/micromath/io/ExportToLatex.java index d622922f..5ca97393 100644 --- a/app/src/main/java/com/mkulesh/micromath/io/ExportToLatex.java +++ b/app/src/main/java/com/mkulesh/micromath/io/ExportToLatex.java @@ -122,7 +122,7 @@ public class ExportToLatex { "Ω", "\\Omega" }, { "ω", "\\omega" } }; protected final String[][] supplementTable = new String[][]{ - { "°", "\\degree" }}; + { "°", "\\degree" } }; public ExportToLatex(Context context, OutputStream stream, final Uri uri, final AdapterIf adapter, final Exporter.Parameters exportParameters) throws Exception diff --git a/app/src/main/java/com/mkulesh/micromath/io/ExportToMathJax.java b/app/src/main/java/com/mkulesh/micromath/io/ExportToMathJax.java index a4a4030d..f544704c 100644 --- a/app/src/main/java/com/mkulesh/micromath/io/ExportToMathJax.java +++ b/app/src/main/java/com/mkulesh/micromath/io/ExportToMathJax.java @@ -62,7 +62,7 @@ public void write(FormulaList formulas) throws Exception writer.append("\n"); writer.append("\n"); writer.append(""); - writer.append(isPropEmpty(docProp.title)? fileName : docProp.title); + writer.append(isPropEmpty(docProp.title) ? fileName : docProp.title); writer.append("\n"); writer.append("