Improve Travis and Screengrab config (#801)

## Screengrab
* Run screengrab on phone, 7 inch and 10 inch tablet emulator
* Remove old screenshots
* Generate locales list during ci run
* Update screenshots for docs

## Travis
* Use Travis build stages
* Only publish full apk. I have noticed that the foss builds on github still have crashalytics. Use F-Droid instead.
* Don't run cov and screenshots on crowdin branch
* Disable gradle deamon

Signed-off-by: mueller-ma <[email protected]>

.travis.yml

@@ -3,10 +3,11 @@ jdk: oraclejdk8
 env:
   global:
   - secure: fMBUkSsCBTw/U907w7Xm/yNzw4lq9yt7zFy0JyEZrA543LI7zQRIclIOtsDTUs0bwY+4KI08MNoYPLJ4TQhSJaH4wQ8b9C5TRsqXNfc0V718TcuYqSXqU6VPRVtX46/fCEWv/HAs0ksUKrHIlpWOwLPQpYDcKxwwlUndaakYKJ8=
+  - ADB_INSTALL_TIMEOUT=8
 
 before_cache:
 - find $HOME/.gradle/caches/ -name "*.lock" -exec rm -rfv {} \;
-- rm -rf $HOME/.gradle/caches/*/plugin-resolution/
+- rm -rfv $HOME/.gradle/caches/*/plugin-resolution/
 
 cache:
   directories:
@@ -19,51 +20,55 @@ notifications:
 
 android:
   components:
-  - tools
   - build-tools-25.0.2
-  - platform-tools
-  - tools
   - android-22
   - sys-img-armeabi-v7a-android-22
-  
+
 install:
-- sed -i 's/org.gradle.daemon=false/org.gradle.daemon=true/' ~/.gradle/gradle.properties
 - echo "mapsApiKey=AIzaSyA2t2893e9wccs9EnlnauJRgtqFNYQSp-o" >> ~/.gradle/gradle.properties
 - echo yes | sdkmanager "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2"
 - echo yes | sdkmanager "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2"
 - ./gradlew --version
 - sdkmanager --list || true
 
-# Emulator Management: Create, Start and Wait
-before_script:
-- android list device
-- echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a -d "5.4in FWVGA"
-- emulator -avd test -no-audio -no-window &
-- android-wait-for-emulator
-- adb shell input keyevent 82 &
-- android list target
-
-script:
-- bash travis/bump-versioncode.sh
-- bash travis/build-and-test-apk.sh
-- bash assets/store_descriptions/generate_and_validate.sh
-- bash <(curl -s https://codecov.io/bash)
-
-before_deploy:
-- bash travis/prepare-deploy.sh
+stages:
+    - test
+    - deploy
 
-deploy:
-  provider: releases
-  prerelease: true
-  file:
-    - $HOME/apks_to_deploy/openhab-android.apk
-    - $HOME/apks_to_deploy/openhab-android-foss.apk
-  skip_cleanup: true
-  overwrite: true
-  on:
-    repo: openhab/openhab-android
-    jdk: oraclejdk8
-    branch: master
-    tags: true
-  api_key:
-    secure: JaDHY9PaBF625dfulN8ygmOvBk3ZDmnZZDr7IPwqJ9hZ+4WzS85om8F9+bgQlZTDDVUeaNZ03ZkfRZ81g9D0EEHF5WSFqgN8aUcNoAa8ViBFAQUeO1uTjVkiP0G7JOVRyW59HTTk6Cjr5eiGKkmeIGT9KgUUi+4Bw/6Quag8f8Y=
+jobs:
+    include:
+        - stage: test
+          script: bash travis/test.sh
+          env:
+              - desc="Build & test"
+        - stage: test
+          script: bash travis/coverage.sh
+          env:
+              - desc="Codecov"
+          if: branch != l10n-crowdin
+        - stage: test
+          script: bash travis/screenshots.sh
+          env:
+              - desc="Screenshots"
+          if: branch != l10n-crowdin
+        - stage: test
+          script: bash assets/store_descriptions/generate_and_validate.sh
+          env:
+              - desc="Validate strings"
+        - stage: deploy
+          script: bash travis/prepare-deploy.sh
+          if: tag IS present
+          deploy:
+            provider: releases
+            prerelease: true
+            file:
+                - $HOME/apks_to_deploy/openhab-android.apk
+            skip_cleanup: true
+            overwrite: true
+            on:
+                repo: openhab/openhab-android
+                jdk: oraclejdk8
+                branch: master
+                tags: true
+            api_key:
+                secure: JaDHY9PaBF625dfulN8ygmOvBk3ZDmnZZDr7IPwqJ9hZ+4WzS85om8F9+bgQlZTDDVUeaNZ03ZkfRZ81g9D0EEHF5WSFqgN8aUcNoAa8ViBFAQUeO1uTjVkiP0G7JOVRyW59HTTk6Cjr5eiGKkmeIGT9KgUUi+4Bw/6Quag8f8Y=

README.md

@@ -33,7 +33,9 @@ openHAB Android application is a native client for openHAB. It uses REST API of
 * Discover devices and add them as items
 * Supports wall mounted tablets
 
-<img src="https://raw.githubusercontent.com/openhab/openhab-android/master/fastlane/metadata/android/en-US/phoneScreenshots/main_menu.png" width="200px"> <img src="https://raw.githubusercontent.com/openhab/openhab-android/master/fastlane/metadata/android/en-US/phoneScreenshots/widget_overview.png" width="200px"> <img src="https://raw.githubusercontent.com/openhab/openhab-android/master/fastlane/metadata/android/en-US/phoneScreenshots/astro_binding.png" width="200px">
+<img src="https://raw.githubusercontent.com/openhab/openhab-android/master/fastlane/metadata/android/en-US/images/phoneScreenshots/main-menu.png" width="200px">
+<img src="https://raw.githubusercontent.com/openhab/openhab-android/master/fastlane/metadata/android/en-US/images/phoneScreenshots/widget-overview.png" width="200px">
+<img src="https://raw.githubusercontent.com/openhab/openhab-android/master/fastlane/metadata/android/en-US/images/phoneScreenshots/chart.png" width="200px">
 
 ## Localization
 

docs/USAGE.md

@@ -26,8 +26,8 @@ The app follows the basic principles of the other openHAB UIs, like Basic UI, an
 * Supports wall mounted tablets
 
 <div class="row">
-  <div class="col s12 m6"><img src="images/main_menu.png" alt="Demo Overview"></div>
-  <div class="col s12 m6"><img src="images/widget_overview.png" alt="Demo Widget Overview"></div>
+  <div class="col s12 m6"><img src="images/main-menu.png" alt="Demo Overview"></div>
+  <div class="col s12 m6"><img src="images/widget-overview.png" alt="Demo Widget Overview"></div>
 </div>
 
 ## Getting Started

fastlane/Screengrabfile

@@ -1,5 +1,4 @@
-locales ['af-ZA', 'ar-SA', 'bg-BG', 'ca-ES', 'cs-CZ', 'da-DK', 'de-DE', 'el-GR', 'en-US', 'es-ES', 'fi-FI', 'fr-FR', 'he-IL', 'hu-HU', 'id-ID', 'it-IT', 'ja-JP', 'ko-KR', 'lt-LT', 'nl-NL', 'no-NO', 'pl-PL', 'pt-BR', 'pt-PT', 'ro-RO', 'ru-RU', 'sr-SP', 'sv-SE', 'tl-PH', 'tr-TR', 'uk-UA', 'vi-VN', 'zh-CN']
-clear_previous_screenshots false
+clear_previous_screenshots true
 
 app_package_name('org.openhab.habdroid')
 app_apk_path('mobile/build/outputs/apk/fullStable/debug/mobile-full-stable-debug.apk')

mobile/src/androidTest/java/org/openhab/habdroid/screengrab/ScreengrabTest.java

@@ -22,6 +22,8 @@
 import org.openhab.habdroid.TestWithoutIntro;
 import org.openhab.habdroid.ui.BasicWidgetTest;
 
+import tools.fastlane.screengrab.Screengrab;
+import tools.fastlane.screengrab.UiAutomatorScreenshotStrategy;
 import tools.fastlane.screengrab.locale.LocaleTestRule;
 
 import static android.support.test.espresso.Espresso.onData;
@@ -51,43 +53,23 @@ public class ScreengrabTest extends TestWithoutIntro {
     public void test() {
         ViewInteraction recyclerView = onView(withId(R.id.recyclerview));
 
-        screenshot("menu");
+        screenshot("main-menu");
 
-        // open widget overview
-        recyclerView.perform(RecyclerViewActions.actionOnItemAtPosition(10, click()));
-
-        screenshot("widget_overview");
+        // open first floor => Office
+        recyclerView.perform(RecyclerViewActions.actionOnItemAtPosition(0, click()));
+        recyclerView.perform(RecyclerViewActions.actionOnItemAtPosition(1, click()));
+        screenshot("office");
 
-        // open nfc selection
-        recyclerView.perform(actionOnItemAtPosition(1, longClick()));
-
-        screenshot("nfc_selection");
-
-        // close nfc selection
+        pressBack();
         pressBack();
 
-        // check whether selection widget appears and click on it
-        recyclerView
-                .perform(RecyclerViewActions.scrollToPosition(4))
-                .check(matches(atPositionOnView(4, withText("Scene Selection"), R.id.widgetlabel)))
-                .check(matches(atPositionOnView(4, isDisplayed(), R.id.selectionspinner)))
-                .perform(RecyclerViewActions.actionOnItemAtPosition(4, onChildView(click(), R.id.selectionspinner)));
-
-        screenshot("selection");
-
-        DataInteraction appCompatCheckedTextView = onData(anything())
-                .inAdapterView(withClassName(
-                        is("com.android.internal.app.AlertController$RecycleListView")))
-                .atPosition(0);
-        appCompatCheckedTextView.check(matches(withText("off")));
-        appCompatCheckedTextView.perform(click());
+        // open "Outside Temperature"
+        recyclerView.perform(RecyclerViewActions.actionOnItemAtPosition(5, click()));
+        screenshot("chart");
+        pressBack();
 
-        if (BuildConfig.FLAVOR.equals("full")) {
-            // check whether map view is displayed
-            recyclerView
-                    .perform(RecyclerViewActions.scrollToPosition(13))
-                    .check(matches(atPositionOnView(13, isDisplayed(), "MapView")));
-            screenshot("mapview");
-        }
+        // open widget overview
+        recyclerView.perform(RecyclerViewActions.actionOnItemAtPosition(10, click()));
+        screenshot("widget-overview");
     }
 }

travis/build-and-test-apk.sh → travis/coverage.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 set -e
 
@@ -14,11 +14,5 @@ then
     packageName="org.openhab.habdroid.beta"
 fi
 
-echo "Build"
-time ./gradlew :mobile:assemble{Foss,Full}${releaseFlavorCapital}{Debug,Release}
-echo "Unit tests"
-time ./gradlew :mobile:test{Foss,Full}${releaseFlavorCapital}ReleaseUnitTest
-echo "Android tests"
-time ./gradlew :mobile:connected{Foss,Full}${releaseFlavorCapital}DebugAndroidTest
-echo "Jacoco coverage reports"
 time ./gradlew :mobile:jacocoTest{Foss,Full}${releaseFlavorCapital}DebugUnitTestReport
+time bash <(curl -s https://codecov.io/bash)

travis/prepare-deploy.sh

@@ -2,72 +2,25 @@
 
 set -e
 
+bash travis/bump-versioncode.sh
+
 releaseFlavor="stable"
-releaseFlavorCaptital="Stable"
+releaseFlavorCapital="Stable"
 
 if $(echo "$TRAVIS_TAG" | grep -q "beta")
 then
     echo "Beta"
     releaseFlavor="beta"
-    releaseFlavorCaptital="Beta"
+    releaseFlavorCapital="Beta"
 fi
-
+echo "Build apk"
+time ./gradlew :mobile:assembleFull${releaseFlavorCapital}Release
 echo "Sign apk"
 openssl aes-256-cbc -K $encrypted_903a93ed2309_key -iv $encrypted_903a93ed2309_iv -in keystore.enc -out keystore -d
 cp $TRAVIS_BUILD_DIR/keystore $HOME
 mkdir $HOME/apks_to_deploy
-cp mobile/build/outputs/apk/full${releaseFlavorCaptital}/release/mobile-full-${releaseFlavor}-release-unsigned.apk $HOME/apks_to_deploy
-cp mobile/build/outputs/apk/foss${releaseFlavorCaptital}/release/mobile-foss-${releaseFlavor}-release-unsigned.apk $HOME/apks_to_deploy
+cp mobile/build/outputs/apk/full${releaseFlavorCapital}/release/mobile-full-${releaseFlavor}-release-unsigned.apk $HOME/apks_to_deploy
 cd $HOME/apks_to_deploy
 jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore $HOME/keystore -storepass $storepass mobile-full-${releaseFlavor}-release-unsigned.apk sign > /dev/null
-jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore $HOME/keystore -storepass $storepass mobile-foss-${releaseFlavor}-release-unsigned.apk sign > /dev/null
 jarsigner -verify mobile-full-${releaseFlavor}-release-unsigned.apk > /dev/null
-jarsigner -verify mobile-foss-${releaseFlavor}-release-unsigned.apk > /dev/null
 ${ANDROID_HOME}/build-tools/25.0.2/zipalign -v 4 mobile-full-${releaseFlavor}-release-unsigned.apk openhab-android.apk > /dev/null
-${ANDROID_HOME}/build-tools/25.0.2/zipalign -v 4 mobile-foss-${releaseFlavor}-release-unsigned.apk openhab-android-foss.apk > /dev/null
-cd -
-
-echo "Configure git"
-git config --local user.name "openhab-bot"
-git config --local user.email "[email protected]"
-echo "Check for beta version"
-if $(echo "$TRAVIS_TAG" | grep -q "beta")
-then
-    bash assets/store_descriptions/generate_and_validate.sh fdroidBeta
-else
-    bash assets/store_descriptions/generate_and_validate.sh fdroid
-fi
-
-# Workaround for #794: Remove crashalytics
-sed -i -e 's|maven.fabric.io/public|repo1.maven.org/maven2|' -e /fabric/d -e '/google-services/d' mobile/build.gradle
-echo "Build apks for screengrab"
-time ./gradlew assembleFullStable assembleAndroidTest
-echo "Install fastlane"
-gem install fastlane screengrab
-echo "Run screengrab"
-time fastlane screengrab
-
-echo "Git add"
-git add fastlane/* "mobile/src/main/AndroidManifest.xml"
-echo "Git commit"
-git commit -m "Bump version to $TRAVIS_TAG and update fastlane metadata"
-echo "Git tag"
-git tag -a "${TRAVIS_TAG}-fdroid" -m "${TRAVIS_TAG} for F-Droid"
-echo "Git decrypt key"
-openssl aes-256-cbc -K $encrypted_c0c05d762590_key -iv $encrypted_c0c05d762590_iv -in travis/key.enc -out travis/key -d > /dev/null 2>&1
-echo "Copy ssh config"
-cp travis/ssh-config ~/.ssh/config
-echo "Change key permissions"
-chmod 400 travis/key
-echo "Git create master branch"
-git checkout -b master
-echo "Git add remote"
-git remote add github [email protected]:openhab/openhab-android > /dev/null 2>&1
-echo "Git fetch"
-git fetch github > /dev/null 2>&1
-echo "Git push master"
-git push --quiet github master > /dev/null 2>&1
-echo "Git push F-Droid tag"
-git push --quiet github ${TRAVIS_TAG}-fdroid > /dev/null 2>&1
-
-cd $HOME/apks_to_deploy

travis/screenshots.sh

@@ -0,0 +1,79 @@
+#!/bin/bash
+
+if [ -z "$TRAVIS_TAG" ]
+then
+    echo "No tag present, do nothing"
+    exit
+fi
+
+bash travis/bump-versioncode.sh
+
+if $(echo "$TRAVIS_TAG" | grep -q "beta")
+then
+    bash assets/store_descriptions/generate_and_validate.sh fdroidBeta
+else
+    bash assets/store_descriptions/generate_and_validate.sh fdroid
+fi
+
+# Workaround for #794: Remove crashalytics
+sed -i -e 's|maven.fabric.io/public|repo1.maven.org/maven2|' -e /fabric/d -e '/google-services/d' mobile/build.gradle
+echo "Build apks for screengrab"
+time ./gradlew assembleFullStable assembleAndroidTest
+echo "Configure locales for fastlane"
+locales=$(find assets/store_descriptions/*/strings.sh -type f -exec wc -l {} \; | grep -v '^13' | cut -d '/' -f 3 | sed "s/$/', /" | tr '\n' "'")
+locales="${locales%, \'}"
+locales="locales [ '$locales ]"
+echo "Locales: $locales"
+echo $locales >> fastlane/Screengrabfile
+echo "Install fastlane"
+gem install fastlane screengrab
+
+patch=$(echo "$TRAVIS_TAG" | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+)-(.*)/\3/')
+if [ $((patch%3)) -eq 0 ]
+then
+    bash travis/start-emulator.sh phone
+    echo "Run screengrab on a phone"
+elif [ $((patch%3)) -eq 1 ]
+then
+    bash travis/start-emulator.sh tenInch
+    echo "Run screengrab on a tenInch"
+else
+    bash travis/start-emulator.sh sevenInch
+    echo "Run screengrab on a sevenInch"
+fi
+time fastlane screengrab
+
+
+#bash travis/start-emulator.sh tenInch
+#echo "Run screengrab on a tablet"
+#time fastlane screengrab
+
+shopt -s globstar
+rename -n "s/(.*)_(.*).png$/\$1.png/" fastlane/metadata/android/**
+rename "s/(.*)_(.*).png$/\$1.png/" fastlane/metadata/android/**
+cp fastlane/metadata/android/en-US/images/phoneScreenshots/{main-menu,widget-overview}.png docs/images
+
+git config --local user.name "openhab-bot"
+git config --local user.email "[email protected]"
+echo "Git add"
+git add fastlane/* docs/* "mobile/src/main/AndroidManifest.xml"
+echo "Git commit"
+git commit -m "Bump version to $TRAVIS_TAG and update fastlane metadata"
+echo "Git tag"
+git tag -a "${TRAVIS_TAG}-fdroid" -m "${TRAVIS_TAG} for F-Droid"
+echo "Git decrypt key"
+openssl aes-256-cbc -K $encrypted_c0c05d762590_key -iv $encrypted_c0c05d762590_iv -in travis/key.enc -out travis/key -d > /dev/null 2>&1
+echo "Copy ssh config"
+cp travis/ssh-config ~/.ssh/config
+echo "Change key permissions"
+chmod 400 travis/key
+echo "Git create master branch"
+git checkout -b master
+echo "Git add remote"
+git remote add github [email protected]:openhab/openhab-android > /dev/null 2>&1
+echo "Git fetch"
+git fetch github > /dev/null 2>&1
+echo "Git push master"
+git push --quiet github master > /dev/null 2>&1
+echo "Git push F-Droid tag"
+git push --quiet github ${TRAVIS_TAG}-fdroid > /dev/null 2>&1