chore: Release v1.10.0 (#2915)

chore: Release v1.10.0

Author: iamareebjamal

.travis.yml

@@ -1,6 +1,6 @@
 language: android
 jdk: oraclejdk8
-sudo: false
+sudo: true
 dist: trusty
 
 env:
@@ -85,5 +85,12 @@ after_success:
   - bash <(curl -s https://codecov.io/bash)
   - bash scripts/update-apk.sh
 
+deploy:
+  - provider: script
+    skip_cleanup: true
+    script: bash scripts/upload-gh-pages.sh
+    on:
+      all_branches: true
+
 notifications:
   slack: fossasia:JgzycrBUs0nKnmJhsAxCB4bL

README.md

@@ -108,7 +108,7 @@ Before you begin, you should have already downloaded the Android Studio SDK and
      - 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)
-     - Copy all the files from *"OpenCV-android-sdk/sdk/native/jni/staticlibs"* to *"phimpme-android/app/src/main/staticlibs"* (create directory if it doesn't exist)
+     - Copy all the files from *"OpenCV-android-sdk/sdk/native/staticlibs"* to *"phimpme-android/app/src/main/staticlibs"* (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 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.

app/build.gradle

@@ -25,17 +25,17 @@ def LOCAL_KEY_PRESENT = project.hasProperty('SIGNING_KEY_FILE') && rootProject.f
 keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion "28.0.3"
+    compileSdkVersion 29
+    buildToolsVersion "29.0.2"
 
     defaultConfig {
         applicationId "org.fossasia.phimpme"
         minSdkVersion 21
-        targetSdkVersion 28
-        versionCode 12
-        versionName '1.9.0'
+        targetSdkVersion 29
+        versionCode 13
+        versionName '1.10.0'
         multiDexEnabled true
-        testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         vectorDrawables.useSupportLibrary = true
         resConfigs "en"
         ndk {
@@ -45,6 +45,11 @@ android {
         renderscriptSupportModeEnabled true
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
     signingConfigs {
         if (TRAVIS_BUILD) {
             release {
@@ -87,7 +92,6 @@ android {
 
     configurations {
         implementation.exclude group: 'org.jetbrains', module: 'annotations'
-        all*.exclude group: 'com.android.volley'
     }
 
     lintOptions {
@@ -114,18 +118,8 @@ android {
 }
 
 repositories {
-    maven {
-        url "https://dl.bintray.com/dasar/maven"
-    }
     mavenCentral()
-    maven {
-        url 'https://github.com/uPhyca/stetho-realm/raw/master/maven-repo'
-    }
     maven { url "https://jitpack.io" }
-
-    maven { url 'https://maven.fabric.io/public' }
-
-    maven { url "https://mvnrepository.com/artifact/com.box/box-android-sdk" }
 }
 
 spotless {
@@ -137,31 +131,44 @@ spotless {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
+    // Core library
+    androidTestImplementation 'androidx.test:core:1.2.0'
+
+    // AndroidJUnitRunner and JUnit Rules
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test:rules:1.2.0'
 
-    implementation 'com.mcxiaoke.volley:library:1.0.19'
+    //retrofit
+    implementation "com.squareup.retrofit2:retrofit:$rootProject.retrofitVersion"
+    implementation "com.squareup.retrofit2:converter-gson:$rootProject.retrofitVersion"
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.2.0'
 
     //google and support
-    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'
+    implementation "androidx.appcompat:appcompat:$rootProject.supportLibraryVersion"
+    implementation "androidx.vectordrawable:vectordrawable-animated:1.1.0"
+    implementation "androidx.legacy:legacy-support-v4:1.0.0"
+    implementation "com.google.android.material:material:1.0.0"
+    implementation "androidx.vectordrawable:vectordrawable:1.1.0"
+    implementation "androidx.palette:palette:1.0.0"
+    implementation "androidx.cardview:cardview:1.0.0"
+    implementation "androidx.browser:browser:1.0.0"
+    implementation "androidx.recyclerview:recyclerview:1.0.0"
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 
     //exoplayer
     implementation 'com.google.android.exoplayer:exoplayer:r1.5.7'
 
+    implementation "androidx.lifecycle:lifecycle-extensions:$rootProject.lifecycleVersion"
+
     //utils
     implementation 'com.github.deano2390:MaterialShowcaseView:1.2.0@aar'
     implementation "com.jakewharton:butterknife:$rootProject.butterknifeVersion"
     annotationProcessor "com.jakewharton:butterknife-compiler:$rootProject.butterknifeVersion"
-    implementation 'com.github.bumptech.glide:glide:3.7.0'
+    implementation "com.github.bumptech.glide:glide:$rootProject.glideVersion"
+    implementation "com.github.bumptech.glide:gifencoder-integration:$rootProject.glideVersion"
     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') {
@@ -171,7 +178,7 @@ dependencies {
     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'
+    implementation group: 'com.box', name: 'box-android-sdk', version: '5.0.0'
 
     //icons
     implementation 'com.mikepenz:iconics-core:2.8.4@aar'
@@ -196,8 +203,7 @@ dependencies {
     implementation "org.twitter4j:twitter4j-core:3.0.5"
     implementation "org.twitter4j:twitter4j-media-support:3.0.5"
 
-    //cloud rail
-    implementation 'com.cloudrail:cloudrail-si-android:2.20.1'
+    implementation 'com.dropbox.core:dropbox-core-sdk:3.1.1'
 
     //next cloud
     implementation "com.github.nextcloud:android-library:$rootProject.nextCloudVersion"
@@ -214,9 +220,6 @@ dependencies {
     //flickr
     implementation "com.googlecode.flickrj-android:flickrj-android:2.1.0"
 
-    //realm
-    implementation 'com.uphyca:stetho_realm:2.0.0'
-
     //metadataextractor
     implementation 'com.drewnoakes:metadata-extractor:2.9.1'
 

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

@@ -1,24 +1,24 @@
 package org.fossasia.phimpme.leafpic.activities;
 
 import static android.content.Context.KEYGUARD_SERVICE;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withContentDescription;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.withContentDescription;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
 import static org.hamcrest.Matchers.allOf;
 
 import android.app.Activity;
 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.view.View;
 import android.view.ViewGroup;
 import android.view.ViewParent;
 import android.view.WindowManager;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.espresso.ViewInteraction;
+import androidx.test.filters.LargeTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
 import org.fossasia.phimpme.R;
 import org.fossasia.phimpme.gallery.activities.LFMainActivity;
 import org.hamcrest.Description;

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

@@ -1,15 +1,15 @@
 package org.fossasia.phimpme.leafpic.activities;
 
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
 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 androidx.test.espresso.ViewInteraction;
+import androidx.test.filters.LargeTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
 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

@@ -1,20 +1,20 @@
 package org.fossasia.phimpme.leafpic.activities;
 
 import static android.content.Context.KEYGUARD_SERVICE;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.scrollTo;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.scrollTo;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
 
 import android.app.Activity;
 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.view.WindowManager;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.espresso.ViewInteraction;
+import androidx.test.filters.LargeTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
 import org.fossasia.phimpme.R;
 import org.fossasia.phimpme.gallery.activities.SettingsActivity;
 import org.junit.Before;

app/src/main/AndroidManifest.xml

@@ -269,17 +269,14 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
+
         <activity
             android:name=".gallery.activities.AboutActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/about"
             android:theme="@style/Theme.AppCompat.NoActionBar">
-            <intent-filter>
-                <action android:name="android.intent.action.ABOUT" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
         </activity>
+
         <activity
             android:name=".gallery.activities.ExcludedAlbumsActivity"
             android:label="@string/excluded_albums"
@@ -315,7 +312,7 @@
             android:value="GlideModule" />
 
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"
             android:exported="false"
             android:grantUriPermissions="true">
@@ -371,6 +368,21 @@
         <activity
             android:name=".share.imgur.ImgurAuthActivity"
             android:theme="@style/AppTheme.NoActionBar" />
+        <activity
+            android:name="com.dropbox.core.android.AuthActivity"
+            android:configChanges="orientation|keyboard"
+            android:launchMode="singleTask">
+            <intent-filter>
+
+                <!-- Change this to be db- followed by your app key -->
+                <data android:scheme="db-7fhwc9meece1m9g" />
+
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.BROWSABLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
         <activity
             android:name=".share.owncloud.OwnCloudActivity"
             android:label="@string/title_activity_own_cloud"

app/src/main/java/org/fossasia/phimpme/MyApplication.java

@@ -3,8 +3,8 @@
 import android.app.Application;
 import android.content.Context;
 import android.os.StrictMode;
-import android.support.multidex.MultiDex;
 import android.util.Log;
+import androidx.multidex.MultiDex;
 import com.squareup.leakcanary.LeakCanary;
 import com.squareup.leakcanary.RefWatcher;
 import com.twitter.sdk.android.core.DefaultLogger;
@@ -68,12 +68,6 @@ public void onCreate() {
     // if (isPublished)
     //   Fabric.with(this, new Crashlytics());
 
-    /** Stetho initialization */
-    /*Stetho.initialize(
-    Stetho.newInitializerBuilder(this)
-            .enableDumpapp(Stetho.defaultDumperPluginsProvider(this))
-            .enableWebKitInspector(RealmInspectorModulesProvider.builder(this).build())
-            .build());*/
   }
 
   public static RefWatcher getRefWatcher(Context context) {