Merge branch 'release/0.8.20'

Author: bmarty

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,8 @@
+### Pull Request Checklist
+
+<!-- Please read CONTRIBUTING.rst before submitting your pull request -->
+
+* [ ] Pull request is based on the develop branch
+* [ ] Pull request updates [CHANGES.rst](https://github.com/vector-im/riot-android/blob/develop/CHANGES.rst)
+* [ ] Pull request includes screenshots or videos if containing UI changes
+* [ ] Pull request includes a [sign off](https://github.com/matrix-org/synapse/blob/master/CONTRIBUTING.rst#sign-off)

CHANGES.rst

@@ -1,4 +1,25 @@
-Changes in Riot 0.8.19 (2018-XX-XX)
+Changes in Riot 0.8.20 (2018-12-13)
+===================================================
+
+MatrixSdk:
+ - Upgrade to version 0.9.14.
+
+Improvements:
+ - Remove double negations from settings and update descriptions (#2723)
+ - Handle missing or bad parameter in slash command
+ - Support specifying kick and ban message (#2164)
+ - Add image transparency and fix issues with gifs in the media viewer (#2731)
+ - Upgrade olm-sdk.aar from version 2.3.0 to version 3.0.0
+ - Migration to the Preference v7 support
+ - Make User Agreement part of the registration flow (#2442)
+ - Fix several color issue on Status theme and prepare rework some styles.
+
+Bugfix:
+ - Use same "Call Anyway" string from iOS (#2695)
+ - Improve `/markdown` command (#2673)
+ - Display thumbnail for encrypted files without a remote thumbnail (#2734)
+
+Changes in Riot 0.8.19 (2018-11-06)
 ===================================================
 
 MatrixSdk:
@@ -1074,3 +1095,32 @@ Changes in Vector 0.2.0 (2016-04-14)
  * First official release.
 
 
+=======================================================
++        TEMPLATE WHEN PREPARING A NEW RELEASE        +
+=======================================================
+
+
+Changes in Riot 0.8.XX (2018-XX-XX)
+===================================================
+
+MatrixSdk:
+ - Upgrade to version 0.X.Y.
+
+Features:
+ -
+
+Improvements:
+ -
+
+Other changes:
+ -
+
+Bugfix:
+ -
+
+Translations:
+ -
+
+Build:
+ -
+

build.gradle

@@ -4,8 +4,8 @@ buildscript {
     ext.kotlin_version = '1.2.30'
 
     repositories {
-        jcenter()
         google()
+        jcenter()
         maven {
             url "https://plugins.gradle.org/m2/"
         }
@@ -23,20 +23,22 @@ buildscript {
 
 // global properties used in sub modules
 ext {
-    versionCodeProp = 81900
-    versionNameProp = "0.8.19"
+    versionCodeProp = 82000
+    versionNameProp = "0.8.20"
     versionBuild = System.getenv("BUILD_NUMBER") as Integer ?: 0
     buildNumberProp = "${versionBuild}"
 }
 
 allprojects {
     repositories {
+        google()
         jcenter()
-
         maven {
             url "https://maven.google.com"
         }
-        google()
+        maven {
+            url "https://jitpack.io"
+        }
     }
 }
 

tools/check/forbidden_strings_in_resources.txt

@@ -70,3 +70,11 @@ DO NOT COMMIT
 layout_constraintRight_
 layout_constraintLeft_
 
+### Use Preference from v7 library (android.support.v7.preference.PreferenceScreen)
+<PreferenceScreen
+
+### Use im.vector.preference.VectorSwitchPreference to support multiline of the title
+<SwitchPreference
+
+### Use im.vector.preference.VectorPreference to support multiline of the title
+<Preference\n

vector/build.gradle

@@ -5,6 +5,21 @@ repositories {
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
+apply plugin: 'realm-android'
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+
+    dependencies {
+        classpath "io.realm:realm-gradle-plugin:5.8.0"
+    }
+}
+
+kapt {
+    correctErrorTypes = true
+}
 
 android {
     compileSdkVersion 27
@@ -15,6 +30,11 @@ android {
         exclude 'META-INF/NOTICE'
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
     defaultConfig {
         applicationId "im.vector"
         minSdkVersion 16
@@ -178,6 +198,7 @@ dependencies {
 
     // Kotlin coroutines
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.30.2'
+    implementation "org.jetbrains.anko:anko-commons:0.10.8"
 
     implementation 'com.android.support:multidex:1.0.0'
 
@@ -187,13 +208,20 @@ dependencies {
     implementation 'com.android.support:design:27.1.1'
     implementation 'com.android.support:cardview-v7:27.1.1'
     implementation 'com.android.support:recyclerview-v7:27.1.1'
+    implementation 'com.android.support:preference-v7:27.1.1'
+    implementation 'com.android.support:preference-v14:27.1.1'
     implementation 'com.jakewharton:butterknife:8.5.1'
     kapt 'com.jakewharton:butterknife-compiler:8.5.1'
 
     // UI
     implementation 'com.android.support.constraint:constraint-layout:1.1.0'
     implementation 'com.getbase:floatingactionbutton:1.10.1'
     implementation 'com.binaryfork:spanny:1.0.4'
+    implementation 'com.github.chrisbanes:PhotoView:2.1.4'
+
+    // Epoxy (without androidx packages)
+    implementation 'com.airbnb.android:epoxy:2.19.0'
+    kapt 'com.airbnb.android:epoxy-processor:2.19.0'
 
     // Network
     implementation 'com.squareup.retrofit2:retrofit:2.4.0'

vector/libs/matrix-sdk.aar

@@ -17,7 +17,7 @@
 package im.vector.receiver
 
 import android.content.*
-import android.preference.PreferenceManager
+import android.support.v7.preference.PreferenceManager
 import android.util.Log
 import androidx.core.content.edit
 import im.vector.Matrix

vector/libs/olm-sdk.aar

@@ -9,7 +9,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:theme="@style/Theme.AppCompat.Light">
+    android:theme="@style/Theme.AppCompat.Light.DarkActionBar">
 
     <FrameLayout
         android:layout_width="match_parent"

vector/src/debug/java/im/vector/receiver/DebugReceiver.kt

@@ -126,25 +126,27 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".activity.AccountCreationActivity"
+            android:name=".activity.FallbackAccountCreationActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/create_account" />
         <activity
             android:name=".activity.AccountCreationCaptchaActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/create_account" />
+        <activity
+            android:name=".activity.policies.AccountCreationTermsActivity"
+            android:configChanges="orientation|screenSize"
+            android:label="@string/create_account" />
         <activity
             android:name=".activity.FallbackLoginActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/login" />
         <activity
             android:name=".activity.SplashActivity"
-            android:configChanges="orientation|screenSize"
-            android:theme="@style/AppTheme.NoActionBar.Light" />
+            android:configChanges="orientation|screenSize" />
         <activity
             android:name=".activity.LoggingOutActivity"
-            android:configChanges="orientation|screenSize"
-            android:theme="@style/AppTheme.NoActionBar.Light" />
+            android:configChanges="orientation|screenSize" />
         <activity
             android:name=".activity.VectorHomeActivity"
             android:configChanges="orientation|screenSize"
@@ -162,11 +164,8 @@
             android:name=".activity.VectorRoomActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/title_activity_room"
-            android:theme="@style/AppTheme.NoActionBar.Light"
             android:windowSoftInputMode="stateHidden|adjustResize" />
-        <activity
-            android:name=".activity.DeactivateAccountActivity"
-            android:theme="@style/AppTheme.NoActionBar.Light" />
+        <activity android:name=".activity.DeactivateAccountActivity" />
         <activity
             android:name=".activity.VectorRoomCreationActivity"
             android:configChanges="orientation|screenSize"
@@ -203,8 +202,7 @@
             android:name=".activity.VectorMemberDetailsActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/title_activity_member_details"
-            android:parentActivityName=".activity.VectorRoomActivity"
-            android:theme="@style/AppTheme.NoActionBar.Light">
+            android:parentActivityName=".activity.VectorRoomActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="im.vector.activity.VectorRoomActivity" />
@@ -250,12 +248,10 @@
             android:theme="@style/AppTheme.NoActionBar.FullScreen.Light" />
         <activity
             android:name=".activity.IntegrationManagerActivity"
-            android:configChanges="orientation|screenSize"
-            android:theme="@style/AppTheme.NoActionBar.Light" />
+            android:configChanges="orientation|screenSize" />
         <activity
             android:name=".activity.StickerPickerActivity"
-            android:configChanges="orientation|screenSize"
-            android:theme="@style/AppTheme.NoActionBar.Light" />
+            android:configChanges="orientation|screenSize" />
         <activity
             android:name=".activity.VectorMediasPickerActivity"
             android:label="@string/media_picker_both_capture_title"
@@ -363,8 +359,7 @@
         <activity
             android:name=".activity.PhoneNumberAdditionActivity"
             android:configChanges="orientation|screenSize"
-            android:label="@string/settings_add_phone_number"
-            android:theme="@style/AppTheme.NoActionBar.Light" />
+            android:label="@string/settings_add_phone_number" />
         <activity
             android:name=".activity.CountryPickerActivity"
             android:configChanges="orientation|screenSize"
@@ -378,26 +373,20 @@
         <activity
             android:name=".activity.RoomDirectoryPickerActivity"
             android:configChanges="orientation|screenSize"
-            android:label="@string/select_room_directory"
-            android:theme="@style/DirectoryPickerTheme.Light" />
+            android:label="@string/select_room_directory" />
         <activity
             android:name=".activity.PhoneNumberVerificationActivity"
             android:configChanges="orientation|screenSize"
-            android:label="@string/settings_phone_number_verification"
-            android:theme="@style/AppTheme.NoActionBar.Light" />
+            android:label="@string/settings_phone_number_verification" />
         <activity
             android:name=".activity.NotificationPrivacyActivity"
             android:configChanges="orientation|screenSize"
-            android:label="@string/settings_notification_privacy"
-            android:theme="@style/AppTheme.NoActionBar.Light" />
-        <activity
-            android:name=".activity.VectorWebViewActivity"
-            android:theme="@style/AppTheme.NoActionBar.Light" />
+            android:label="@string/settings_notification_privacy" />
+        <activity android:name=".activity.VectorWebViewActivity" />
 
         <activity
             android:name="im.vector.activity.MediaPreviewerActivity"
-            android:configChanges="orientation|screenSize"
-            android:theme="@style/AppTheme.NoActionBar.Light" />
+            android:configChanges="orientation|screenSize" />
 
         <!-- FileProvider -->
         <provider