mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-01-24 00:34:01 +03:00
Code Issues Projects Releases Packages Wiki Activity
16845 commits 7 branches 125 tags 235 MiB
Commit graph

10159 commits

Author SHA1 Message Date
Benoit Marty
c339e10c07
Merge pull request #5436 from vector-im/feature/nfe/space_highlight 
change selected space highlight
 2022-03-10 13:28:08 +01:00
SpiritCroc
27fd6a2819 Automatic SchildiChat string correction 
Change-Id: I728d41658c2b1148b40644e28b67016f5e420c70
 2022-03-10 13:26:54 +01:00
SpiritCroc
8f93b55b59 Automatic color correction 
Change-Id: I0ac188dce1148b8defeaffd70062691a8ee2e9da
 2022-03-10 13:26:52 +01:00
SpiritCroc
f5afdefe2f Merge tag 'v1.4.4' into sc 
Change-Id: Ibfb35ec30a51abebb652044719417f62c8a6be50

Conflicts:
	library/ui-styles/src/main/res/values/dimens.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/SyncTask.kt
	vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
	vector/src/main/res/drawable/bg_unread_notification.xml
	vector/src/main/res/drawable/ic_add_reaction_small.xml
	vector/src/main/res/layout/item_room.xml
	vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
 2022-03-10 13:26:09 +01:00
SpiritCroc
373d88885e Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I1c7b6a48f886c7c4664ebf81252f84c1aaa5930b
 2022-03-10 13:09:23 +01:00
SpiritCroc
98ec8b4842 FooteredTextView: Fix reserving footer width when forcing footer below 
Change-Id: Iea91960f6bcbdc0af4956a65a04d926b98f0d580
 2022-03-10 13:08:18 +01:00
Benoit Marty
d83d5f9828
Merge pull request #5467 from vector-im/feature/bma/unused_resources_all 
Remove unused resources
 2022-03-10 13:03:27 +01:00
SpiritCroc
b3d9ddbeca Do not cut italic text, v2 
Different implementaion than the one which got lost during a recent
upstream merge

Change-Id: Ic4b0474bd95a9746cfecc8aff8562c330e296b5a
 2022-03-10 12:48:17 +01:00
ariskotsomitopoulos
21111922e6 Merge branch 'develop' into feature/aris/thread_live_thread_list 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/relation/threads/FetchThreadTimelineTask.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
 2022-03-10 12:55:13 +02:00
Benoit Marty
ce4ad8819a
Merge pull request #5380 from vector-im/feature/bca/crypto_fix_rolling_uisi 
Refactoring for safer olm and megolm session usage
 2022-03-10 11:13:07 +01:00
ariskotsomitopoulos
03f293f216 Remove io.element.thread and add stable m.thread prefix 2022-03-10 12:06:02 +02:00
SpiritCroc
a132ee22cb Fix gif autoplay after merge 
Change-Id: Ia6f1718284903108aed22e246d2f594741e8511f
 2022-03-10 08:24:15 +01:00
Adam Brown
ecb49b3b27 Merge branch 'main' into develop 2022-03-09 16:13:15 +00:00
Maxime NATUREL
f12afe0ef0
Merge pull request #5411 from vector-im/feature/mna/PSF-735-sharing-options-view 
#5395: Location sharing options view
 2022-03-09 16:10:46 +01:00
Benoit Marty
3f17cf595f Remove unused resources 2022-03-09 14:55:40 +01:00
Adam Brown
57ffc56869
Merge pull request #5472 from vector-im/feature/aris/fix_5463_parcelising_reaction_crash 
Fix reactions summary crash
 2022-03-09 13:35:51 +00:00
SpiritCroc
4f2931feae Fix another case of missing read markers 
HasUnread might not be correct on the first try while loading the
timeline.

Change-Id: I6bba6cc58ca21725764d41909deb9a0495d51ea0
 2022-03-09 13:56:17 +01:00
SpiritCroc
df0b5ca0a0 Fix a case of missing read markers 
Case: bottom-most loaded event has read marker, but there are messages below it
that haven't been loaded yet.

Change-Id: I24336ac20558d637840c38ff00527dc2f2c65f75
 2022-03-09 13:56:13 +01:00
SpiritCroc
1206c31e3a Fix another case of missing read markers 
HasUnread might not be correct on the first try while loading the
timeline.
 2022-03-09 13:43:52 +01:00
SpiritCroc
8efd389a3c Fix a case of missing read markers 
Case: bottom-most loaded event has read marker, but there are messages below it
that haven't been loaded yet.
 2022-03-09 13:40:05 +01:00
ericdecanini
e4ce4ab1ab Adds server side vote blocking for ended polls 2022-03-09 12:07:16 +01:00
ariskotsomitopoulos
84b3f63279 Format code 2022-03-09 12:55:25 +02:00
ariskotsomitopoulos
c24944b1f2 Fix reactions summary crash 2022-03-09 12:52:34 +02:00
Onuray Sahin
9b7e329000 Fix lint error. 2022-03-09 13:31:29 +03:00
SpiritCroc
93ae1e954e Switch to schildi.chat FCM gateway 
The matrix.org one seems to be a little slow compared to a private one
recently

Change-Id: Ia9ce4f40c920657abb38aa5ebe31704cf829f4ec
 2022-03-09 11:16:22 +01:00
Benoit Marty
e0914781fc
Merge pull request #5435 from vector-im/feature/nfe/space_menu_amend_copy 
Amend spaces menu to have consistent copy
 2022-03-09 11:13:46 +01:00
Adam Brown
662e9592a0
fixing overlapping room image and title (#5469) 
- the room title was missing constraints for the different types of leading icons
 2022-03-09 10:11:53 +00:00
Benoit Marty
67a24b38cb Avoid stable prefix 2022-03-09 10:48:35 +01:00
Benoit Marty
20c1886fed Support both unstable and stable prefixes. 
Author: Onuray
 2022-03-09 10:40:43 +01:00
SpiritCroc
9a00cf7a3f Move attachment selector close button to the right 
Change-Id: I061f7826f8fb138e0b28e818c8e92108b62aad4f
 2022-03-09 10:25:29 +01:00
SpiritCroc
4b12f162a0 View displayIndex in timeline to debug chunks if developer info enabled 
Change-Id: Id52e6f69b6fbe18cb78a3bdeca220fa58b4e7a82
 2022-03-09 10:22:25 +01:00
Maxime Naturel
2bdafde965 Fix wrong click listener on the current available option 2022-03-09 09:46:52 +01:00
Maxime Naturel
89db867ab3 Fix attributes style id conflicts 2022-03-09 09:46:52 +01:00
Maxime Naturel
6515e457b5 Ignore unused strings to be deleted 2022-03-09 09:46:52 +01:00
Maxime Naturel
046d906f97 Moving view attributes into uikit dedicated file 2022-03-09 09:46:52 +01:00
Maxime Naturel
9adb87bdb4 Renaming picker view method 2022-03-09 09:46:52 +01:00
Maxime Naturel
442d722980 Fix comment form in enum 2022-03-09 09:46:52 +01:00
Maxime Naturel
3aa1032a7a Rollback wrong sharing options 2022-03-09 09:46:52 +01:00
Maxime Naturel
82515cf095 Remove usage of strings to be deleted 2022-03-09 09:46:52 +01:00
Maxime Naturel
9b6811c915 View extension methods to tint current background 2022-03-09 09:46:52 +01:00
Maxime Naturel
7cad30e6bb Use user color for pin background 2022-03-09 09:46:52 +01:00
Maxime Naturel
8f362d83cd Set option to user current location 2022-03-09 09:46:52 +01:00
Maxime Naturel
edc77b0c17 Fixing code syntax 2022-03-09 09:46:51 +01:00
Maxime Naturel
e4c9acde77 Setting colorSurface for background 2022-03-09 09:46:51 +01:00
Maxime Naturel
d36409d475 Renaming package to option 2022-03-09 09:46:51 +01:00
Maxime Naturel
b11f7f20e1 Adding user avatar and color for current location option 2022-03-09 09:46:51 +01:00
Maxime Naturel
42fca9bd6f Fixing ripple effect 2022-03-09 09:46:51 +01:00
Maxime Naturel
8bcc594320 Changing color of the live location icon 2022-03-09 09:46:47 +01:00
Maxime Naturel
fb764028c9 Adding dividers 2022-03-09 09:45:15 +01:00
Maxime Naturel
0707877b3c Using correct string resources for options 2022-03-09 09:45:15 +01:00