Merge branch 'develop' into develop

android-ddp/build.gradle

@@ -11,11 +11,9 @@ buildscript {
         classpath 'me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2'
     }
 }
-
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
-
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -33,15 +31,10 @@ android {
         }
     }
 }
-
 dependencies {
     compile project(':log-wrapper')
-
-    compile "com.android.support:support-annotations:$rootProject.ext.supportLibraryVersion"
-
-    compile "com.squareup.okhttp3:okhttp:$rootProject.ext.okHttpVersion"
-
-    compile 'io.reactivex.rxjava2:rxjava:2.1.0'
-
-    compile 'com.parse.bolts:bolts-tasks:1.4.0'
+    compile extraDependencies.okHTTP
+    compile extraDependencies.rxJava
+    compile extraDependencies.boltTask
+    compile supportDependencies.annotation
 }
\ No newline at end of file

android-ddp/src/main/java/chat/rocket/android_ddp/DDPClient.java

 package chat.rocket.android_ddp;
 
-import android.support.annotation.Nullable;
 
+import io.reactivex.Flowable;
+import io.reactivex.Maybe;
+import io.reactivex.annotations.Nullable;
 import org.json.JSONArray;
 
 import bolts.Task;
 import bolts.TaskCompletionSource;
 import chat.rocket.android_ddp.rx.RxWebSocketCallback;
-import io.reactivex.Flowable;
-import io.reactivex.Maybe;
 import okhttp3.OkHttpClient;
 
 public class DDPClient {

app/build.gradle

@@ -22,7 +22,6 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$rootProject.ext.kotlinVersion"
-
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
         classpath 'me.tatarka:gradle-retrolambda:3.5.0'
@@ -115,7 +114,6 @@ play {
     jsonFile = file('rocket-chat.json')
     track = "${track}"
 }
-
 ext {
     playLibVersion = '11.0.4'
     stethoVersion = '1.5.0'
@@ -133,62 +131,50 @@ dependencies {
     compile project(':rocket-chat-core')
     compile project(':rocket-chat-android-widgets')
     compile project(':persistence-realm')
-
-    compile "com.android.support:appcompat-v7:$rootProject.ext.supportLibraryVersion"
-    compile "com.android.support:design:$rootProject.ext.supportLibraryVersion"
-    compile "com.android.support:support-annotations:$rootProject.ext.supportLibraryVersion"
-    compile "com.android.support.constraint:constraint-layout:$rootProject.ext.constraintLayoutVersion"
+    compile extraDependencies.okHTTP
+    compile extraDependencies.rxJava
+    compile extraDependencies.boltTask
+    compile supportDependencies.designSupportLibrary
+    compile supportDependencies.annotation
+    compile supportDependencies.kotlin;
+    compile rxbindingDependencies.rxBinding
+    compile rxbindingDependencies.rxBindingSupport
+    compile rxbindingDependencies.rxBindingAppcompact
     compile 'com.android.support:multidex:1.0.1'
-
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$rootProject.ext.kotlinVersion"
-    testCompile "org.jetbrains.kotlin:kotlin-test:$rootProject.ext.kotlinVersion"
-    testCompile "org.jetbrains.kotlin:kotlin-test-junit:$rootProject.ext.kotlinVersion"
-
     compile "com.google.firebase:firebase-core:$playLibVersion"
     compile "com.google.firebase:firebase-crash:$playLibVersion"
-
     compile "com.google.android.gms:play-services-gcm:$playLibVersion"
-
-    compile "com.squareup.okhttp3:okhttp:$rootProject.ext.okHttpVersion"
-
     debugCompile "com.facebook.stetho:stetho:$stethoVersion"
     debugCompile "com.facebook.stetho:stetho-okhttp3:$stethoOkhttp3Version"
     debugCompile "com.uphyca:stetho_realm:$stethoRealmVersion"
-
-    compile "com.jakewharton.rxbinding2:rxbinding:$rxbindingVersion"
-    compile "com.jakewharton.rxbinding2:rxbinding-support-v4:$rxbindingVersion"
-    compile "com.jakewharton.rxbinding2:rxbinding-appcompat-v7:$rxbindingVersion"
-
     compile "com.trello.rxlifecycle2:rxlifecycle:$rxlifecycleVersion"
     compile "com.trello.rxlifecycle2:rxlifecycle-android:$rxlifecycleVersion"
     compile "com.trello.rxlifecycle2:rxlifecycle-components:$rxlifecycleVersion"
-
     compile 'nl.littlerobots.rxlint:rxlint:1.2'
-
-    compile 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
-
     compile "frankiesardo:icepick:$icepickVersion"
     provided "frankiesardo:icepick-processor:$icepickVersion"
-
     compile "com.github.hotchemi:permissionsdispatcher:$permissionsdispatcherVersion"
     annotationProcessor "com.github.hotchemi:permissionsdispatcher-processor:$permissionsdispatcherVersion"
-
     compile('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') {
         transitive = true;
     }
-
     debugCompile "com.tspoon.traceur:traceur:1.0.1"
-
-    provided 'com.parse.bolts:bolts-tasks:1.4.0'
-    provided 'io.reactivex.rxjava2:rxjava:2.1.0'
+    compile 'com.aurelhubert:ahbottomnavigation:2.0.6'
+    compile('com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.10.6@aar') {
+        transitive = true
+    }
+    compile 'com.github.JakeWharton:ViewPagerIndicator:2.4.1@aar'
+    compile 'com.jakewharton:butterknife:8.5.1'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
+    compile 'com.jakewharton.timber:timber:4.5.1'
+    compile 'com.github.matrixxun:MaterialBadgeTextView:c5a27e8243'
+    compile 'com.github.chrisbanes:PhotoView:2.0.0'
     provided 'io.reactivex:rxjava:1.3.0'
     provided "com.github.akarnokd:rxjava2-interop:0.10.2"
     provided 'com.hadisatrio:Optional:v1.0.1'
-
     testCompile 'junit:junit:4.12'
     testCompile "org.mockito:mockito-core:2.7.19"
     testCompile "org.jetbrains.kotlin:kotlin-test:$rootProject.ext.kotlinVersion"
     testCompile "org.jetbrains.kotlin:kotlin-test-junit:$rootProject.ext.kotlinVersion"
 }
-
 apply plugin: 'com.google.gms.google-services'

app/src/main/java/chat/rocket/android/activity/AbstractAuthedActivity.java

@@ -3,11 +3,11 @@ package chat.rocket.android.activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-
 import com.hadisatrio.optional.Optional;
-
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.CompositeDisposable;
+import io.reactivex.schedulers.Schedulers;
 import java.util.List;
-
 import chat.rocket.android.LaunchUtil;
 import chat.rocket.android.RocketChatCache;
 import chat.rocket.android.helper.Logger;
@@ -18,9 +18,6 @@ import chat.rocket.core.models.ServerInfo;
 import chat.rocket.persistence.realm.RealmStore;
 import chat.rocket.persistence.realm.models.ddp.RealmRoom;
 import icepick.State;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.CompositeDisposable;
-import io.reactivex.schedulers.Schedulers;
 
 abstract class AbstractAuthedActivity extends AbstractFragmentActivity {
   @State protected String hostname;
@@ -30,6 +27,7 @@ abstract class AbstractAuthedActivity extends AbstractFragmentActivity {
   private CompositeDisposable compositeDisposable = new CompositeDisposable();
   private boolean isNotification;
 
+
   @Override
   protected void onCreate(@Nullable Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);

build.gradle

@@ -20,10 +20,7 @@ ext {
     compileSdkVersion = 26
     targetSdkVersion = 26
     buildToolsVersion = "26.0.0"
-    supportLibraryVersion = "25.4.0"
-    constraintLayoutVersion = "1.0.2"
-    kotlinVersion = "1.1.4-3"
-    okHttpVersion = "3.9.0"
+
 }
 
 task clean(type: Delete) {

dependencies.gradle

 ext {
     preDexLibs = "true" != System.getenv("CI")
+    supportLibraryVersion = "25.4.0"
+    constraintLayoutVersion = "1.0.2"
+    kotlinVersion = "1.1.4-2"
+    okHttpVersion = "3.9.0"
+    rxbindingVersion = '2.0.0'
+    supportDependencies = [
+            designSupportLibrary: "com.android.support:design:${supportLibraryVersion}",
+            annotation          : "com.android.support:support-annotations:${supportLibraryVersion}",
+            constrainLayout     : "com.android.support.constraint:constraint-layout:${constraintLayoutVersion}",
+            kotlin              : "org.jetbrains.kotlin:kotlin-stdlib-jre7:${kotlinVersion}",
+            cardView            : "com.android.support:cardview-v7:${supportLibraryVersion}",
+    ]
+    extraDependencies = [
+            okHTTP         : "com.squareup.okhttp3:okhttp:3.8.0",
+            rxJava         : "io.reactivex.rxjava2:rxjava:2.1.0",
+            boltTask       : "com.parse.bolts:bolts-tasks:1.4.0",
+            textDrawable   : "com.amulyakhare:com.amulyakhare.textdrawable:1.0.1",
+            rxAndroid      : "io.reactivex.rxjava2:rxandroid:2.0.1"
+    ]
+    rxbindingDependencies = [
+            rxBinding          : "com.jakewharton.rxbinding2:rxbinding:${rxbindingVersion}",
+            rxBindingSupport   : "com.jakewharton.rxbinding2:rxbinding-support-v4:${rxbindingVersion}",
+            rxBindingAppcompact: "com.jakewharton.rxbinding2:rxbinding-appcompat-v7:${rxbindingVersion}",
+    ]
 }
-
 subprojects {
     project.plugins.whenPluginAdded { plugin ->
         if ("com.android.build.gradle.AppPlugin" == plugin.class.name) {
@@ -11,3 +34,4 @@ subprojects {
         }
     }
 }
+

log-wrapper/build.gradle

@@ -8,11 +8,9 @@ buildscript {
         classpath 'com.android.tools.build:gradle:2.3.3'
     }
 }
-
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
-
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion rootProject.ext.targetSdkVersion

persistence-realm/build.gradle

@@ -44,30 +44,20 @@ android {
         androidTest.java.srcDirs += 'src/androidTest/kotlin'
     }
 }
-
 dependencies {
     compile project(':log-wrapper')
     compile project(':rocket-chat-core')
-
-    compile "com.android.support:support-annotations:$rootProject.ext.supportLibraryVersion"
-    compile "com.android.support:appcompat-v7:$rootProject.ext.supportLibraryVersion"
-    compile "com.android.support:design:$rootProject.ext.supportLibraryVersion"
-
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$rootProject.ext.kotlinVersion"
+    compile extraDependencies.rxJava
+    compile extraDependencies.boltTask
+    compile supportDependencies.annotation
+    compile supportDependencies.designSupportLibrary
+    compile supportDependencies.kotlin
+    compile extraDependencies.rxAndroid
     testCompile "org.jetbrains.kotlin:kotlin-test:$rootProject.ext.kotlinVersion"
     testCompile "org.jetbrains.kotlin:kotlin-test-junit:$rootProject.ext.kotlinVersion"
-
     testCompile 'org.json:json:20170516'
     testCompile 'org.skyscreamer:jsonassert:1.5.0'
-
-    compile 'io.reactivex.rxjava2:rxjava:2.1.0'
-    compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
-
     compile 'com.github.akarnokd:rxjava2-interop:0.10.0'
-
-    compile 'com.parse.bolts:bolts-tasks:1.4.0'
-
     provided 'com.hadisatrio:Optional:v1.0.1'
-
     testCompile 'junit:junit:4.12'
 }

rocket-chat-android-widgets/build.gradle

@@ -12,7 +12,6 @@ buildscript {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$rootProject.ext.kotlinVersion"
     }
 }
-
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
@@ -43,41 +42,25 @@ ext {
     frescoVersion = '1.4.0'
     rxbindingVersion = '2.0.0'
 }
-
 dependencies {
     compile project(':rocket-chat-core')
-
-    compile "com.android.support:support-annotations:$rootProject.ext.supportLibraryVersion"
-    compile "com.android.support:appcompat-v7:$rootProject.ext.supportLibraryVersion"
-    compile "com.android.support:recyclerview-v7:$rootProject.ext.supportLibraryVersion"
-    compile "com.android.support:cardview-v7:$rootProject.ext.supportLibraryVersion"
+    compile extraDependencies.okHTTP;
+    compile supportDependencies.annotation
+    compile supportDependencies.cardView
+    compile supportDependencies.designSupportLibrary
+    compile supportDependencies.constrainLayout
+    compile supportDependencies.kotlin
+    compile extraDependencies.textDrawable
+    compile rxbindingDependencies.rxBinding
+    compile rxbindingDependencies.rxBindingSupport
     compile "com.android.support:support-v13:$rootProject.ext.supportLibraryVersion"
-    compile "com.android.support:design:$rootProject.ext.supportLibraryVersion"
-    compile "com.android.support.constraint:constraint-layout:$rootProject.ext.constraintLayoutVersion"
-
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$rootProject.ext.kotlinVersion"
     testCompile "org.jetbrains.kotlin:kotlin-test:$rootProject.ext.kotlinVersion"
     testCompile "org.jetbrains.kotlin:kotlin-test-junit:$rootProject.ext.kotlinVersion"
-
     compile 'org.nibor.autolink:autolink:0.6.0'
-
-    compile 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
-
-    compile "com.squareup.okhttp3:okhttp:$rootProject.ext.okHttpVersion"
-
     compile 'com.github.yusukeiwaki.android-widget:widget-fontawesome:0.0.1'
-
     compile "com.facebook.fresco:fresco:$frescoVersion"
-    compile "com.facebook.fresco:animated-gif:$frescoVersion"
-    compile "com.facebook.fresco:animated-webp:$frescoVersion"
-    compile "com.facebook.fresco:webpsupport:$frescoVersion"
     compile "com.facebook.fresco:imagepipeline-okhttp3:$frescoVersion"
-
     compile 'com.caverock:androidsvg:1.2.1'
-
-    compile "com.jakewharton.rxbinding2:rxbinding:$rxbindingVersion"
-    compile "com.jakewharton.rxbinding2:rxbinding-support-v4:$rxbindingVersion"
-
     testCompile 'junit:junit:4.12'
     testCompile "org.mockito:mockito-core:2.7.19"
 }

rocket-chat-android-widgets/src/main/java/chat/rocket/android/widget/helper/AvatarHelper.kt

@@ -6,6 +6,7 @@ import android.graphics.Typeface
 import android.graphics.drawable.Drawable
 import chat.rocket.android.widget.AbsoluteUrl
 import com.amulyakhare.textdrawable.TextDrawable
+
 import java.net.URLEncoder
 
 /**

rocket-chat-core/build.gradle

@@ -4,15 +4,14 @@ plugins {
 
 apply plugin: 'idea'
 apply plugin: 'java'
-
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-
+    compile extraDependencies.rxJava
     compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$rootProject.ext.kotlinVersion"
 
     compile 'com.google.code.findbugs:jsr305:3.0.1'
 
-    compile 'io.reactivex.rxjava2:rxjava:2.1.0'
+
 
     compile 'com.hadisatrio:Optional:v1.0.1'
 
@@ -23,6 +22,5 @@ dependencies {
     testCompile 'junit:junit:4.12'
     testCompile "org.mockito:mockito-inline:2.8.9"
 }
-
 sourceCompatibility = "1.7"
 targetCompatibility = "1.7"
\ No newline at end of file