diff --git a/calculatorpp-service/AndroidManifest.xml b/calculatorpp-service/AndroidManifest.xml index d1739b4a..7c364aa4 100644 --- a/calculatorpp-service/AndroidManifest.xml +++ b/calculatorpp-service/AndroidManifest.xml @@ -1,6 +1,2 @@ - + \ No newline at end of file diff --git a/calculatorpp-service/pom.xml b/calculatorpp-service/pom.xml index b518441b..ff0be12d 100644 --- a/calculatorpp-service/pom.xml +++ b/calculatorpp-service/pom.xml @@ -32,38 +32,4 @@ - - - - - com.jayway.maven.plugins.android.generation2 - android-maven-plugin - 3.1.1 - - - - - - - org.codehaus.mojo - properties-maven-plugin - 1.0-alpha-2 - - - initialize - - read-project-properties - - - - ${basedir}/src/misc/env/env.properties - - - - - - - - - \ No newline at end of file diff --git a/calculatorpp-service/res/values/dummy.xml b/calculatorpp-service/res/values/dummy.xml new file mode 100644 index 00000000..dee82b37 --- /dev/null +++ b/calculatorpp-service/res/values/dummy.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/calculatorpp/pom.xml b/calculatorpp/pom.xml index f972de02..2b177cdb 100644 --- a/calculatorpp/pom.xml +++ b/calculatorpp/pom.xml @@ -133,63 +133,13 @@ - - - - - - ${project.basedir}/res - true - ${project.build.directory}/filtered-res - - **/*.xml - - - - - ${project.basedir}/res - false - ${project.build.directory}/filtered-res - - **/*.xml - - - - - - - maven-resources-plugin - 2.4.3 - - - initialize - - resources - - - - - com.jayway.maven.plugins.android.generation2 android-maven-plugin - true - - ${project.build.directory}/filtered-res - - true - - + - - manifestUpdate - process-resources - - manifest-update - - alignApk package @@ -198,6 +148,7 @@ + @@ -213,7 +164,6 @@ ${project.basedir}/src/misc/env/jarsigner.properties - ${project.basedir}/src/misc/env/env.properties @@ -334,6 +284,7 @@ + org.codehaus.mojo build-helper-maven-plugin @@ -361,6 +312,7 @@ + diff --git a/calculatorpp/res/values-uk/text_functions.xml b/calculatorpp/res/values-uk/text_functions.xml index c52d9099..e398ce5f 100644 --- a/calculatorpp/res/values-uk/text_functions.xml +++ b/calculatorpp/res/values-uk/text_functions.xml @@ -8,7 +8,7 @@ Функції - Тригонометрична фунція синус. + Тригонометрична фунція синус. Тригонометрична функція косинус. Тригонометрична функція тангенс. Тригонометрична функція котангенс. diff --git a/calculatorpp/res/values-uk/text_strings.xml b/calculatorpp/res/values-uk/text_strings.xml index 1f944e85..0a317202 100644 --- a/calculatorpp/res/values-uk/text_strings.xml +++ b/calculatorpp/res/values-uk/text_strings.xml @@ -177,7 +177,7 @@ Увага Помилка - Біллінг не підтримується: ви повинні мати обліковий запис Google Checkout, пов'язаний з вашим обліковим записом Google і мати підключення до Інтернету. + Біллінг не підтримується: ви повинні мати обліковий запис Google Checkout, пов’язаний з вашим обліковим записом Google і мати підключення до Інтернету. Підтримати проект І позбутися реклами diff --git a/calculatorpp/src/test/java/org/solovyev/android/calculator/TextHighlighterTest.java b/calculatorpp/src/test/java/org/solovyev/android/calculator/TextHighlighterTest.java index 12413380..0f0739cf 100644 --- a/calculatorpp/src/test/java/org/solovyev/android/calculator/TextHighlighterTest.java +++ b/calculatorpp/src/test/java/org/solovyev/android/calculator/TextHighlighterTest.java @@ -53,10 +53,10 @@ public class TextHighlighterTest { Assert.assertEquals("0.1E3", textHighlighter.process("0.1E3").toString()); Assert.assertEquals("1E3", textHighlighter.process("1E3").toString()); Assert.assertEquals("20x:", textHighlighter.process("20x:").toString()); - Assert.assertEquals("20x", textHighlighter.process("20x").toString()); - Assert.assertEquals("22x", textHighlighter.process("22x").toString()); - Assert.assertEquals("20t", textHighlighter.process("20t").toString()); - Assert.assertEquals("20k", textHighlighter.process("20k").toString()); + Assert.assertEquals("20g", textHighlighter.process("20g").toString()); + Assert.assertEquals("22g", textHighlighter.process("22g").toString()); + Assert.assertEquals("20ю", textHighlighter.process("20ю").toString()); + Assert.assertEquals("20ъ", textHighlighter.process("20ъ").toString()); Assert.assertEquals("3!!", textHighlighter.process("3!!").toString()); Assert.assertEquals("2", textHighlighter.process("2").toString()); Assert.assertEquals("21", textHighlighter.process("21").toString()); diff --git a/pom.xml b/pom.xml index d75cc986..2ccf3063 100644 --- a/pom.xml +++ b/pom.xml @@ -16,37 +16,116 @@ calculatorpp-test + + UTF-8 + /home/ssolovyev/projects/org.solovyev/misc/lib/android-sdk-linux_x86 + + + junit junit 4.8.1 + com.google.android android 4.0.1.2 provided + com.google.android android-test 2.3.1 + + + + + + + + ${project.basedir}/res + true + ${project.build.directory}/filtered-res + + **/*.xml + + + + + ${project.basedir}/res + false + ${project.build.directory}/filtered-res + + **/*.xml + + + + + + + + + maven-resources-plugin + 2.4.3 + + + initialize + + resources + + + + + + + com.jayway.maven.plugins.android.generation2 + android-maven-plugin + true + + + ${project.build.directory}/filtered-res + + true + + + + + + + manifestUpdate + process-resources + + manifest-update + + + + + + + + + + org.apache.maven.plugins maven-jarsigner-plugin 1.2 + org.apache.maven.plugins maven-resources-plugin 2.4.3 @@ -98,6 +177,15 @@ + + + + com.jayway.maven.plugins.android.generation2 + android-maven-plugin + 3.1.1 + + +