diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml
deleted file mode 100644
index 35ee4f55..00000000
--- a/.idea/checkstyle-idea.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100644
index 9febb239..00000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,195 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 42cacc1c..9a8b7e5c 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -17,25 +17,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index d54a0ce6..d8210482 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,13 +1,4 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
\ No newline at end of file
diff --git a/.idea/findbugs-idea.xml b/.idea/findbugs-idea.xml
deleted file mode 100644
index c8493a76..00000000
--- a/.idea/findbugs-idea.xml
+++ /dev/null
@@ -1,219 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
new file mode 100644
index 00000000..d683ff49
--- /dev/null
+++ b/.idea/gradle.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index e3894bb2..6be9a901 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,47 +1,218 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ localhost
+ 5050
+
+
+
+
+
+
+ 1.6
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 8283ab19..d982d6de 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,13 +2,12 @@
-
-
-
-
-
+
+
+
+
-
+
\ No newline at end of file
diff --git a/.idea/runConfigurations/Acra_Analyzer.xml b/.idea/runConfigurations/Acra_Analyzer.xml
deleted file mode 100644
index 2c2df798..00000000
--- a/.idea/runConfigurations/Acra_Analyzer.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index c80f2198..35eb1ddf 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,7 +1,6 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/android-app-core.iml b/android-app-core.iml
deleted file mode 100644
index a45b85ca..00000000
--- a/android-app-core.iml
+++ /dev/null
@@ -1,306 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- true
-
- /res-overlay
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/android-app-core/android-app-core.iml b/android-app-core/android-app-core.iml
new file mode 100644
index 00000000..f655ac13
--- /dev/null
+++ b/android-app-core/android-app-core.iml
@@ -0,0 +1,108 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android-app-core/build.gradle b/android-app-core/build.gradle
new file mode 100644
index 00000000..5113aadd
--- /dev/null
+++ b/android-app-core/build.gradle
@@ -0,0 +1,146 @@
+/*
+ * Copyright 2014 serso aka se.solovyev
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ * Contact details
+ *
+ * Email: se.solovyev@gmail.com
+ * Site: http://se.solovyev.org
+ */
+
+apply plugin: 'com.android.library'
+apply plugin: 'maven'
+apply plugin: 'signing'
+
+android {
+ compileSdkVersion android_sdk_version()
+ buildToolsVersion android_build_tools_version()
+
+ defaultConfig {
+ minSdkVersion android_min_sdk_version()
+ targetSdkVersion android_sdk_version()
+ versionCode version_code()
+ versionName version_name()
+ }
+}
+
+dependencies {
+ compile project(':core')
+ compile 'org.solovyev:common-core:1.0.7'
+ compile 'org.solovyev:common-text:1.0.7'
+ compile 'org.solovyev.android:android-common-views:1.1.18@aar'
+ compile 'org.solovyev.android:android-common-menus:1.1.18@aar'
+ compile 'org.solovyev.android:android-common-core:1.1.18@aar'
+ compile 'org.solovyev.android:android-common-preferences:1.1.18@aar'
+ compile 'org.solovyev.android:android-common-app:1.1.18@aar'
+ compile('org.solovyev:jscl:1.0.8') {
+ exclude(module: 'xercesImpl')
+ }
+ compile 'com.actionbarsherlock:actionbarsherlock:4.4.0@aar'
+ compile 'com.google.android.admob:admob:6.4.1-r11.0.0'
+ compile 'com.android.support:support-v4:21.0.3'
+ //testCompile group: 'org.robolectric', name: 'robolectric', version: '2.1.1'
+}
+
+
+task androidJavadocs(type: Javadoc) {
+ source = android.sourceSets.main.java.srcDirs
+ classpath += project.files(android.plugin.getBootClasspath().join(File.pathSeparator))
+ configurations.compile.each { File file -> classpath += project.files(file.path) }
+}
+
+task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
+ classifier = 'javadoc'
+ from androidJavadocs.destinationDir
+}
+
+task androidSourcesJar(type: Jar) {
+ classifier = 'sources'
+ from android.sourceSets.main.java.srcDirs
+}
+
+task apklib(type: Zip) {
+ appendix = extension = 'apklib'
+
+ from 'src/main/AndroidManifest.xml'
+ into('res') {
+ from android.sourceSets.main.res.srcDirs
+ }
+ into('src') {
+ from android.sourceSets.main.java.srcDirs
+ }
+ into('src') {
+ from android.sourceSets.main.aidl.srcDirs
+ }
+}
+
+
+artifacts {
+ archives androidSourcesJar
+ archives androidJavadocsJar
+ archives apklib
+}
+
+signing {
+ sign configurations.archives
+}
+
+group = "org.solovyev.android"
+archivesBaseName = "calculatorpp-android-app-core"
+version = version_name()
+
+uploadArchives {
+ repositories {
+ mavenDeployer {
+ beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+
+ repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
+ authentication(userName: ossrhUsername, password: ossrhPassword)
+ }
+
+ snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
+ authentication(userName: ossrhUsername, password: ossrhPassword)
+ }
+
+ pom.project {
+ name 'Calculator++ Application Core'
+ packaging 'aar'
+ url 'https://github.com/serso/android-calculatorpp'
+
+ scm {
+ url 'https://github.com/serso/android-calculatorpp'
+ connection 'scm:https://serso@github.com/serso/android-calculatorpp.git'
+ developerConnection 'scm:git://github.com/serso/android-calculatorpp.git'
+ }
+
+ licenses {
+ license {
+ name 'The Apache Software License, Version 2.0'
+ url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+ distribution 'repo'
+ }
+ }
+
+ developers {
+ developer {
+ id 'se.solovyev'
+ name 'Sergey Solovyev'
+ email 'se.solovyev@gmail.com'
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/android-app-core/pom.xml b/android-app-core/pom.xml
deleted file mode 100644
index b9fa7acc..00000000
--- a/android-app-core/pom.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-
-
- 4.0.0
-
-
- org.solovyev.android
- calculatorpp-parent
- 2.0.7-SNAPSHOT
-
-
- org.solovyev.android
- calculatorpp-android-app-core
- 2.0.7-SNAPSHOT
- Calculator++ Application Core
- apklib
-
-
-
-
- org.solovyev.android
- calculatorpp-core
-
-
-
- org.solovyev
- common-core
-
-
-
- org.solovyev
- common-text
-
-
-
- org.solovyev.android
- android-common-all
- apklib
-
-
-
- org.solovyev
- jscl
-
-
-
- com.actionbarsherlock
- library
- apklib
-
-
-
- com.google.android
- android
- provided
-
-
-
- com.google.android
- support-v4
-
-
-
- junit
- junit
-
-
-
- org.robolectric
- robolectric
- test
-
-
-
-
-
-
-
-
- com.simpligility.maven.plugins
- android-maven-plugin
-
-
-
-
-
-
\ No newline at end of file
diff --git a/android-app-core/src/main/res/values/theme_gray.xml b/android-app-core/src/main/res/values/theme_gray.xml
index e63be8d4..de36f57c 100644
--- a/android-app-core/src/main/res/values/theme_gray.xml
+++ b/android-app-core/src/main/res/values/theme_gray.xml
@@ -181,7 +181,7 @@
- @style/cpp_default_actionbar_dropdown_listview_style
-