[TMP] Automatic upstream merge preparation
Change-Id: I52165397a64804cfc00893eb6484e73cf648f3bb
This commit is contained in:
SpiritCroc
parent
c2f524b7b3
commit
d1468a50d2
40
README.md
40
README.md
|
|
@ -1,30 +1,34 @@
|
|||
[](https://weblate.bubu1.eu/projects/schildichat/schildichat-android/)
|
||||
[](https://matrix.to/#/#schildichat-android:matrix.org)
|
||||
[](https://buildkite.com/matrix-dot-org/element-android/builds?branch=develop)
|
||||
[](https://translate.element.io/engage/element-android/?utm_source=widget)
|
||||
[](https://matrix.to/#/#element-android:matrix.org)
|
||||
[](https://sonarcloud.io/dashboard?id=im.vector.app.android)
|
||||
[](https://sonarcloud.io/dashboard?id=im.vector.app.android)
|
||||
[](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
|
||||
- Optional message bubbles
|
||||
- Further usability improvements and additional settings to configure the app
|
||||
[<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)
|
||||
[<img src="resources/img/f-droid-badge.png" alt="Get it on F-Droid" height="60">](https://f-droid.org/app/im.vector.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: [](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>
|
||||
<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>
|
||||
# New Android SDK
|
||||
|
||||
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/).
|
||||
For translations that concern upstream Element code, visit their weblate [here](https://translate.element.io/engage/element-android/).
|
||||
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.
|
||||
|
||||
## 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).
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
json_key_file("../google-api-fastlane-release.json") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one
|
||||
package_name("de.spiritcroc.riotx") # e.g. com.krausefx.app
|
||||
json_key_file("./fastlane/private/api-8525453667099313774-565354-aca0e6153603.json")
|
||||
package_name("im.vector.app")
|
||||
|
|
|
|||
|
|
@ -16,49 +16,45 @@
|
|||
default_platform(:android)
|
||||
|
||||
platform :android do
|
||||
keystore = ENV["keystore"]
|
||||
keystore_pass = ENV["keystorepass"]
|
||||
key_alias = ENV["keyalias"]
|
||||
key_pass = ENV["keypass"]
|
||||
|
||||
desc "Runs all the tests"
|
||||
lane :test do
|
||||
gradle(task: "test")
|
||||
end
|
||||
|
||||
desc "Deploy a new version to Google Play"
|
||||
desc "Submit a new Beta Build to Crashlytics Beta"
|
||||
lane :beta do
|
||||
gradle(task: "clean assembleRelease")
|
||||
crashlytics
|
||||
|
||||
# sh "your_script.sh"
|
||||
# You can also use other beta testing services here
|
||||
end
|
||||
|
||||
desc "Deploy a new version to the Google Play"
|
||||
lane :deploy do
|
||||
gradle(
|
||||
task: "clean bundleGplayRelease",
|
||||
properties: {
|
||||
"android.injected.signing.store.file": keystore,
|
||||
"android.injected.signing.store.password": keystore_pass,
|
||||
"android.injected.signing.key.alias": key_alias,
|
||||
"android.injected.signing.key.password": key_pass
|
||||
}
|
||||
)
|
||||
gradle(task: "clean assembleRelease")
|
||||
upload_to_play_store
|
||||
end
|
||||
|
||||
desc "Deploy Google Play metadata"
|
||||
lane :deployMeta do
|
||||
# Doc: https://docs.fastlane.tools/actions/upload_to_play_store/
|
||||
upload_to_play_store(
|
||||
# apk: lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH]
|
||||
skip_upload_apk: true,
|
||||
skip_upload_aab: true,
|
||||
skip_upload_images: true,
|
||||
skip_upload_screenshots: true,
|
||||
skip_upload_changelogs: true,
|
||||
# Set to true to not update the PlayStore
|
||||
validate_only: false
|
||||
)
|
||||
end
|
||||
|
||||
desc "Deploy a beta to Google Play"
|
||||
lane :deploy_beta do
|
||||
gradle(
|
||||
task: "clean bundleGplayRelease",
|
||||
properties: {
|
||||
"android.injected.signing.store.file": keystore,
|
||||
"android.injected.signing.store.password": keystore_pass,
|
||||
"android.injected.signing.key.alias": key_alias,
|
||||
"android.injected.signing.key.password": key_pass
|
||||
}
|
||||
)
|
||||
upload_to_play_store(
|
||||
# apk: lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH]
|
||||
track: 'beta',
|
||||
skip_upload_metadata: false,
|
||||
skip_upload_images: true,
|
||||
skip_upload_screenshots: true
|
||||
)
|
||||
desc "Get version code"
|
||||
lane :getVersionCode do
|
||||
versions = google_play_track_version_codes(track: "production")
|
||||
puts(versions)
|
||||
version_code = versions[0]
|
||||
puts(version_code)
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -21,16 +21,26 @@ or alternatively using `brew install fastlane`
|
|||
fastlane android test
|
||||
```
|
||||
Runs all the tests
|
||||
### android beta
|
||||
```
|
||||
fastlane android beta
|
||||
```
|
||||
Submit a new Beta Build to Crashlytics Beta
|
||||
### android deploy
|
||||
```
|
||||
fastlane android deploy
|
||||
```
|
||||
Deploy a new version to Google Play
|
||||
### android deploy_beta
|
||||
Deploy a new version to the Google Play
|
||||
### android deployMeta
|
||||
```
|
||||
fastlane android deploy_beta
|
||||
fastlane android deployMeta
|
||||
```
|
||||
Deploy a beta to Google Play
|
||||
Deploy Google Play metadata
|
||||
### android getVersionCode
|
||||
```
|
||||
fastlane android getVersionCode
|
||||
```
|
||||
Get version code
|
||||
|
||||
----
|
||||
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue