Merge pull request #2796 from fossasia/development

chore: Release v1.8.0

.github/auto_label.yml

@@ -0,0 +1,14 @@
+labels: [fix, chore, ui]
+labelMapping:
+  feat: [feature]
+  fix(ui): [fix, ui]
+  feat(ui): [feat, ui]
+  refactor: [chore, refactor]
+  chore(refactor): [chore, refactor]
+  chore(deps): [dependencies]
+  chore(docs): [chore, docs]
+  docs: [chore, docs]
+  test: [chore, test]
+  chore(ci): [chore, tools, ci]
+  chore(tools): [chore, tools]
+  chore(release): [chore, release]

.github/release-drafter.yml

@@ -0,0 +1,20 @@
+name-template: v$NEXT_MINOR_VERSION 🌈
+tag-template: v$NEXT_MINOR_VERSION
+categories:
+  - title: 🚀 Features
+    label: feature
+  - title: 🐛 Bug Fixes
+    label: fix
+  - title: ⚒️ Maintenance
+    label: chore
+  - title: Dependencies and Libraries
+    label: dependencies
+change-template: '- $TITLE (#$NUMBER) - @$AUTHOR'
+template: |
+  ## Changes
+  $CHANGES
+
+  ## Contributors
+
+  Thanks a lot to our contributors for making this release possible:
+  $CONTRIBUTORS

.gitignore

@@ -9,6 +9,7 @@ build
 /docs/keystore
 /app/src/main/3rdparty/
 /app/src/main/jniLibs/
+/app/src/main/jni/include
 libopencv_*
 viewflow/
 keystore.properties

.travis.yml

@@ -1,18 +1,16 @@
 language: android
 jdk: oraclejdk8
+sudo: false
+dist: trusty
 
 env:
   global:
     - ANDROID_API_LEVEL=22
     - ANDROID_BUILD_TOOLS_VERSION=25.0.3
-    - ANDROID_ABI=armeabi-v7a
+    - ANDROID_ABI=armeabi-v7a arm64-v8a x86 x86_64
     - ANDROID_TAG=google_apis
     - ANDROID_TARGET=android-25
     - ADB_INSTALL_TIMEOUT=20 # minutes (2 minutes by default)
-  matrix:
-    - COMPONENT=BUILD
-    - COMPONENT=CONNECTED_TEST
-    - COMPONENT=ASSEMBLE_RELEASE
 
 android:
   components:
@@ -34,7 +32,7 @@ android:
     - '.+'
     # Specify at least one system image
     - sys-img-armeabi-v7a-android-$ANDROID_API_LEVEL
-    
+
 # prevents reuploading of Cache
 before_cache:
   - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
@@ -51,13 +49,11 @@ before_install:
   - mkdir "$ANDROID_HOME/licenses" || true
   - echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
   - echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
-  - export NDK_VERSION=r10e
-  - curl -L http://dl.google.com/android/ndk/android-ndk-${NDK_VERSION}-linux-x86_64.bin -O
-  - chmod u+x android-ndk-${NDK_VERSION}-linux-x86_64.bin
-  - ./android-ndk-${NDK_VERSION}-linux-x86_64.bin > /dev/null
-  - rm android-ndk-${NDK_VERSION}-linux-x86_64.bin
-  - export ANDROID_NDK_HOME=`pwd`/android-ndk-${NDK_VERSION}
-  - export PATH=${ANDROID_NDK_HOME}:${PATH}
+  - curl https://dl.google.com/android/repository/android-ndk-r18b-linux-x86_64.zip -o android-ndk-r18b.zip
+  - unzip -q android-ndk-r18b.zip && rm android-ndk-r18b.zip
+  - mv android-ndk-r18b $HOME
+  - export ANDROID_NDK=$HOME/android-ndk-r18b
+
 
 install:
   - sdkmanager --list || true
@@ -66,23 +62,28 @@ install:
   - echo yes | sdkmanager "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2"
 
 licenses:
-    - 'android-sdk-preview-license-.+'
-    - 'android-sdk-license-.+'
-    - 'google-gdk-license-.+'
+  - 'android-sdk-preview-license-.+'
+  - 'android-sdk-license-.+'
+  - 'google-gdk-license-.+'
 
 before_script:
   - ./scripts/download_open_cv.sh
-  - ./scripts/prepare_avd.sh
+  - echo "Starting AVD"
+  - echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a
+  - emulator -avd test -no-audio -no-window &
+  - android-wait-for-emulator
+  - adb shell input keyevent 82 &
 
 script:
   - ./gradlew spotlessCheck
   - ./scripts/copy_opencv.sh
-  - ./scripts/main_script.sh
+  - ./gradlew build
+  - ./gradlew build connectedAndroidTest jacocoTestReport --stacktrace
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)
   - bash scripts/prep-key.sh
   - bash scripts/update-apk.sh
 
 notifications:
-  slack: fossasia:JgzycrBUs0nKnmJhsAxCB4bL
+  slack: fossasia:JgzycrBUs0nKnmJhsAxCB4bL

README.md

@@ -7,9 +7,9 @@
 <a href='https://phimp.me'>Phimp.me</a> is an Android image editor app that aims to replace proprietary photographing and image apps on smart phones. It offers features such as taking photos, adding filters, editing images and uploading them to social networks. Phimp.me stands for **Ph**otos - **Im**ages - **P**ictures. It is developed at <a href='https://fossasia.org'>FOSSASIA</a> together with a global community.
 
 
-| Master | Development | Codecov | Code Quality | Chat |
-|------------|-----------------|-------------|-----------------|-----------------|
-| [![Build Status](https://travis-ci.org/fossasia/phimpme-android.svg?branch=master)](https://travis-ci.org/fossasia/phimpme-android) | [![Build Status](https://travis-ci.org/fossasia/phimpme-android.svg?branch=development)](https://travis-ci.org/fossasia/phimpme-android) | [![codecov](https://codecov.io/gh/fossasia/phimpme-android/branch/master/graph/badge.svg)](https://codecov.io/gh/fossasia/phimpme-android) | [![Codacy Badge](https://api.codacy.com/project/badge/Grade/4584003e734343b3b8ce94bcae6e9ca4)](https://www.codacy.com/app/harshithdwivedi/phimpme-android?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=fossasia/phimpme-android&amp;utm_campaign=Badge_Grade) | [![Gitter Room](https://img.shields.io/badge/gitter-join%20chat%20%E2%86%92-blue.svg)](https://gitter.im/fossasia/phimpme) |
+| Master | Development | Codecov | Code Quality | Chat | Twitter |
+|------------|-----------------|-------------|-----------------|-----------------|-----------------|
+| [![Build Status](https://travis-ci.org/fossasia/phimpme-android.svg?branch=master)](https://travis-ci.org/fossasia/phimpme-android) | [![Build Status](https://travis-ci.org/fossasia/phimpme-android.svg?branch=development)](https://travis-ci.org/fossasia/phimpme-android) | [![codecov](https://codecov.io/gh/fossasia/phimpme-android/branch/master/graph/badge.svg)](https://codecov.io/gh/fossasia/phimpme-android) | [![Codacy Badge](https://api.codacy.com/project/badge/Grade/4584003e734343b3b8ce94bcae6e9ca4)](https://www.codacy.com/app/harshithdwivedi/phimpme-android?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=fossasia/phimpme-android&amp;utm_campaign=Badge_Grade) | [![Gitter Room](https://img.shields.io/badge/gitter-join%20chat%20%E2%86%92-blue.svg)](https://gitter.im/fossasia/phimpme) | [![Twitter Follow](https://img.shields.io/twitter/follow/phimpme.svg?style=social&label=Follow&maxAge=2592000?style=flat-square)](https://twitter.com/phimpme) |
 
 ## Screenshots
 
@@ -103,13 +103,14 @@ Before you begin, you should have already downloaded the Android Studio SDK and
 
     - *Note:* If you receive a Gradle sync error titled, "failed to find ...", you should click on the link below the error message (if available) that says *Install missing platform(s) and sync project* and allow Android studio to fetch you what is missing.
 
-6. Download this [OpenCV-android-sdk](https://github.com/opencv/opencv/releases/download/2.4.13.3/opencv-2.4.13.3-android-sdk.zip) zip file and extract it.
+6. Download this [OpenCV-android-sdk](https://github.com/opencv/opencv/releases/download/4.0.1/opencv-4.0.1-android-sdk.zip) zip file and extract it.
 
      - Copy all the files from *"OpenCV-android-sdk/sdk/native/3rdparty"* to *"phimpme-android/app/src/main/3rdparty"* (create directory if it doesn't exist)
      - Copy all the files from *"OpenCV-android-sdk/sdk/native/libs"* to *"phimpme-android/app/src/main/jniLibs"* (create directory if it doesn't exist)
+     - Copy all the files from *"OpenCV-android-sdk/sdk/native/jni/include"* to *"phimpme-android/app/src/main/jni/include"* (create directory if it doesn't exist)
      - Now build your project. If your build fails then try deleting these build directories *"phimpme-android/app/.externalNativeBuild"* and *"phimpme-android/app/build"*, if they exist and run the build again.
 
-7. If build error still persist, try replacing ndk with ndk version 16b from [ndk-archives](https://developer.android.com/ndk/downloads/older_releases) .  Once all build errors have been resolved, you should be all set to build the app and test it.
+7. If build error still persist, try replacing ndk with ndk version 18b from [ndk-archives](https://developer.android.com/ndk/downloads/older_releases) .  Once all build errors have been resolved, you should be all set to build the app and test it.
 
 8. To Build the app, go to *Build > Make Project* (or alternatively press the Make Project icon in the toolbar).
 

app/build.gradle

@@ -3,7 +3,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.dicedmelon.gradle:jacoco-android:0.1.1'
+        classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4'
     }
 }
 
@@ -22,19 +22,21 @@ def keystoreProperties = new Properties()
 keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion "26.0.3"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
 
     defaultConfig {
         applicationId "org.fossasia.phimpme"
         minSdkVersion 21
-        targetSdkVersion 26
+        targetSdkVersion 28
+        versionCode 11
+        versionName '1.8.0'
         multiDexEnabled true
         testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
         vectorDrawables.useSupportLibrary = true
         resConfigs "en"
         ndk {
-            abiFilters 'armeabi-v7a', 'x86'
+            abiFilters 'armeabi-v7a','arm64-v8a','x86','x86_64'
         }
         renderscriptTargetApi 19
         renderscriptSupportModeEnabled true
@@ -62,7 +64,7 @@ android {
     }
 
     configurations {
-        compile.exclude group: 'org.jetbrains', module: 'annotations'
+        implementation.exclude group: 'org.jetbrains', module: 'annotations'
         all*.exclude group: 'com.android.volley'
     }
 
@@ -112,98 +114,102 @@ spotless {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
 
+    implementation 'com.mcxiaoke.volley:library:1.0.19'
+
     //google and support
-    compile "com.android.support:appcompat-v7:$rootProject.supportLibraryVersion"
-    compile "com.android.support:design:$rootProject.supportLibraryVersion"
-    compile "com.android.support:support-vector-drawable:$rootProject.supportLibraryVersion"
-    compile "com.android.support:palette-v7:$rootProject.supportLibraryVersion"
-    compile "com.android.support:cardview-v7:$rootProject.supportLibraryVersion"
-    compile "com.android.support:customtabs:$rootProject.supportLibraryVersion"
-    compile 'com.android.support.constraint:constraint-layout:1.0.2'
+    implementation "com.android.support:appcompat-v7:$rootProject.supportLibraryVersion"
+    implementation "com.android.support:animated-vector-drawable:28.0.0"
+    implementation "com.android.support:support-v4:28.0.0"
+    implementation "com.android.support:design:$rootProject.supportLibraryVersion"
+    implementation "com.android.support:support-vector-drawable:$rootProject.supportLibraryVersion"
+    implementation "com.android.support:palette-v7:$rootProject.supportLibraryVersion"
+    implementation "com.android.support:cardview-v7:$rootProject.supportLibraryVersion"
+    implementation "com.android.support:customtabs:$rootProject.supportLibraryVersion"
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
 
     //exoplayer
-    compile 'com.google.android.exoplayer:exoplayer:r1.5.7'
+    implementation 'com.google.android.exoplayer:exoplayer:r1.5.7'
 
     //utils
-    compile 'com.github.deano2390:MaterialShowcaseView:1.2.0@aar'
-    compile "com.jakewharton:butterknife:$rootProject.butterknifeVersion"
+    implementation 'com.github.deano2390:MaterialShowcaseView:1.2.0@aar'
+    implementation "com.jakewharton:butterknife:$rootProject.butterknifeVersion"
     annotationProcessor "com.jakewharton:butterknife-compiler:$rootProject.butterknifeVersion"
-    compile 'com.github.bumptech.glide:glide:3.7.0'
-    compile 'com.yalantis:ucrop:1.5.0'
-    compile 'de.psdev.licensesdialog:licensesdialog:1.8.0'
-    /*compile('com.crashlytics.sdk.android:crashlytics:2.9.3@aar') {
+    implementation 'com.github.bumptech.glide:glide:3.7.0'
+    implementation 'com.yalantis:ucrop:1.5.0'
+    implementation 'de.psdev.licensesdialog:licensesdialog:1.8.0'
+    /*implementation('com.crashlytics.sdk.android:crashlytics:2.9.3@aar') {
         transitive = true;
     }*/
 
-    compile 'com.koushikdutta.ion:ion:2.1.7'
-    compile 'org.jetbrains:annotations-java5:15.0'
-    compile 'com.android.support:multidex:1.0.1'
-    compile group: 'com.box', name: 'box-android-sdk', version: '4.0.8'
+    implementation 'com.koushikdutta.ion:ion:2.1.7'
+    implementation 'org.jetbrains:annotations-java5:15.0'
+    implementation 'com.android.support:multidex:1.0.3'
+    implementation group: 'com.box', name: 'box-android-sdk', version: '4.0.8'
 
     //icons
-    compile 'com.mikepenz:iconics-core:2.8.4@aar'
-    compile 'com.mikepenz:google-material-typeface:2.2.0.3.original@aar'
-    compile 'com.mikepenz:community-material-typeface:1.5.54.2@aar'
-    compile 'com.mikepenz:fontawesome-typeface:4.6.0.1@aar'
-    compile 'com.mikepenz:ionicons-typeface:+@aar'
+    implementation 'com.mikepenz:iconics-core:2.8.4@aar'
+    implementation 'com.mikepenz:google-material-typeface:2.2.0.3.original@aar'
+    implementation 'com.mikepenz:community-material-typeface:1.5.54.2@aar'
+    implementation 'com.mikepenz:fontawesome-typeface:4.6.0.1@aar'
+    implementation 'com.mikepenz:ionicons-typeface:+@aar'
 
     //ui
-    compile 'de.hdodenhof:circleimageview:2.0.0'
-    compile 'uz.shift:colorpicker:0.5@aar'
-    compile 'com.turingtechnologies.materialscrollbar:lib:10.0.3'
-    compile 'pl.droidsonroids.gif:android-gif-drawable:1.2.7'
-    compile 'com.github.shchurov:horizontalwheelview:0.9.5'
-    compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.4'
+    implementation 'de.hdodenhof:circleimageview:2.0.0'
+    implementation 'uz.shift:colorpicker:0.5@aar'
+    implementation 'com.turingtechnologies.materialscrollbar:lib:10.0.3'
+    implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.7'
+    implementation 'com.github.shchurov:horizontalwheelview:0.9.5'
+    implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.4'
 
     //twitter
-    compile "com.twitter.sdk.android:twitter:$rootProject.twitterVersion"
-    compile files('libs/twitter4j-core-3.0.5.jar')
-    compile files('libs/twitter4j-media-support-3.0.5.jar')
+    implementation "com.twitter.sdk.android:twitter:$rootProject.twitterVersion"
+    implementation files('libs/twitter4j-core-3.0.5.jar')
+    implementation files('libs/twitter4j-media-support-3.0.5.jar')
 
     //cloud rail
-    compile 'com.cloudrail:cloudrail-si-android:2.20.1'
+    implementation 'com.cloudrail:cloudrail-si-android:2.20.1'
 
     //next cloud
-    compile "com.github.nextcloud:android-library:$rootProject.nextCloudVersion"
+    implementation "com.github.nextcloud:android-library:$rootProject.nextCloudVersion"
 
     //leak canary
-    debugCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
-    releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
+    releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.1'
 
     //flickr
-    compile files('libs/flickrj-android-2.1.0.jar')
+    implementation files('libs/flickrj-android-2.1.0.jar')
 
     //tumblr
-    compile('com.tumblr:jumblr:0.0.11') {
+    implementation('com.tumblr:jumblr:0.0.11') {
         exclude module: 'scribe'
     }
 
     //realm
-    compile 'com.uphyca:stetho_realm:2.0.0'
+    implementation 'com.uphyca:stetho_realm:2.0.0'
 
     //metadataextractor
-    compile 'com.drewnoakes:metadata-extractor:2.9.1'
+    implementation 'com.drewnoakes:metadata-extractor:2.9.1'
 
     //tests
-    testCompile "junit:junit:$rootProject.junitVersion"
-    androidTestCompile 'com.google.code.findbugs:jsr305:3.0.0'
+    testImplementation "junit:junit:$rootProject.junitVersion"
+    androidTestImplementation 'com.google.code.findbugs:jsr305:3.0.0'
 
     //opencv
-    compile project(':openCVLibrary24133')
+    implementation project(':openCV')
 
     //pdk
-    compile project(':pdk')
+    implementation project(':pdk')
 
     //photoview
-    compile project(':photoview')
+    implementation project(':photoview')
 
     //compressor
-    compile 'id.zelory:compressor:2.1.0'
+    implementation 'id.zelory:compressor:2.1.0'
 
 }
 

app/lint.xml

@@ -147,4 +147,6 @@
     <issue id="WorldWriteableFiles" severity="ignore" />
     <issue id="WrongManifestParent" severity="ignore" />
     <issue id="WrongViewCast" severity="ignore" />
+    <issue id="LongLogTag" severity="ignore" />
+
 </lint>

app/src/androidTest/java/org/fossasia/phimpme/leafpic/activities/HomeScreenTest.java

@@ -12,9 +12,9 @@
 import android.app.KeyguardManager;
 import android.support.test.annotation.UiThreadTest;
 import android.support.test.espresso.ViewInteraction;
+import android.support.test.filters.LargeTest;
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
-import android.test.suitebuilder.annotation.LargeTest;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewParent;

app/src/androidTest/java/org/fossasia/phimpme/leafpic/activities/PhotoActivityTest.java

@@ -7,9 +7,9 @@
 import static org.hamcrest.Matchers.allOf;
 
 import android.support.test.espresso.ViewInteraction;
+import android.support.test.filters.LargeTest;
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
-import android.test.suitebuilder.annotation.LargeTest;
 import org.fossasia.phimpme.R;
 import org.fossasia.phimpme.opencamera.Camera.PhotoActivity;
 import org.junit.Ignore;

app/src/androidTest/java/org/fossasia/phimpme/leafpic/activities/SettingsActivityTest.java

@@ -11,9 +11,9 @@
 import android.app.KeyguardManager;
 import android.support.test.annotation.UiThreadTest;
 import android.support.test.espresso.ViewInteraction;
+import android.support.test.filters.LargeTest;
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
-import android.test.suitebuilder.annotation.LargeTest;
 import android.view.WindowManager;
 import org.fossasia.phimpme.R;
 import org.fossasia.phimpme.gallery.activities.SettingsActivity;