mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-24 18:35:40 +03:00
Code Issues Projects Releases Packages Wiki Activity
14572 commits 161 branches 158 tags 270 MiB
Commit graph

9162 commits

Author SHA1 Message Date
ericdecanini
82cde166db Merge remote-tracking branch 'origin/develop' into feature/eric/audio-files-player 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageHelper.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/factory/MessageItemFactory.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt
 2022-03-24 20:32:28 +01:00
Adam Brown
e7a1c20132 handling the username in use as a username field error 2022-03-23 17:29:06 +00:00
Adam Brown
5aa35899bc extracting error cases to extensions and handles invalid username as a specific case 2022-03-23 17:29:06 +00:00
Adam Brown
373385b29f moving the not accepting registration error handling to the login fragment 2022-03-23 17:29:06 +00:00
Adam Brown
11cc284bcc reusing showFailure from the base fragment instead of resubscribing to the view events 2022-03-23 17:29:05 +00:00
Adam Brown
7d80cfed0b replacing async reset password,mail and homeserver requests with shared isLoading with error view events 2022-03-23 17:25:10 +00:00
Adam Brown
2227df479c replacing async login/register state with separate failure view event and shared isLoading 2022-03-23 17:20:47 +00:00
Adam Brown
e3df9c4cef using isLoading boolean instead of stateless async result for the display name and profile picture updates 2022-03-23 16:48:07 +00:00
ganfra
adf2c642da Update versions to 1.4.8 2022-03-23 16:27:36 +01:00
ganfra
8d4830975d Merge tag '1.4.6' into develop 
v1.4.6
 2022-03-23 16:24:02 +01:00
ganfra
55b1a60f96 Revert "Do not suggest collapse if there is only one section" 
This reverts commit 6787980185.
 2022-03-23 16:09:05 +01:00
Adam Brown
55b946a019 fixing the onboarding sanity test failing 
- adds tapping the new take me home button within the sanity test
 2022-03-23 12:57:53 +01:00
Onuray Sahin
7ead3f93f4 Remove exhaustive. 2022-03-23 13:52:53 +03:00
Onuray Sahin
c478503c13 Merge branch 'develop' into feature/ons/voice_message_scrubbing 
* develop: (429 commits)
  fixing the onboarding sanity test failing - adds tapping the new take me home button within the sanity test
  Fix lint issues on weblate sync
  fixing view model tests not collecting flow results - the switch from runBlockingTest to runTest means we need to provide a separate scope from the test in order to asynchronously collect the flow results
  Do not suggest collapse if there is only one section
  Translated using Weblate (Spanish)
  Translated using Weblate (Spanish)
  runBlocking -> runTest https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md
  runBlockingTest -> runTest https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md
  Small cleanup
  The `.exhaustive` trick is not needed anymore in Kotlin 1.6.0 https://kotlinlang.org/docs/whatsnew16.html#stable-exhaustive-when-statements-for-enum-sealed-and-boolean-subjects
  Also upgrade the coroutine lib
  Fix compilation warning (exhaustive when)
  Fix compilation warning (exhaustive when)
  Format file (no other change)
  Fix compilation warning (exhaustive when)
  Bump moshi from 1.12.0 to 1.13.0
  Bump kotlin-gradle-plugin from 1.5.31 to 1.6.0
  fixing presence icon anchoring to the middle of the room icon - creates a secondary verification shield and aligns to the start of the room title when presence is present
  PR remarks
  Increase the thread summaries limit
  ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt
 2022-03-23 13:32:36 +03:00
ganfra
20b2af4432
Merge pull request #5610 from vector-im/feature/adm/account-creation-sanity-test-update 
Sanity test getting stuck on account created screen
 2022-03-23 11:03:46 +01:00
Benoit Marty
c6fe084507
Merge pull request #4471 from vector-im/dependabot/gradle/org.jetbrains.kotlin-kotlin-gradle-plugin-1.6.0 
Bump kotlin-gradle-plugin from 1.5.31 to 1.6.0 - BLOCKED
 2022-03-23 10:08:53 +01:00
Adam Brown
5bbc9dc102 fixing the onboarding sanity test failing 
- adds tapping the new take me home button within the sanity test
 2022-03-23 09:02:37 +00:00
ganfra
c06c9ea1d6 Fix lint issues on weblate sync 2022-03-22 18:55:34 +01:00
ganfra
3d3f5444b1
Merge pull request #5606 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2022-03-22 18:11:28 +01:00
Adam Brown
fdf3cc36ce fixing view model tests not collecting flow results 
- the switch from runBlockingTest to runTest means we need to provide a separate scope from the test in order to asynchronously collect the flow results
 2022-03-22 17:01:34 +00:00
ClaireG
6787980185
Do not suggest collapse if there is only one section 2022-03-22 17:31:21 +01:00
Weblate
095f06bd89 Merge branch 'origin/develop' into Weblate. 2022-03-22 15:59:34 +00:00
iaiz
8550db9f23 Translated using Weblate (Spanish) 
Currently translated at 95.7% (2065 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/es/
 2022-03-22 15:58:54 +00:00
Benoit Marty
012cdf4b4d runBlocking -> runTest 
https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md
 2022-03-22 16:52:18 +01:00
Benoit Marty
86829008c3 runBlockingTest -> runTest 
https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md
 2022-03-22 16:39:39 +01:00
ericdecanini
249db1820f Removes ic_headphones 2022-03-22 16:22:40 +01:00
Benoit Marty
f791ddb7bb Small cleanup 2022-03-22 16:14:15 +01:00
Benoit Marty
03fee2a131 The .exhaustive trick is not needed anymore in Kotlin 1.6.0 
https://kotlinlang.org/docs/whatsnew16.html#stable-exhaustive-when-statements-for-enum-sealed-and-boolean-subjects
 2022-03-22 16:14:15 +01:00
Benoit Marty
57bee40211 Fix compilation warning (exhaustive when) 2022-03-22 16:13:06 +01:00
ganfra
67804da205
Merge pull request #5604 from vector-im/feature/adm/toolbar-icon-positions 
Fixing presence icon anchoring to the middle of the room icon
 2022-03-22 15:16:17 +01:00
Onuray Sahin
24bdad3ae1 Code review fixes. 2022-03-22 17:04:35 +03:00
ganfra
a2f64e7f3c
Merge pull request #5576 from vector-im/feature/aris/thread_labs_notice_users 
Threads Migration
 2022-03-22 14:57:07 +01:00
Adam Brown
1e6e8b546d fixing presence icon anchoring to the middle of the room icon 
- creates a secondary verification shield and aligns to the start of the room title when presence is present
 2022-03-22 13:43:43 +00:00
ariskotsomitopoulos
c6593f0cee PR remarks 2022-03-22 13:57:20 +02:00
ericdecanini
b035911d8f Fixes import lint error 2022-03-21 20:05:47 +01:00
ericdecanini
c9946b6dd3 Code cleanup 2022-03-21 19:57:18 +01:00
ericdecanini
5a819bbafa Merge remote-tracking branch 'origin/develop' into feature/eric/audio-files-player 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
 2022-03-21 19:40:14 +01:00
ericdecanini
ff26829d65 Adds new audio timeline stub 2022-03-21 18:42:07 +01:00
ericdecanini
7a7d36d010 Renames functions and variables 2022-03-21 16:23:19 +01:00
Benoit Marty
835497682f
Merge pull request #5572 from p1gp1g/play-sticker 
Show stickers on click
 2022-03-21 15:51:36 +01:00
Benoit Marty
579e6164d6
Merge pull request #5550 from vector-im/feature/adm/presence-theme-patch 
Presence indicator theme attribute
 2022-03-21 15:45:36 +01:00
ariskotsomitopoulos
ed2cb5f0fe Enhance text constants 2022-03-21 15:45:08 +02:00
Linerly
75fe14561e Translated using Weblate (Indonesian) 
Currently translated at 100.0% (2157 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/id/
 2022-03-21 08:38:31 +00:00
bmarty
ffb007e96d Sync Emojis 2022-03-21 00:03:12 +00:00
notramo
06af5a8017 Translated using Weblate (Hungarian) 
Currently translated at 99.8% (2154 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/hu/
 2022-03-19 21:38:31 +00:00
Jeanne Lavoie
8a783a7a0b Translated using Weblate (French (Canada)) 
Currently translated at 83.9% (1811 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr_CA/
 2022-03-19 21:38:31 +00:00
libexus
7910b4cd35 Translated using Weblate (German) 
Currently translated at 99.9% (2155 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2022-03-19 21:38:31 +00:00
ericdecanini
2e716cb8a0 Adapts special body text for audio messages 2022-03-19 18:26:37 +01:00
ericdecanini
fab78c9a6e Refactors MessageAudioItem to work for both audio files and voice messages 2022-03-19 18:16:51 +01:00
ravit
cb290550a9 Translated using Weblate (Hebrew) 
Currently translated at 94.5% (2039 of 2157 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/he/
 2022-03-18 18:38:46 +00:00