mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-01-10 18:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity
9663 commits 7 branches 124 tags 230 MiB
Commit graph

9663 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sven Grewe
d6e495f79f Translated using Weblate (German) 
Currently translated at 100.0% (2363 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2021-04-15 17:34:21 +00:00
SpiritCroc
e6b3f01545 Automatic SchildiChat string correction 
Change-Id: I4173e26d5fa2de9fc1ac9a8d08ce4cd50bd500dc
 2021-04-15 12:30:04 +02:00
SpiritCroc
5757d1894c Automatic upstream merge postprocessing 
Change-Id: Ia39d86869d7d2a16e2408838d5a3c5b0f80f3711
 2021-04-15 12:30:02 +02:00
SpiritCroc
28c5f036c8 Merge tag 'v1.1.5' into sc 
Change-Id: I263852c42cfa21935890bee435f063d7fa43edfa
 2021-04-15 12:29:59 +02:00
SpiritCroc
ad8e9380b6 [TMP] Automatic upstream merge preparation 
Change-Id: Ib8637486c2a7e77402e356605603e6577ecd88e6
 2021-04-15 12:29:55 +02:00
SpiritCroc
537dd060b2 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I777c5cd5991b46559184568cc4d27d6acdab8878
 2021-04-15 12:29:55 +02:00
SpiritCroc
dd5fd4c128 More longclick actions for stickers 
Allow
- Reactions
- Redactions
- Replies

Closes https://github.com/SchildiChat/SchildiChat-android/issues/57

Change-Id: I773cdcf84b2291494096debed38ba2342708290f
 2021-04-15 12:28:12 +02:00
Benoit Marty
18cef243a1 Merge branch 'hotfix/1.1.4_fixes' 2021-04-15 11:10:24 +02:00
Benoit Marty
9565e8975e merge hotfix to develop 2021-04-15 11:09:58 +02:00
Benoit Marty
ccf7dd9583 Add changelog file 2021-04-14 22:41:57 +02:00
Benoit Marty
e4375522ff Fix crash when playing video (#3179) 2021-04-14 22:35:30 +02:00
Benoit Marty
59637c4a6b Revert to Realm 10.3.1 to fix issue with migration 
Waiting for https://github.com/realm/realm-java/issues/7402
 2021-04-14 21:54:07 +02:00
Benoit Marty
3034d1d831
Merge pull request #3176 from vector-im/feature/bma/login_fixes 
Small fixes on the current sign in sign up flow
 2021-04-14 20:13:12 +02:00
Benoit Marty
057295c155 Cleanup 2021-04-14 20:12:57 +02:00
SpiritCroc
221be6947d Fix alignment of read receipts for dual-side bubbles 
Change-Id: I60d6dde73071fa28d069cba87850cd85d6ddd36b
 2021-04-14 17:22:34 +02:00
SpiritCroc
d568523b8b Add back low-priority section for DMs 
Change-Id: I63871b90a8541d2d8f9c87374176f95f6278882e
 2021-04-14 16:54:36 +02:00
SpiritCroc
3bfae2a28b Fix invalid expand status on tab switch 
Change-Id: I8db822d61b93b0b6f12ecbe4c7270f42c204caa5
 2021-04-14 16:43:54 +02:00
SpiritCroc
0aee3cf68c Remember expand status of sections in the overview again 
Change-Id: I3648e959de8a12d525d73da642b6ce6ae6a5ba7a
 2021-04-14 16:31:45 +02:00
SpiritCroc
2020765b77 Automatic SchildiChat string correction 
Change-Id: I0b5bf7e0a8d39f9308dcd13c35fbbfd91a487322
 2021-04-14 14:02:45 +02:00
SpiritCroc
5749e31508 Automatic upstream merge postprocessing 
Change-Id: Ic88df521a426bfe12b6fbbbcbdca534722ce7a6c
 2021-04-14 14:02:43 +02:00
Benoit Marty
e612a7e51d
Merge pull request #3170 from vector-im/feature/ons/fix_send_state_ui 
Fix send state image color on dark theme
 2021-04-14 13:59:58 +02:00
SpiritCroc
20e185ef48 Restore setting functionality for unimportant unread type and count 
Change-Id: Ied403f8fad4a7fa4e9dd1422c9ca08690183c1b1
 2021-04-14 13:58:37 +02:00
SpiritCroc
04c0d7c121 Add back chats marked unread to notifications tab 
Likely also required for the "mark all as read" feature to work properly
since v1.1.4

Change-Id: I375860e55e3f188526f90cf7ffdccf192871e745
 2021-04-14 13:26:35 +02:00
SpiritCroc
811950cb18 Various fixes after merge 
- Fix compile
- Fix counting chats marked unread
- Fix counting chats with unread messages

Change-Id: Ibf928c5380a1b7ec25f2c510b97ee4f726fe7c0d
 2021-04-14 13:20:50 +02:00
Benoit Marty
877e0ca5c6 compact code 2021-04-14 12:48:33 +02:00
Benoit Marty
89c2662e09 Fix social login button rendering on old OS 2021-04-14 12:44:48 +02:00
Benoit Marty
699b1429b7 Simplify LoginFlowResult model 2021-04-14 12:42:47 +02:00
yostyle
e467e2ca08 Expose directUserId in RoomSummary 2021-04-14 11:35:21 +02:00
dependabot[bot]
30b415e77e
Bump daggerVersion from 2.34 to 2.34.1 
Bumps `daggerVersion` from 2.34 to 2.34.1.

Updates `dagger` from 2.34 to 2.34.1
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.34...dagger-2.34.1)

Updates `dagger-compiler` from 2.34 to 2.34.1
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.34...dagger-2.34.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-14 07:09:19 +00:00
dependabot[bot]
39f304a57b
Bump big_image_viewer_version from 1.7.1 to 1.8.0 
Bumps `big_image_viewer_version` from 1.7.1 to 1.8.0.

Updates `BigImageViewer` from 1.7.1 to 1.8.0
- [Release notes](https://github.com/Piasy/BigImageViewer/releases)
- [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Piasy/BigImageViewer/commits)

Updates `GlideImageLoader` from 1.7.1 to 1.8.0
- [Release notes](https://github.com/Piasy/BigImageViewer/releases)
- [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Piasy/BigImageViewer/commits)

Updates `ProgressPieIndicator` from 1.7.1 to 1.8.0
- [Release notes](https://github.com/Piasy/BigImageViewer/releases)
- [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Piasy/BigImageViewer/commits)

Updates `GlideImageViewFactory` from 1.7.1 to 1.8.0
- [Release notes](https://github.com/Piasy/BigImageViewer/releases)
- [Changelog](https://github.com/Piasy/BigImageViewer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Piasy/BigImageViewer/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-14 07:09:03 +00:00
dependabot[bot]
afe617357d
Bump zxcvbn from 1.4.0 to 1.4.1 
Bumps [zxcvbn](https://github.com/nulab/zxcvbn4j) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/nulab/zxcvbn4j/releases)
- [Changelog](https://github.com/nulab/zxcvbn4j/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nulab/zxcvbn4j/compare/1.4.0...1.4.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-14 07:08:48 +00:00
Moo
2116ff91cc Added translation using Weblate (Lithuanian) 2021-04-13 19:52:50 +00:00
Onuray Sahin
ce7e00a499 Fix send state image color on dark theme. 2021-04-13 11:48:12 +03:00
Salamandar
f23eb425a1 Translated using Weblate (French) 
Currently translated at 100.0% (15 of 15 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fr/
 2021-04-13 08:34:24 +00:00
Thai Localization
05b35f53d4 Translated using Weblate (Thai) 
Currently translated at 12.2% (290 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/th/
 2021-04-13 08:34:23 +00:00
SpiritCroc
0e601aa8f0 Merge tag 'v1.1.4' into sc 
Note: this merge needs more work, since upstream changed implementations
affecting following features:
- Mark unread
- Notification count badges
- Overview list filtering / combined overview
- Remember expanded categories
- Read receipt layout

Change-Id: If728bb54dd7c423b57bd3f59d23d86a1a0e5e435

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/DefaultReadService.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt
	vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
	vector/src/main/java/im/vector/app/core/utils/Emoji.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewState.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryController.kt
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/layout/item_timeline_event_base_state.xml
 2021-04-13 09:28:13 +02:00
dependabot[bot]
bb9258cc47
Bump oss-licenses-plugin from 0.10.3 to 0.10.4 
Bumps oss-licenses-plugin from 0.10.3 to 0.10.4.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-13 07:21:36 +00:00
SpiritCroc
5d7a1605da merge_helpers.sh: Fix spaces for upstream_previous_tag 
Change-Id: I669fd7e764419c9c78c15d7a3c5e5a6ce8af4af4
 2021-04-12 16:01:39 +02:00
SpiritCroc
79daede4f5 [TMP] Automatic upstream merge preparation 
Change-Id: Ic73bcab6bcb749b183f47ab8cf6ee647239822b7
 2021-04-12 15:58:23 +02:00
SpiritCroc
d6fb89492a Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I82ed105a407d79a9faa756b523e89dbfe5e14246
 2021-04-12 15:58:22 +02:00
SpiritCroc
d329f08162 Increment version 
Change-Id: Ieeae5d0355183e5fadd8a0303514d8af9d7301a5
 2021-04-12 10:57:35 +02:00
Benoit Marty
288aed3252
Merge pull request #3151 from vector-im/feature/bma/cleanup_resources 
Store description update
 2021-04-12 10:47:18 +02:00
Benoit Marty
ef648ce7ec
Merge pull request #3152 from vector-im/gradlew-update-7.0 
Update Gradle Wrapper from 6.8.3 to 7.0
 2021-04-12 10:46:33 +02:00
Benoit Marty
5ca71a10ec Changelog 2021-04-12 10:46:03 +02:00
Benoit Marty
d2c74f6fcd
Merge pull request #3104 from Dominaezzz/suspend_functions_1 
Convert RoomService to suspend functions
 2021-04-11 21:13:15 +02:00
Benoit Marty
984342a6dd Upgrade com.likethesalad.android:string-reference to 1.2.2 
Compatible with gradle7, see https://github.com/LikeTheSalad/android-string-reference/issues/11
 2021-04-11 21:07:08 +02:00
Jeanne Lavoie
6c30e90dd9 Translated using Weblate (Italian) 
Currently translated at 100.0% (2363 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
 2021-04-11 17:38:34 +00:00
Oymate
2563bc9879 Translated using Weblate (Bengali (Bangladesh)) 
Currently translated at 51.4% (1215 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/bn_BD/
 2021-04-11 17:38:33 +00:00
Jeanne Lavoie
05993c36c4 Translated using Weblate (French) 
Currently translated at 100.0% (2363 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2021-04-11 17:37:06 +00:00
Jeanne Lavoie
c7a241fbf5 Translated using Weblate (French (Canada)) 
Currently translated at 100.0% (2363 of 2363 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr_CA/
 2021-04-11 17:37:05 +00:00