Merge branch 'release/1.1.10' into develop

.github/PULL_REQUEST_TEMPLATE.md

@@ -5,6 +5,6 @@
 - [ ] Changes has been tested on an Android device or Android emulator with API 21
 - [ ] UI change has been tested on both light and dark themes
 - [ ] Pull request is based on the develop branch
-- [ ] Pull request includes a new file under ./newsfragment. See https://github.com/vector-im/element-android/blob/develop/CONTRIBUTING.md#changelog
+- [ ] Pull request includes a new file under ./changelog.d. See https://github.com/vector-im/element-android/blob/develop/CONTRIBUTING.md#changelog
 - [ ] 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.md#sign-off)

CHANGES.md

@@ -1,3 +1,33 @@
+Changes in Element v1.1.10 (2021-06-18)
+=======================================
+
+Features ✨
+----------
+ - Migrate DefaultTypingService, KeysImporter and KeysExporter to coroutines ([#2449](https://github.com/vector-im/element-android/issues/2449))
+ - Update Message Composer design ([#3182](https://github.com/vector-im/element-android/issues/3182))
+ - Cleanup Epoxy items, and debounce all the clicks ([#3435](https://github.com/vector-im/element-android/issues/3435))
+ - Adds support for receiving MSC3086 Asserted Identity events. ([#3451](https://github.com/vector-im/element-android/issues/3451))
+ - Migrate to new colors and cleanup the style and theme. Now exported in module :library:ui-styles
+  Ref: https://material.io/blog/migrate-android-material-components ([#3459](https://github.com/vector-im/element-android/issues/3459))
+ - Add option to set aliases for public spaces ([#3483](https://github.com/vector-im/element-android/issues/3483))
+ - Add beta warning to private space creation flow ([#3485](https://github.com/vector-im/element-android/issues/3485))
+ - User defined top level spaces ordering ([#3501](https://github.com/vector-im/element-android/issues/3501))
+
+Bugfixes 🐛
+----------
+ - Fix new DMs not always marked as such ([#3333](https://github.com/vector-im/element-android/issues/3333))
+
+SDK API changes ⚠️
+------------------
+ - Splits SessionAccountDataService and RoomAccountDataService and offers to query RoomAccountDataEvent at the session level. ([#3479](https://github.com/vector-im/element-android/issues/3479))
+
+Other changes
+-------------
+ - Move the ability to start a call from dialpad directly to a dedicated tab in the home screen. ([#3457](https://github.com/vector-im/element-android/issues/3457))
+ - VoIP: Change hold direction to send-only. ([#3467](https://github.com/vector-im/element-android/issues/3467))
+ - Some improvements on DialPad (cursor edition, paste number, small fixes). ([#3516](https://github.com/vector-im/element-android/issues/3516))
+
+
 Changes in Element v1.1.9 (2021-06-02)
 ======================================
 

CONTRIBUTING.md

@@ -53,7 +53,7 @@ This project is full Kotlin. Please do not write Java classes.
 
 ### Changelog
 
-Please create at least one file under ./newsfragment containing details about your change. Towncrier will be used when preparing the release.
+Please create at least one file under ./changelog.d containing details about your change. Towncrier will be used when preparing the release.
 
 Towncrier says to use the PR number for the filename, but the issue number is also fine.
 

changelog.d/.gitignore

@@ -0,0 +1 @@
+!.gitignore

fastlane/metadata/android/en-US/changelogs/40101100.txt

@@ -0,0 +1,2 @@
+Main changes in this version: theme and style update and new features for spaces.
+Full changelog: https://github.com/vector-im/element-android/releases/tag/v1.1.10

newsfragment/2449.feature

@@ -1 +0,0 @@
-Migrate DefaultTypingService, KeysImporter and KeysExporter to coroutines

newsfragment/3182.feature

@@ -1 +0,0 @@
-Update Message Composer design

newsfragment/3333.bugfix

@@ -1 +0,0 @@
-Fix new DMs not always marked as such

newsfragment/3435.feature

@@ -1 +0,0 @@
-Cleanup Epoxy items, and debounce all the clicks

newsfragment/3451.feature

@@ -1 +0,0 @@
-Adds support for receiving MSC3086 Asserted Identity events.

newsfragment/3457.misc

@@ -1 +0,0 @@
-Move the ability to start a call from dialpad directly to a dedicated tab in the home screen.

newsfragment/3459.feature

@@ -1,2 +0,0 @@
-Migrate to new colors and cleanup the style and theme. Now exported in module :library:ui-styles
-Ref: https://material.io/blog/migrate-android-material-components

newsfragment/3467.misc

@@ -1 +0,0 @@
-VoIP: Change hold direction to send-only.

newsfragment/3479.removal

@@ -1 +0,0 @@
-Splits SessionAccountDataService and RoomAccountDataService and offers to query RoomAccountDataEvent at the session level.

newsfragment/3483.feature

@@ -1 +0,0 @@
-Add option to set aliases for public spaces

newsfragment/3485.feature

@@ -1 +0,0 @@
-Add beta warning to private space creation flow

newsfragment/3501.feature

@@ -1 +0,0 @@
-User defined top level spaces ordering (#3501)

newsfragment/3516.misc

@@ -1 +0,0 @@
-Some improvements on DialPad (cursor edition, paste number, small fixes).

tools/towncrier/template.md

@@ -15,19 +15,8 @@
 
 {% if sections[section] %}
 {% for category, val in definitions.items() if category in sections[section]%}
-{% if definitions[category]['name'] == "Features" %}
-Features ✨:
-{% elif definitions[category]['name'] == "Bugfixes" %}
-Bugfixes 🐛:
-{% elif definitions[category]['name'] == "Deprecations and Removals" %}
-SDK API changes ⚠️:
-{% elif definitions[category]['name'] == "Improved Documentation" %}
-Improved Documentation 📚:
-{% elif definitions[category]['name'] == "Misc" %}
-Other changes:
-{% else %}
 {{ definitions[category]['name'] }}
-{% endif %}
+{{ underline * definitions[category]['name']|length }}
 {% if definitions[category]['showcontent'] %}
 {% for text, values in sections[section][category].items() %}
  - {{ text }} ({{ values|join(', ') }})

tools/travis/check_pr.sh

@@ -23,7 +23,7 @@ branch=${TRAVIS_BRANCH}
 # If not on develop, exit, else we cannot get the list of modified files
 # It is ok to check only when on develop branch
 if [[ "${branch}" -eq 'develop' ]]; then
-    echo "Check that a file has been added to /newsfragment"
+    echo "Check that a file has been added to /changelog.d"
 else
     echo "Not on develop branch"
     exit 0
@@ -37,9 +37,9 @@ listOfModifiedFiles=`git diff --name-only HEAD ${branch}`
 # echo ${listOfModifiedFiles}
 
 
-if [[ ${listOfModifiedFiles} = *"newsfragment"* ]]; then
+if [[ ${listOfModifiedFiles} = *"changelog.d"* ]]; then
-  echo "A file has been added to /newsfragment!"
+  echo "A file has been added to /changelog.d!"
 else
-  echo "❌ Please add a file describing your changes in /newsfragment. See https://github.com/vector-im/element-android/blob/develop/CONTRIBUTING.md#changelog"
+  echo "❌ Please add a file describing your changes in /changelog.d. See https://github.com/vector-im/element-android/blob/develop/CONTRIBUTING.md#changelog"
   exit 1
 fi

towncrier.toml

@@ -1,7 +1,31 @@
 [tool.towncrier]
-directory = "newsfragment"
+    directory = "changelog.d"
-filename = "CHANGES.md"
+    filename = "CHANGES.md"
-name = "Changes in Element"
+    name = "Changes in Element"
-# Note: there is a bug, if I use title_format, the title is printed twice
+    template = "tools/towncrier/template.md"
-# title_format = "Changes in Element {version} ({project_date})"
+    issue_format = "[#{issue}](https://github.com/vector-im/element-android/issues/{issue})"
-template="tools/towncrier/template.md"
+
+    [[tool.towncrier.type]]
+        directory = "feature"
+        name = "Features ✨"
+        showcontent = true
+
+    [[tool.towncrier.type]]
+        directory = "bugfix"
+        name = "Bugfixes 🐛"
+        showcontent = true
+
+    [[tool.towncrier.type]]
+        directory = "doc"
+        name = "Improved Documentation 📚"
+        showcontent = true
+
+    [[tool.towncrier.type]]
+        directory = "removal"
+        name = "SDK API changes ⚠️"
+        showcontent = true
+
+    [[tool.towncrier.type]]
+        directory = "misc"
+        name = "Other changes"
+        showcontent = true