Commit Graph

10579 Commits

Author SHA1 Message Date
SpiritCroc b58f9cedbd increment_version.sh: Exclude more merge commits from changelog
Change-Id: Iaaeccb73d0c4b0256b4c7211c3153a639a77eaf7
2021-08-02 13:59:41 +02:00
SpiritCroc 2db315219a Lab setting to load rooms at first unread message
Change-Id: I781e5a32d8557939c51387eadf1387cba0d3b149
2021-08-02 13:57:54 +02:00
SpiritCroc 401424ff96 Scroll to top of messages again
We want to specify where to scroll to from the top of the message rather
than the bottom. To do this in a recycler view that's filled from the
bottom, let's just target the event above and move that out by 2/3 of
the screen.

Change-Id: Ica8ec2d0aaa22b654232f128992510c9d550fe35
2021-08-02 11:07:42 +02:00
SpiritCroc 3af5e6ea76 Missed scrollToPosition() -> scrollToPositionWithOffset()
This should make the scroll position more reliable.

Change-Id: Ideba69e14f122d0f93a6edad8d27612f7bc45f59
2021-08-02 10:01:33 +02:00
Nikita Epifanov 04e4ad0d6e Translated using Weblate (Russian)
Currently translated at 100.0% (85 of 85 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/ru/
2021-08-01 12:26:01 +02:00
SpiritCroc ab1fcaca62 Scroll to linked message: better control the final scroll position
With scrollToPosition(), the layout will only scroll such that the view
is visible *somewhere* on the screen. Defining a precise offset where to
show it is better, so the user can expect where the message will show
up.

Change-Id: Idd25a062c4be8f45ba804e442d63409f279f2a76
2021-08-01 12:22:27 +02:00
SpiritCroc 6c9c2eaef5 Fix scrolling to bottom if it's not far and it wasn't at bottom initially
Change-Id: Ifaf2395140d30b456acd9130bd058ed573888423
2021-08-01 12:11:58 +02:00
SpiritCroc 6399e71e25 [merge-features] Fix and properly style voice message recording for SC
Change-Id: Iba97f334b07e0fa1f4a4cc8fc92c97e53d919dd4
2021-08-01 11:42:17 +02:00
SpiritCroc 3959a838d1 [merge-features] Fix voice messsage bubble layout + SC themes
Change-Id: Idd2dddc8c8f6333ca90fa5411c69e084e3a4cdcf
2021-08-01 10:31:17 +02:00
SpiritCroc 899168e84c increment_version.sh: Exclude merge-specific changes from changelog
Change-Id: I8ec4f78b129efc63613f3881975f9738ac463eb6
2021-08-01 09:39:49 +02:00
SpiritCroc 3cb509c58a Automatic SchildiChat string correction
Change-Id: I9c40b43cf33abd696d421bdafd77db159eeb6545
2021-08-01 09:37:47 +02:00
SpiritCroc 9b9964e506 Automatic upstream merge postprocessing
Change-Id: I5e4bd152529574c753fb2dd8b39ceafb8638ed02
2021-08-01 09:37:46 +02:00
SpiritCroc 25ba52115b Merge tag 'v1.1.15' into sc
Change-Id: I6bc7a7c052ccaae6adec247889b37baac2672ba4

Conflicts:
	vector/src/main/assets/open_source_licenses.html
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
	vector/src/main/res/drawable/ic_insert_emoji.xml
	vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
	vector/src/main/res/layout/fragment_room_detail.xml
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/xml/vector_settings_labs.xml
2021-08-01 09:37:33 +02:00
SpiritCroc c3f3e13d26 [TMP] Automatic upstream merge preparation
Change-Id: I980573f83c23136057e6cf47093567d89a023458
2021-07-30 18:33:30 +02:00
SpiritCroc 26b1a478f0 Automatic revert to unchanged upstream strings, pt.1
Change-Id: Ieaa970a813aa29bdc792add82c43f73062262056
2021-07-30 18:33:30 +02:00
Onuray Sahin 53568f1477 Merge branch 'develop' into main
* develop: (127 commits)
  fastlane changelog added.
  Changelog added.
  Fix lint error.
  Translated using Weblate (Slovenian)
  Lint fixes.
  cleanup
  Update initial recording state to restore from background.
  Hide mic if there is a draft message.
  Migration to cleanup orphan TrustLevelEntities
  Design review fixes.
  Better algorithm to update user devices Should fix the problem of too many TrustLevelEntity objects
  Small optimization
  Translated using Weblate (Chinese (Traditional))
  Translated using Weblate (Italian)
  Translated using Weblate (Hungarian)
  Translated using Weblate (Hungarian)
  Fix wording when verification is cancelled.
  Design review fixes.
  Do not check the baseURL to override if it is the same than the one previously known and used
  Translated using Weblate (Portuguese (Brazil))
  ...
2021-07-30 17:55:56 +03:00
Onuray Sahin 3900a3ef33 fastlane changelog added. 2021-07-30 17:44:09 +03:00
Onuray Sahin e7d9ffc992 Changelog added. 2021-07-30 17:35:04 +03:00
Onuray Sahin c6bd6e4961
Merge pull request #3598 from vector-im/feature/ons/voice_message
Voice Message
2021-07-30 17:24:17 +03:00
Onuray Sahin 8e28872c9f Fix lint error. 2021-07-30 17:17:55 +03:00
Onuray Sahin 10bd1006e1
Merge pull request #3762 from RiotTranslateBot/weblate-element-android-element-app
Translations update from Weblate
2021-07-30 17:14:32 +03:00
Weblate 7e79473df5 Merge branch 'origin/develop' into Weblate. 2021-07-30 12:37:18 +00:00
Vojko Rajh d4d43f228c Translated using Weblate (Slovenian)
Currently translated at 1.0% (27 of 2518 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sl/
2021-07-30 12:36:56 +00:00
Onuray Sahin 1aa706dee5 Lint fixes. 2021-07-30 15:25:02 +03:00
Benoit Marty 7cd90b0b14
Merge pull request #3760 from vector-im/feature/bma/otk1
2 small fixes
2021-07-30 12:55:57 +02:00
Benoit Marty 25f25b0e95
Merge pull request #3757 from vector-im/feature/bma/trustLevelEntity
Cleanup TrustLevelEntity
2021-07-30 11:01:01 +02:00
Benoit Marty 57f3a2437e cleanup 2021-07-30 10:59:46 +02:00
Onuray Sahin cfe64eed2a Update initial recording state to restore from background. 2021-07-30 11:27:14 +03:00
Onuray Sahin e945b8911c Hide mic if there is a draft message. 2021-07-30 11:14:29 +03:00
Benoit Marty 54f707644c Migration to cleanup orphan TrustLevelEntities 2021-07-29 17:42:55 +02:00
Onuray Sahin cdd2fca258 Design review fixes. 2021-07-29 18:41:29 +03:00
Benoit Marty b4e7f10019 Better algorithm to update user devices
Should fix the problem of too many TrustLevelEntity objects
2021-07-29 16:46:09 +02:00
Benoit Marty 5eb794f8af Small optimization 2021-07-29 15:39:03 +02:00
Jeff Huang ec87faa24b Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (24 of 24 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
2021-07-28 21:25:13 +00:00
random fd0a6746bd Translated using Weblate (Italian)
Currently translated at 100.0% (24 of 24 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/it/
2021-07-28 21:25:12 +00:00
Szimszon 6cb10b0e9f Translated using Weblate (Hungarian)
Currently translated at 100.0% (24 of 24 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/hu/
2021-07-28 21:25:12 +00:00
Szimszon 5afc689bcf Translated using Weblate (Hungarian)
Currently translated at 100.0% (2518 of 2518 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/hu/
2021-07-28 21:25:11 +00:00
Benoit Marty a7e3c0d0d8 Fix wording when verification is cancelled. 2021-07-27 17:31:19 +02:00
Benoit Marty 00911a7f7e
Merge pull request #3681 from vector-im/feature/dla/fix_account_notifications_discrepancies
Fixes Changing Account Settings > Notifications > Advanced Notifications on android causes discrepancies with web
2021-07-27 15:14:35 +02:00
SpiritCroc 782141998d Increment version
Change-Id: I710e0f58cc1fef70e5bc199ab4effb607ad321db
2021-07-27 14:53:48 +02:00
SpiritCroc 1a1d19cf20 Merge remote-tracking branch 'weblate/sc' into sc
Change-Id: Iad04e36677b9ba654be82632cb63f94dd35f435a
2021-07-27 14:52:39 +02:00
waclaw66 e69011835e Translated using Weblate (Czech)
Currently translated at 77.6% (66 of 85 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/cs/
2021-07-27 14:52:38 +02:00
SpiritCroc a8f1391c47 Fix fastlane
Change-Id: If9f02ea28f6377c6fa218e9ac024469ceab5ad61
2021-07-27 14:47:05 +02:00
Onuray Sahin 4c8a8d8cfb Design review fixes. 2021-07-27 15:32:35 +03:00
Benoit Marty 4caf333769 Do not check the baseURL to override if it is the same than the one previously known and used 2021-07-27 09:59:01 +02:00
David Langley 9c139b3bd0 Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/fix_account_notifications_discrepancies 2021-07-26 22:55:27 +01:00
lvre 5f148eb478 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (24 of 24 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/pt_BR/
2021-07-26 20:25:11 +00:00
Lukas Novotny 40c951d114 Translated using Weblate (Czech)
Currently translated at 100.0% (24 of 24 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/
2021-07-26 20:25:10 +00:00
Priit Jõerüüt 07ad907db4 Translated using Weblate (Estonian)
Currently translated at 100.0% (24 of 24 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/et/
2021-07-26 20:25:10 +00:00
Priit Jõerüüt f123db398e Translated using Weblate (Estonian)
Currently translated at 100.0% (2518 of 2518 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
2021-07-26 20:25:09 +00:00