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

6849 Commits

Author SHA1 Message Date
SpiritCroc 045f95326a Fix for crash on rendering media items 
07-19 19:28:53.039 E/AndroidRuntime(12141): java.lang.NoSuchMethodError: No virtual method updateMessageBubble(Landroid/content/Context;Lim/vector/app/features/home/room/detail/timeline/item/AbsMessageItem$Holder;)V in class Lim/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem; or its super classes (declaration of 'im.vector.app.features.home.room.detail.timeline.item.MessageImageVideoItem' appears in base.apk)
07-19 19:28:53.039 E/AndroidRuntime(12141): 	at im.vector.app.features.home.room.detail.timeline.item.MessageImageVideoItem$bind$onImageSizeListener$1.onImageSizeUpdated(MessageImageVideoItem.kt:6)
07-19 19:28:53.039 E/AndroidRuntime(12141): 	at im.vector.app.features.media.ImageContentRenderer.render(ImageContentRenderer.kt:20)
07-19 19:28:53.039 E/AndroidRuntime(12141): 	at im.vector.app.features.home.room.detail.timeline.item.MessageImageVideoItem.bind(MessageImageVideoItem.kt:12)
07-19 19:28:53.039 E/AndroidRuntime(12141): 	at im.vector.app.features.home.room.detail.timeline.item.MessageImageVideoItem.bind(MessageImageVideoItem.kt:6)
07-19 19:28:53.039 E/AndroidRuntime(12141): 	at com.airbnb.epoxy.BaseEpoxyAdapter.onBindViewHolder(BaseEpoxyAdapter.java:25)

Change-Id: Ic803b3bfb328ed3a56202df789500b162886250d
 2021-07-19 22:55:11 +02:00
David Langley a29ccda68e move mutable push rule logic to static declarations as on web 2021-07-19 21:29:46 +01:00
ganfra f7e2e741c0 Missed call: start showing notification when there is a missed call 2021-07-19 20:25:09 +02:00
Benoit Marty 256df7e869 Rework on how we dispose the subscriptions 2021-07-19 19:18:49 +02:00
Benoit Marty ac2f1ee7fe Cleanup and comment 2021-07-19 19:03:41 +02:00
Benoit Marty 5990e5a52b Cleanup constructors 2021-07-19 18:59:27 +02:00
Benoit Marty 14b4bff477 Use the interface power! 2021-07-19 18:56:15 +02:00
Benoit Marty b8abe1b7ad Rename class for code clarity 2021-07-19 18:54:14 +02:00
Benoit Marty ac8303bb99 Add low priority section in DM tab #3463 2021-07-19 18:43:05 +02:00
Benoit Marty ca2794193c Typo 2021-07-19 18:16:36 +02:00
Benoit Marty 765f7d634e
Merge pull request #3700 from psrpinto/fix/naming-2 
Standardise casing of terms in source strings
 2021-07-19 16:26:41 +02:00
SpiritCroc 37621d1fc7 Automatic SchildiChat string correction 
Change-Id: I20c511ac19bfbf0bd11c0ae96a5a1ff97b19a59e
 2021-07-19 16:15:39 +02:00
SpiritCroc 8497a307a1 Merge tag 'v1.1.13' into sc 
Change-Id: Icc97ef8699b1cc96447369121f3c88582ac651bc

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt
	vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomFooterItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
 2021-07-19 16:10:57 +02:00
SpiritCroc a4f87f49dd Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I432f4130ab60f0a891a48609ad5bbe6a3a2b9583
 2021-07-19 16:05:38 +02:00
Benoit Marty 6d1cabaee3 Version++ 2021-07-19 15:28:14 +02:00
Paulo Pinto 0bdba9eb7d Standardise casing of terms in source strings 
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
 2021-07-19 12:47:10 +01:00
Weblate 9b829ddd04 Merge branch 'origin/develop' into Weblate. 2021-07-19 08:08:18 +00:00
ppnplusdf0eb2eb726b4bb3 a4cb5b1d28 Translated using Weblate (Thai) 
Currently translated at 12.3% (309 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/th/
 2021-07-16 16:25:05 +00:00
Benoit Marty 45efb4386b
Merge pull request #3668 from vector-im/dependabot/gradle/org.amshove.kluent-kluent-android-1.68 
Bump kluent-android from 1.67 to 1.68
 2021-07-16 18:05:45 +02:00
Benoit Marty 6caa2b9ae0 Fix issue with RTL 
Still a pb when Mic is on, margins are not correct
 2021-07-16 17:12:08 +02:00
Benoit Marty 30bb91892d Fix issue about move overflow. 
Now use limit for distances
 2021-07-16 16:04:50 +02:00
SpiritCroc 0dcb14482d Increment version 
Change-Id: I8c9b382eea65a87575d0642eb8bfa5bc4f0b4707
 2021-07-16 12:34:43 +02:00
Benoit Marty 6da4f1d84f Add comment 2021-07-16 11:19:06 +02:00
Benoit Marty 13ae0ba5f1 Convert voice message to be able to play on Android 28 and below 2021-07-16 11:00:25 +02:00
Benoit Marty 343ea42ef5 Fix issue on Android 21 2021-07-15 17:30:48 +02:00
Benoit Marty bfc70be5bb Record voice on Android 21 2021-07-15 17:23:46 +02:00
David Langley dff8503493 fix discrepancies with web 2021-07-15 16:06:46 +01:00
Paulo Pinto 5d4e71a011 Standardise casing of integration manager 
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
 2021-07-15 15:58:50 +01:00
Paulo Pinto e61c8c28bb Standardise spelling and casing of homeserver 
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
 2021-07-15 15:58:50 +01:00
Benoit Marty 6f947e979b Split to sub fun 2021-07-15 15:14:26 +02:00
Benoit Marty bb742eb483 Handle record/play error 2021-07-15 15:06:38 +02:00
Benoit Marty 6ab9b462a3 Fix mic button color 2021-07-15 13:42:40 +02:00
Besnik Bleta 98aec941e2 Translated using Weblate (Albanian) 
Currently translated at 99.5% (2483 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sq/
 2021-07-15 11:25:06 +00:00
Paulo Pinto 1dfb10d174 Translated using Weblate (Portuguese) 
Currently translated at 33.8% (843 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt/
 2021-07-15 11:25:05 +00:00
Benoit Marty 8757d0269f Added translation using Weblate (English (United Kingdom)) 2021-07-15 09:58:23 +00:00
Frisk ccaadcbd4f Translated using Weblate (Polish) 
Currently translated at 22.5% (14 of 62 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/pl/
 2021-07-15 11:27:06 +02:00
SeedPuller f1fe9055c4 Added translation using Weblate (Persian) 2021-07-15 11:27:06 +02:00
Weblate aeb830d639 Added translation using Weblate (Polish) 2021-07-15 11:27:06 +02:00
SpiritCroc b7d0ce7857 Deleted translation using Weblate (English (United States)) 2021-07-15 11:27:06 +02:00
Weblate f59f75a1ee Added translation using Weblate (English (United States)) 2021-07-15 11:27:06 +02:00
J. Lavoie 5b20f53c9f Translated using Weblate (French) 
Currently translated at 100.0% (54 of 54 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/fr/
 2021-07-15 11:27:06 +02:00
SpiritCroc dc34334e3c Fix RTL language reply rendering issues 
Fixes https://github.com/SchildiChat/SchildiChat-android/issues/74

Change-Id: I2c24950506158fdde11f5d13b177e11fe894bde9
 2021-07-15 11:17:39 +02:00
David Langley f0d5950b13 fix unncessary reformatting and function description 2021-07-14 11:59:00 +01:00
David Langley 5044b21545 add changelog, checks/tests 2021-07-14 11:49:16 +01:00
David Langley baab726df2 Merge branch 'develop' of github.com:vector-im/element-android into feature/dla/reorg_account_notification_settings 2021-07-14 10:18:54 +01:00
David Langley a3204fdad9 add resValue to enable feature, put back old code 2021-07-13 21:22:56 +01:00
Benoit Marty 276808c8e9 Fix issue in RTL 2021-07-13 20:09:23 +02:00
Benoit Marty 0cf10b2f84 Fix issue with waveform rendering 2021-07-13 18:48:59 +02:00
Benoit Marty c938a30dd9 Change filename. 
Later we will use the room id to save the draft.
 2021-07-13 18:12:55 +02:00
Benoit Marty 95bb796bad Fix color 2021-07-13 17:19:11 +02:00
Benoit Marty 013174d3dc License file 2021-07-13 16:24:03 +02:00
Benoit Marty f40e6b56fe Fix other color issue 2021-07-13 16:21:38 +02:00
Benoit Marty 9e0f3a1517 Fix other color issue 2021-07-13 16:17:22 +02:00
Benoit Marty cf4e603f09 Fix background color of voice message recorder 2021-07-13 16:14:02 +02:00
Benoit Marty 14dbbee1e3 Fix background color of voice message item 2021-07-13 16:10:51 +02:00
Benoit Marty 4c5be39f46 Fix background color of Play/Pause button 2021-07-13 16:08:54 +02:00
Benoit Marty a52d5f6d12 Renaming 2021-07-13 15:57:35 +02:00
Benoit Marty 6283846108 Cleanup 2021-07-13 15:54:09 +02:00
Benoit Marty bff2c6ea93 Better handling of Paused/Play state 2021-07-13 15:47:52 +02:00
Benoit Marty 7937c9945b Untrack 2021-07-13 15:26:06 +02:00
Benoit Marty bf14fa90a2 Fix rendering issue of time when playing in the timeline - still buggy 
And fix timer not cancelled properly when at the end of the playback
 2021-07-13 15:15:07 +02:00
Benoit Marty fa7c1a763f Render the wave form more often 2021-07-13 14:29:05 +02:00
Benoit Marty cae927b863 Use CountUpTimer 2021-07-13 14:18:57 +02:00
Benoit Marty 78e9a4ffe7 Use CountUpTimer 2021-07-13 14:13:35 +02:00
Benoit Marty c69bc12637 Be more precise if the timer is paused and resume. 2021-07-13 14:13:35 +02:00
Benoit Marty 83bf48dfff Fix denied permission issue 
And remove dead code
 2021-07-13 11:02:22 +02:00
Benoit Marty 9df874c975 Merge branch 'develop' into feature/ons/voice_message 2021-07-13 10:36:05 +02:00
Benoit Marty c08bd664ab
Merge pull request #3667 from vector-im/feature/bma/permission 
Permission rework
 2021-07-13 10:33:40 +02:00
Benoit Marty 34723ce4f7 Cleanup 2021-07-13 10:27:29 +02:00
dependabot[bot] b0ea022eea
Bump kluent-android from 1.67 to 1.68 
Bumps [kluent-android](https://github.com/MarkusAmshove/Kluent) from 1.67 to 1.68.
- [Release notes](https://github.com/MarkusAmshove/Kluent/releases)
- [Changelog](https://github.com/MarkusAmshove/Kluent/blob/master/CHANGELOG.md)
- [Commits](https://github.com/MarkusAmshove/Kluent/commits)

---
updated-dependencies:
- dependency-name: org.amshove.kluent:kluent-android
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-12 23:07:08 +00:00
Benoit Marty 76ab34f1a6 Cleanup 2021-07-13 00:41:26 +02:00
Benoit Marty 59e3b421bb Cleanup 2021-07-13 00:33:29 +02:00
Benoit Marty cc042f2d7a Fail fast 2021-07-13 00:31:05 +02:00
Benoit Marty 067349f602 Fix some misunderstanding about the permissions request - step 2 2021-07-13 00:22:23 +02:00
Benoit Marty 80657251a5 Fix some misunderstanding about the permissions request - step 1 2021-07-12 23:47:33 +02:00
Benoit Marty fabbd6da9e Add action to see permission status in the DebugActivity 2021-07-12 22:12:51 +02:00
Benoit Marty cca9a8007c Use new permission request management 
I do not know why all has not been migrated in the previous rework
 2021-07-12 21:18:01 +02:00
David Langley 727ce7272a update translations 2021-07-12 18:38:56 +01:00
SpiritCroc 9aa37dfbe9 Fix top row of emoji reaction picker on small displays 
Emojis were not showing if not enough space, so allow scrolling there.
 2021-07-12 17:56:58 +02:00
Benoit Marty 039ebdac7e Fix top row of emoji reaction picker on small displays v2 
Change-Id: I4294cd48000503f83748deb0dd41a73d05fafc8e
 2021-07-12 17:53:24 +02:00
langleyd 7e156d372f Add checkbox preference, remove PushRulePreference, Split adavanced fragment to new 3 new fragments and inherit common function 2021-07-12 14:08:35 +01:00
langleyd d6f1f276c2 Add checkbox preference, remove PushRulePreference, Split adavanced fragment to new 3 new fragments and inherit common function 2021-07-12 14:07:27 +01:00
Benoit Marty 8b852a2ab2 Fix glitch when opening a room invite 
Composer and mic was shown for a few milliseconds
Also hide the mic if the uer cannot send event, or if the room has been tombstoned.
 2021-07-12 13:55:44 +02:00
Benoit Marty e49290b8ac Fix mic visible for invite room mode. 
We can still view the mic when the screen is resumed, to be improved.
 2021-07-12 13:40:59 +02:00
SpiritCroc 15249ebe1b Some RTL/LTR mixture alignment improvements 
Change-Id: I2174b75f378cd09290d9d32bd39ebf15e577ab23
 2021-07-11 12:24:29 +02:00
SpiritCroc 62a8865dbc Fix top row of emoji reaction picker on small displays 
Emojis were not showing if not enough space, so allow scrolling there.

Change-Id: I75c73132ff4479782953f5401db2ca8037f751e9
 2021-07-11 11:13:02 +02:00
SpiritCroc e61fc1a935 Fix unread messages marker being hidden in collapsed membership item 
Scenario: the last read event in a chat is a membership change. After
that, at least two new membership changes were added, followed by normal
messages. Due to the membership changes being collapsed by default, in
this scenario the read marker would not show, since in the loop, we
would overwrite the appendReadMarker with the value for the last eventId
of the merged item, instead of showing it if any of the items matched.
 2021-07-10 11:01:36 +02:00
SpiritCroc 00c2f271b3 Fix unread messages marker being hidden in collapsed membership item 
Scenario: the last read event in a chat is a membership change. After
that, at least two new membership changes were added, followed by normal
messages. Due to the membership changes being collapsed by default, in
this scenario the read marker would not show, since in the loop, we
would overwrite the appendReadMarker with the value for the last eventId
of the merged item, instead of showing it if any of the items matched.

Change-Id: I791627df6776ebf791310eb082b648701936d565
 2021-07-10 10:45:37 +02:00
Ali KARABAK 1888588377 Translated using Weblate (Turkish) 
Currently translated at 64.2% (1603 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/tr/
 2021-07-10 08:25:04 +00:00
libexus debc3645ba Translated using Weblate (German) 
Currently translated at 99.8% (2491 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2021-07-10 08:25:03 +00:00
Benoit Marty c5b8755bab Trick for a better alignment of voice message in the timeline. 2021-07-09 23:16:43 +02:00
Benoit Marty 0382ae8273 Swipe to reply on voice message 2021-07-09 22:35:44 +02:00
Benoit Marty e391a1371c Merge branch 'develop' into feature/ons/voice_message 2021-07-09 22:19:50 +02:00
Benoit Marty 963eb9daf4 Fix missing duration in audio event, and move `AudioWaveformInfo` to the proper package 2021-07-09 22:06:09 +02:00
Benoit Marty 79f4053ab4 Use DimensionConverter 2021-07-09 21:33:54 +02:00
Benoit Marty a69ac965b6 Fix bad timer display 2021-07-09 21:21:45 +02:00
Benoit Marty 2c1335a2f5 Theme for Toast 2021-07-09 21:06:13 +02:00
Benoit Marty a2671bc0d3 Fix touchable area to delete the voice message 2021-07-09 18:26:58 +02:00
Benoit Marty 2792d736f0 Apply missing tint 2021-07-09 18:22:52 +02:00
Benoit Marty 9dea519d0c Fix issue with play / pause button alignment 2021-07-09 18:05:41 +02:00
Benoit Marty 7a1c6b78d4 Move the style to the layout, for code clarity. Style are not reused, and it's better to have layout attr in the layout itself 2021-07-09 17:49:27 +02:00
Benoit Marty b400f3c83f Small cleanup 2021-07-09 16:31:26 +02:00
Benoit Marty 910c0ff326
Merge pull request #3648 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.27 
Bump libphonenumber from 8.12.26 to 8.12.27
 2021-07-09 09:47:45 +02:00
SpiritCroc 7d377ea418 Change power level username colors 
Change-Id: If49dbc83268f04bba923838eda1fb7aa461c23cd
 2021-07-08 20:11:45 +02:00
SpiritCroc b0206cbc6e Scroll to the real bottom 
the element at the bottom might be larger than the display...

Change-Id: I52ac882b1b192f9d55c12549c82de46db025c12e
 2021-07-08 18:22:57 +02:00
libexus 402e3bde83 Translated using Weblate (German) 
Currently translated at 99.8% (2491 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2021-07-08 11:39:40 +00:00
Dwaris 0545009b0a Translated using Weblate (German) 
Currently translated at 99.8% (2491 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2021-07-08 11:39:40 +00:00
libexus 8a588abc69 Translated using Weblate (German) 
Currently translated at 99.8% (2490 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2021-07-08 11:39:08 +00:00
Dwaris fe81fc8f93 Translated using Weblate (German) 
Currently translated at 99.8% (2490 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2021-07-08 11:39:08 +00:00
libexus 941735b4d3 Translated using Weblate (German) 
Currently translated at 99.7% (2489 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2021-07-08 11:38:47 +00:00
Dwaris 5cb26fab4d Translated using Weblate (German) 
Currently translated at 99.7% (2489 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2021-07-08 11:38:46 +00:00
libexus 1c80f0045f Translated using Weblate (German) 
Currently translated at 99.7% (2488 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2021-07-08 11:38:24 +00:00
Dwaris 1346fd3077 Translated using Weblate (German) 
Currently translated at 99.7% (2488 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2021-07-08 11:38:23 +00:00
HelaBasa 14dcd8a875 Translated using Weblate (Sinhala) 
Currently translated at 0.2% (6 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/si/
 2021-07-08 10:35:00 +00:00
Joe Sagawa a1d5501215 Translated using Weblate (Japanese) 
Currently translated at 62.9% (1570 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
 2021-07-08 10:34:59 +00:00
libexus c6e6fc7ecb Translated using Weblate (German) 
Currently translated at 99.7% (2487 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2021-07-08 10:34:50 +00:00
Benoit Marty 2948f03978
Merge pull request #3551 from vector-im/feature/bca/room_upgrade 
Feature/bca/room upgrade
 2021-07-08 10:00:01 +02:00
dependabot[bot] 76890a3b26
Bump libphonenumber from 8.12.26 to 8.12.27 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.26 to 8.12.27.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.26...v8.12.27)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-07 23:06:17 +00:00
Onuray Sahin 3372177b0e Design review fixes. 2021-07-07 16:44:42 +03:00
Onuray Sahin a9beded589 Lint fix. 2021-07-07 11:54:23 +03:00
Onuray Sahin b1c7cb3219 Lint fixes. 2021-07-07 11:37:01 +03:00
Benoit Marty 5bbb45de68
Merge pull request #3636 from vector-im/feature/bma/cleanup_interface 
Decorelate interfaces for code clarity
 2021-07-07 10:08:15 +02:00
Onuray Sahin 8452f7564c Lint fix. 2021-07-07 10:28:08 +03:00
Onuray Sahin 5856e563c5 Put voice message preference under labs. 2021-07-07 10:23:22 +03:00
random 87df147a28 Translated using Weblate (Italian) 
Currently translated at 99.8% (2491 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
 2021-07-06 14:34:50 +00:00
Thibault Martin 9efb213ff7 Translated using Weblate (French) 
Currently translated at 100.0% (2494 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2021-07-06 14:34:50 +00:00
Onuray Sahin 6cb53c991a Fix visibility of microphone icon. 2021-07-06 14:29:56 +03:00
Onuray Sahin 7a1b138894 Merge branch 'develop' into feature/ons/voice_message 
* develop: (286 commits)
  Fix crash after video call
  Fix issue on button styles
  Clean after benoits review
  Fix warning about implicit type, introduced in Kotlin 1.5.20. "Returning type parameter has been inferred to Nothing implicitly. Please specify type arguments explicitly to hide this warning. Nothing can produce an exception at runtime."
  Bump kotlin_version from 1.5.10 to 1.5.20
  Bump libphonenumber from 8.12.25 to 8.12.26
  Fix call invite processed after call is ended because of fastlane mode.
  Jump to unread: removes unnecessary check which can cause scroll issue
  Jump to unread: avoid blink when jumping
  Clean after Benoits review
  Delete unused drawable to avoid conflict on develop
  Jump to unread: add towncrier file.
  Read marker: fix some issues with jump to unread visibility.
  Stop using ProgressDialog, there is a theme issue with it. It's not maintain by Google since it's deprecated. Force usage of MaterialAlertDialogBuilder to have the same UI effect. We sometimes need to block the UI :/
  Reordering
  Add text style for dialogs
  Colored dialog button is now handled by the theme
  Update theme for material dialog and create a destructive variant
  Reorder buttons
  Update doc
  ...

# Conflicts:
#	library/ui-styles/src/main/res/values/theme_dark.xml
#	library/ui-styles/src/main/res/values/theme_light.xml
#	vector/build.gradle
#	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/composer/TextComposerView.kt
#	vector/src/main/res/values/strings.xml
 2021-07-06 13:17:49 +03:00
Benoit Marty e9da63e3ee
Merge pull request #3635 from vector-im/feature/bma/crash_room_aliases 
Fix crash in room aliases
 2021-07-06 12:15:37 +02:00
Benoit Marty 8f1b7649aa Make the code compile... 2021-07-06 12:10:06 +02:00
Benoit Marty 4963025150 Decorelate interfaces for code clarity 2021-07-06 11:36:50 +02:00
Benoit Marty ca9f5161d1 Add retry support on Room Alias screen 2021-07-06 11:12:40 +02:00
Benoit Marty 5b149c8a34 Crash when opening room addresses screen with no internet connection 2021-07-06 10:57:59 +02:00
Benoit Marty e22bd8f637
Merge pull request #3593 from vector-im/dependabot/gradle/androidx.test.ext-junit-1.1.3 
Bump junit from 1.1.2 to 1.1.3
 2021-07-05 21:36:38 +02:00
Benoit Marty ca45cdd5c7
Merge pull request #3585 from vector-im/feature/bma/wellknown 
Improve wellknown usage
 2021-07-05 21:36:16 +02:00
Benoit Marty 692adffa69
Merge pull request #3626 from vector-im/dependabot/gradle/com.google.android.material-material-1.4.0 
Bump material from 1.3.0 to 1.4.0
 2021-07-05 21:29:49 +02:00
Benoit Marty 07d6eaacf9 Quick cleanup after #3624 2021-07-05 21:28:37 +02:00
Benoit Marty a335c5eb4b
Merge pull request #3624 from vector-im/dbkr/scan_button_title 
Use different copy for self verification
 2021-07-05 21:25:57 +02:00
David Baker 04cad290f7 Also change the emoji button subtitle 
and tweak the other string more because it's not "each other" either
 2021-07-05 19:49:48 +01:00
SpiritCroc 0b8b9d3cad Fix jump-to-unread style for non-Element themes 
Change-Id: If203eb8af60542eff57269dfe318b754b1e83b10
 2021-07-05 18:00:51 +02:00
SpiritCroc e0e17e8996 Automatic SchildiChat string correction 
Change-Id: I07253ef1a3be8dc753c734eb93fe50f6899d03e5
 2021-07-05 16:58:50 +02:00
SpiritCroc e5c9c33a0f Merge tag 'v1.1.12' into sc 
Change-Id: I224f427a0d65bfea7ed0b1e19a95e1f03d0d5236

Conflicts:
	library/ui-styles/src/main/res/values/text_appearances.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.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/TimelineEventController.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/list/GroupRoomListSectionBuilder.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/RoomListViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/SpaceRoomListSectionBuilder.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
	vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
	vector/src/main/res/layout/dialog_export_e2e_keys.xml
	vector/src/main/res/layout/dialog_import_e2e_keys.xml
 2021-07-05 16:58:45 +02:00
Benoit Marty d29e04f16c Create fun String.getDomain(): String to avoid duplicated code 2021-07-05 16:49:09 +02:00
Benoit Marty 0e8018cbba ktlint and format 2021-07-05 16:24:19 +02:00
Benoit Marty 97cae9926b
Merge pull request #2848 from vector-im/neilalexander/vectorpreferences 
Add subscribeToChanges/unsubscribeToChanges to VectorPreferences
 2021-07-05 16:22:43 +02:00
dependabot[bot] 974d5c23d3
Bump junit from 1.1.2 to 1.1.3 
Bumps junit from 1.1.2 to 1.1.3.

---
updated-dependencies:
- dependency-name: androidx.test.ext:junit
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-05 14:19:54 +00:00
Benoit Marty d85099f23c
Merge pull request #3595 from vector-im/dependabot/gradle/espresso_version-3.4.0 
Bump espresso_version from 3.3.0 to 3.4.0
 2021-07-05 16:19:17 +02:00
Benoit Marty edbf70c820
Merge pull request #3273 from vector-im/feature/bma/cleanup_redundant_fields 
Cleanup redundant fields - TO BE MERGED ON JULY 1st
 2021-07-05 16:16:33 +02:00
Benoit Marty c2e649f64e Fix deprecated method 2021-07-05 16:07:44 +02:00
Benoit Marty b285bd0359 Merge branch 'develop' into feature/bca/room_upgrade 2021-07-05 16:01:27 +02:00
Jeff Huang e0f5099bd6 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2494 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2021-07-05 13:34:51 +00:00
sr093906 900769174c Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (2494 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hans/
 2021-07-05 13:34:51 +00:00
lvre 7ccc218c6b Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2494 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2021-07-05 13:34:50 +00:00
Szimszon a610ea06aa Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2494 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/hu/
 2021-07-05 13:34:50 +00:00
Priit Jõerüüt 8034ea16e5 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2494 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
 2021-07-05 13:34:50 +00:00
zeritti 5fc818fac2 Translated using Weblate (Czech) 
Currently translated at 100.0% (2494 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
 2021-07-05 13:34:49 +00:00
dependabot[bot] 8639582671
Bump espresso_version from 3.3.0 to 3.4.0 
Bumps `espresso_version` from 3.3.0 to 3.4.0.

Updates `espresso-core` from 3.3.0 to 3.4.0

Updates `espresso-contrib` from 3.3.0 to 3.4.0

Updates `espresso-intents` from 3.3.0 to 3.4.0

---
updated-dependencies:
- dependency-name: androidx.test.espresso:espresso-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: androidx.test.espresso:espresso-contrib
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: androidx.test.espresso:espresso-intents
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-05 12:38:04 +00:00
Benoit Marty 5ccfbf4ed8
Merge pull request #3596 from vector-im/dependabot/gradle/androidx.core-core-ktx-1.6.0 
Bump core-ktx from 1.5.0 to 1.6.0
 2021-07-05 14:37:48 +02:00
Benoit Marty f03155bbae
Merge pull request #3591 from vector-im/dependabot/gradle/androidxTest_version-1.4.0 
Bump androidxTest_version from 1.3.0 to 1.4.0
 2021-07-05 14:37:14 +02:00
Benoit Marty 72dcc92032 Version++ 2021-07-05 14:27:33 +02:00
SpiritCroc a4ba5998e1 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I145b127da93a119944cdd13879644787c875a52e
 2021-07-05 10:32:08 +02:00
Benoit Marty 76f4c81d2d Hide password... Oups 2021-07-05 09:50:20 +02:00
SpiritCroc 24a61ee0ff Display-name coloring setting 
Based on whether a chat is
- DM
- Room
- Public room

allow to select whether to color usernames
- Uniformly (as previously done in SC themes)
- Based on Matrix ID (as previously seen in Element themes)
- Based on the user's power level in that room (new!)

The setting concerning rooms that are neither DM nor public is also used
for deciding whether to use mxid-based avatar coloring or uniform
coloring.

Change-Id: Ic68a24f4818a193f776a3b14232f887cd229929a
 2021-07-04 17:01:27 +02:00
SpiritCroc 1ba30d4bdb Increment version 
Change-Id: I01966a3e4b177a2a19f7c50322bb3e601cf1bb24
 2021-07-04 11:52:31 +02:00
lvre eb4f36319f Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2494 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2021-07-03 20:00:21 +00:00
SpiritCroc ba6fd96623 Fix some corner case where a wrong display name would show 
Scenario: Scroll to a message in dual side bubble layout that:
- Is an image, i.e. has a time footer overlay
- Was sent by the user
- Was sent in a group chat, i.e. other messages show sender display
  names

This scenario could lead to the non-bubble name view not being cleared
nor hidden correctly.

Change-Id: I033d3070612d219dea9f2181c5029e17460c3ee6
 2021-07-03 15:34:34 +02:00
dependabot[bot] 9ff1e20f07
Bump material from 1.3.0 to 1.4.0 
Bumps [material](https://github.com/material-components/material-components-android) from 1.3.0 to 1.4.0.
- [Release notes](https://github.com/material-components/material-components-android/releases)
- [Commits](https://github.com/material-components/material-components-android/compare/1.3.0...1.4.0)

---
updated-dependencies:
- dependency-name: com.google.android.material:material
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-02 23:07:53 +00:00
David Baker fe4c4832bd Use different copy for self verification 
The copy all refers to 'their' device for when you're verifying
someone else. Update it to refer to your own devices in the case
where you're verifying one of your own devices.
 2021-07-02 18:38:57 +01:00
SpiritCroc fe1fc098c8 Disable "long click on room" "help" 
Change-Id: I851092f89131b531e5e0e94e405bb2769f84dbb0
 2021-07-02 18:35:15 +02:00
SpiritCroc 1c32fcad35 Profile screen theme tweaks 
Change-Id: I0dfeea8284ae597b03c6e9fd8c1f2f1e4f45332f
 2021-07-02 18:33:42 +02:00
Benoit Marty 2c7b947d27 Fix compilation issue 
A bit weird, I did not figure out was was the original problem.
Editiing the line, for instance adding any char fixes the issue, so I decided to put all on one line.
 2021-07-02 15:32:01 +02:00
SpiritCroc 4b472f041b Merge remote-tracking branch 'weblate/sc' into sc 
Change-Id: If195307eec194931f2ec1980dbf23d0b45d18a32
 2021-07-02 15:23:09 +02:00
SpiritCroc b808d8b464 Avoid chat position jumps during message loading 
Sometimes, the chat list would jump without the user scrolling:
- During intial loading of a room content, i.e. when it is expected
  that the list stays scrolled to bottom
- During loading of messages after jumping to a linked message

With this commit, the target event is repeatedly scrolled to upon list
changes until the users scroll themselves, to avoid above scenarios.

Change-Id: Iabbe76832e7e68686431b0baed9356c88eb50901
 2021-07-02 15:19:20 +02:00
Benoit Marty f06d2b1734 Fix typo 2021-07-02 14:55:30 +02:00
Benoit Marty 1eea734a4c Fix compilation issue 
A bit weird, I did not figure out was was the original problem.
Editiing the line, for instance adding any char fixes the issue, so I decided to put all on one line.
 2021-07-02 12:53:00 +02:00
Weblate 64b6779cfa Merge branch 'origin/develop' into Weblate. 2021-07-02 07:52:44 +00:00
Benoit Marty b0f7268d13
Merge pull request #3553 from vector-im/feature/fga/fix_timeline_visibility 
Fix some issues with timeline cache invalidation and visibility.
 2021-07-02 09:40:37 +02:00
Benoit Marty d4009476f9 Cleanup 2021-07-02 09:39:32 +02:00
lvre 1906fbdeaa Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2490 of 2490 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2021-07-02 01:04:01 +00:00
Benoit Marty 47ef0d90fc Open upgraded room when upgrading from the room profile 2021-07-01 14:31:27 +02:00
Benoit Marty ed7be13ea3 PR review part 2 2021-07-01 12:51:33 +02:00
Benoit Marty 69c399a229
Merge pull request #3529 from erikhuizinga/erikhuizinga-3527-fix-google-play-service-application 
Apply Google Services Gradle plugin more robustly
 2021-07-01 10:16:00 +02:00
Onuray Sahin 9d48b399df Voice message playback implementation. 2021-07-01 10:49:04 +03:00
Onuray Sahin 5676226f42 Voice message recording view implementations. 2021-07-01 10:47:41 +03:00
dependabot[bot] 752290424c
Bump core-ktx from 1.5.0 to 1.6.0 
Bumps core-ktx from 1.5.0 to 1.6.0.

---
updated-dependencies:
- dependency-name: androidx.core:core-ktx
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-30 23:07:55 +00:00
dependabot[bot] 2ebfeb1709
Bump androidxTest_version from 1.3.0 to 1.4.0 
Bumps `androidxTest_version` from 1.3.0 to 1.4.0.

Updates `core` from 1.3.0 to 1.4.0

Updates `runner` from 1.3.0 to 1.4.0

Updates `rules` from 1.3.0 to 1.4.0

---
updated-dependencies:
- dependency-name: androidx.test:core
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: androidx.test:runner
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: androidx.test:rules
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-30 23:06:24 +00:00
Benoit Marty ec515ced66 PR review part 1 2021-06-30 18:54:13 +02:00
Benoit Marty 3e53fa710a
Merge branch 'develop' into feature/bca/room_upgrade 2021-06-30 17:56:32 +02:00
ganfra de64df3cdb Fix crash after video call 2021-06-30 14:50:30 +02:00
Benoit Marty 7292c4e13d Code quality 2021-06-30 13:57:42 +02:00
J. Lavoie 24fe43e267 Translated using Weblate (French) 
Currently translated at 27.7% (15 of 54 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/fr/
 2021-06-30 13:07:58 +02:00
Govindas 265806b190 Translated using Weblate (Lithuanian) 
Currently translated at 100.0% (54 of 54 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/lt/
 2021-06-30 13:07:58 +02:00
SpiritCroc b9749f0260 Translated using Weblate (German) 
Currently translated at 100.0% (54 of 54 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/de/
 2021-06-30 13:07:58 +02:00
waclaw66 b78a1768e8 Translated using Weblate (Czech) 
Currently translated at 100.0% (54 of 54 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/cs/
 2021-06-30 13:07:58 +02:00
J. Lavoie b18bf89934 Added translation using Weblate (French) 2021-06-30 13:07:58 +02:00
Benoit Marty ea6b0b6a43 Fix issue when sign-in using matrixId 2021-06-30 12:53:37 +02:00
lvre 1a0f29ff94 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2490 of 2490 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2021-06-30 10:34:47 +00:00
libexus c350c94827 Translated using Weblate (German) 
Currently translated at 99.9% (2488 of 2490 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2021-06-30 10:34:47 +00:00
Benoit Marty 24d2669255 Keep the data entered by the user for the UI 
Actually import what has been done in Login V2...
 2021-06-30 12:07:24 +02:00
Benoit Marty 08000dce55 Update the UI showing the homeserver API url in developer mode 2021-06-30 11:14:44 +02:00
Benoit Marty 38cb8bd33e Store homeServerUriBase independently that the base URL for client-server API 
Also handle the migration for the specific matrix-client.matrix.org URL
 2021-06-30 11:07:24 +02:00
Benoit Marty 0f25e2986f fun RawService.getElementWellknown() now takes a SessionParams for parameter to be able to use something else than the userId's domain 2021-06-30 09:27:11 +02:00
Benoit Marty 984b1dd6a8 RawService.getWellknown() now takes a domain instead of a matrixId as parameter 2021-06-30 09:20:08 +02:00
SpiritCroc 4e9ab0c6f9 Fix message highlight color behind bubbles for SC themes 
Change-Id: Ia115cba593c90682bbf4023d9161b1df6001f3c9
 2021-06-29 16:46:23 +02:00
SpiritCroc 559016cd32 SC theme improvements after merge, pt. 3 
Change-Id: I506d0bc3a320508268646ba86d93fb39e2ad8168
 2021-06-29 15:06:45 +02:00
Benoit Marty 7f70a03f41 Use interface field 2021-06-29 10:58:28 +02:00
SpiritCroc dab04d52fd More SC theme improvements, including a reworked light theme 
Change-Id: I373daedc45bee3aa9e24e09bb632b01e27754010
 2021-06-28 18:28:41 +02:00
Benoit Marty edd24de4c3
Merge pull request #3547 from vector-im/feature/fga/jump_to_unread_redesign 
Jump to unread: implement new design
 2021-06-28 16:45:06 +02:00
Benoit Marty 9bbe002988
Merge pull request #3531 from vector-im/feature/fga/auto_accept_invite 
Feature/fga/auto accept invite
 2021-06-28 16:40:10 +02:00
ganfra 48fa9e1a5e Clean after benoits review 2021-06-28 11:00:29 +02:00
Valere 4aa93d79fe cleaning 2021-06-28 09:42:54 +02:00
random 2764ecb256 Translated using Weblate (Italian) 
Currently translated at 99.8% (2486 of 2490 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
 2021-06-27 19:34:46 +00:00
libexus 230b3f31d7 Translated using Weblate (German) 
Currently translated at 99.9% (2488 of 2490 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2021-06-27 19:34:46 +00:00
SpiritCroc 15625e7424 Clarify element theme names 
Change-Id: Ibe3e4bd6536978b1ff816f7c74738768c52adf95
 2021-06-27 14:44:16 +02:00
SpiritCroc 29d243d8b2 Use composer view without outline again 
Change-Id: Icc567fad3df142cab8c927d95d65ff031683b49f
 2021-06-27 14:40:37 +02:00
SpiritCroc 71b663db49 Update tab hiding logic 
Change-Id: Ic6d80651e80c2ea57f72516cf9909e3691ac0367
 2021-06-27 12:35:23 +02:00
SpiritCroc 098d98926a Fixup SchildiChat theming 
Change-Id: I0c6f04ceb4c09be41d5879b6c6a4cee1d082c525
 2021-06-27 12:01:35 +02:00
Benoit Marty cd0c9b4e08
Merge pull request #3549 from vector-im/feature/bma/cleanup_styles 
Fix styles issue
 2021-06-25 19:11:54 +02:00
BramvdnHeuvel 7c04391037 Translated using Weblate (Dutch) 
Currently translated at 52.1% (1298 of 2490 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nl/
 2021-06-25 09:34:49 +00:00
Thibault Martin bafd01c0f4 Translated using Weblate (French) 
Currently translated at 100.0% (2490 of 2490 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2021-06-25 09:34:45 +00:00
dependabot[bot] 9e2f2f2372
Bump libphonenumber from 8.12.25 to 8.12.26 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.25 to 8.12.26.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.25...v8.12.26)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-24 23:05:19 +00:00
ganfra cccf5de015 Jump to unread: removes unnecessary check which can cause scroll issue 2021-06-24 18:50:44 +02:00
ganfra ab37984beb Jump to unread: avoid blink when jumping 2021-06-24 18:33:30 +02:00
ganfra 1ba97fa9be Clean after Benoits review 2021-06-24 17:40:45 +02:00
Benoit Marty ca3e5cdf90
Merge pull request #3544 from vector-im/dependabot/gradle/org.amshove.kluent-kluent-android-1.67 
Bump kluent-android from 1.65 to 1.67
 2021-06-24 14:49:53 +02:00
Benoit Marty f5ecaa0339
Merge pull request #3520 from vector-im/feature/fga/timeline_virtual_room 
Feature/fga/timeline virtual room
 2021-06-24 14:43:00 +02:00
Benoit Marty 5eb0097fb2 Delete unused drawable to avoid conflict on develop 2021-06-24 14:40:38 +02:00
Benoit Marty 14184aae6f
Merge pull request #3506 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.25 
Bump libphonenumber from 8.12.24 to 8.12.25
 2021-06-24 14:34:45 +02:00
Benoit Marty ed90f376e6
Merge pull request #3518 from vector-im/dependabot/gradle/androidx.fragment-fragment-ktx-1.3.5 
Bump fragment-ktx from 1.3.4 to 1.3.5
 2021-06-24 14:31:04 +02:00
Benoit Marty 7257736691
Merge pull request #3545 from vector-im/feature/bma/password_reveal 
Password reveal
 2021-06-24 14:30:34 +02:00
ganfra 919ebaa82e Fix some issues with timeline cache invalidation and visibility. 2021-06-24 12:41:23 +02:00
Valere 846c5d52b8 Fix unused parameter 2021-06-24 11:54:06 +02:00
SpiritCroc 5a1e7c8c74 Automatic SchildiChat string correction 
Change-Id: I97f141d77c393c13cdd5e2e7a2def918aace93e9
 2021-06-24 10:19:46 +02:00
SpiritCroc d11c1fcc62 Merge tag 'v1.1.11' into sc 
Change-Id: I15d6e584f1594764f956c129003b2a459b5d24a6
 2021-06-24 10:19:24 +02:00
SpiritCroc 89ef62e1d5 Fix compile after v1.1.10 merge 
Change-Id: I2c5395044d0a3d1cd8005c1f2f8fface38b45c22
 2021-06-24 10:19:02 +02:00
Valere 43a1e283c5
Merge pull request #3514 from vector-im/feature/bca/fix_join_errors 
Add error feedback when joining space rooms
 2021-06-24 09:56:32 +02:00
Valere 57c75f8039 Ugrade unstable room notice in settings 
default update parent, clean migrate bottomsheet layout
 2021-06-24 09:38:52 +02:00
ganfra c3ef036dca Read marker: fix some issues with jump to unread visibility. 2021-06-23 16:59:58 +02:00
Benoit Marty 885f5736c9 Stop using ProgressDialog, there is a theme issue with it. 
It's not maintain by Google since it's deprecated. Force usage of MaterialAlertDialogBuilder to have the same UI effect. We sometimes need to block the UI :/
 2021-06-23 16:46:15 +02:00
Thor Arne Johansen 25b9547678 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 62.8% (1564 of 2490 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nb_NO/
 2021-06-23 14:34:46 +00:00
libexus 3b31f3956c Translated using Weblate (German) 
Currently translated at 99.9% (2488 of 2490 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2021-06-23 14:34:45 +00:00
Benoit Marty 11b16ea065 Colored dialog button is now handled by the theme 2021-06-23 14:50:34 +02:00
SpiritCroc 72aa4bb999 Merge tag 'v1.1.10' into sc 
Change-Id: I01e7b61adf9444e6894232235ee71ac8295b00ab

Conflicts:
	library/ui-styles/src/main/res/color/bottom_navigation_icon_tint_selector.xml
	library/ui-styles/src/main/res/drawable/splash.xml
	library/ui-styles/src/main/res/values/theme_light.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/accountdata/RoomAccountDataTypes.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewState.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
	vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
	vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
	vector/src/main/res/drawable/ic_attachment.xml
	vector/src/main/res/drawable/ic_insert_emoji.xml
	vector/src/main/res/drawable/ic_keyboard.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/fragment_home_detail.xml
	vector/src/main/res/layout/fragment_login_server_url_form.xml
	vector/src/main/res/layout/fragment_user_list.xml
	vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
	vector/src/main/res/layout/item_keys_backup_settings_button_footer.xml
	vector/src/main/res/layout/item_room.xml
	vector/src/main/res/layout/item_space_beta_header.xml
	vector/src/main/res/layout/item_suggested_room.xml
	vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
	vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
	vector/src/main/res/values/styles_riot.xml
 2021-06-23 13:38:41 +02:00
Benoit Marty d0a7265975 Reorder buttons 2021-06-23 13:01:48 +02:00
SpiritCroc 9ba32bc5bb Rework SC theme and more fix merge conflicts to make it compile again 
Note: SC colors still need work, this is just to make the semi-merge compile.

Change-Id: Iaf144e1ce6f349d10759ba1c22c3dc404dee4768
 2021-06-23 12:38:27 +02:00
SpiritCroc 7f84f79693 Re-enable crash report prompt onResume 
Change-Id: Id21aae4b2c24cdd3fd3ee0051a0369034c117cea
 2021-06-23 11:11:10 +02:00
SpiritCroc f66747e972 Merge commit '0f4e546e1e96c76219649d27eca38a98e6c04c5f' into sc 
Change-Id: I782ef7ae26d7a3c168d26a1458f84fbfe80e9767

Conflicts:
	vector/src/debug/res/layout/activity_debug_menu.xml
	vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt
	vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.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/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
	vector/src/main/java/im/vector/app/features/userdirectory/UserDirectoryUserItem.kt
	vector/src/main/res/color/bottom_navigation_icon_tint_selector.xml
	vector/src/main/res/color/button_positive_background_selector.xml
	vector/src/main/res/color/button_positive_text_color_selector.xml
	vector/src/main/res/color/checked_accent_color_selector.xml
	vector/src/main/res/color/login_button_tint.xml
	vector/src/main/res/drawable/bg_breadcrumbs_typing.xml
	vector/src/main/res/drawable/bg_login_server_checked.xml
	vector/src/main/res/drawable/bg_send.xml
	vector/src/main/res/drawable/highlighted_message_background.xml
	vector/src/main/res/drawable/ic_settings_root_advanced.xml
	vector/src/main/res/drawable/ic_settings_root_call.xml
	vector/src/main/res/drawable/ic_settings_root_flair.xml
	vector/src/main/res/drawable/ic_settings_root_general.xml
	vector/src/main/res/drawable/ic_settings_root_help_about.xml
	vector/src/main/res/drawable/ic_settings_root_ignored_users.xml
	vector/src/main/res/drawable/ic_settings_root_labs.xml
	vector/src/main/res/drawable/ic_settings_root_notification.xml
	vector/src/main/res/drawable/ic_settings_root_preferences.xml
	vector/src/main/res/drawable/ic_settings_root_security_privacy.xml
	vector/src/main/res/drawable/reaction_rounded_rect_shape.xml
	vector/src/main/res/drawable/splash.xml
	vector/src/main/res/drawable/vector_tabbar_selected_background.xml
	vector/src/main/res/layout/alerter_incoming_call_layout.xml
	vector/src/main/res/layout/custom_action_item_layout_badge.xml
	vector/src/main/res/layout/dialog_export_e2e_keys.xml
	vector/src/main/res/layout/dialog_import_e2e_keys.xml
	vector/src/main/res/layout/fragment_home_drawer.xml
	vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml
	vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml
	vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
	vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml
	vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
	vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
	vector/src/main/res/layout/fragment_login_server_selection.xml
	vector/src/main/res/layout/fragment_login_server_url_form.xml
	vector/src/main/res/layout/fragment_login_server_url_form_2.xml
	vector/src/main/res/layout/fragment_login_splash.xml
	vector/src/main/res/layout/fragment_public_rooms.xml
	vector/src/main/res/layout/fragment_qr_code_scanner.xml
	vector/src/main/res/layout/fragment_qr_code_scanner_with_button.xml
	vector/src/main/res/layout/fragment_review_terms.xml
	vector/src/main/res/layout/fragment_room_detail.xml
	vector/src/main/res/layout/fragment_space_add_rooms.xml
	vector/src/main/res/layout/fragment_space_create_generic_epoxy_form.xml
	vector/src/main/res/layout/item_bottom_sheet_action.xml
	vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
	vector/src/main/res/layout/item_form_submit_button.xml
	vector/src/main/res/layout/item_generic_list.xml
	vector/src/main/res/layout/item_generic_with_value.xml
	vector/src/main/res/layout/item_keys_backup_settings_button_footer.xml
	vector/src/main/res/layout/item_notification_troubleshoot.xml
	vector/src/main/res/layout/item_room.xml
	vector/src/main/res/layout/item_settings_centered_image.xml
	vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
	vector/src/main/res/layout/item_timeline_event_poll_stub.xml
	vector/src/main/res/layout/item_timeline_event_redacted_stub.xml
	vector/src/main/res/layout/item_verification_action.xml
	vector/src/main/res/layout/view_attachment_type_selector.xml
	vector/src/main/res/layout/view_bottom_sheet_action_button.xml
	vector/src/main/res/layout/view_call_controls.xml
	vector/src/main/res/menu/menu_submit.xml
	vector/src/main/res/menu/menu_timeline.xml
	vector/src/main/res/values/styles_riot.xml
	vector/src/main/res/values/theme_dark.xml
 2021-06-23 11:08:10 +02:00
Ridhubharan 13ec7a500a Added translation using Weblate (Tamil) 2021-06-22 17:31:49 +00:00
Valere 171793d190 room version cap support + room upgrade 2021-06-22 17:35:39 +02:00
ganfra 121fd9a19d Jump to unread: implement new design 2021-06-22 16:29:19 +02:00