filippodb/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-11 17:16:10 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,335 Commits 7 Branches 122 Tags 228 MiB
ae87068cd8
Commit Graph

22335 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SpiritCroc
ae87068cd8 [TMP] Automatic upstream merge preparation 
Change-Id: Icc696ad9418ffafd7271139471cae7e7d7b601cd
 2022-12-07 14:36:18 +01:00
SpiritCroc
bf80489905 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I215f83dab2252490aba0aba425bf5e19fcd0d392
 2022-12-07 14:36:17 +01:00
SpiritCroc
51093ec8ac [merge] Bring back composer divider where it used to be 
Change-Id: I74ee80cf8860917d6fdf5efe545c1ad75e7c1059
 2022-12-04 17:47:29 +01:00
SpiritCroc
c1fce98bf1 Fix reply fade effect for some colored bubble themes 
Change-Id: I3fb7fa2045c8c944d6bb5d0f55f28b00e655c4b2
 2022-12-04 13:36:58 +01:00
SpiritCroc
1d62cd09d2 Add setting to disable member click to mention 
Change-Id: I2d6660baaa31f74fd0217262bf887da16a61c9b3
 2022-12-04 13:22:32 +01:00
SpiritCroc
8e97b7c79d Render images in replies 
Change-Id: Ia0678184c42a2a01f2e1e65ccd8287bbd71c8c80
 2022-12-04 13:17:45 +01:00
SpiritCroc
048e1edb54 Make long press on reply do same action as long press on message 
Change-Id: Icfc101e8233ba55d5e95b47dfb2530faadea56df
 2022-12-04 12:13:54 +01:00
SpiritCroc
32d076cbdf Fix useless rich replies crash 
Change-Id: I40103d9cb91365c421b411ce35a3b1e12f00ce00
 2022-12-04 12:04:40 +01:00
SpiritCroc
0e2de3eadb merge_helpers.sh: Fix downstream_latest_tag if sc_v and sc_last are identical 
Change-Id: I750b4ce873229de098988c5dbf94e0cfe6a57b82
 2022-12-03 17:17:06 +01:00
SpiritCroc
7ffa6214a4 Hide reply-fallback from reply preview 
Change-Id: I368f80cec1a94ea4b5551cd41d89e096ae5286cd
 2022-12-03 16:05:16 +01:00
SpiritCroc
5aa3a4a764 Re-generate icons 
Change-Id: I25836945ef12e1ebd2059983988e4ed44cd3d8d4
 2022-12-03 15:44:11 +01:00
SpiritCroc
2f238efde0 Merge remote-tracking branch 'NathanC/themable-icons' into merge-v1.5.10 
Change-Id: I4abbebfb8f4a322f4a5942a148b6c16a879a4044
 2022-12-03 15:38:45 +01:00
SpiritCroc
dedcfe5ebf [merge] Fix voice recording arrow offset 
Change-Id: I968fe08ec4990eb12cf42048147657c66872143c
 2022-12-03 15:38:10 +01:00
SpiritCroc
2526bb168d Add composer-related developer quick settings 
Change-Id: I3d8bd7b38b8ac84f77d84998433d40894b28ea3d
 2022-12-03 15:15:56 +01:00
SpiritCroc
7e4b08155e Clear composer text when canceling message edit 
Change-Id: Ib1641b55ef6c214a15523c7045e5f20885db84e6
 2022-12-03 11:40:17 +01:00
SpiritCroc
6532a4e999 Automatic SchildiChat string correction 
Change-Id: I7050cbfabbba67d40681cfd0f663c2a4196f4ddb
 2022-12-03 11:33:26 +01:00
SpiritCroc
541c6ec25b Automatic upstream merge postprocessing 
Change-Id: Ie35d8041388e6a08ff9e1f2672711e2c81c7bd5e
 2022-12-03 11:33:25 +01:00
SpiritCroc
71eca44f4f [merge] Re-implement Schildi plain composer layout 
Change-Id: Ie51df42a34c1ac265748658155d578d6d4debd7c
 2022-12-03 11:33:18 +01:00
Nathan
86f39e52e7 Adds in source SVGs for monochrome icons 2022-12-03 01:40:05 -08:00
Nathan
f32e491c72 Adds in themable icon, with beta variant 2022-12-02 23:57:57 -08:00
SpiritCroc
65be0039a5 Merge tag 'v1.5.10' into merge-v1.5.10 
TODO: re-implement our composer constraint changes

Conflicts:
	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/database/query/ReadQueries.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/room/read/SetReadMarkersTask.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/core/session/ConfigureAndStartSessionUseCase.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/TimelineViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerAction.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/PlainTextComposerLayout.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/RichTextComposerLayout.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageViews.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/action/CheckIfCanReplyEventUseCase.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/ReadReceiptsItemFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
	vector/src/main/res/drawable/ic_voice_mic_recording.xml
	vector/src/main/res/layout/composer_layout.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/composer_rich_text_layout_constraint_set_compact.xml
	vector/src/main/res/layout/composer_rich_text_layout_constraint_set_expanded.xml
	vector/src/main/res/layout/composer_rich_text_layout_constraint_set_fullscreen.xml
	vector/src/main/res/layout/fragment_timeline.xml
	vector/src/main/res/layout/view_voice_message_recorder.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
	vector/src/test/java/im/vector/app/core/session/ConfigureAndStartSessionUseCaseTest.kt

Change-Id: I55e95d86b4bb019544d75dcb653afe05194cd224
 2022-12-02 22:03:17 +01:00
SpiritCroc
abc5ed5dc4 [TMP] Automatic upstream merge preparation 
Change-Id: I594a94fa28d863107f24a5f8592e48b330f21c48
 2022-11-30 11:35:29 +01:00
SpiritCroc
1b6d04b6c5 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I98e36bdf3d3daee932b62070de325fb320df5601
 2022-11-30 11:35:28 +01:00
Benoit Marty
8c111fea13 Merge branch 'release/1.5.10' into main 2022-11-30 10:59:49 +01:00
Benoit Marty
0844310e57 Merge branch 'release/1.5.10' into main 2022-11-30 10:51:55 +01:00
Benoit Marty
a656b00329 Adding fastlane file for version 1.5.10 2022-11-30 10:50:06 +01:00
Benoit Marty
d447d809f7 Changelog for version 1.5.10 2022-11-30 10:46:58 +01:00
Benoit Marty
eb7154d42c Remove the obsolete description of the attribute. 2022-11-30 10:25:21 +01:00
Benoit Marty
b0029f2dd3 Release script: Check if git flow is enabled 2022-11-30 10:07:55 +01:00
Benoit Marty
93a34d953f Release script: Fix script error 2022-11-30 10:07:49 +01:00
jonnyandrew
31a1b09e34
[Rich text editor] Fix design and spacing of rich text editor (#7658) 
Improve design and spacing of the rich text editor.

Minor changes to
 - position of input field relative to buttons
 - spacing around attachments button
 - spacing around send button
 - selectable backgrounds
 2022-11-30 09:00:37 +00:00
Florian Renaud
4b3e36da91
Merge pull request #7656 from vector-im/feature/fre/voice_broadcast_room_attachments 
[Voice Broadcast] Remove chunks from the room attachments
 2022-11-29 17:43:42 +01:00
Florian Renaud
5560694f54
Merge pull request #7655 from vector-im/feature/fre/voice_broadcast_buffering 
[Voice Broadcast] Update buffering display and improve playback
 2022-11-29 17:43:21 +01:00
Florian Renaud
1415504f84 Rename view ids 2022-11-29 14:32:05 +01:00
Florian Renaud
42b3ecc0b6 Fix pause/resume playback not working correctly 2022-11-29 14:13:46 +01:00
Benoit Marty
537331ccf6
Merge pull request #7488 from kinote/feat-2725-optional-direct-share 
Add setting to allow disabling direct share
 2022-11-29 11:19:44 +01:00
Florian Renaud
6bdf237cc9 Fix playback not in buffering if waiting for new chunks 2022-11-29 10:54:31 +01:00
Florian Renaud
9ab2d1afb0 Fix thumb cropped 2022-11-29 10:50:31 +01:00
Florian Renaud
559af32ab6
Merge pull request #7646 from vector-im/bugfix/fre/fix_playback_stuck_in_buffering 
Voice Broadcast - Fix playback stuck in buffering
 2022-11-29 09:59:08 +01:00
Florian Renaud
d6fd32b5a0
Merge pull request #7629 from vector-im/feature/fre/voice_broadcast_handle_event_deletion 
Voice Broadcast - Handle event deletion when listening or recording
 2022-11-29 09:51:11 +01:00
SpiritCroc
39aff9f2cd Increment version 
Change-Id: I456b2fbb19de339bfeac941b42da1aaabab411f8
 2022-11-29 09:27:11 +01:00
SpiritCroc
c8c82d40dd merge_helpers.sh: Fix downstream_latest_tag after introducing sc_last 
Change-Id: I558633e54c445770ef9d99ce42286f208edbb15d
 2022-11-29 09:19:15 +01:00
waclaw66
9c2dcb9233 Translated using Weblate (Czech) 
Currently translated at 100.0% (159 of 159 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/cs/
 2022-11-29 09:14:48 +01:00
Florian Renaud
f8881638f9 Changelog 2022-11-29 01:49:50 +01:00
Florian Renaud
471bf853c8 Remove voice broadcast chunks from the room attachments list 2022-11-29 01:41:31 +01:00
Florian Renaud
7b4c165033 Changelog 2022-11-29 01:22:39 +01:00
Florian Renaud
9458276a4e Change seekBar and duration colors to secondary 2022-11-29 01:12:18 +01:00
Florian Renaud
0dbbfab97d Remove seekBar padding 2022-11-29 01:12:18 +01:00
Florian Renaud
12a86e7d29 Reduce tiles padding 2022-11-29 01:12:18 +01:00
Florian Renaud
912de8286f Move buffering view in tile header 2022-11-29 01:12:18 +01:00