Commit graph

14896 commits

Author SHA1 Message Date
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
SpiritCroc
7bfd3c8dca [TMP] Add some debugging to detect timeline inconsistencies
Note: may affect performance a little when loading the timeline, so
better revert when we are confident we have fixed the issue.

Change-Id: Ic4d31e47948984371a02ce51af7a8d56cb120234
2022-03-10 12:36:00 +01:00
SpiritCroc
a132ee22cb Fix gif autoplay after merge
Change-Id: Ia6f1718284903108aed22e246d2f594741e8511f
2022-03-10 08:24:15 +01:00
SpiritCroc
2498da3631 Fix updating unread marker if not to latest chunk
SetReadMarkerTask was not updating the read marker when both the old and
the new fully read eventId weren't in the last chunk, even when the new
one was after the first one.

Change-Id: I175b335cf90328f676238ca23e45aa0f91b269c9
2022-03-09 18:07:38 +01: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
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
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
SpiritCroc
96d7e4859b Revert "[TMP] Force-disable "open at first unread" setting"
This reverts commit f06ae844dc.

Change-Id: I12111941fc71b9f7e49742e52f9a212382a44b7b
2022-03-08 18:41:16 +01:00
SpiritCroc
430963ae28 Fix missing messages when forward paging with chunks > 50 messages
- offsets() was not limiting in the right direction when loading
  messages forwards
- after fixing offsets(), more recent messages would not be loaded due
  to the isLastForward() check, so better prioritize the SUCCESS
  LoadMoreResult over the REACHED_END here

Change-Id: I48011adc57ff2d48bb7be37cb4dda8bd8f745bf8
2022-03-08 18:29:21 +01:00
SpiritCroc
22d034566b Do not offset text with inline code snippets
Change-Id: Id1573c55f4e719e4659aacd76a4416a38db5d9eb
2022-03-06 10:36:31 +01:00
SpiritCroc
9d64a14ff7 Revert back to search icon for room list filter for now
Until a global search exists, users are more likely to think "search
for a room" instead of "filter the room list by room name"

Change-Id: Ic0d07bcd0b64c92ad180c33a5740a4a98f94f625
2022-03-06 09:56:31 +01:00
SpiritCroc
c402e6d637 Add comment to schildichat:// intent filter
Change-Id: I155217f592d9af885cda51d1baf410c472c97a4a
2022-03-06 09:47:55 +01:00
Andrew Ryan
c3fbaaa3aa Support schildichat:// links
We want to suppot schildichat:// links in addition to element:// links.

This change adds support for schildichat:// links of the same format as
the element links.
2022-03-05 09:56:13 -08:00
SpiritCroc
37a68b4367 [merge] Fix ic_add_reaction color
Change-Id: Ieeff366c672499ed14291fe64338bd0d41332585
2022-03-04 12:11:30 +01:00
SpiritCroc
3d57cb880c Unread line: follow unread counter color
Change-Id: Ia3cd51364517276cfc438fe0f7700d11de7ff00a
2022-03-04 11:57:58 +01:00
SpiritCroc
0a4f07f07f Automatic SchildiChat string correction
Change-Id: I3b93d37a7ac0874203cb10e16693476c01b5fe5b
2022-03-04 11:43:01 +01:00
SpiritCroc
d77c42f8c1 Automatic upstream merge postprocessing
Change-Id: Iaf674a4d25857de93b86e4162b51688ed113553f
2022-03-04 11:43:00 +01:00
SpiritCroc
161780899e [merge] Make unread indicator accent color as before
Change-Id: I511adcfd2be159f1ba392525af6e60196a774901
2022-03-04 11:42:49 +01:00
SpiritCroc
2f5df9133f Merge tag 'v1.4.2' into sc
Change-Id: I8a96211645ff31284897d818ce93c7b5571fbd0f

Conflicts:
	library/ui-styles/src/main/res/values/styles_timeline.xml
	library/ui-styles/src/main/res/values/theme_black.xml
	library/ui-styles/src/main/res/values/theme_dark.xml
	library/ui-styles/src/main/res/values/theme_light.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.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/detail/timeline/item/AbsBaseMessageItem.kt
	vector/src/main/java/im/vector/app/features/html/PillImageSpan.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/res/layout/item_room.xml
	vector/src/main/res/values/config.xml
2022-03-04 11:42:30 +01:00
SpiritCroc
ab9bf0cb7d [TMP] Automatic upstream merge preparation
Change-Id: I643396f8586b594412dbd97284256165fd843f7b
2022-03-04 10:48:35 +01:00
SpiritCroc
5331ad8911 Automatic revert to unchanged upstream strings, pt.1
Change-Id: I2cf821d62dab6a1c5bcbf7a3c124e57bd49ab60e
2022-03-04 10:48:35 +01:00
SpiritCroc
dd0037509e Apply corner roundness to image-related drawables
Background outline and time overlay

Change-Id: If6715bf11489609a9ad2aad831db9ee608c803b6
2022-03-04 10:21:40 +01:00
SpiritCroc
b56c1a3b0c Fix image corner radius for SC bubbles
Change-Id: I8cb2515f3f7985cf12ecc2b4a368f663cacfc0d0
2022-03-04 10:06:16 +01:00
SpiritCroc
fe5eaece47 Setting for more rounded bubbles
Closes https://github.com/SchildiChat/SchildiChat-android/issues/48

Change-Id: I51dabc18c1542dcd4b8d12769fe1cc76573441c5
2022-03-03 17:20:06 +01:00
SpiritCroc
20ba02db57 [TMP] Raise sync logging level
So we get these in rageshakes

Change-Id: I1efb8dd759cd03607ade0611c92a87df1b20c7f3
2022-03-03 08:55:34 +01:00
SpiritCroc
ad3beec3cf [merge] Make url previews utilize maximum width again
Change-Id: Ib0e6bbb2d898553f23c4d51a8c3e0242c6197bb8
2022-03-03 08:52:24 +01:00
SpiritCroc
8afa535fe6 [merge] Fix minimum bubble width for long sender names
Change-Id: I32aa8b8dfc40ce29e2414f04ae8933a836d9ebc3
2022-03-03 08:48:38 +01:00
SpiritCroc
a8f10a95da Fix attachments close button look
Rotating the attachments button to get a close button does not work
for us

Change-Id: I893a06d0671f75626229e71037f0b6bee774a74c
2022-03-02 16:43:43 +01:00
SpiritCroc
fa53abc91f Proper thread list title name color
Change-Id: I3e39db09a575190a62bd206dcd71b84db07305f6
2022-03-02 16:41:42 +01:00
SpiritCroc
b26b3186ac Hide username color override if unused
Change-Id: I93e40b06c518398ad27458b6425ce0bcae8ebd57
2022-03-02 16:39:56 +01:00
SpiritCroc
fd72d55dd0 Accent color for location map pin
Change-Id: I624f156ad7f44ab84328cee43ff3777e6a51f802
2022-03-02 16:27:21 +01:00
SpiritCroc
bd66326c40 Put emotes back into bubbles
Change-Id: I2c80095104039081e32785d9fd83477e610fda21
2022-03-02 16:22:26 +01:00
SpiritCroc
ccb49c6c70 increment_version.sh: Exclude more merge-related commits
Change-Id: If9093f1cc195afcc68a694bb6716691875badb8d
2022-03-02 16:14:22 +01:00
SpiritCroc
7ff40cb22d Threading-related theming
Change-Id: Idec928fa03c60235e2723c22139c6247020ef7b0
2022-03-02 16:07:50 +01:00
Benoit Marty
f10c67d3fa Merge branch 'release/1.4.2' into main 2022-02-22 21:32:05 +01:00
Benoit Marty
bb0955f809 change for fastlane 2022-02-22 21:29:16 +01:00
Benoit Marty
70bb1004c1 Tidy up the changelog 2022-02-22 21:27:06 +01:00
Benoit Marty
b746321bad Towncrier 2022-02-22 21:21:40 +01:00
Benoit Marty
6fd14c9ebc Typo in the filename 2022-02-22 21:21:24 +01:00
Benoit Marty
ed80fe517d Revert recent change to fix a crash
`readReceiptsSummaryEntity.realm` is null
2022-02-22 21:06:41 +01:00
Benoit Marty
bff663d4fa
Merge pull request #5304 from vector-im/feature/bma/weblate_1_4_2
Weblate 1 4 2
2022-02-22 18:13:01 +01:00
Benoit Marty
5dced8b6bd
Merge pull request #5258 from vector-im/feature/mna/5218-crash-at-registration
#5218: Fix crash at registration when redirecting to Web View
2022-02-22 18:12:35 +01:00
Maxime Naturel
21fa0267f6 Removing TODOs 2022-02-22 17:44:59 +01:00
Benoit Marty
1ce65d7f87 Use plurals for message_reaction_show_more. Fixes #5227 2022-02-22 16:08:08 +01:00
Benoit Marty
17fa463bc8 Delete unused resource 2022-02-22 16:05:40 +01:00
Benoit Marty
a9702c63d2 Fix lint issue 2022-02-22 16:00:40 +01:00
Benoit Marty
fa66f10075 Create template with the app name 2022-02-22 15:47:15 +01:00
Benoit Marty
9cd4b5d3b8 Create template with the app name 2022-02-22 15:45:47 +01:00