diff --git a/CHANGELOG.md b/CHANGELOG.md index 283fc91..d18a8b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,3 +17,9 @@ # Translations # * German, Spanish + + + +## v0.1.1# +* FIX: Spanish translation +* FIX: Empty Newsview after deletion of first newsitem diff --git a/Friendiqa.apk b/Friendiqa_v0.1.1.apk similarity index 64% rename from Friendiqa.apk rename to Friendiqa_v0.1.1.apk index 673aa2e..dbd3f04 100644 Binary files a/Friendiqa.apk and b/Friendiqa_v0.1.1.apk differ diff --git a/source-android/android/AndroidManifest.xml b/source-android/android/AndroidManifest.xml index 60b9234..4ecc510 100644 --- a/source-android/android/AndroidManifest.xml +++ b/source-android/android/AndroidManifest.xml @@ -1,11 +1,7 @@ - + - + diff --git a/source-android/android/gradle.properties~ b/source-android/android/gradle.properties~ deleted file mode 100644 index 0463ab8..0000000 --- a/source-android/android/gradle.properties~ +++ /dev/null @@ -1,4 +0,0 @@ -androidBuildToolsVersion=25.0.3 -androidCompileSdkVersion=25 -buildDir=.build -qt5AndroidDir=/home/pankraz/Qt/5.9.1/android_armv7/src/android/java diff --git a/source-android/android/local.properties~ b/source-android/android/local.properties~ deleted file mode 100644 index ada6c98..0000000 --- a/source-android/android/local.properties~ +++ /dev/null @@ -1 +0,0 @@ -sdk.dir=/home/pankraz/android-sdk_alt diff --git a/source-android/androidnative.pri/.gitignore b/source-android/androidnative.pri/.gitignore new file mode 100644 index 0000000..23657c7 --- /dev/null +++ b/source-android/androidnative.pri/.gitignore @@ -0,0 +1,45 @@ +# C++ objects and libs + +*.slo +*.lo +*.o +*.a +*.la +*.lai +*.so +*.dll +*.dylib + +# Qt-es + +/.qmake.cache +/.qmake.stash +*.pro.user +*.pro.user.* +*.moc +moc_*.cpp +qrc_*.cpp +ui_*.h +Makefile* +*-build-* +build-* +html + +# QtCreator + +*.autosave +.idea + +tests/quickandroidactivitytests/tests/bin/* +tests/quickandroidactivitytests/tests/gen/* + +#Android +local.properties +gradle.properties +.build +.gradle +*.iml +vendor +tests/instrument/build +build +*.swp diff --git a/source-android/androidnative.pri/.gitmodules b/source-android/androidnative.pri/.gitmodules new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/source-android/androidnative.pri/.gitmodules @@ -0,0 +1 @@ + diff --git a/source-android/androidnative.pri/.travis.yml b/source-android/androidnative.pri/.travis.yml new file mode 100644 index 0000000..deffa3c --- /dev/null +++ b/source-android/androidnative.pri/.travis.yml @@ -0,0 +1,61 @@ +language : android +addons: + apt: + packages: + - p7zip + - coreutils + - realpath +android: + components: + - build-tools-23.0.2 + - android-19 + - extra-google-google_play_services +env: + - DISPLAY=:99.0 +compiler: + - gcc +before_install: + - wget -c https://services.gradle.org/distributions/gradle-2.9-bin.zip + - unzip -qq gradle-2.9-bin.zip + - export GRADLE_HOME=$PWD/gradle-2.9 + - export PATH=$GRADLE_HOME/bin:$PATH + - gradle --version + - git clone https://github.com/benlau/qtci/ + - source qtci/path.env + - ./ci/qt-android + +script: + - export ROOT_DIR=`pwd` + - KEYSTORE=dev.keystore + - KEYPASS=123456 + - BUILD_DIR=$ROOT_DIR/tests/instrument/build + - ANDROID_TARGET_SDK_VERSION=23 + - mkdir -p $BUILD_DIR + - ls + - keytool -genkey -v -alias alias_name -keyalg RSA -keysize 2048 -validity 10000 -dname "cn=localhost, ou=oss, o=Continuent, c=HK" -storepass $KEYPASS -keypass $KEYPASS -keystore $KEYSTORE + - source qt.env + - ls $ANDROID_SDK_ROOT/build-tools + - cd $BUILD_DIR + - build-android-gradle-project ${ROOT_DIR}/tests/instrument/activity/activity.pro + - sed -i "s/com.android.application/com.android.library/g" android-build/build.gradle + - cat android-build/gradle.properties + - cp ./android-build/build/outputs/apk/android-build-debug.apk output.apk + - echo no | android create avd --force -n test -t android-19 --abi armeabi-v7a + - emulator -avd test -no-audio -no-window & + - android-wait-for-emulator + - adb shell input keyevent 82 & + - export ANDROID_HOME=$ANDROID_SDK_ROOT + - adb install -r output.apk + - cd $ROOT_DIR/tests/instrument/runner + - ls + - ./gradlew -q assembleDebug + - find . -name "*.apk" + - adb install -r ./build/outputs/apk/runner-debug.apk + - adb shell am instrument -w quickandroid.example.tests/android.test.InstrumentationTestRunner 2>&1 | tee instrument.log + - adb logcat -d > log.txt + - sed -i "/dalvikvm/d" log.txt + - tail -n 500 log.txt + - OK=`cat instrument.log | grep -G "^OK" | wc -l` + - echo $OK + - if [ $OK -eq 0 ]; then echo "Test failure found"; exit 1; fi + diff --git a/source-android/application.qrc b/source-android/application.qrc index 45a0e2d..859e7e2 100644 --- a/source-android/application.qrc +++ b/source-android/application.qrc @@ -207,6 +207,8 @@ qml/calendarqml/EventList.qml translations/friendiqa-de.qm translations/friendiqa-de.ts + translations/friendiqa-es.qm + translations/friendiqa-es.ts qml/photoqml/ImageUploadDialog.qml qml/genericqml/ImageDialog.qml qml/genericqml/PermissionDialog.qml diff --git a/source-android/friendiqa.pro b/source-android/friendiqa.pro index 1f23310..195e614 100644 --- a/source-android/friendiqa.pro +++ b/source-android/friendiqa.pro @@ -12,7 +12,7 @@ # The name of your application TEMPLATE = app TARGET = friendiqa -CONFIG += debug +CONFIG += release QT += qml quick gui widgets androidextras include(androidnative.pri/androidnative.pri) @@ -54,6 +54,7 @@ DISTFILES += \ android/gradle/wrapper/gradle-wrapper.properties \ android/gradlew.bat \ translations/*.ts \ + translations/*.qm \ qml/*.qml \ qml/newsqml/*.qml \ qml/contactqml/*.qml \ diff --git a/source-android/js/newsworker.js b/source-android/js/newsworker.js index 8e912fb..a22e59e 100644 --- a/source-android/js/newsworker.js +++ b/source-android/js/newsworker.js @@ -1,5 +1,5 @@ WorkerScript.onMessage = function(msg) { -if(msg.deleteId) +if(msg.deleteId!==undefined) {msg.model.remove(msg.deleteId); msg.model.sync() } diff --git a/source-android/qml/newsqml/Newsitem.qml b/source-android/qml/newsqml/Newsitem.qml index 48e703f..1610f09 100644 --- a/source-android/qml/newsqml/Newsitem.qml +++ b/source-android/qml/newsqml/Newsitem.qml @@ -364,7 +364,6 @@ Item { text: qsTr("Delete") onTriggered: { Newsjs.deleteNews(root.login,root.db,newsitemobject.status_id,newsitemobject.messagetype,root,function(reply){ - // newsModel.remove(index) var msg = {'deleteId': index, 'model': newsModel}; newsWorker.sendMessage(msg); })