From 4651bd9e4d326259ea02fcff6c130e67a7c85c62 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Thu, 17 Sep 2020 12:03:28 +0200 Subject: [PATCH] Automatic upstream merge postprocessing Change-Id: I94adeba9d95496efd5e0e9bfb94ba0174bbf5933 --- README.md | 42 +++++++----------- .../android/de-DE/full_description.txt | 0 .../de-DE/images/phoneScreenshots/1_de-DE.png | Bin .../de-DE/images/phoneScreenshots/2_de-DE.png | Bin .../de-DE/images/phoneScreenshots/3_de-DE.png | Bin .../de-DE/images/phoneScreenshots/4_de-DE.png | Bin .../android/de-DE/short_description.txt | 0 .../metadata/android/de-DE/title.txt | 0 .../metadata/android/de-DE/video.txt | 0 .../android/en-US/changelogs/40100250.txt | 0 .../android/en-US/full_description.txt | 0 .../android/en-US/images/featureGraphic.png | Bin .../metadata/android/en-US/images/icon.png | Bin .../en-US/images/phoneScreenshots/1_en-US.png | Bin .../en-US/images/phoneScreenshots/2_en-US.png | Bin .../en-US/images/phoneScreenshots/3_en-US.png | Bin .../en-US/images/phoneScreenshots/4_en-US.png | Bin .../android/en-US/short_description.txt | 0 .../metadata/android/en-US/title.txt | 0 .../metadata/android/en-US/video.txt | 0 .../android/ru-RU/changelogs/40100250.txt | 0 .../android/ru-RU/full_description.txt | 0 .../android/ru-RU/short_description.txt | 0 .../metadata/android/ru-RU/title.txt | 0 tmp_sc_README.md | 22 --------- upstream_README.md | 34 ++++++++++++++ 26 files changed, 49 insertions(+), 49 deletions(-) rename {tmp_sc_fastlane => fastlane}/metadata/android/de-DE/full_description.txt (100%) rename {tmp_sc_fastlane => fastlane}/metadata/android/de-DE/images/phoneScreenshots/1_de-DE.png (100%) rename {tmp_sc_fastlane => fastlane}/metadata/android/de-DE/images/phoneScreenshots/2_de-DE.png (100%) rename {tmp_sc_fastlane => fastlane}/metadata/android/de-DE/images/phoneScreenshots/3_de-DE.png (100%) rename {tmp_sc_fastlane => fastlane}/metadata/android/de-DE/images/phoneScreenshots/4_de-DE.png (100%) rename {tmp_sc_fastlane => fastlane}/metadata/android/de-DE/short_description.txt (100%) rename {tmp_sc_fastlane => fastlane}/metadata/android/de-DE/title.txt (100%) rename {tmp_sc_fastlane => fastlane}/metadata/android/de-DE/video.txt (100%) rename {tmp_sc_fastlane => fastlane}/metadata/android/en-US/changelogs/40100250.txt (100%) rename {tmp_sc_fastlane => fastlane}/metadata/android/en-US/full_description.txt (100%) rename {tmp_sc_fastlane => fastlane}/metadata/android/en-US/images/featureGraphic.png (100%) rename {tmp_sc_fastlane => fastlane}/metadata/android/en-US/images/icon.png (100%) rename {tmp_sc_fastlane => fastlane}/metadata/android/en-US/images/phoneScreenshots/1_en-US.png (100%) rename {tmp_sc_fastlane => fastlane}/metadata/android/en-US/images/phoneScreenshots/2_en-US.png (100%) rename {tmp_sc_fastlane => fastlane}/metadata/android/en-US/images/phoneScreenshots/3_en-US.png (100%) rename {tmp_sc_fastlane => fastlane}/metadata/android/en-US/images/phoneScreenshots/4_en-US.png (100%) rename {tmp_sc_fastlane => fastlane}/metadata/android/en-US/short_description.txt (100%) rename {tmp_sc_fastlane => fastlane}/metadata/android/en-US/title.txt (100%) rename {tmp_sc_fastlane => fastlane}/metadata/android/en-US/video.txt (100%) rename {tmp_sc_fastlane => fastlane}/metadata/android/ru-RU/changelogs/40100250.txt (100%) rename {tmp_sc_fastlane => fastlane}/metadata/android/ru-RU/full_description.txt (100%) rename {tmp_sc_fastlane => fastlane}/metadata/android/ru-RU/short_description.txt (100%) rename {tmp_sc_fastlane => fastlane}/metadata/android/ru-RU/title.txt (100%) delete mode 100644 tmp_sc_README.md create mode 100644 upstream_README.md diff --git a/README.md b/README.md index 64c6c9d04d..c57aebb343 100644 --- a/README.md +++ b/README.md @@ -1,34 +1,22 @@ -[![Buildkite](https://badge.buildkite.com/ad0065c1b70f557cd3b1d3d68f9c2154010f83c4d6f71706a9.svg?branch=develop)](https://buildkite.com/matrix-dot-org/element-android/builds?branch=develop) -[![Weblate](https://translate.riot.im/widgets/element-android/-/svg-badge.svg)](https://translate.riot.im/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 is an Android Matrix Client based on [Element](https://github.com/vector-im/riotX-android). -Element Android is an Android Matrix Client provided by [Element](https://element.io/). +Compared to the Element app, SchildiChat features following changes: +- A unified chat list for both direct and group chats +- Optional message bubbles +- Follows the system setting for dark/light mode +- Further small usability improvements -It is a total rewrite of [Riot-Android](https://github.com/vector-im/riot-android) with a new user experience. + -[Get it on Google Play](https://play.google.com/store/apps/details?id=im.vector.app) -[Get it on F-Droid](https://f-droid.org/app/im.vector.app) +The version in the official F-Droid repositories comes without the proprietary libraries for push notifications. +This might lead to increased battery drain and a higher delay for delivering messages. +If you are looking for a version with push notification support, you can get it from [my F-Droid repository](https://s2.spiritcroc.de/fdroid/repo/). +The latest version should also be available for direct download [here](https://s2.spiritcroc.de/fdroid/SchildiChat.apk). -Nightly build: [![Buildkite](https://badge.buildkite.com/ad0065c1b70f557cd3b1d3d68f9c2154010f83c4d6f71706a9.svg?branch=develop)](https://buildkite.com/matrix-dot-org/element-android/builds?branch=develop) +Join the discussion on matrix -# New Android SDK +## Screenshots -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. - -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. - -# Roadmap - -The version 1.0.0 of Element still misses some features which was previously included in Riot-Android. -The team will work to add them on a regular basis. - -## Contributing - -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). + diff --git a/tmp_sc_fastlane/metadata/android/de-DE/full_description.txt b/fastlane/metadata/android/de-DE/full_description.txt similarity index 100% rename from tmp_sc_fastlane/metadata/android/de-DE/full_description.txt rename to fastlane/metadata/android/de-DE/full_description.txt diff --git a/tmp_sc_fastlane/metadata/android/de-DE/images/phoneScreenshots/1_de-DE.png b/fastlane/metadata/android/de-DE/images/phoneScreenshots/1_de-DE.png similarity index 100% rename from tmp_sc_fastlane/metadata/android/de-DE/images/phoneScreenshots/1_de-DE.png rename to fastlane/metadata/android/de-DE/images/phoneScreenshots/1_de-DE.png diff --git a/tmp_sc_fastlane/metadata/android/de-DE/images/phoneScreenshots/2_de-DE.png b/fastlane/metadata/android/de-DE/images/phoneScreenshots/2_de-DE.png similarity index 100% rename from tmp_sc_fastlane/metadata/android/de-DE/images/phoneScreenshots/2_de-DE.png rename to fastlane/metadata/android/de-DE/images/phoneScreenshots/2_de-DE.png diff --git a/tmp_sc_fastlane/metadata/android/de-DE/images/phoneScreenshots/3_de-DE.png b/fastlane/metadata/android/de-DE/images/phoneScreenshots/3_de-DE.png similarity index 100% rename from tmp_sc_fastlane/metadata/android/de-DE/images/phoneScreenshots/3_de-DE.png rename to fastlane/metadata/android/de-DE/images/phoneScreenshots/3_de-DE.png diff --git a/tmp_sc_fastlane/metadata/android/de-DE/images/phoneScreenshots/4_de-DE.png b/fastlane/metadata/android/de-DE/images/phoneScreenshots/4_de-DE.png similarity index 100% rename from tmp_sc_fastlane/metadata/android/de-DE/images/phoneScreenshots/4_de-DE.png rename to fastlane/metadata/android/de-DE/images/phoneScreenshots/4_de-DE.png diff --git a/tmp_sc_fastlane/metadata/android/de-DE/short_description.txt b/fastlane/metadata/android/de-DE/short_description.txt similarity index 100% rename from tmp_sc_fastlane/metadata/android/de-DE/short_description.txt rename to fastlane/metadata/android/de-DE/short_description.txt diff --git a/tmp_sc_fastlane/metadata/android/de-DE/title.txt b/fastlane/metadata/android/de-DE/title.txt similarity index 100% rename from tmp_sc_fastlane/metadata/android/de-DE/title.txt rename to fastlane/metadata/android/de-DE/title.txt diff --git a/tmp_sc_fastlane/metadata/android/de-DE/video.txt b/fastlane/metadata/android/de-DE/video.txt similarity index 100% rename from tmp_sc_fastlane/metadata/android/de-DE/video.txt rename to fastlane/metadata/android/de-DE/video.txt diff --git a/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100250.txt b/fastlane/metadata/android/en-US/changelogs/40100250.txt similarity index 100% rename from tmp_sc_fastlane/metadata/android/en-US/changelogs/40100250.txt rename to fastlane/metadata/android/en-US/changelogs/40100250.txt diff --git a/tmp_sc_fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt similarity index 100% rename from tmp_sc_fastlane/metadata/android/en-US/full_description.txt rename to fastlane/metadata/android/en-US/full_description.txt diff --git a/tmp_sc_fastlane/metadata/android/en-US/images/featureGraphic.png b/fastlane/metadata/android/en-US/images/featureGraphic.png similarity index 100% rename from tmp_sc_fastlane/metadata/android/en-US/images/featureGraphic.png rename to fastlane/metadata/android/en-US/images/featureGraphic.png diff --git a/tmp_sc_fastlane/metadata/android/en-US/images/icon.png b/fastlane/metadata/android/en-US/images/icon.png similarity index 100% rename from tmp_sc_fastlane/metadata/android/en-US/images/icon.png rename to fastlane/metadata/android/en-US/images/icon.png diff --git a/tmp_sc_fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.png similarity index 100% rename from tmp_sc_fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.png rename to fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.png diff --git a/tmp_sc_fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.png similarity index 100% rename from tmp_sc_fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.png rename to fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.png diff --git a/tmp_sc_fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.png similarity index 100% rename from tmp_sc_fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.png rename to fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.png diff --git a/tmp_sc_fastlane/metadata/android/en-US/images/phoneScreenshots/4_en-US.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/4_en-US.png similarity index 100% rename from tmp_sc_fastlane/metadata/android/en-US/images/phoneScreenshots/4_en-US.png rename to fastlane/metadata/android/en-US/images/phoneScreenshots/4_en-US.png diff --git a/tmp_sc_fastlane/metadata/android/en-US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txt similarity index 100% rename from tmp_sc_fastlane/metadata/android/en-US/short_description.txt rename to fastlane/metadata/android/en-US/short_description.txt diff --git a/tmp_sc_fastlane/metadata/android/en-US/title.txt b/fastlane/metadata/android/en-US/title.txt similarity index 100% rename from tmp_sc_fastlane/metadata/android/en-US/title.txt rename to fastlane/metadata/android/en-US/title.txt diff --git a/tmp_sc_fastlane/metadata/android/en-US/video.txt b/fastlane/metadata/android/en-US/video.txt similarity index 100% rename from tmp_sc_fastlane/metadata/android/en-US/video.txt rename to fastlane/metadata/android/en-US/video.txt diff --git a/tmp_sc_fastlane/metadata/android/ru-RU/changelogs/40100250.txt b/fastlane/metadata/android/ru-RU/changelogs/40100250.txt similarity index 100% rename from tmp_sc_fastlane/metadata/android/ru-RU/changelogs/40100250.txt rename to fastlane/metadata/android/ru-RU/changelogs/40100250.txt diff --git a/tmp_sc_fastlane/metadata/android/ru-RU/full_description.txt b/fastlane/metadata/android/ru-RU/full_description.txt similarity index 100% rename from tmp_sc_fastlane/metadata/android/ru-RU/full_description.txt rename to fastlane/metadata/android/ru-RU/full_description.txt diff --git a/tmp_sc_fastlane/metadata/android/ru-RU/short_description.txt b/fastlane/metadata/android/ru-RU/short_description.txt similarity index 100% rename from tmp_sc_fastlane/metadata/android/ru-RU/short_description.txt rename to fastlane/metadata/android/ru-RU/short_description.txt diff --git a/tmp_sc_fastlane/metadata/android/ru-RU/title.txt b/fastlane/metadata/android/ru-RU/title.txt similarity index 100% rename from tmp_sc_fastlane/metadata/android/ru-RU/title.txt rename to fastlane/metadata/android/ru-RU/title.txt diff --git a/tmp_sc_README.md b/tmp_sc_README.md deleted file mode 100644 index c57aebb343..0000000000 --- a/tmp_sc_README.md +++ /dev/null @@ -1,22 +0,0 @@ -# SchildiChat for Android - -SchildiChat is an Android Matrix Client based on [Element](https://github.com/vector-im/riotX-android). - -Compared to the Element app, SchildiChat features following changes: -- A unified chat list for both direct and group chats -- Optional message bubbles -- Follows the system setting for dark/light mode -- Further small usability improvements - - - -The version in the official F-Droid repositories comes without the proprietary libraries for push notifications. -This might lead to increased battery drain and a higher delay for delivering messages. -If you are looking for a version with push notification support, you can get it from [my F-Droid repository](https://s2.spiritcroc.de/fdroid/repo/). -The latest version should also be available for direct download [here](https://s2.spiritcroc.de/fdroid/SchildiChat.apk). - -Join the discussion on matrix - -## Screenshots - - diff --git a/upstream_README.md b/upstream_README.md new file mode 100644 index 0000000000..64c6c9d04d --- /dev/null +++ b/upstream_README.md @@ -0,0 +1,34 @@ +[![Buildkite](https://badge.buildkite.com/ad0065c1b70f557cd3b1d3d68f9c2154010f83c4d6f71706a9.svg?branch=develop)](https://buildkite.com/matrix-dot-org/element-android/builds?branch=develop) +[![Weblate](https://translate.riot.im/widgets/element-android/-/svg-badge.svg)](https://translate.riot.im/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) + +# Element Android + +Element Android is an Android Matrix Client provided by [Element](https://element.io/). + +It is a total rewrite of [Riot-Android](https://github.com/vector-im/riot-android) with a new user experience. + +[Get it on Google Play](https://play.google.com/store/apps/details?id=im.vector.app) +[Get it on F-Droid](https://f-droid.org/app/im.vector.app) + +Nightly build: [![Buildkite](https://badge.buildkite.com/ad0065c1b70f557cd3b1d3d68f9c2154010f83c4d6f71706a9.svg?branch=develop)](https://buildkite.com/matrix-dot-org/element-android/builds?branch=develop) + +# New Android SDK + +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. + +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. + +# Roadmap + +The version 1.0.0 of Element still misses some features which was previously included in Riot-Android. +The team will work to add them on a regular basis. + +## Contributing + +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).