Commit graph

15768 commits

Author SHA1 Message Date
SpiritCroc
97b181997f [TMP] Automatic upstream merge preparation
Change-Id: Ia7ca6b9e94631fc9ccfa911669376a472f5012d5
2022-04-12 11:07:58 +02:00
SpiritCroc
1ae13292a5 Automatic revert to unchanged upstream strings, pt.1
Change-Id: I39238d970aeee2af9fafc69604ff5d5dfb7b2b09
2022-04-12 11:07:57 +02:00
SpiritCroc
096bbb696f Open without reading: remember for rooms opened from room
Change-Id: I6ea5675b4cfb5d65d0a5a66d41a0cd489fe263b0
2022-04-12 11:02:43 +02:00
SpiritCroc
d5b0ffacf8 Home pager space swipe: ensure we don't use legacy groups
Change-Id: Icb7ce90dcb1ae013b999c9db9b7b9a3d984dc83f
2022-04-12 11:02:40 +02:00
SpiritCroc
1e62bbfdb3 TokenChunkEventPersistor: log sync tokens
Change-Id: I916808b1839171b8bd96dc5560d97c43c801165b
2022-04-12 11:02:36 +02:00
SpiritCroc
68c9c5459d ViewPager: Change how initial page is selected
Change-Id: Id1a7f29526dc6957dfed61ba016c89e9b45638a2
2022-04-12 11:02:22 +02:00
SpiritCroc
66f5b5c771 Update ViewPager debugging
Change-Id: I969a649335f069ddc68762975be8e8aad018a37d
2022-04-12 11:01:05 +02:00
SpiritCroc
48d632cce5 Quicker updates of toolbar title on space swipe
Change-Id: I89b89ab50aa8dab59e6db719332641e8376f5c76
2022-04-07 15:34:43 +02:00
SpiritCroc
e4c0883312 Rageshake: add field about what debug settings to expect
Change-Id: Idd9a1954e80c24ed58bf8e1f2b93ecb7cd211407
2022-04-07 15:15:29 +02:00
SpiritCroc
14d7921f35 Persist swiped space across viewpager recreations
Change-Id: I8a4010b8eaddcfe2ee906cb559336dc4c2e05bef
2022-04-05 10:43:19 +02:00
SpiritCroc
c1149858c4 Different app icon background for debug builds
Change-Id: I58d40b5862f933a15cb1859f7755d8c5ce32007a
2022-04-04 12:44:42 +02:00
SpiritCroc
1894bb0b11 Update ViewPager debugging
Change-Id: I12cf51829abf0722bcc527ab6004a5378aac7cee
2022-04-04 10:12:33 +02:00
SpiritCroc
1287770b16 Add some optional ViewPager debugging
Change-Id: I30332b57779e1093d06d2d7a07bca0ca5342de15
2022-04-03 13:29:16 +02:00
SpiritCroc
45613792bf Avoid loading pager before pages known
Change-Id: I427e3e5ef9a27004b7b5f5e4eb6a2f45f8141c50
2022-03-31 11:05:33 +02:00
SpiritCroc
36c290f112 Persist selected space on home fragment pause
Change-Id: Ib7771d83c0adb7a9e228261a55bac2f1de0f118f
2022-03-31 10:46:38 +02:00
SpiritCroc
ca31577858 Merge remote-tracking branch 'weblate/sc' into sc
Change-Id: I1435cde28140a7f98751bcafe0005078d29dc100
2022-03-31 09:21:29 +02:00
SpiritCroc
a9bace959b increment_version.sh: fix some "Update codebase" cases
Change-Id: I294c4818345dd062013847ab98b0cb0e296560ac
2022-03-31 09:21:15 +02:00
SpiritCroc
e21f9443d5 ViewPager: never react to own space-changes
Change-Id: I45a1fd1e9ec6048dffdc4d54e8022d53afc627ff
2022-03-31 09:14:53 +02:00
SpiritCroc
f50b21d9b7 Do not clear unread counts when fetching room members
This messes with our "open without reading" functionality.

Change-Id: Ie1bf84aa79b3bc0c18efd7325f817aa227b8e748
2022-03-31 08:37:40 +02:00
SpiritCroc
128b532b51 [merge] Fix presence indicator color for SC default accent
Change-Id: I484051c41f59f4d613849ae45592b6201b151f38
2022-03-31 08:09:33 +02:00
J. Lavoie
5c6dfbba32 Translated using Weblate (French)
Currently translated at 71.4% (105 of 147 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/fr/
2022-03-30 17:46:18 +02:00
Linerly
4f1f4a8ec7 Translated using Weblate (Indonesian)
Currently translated at 100.0% (147 of 147 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/id/
2022-03-30 17:46:18 +02:00
waclaw66
2baf58d3f1 Translated using Weblate (Czech)
Currently translated at 100.0% (147 of 147 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/cs/
2022-03-30 17:46:18 +02:00
Colin Xu
1fdf38268d Translated using Weblate (Chinese (Simplified))
Currently translated at 89.9% (125 of 139 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/zh_Hans/
2022-03-30 17:46:17 +02:00
SpiritCroc
972fd9f31a Also give up loading event for M_FORBIDDEN
Change-Id: Ic21821df4a341257dca99149141855a34edc5101
2022-03-30 17:41:08 +02:00
SpiritCroc
886cd253ec [merge] Revert back to old section header
Change-Id: Id7a4a9b31a02acbabff028d8d684e3d02dc1c1ec
2022-03-30 17:07:24 +02:00
SpiritCroc
cb3658859e Improve unread line color on light theme
Change-Id: I3b4c54354555433fd9b3e6a53ff8440c8c05f359
2022-03-30 16:40:41 +02:00
SpiritCroc
126dfd7ded Revert "change selected space highlight"
This reverts commit 33246be2a5.
2022-03-30 16:34:50 +02:00
SpiritCroc
997f93dd3a Automatic SchildiChat string correction
Change-Id: I73a591e02f0f08ee1961f066751f4fc1b4b3a343
2022-03-30 15:53:53 +02:00
SpiritCroc
3322a6fde6 Automatic upstream merge postprocessing
Change-Id: I2d763d8cb40866f8cf8b21a1750bf487f291c90f
2022-03-30 15:53:52 +02:00
SpiritCroc
dd0897d6e4 Automatic color correction
Change-Id: I3d2b339669ab717bf5e3a08cfcdfc46762838667
2022-03-30 15:53:52 +02:00
SpiritCroc
d5d555d07f Merge tag 'v1.4.8' into merge-v1.4.8
Change-Id: Ic6338fef4f27ca95016eb11ab07a10d3f3a8986e

Conflicts:
	library/ui-styles/src/main/res/values/dimens.xml
	library/ui-styles/src/main/res/values/styles_buttons.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomSummaryConstants.kt
	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/session/room/summary/RoomSummaryUpdater.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/LoadTimelineStrategy.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	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/item/AbsMessageItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayout.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/view/MessageBubbleView.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomCategoryItem.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/RoomListSectionBuilderSpace.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomsSection.kt
	vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
	vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsViewState.kt
	vector/src/main/res/drawable/ic_home_bottom_catchup.xml
	vector/src/main/res/drawable/ic_shield_custom.xml
	vector/src/main/res/drawable/ic_shield_trusted.xml
	vector/src/main/res/drawable/ic_shield_trusted_no_border.xml
	vector/src/main/res/layout/fragment_ftue_account_created.xml
	vector/src/main/res/layout/fragment_timeline.xml
	vector/src/main/res/layout/item_timeline_event_code_block_stub.xml
	vector/src/main/res/layout/view_attachment_type_selector.xml
	vector/src/main/res/layout/view_room_detail_toolbar.xml
	vector/src/main/res/menu/menu_submit.xml
2022-03-30 15:53:51 +02:00
SpiritCroc
a6c3ae3bb0 [TMP] Automatic upstream merge preparation
Change-Id: I5c089c587d4c19472de02cb3f704736c9461430d
2022-03-30 14:57:34 +02:00
SpiritCroc
cefb0539bf Automatic revert to unchanged upstream strings, pt.1
Change-Id: I56dd0cb49f394d099f71048f7e93b85bc9d35da1
2022-03-30 14:57:34 +02:00
SpiritCroc
59ae8f521b Fix media player play icon color
Change-Id: Ie858123cedbf22129b9e465a90c30147e8bd2314
2022-03-30 14:55:40 +02:00
SpiritCroc
39c5cb2280 Load timeline without initial eventId if not found
Change-Id: Ifab011c7730ddd9eeeef89451dda48b3fcec341b
2022-03-29 13:08:49 +02:00
ganfra
d589758b7b Merge branch 'hotfix/1.4.8' into main 2022-03-28 13:37:42 +02:00
ganfra
9bf54a3750 Update changes 2022-03-28 13:36:17 +02:00
Adam Brown
e01c5049f6 updating version to 1.4.8 2022-03-28 09:46:26 +01:00
Adam Brown
f5d2ba39f4 moving the live location sharing permission debug only to unblock releases whilst the feature is WIP 2022-03-25 15:07:06 +00:00
ganfra
9ec684f438 Merge branch 'hotfix/1.4.7' into main 2022-03-24 19:33:44 +01:00
ganfra
60ecfd4fc2 Update changes 2022-03-24 19:31:29 +01:00
ganfra
8bcc2f5b0c Fix formating 2022-03-24 19:07:44 +01:00
ganfra
04b136e3e4 RoomList: more fixes on count 2022-03-24 18:50:33 +01:00
ganfra
87438085c6 RoomList: fix count not showing if not collapsable 2022-03-24 18:49:57 +01:00
ganfra
81aa42a8e8
Merge pull request #5616 from vector-im/hotfix/fre/collapse_rooms_section
Fix rooms section collapsing
2022-03-24 16:04:16 +01:00
Florian Renaud
3c73ccce7b Add changelog entry 2022-03-24 15:46:16 +01:00
Florian Renaud
1ef1bd81bc Improve room section collapsing 2022-03-24 15:46:16 +01:00
Florian Renaud
a97d3eae7e Pass lambda to updateSection method 2022-03-24 15:46:16 +01:00
Florian Renaud
a362d5427d Fix arrow visibility on section header 2022-03-24 15:46:16 +01:00