Merge branch 'release/2.2.10'

.gitignore

@@ -34,3 +34,7 @@ gradle.properties
 
 # Local debug settings
 app/src/debug/raw/survey.properties
+
+#Builds
+builds/
+tmp/

RELEASE_NOTES.md

@@ -1,5 +1,30 @@
 Akvo FLOW app release notes
 ===========================
+# ver 2.2.10
+Date: 19 January 2017
+
+# New and noteworthy
+* **Update play services** - [#508] (https://github.com/akvo/akvo-flow-mobile/issues/508) Using Google Play Services version 7.5.0 with new features and bug fixes.
+* **Add basic lint configuration** - [#532] (https://github.com/akvo/akvo-flow-mobile/issues/532) Lint can now be run before building the app.
+* **Move Version code and name to properties file** - [#555] (https://github.com/akvo/akvo-flow-mobile/issues/555) It is now easier to increase version name and code.
+* **Remove location beacon sending** - [#550] (https://github.com/akvo/akvo-flow-mobile/issues/550) The location beacon sending feature, disabled by default, has now been completely removed.
+* **Design changes after update of support library** - [#559] (https://github.com/akvo/akvo-flow-mobile/issues/559) The Android Support Library has been updated to version 25.0.1 with multiple cosmetic improvements and fixes.
+* **Replace Akvo FLOW by Akvo Flow string** - [#564] (https://github.com/akvo/akvo-flow-mobile/issues/564) The app naming is now consistent everywhere in the app.
+* **Pull latest translations from Transifex** - [#589] (https://github.com/akvo/akvo-flow-mobile/issues/589) The translations have been updated.
+
+# Resolved issues
+* **Change the query type for the data point search** - [#467] (https://github.com/akvo/akvo-flow-mobile/issues/467) You can now easily search for a data point using any of the name fields, not just the first word.
+* **Error notification icon is shown as empty white circle** - [#486] (https://github.com/akvo/akvo-flow-mobile/issues/486) Notification look has been improved with new icon and colors.
+* **When notifications have long text, only one line is shown** - [#519] (https://github.com/akvo/akvo-flow-mobile/issues/519) Notifications can now be expanded on newer devices and the text has been made clearer and shorter.
+* **Error notification too long for unsuccessful syncing of data points** - [#560] (https://github.com/akvo/akvo-flow-mobile/issues/560) Notifications for data point syncing errors now have shorter text (similar to #519).
+* **Syncing imported data points** - [#526] (https://github.com/akvo/akvo-flow-mobile/issues/526) You will be notified if the data points were not synced correctly.
+* **When device is rotated user is shown the download update dialog again** - [#499] (https://github.com/akvo/akvo-flow-mobile/issues/499) You will no longer be constantly shown the update dialog when rotating the device.
+* **How to notify user of available updates**  - [#578] (https://github.com/akvo/akvo-flow-mobile/issues/578) Related to #499, the update frequency and user notification of new updates has been reduced.
+* **Form name does not wrap** - [#521] (https://github.com/akvo/akvo-flow-mobile/issues/521) Long form names are now displayed correctly.
+* **"About Akvo" is outdated** - [#545] (https://github.com/akvo/akvo-flow-mobile/issues/545) The "About Akvo" screen now shows up to date information.
+* **Long cascade options do not wrap** - [#568] (https://github.com/akvo/akvo-flow-mobile/issues/568) Long cascade names are now visible in full.
+
+---------------
 # ver 2.2.9
 Date: 24 November 2016
 

app/build.gradle

@@ -1,68 +1,89 @@
 apply plugin: 'com.android.application'
 
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0'
-    }
-}
-
 repositories {
     mavenCentral()
 }
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion "21.1.2"
-    defaultConfig {
-        minSdkVersion 10
-        targetSdkVersion 21
-        applicationId "org.akvo.flow"
-        testApplicationId "org.akvo.flow.tests"
-        testInstrumentationRunner "android.test.InstrumentationTestRunner"
-        testHandleProfiling true
-        testFunctionalTest true
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
-    signingConfigs {
+    compileSdkVersion 25
+    buildToolsVersion "25.0.1"
+    def versionPropsFile = file('version.properties')
 
-        debug {
-            keyAlias 'androiddebugkey'
-            keyPassword 'android'
-            storeFile file('debug-key/debug.keystore')
-            storePassword 'android'
-        }
+    if (versionPropsFile.canRead()) {
+        def Properties versionProps = new Properties()
+
+        versionProps.load(new FileInputStream(versionPropsFile))
+
+        def versionMajor = versionProps['VERSION_MAJOR'].toInteger()
+        def versionMinor = versionProps['VERSION_MINOR'].toInteger()
+        def versionPatch = versionProps['VERSION_PATCH'].toInteger()
+        def versionCodeProperty = versionProps['VERSION_CODE'].toInteger()
 
-        flowRelease {
-            storeFile file(RELEASE_STORE_FILE)
-            storePassword RELEASE_STORE_PASSWORD
-            keyAlias RELEASE_KEY_ALIAS
-            keyPassword RELEASE_KEY_PASSWORD
+        defaultConfig {
+            versionCode versionCodeProperty
+            versionName "${versionMajor}.${versionMinor}.${versionPatch}"
+            minSdkVersion 10
+            targetSdkVersion 21
+            applicationId "org.akvo.flow"
+            testApplicationId "org.akvo.flow.tests"
+            testInstrumentationRunner "android.test.InstrumentationTestRunner"
+            testHandleProfiling true
+            testFunctionalTest true
         }
+        compileOptions {
+            sourceCompatibility JavaVersion.VERSION_1_7
+            targetCompatibility JavaVersion.VERSION_1_7
+        }
+        signingConfigs {
+
+            debug {
+                keyAlias 'androiddebugkey'
+                keyPassword 'android'
+                storeFile file('debug-key/debug.keystore')
+                storePassword 'android'
+            }
 
-        buildTypes {
-            release {
-                signingConfig signingConfigs.flowRelease
+            flowRelease {
+                storeFile file(RELEASE_STORE_FILE)
+                storePassword RELEASE_STORE_PASSWORD
+                keyAlias RELEASE_KEY_ALIAS
+                keyPassword RELEASE_KEY_PASSWORD
+            }
+            buildTypes {
+                release {
+                    signingConfig signingConfigs.flowRelease
+                }
             }
         }
-    }
-    packagingOptions {
-        exclude 'META-INF/LICENSE'
-        exclude 'META-INF/NOTICE'
-    }
+        packagingOptions {
+            exclude 'META-INF/LICENSE'
+            exclude 'META-INF/NOTICE'
+        }
 
-    productFlavors {
-        flow {
+        productFlavors {
+            flow {
+            }
+            biogas {
+            }
+            cookstoves {
+            }
         }
-        biogas {
+
+        testOptions {
+            unitTests.returnDefaultValues = true
         }
-        cookstoves {
+
+        lintOptions {
+            // set to true to turn off analysis progress reporting by lint
+            quiet false
+            // if true, stop the gradle build if errors are found
+            abortOnError false
+            // if true, only report errors
+            ignoreWarnings false
+            lintConfig file('lint.xml')
         }
+    } else {
+        throw new GradleException("Could not read version.properties!")
     }
 }
 
@@ -74,15 +95,24 @@ android.applicationVariants.all { variant ->
 
 dependencies {
     compile fileTree(dir: 'libs', include: '*.jar')
-    compile 'com.android.support:appcompat-v7:19.+'
-    compile 'com.android.support:support-annotations:21.0.0'
-    compile 'com.google.android.gms:play-services:4.0.30'
+    compile 'com.android.support:appcompat-v7:25.0.1'
+    compile 'com.android.support:support-annotations:25.0.1'
+    compile 'com.google.android.gms:play-services-base:7.5.0'
+    compile 'com.google.android.gms:play-services-maps:7.5.0'
+    compile 'com.google.android.gms:play-services-gcm:7.5.0'
     compile 'org.ocpsoft.prettytime:prettytime:3.2.4.Final'
-    compile 'com.google.maps.android:android-maps-utils:0.3.3'
+    compile 'com.google.maps.android:android-maps-utils:0.4'
     compile 'com.fasterxml.jackson.core:jackson-databind:2.4.4'
     compile 'com.astuetz:pagerslidingtabstrip:1.0.1'
-    androidTestCompile 'junit:junit:4.12'
-    androidTestCompile 'org.mockito:mockito-core:1.9.5'
+    compile 'com.google.code.gson:gson:2.3'
+
+    testCompile 'junit:junit:4.12'
+    testCompile 'org.mockito:mockito-core:1.10.19'
+    testCompile "org.powermock:powermock-module-junit4:1.6.2"
+    testCompile "org.powermock:powermock-module-junit4-rule:1.6.2"
+    testCompile "org.powermock:powermock-api-mockito:1.6.2"
+    testCompile "org.powermock:powermock-classloading-xstream:1.6.2"
+
     androidTestCompile 'com.google.dexmaker:dexmaker:1.2'
     androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2'
 }

app/src/debug/res/values/donottranslate.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="google_maps_key" templateMergeStrategy="preserve" translatable="false">AIzaSyBuLUoucTMjv2kcGSN3s6tYy6YFa-9WV94</string>
+</resources>