diff --git a/.gitignore b/.gitignore
index f5ae2de0d..40af9d3c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
build
.gradle
+local.properties
+gradle/local.properties
*.apk
.DS_Store
.metadata
diff --git a/README.md b/README.md
index dbb27a6d4..d87553ca9 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,25 @@ There are different ways to get the Gnucash app for Android; through the app sto
## Building
+### With Gradle
+
+Run `gradlew build installDebug` from the within the project folder.
+It will build the project for you and install it to the connected Android device or running emulator.
+
+
+### With Android Studio
+The easiest way to build is to install [Android Studio](https://developer.android.com/sdk/index.html) v1.+
+with [Gradle](https://www.gradle.org/) v2.2.1.
+Once installed, then you can import the project into Android Studio:
+
+1. Open `File`
+2. Import Project
+3. Select `build.gradle` under the project directory
+4. Click `OK`
+
+Then, Gradle will do everything for you.
+
+### With Maven
The build requires [Maven](http://maven.apache.org/download.html)
v3.1.1+ and the [Android SDK](http://developer.android.com/sdk/index.html)
to be installed in your development environment. In addition you'll need to set
diff --git a/app/build.gradle b/app/build.gradle
index c09bde65f..183ae5faf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -29,5 +29,8 @@ dependencies {
'com.actionbarsherlock:actionbarsherlock:4.4.0@aar',
'com.viewpagerindicator:library:2.4.1@aar',
'com.doomonafireball.betterpickers:library:1.5.2')
+
+ androidTestCompile ('com.jayway.android.robotium:robotium-solo:5.2.1',
+ 'com.squareup:fest-android:1.0.6')
}
\ No newline at end of file
diff --git a/integration-tests/src/main/AndroidManifest.xml b/app/src/androidTest/AndroidManifest.xml
similarity index 100%
rename from integration-tests/src/main/AndroidManifest.xml
rename to app/src/androidTest/AndroidManifest.xml
diff --git a/integration-tests/src/main/java/org/gnucash/android/test/db/AccountsDbAdapterTest.java b/app/src/androidTest/java/org/gnucash/android/test/db/AccountsDbAdapterTest.java
similarity index 100%
rename from integration-tests/src/main/java/org/gnucash/android/test/db/AccountsDbAdapterTest.java
rename to app/src/androidTest/java/org/gnucash/android/test/db/AccountsDbAdapterTest.java
diff --git a/integration-tests/src/main/java/org/gnucash/android/test/db/TransactionsDbAdapterTest.java b/app/src/androidTest/java/org/gnucash/android/test/db/TransactionsDbAdapterTest.java
similarity index 100%
rename from integration-tests/src/main/java/org/gnucash/android/test/db/TransactionsDbAdapterTest.java
rename to app/src/androidTest/java/org/gnucash/android/test/db/TransactionsDbAdapterTest.java
diff --git a/integration-tests/src/main/java/org/gnucash/android/test/model/AccountTest.java b/app/src/androidTest/java/org/gnucash/android/test/model/AccountTest.java
similarity index 100%
rename from integration-tests/src/main/java/org/gnucash/android/test/model/AccountTest.java
rename to app/src/androidTest/java/org/gnucash/android/test/model/AccountTest.java
diff --git a/integration-tests/src/main/java/org/gnucash/android/test/model/MoneyTest.java b/app/src/androidTest/java/org/gnucash/android/test/model/MoneyTest.java
similarity index 100%
rename from integration-tests/src/main/java/org/gnucash/android/test/model/MoneyTest.java
rename to app/src/androidTest/java/org/gnucash/android/test/model/MoneyTest.java
diff --git a/integration-tests/src/main/java/org/gnucash/android/test/model/SplitTest.java b/app/src/androidTest/java/org/gnucash/android/test/model/SplitTest.java
similarity index 100%
rename from integration-tests/src/main/java/org/gnucash/android/test/model/SplitTest.java
rename to app/src/androidTest/java/org/gnucash/android/test/model/SplitTest.java
diff --git a/integration-tests/src/main/java/org/gnucash/android/test/model/TransactionTest.java b/app/src/androidTest/java/org/gnucash/android/test/model/TransactionTest.java
similarity index 100%
rename from integration-tests/src/main/java/org/gnucash/android/test/model/TransactionTest.java
rename to app/src/androidTest/java/org/gnucash/android/test/model/TransactionTest.java
diff --git a/integration-tests/src/main/java/org/gnucash/android/test/ui/AccountsActivityTest.java b/app/src/androidTest/java/org/gnucash/android/test/ui/AccountsActivityTest.java
similarity index 99%
rename from integration-tests/src/main/java/org/gnucash/android/test/ui/AccountsActivityTest.java
rename to app/src/androidTest/java/org/gnucash/android/test/ui/AccountsActivityTest.java
index d2f0b6feb..a04a5fdb2 100644
--- a/integration-tests/src/main/java/org/gnucash/android/test/ui/AccountsActivityTest.java
+++ b/app/src/androidTest/java/org/gnucash/android/test/ui/AccountsActivityTest.java
@@ -253,7 +253,7 @@ public void testDeleteAccount(){
Exception expectedException = null;
try {
- mAccountsDbAdapter.getAccountID(accountUidToDelete);
+ mAccountsDbAdapter.getID(accountUidToDelete);
} catch (IllegalArgumentException e){
expectedException = e;
}
diff --git a/integration-tests/src/main/java/org/gnucash/android/test/ui/ExportTransactionsTest.java b/app/src/androidTest/java/org/gnucash/android/test/ui/ExportTransactionsTest.java
similarity index 100%
rename from integration-tests/src/main/java/org/gnucash/android/test/ui/ExportTransactionsTest.java
rename to app/src/androidTest/java/org/gnucash/android/test/ui/ExportTransactionsTest.java
diff --git a/integration-tests/src/main/java/org/gnucash/android/test/ui/TransactionsActivityTest.java b/app/src/androidTest/java/org/gnucash/android/test/ui/TransactionsActivityTest.java
similarity index 99%
rename from integration-tests/src/main/java/org/gnucash/android/test/ui/TransactionsActivityTest.java
rename to app/src/androidTest/java/org/gnucash/android/test/ui/TransactionsActivityTest.java
index a7b047b35..7864ef901 100644
--- a/integration-tests/src/main/java/org/gnucash/android/test/ui/TransactionsActivityTest.java
+++ b/app/src/androidTest/java/org/gnucash/android/test/ui/TransactionsActivityTest.java
@@ -157,7 +157,7 @@ public void testAddTransactionShouldRequireAmount(){
mSolo.waitForText(TRANSACTION_NAME);
validateTransactionListDisplayed();
- int beforeCount = mTransactionsDbAdapter.getTransactionsCount(mTransactionsDbAdapter.getAccountID(DUMMY_ACCOUNT_UID));
+ int beforeCount = mTransactionsDbAdapter.getTransactionsCount(DUMMY_ACCOUNT_UID);
clickSherlockActionBarItem(R.id.menu_add_transaction);
mSolo.waitForText("Description");
mSolo.enterText(0, "Lunch");
@@ -167,7 +167,7 @@ public void testAddTransactionShouldRequireAmount(){
boolean toastFound = mSolo.waitForText(toastAmountRequired);
assertTrue(toastFound);
- int afterCount = adapter.getTransactionsCount(adapter.getID(DUMMY_ACCOUNT_UID));
+ int afterCount = mTransactionsDbAdapter.getTransactionsCount(DUMMY_ACCOUNT_UID);
assertEquals(beforeCount, afterCount);
mSolo.goBack();
diff --git a/integration-tests/src/main/java/org/gnucash/android/test/util/ActionBarUtils.java b/app/src/androidTest/java/org/gnucash/android/test/util/ActionBarUtils.java
similarity index 100%
rename from integration-tests/src/main/java/org/gnucash/android/test/util/ActionBarUtils.java
rename to app/src/androidTest/java/org/gnucash/android/test/util/ActionBarUtils.java
diff --git a/integration-tests/src/main/res/drawable-hdpi/ic_launcher.png b/app/src/androidTest/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from integration-tests/src/main/res/drawable-hdpi/ic_launcher.png
rename to app/src/androidTest/res/drawable-hdpi/ic_launcher.png
diff --git a/integration-tests/src/main/res/drawable-ldpi/ic_launcher.png b/app/src/androidTest/res/drawable-ldpi/ic_launcher.png
similarity index 100%
rename from integration-tests/src/main/res/drawable-ldpi/ic_launcher.png
rename to app/src/androidTest/res/drawable-ldpi/ic_launcher.png
diff --git a/integration-tests/src/main/res/drawable-mdpi/ic_launcher.png b/app/src/androidTest/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from integration-tests/src/main/res/drawable-mdpi/ic_launcher.png
rename to app/src/androidTest/res/drawable-mdpi/ic_launcher.png
diff --git a/integration-tests/src/main/res/drawable-xhdpi/ic_launcher.png b/app/src/androidTest/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from integration-tests/src/main/res/drawable-xhdpi/ic_launcher.png
rename to app/src/androidTest/res/drawable-xhdpi/ic_launcher.png
diff --git a/integration-tests/src/main/res/layout/main.xml b/app/src/androidTest/res/layout/main.xml
similarity index 100%
rename from integration-tests/src/main/res/layout/main.xml
rename to app/src/androidTest/res/layout/main.xml
diff --git a/integration-tests/src/main/res/values/strings.xml b/app/src/androidTest/res/values/strings.xml
similarity index 100%
rename from integration-tests/src/main/res/values/strings.xml
rename to app/src/androidTest/res/values/strings.xml
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 000000000..c97a8bdb9
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000..0791fc393
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Fri Feb 13 15:34:08 CET 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-bin.zip
diff --git a/gradlew b/gradlew
new file mode 100644
index 000000000..91a7e269e
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+ echo "$*"
+}
+
+die ( ) {
+ echo
+ echo "$*"
+ echo
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+ [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=$((i+1))
+ done
+ case $i in
+ (0) set -- ;;
+ (1) set -- "$args0" ;;
+ (2) set -- "$args0" "$args1" ;;
+ (3) set -- "$args0" "$args1" "$args2" ;;
+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+ JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 000000000..8a0b282aa
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/integration-tests/.classpath b/integration-tests/.classpath
deleted file mode 100644
index 38c0f238c..000000000
--- a/integration-tests/.classpath
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/integration-tests/.project b/integration-tests/.project
deleted file mode 100644
index e9dcf6df8..000000000
--- a/integration-tests/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
- GnucashMobileTest
-
-
- GnucashMobile
-
-
-
- com.android.ide.eclipse.adt.ResourceManagerBuilder
-
-
-
-
- com.android.ide.eclipse.adt.PreCompilerBuilder
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- com.android.ide.eclipse.adt.ApkBuilder
-
-
-
-
-
- com.android.ide.eclipse.adt.AndroidNature
- org.eclipse.jdt.core.javanature
-
-
diff --git a/integration-tests/proguard-project.txt b/integration-tests/proguard-project.txt
deleted file mode 100644
index f2fe1559a..000000000
--- a/integration-tests/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
diff --git a/integration-tests/project.properties b/integration-tests/project.properties
deleted file mode 100644
index ce39f2d0a..000000000
--- a/integration-tests/project.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-18