Merge pull request #527 from QuickBlox/development

Development
QuickBlox · Jan 26, 2018 · 110f57e · 110f57e
2 parents 6feeea5 + 7c8c3a0
commit 110f57e
Show file tree

Hide file tree

Showing 18 changed files with 165 additions and 96 deletions.
diff --git a/artifacts.gradle b/artifacts.gradle
@@ -19,7 +19,7 @@ android.applicationVariants.all {
                     apkEndName = "-unaligned.apk"
                 }
                 newApkName = "${appName}-${variant.buildType.name}-${getDate()}-code-${variant.versionCode}-version-${variant.versionName}" + apkEndName
-                output.outputFile = new File(output.outputFile.parent, newApkName)
+                output.outputFileName = newApkName
         }
 }
 

diff --git a/build.gradle b/build.gradle
@@ -1,11 +1,12 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
-        classpath 'com.google.gms:google-services:3.0.0'
+        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.google.gms:google-services:3.1.1'
     }
 }
 
@@ -19,12 +20,11 @@ allprojects {
             url 'https://maven.google.com'
         }
     }
-
 }
 
 ext {
     compileSdkVersion = 26
-    buildToolsVersion = "26.0.2"
+    buildToolsVersion = "27.0.3"
 
     minSdkVersion = 14
     targetSdkVersion = 26
@@ -35,34 +35,33 @@ ext {
     lintAbortOnError = false
 
     // QuickBlox SDK version
-    qbSdkVersion = '3.4.1'
+    qbSdkVersion = '3.6.0'
 
-    versionName = '3.4.1'
+    versionCode = 360
+    versionName = '3.6.0'
 
     testRunnerVersion = "0.4.1"
 
 
     // Dependency versions
     playServicesVersion = '11.4.2'
-    supportV4Version = '26.1.0'
-    appcompatV7Version = '26.1.0'
-    recyclerviewV7Version = '26.1.0'
-    supportAnnotationsVersion = '26.1.0'
-    designVersion = '26.1.0'
+    supportLibVersion = '26.1.0'
+    supportV4Version = supportLibVersion
+    appcompatV7Version = supportLibVersion
+    recyclerviewV7Version = supportLibVersion
+    supportAnnotationsVersion = supportLibVersion
+    designVersion = supportLibVersion
+    cardViewVersion = supportLibVersion
 
     uilVersion = '1.9.0'
     glideVersion = '3.6.1'
     pullToRefreshVersion = '3.2.3'
     stickyListHeaders = '2.7.0'
     robotoTextViewVersion = '4.0.0'
     stickersVersion = '0.7.3'
-    crashlyticsVersion = '2.2.2'
-}
+    crashlyticsVersion = '2.8.0'
+    fabricToolsVersion = '1.25.1'
+    swipyVersion = '1.2.3'
 
-task wrapper(type: Wrapper) {
-    gradleVersion = '2.10'
-}
-
-def makeJar(variant, project) {
-    //empty
-}
+    dimensionDefault = 'default'
+}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-all.zip
diff --git a/sample-chat/build.gradle b/sample-chat/build.gradle
@@ -4,7 +4,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'io.fabric.tools:gradle:1.20.1'
+        classpath "io.fabric.tools:gradle:$rootProject.fabricToolsVersion"
     }
 }
 
@@ -21,20 +21,23 @@ repositories {
 android {
     compileSdkVersion rootProject.compileSdkVersion
     buildToolsVersion rootProject.buildToolsVersion
+    flavorDimensions rootProject.dimensionDefault
 
     defaultConfig {
         applicationId "com.quickblox.sample.chat"
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
-        versionCode 202
-        versionName "3.2"
+        versionCode rootProject.versionCode
+        versionName rootProject.versionName
     }
 
     productFlavors {
         speedDev {
+            dimension rootProject.dimensionDefault
             minSdkVersion 21
         }
         dev {
+            dimension rootProject.dimensionDefault
             minSdkVersion rootProject.minSdkVersion
         }
     }
@@ -71,13 +74,14 @@ android {
 
 
 dependencies {
-    compile("com.quickblox:quickblox-android-sdk-chat:$rootProject.qbSdkVersion")
-    compile("com.quickblox:quickblox-android-sdk-content:$rootProject.qbSdkVersion")
+    implementation (project(":sample-core"))
 
-    compile(project(":sample-core"))
-    compile 'com.github.orangegangsters:swipy:1.2.2@aar'
-    compile "com.github.bumptech.glide:glide:${rootProject.glideVersion}"
-    compile(name: 'sticky-list-headers', ext: 'aar')
+    implementation ("com.quickblox:quickblox-android-sdk-chat:$rootProject.qbSdkVersion")
+    implementation("com.quickblox:quickblox-android-sdk-content:$rootProject.qbSdkVersion")
+
+    implementation "com.github.orangegangsters:swipy:$rootProject.swipyVersion@aar"
+    implementation "com.github.bumptech.glide:glide:${rootProject.glideVersion}"
+    implementation (name: 'sticky-list-headers', ext: 'aar')
 }
 
 apply from: "../artifacts.gradle"

diff --git a/sample-chat/src/main/AndroidManifest.xml b/sample-chat/src/main/AndroidManifest.xml
@@ -98,10 +98,6 @@
             android:name="com.google.android.gms.version"
             android:value="@integer/google_play_services_version" />
 
-        <meta-data
-            android:name="io.fabric.ApiKey"
-            android:value="7aea78439bec41a9005c7488bb6751c5e33fe270" />
-
         <provider
             android:name="android.support.v4.content.FileProvider"
             android:authorities="${applicationId}.provider"

diff --git a/sample-chat/src/main/java/com/quickblox/sample/chat/ui/adapter/DialogsAdapter.java b/sample-chat/src/main/java/com/quickblox/sample/chat/ui/adapter/DialogsAdapter.java
@@ -60,7 +60,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
             holder.unreadCounterTextView.setVisibility(View.GONE);
         } else {
             holder.unreadCounterTextView.setVisibility(View.VISIBLE);
-            holder.unreadCounterTextView.setText(String.valueOf(unreadMessagesCount > 99 ? 99 : unreadMessagesCount));
+            holder.unreadCounterTextView.setText(String.valueOf(unreadMessagesCount > 99 ? "99+" : unreadMessagesCount));
         }
 
         holder.rootLayout.setBackgroundColor(isItemSelected(position) ? ResourceUtils.getColor(R.color.selected_list_item_color) :

diff --git a/sample-chat/src/main/java/com/quickblox/sample/chat/utils/chat/ChatHelper.java b/sample-chat/src/main/java/com/quickblox/sample/chat/utils/chat/ChatHelper.java
@@ -12,6 +12,7 @@
 import com.quickblox.chat.model.QBChatMessage;
 import com.quickblox.chat.model.QBDialogType;
 import com.quickblox.chat.request.QBDialogRequestBuilder;
+import com.quickblox.chat.request.QBMessageGetBuilder;
 import com.quickblox.chat.utils.DialogUtils;
 import com.quickblox.content.QBContent;
 import com.quickblox.content.model.QBFile;
@@ -235,12 +236,13 @@ public void onSuccess(QBChatDialog qbDialog, Bundle bundle) {
 
     public void loadChatHistory(QBChatDialog dialog, int skipPagination,
                                 final QBEntityCallback<ArrayList<QBChatMessage>> callback) {
-        QBRequestGetBuilder customObjectRequestBuilder = new QBRequestGetBuilder();
-        customObjectRequestBuilder.setSkip(skipPagination);
-        customObjectRequestBuilder.setLimit(CHAT_HISTORY_ITEMS_PER_PAGE);
-        customObjectRequestBuilder.sortDesc(CHAT_HISTORY_ITEMS_SORT_FIELD);
+        QBMessageGetBuilder messageGetBuilder = new QBMessageGetBuilder();
+        messageGetBuilder.setSkip(skipPagination);
+        messageGetBuilder.setLimit(CHAT_HISTORY_ITEMS_PER_PAGE);
+        messageGetBuilder.sortDesc(CHAT_HISTORY_ITEMS_SORT_FIELD);
+        messageGetBuilder.markAsRead(false);
 
-        QBRestChatService.getDialogMessages(dialog, customObjectRequestBuilder).performAsync(
+        QBRestChatService.getDialogMessages(dialog, messageGetBuilder).performAsync(
                 new QbEntityCallbackWrapper<ArrayList<QBChatMessage>>(callback) {
                     @Override
                     public void onSuccess(ArrayList<QBChatMessage> qbChatMessages, Bundle bundle) {

diff --git a/sample-chat/src/main/res/values/styles_widgets.xml b/sample-chat/src/main/res/values/styles_widgets.xml
@@ -43,8 +43,14 @@
     </style>
 
     <style name="DialogUnreadCounterStyle">
-        <item name="android:layout_width">20dp</item>
+        <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">20dp</item>
+        <item name="android:minWidth">20dp</item>
+        <item name="android:paddingStart">4dp</item>
+        <item name="android:paddingLeft">4dp</item>
+        <item name="android:paddingEnd">4dp</item>
+        <item name="android:paddingRight">4dp</item>
+
         <item name="android:layout_alignParentRight">true</item>
         <item name="android:layout_centerVertical">true</item>
         <item name="android:layout_marginLeft">@dimen/list_item_side_margin</item>

diff --git a/sample-content/build.gradle b/sample-content/build.gradle
@@ -1,22 +1,36 @@
+buildscript {
+    repositories {
+        maven { url 'https://maven.fabric.io/public' }
+    }
+
+    dependencies {
+        classpath "io.fabric.tools:gradle:$rootProject.fabricToolsVersion"
+    }
+}
+
 apply plugin: 'com.android.application'
+apply plugin: 'io.fabric'
 
 android {
     compileSdkVersion rootProject.compileSdkVersion
     buildToolsVersion rootProject.buildToolsVersion
+    flavorDimensions rootProject.dimensionDefault
 
     defaultConfig {
         applicationId "com.quickblox.sample.content"
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
-        versionCode 200
-        versionName "2.0.0"
+        versionCode rootProject.versionCode
+        versionName rootProject.versionName
     }
 
     productFlavors {
         speedDev {
+            dimension rootProject.dimensionDefault
             minSdkVersion 21
         }
         dev {
+            dimension rootProject.dimensionDefault
             minSdkVersion rootProject.minSdkVersion
         }
     }
@@ -42,11 +56,11 @@ android {
 }
 
 dependencies {
-    compile "com.quickblox:quickblox-android-sdk-content:$rootProject.qbSdkVersion"
+    implementation (project(":sample-core"))
 
-    compile(project(":sample-core"))
+    implementation "com.quickblox:quickblox-android-sdk-content:$rootProject.qbSdkVersion"
 
-    compile "com.github.bumptech.glide:glide:${rootProject.glideVersion}"
+    implementation "com.github.bumptech.glide:glide:${rootProject.glideVersion}"
 }
 
 apply from: "../artifacts.gradle"
diff --git a/sample-core/build.gradle b/sample-core/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
-        versionCode 1
-        versionName "1.0"
+        versionCode rootProject.versionCode
+        versionName rootProject.versionName
     }
 
     lintOptions {
@@ -17,9 +17,9 @@ android {
 }
 
 dependencies {
-    compile ("com.quickblox:quickblox-android-sdk-messages:$rootProject.qbSdkVersion" )
+    api ("com.quickblox:quickblox-android-sdk-messages:$rootProject.qbSdkVersion" )
 
-    compile "com.android.support:design:${rootProject.designVersion}"
-    compile "com.github.johnkil.android-robototextview:robototextview:${rootProject.robotoTextViewVersion}"
+    api "com.android.support:design:${rootProject.designVersion}"
+    api "com.github.johnkil.android-robototextview:robototextview:${rootProject.robotoTextViewVersion}"
 
 }
diff --git a/sample-core/src/main/AndroidManifest.xml b/sample-core/src/main/AndroidManifest.xml
@@ -1,5 +1,10 @@
-<manifest package="com.quickblox.sample.core">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.quickblox.sample.core">
 
-    <application />
+    <application>
+        <meta-data
+            android:name="io.fabric.ApiKey"
+            android:value="7aea78439bec41a9005c7488bb6751c5e33fe270" />
+    </application>
 
 </manifest>
diff --git a/sample-custom-objects/build.gradle b/sample-custom-objects/build.gradle
@@ -1,22 +1,36 @@
+buildscript {
+    repositories {
+        maven { url 'https://maven.fabric.io/public' }
+    }
+
+    dependencies {
+        classpath "io.fabric.tools:gradle:$rootProject.fabricToolsVersion"
+    }
+}
+
 apply plugin: 'com.android.application'
+apply plugin: 'io.fabric'
 
 android {
     compileSdkVersion rootProject.compileSdkVersion
     buildToolsVersion rootProject.buildToolsVersion
+    flavorDimensions rootProject.dimensionDefault
 
     defaultConfig {
         applicationId "com.quickblox.sample.customobjects"
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
-        versionCode 200
-        versionName "2.0.0"
+        versionCode rootProject.versionCode
+        versionName rootProject.versionName
     }
 
     productFlavors {
         speedDev {
+            dimension rootProject.dimensionDefault
             minSdkVersion 21
         }
         dev {
+            dimension rootProject.dimensionDefault
             minSdkVersion rootProject.minSdkVersion
         }
     }
@@ -46,11 +60,13 @@ android {
 }
 
 dependencies {
-    compile "com.quickblox:quickblox-android-sdk-customobjects:$rootProject.qbSdkVersion"
-    compile "com.quickblox:quickblox-android-sdk-extensions:$rootProject.qbSdkVersion"
-    compile 'io.reactivex:rxandroid:1.2.1'
-    compile 'com.github.orangegangsters:swipy:1.2.2@aar'
-    compile(project(":sample-core"))
+    implementation (project(":sample-core"))
+
+    implementation "com.quickblox:quickblox-android-sdk-customobjects:$rootProject.qbSdkVersion"
+    implementation "com.quickblox:quickblox-android-sdk-extensions:$rootProject.qbSdkVersion"
+
+    implementation 'io.reactivex:rxandroid:1.2.1'
+    implementation "com.github.orangegangsters:swipy:$rootProject.swipyVersion@aar"
 }
 
 apply from: "../artifacts.gradle"