Skip to content

Commit 110f57e

Browse files
RomanProninRomanPronin
authored
Merge pull request #527 from QuickBlox/development
Development
2 parents 6feeea5 + 7c8c3a0 commit 110f57e

File tree

18 files changed

+165
-96
lines changed

18 files changed

+165
-96
lines changed

‎artifacts.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ android.applicationVariants.all {
1919
apkEndName = "-unaligned.apk"
2020
}
2121
newApkName = "${appName}-${variant.buildType.name}-${getDate()}-code-${variant.versionCode}-version-${variant.versionName}" + apkEndName
22-
output.outputFile = new File(output.outputFile.parent, newApkName)
22+
output.outputFileName = newApkName
2323
}
2424
}
2525

‎build.gradle‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
buildscript {
22
repositories {
33
jcenter()
4+
google()
45
}
56

67
dependencies {
7-
classpath 'com.android.tools.build:gradle:2.2.3'
8-
classpath 'com.google.gms:google-services:3.0.0'
8+
classpath 'com.android.tools.build:gradle:3.0.1'
9+
classpath 'com.google.gms:google-services:3.1.1'
910
}
1011
}
1112

@@ -19,12 +20,11 @@ allprojects {
1920
url 'https://maven.google.com'
2021
}
2122
}
22-
2323
}
2424

2525
ext {
2626
compileSdkVersion = 26
27-
buildToolsVersion = "26.0.2"
27+
buildToolsVersion = "27.0.3"
2828

2929
minSdkVersion = 14
3030
targetSdkVersion = 26
@@ -35,34 +35,33 @@ ext {
3535
lintAbortOnError = false
3636

3737
// QuickBlox SDK version
38-
qbSdkVersion = '3.4.1'
38+
qbSdkVersion = '3.6.0'
3939

40-
versionName = '3.4.1'
40+
versionCode = 360
41+
versionName = '3.6.0'
4142

4243
testRunnerVersion = "0.4.1"
4344

4445

4546
// Dependency versions
4647
playServicesVersion = '11.4.2'
47-
supportV4Version = '26.1.0'
48-
appcompatV7Version = '26.1.0'
49-
recyclerviewV7Version = '26.1.0'
50-
supportAnnotationsVersion = '26.1.0'
51-
designVersion = '26.1.0'
48+
supportLibVersion = '26.1.0'
49+
supportV4Version = supportLibVersion
50+
appcompatV7Version = supportLibVersion
51+
recyclerviewV7Version = supportLibVersion
52+
supportAnnotationsVersion = supportLibVersion
53+
designVersion = supportLibVersion
54+
cardViewVersion = supportLibVersion
5255

5356
uilVersion = '1.9.0'
5457
glideVersion = '3.6.1'
5558
pullToRefreshVersion = '3.2.3'
5659
stickyListHeaders = '2.7.0'
5760
robotoTextViewVersion = '4.0.0'
5861
stickersVersion = '0.7.3'
59-
crashlyticsVersion = '2.2.2'
60-
}
62+
crashlyticsVersion = '2.8.0'
63+
fabricToolsVersion = '1.25.1'
64+
swipyVersion = '1.2.3'
6165

62-
task wrapper(type: Wrapper) {
63-
gradleVersion = '2.10'
64-
}
65-
66-
def makeJar(variant, project) {
67-
//empty
68-
}
66+
dimensionDefault = 'default'
67+
}

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-all.zip

‎sample-chat/build.gradle‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
}
55

66
dependencies {
7-
classpath 'io.fabric.tools:gradle:1.20.1'
7+
classpath "io.fabric.tools:gradle:$rootProject.fabricToolsVersion"
88
}
99
}
1010

@@ -21,20 +21,23 @@ repositories {
2121
android {
2222
compileSdkVersion rootProject.compileSdkVersion
2323
buildToolsVersion rootProject.buildToolsVersion
24+
flavorDimensions rootProject.dimensionDefault
2425

2526
defaultConfig {
2627
applicationId "com.quickblox.sample.chat"
2728
minSdkVersion rootProject.minSdkVersion
2829
targetSdkVersion rootProject.targetSdkVersion
29-
versionCode 202
30-
versionName "3.2"
30+
versionCode rootProject.versionCode
31+
versionName rootProject.versionName
3132
}
3233

3334
productFlavors {
3435
speedDev {
36+
dimension rootProject.dimensionDefault
3537
minSdkVersion 21
3638
}
3739
dev {
40+
dimension rootProject.dimensionDefault
3841
minSdkVersion rootProject.minSdkVersion
3942
}
4043
}
@@ -71,13 +74,14 @@ android {
7174

7275

7376
dependencies {
74-
compile("com.quickblox:quickblox-android-sdk-chat:$rootProject.qbSdkVersion")
75-
compile("com.quickblox:quickblox-android-sdk-content:$rootProject.qbSdkVersion")
77+
implementation (project(":sample-core"))
7678

77-
compile(project(":sample-core"))
78-
compile 'com.github.orangegangsters:swipy:1.2.2@aar'
79-
compile "com.github.bumptech.glide:glide:${rootProject.glideVersion}"
80-
compile(name: 'sticky-list-headers', ext: 'aar')
79+
implementation ("com.quickblox:quickblox-android-sdk-chat:$rootProject.qbSdkVersion")
80+
implementation("com.quickblox:quickblox-android-sdk-content:$rootProject.qbSdkVersion")
81+
82+
implementation "com.github.orangegangsters:swipy:$rootProject.swipyVersion@aar"
83+
implementation "com.github.bumptech.glide:glide:${rootProject.glideVersion}"
84+
implementation (name: 'sticky-list-headers', ext: 'aar')
8185
}
8286

8387
apply from: "../artifacts.gradle"

‎sample-chat/src/main/AndroidManifest.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,6 @@
9898
android:name="com.google.android.gms.version"
9999
android:value="@integer/google_play_services_version" />
100100

101-
<meta-data
102-
android:name="io.fabric.ApiKey"
103-
android:value="7aea78439bec41a9005c7488bb6751c5e33fe270" />
104-
105101
<provider
106102
android:name="android.support.v4.content.FileProvider"
107103
android:authorities="${applicationId}.provider"

‎sample-chat/src/main/java/com/quickblox/sample/chat/ui/adapter/DialogsAdapter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
6060
holder.unreadCounterTextView.setVisibility(View.GONE);
6161
} else {
6262
holder.unreadCounterTextView.setVisibility(View.VISIBLE);
63-
holder.unreadCounterTextView.setText(String.valueOf(unreadMessagesCount > 99 ? 99 : unreadMessagesCount));
63+
holder.unreadCounterTextView.setText(String.valueOf(unreadMessagesCount > 99 ? "99+" : unreadMessagesCount));
6464
}
6565

6666
holder.rootLayout.setBackgroundColor(isItemSelected(position) ? ResourceUtils.getColor(R.color.selected_list_item_color) :

‎sample-chat/src/main/java/com/quickblox/sample/chat/utils/chat/ChatHelper.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import com.quickblox.chat.model.QBChatMessage;
1313
import com.quickblox.chat.model.QBDialogType;
1414
import com.quickblox.chat.request.QBDialogRequestBuilder;
15+
import com.quickblox.chat.request.QBMessageGetBuilder;
1516
import com.quickblox.chat.utils.DialogUtils;
1617
import com.quickblox.content.QBContent;
1718
import com.quickblox.content.model.QBFile;
@@ -235,12 +236,13 @@ public void onSuccess(QBChatDialog qbDialog, Bundle bundle) {
235236

236237
public void loadChatHistory(QBChatDialog dialog, int skipPagination,
237238
final QBEntityCallback<ArrayList<QBChatMessage>> callback) {
238-
QBRequestGetBuilder customObjectRequestBuilder = new QBRequestGetBuilder();
239-
customObjectRequestBuilder.setSkip(skipPagination);
240-
customObjectRequestBuilder.setLimit(CHAT_HISTORY_ITEMS_PER_PAGE);
241-
customObjectRequestBuilder.sortDesc(CHAT_HISTORY_ITEMS_SORT_FIELD);
239+
QBMessageGetBuilder messageGetBuilder = new QBMessageGetBuilder();
240+
messageGetBuilder.setSkip(skipPagination);
241+
messageGetBuilder.setLimit(CHAT_HISTORY_ITEMS_PER_PAGE);
242+
messageGetBuilder.sortDesc(CHAT_HISTORY_ITEMS_SORT_FIELD);
243+
messageGetBuilder.markAsRead(false);
242244

243-
QBRestChatService.getDialogMessages(dialog, customObjectRequestBuilder).performAsync(
245+
QBRestChatService.getDialogMessages(dialog, messageGetBuilder).performAsync(
244246
new QbEntityCallbackWrapper<ArrayList<QBChatMessage>>(callback) {
245247
@Override
246248
public void onSuccess(ArrayList<QBChatMessage> qbChatMessages, Bundle bundle) {

‎sample-chat/src/main/res/values/styles_widgets.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,14 @@
4343
</style>
4444

4545
<style name="DialogUnreadCounterStyle">
46-
<item name="android:layout_width">20dp</item>
46+
<item name="android:layout_width">wrap_content</item>
4747
<item name="android:layout_height">20dp</item>
48+
<item name="android:minWidth">20dp</item>
49+
<item name="android:paddingStart">4dp</item>
50+
<item name="android:paddingLeft">4dp</item>
51+
<item name="android:paddingEnd">4dp</item>
52+
<item name="android:paddingRight">4dp</item>
53+
4854
<item name="android:layout_alignParentRight">true</item>
4955
<item name="android:layout_centerVertical">true</item>
5056
<item name="android:layout_marginLeft">@dimen/list_item_side_margin</item>

‎sample-content/build.gradle‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,36 @@
1+
buildscript {
2+
repositories {
3+
maven { url 'https://maven.fabric.io/public' }
4+
}
5+
6+
dependencies {
7+
classpath "io.fabric.tools:gradle:$rootProject.fabricToolsVersion"
8+
}
9+
}
10+
111
apply plugin: 'com.android.application'
12+
apply plugin: 'io.fabric'
213

314
android {
415
compileSdkVersion rootProject.compileSdkVersion
516
buildToolsVersion rootProject.buildToolsVersion
17+
flavorDimensions rootProject.dimensionDefault
618

719
defaultConfig {
820
applicationId "com.quickblox.sample.content"
921
minSdkVersion rootProject.minSdkVersion
1022
targetSdkVersion rootProject.targetSdkVersion
11-
versionCode 200
12-
versionName "2.0.0"
23+
versionCode rootProject.versionCode
24+
versionName rootProject.versionName
1325
}
1426

1527
productFlavors {
1628
speedDev {
29+
dimension rootProject.dimensionDefault
1730
minSdkVersion 21
1831
}
1932
dev {
33+
dimension rootProject.dimensionDefault
2034
minSdkVersion rootProject.minSdkVersion
2135
}
2236
}
@@ -42,11 +56,11 @@ android {
4256
}
4357

4458
dependencies {
45-
compile "com.quickblox:quickblox-android-sdk-content:$rootProject.qbSdkVersion"
59+
implementation (project(":sample-core"))
4660

47-
compile(project(":sample-core"))
61+
implementation "com.quickblox:quickblox-android-sdk-content:$rootProject.qbSdkVersion"
4862

49-
compile "com.github.bumptech.glide:glide:${rootProject.glideVersion}"
63+
implementation "com.github.bumptech.glide:glide:${rootProject.glideVersion}"
5064
}
5165

5266
apply from: "../artifacts.gradle"

‎sample-core/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ android {
77
defaultConfig {
88
minSdkVersion rootProject.minSdkVersion
99
targetSdkVersion rootProject.targetSdkVersion
10-
versionCode 1
11-
versionName "1.0"
10+
versionCode rootProject.versionCode
11+
versionName rootProject.versionName
1212
}
1313

1414
lintOptions {
@@ -17,9 +17,9 @@ android {
1717
}
1818

1919
dependencies {
20-
compile ("com.quickblox:quickblox-android-sdk-messages:$rootProject.qbSdkVersion" )
20+
api ("com.quickblox:quickblox-android-sdk-messages:$rootProject.qbSdkVersion" )
2121

22-
compile "com.android.support:design:${rootProject.designVersion}"
23-
compile "com.github.johnkil.android-robototextview:robototextview:${rootProject.robotoTextViewVersion}"
22+
api "com.android.support:design:${rootProject.designVersion}"
23+
api "com.github.johnkil.android-robototextview:robototextview:${rootProject.robotoTextViewVersion}"
2424

2525
}

0 commit comments

Comments
 (0)