filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,433 Commits 6 Branches 120 Tags 228 MiB
Commit Graph

8433 Commits

Author SHA1 Message Date
SpiritCroc 61e9bfce5b pre_merge.sh: Fix when last merge was not tagged 
Change-Id: Ib48f8369884a13b7556bb0c3a70c367a940028c9
 2021-04-09 11:55:15 +02:00
SpiritCroc 8f378aafea Jump to recent button: accent color like FAB in chat overview 
Change-Id: Ie0bef66add3b329d0c0624be825d4c49797b7534
 2021-03-16 10:26:11 +01:00
SpiritCroc fa8fac6bca Remove time location setting, always use bottom if possible 
Issues with dual-side bubbles with top time:
- Not well tested, extra complexity, extra maintenance hassle
- Media: no send time without footer
- Media: currently showing empty footer shade
- Adding further footer items would need extra handling
 2021-03-14 11:44:20 +01:00
SpiritCroc 507a9575fc Fix Element's send state alignment in SC's layout 2021-03-14 11:34:17 +01:00
SpiritCroc a64429fcb6 Content in bubbles -> don't show element send state (we have SC one) 2021-03-14 11:34:17 +01:00
SpiritCroc ead1258e2a Automatic SchildiChat string correction 2021-03-14 11:33:56 +01:00
SpiritCroc f06162f1a8 correct_strings.sh: matrix-sdk strings were deleted 2021-03-14 11:06:25 +01:00
SpiritCroc bfb7fe5938 Automatic upstream merge postprocessing 2021-03-14 10:59:10 +01:00
SpiritCroc 5120b8c148 Automatic color correction 2021-03-14 10:59:10 +01:00
SpiritCroc 699ad4eaeb Merge tag 'v1.1.1' into sc 
Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.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/AbsMessageItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageFileItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageInformationData.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
	vector/src/main/res/drawable/rounded_rect_shape.xml
	vector/src/main/res/menu/menu_timeline.xml
	vector/src/main/res/values/array.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
 2021-03-14 10:58:57 +01:00
SpiritCroc 1aed52e291 [TMP] Automatic upstream merge preparation 2021-03-14 10:13:06 +01:00
SpiritCroc 2e74a87e4c Automatic revert to unchanged upstream strings, pt.1 2021-03-14 10:13:06 +01:00
Benoit Marty bc81931773 Merge branch 'release/1.1.1' 2021-03-10 22:04:26 +01:00
Benoit Marty ac02d1d48a Prepare release 1.1.1 2021-03-10 22:03:57 +01:00
Benoit Marty 77772f01c1
Merge pull request #2981 from vector-im/feature/bma/wl 
WL mistake
 2021-03-10 21:57:33 +01:00
Benoit Marty 8c24dd0fba Add entry in changelog 2021-03-10 21:55:59 +01:00
Benoit Marty c6828a8612 Fix issue with Locale folder. 
Hoping Weblate will eat that correctly.
 2021-03-10 21:54:11 +01:00
Benoit Marty c5a4c805b5 Fix lint error 2021-03-10 21:54:11 +01:00
Benoit Marty 8a1a90d1b9
Merge pull request #2937 from vector-im/feature/ons/message_states 
Improve the status of send messages
 2021-03-10 21:51:48 +01:00
ganfra ea21892d03 Message state: fix and clean code after Benoits review 2021-03-10 19:32:50 +01:00
Benoit Marty 2536452220
Merge pull request #2964 from vector-im/matthew/zh 
rename zh-Hans and zh-Hant - TO BE MERGED DURING WEBLATE SYNC
 2021-03-10 18:32:22 +01:00
Benoit Marty 730869a37a
Merge pull request #2980 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2021-03-10 18:27:06 +01:00
ganfra 6c8e2f1fd6 Message state: allow edit and copy when failed 2021-03-10 18:10:03 +01:00
ganfra bbb5dd06a2 Message state: adjust some ui 2021-03-10 18:08:18 +01:00
ganfra fad4140924 Message states: makes sure the actions bottom sheet is updated with synced event 2021-03-10 17:56:48 +01:00
Benoit Marty 944ee1d8c1
Merge pull request #2979 from vector-im/feature/bma/quick_fixes 
Fixes before the release
 2021-03-10 17:21:06 +01:00
Benoit Marty edb31ddec0 Cleanup 2021-03-10 17:20:51 +01:00
Weblate cf251c38fd Merge branch 'origin/develop' into Weblate. 2021-03-10 15:38:07 +00:00
Hivaa 38f2c4c43d Translated using Weblate (Persian) 
Currently translated at 100.0% (2351 of 2351 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
 2021-03-10 15:38:00 +00:00
Benoit Marty 5c07a5780c Better with horizontal progress bar 2021-03-10 15:38:29 +01:00
Benoit Marty 5aa8b0255a Fix MainActivity display (Fixes #2927) 2021-03-10 15:34:28 +01:00
Benoit Marty 8356d18a67 Improve Snackbar duration (Fixes #2929) 2021-03-10 14:49:52 +01:00
Ihor Hordiichuk f7abda5d1f Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (12 of 12 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/uk/
 2021-03-10 11:29:18 +00:00
@a2sc:matrix.org b373957b6b Translated using Weblate (German) 
Currently translated at 100.0% (12 of 12 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/de/
 2021-03-10 11:29:18 +00:00
LinAGKar 8b867086aa Translated using Weblate (Swedish) 
Currently translated at 100.0% (2351 of 2351 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
 2021-03-10 11:29:17 +00:00
Thibault Martin 660129e690 Translated using Weblate (French) 
Currently translated at 100.0% (2351 of 2351 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2021-03-10 11:29:15 +00:00
@a2sc:matrix.org 0ae9abd6ad Translated using Weblate (German) 
Currently translated at 99.8% (2348 of 2351 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2021-03-10 11:29:02 +00:00
waclaw66 0ad1e46b0b Translated using Weblate (Czech) 
Currently translated at 100.0% (2351 of 2351 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
 2021-03-10 11:28:59 +00:00
Zet e51b3bd399 Translated using Weblate (Arabic) 
Currently translated at 38.8% (913 of 2351 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ar/
 2021-03-10 11:28:58 +00:00
Benoit Marty fa40667633 Restore BottomSheet for event not sent. 
Move the confirmation dialog when the action is selected from the bottom sheet.
 2021-03-10 11:10:23 +01:00
ganfra 6977ee45da Timeline: force a build if decoration is SENT 2021-03-10 11:10:23 +01:00
Benoit Marty c9c4a203d1 Code quality 2021-03-10 11:10:23 +01:00
Benoit Marty 47f7c91a3b Fix issue in e2e rooms. 2021-03-10 11:10:23 +01:00
Benoit Marty b7c0951cbe Speed up sent state display for local echo 2021-03-10 11:10:23 +01:00
Benoit Marty 3ca25f9006 Some cleanup 2021-03-10 11:10:23 +01:00
Onuray Sahin f64086a25f Do not show different text color for sending state. 2021-03-10 11:10:23 +01:00
Onuray Sahin ab304b0b9f Do not decorate local echos as sent. 2021-03-10 11:10:23 +01:00
Onuray Sahin f5f16fd330 Retry and delete options added for all failed messages. 2021-03-10 11:10:23 +01:00
Onuray Sahin a3d45bbba8 Failed messages bottom sheet UI fixes. 2021-03-10 11:10:23 +01:00
Onuray Sahin 9eedac3e6d Fix color of sending media progress bar. 2021-03-10 11:10:23 +01:00