mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-23 17:40:37 +03:00
Code Issues Projects Releases Packages Wiki Activity
13236 commits 7 branches 124 tags 230 MiB
Commit graph

13236 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpiritCroc
2da47f81bd Hide (broken) e2e decoration for dual-side bubble layout 
Change-Id: I480005fffa8f3be1adb29bf7f0280b3acbebc135
 2022-01-11 12:30:45 +01:00
SpiritCroc
12497bd90f Merge remote-tracking branch 'upstream/feature/bma/toDevice_timeout_0' into sc 
Change-Id: I6234f07715d1c5eab4732a046e93c4bda48159ad
 2021-12-27 19:38:08 +01:00
SpiritCroc
f95e285780 Add back "default" notification option 
Closes https://github.com/SchildiChat/SchildiChat-android/issues/100

Change-Id: I0ef5580f41bd90a0f5b5c350ee2a51ca12f70e40
 2021-12-26 11:39:02 +01:00
SpiritCroc
9b7b364a25 Move more bubble dimens to dimens.xml to better ensure consistence 
Change-Id: I996501e0e81e278ec8cc60dba25791d9627b0a4d
 2021-12-26 11:24:25 +01:00
SpiritCroc
127e151c41 Make pseudo-bubbles align properly with bubbles again 
Change-Id: Ib841827f7df8712eb35c126a94fb1554d1182c6f
 2021-12-26 10:50:18 +01:00
su-ex
6a9b6e38e4 Translated using Weblate (German) 
Currently translated at 71.6% (86 of 120 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/de/
 2021-12-26 10:43:37 +01:00
Lucas
eed2250389 Translated using Weblate (French) 
Currently translated at 78.3% (94 of 120 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/fr/
 2021-12-24 12:02:27 +01:00
Linerly
474a79cf90 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (120 of 120 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/id/
 2021-12-24 12:02:26 +01:00
waclaw66
8cff76680e Translated using Weblate (Czech) 
Currently translated at 100.0% (120 of 120 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/cs/
 2021-12-24 12:02:26 +01:00
SpiritCroc
eac9774c8e Increase notice alpha/opacity to 0.65 
Change-Id: I653804768c803221065bc8c9cd5d30f3c56063aa
 2021-12-24 12:01:36 +01:00
SpiritCroc
88c1833c45 Show participants action: use upstream impl to reduce conflicts 
Change-Id: I3136fa37ddbf2575881b7f5c447c022d1130f411
 2021-12-24 11:19:14 +01:00
SpiritCroc
98f05b25e2 Only allow paging for room list tab 
Change-Id: I4a19b516fe821b00224b90832f31360d4243bed4
 2021-12-24 10:12:19 +01:00
SpiritCroc
e2e068f549 ViewPager: avoid redundant room list action handling 
In particular bad where "Open at recent messages" would open the room as
many times as room lists are alive in the view pager.

Change-Id: I58fb2df012e56ce0b6afb984f48c74b7c3e146db
 2021-12-24 09:25:08 +01:00
SpiritCroc
e78ad54850 [merge] Fix url preview measures 
Change-Id: I4348e5bd08b61a2fd90b821b1787057d3813d005
 2021-12-23 18:06:07 +01:00
SpiritCroc
0cf5806894 Also apply notice transparency to no-bubble style 
Change-Id: I22af6d8d9d72f624bd88df2e0af2ad99d6a322f0
 2021-12-23 17:53:02 +01:00
SpiritCroc
e8a2b14055 Notices transparent as done on desktop 
Change-Id: I4768180eebcaa82bc64e5dcca9694ba808467d94
 2021-12-23 17:42:39 +01:00
SpiritCroc
f3874be337 [merge] Bring back old url preview code 
Already added back old layout in merge, but that's not enough

Change-Id: I0c262f1a33890959bde77a0d54916a88c4ff2cc9
 2021-12-23 17:16:03 +01:00
SpiritCroc
ca8d940c0e [merge] Fix some bubble layout 
Change-Id: I472d12d111de2352544c136a17288e54328a3c5d
 2021-12-23 16:02:35 +01:00
SpiritCroc
17a8969d80 [merge] Fix some poll colors + some more previously missed 
Change-Id: I346fab778b9c6c07bcf5fd1f3c753ccfe717aeea
 2021-12-23 15:29:55 +01:00
SpiritCroc
bd38595ab5 [merge] Put poll in message bubble 
Change-Id: Ifebbc53cd1c716b8b890e63f536b258c68b4c1cf
 2021-12-23 15:11:02 +01:00
SpiritCroc
38d16c98e3 [merge] Fix room list notification action background 
Change-Id: I3c0d7d1b311c288f4b12077f7a60477e0bafadd5
 2021-12-23 14:55:10 +01:00
SpiritCroc
2e3e233d5d ViewPager: avoid smooth scrolling large distances 
Change-Id: Id99152c8f10aab1a93679e6559e446fb4135070c
 2021-12-23 14:54:46 +01:00
SpiritCroc
e6a7b4aa5f ViewPager: use default caching strategy 
Change-Id: Ic09ca9f15320ca7e8ba5c1457e934d909055449e
 2021-12-23 14:46:54 +01:00
SpiritCroc
197bf860c3 Automatic SchildiChat string correction 
Change-Id: I7feb0338399c577ec5183c62c6219b79e8eb5d35
 2021-12-23 14:42:24 +01:00
SpiritCroc
832b684550 Automatic upstream merge postprocessing 
Change-Id: I4a541aa3f5f767b9b7c1cecd22b8ecf3adedbf99
 2021-12-23 14:42:23 +01:00
SpiritCroc
acdd4e24b9 Merge tag 'v1.3.12' into sc 
Change-Id: I66c0120371c3f52295f033ec21702c08381b5b10

Conflicts:
	build.gradle
	vector/build.gradle
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventVisibilityHelper.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/url/PreviewUrlView.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/actions/RoomListQuickActionsEpoxyController.kt
	vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
	vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
	vector/src/main/res/drawable/highlighted_message_background.xml
	vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
	vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
	vector/src/main/res/layout/fragment_home_detail.xml
	vector/src/main/res/layout/fragment_login_server_selection.xml
	vector/src/main/res/layout/fragment_room_detail.xml
	vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
	vector/src/main/res/layout/item_expandable_textview.xml
	vector/src/main/res/layout/item_login_header.xml
	vector/src/main/res/layout/item_radio.xml
	vector/src/main/res/layout/item_room.xml
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
	vector/src/main/res/layout/item_timeline_event_code_block_stub.xml
	vector/src/main/res/layout/item_timeline_event_media_message_stub.xml
	vector/src/main/res/layout/item_timeline_event_poll_stub.xml
	vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
	vector/src/main/res/layout/item_timeline_event_voice_stub.xml
	vector/src/main/res/layout/view_stub_room_profile_header.xml
	vector/src/main/res/layout/view_url_preview.xml
	vector/src/main/res/xml/vector_settings_labs.xml
	vector/src/main/res/xml/vector_settings_root.xml
 2021-12-23 14:36:13 +01:00
SpiritCroc
43ba77577b [TMP] Automatic upstream merge preparation 
Change-Id: I07249d2b85b4bd78844e5e74c0245116e9119499
 2021-12-23 09:55:24 +01:00
SpiritCroc
4db21fb294 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Id2de49d9a137fc056758739dfd127b668c1253d5
 2021-12-23 09:55:24 +01:00
ganfra
1695fde15b Merge branch 'release/1.3.12' into main 2021-12-20 15:32:27 +01:00
ganfra
4b2dd73d19 Release: prepare CHANGES 2021-12-20 14:56:27 +01:00
ganfra
721bf4fbd1
Merge pull request #4770 from vector-im/feature/adm/emoji-27-and-below-crash 
Fixing Android 8.1.1 / 27 and below emoji crash
 2021-12-20 11:41:18 +01:00
Adam Brown
18df540487 adding changelog entry 2021-12-20 10:10:07 +00:00
Adam Brown
f1dff33dc2 removing android version bypass for using text futures 
- the emoji span changes affect all android versions
 2021-12-20 10:09:17 +00:00
ganfra
c6a118fc1f Update versions to 1.3.12 2021-12-17 19:05:17 +01:00
ganfra
cab28ffe7e Merge branch 'release/1.3.11' into main 2021-12-17 18:53:26 +01:00
ganfra
f134ac6cdf Merge tag '1.3.11' into develop 
no message
 2021-12-17 18:53:26 +01:00
ganfra
6c127e9de5 Release: prepare CHANGES 2021-12-17 18:21:56 +01:00
ganfra
461beda634
Merge pull request #4742 from vector-im/feature/aris/fix_immutable_model_crash 
Fix crash ImmutableModelException
 2021-12-17 15:30:19 +01:00
ganfra
e155eefb7b
Merge pull request #4748 from vector-im/feature/adm/late-emoji-initialisation 
Unable to render messages
 2021-12-17 12:35:37 +01:00
ganfra
ac65942c28
Merge pull request #4744 from vector-im/feature/adm/emoji-notice-fix 
Emojis in emotes causing crashes on Android 12+
 2021-12-17 11:47:16 +01:00
Adam Brown
ddbf8582dd removing trailing space 2021-12-17 10:46:03 +00:00
Adam Brown
6918372a87 extracting the emoji processing to an interface so that we can override the behaviour in the unit test 2021-12-17 10:38:49 +00:00
Adam Brown
b73bae452a
adding comment to explain SpannableStringBuilder usage 2021-12-17 09:37:50 +00:00
Adam Brown
e1eafd2c64 adding changelog entry 2021-12-17 09:26:10 +00:00
Adam Brown
37db28ae7c using the safe emoji processor to avoid the timeline failing when processing the content and the emoji library hasn't initialised yet 2021-12-17 09:25:16 +00:00
Adam Brown
9e2fb1366f
Update changelog.d/4743.bugfix 
Co-authored-by: Benoit Marty <benoitm@matrix.org>
 2021-12-17 09:22:12 +00:00
ClaireGizard
ca58a04f57
Small UI fix in room member profile hearder (#4700) 
Small ui fix on room member profile name

Co-authored-by: Claire Gizard <cgizard>
 2021-12-16 21:10:03 +01:00
ariskotsomitopoulos
cabf12289b Add changelog 2021-12-16 20:39:21 +02:00
Adam Brown
049cad7d2c adding changelog entry 2021-12-16 18:37:03 +00:00
Adam Brown
ae6be3fdc4 adding missing binding options emote content 
- fixes android 12+ crash when certain emojis are used within the emote content
 2021-12-16 18:34:00 +00:00