Merge pull request #865 from redsolution/develop

Update to 568

.travis.yml

@@ -30,7 +30,7 @@ install:
 
 script:
   # By default Travis-ci executes './gradlew build connectedCheck' if no 'script:' section found.
-  - ./gradlew clean build -Pbuild=dev
+  - ./gradlew clean build -Pbuild=open
 
 
 env:

README.md

@@ -18,7 +18,7 @@ Xabber uses Gradle build system. The only specific thing is git submodule for ge
 
 **2. Build**
 
-To build Xabber use **"dev"** productFlavour. Other flavours like "beta", "prod", "ru" and "vip" requare api keys that not represent in this repository.
+To build Xabber use **"open"** productFlavour. Other flavours like "beta", "prod", "dev" and "vip" requare api keys that not represent in this repository.
 
 ## Translations [![Crowdin](https://d322cqt584bo4o.cloudfront.net/xabber/localized.svg)](https://crowdin.com/project/xabber)
 

xabber/build.gradle

@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 28
-        versionCode 533
-        versionName '2.5(533)'
+        versionCode 568
+        versionName '2.6(568)'
     }
 
     lintOptions {
@@ -38,6 +38,13 @@ android {
     flavorDimensions "build"
     productFlavors {
 
+        open {
+            dimension "build"
+            applicationId "com.xabber.android.open"
+            resValue 'string', 'application_package', applicationId
+            multiDexEnabled true
+        }
+
         dev {
             dimension "build"
             applicationId "com.xabber.androiddev"
@@ -65,28 +72,13 @@ android {
             resValue 'string', 'application_package', applicationId
             multiDexEnabled true
         }
-
-        ru {
-            dimension "build"
-            applicationId "com.xabber.android.ru"
-            resValue 'string', 'application_package', applicationId
-            multiDexEnabled true
-        }
-
     }
 
     buildTypes {
         release {
             minifyEnabled true
             shrinkResources true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'),
-                    'proguard-rules.pro'
-            // enable crashlytics
-            buildConfigField "boolean", "USE_CRASHLYTICS", "true"
-        }
-        debug {
-            // disable crashlytics
-            buildConfigField "boolean", "USE_CRASHLYTICS", "false"
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
 
@@ -103,33 +95,14 @@ android {
             universalApk true
         }
     }
-
-    afterEvaluate {
-        initFabricPropertiesIfNeeded()
-    }
-}
-
-def initFabricPropertiesIfNeeded() {
-    def propertiesFile = file('fabric.properties')
-
-    def apiSecret = hasProperty('crashlyticsApisecret') ? crashlyticsApisecret : System.getenv('crashlyticsApisecret')
-    def apiKey = hasProperty('crashlyticsApikey') ? crashlyticsApikey : System.getenv('crashlyticsApikey')
-
-    if (!propertiesFile.exists()) {
-        def commentMessage = "This is autogenerated fabric property from system environment to prevent key to be committed to source control."
-        ant.propertyfile(file: "fabric.properties", comment: commentMessage) {
-            entry(key: "apiSecret", value: apiSecret)
-            entry(key: "apiKey", value: apiKey)
-        }
-    }
 }
 
 def build_param = "${build}";
 
-if (build_param == "dev") {
-    //exclude all but dev
+if (build_param == "open") {
+    // exclude all flavours except open
     android.variantFilter { variant ->
-        if (!variant.getFlavors().get(0).name.equals('dev')) {
+        if (!variant.getFlavors().get(0).name.equals('open')) {
             variant.setIgnore(true);
         }
     }
@@ -172,7 +145,7 @@ dependencies {
 
     // social
     implementation 'com.google.android.gms:play-services-safetynet:11.4.0'
-    implementation 'com.facebook.android:facebook-android-sdk:4.31.0'
+    implementation 'com.facebook.android:facebook-login:4.36.1'
     implementation 'com.twitter.sdk.android:twitter:3.0.0'
     implementation 'com.google.android.gms:play-services-auth:11.4.0'
     implementation ('com.google.api-client:google-api-client-android:1.22.0') {

xabber/proguard-rules.pro

@@ -35,6 +35,9 @@
 -keep @io.realm.internal.Keep class * { *; }
 -dontwarn javax.**
 -dontwarn io.realm.**
+-keepnames public class * extends io.realm.RealmObject
+-keep public class * extends io.realm.RealmObject { *; }
+-keep class io.realm.** { *; }
 
 # EbentBus
 -keepattributes *Annotation*

xabber/src/beta/res/drawable/ic_stat_offline.xml

@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M13.4146,22.5C13.2087,23.0826 12.6531,23.5 12,23.5C11.3469,23.5 10.7913,23.0826 10.5854,22.5L9.9908,22.5C9.4436,22.5 9,22.0561 9,21.5C9,20.9477 9.451,20.5 9.9908,20.5L14.0092,20.5C14.5564,20.5 15,20.9439 15,21.5C15,22.0523 14.549,22.5 14.0092,22.5L13.4146,22.5Z"
+      android:strokeWidth="1"
+      android:fillColor="#fff"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M9,17.75L15,17.75A1,1 0,0 1,16 18.75L16,18.75A1,1 0,0 1,15 19.75L9,19.75A1,1 0,0 1,8 18.75L8,18.75A1,1 0,0 1,9 17.75z"
+      android:strokeWidth="1"
+      android:fillColor="#fff"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M17.51,14.8015C17.1966,15.1049 17.0014,15.5297 17,16C17,16.5523 16.5443,17 16.0046,17L7.9954,17C7.4457,17 7,16.5561 7,16C6.9986,15.5297 6.8034,15.1049 6.49,14.8015L6.49,14.8C4.9562,13.3425 4,11.2829 4,9C4,4.5817 7.5817,1 12,1C16.4183,1 20,4.5817 20,9C20,11.2829 19.0438,13.3425 17.51,14.8L17.51,14.8015ZM8.8609,15L15.1391,15C15.3021,14.4253 15.6015,13.8951 16,13.4722C17.2275,12.3736 18,10.777 18,9C18,5.6863 15.3137,3 12,3C8.6863,3 6,5.6863 6,9C6,10.777 6.7725,12.3736 8,13.4722C8.3985,13.8951 8.6979,14.4253 8.8609,15Z"
+      android:strokeWidth="1"
+      android:fillColor="#fff"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M11.8916,6C12.4385,6 12.8785,6.1515 13.2115,6.4546C13.5445,6.7577 13.7109,7.1501 13.7109,7.6317C13.7109,7.8836 13.6415,8.1147 13.5027,8.3251C13.3638,8.5355 13.1697,8.7043 12.9203,8.8316C13.2689,8.9562 13.536,9.1534 13.7216,9.4233C13.9072,9.6932 14,10.008 14,10.3679C14,10.9353 13.8236,11.3844 13.4708,11.7152C13.118,12.0459 12.6511,12.2113 12.0701,12.2113C11.5572,12.2113 11.1307,12.0799 10.7906,11.8169L10.7906,14C10.6143,13.9519 10.4816,13.9122 10.3924,13.8809C10.3032,13.8496 10.1724,13.7968 10,13.7226L10,7.6732C10,7.3743 10.0864,7.0947 10.2593,6.8345C10.4322,6.5744 10.6652,6.3702 10.9586,6.2221C11.2519,6.074 11.5629,6 11.8916,6ZM12.9245,7.6151C12.9245,7.3328 12.8282,7.0982 12.6355,6.9114C12.4428,6.7245 12.1948,6.6311 11.8916,6.6311C11.5855,6.6311 11.3263,6.7294 11.1137,6.9259C10.9012,7.1224 10.7935,7.3688 10.7906,7.6649L10.7906,11.1069C10.9153,11.2508 11.0797,11.3664 11.2837,11.4536C11.4878,11.5408 11.723,11.5844 11.9894,11.5844C12.3691,11.5844 12.6681,11.4737 12.8863,11.2522C13.1045,11.0308 13.2136,10.7415 13.2136,10.3845C13.2136,10.0578 13.1144,9.7804 12.916,9.552C12.7177,9.3236 12.464,9.2053 12.1552,9.197L11.5175,9.197L11.5175,8.5659L11.8789,8.5659C12.2189,8.5659 12.4782,8.4836 12.6567,8.3189C12.8353,8.1542 12.9245,7.9196 12.9245,7.6151Z"
+      android:strokeWidth="1"
+      android:fillColor="#fff"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
+</vector>

xabber/src/beta/res/drawable/ic_stat_online.xml

@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M13.4146,22.5C13.2087,23.0826 12.6531,23.5 12,23.5C11.3469,23.5 10.7913,23.0826 10.5854,22.5L9.9908,22.5C9.4436,22.5 9,22.0561 9,21.5C9,20.9477 9.451,20.5 9.9908,20.5L14.0092,20.5C14.5564,20.5 15,20.9439 15,21.5C15,22.0523 14.549,22.5 14.0092,22.5L13.4146,22.5Z"
+      android:strokeWidth="1"
+      android:fillColor="#fff"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M9,17.75L15,17.75A1,1 0,0 1,16 18.75L16,18.75A1,1 0,0 1,15 19.75L9,19.75A1,1 0,0 1,8 18.75L8,18.75A1,1 0,0 1,9 17.75z"
+      android:strokeWidth="1"
+      android:fillColor="#fff"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M17.51,14.8015C17.1966,15.1049 17.0014,15.5297 17,16C17,16.5523 16.5443,17 16.0046,17L7.9954,17C7.4457,17 7,16.5561 7,16C6.9986,15.5297 6.8034,15.1049 6.49,14.8015L6.49,14.8C4.9562,13.3425 4,11.2829 4,9C4,4.5817 7.5817,1 12,1C16.4183,1 20,4.5817 20,9C20,11.2829 19.0438,13.3425 17.51,14.8L17.51,14.8015ZM11.8916,6C11.5629,6 11.2519,6.074 10.9586,6.2221C10.6652,6.3702 10.4322,6.5744 10.2593,6.8345C10.0864,7.0947 10,7.3743 10,7.6732L10,13.7226C10.1724,13.7968 10.3032,13.8496 10.3924,13.8809C10.4816,13.9122 10.6143,13.9519 10.7906,14L10.7906,11.8169C11.1307,12.0799 11.5572,12.2113 12.0701,12.2113C12.6511,12.2113 13.118,12.0459 13.4708,11.7152C13.8236,11.3844 14,10.9353 14,10.3679C14,10.008 13.9072,9.6932 13.7216,9.4233C13.536,9.1534 13.2689,8.9562 12.9203,8.8316C13.1697,8.7043 13.3638,8.5355 13.5027,8.3251C13.6415,8.1147 13.7109,7.8836 13.7109,7.6317C13.7109,7.1501 13.5445,6.7577 13.2115,6.4546C12.8785,6.1515 12.4385,6 11.8916,6ZM12.9245,7.6151C12.9245,7.9196 12.8353,8.1542 12.6567,8.3189C12.4782,8.4836 12.2189,8.5659 11.8789,8.5659L11.5175,8.5659L11.5175,9.197L12.1552,9.197C12.464,9.2053 12.7177,9.3236 12.916,9.552C13.1144,9.7804 13.2136,10.0578 13.2136,10.3845C13.2136,10.7415 13.1045,11.0308 12.8863,11.2522C12.6681,11.4737 12.3691,11.5844 11.9894,11.5844C11.723,11.5844 11.4878,11.5408 11.2837,11.4536C11.0797,11.3664 10.9153,11.2508 10.7906,11.1069L10.7906,7.6649C10.7935,7.3688 10.9012,7.1224 11.1137,6.9259C11.3263,6.7294 11.5855,6.6311 11.8916,6.6311C12.1948,6.6311 12.4428,6.7245 12.6355,6.9114C12.8282,7.0982 12.9245,7.3328 12.9245,7.6151Z"
+      android:strokeWidth="1"
+      android:fillColor="#fff"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
+</vector>

xabber/src/dev/res/drawable/ic_stat_offline.xml

@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M13.4146,22.5C13.2087,23.0826 12.6531,23.5 12,23.5C11.3469,23.5 10.7913,23.0826 10.5854,22.5L9.9908,22.5C9.4436,22.5 9,22.0561 9,21.5C9,20.9477 9.451,20.5 9.9908,20.5L14.0092,20.5C14.5564,20.5 15,20.9439 15,21.5C15,22.0523 14.549,22.5 14.0092,22.5L13.4146,22.5Z"
+      android:strokeWidth="1"
+      android:fillColor="#fff"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M9,17.75L15,17.75A1,1 0,0 1,16 18.75L16,18.75A1,1 0,0 1,15 19.75L9,19.75A1,1 0,0 1,8 18.75L8,18.75A1,1 0,0 1,9 17.75z"
+      android:strokeWidth="1"
+      android:fillColor="#fff"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M17.51,14.8015C17.1966,15.1049 17.0014,15.5297 17,16C17,16.5523 16.5443,17 16.0046,17L7.9954,17C7.4457,17 7,16.5561 7,16C6.9986,15.5297 6.8034,15.1049 6.49,14.8015L6.49,14.8C4.9562,13.3425 4,11.2829 4,9C4,4.5817 7.5817,1 12,1C16.4183,1 20,4.5817 20,9C20,11.2829 19.0438,13.3425 17.51,14.8L17.51,14.8015ZM8.8609,15L15.1391,15C15.3021,14.4253 15.6015,13.8951 16,13.4722C17.2275,12.3736 18,10.777 18,9C18,5.6863 15.3137,3 12,3C8.6863,3 6,5.6863 6,9C6,10.777 6.7725,12.3736 8,13.4722C8.3985,13.8951 8.6979,14.4253 8.8609,15Z"
+      android:strokeWidth="1"
+      android:fillColor="#fff"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M14.0762,10.5795C14.2319,10.2788 14.3953,10 14.5616,10C14.9372,10 15.6551,11.206 16,12L12.5024,12C12.5024,11.7296 12.8894,11.1872 13.0778,11.1872C13.2575,11.1872 13.4363,11.3136 13.5696,11.3136C13.6962,11.3136 13.8355,11.0521 13.9829,10.7624L12.6264,9.9726C12.5882,9.9876 12.5466,9.9972 12.5024,10C12.3136,10.012 12.1435,9.8952 12.1037,9.7256L12.0858,9.6578L11.3664,9.239L11.2739,9.354L11.8248,10.2524L12.0652,12L11.2857,12L11.03,10.514L10.5237,10L9.8793,12L9.0049,12L9.8793,8.8L10.1007,8.502L9.6722,8.2526C9.5506,8.4046 9.3164,8.4378 9.1505,8.3252C8.9891,8.2156 8.952,8.0088 9.0661,7.858L9.8526,6.99C9.9623,6.8452 10.1582,6.7772 10.3453,6.8184L11.2897,7.1156C11.3491,7.1284 11.4042,7.1516 11.4536,7.1844C11.6263,7.2992 12.0561,7.5852 12.283,7.7364C12.377,7.7992 12.4412,7.8912 12.4644,7.9952L12.8487,9.5828C12.8692,9.6741 12.8486,9.7635 12.7993,9.8361L14.0762,10.5795ZM9.8181,8.1003L10.2237,8.3365L10.602,7.8276L10.1989,7.7048L9.8181,8.1003ZM11.4964,9.0775L12.0118,9.3776L11.8248,8.6692L11.4964,9.0775ZM12.5024,7.6C12.0195,7.6 11.6281,7.2418 11.6281,6.8C11.6281,6.3582 12.0195,6 12.5024,6C12.9854,6 13.3768,6.3582 13.3768,6.8C13.3768,7.2418 12.9854,7.6 12.5024,7.6Z"
+      android:strokeWidth="1"
+      android:fillColor="#fff"
+      android:fillType="nonZero"
+      android:strokeColor="#00000000"/>
+</vector>

xabber/src/dev/res/drawable/ic_stat_online.xml

@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M13.4146,22.5C13.2087,23.0826 12.6531,23.5 12,23.5C11.3469,23.5 10.7913,23.0826 10.5854,22.5L9.9908,22.5C9.4436,22.5 9,22.0561 9,21.5C9,20.9477 9.451,20.5 9.9908,20.5L14.0092,20.5C14.5564,20.5 15,20.9439 15,21.5C15,22.0523 14.549,22.5 14.0092,22.5L13.4146,22.5Z"
+      android:strokeWidth="1"
+      android:fillColor="#fff"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M9,17.75L15,17.75A1,1 0,0 1,16 18.75L16,18.75A1,1 0,0 1,15 19.75L9,19.75A1,1 0,0 1,8 18.75L8,18.75A1,1 0,0 1,9 17.75z"
+      android:strokeWidth="1"
+      android:fillColor="#fff"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M14.0762,10.5795L12.7993,9.8361C12.8486,9.7635 12.8692,9.6741 12.8487,9.5828L12.4644,7.9952C12.4412,7.8912 12.377,7.7992 12.283,7.7364C12.0561,7.5852 11.6263,7.2992 11.4536,7.1844C11.4042,7.1516 11.3491,7.1284 11.2897,7.1156L10.3453,6.8184C10.1582,6.7772 9.9623,6.8452 9.8526,6.99L9.0661,7.858C8.952,8.0088 8.9891,8.2156 9.1505,8.3252C9.3164,8.4378 9.5506,8.4046 9.6722,8.2526L10.1007,8.502L9.8793,8.8L9.0049,12L9.8793,12L10.5237,10L11.03,10.514L11.2857,12L12.0652,12L11.8248,10.2524L11.2739,9.354L11.3664,9.239L12.0858,9.6578L12.1037,9.7256C12.1435,9.8952 12.3136,10.012 12.5024,10C12.5466,9.9972 12.5882,9.9876 12.6264,9.9726L13.9829,10.7624C13.8355,11.0521 13.6962,11.3136 13.5696,11.3136C13.4363,11.3136 13.2575,11.1872 13.0778,11.1872C12.8894,11.1872 12.5024,11.7296 12.5024,12L16,12C15.6551,11.206 14.9372,10 14.5616,10C14.3953,10 14.2319,10.2788 14.0762,10.5795ZM9.8181,8.1003L10.1989,7.7048L10.602,7.8276L10.2237,8.3365L9.8181,8.1003ZM11.4964,9.0775L11.8248,8.6692L12.0118,9.3776L11.4964,9.0775ZM17.51,14.8015C17.1966,15.1049 17.0014,15.5297 17,16C17,16.5523 16.5443,17 16.0046,17L7.9954,17C7.4457,17 7,16.5561 7,16C6.9986,15.5297 6.8034,15.1049 6.49,14.8015L6.49,14.8C4.9562,13.3425 4,11.2829 4,9C4,4.5817 7.5817,1 12,1C16.4183,1 20,4.5817 20,9C20,11.2829 19.0438,13.3425 17.51,14.8L17.51,14.8015ZM12.5024,7.6C12.9854,7.6 13.3768,7.2418 13.3768,6.8C13.3768,6.3582 12.9854,6 12.5024,6C12.0195,6 11.6281,6.3582 11.6281,6.8C11.6281,7.2418 12.0195,7.6 12.5024,7.6Z"
+      android:strokeWidth="1"
+      android:fillColor="#fff"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
+</vector>

xabber/src/dev/res/layout/activity_tutorial.xml

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/intro_background">
+
+    <android.support.v4.view.ViewPager
+        android:id="@+id/pager"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_alignParentTop="true"
+        android:layout_marginBottom="48dp" />
+
+    <ImageView
+        android:id="@+id/ivSettings"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:src="@drawable/ic_settings_grey600_24dp"
+        android:tint="@color/account_register_blue"
+        android:layout_alignParentRight="true"
+        android:layout_margin="8dp"
+        />
+
+    <me.relex.circleindicator.CircleIndicator
+        android:id="@+id/indicator"
+        android:layout_width="match_parent"
+        android:layout_height="24dp"
+        android:layout_marginBottom="48dp"
+        android:layout_alignParentBottom="true"
+        app:ci_drawable="@drawable/blue_radius"/>
+
+    <LinearLayout
+        android:id="@+id/rlButtons"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:orientation="horizontal"
+        android:layout_alignParentBottom="true"
+        >
+
+        <Button
+            android:id="@+id/btnLogin"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            style="@style/Widget.AppCompat.Button.Borderless"
+            android:theme="@style/BlueButton"
+            android:textColor="@color/account_register_blue"
+            android:text="@string/button_login"
+            android:layout_weight="1"
+            />
+
+        <Button
+            android:id="@+id/btnRegister"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            style="@style/Widget.AppCompat.Button.Borderless"
+            android:theme="@style/BlueButton"
+            android:textColor="@color/account_register_blue"
+            android:text="@string/button_registration"
+            android:layout_weight="1"
+            />
+
+    </LinearLayout>
+
+</RelativeLayout>