[TMP] Automatic upstream merge preparation

Change-Id: Iaf09a78fbaad18a6581bfd5384239f471b007fdf

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,38 +1,34 @@
 ---
 name: Bug report
-about: Create a report to help us improve SchildiChat
+about: Create a report to help us improve Element
 title: ''
 labels: ''
 assignees: ''
 
 ---
 
-**Describe the bug**
+#### Describe the bug
 A clear and concise description of what the bug is.
 
-**To Reproduce**
+#### To Reproduce
 Steps to reproduce the behavior:
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
 
-**Expected behavior**
+#### Expected behavior
 A clear and concise description of what you expected to happen.
 
-**Screenshots**
+#### Screenshots
 If applicable, add screenshots to help explain your problem.
 
-**Smartphone (please complete the following information):**
+#### Smartphone (please complete the following information):
  - Device: [e.g. Samsung S6]
  - OS: [e.g. Android 6.0]
 
-**Additional context**
+#### Additional context
  - App version and store [e.g. 1.0.0 - F-Droid]
  - Homeserver: [e.g. matrix.org]
 
-**Upstream relevance**
- - Does this issue exist in Element Android?
- - If this issue exists in Element Android, please also link the corresponding bug report (create a new one if it doesn't exist yet)
-
 Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -7,14 +7,14 @@ assignees: ''
 
 ---
 
-**Is your feature request related to a problem? Please describe.**
+#### Is your feature request related to a problem? Please describe.
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 
-**Describe the solution you'd like**
+#### Describe the solution you'd like.
 A clear and concise description of what you want to happen.
 
-**Describe alternatives you've considered**
+#### Describe alternatives you've considered.
 A clear and concise description of any alternative solutions or features you've considered.
 
-**Additional context**
+#### Additional context
 Add any other context or screenshots about the feature request here.

README.md

@@ -1,30 +1,34 @@
-[![Translation status](https://weblate.bubu1.eu/widgets/schildichat/-/schildichat-android/svg-badge.svg)](https://weblate.bubu1.eu/projects/schildichat/schildichat-android/)
+[![Buildkite](https://badge.buildkite.com/ad0065c1b70f557cd3b1d3d68f9c2154010f83c4d6f71706a9.svg?branch=develop)](https://buildkite.com/matrix-dot-org/element-android/builds?branch=develop)
-[![SchildiChat-Android Matrix room #schildichat-android:matrix.org](https://img.shields.io/matrix/schildichat-android:matrix.org.svg?label=%23schildichat-android:matrix.org&logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#schildichat-android:matrix.org)
+[![Weblate](https://translate.element.io/widgets/element-android/-/svg-badge.svg)](https://translate.element.io/engage/element-android/?utm_source=widget)
+[![Element Android Matrix room #element-android:matrix.org](https://img.shields.io/matrix/element-android:matrix.org.svg?label=%23element-android:matrix.org&logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#element-android:matrix.org)
+[![Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=im.vector.app.android&metric=alert_status)](https://sonarcloud.io/dashboard?id=im.vector.app.android)
+[![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=im.vector.app.android&metric=vulnerabilities)](https://sonarcloud.io/dashboard?id=im.vector.app.android)
+[![Bugs](https://sonarcloud.io/api/project_badges/measure?project=im.vector.app.android&metric=bugs)](https://sonarcloud.io/dashboard?id=im.vector.app.android)
 
-# SchildiChat for Android
+# Element Android
 
-SchildiChat for Android is a Matrix Client based on [Element Android](https://github.com/vector-im/element-android).
+Element Android is an Android Matrix Client provided by [Element](https://element.io/).
 
-Compared to Element, SchildiChat features following most important changes:
+It is a total rewrite of [Riot-Android](https://github.com/vector-im/riot-android) with a new user experience.
 
-- A unified chat list for both direct and group chats
+[<img src="resources/img/google-play-badge.png" alt="Get it on Google Play" height="60">](https://play.google.com/store/apps/details?id=im.vector.app)
-- Optional message bubbles
+[<img src="resources/img/f-droid-badge.png" alt="Get it on F-Droid" height="60">](https://f-droid.org/app/im.vector.app)
-- Further usability improvements and additional settings to configure the app
 
-A more thorough list of changes compared to Element can be found [here](FEATURES.md) - but keep in mind this list might not be up-to-date at all times.
+Nightly build: [![Buildkite](https://badge.buildkite.com/ad0065c1b70f557cd3b1d3d68f9c2154010f83c4d6f71706a9.svg?branch=develop)](https://buildkite.com/matrix-dot-org/element-android/builds?branch=develop)
 
-<a href="https://f-droid.org/packages/de.spiritcroc.riotx/" alt="Get it on F-Droid" target="_blank"><img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" height="80"></a>
+# New Android SDK
-<a href="https://play.google.com/store/apps/details?id=de.spiritcroc.riotx" alt="Get it on Google Play" target="_blank"><img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" height="80"></a>
 
-Information about available app variants can be found [on our website](https://schildi.chat/android/).
+Element is based on a new Android SDK fully written in Kotlin (like Element). In order to make the early development as fast as possible, Element and the new SDK currently share the same git repository.
 
-<a href="https://matrix.to/#/#schildichat-android:matrix.org" target="_blank">Join the discussion on matrix</a>
+At each Element release, the SDK module is copied to a dedicated repository: https://github.com/matrix-org/matrix-android-sdk2. That way, third party apps can add a regular gradle dependency to use it. So more details on how to do that here: https://github.com/matrix-org/matrix-android-sdk2.
 
-## Translations
+# Roadmap
 
-If you want to translate SchildiChat, visit its weblate [here](https://weblate.bubu1.eu/projects/schildichat/schildichat-android/).
+The version 1.0.0 of Element still misses some features which was previously included in Riot-Android.
-For translations that concern upstream Element code, visit their weblate [here](https://translate.element.io/engage/element-android/).
+The team will work to add them on a regular basis.
 
-## Screenshots
+## Contributing
 
-<img src="https://raw.githubusercontent.com/SchildiChat/SchildiChat-android/sc/fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.png" height="500"/> <img src="https://raw.githubusercontent.com/SchildiChat/SchildiChat-android/sc/fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.png" height="500"/> <img src="https://raw.githubusercontent.com/SchildiChat/SchildiChat-android/sc/fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.png" height="500"/> <img src="https://raw.githubusercontent.com/SchildiChat/SchildiChat-android/sc/fastlane/metadata/android/en-US/images/phoneScreenshots/4_en-US.png" height="500"/>
+Please refer to [CONTRIBUTING.md](https://github.com/vector-im/element-android/blob/develop/CONTRIBUTING.md) if you want to contribute on Matrix Android projects!
+
+Come chat with the community in the dedicated Matrix [room](https://matrix.to/#/#element-android:matrix.org).