Benoit Marty
17e8581ef0
Merge pull request #2597 from Tigermouthbear/develop
...
Add System theme option and set as default
2020-12-29 09:47:58 +01:00
Benoit Marty
7ff45738e0
Merge pull request #2543 from vector-im/feature/ons/wait_members_before_sending_event
...
Make sure to load all members in the room before sending the event
2020-12-29 09:31:30 +01:00
Tigermouthbear
c9eacec449
Fix formatting in ThemeUtils
2020-12-29 00:22:12 -05:00
Tigermouthbear
3e78098c43
Add System theme option and set as default; closes #904 , closes #2387
2020-12-28 23:32:06 -05:00
SpiritCroc
cfbe6c753a
Refactor misleading "default"
...
This used to be the default, but was changed upstream to default
to something similar to our UNREAD_KIND_CONTENT.
Change-Id: Id0e46eebcd3505071f200cafd603fb9828c9a919
2020-12-28 16:27:01 +01:00
SpiritCroc
0c37405278
Room summary preview / unread kind depending on DMs vs groups
...
Closes https://github.com/SchildiChat/SchildiChat-android/issues/32
Change-Id: I4f4e3078e940dc80046d5d08628a1bdbed4fd55e
2020-12-28 16:17:42 +01:00
SpiritCroc
a365850516
Emoji-only messages big also when spaces included
...
Same behaviour as on desktop.
Fixes https://github.com/SchildiChat/SchildiChat-android/issues/31
Change-Id: I221e226cdebfc1e7b7d38ab439801ec542c969bf
2020-12-28 15:44:34 +01:00
Onuray Sahin
cbdacc199a
Disable scroll effect when click to a link in the topic.
2020-12-28 17:17:01 +03:00
SpiritCroc
dee1971814
Workaround for wrongly aligned textView for RTL locales
...
Change-Id: I77e48dbc8a0c93337d9c2d2c56025ae222d291d8
2020-12-28 14:20:30 +01:00
SpiritCroc
813d3679cd
Fix footer when text does not match the locale's RTL status
...
Change-Id: Iaaf3d5fc2f2bd1b635974494362ed6569962e67e
2020-12-28 14:00:37 +01:00
Benoit Marty
d1bec21759
Fix crash after migration to view bindings
...
Also rename some layouts to follow convention
2020-12-28 12:23:06 +01:00
Ngô Ngọc Đức Huy
761d8d89b0
Translated using Weblate (Vietnamese)
...
Currently translated at 10.8% (218 of 2018 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/vi/
2020-12-27 22:35:44 +00:00
Marcelo Filho
9ccb22015a
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 100.0% (2018 of 2018 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
2020-12-27 22:35:39 +00:00
SpiritCroc
2aaca9cea9
Add missing divider
...
Change-Id: Ib0884b131af664a6cd18226056c8ee09df208495
2020-12-27 15:01:32 +01:00
SpiritCroc
c61a909c71
Use AppCompatEditText instead of EmojiEditText
...
This avoids different emojis from the editText compared to other
messages and the system keyboard.
When using the inbuilt emoji picker, we get slightly different emojis
to the rest of the system and messages either way, so we might as well
start in the editText, to keep at least that one equal to the rest.
Change-Id: If4cf1dec0513ed725a3bb098cc05a5cd267860b0
2020-12-27 14:07:14 +01:00
SpiritCroc
7ecf8073ef
Increment version
...
Change-Id: Icd9bbfe6db69fc8a7b2de5626f4292d3664f4c5e
2020-12-27 11:29:47 +01:00
SpiritCroc
fcf623ce06
Disable setting for url previews in encrypted chats for disabled previews
...
Change-Id: I6af98d60a2c73ddccf6fd6b3e729689e601c185d
2020-12-27 09:44:54 +01:00
SpiritCroc
8c2dbc342b
Fix member state setting filter
...
What we want with that setting:
- When enabled, include all member state events
- When disable, exclude all member state events
What it did:
- When enabled, exclude all member state events except from the
logged-in user
- When disabled, include all member state events
Change-Id: I86eec2188163dc3265444e121d230ce0cb9c7f7a
2020-12-26 14:28:42 +01:00
Ngô Ngọc Đức Huy
6d1c53c7ed
Translated using Weblate (Vietnamese)
...
Currently translated at 7.2% (147 of 2018 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/vi/
2020-12-26 11:35:47 +00:00
Thomas Jensen
df3bb5b212
Translated using Weblate (Norwegian Bokmål)
...
Currently translated at 53.2% (1075 of 2018 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nb_NO/
2020-12-26 11:35:38 +00:00
Ngô Ngọc Đức Huy
5768e45809
Added translation using Weblate (Vietnamese)
2020-12-25 10:31:01 +00:00
LinAGKar
ba6dffc0bf
Translated using Weblate (Swedish)
...
Currently translated at 95.8% (1934 of 2018 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
2020-12-24 19:35:58 +00:00
eman luff
d3acf7e862
Translated using Weblate (Polish)
...
Currently translated at 98.5% (1988 of 2018 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
2020-12-24 19:35:57 +00:00
Thomas Jensen
5c6d710f2d
Translated using Weblate (Norwegian Bokmål)
...
Currently translated at 52.5% (1061 of 2018 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nb_NO/
2020-12-24 19:35:50 +00:00
SpiritCroc
7c5d49909c
Apply rebrand to open_source_licenses.html
...
Change-Id: I6b6ceb77a1d964ecceaab9833309e4fcb2fc0bf4
2020-12-24 12:29:12 +01:00
SpiritCroc
2542247d6a
Update link to privacy policy
...
Change-Id: I8e69b0b3b8a6a68bcc80c871988cf6edf4af8eb9
2020-12-24 12:21:48 +01:00
SpiritCroc
1a6d8398aa
Fix incomplete reactions bubble alignment
...
Related to:
fa5acb49c
Align reactions better with message bubbles
We do not want to change the alignment for views that draw actual
bubbles, but also pseudo-bubbles, such as media items.
Change-Id: Ie6e0e8d9145239d284ee4e35987459a9184e48ff
2020-12-24 12:08:46 +01:00
SpiritCroc
b6f2ca85f7
Fix hiding attachment-button, not emoji-button for replies
...
Broken in f5054106e8:
"Exchange emoji and attachments button back to familiar layout"
We cannot animate attachments view out to the side as elegantly as before,
but we can move it out at the bottom.
Change-Id: I1060a95ee583bb1e73259bb86f85741ef5b27f31
2020-12-24 11:54:27 +01:00
SpiritCroc
a5c84c4f32
Slightly smaller emoji and attachments buttons for more typing space
...
Change-Id: If43b6ed01e8ead20d8757c8e6172fb562acc40c8
2020-12-22 19:46:59 +01:00
SpiritCroc
f5054106e8
Exchange emoji and attachments button back to familiar layout
...
Also drop the layout_goneMarginEnd attribute.
Change-Id: I0782a92947a470e233e2596a721d7a652fa37c7e
2020-12-22 19:44:26 +01:00
SpiritCroc
12eb1ea68d
Hide empty URL previews
...
Change-Id: I10a2f78e7efa96249adb7cd4849e54150a08001a
2020-12-22 14:26:20 +01:00
SpiritCroc
9e99fcb7ff
Fix german translation again
...
Change-Id: Ib51fd445cae5b6ad741ae611d56651b07c040274
2020-12-22 12:35:15 +01:00
SpiritCroc
99b943c737
Automatic SchildiChat string correction
...
Change-Id: I6647eaab5a272cc6450f55df83f1278a632af28b
2020-12-22 12:28:32 +01:00
SpiritCroc
4a726db856
Revert "Automatic SchildiChat string correction"
...
This reverts commit 40e3f9f097
.
Change-Id: I319a351be0ad367102ec3aacaeb0f41c78da6dff
2020-12-22 12:18:00 +01:00
Rachida S
ab23d9b715
Translated using Weblate (Kabyle)
...
Currently translated at 96.8% (1955 of 2018 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/kab/
2020-12-22 10:36:04 +00:00
Ihor Hordiichuk
b082a009a7
Translated using Weblate (Ukrainian)
...
Currently translated at 48.4% (977 of 2018 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
2020-12-22 10:35:59 +00:00
eman luff
cdeb2663fe
Translated using Weblate (Polish)
...
Currently translated at 92.6% (1869 of 2018 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
2020-12-22 10:35:57 +00:00
aka. nils on element-translations
a5e979b763
Translated using Weblate (Norwegian Nynorsk)
...
Currently translated at 43.3% (874 of 2018 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nn/
2020-12-22 10:35:39 +00:00
reg4xp
be0cadb3c7
Translated using Weblate (Persian)
...
Currently translated at 99.7% (2013 of 2018 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
2020-12-22 10:35:37 +00:00
SpiritCroc
d3700cecc3
Properly reserve space in URL-previews for time footer
...
Change-Id: Iee60d34086a8b1e2b9b70674eb77df2220dff1e5
2020-12-22 11:27:15 +01:00
SpiritCroc
c01d4cdc9c
Fix tertiary color with sc dark themes
...
Change-Id: I643110fd429f62381f84905bcb1cd8384c935f8f
2020-12-22 10:06:54 +01:00
SpiritCroc
40e3f9f097
Automatic SchildiChat string correction
...
Change-Id: I5a0039645e21bf4132f1d707d7a7774500450bec
2020-12-22 09:25:30 +01:00
SpiritCroc
8da4044de6
Merge tag 'v1.0.13' into sc
...
Change-Id: Ica0f7dfed8acda02772a90e30bfba3f9d284c538
2020-12-22 09:24:31 +01:00
SpiritCroc
15f3974b89
Revert "Automatic SchildiChat string correction"
...
This reverts commit 77bfa1a687
.
2020-12-22 09:14:00 +01:00
SpiritCroc
fa5acb49ca
Align reactions better with message bubbles
...
Change-Id: I128a23009b1636ce10619e17fccc507fc39028d4
2020-12-21 18:29:48 +01:00
SpiritCroc
794325f74e
Unify compose area icon colors
...
Change-Id: I55b197eb15296f0b47565e50e2c2f90178799453
2020-12-21 18:03:56 +01:00
SpiritCroc
a5d96b729e
Make composer layout smaller (as before 1.0.12 merge)
...
Change-Id: I39de8014a113b9673e3899669e72adf0e6cbcb7a
2020-12-21 16:43:54 +01:00
SpiritCroc
4b279f78a3
Replace insert-emoji icon
...
Change-Id: I78a80dee129c0f86573e45505a7dde52b3584b3f
2020-12-21 16:23:49 +01:00
SpiritCroc
04aadb6e5b
SC ic_send does not need background drawable
...
Change-Id: Id4ed497bc7f6deaca9e700269cb1fafc50b92b7b
2020-12-21 16:21:51 +01:00
SpiritCroc
6307bc9909
Notification test: no in-app bug reports for Schildi yet
...
Change-Id: I803e4fbe3c71da87e0d91df767f77c302cc11e37
2020-12-21 16:21:24 +01:00
SpiritCroc
4cb69860fc
Schildify test notification
...
Change-Id: Iaa31d1c00b2cfbd88e259423feeb8549ad5f9ddf
2020-12-21 16:21:20 +01:00
Benoit Marty
36a553a886
Let the Matrix SDK compute the Fallback urls
2020-12-21 12:08:49 +01:00
Benoit Marty
13938f2ab3
Let the Matrix SDK compute the SSO url
2020-12-21 11:26:57 +01:00
Onuray Sahin
a755536a2f
Merge branch 'develop' into feature/ons/wait_members_before_sending_event
2020-12-21 12:41:24 +03:00
Benoit Marty
4a5dbde8d3
Merge pull request #2558 from aqulu/fix/bottomsheet-viewbinding
...
Release VectorBaseBottomSheetDialogFragment bindings when view destroyed
2020-12-20 20:44:37 +01:00
Benoit Marty
5744939c05
Merge pull request #2561 from SpiritCroc/url_preview_visibility
...
Properly hide preview URLs for messages that don't support previews
2020-12-20 20:40:19 +01:00
Rachida S
3e420033c5
Translated using Weblate (Kabyle)
...
Currently translated at 91.6% (1849 of 2018 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/kab/
2020-12-20 19:35:42 +00:00
strix aluco
4e73705378
Translated using Weblate (Ukrainian)
...
Currently translated at 47.7% (963 of 2018 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
2020-12-20 19:35:41 +00:00
Nikita Epifanov
611e1185c8
Translated using Weblate (Russian)
...
Currently translated at 100.0% (2018 of 2018 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
2020-12-20 19:35:41 +00:00
Nils Haugen
b90d8e6238
Translated using Weblate (Norwegian Nynorsk)
...
Currently translated at 40.8% (824 of 2018 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nn/
2020-12-20 19:35:41 +00:00
notramo
ad3573226c
Translated using Weblate (Hungarian)
...
Currently translated at 92.3% (1864 of 2018 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/hu/
2020-12-20 19:35:40 +00:00
reg4xp
1cc0825b54
Translated using Weblate (Persian)
...
Currently translated at 99.2% (2002 of 2018 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
2020-12-20 19:35:38 +00:00
Priit Jõerüüt
87ac4ec5d4
Translated using Weblate (Estonian)
...
Currently translated at 100.0% (2018 of 2018 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
2020-12-20 19:35:37 +00:00
The one with the braid
8344506b05
Translated using Weblate (German)
...
Currently translated at 97.0% (1958 of 2018 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
2020-12-20 19:35:36 +00:00
SpiritCroc
f689576fbf
Allow to enable URL preview in encrypted rooms
...
Change-Id: Iac2fff47cc86bd77203c44ce0f39ff131c60a16c
2020-12-20 09:33:08 +01:00
SpiritCroc
d5e76c515e
Enable URL-previews for notices
...
Desktop has those too.
2020-12-20 09:10:37 +01:00
SpiritCroc
9fcf7263b5
Properly hide preview URLs for messages that don't support previews
...
Notices and formatted messages don't have imageContentRenderer and
previewUrlRetriever set.
Accordingly, when recycling messages that previously had an URL preview,
we do not want to keep that preview, but actually hide it, instead of
returning early (without rendering any update).
2020-12-20 09:05:15 +01:00
aqulu
0059fdf174
Release VectorBaseBottomSheetDialogFragment bindings when view destroyed
...
Signed-off-by: aqulu <dev@aqu.lu>
2020-12-20 13:55:32 +09:00
SpiritCroc
997fcf8fff
Enable URL-previews for m.notice
...
Desktop has those too.
Change-Id: I14fd4b3afff17b23e34ea78a4cd7948b85816a2f
2020-12-19 20:17:25 +01:00
SpiritCroc
5f30336542
Properly hide preview URLs for notices
...
Notices don't have imageContentRenderer and previewUrlRetriever set.
Accordingly, when recycling messages that previously had an URL preview,
we do not want to keep that preview, but actually hide it, instead of
returning early.
Change-Id: I245d4bf5006ffc756fa35196351decb9cdabfb8a
2020-12-19 19:56:47 +01:00
SpiritCroc
002edb5e36
[WIP] PreviewUrl-fixes for bubble layout
...
- Always use maximum available width for the preview
- TODO reserve footer for time
- TODO fix upstream bug which comes more apparent on Schildi:
fast scrolling leads to previews attached to wrong messages
Change-Id: Ie8447b7a9dbace54e38c14fc7d281b7f3887736c
2020-12-19 11:37:15 +01:00
Onuray Sahin
5d8f365520
Load room members seamlessly when timeline is starting.
2020-12-18 16:00:32 +01:00
Benoit Marty
2b780a8b76
Merge pull request #2542 from vector-im/feature/bma/view_bindings
...
View bindings
2020-12-18 15:57:34 +01:00
Benoit Marty
0518e5f18d
Version++
2020-12-18 11:03:01 +01:00
Benoit Marty
68cd06f1fb
Improve redirect url, which can be visible to the user: "element://element" -> "element://connect"
2020-12-17 12:11:30 +01:00
Benoit Marty
c7afcf4ff2
Fix compilation issue
2020-12-17 12:10:55 +01:00
Travis Ralston
ea6fde3ed0
Make MSC2858 implementation match the unstable policy of the spec
...
See https://github.com/matrix-org/matrix-doc/pull/2858/files#r543567196
2020-12-17 12:09:34 +01:00
Benoit Marty
267a7a36ff
Translated using Weblate (Slovenian)
...
Currently translated at 0.3% (7 of 2018 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sl/
2020-12-17 06:35:49 +00:00
Jeff Huang
d095784bfc
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (2018 of 2018 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
2020-12-17 06:35:46 +00:00
Ihor Hordiichuk
1ac1d32b3a
Translated using Weblate (Ukrainian)
...
Currently translated at 47.7% (963 of 2018 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
2020-12-17 06:35:44 +00:00
Besnik Bleta
518b207f63
Translated using Weblate (Albanian)
...
Currently translated at 99.6% (2010 of 2018 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sq/
2020-12-17 06:35:44 +00:00
Nikita Epifanov
16ba5d2416
Translated using Weblate (Russian)
...
Currently translated at 100.0% (2018 of 2018 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ru/
2020-12-17 06:35:42 +00:00
Marcelo Filho
ac6e7652bd
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 99.1% (2000 of 2018 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
2020-12-17 06:35:40 +00:00
random
cc3e090855
Translated using Weblate (Italian)
...
Currently translated at 100.0% (2018 of 2018 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
2020-12-17 06:35:39 +00:00
Priit Jõerüüt
30e4fdebd7
Translated using Weblate (Estonian)
...
Currently translated at 100.0% (2018 of 2018 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
2020-12-17 06:35:37 +00:00
Benoit Marty
27e5626fcf
Test has been passed!
2020-12-16 16:07:18 +01:00
Benoit Marty
8878cb41ee
Fix issue with not clickable item
2020-12-16 16:04:57 +01:00
Benoit Marty
10575698de
Avoid blink effect
2020-12-16 15:51:30 +01:00
Benoit Marty
451750f08a
Improve code (items still not clickable)
2020-12-16 15:48:39 +01:00
Benoit Marty
929d711149
Split long lines and cleanup
2020-12-16 14:33:44 +01:00
Benoit Marty
b52f8b1dbf
Fix crash
2020-12-16 14:31:14 +01:00
Benoit Marty
aa0a851b35
Restore waiting view management
2020-12-16 13:32:49 +01:00
Benoit Marty
4ddc8e706d
Fix issue with coordinator Layout
2020-12-16 13:23:42 +01:00
Benoit Marty
da2a0abf45
Provide CoordinatorLayout when available
2020-12-16 12:39:22 +01:00
Benoit Marty
53a0e0ce10
Remove useless @Inject
2020-12-16 12:22:28 +01:00
Benoit Marty
7f02c0596e
Fix strange crash
2020-12-16 12:21:25 +01:00
Benoit Marty
e081c3b249
Add TODO
2020-12-16 12:09:23 +01:00
Benoit Marty
8db4da5473
Fix crash
2020-12-16 11:45:06 +01:00
Benoit Marty
d389581d96
Better binding
2020-12-16 11:18:25 +01:00
Benoit Marty
018574a21e
Rename some view ids
2020-12-16 11:10:49 +01:00
Benoit Marty
9e3eb993ee
Fix some crashes
2020-12-16 10:36:33 +01:00
Benoit Marty
6c64fb2169
Fix some crashes
2020-12-16 10:16:33 +01:00
Benoit Marty
2e70808bbd
Fix some crashes
2020-12-16 04:16:34 +01:00
Benoit Marty
18bf9856fe
Migrate to ViewBindings ( #1072 ) - WIP
2020-12-16 03:57:19 +01:00
Benoit Marty
f09ee5016a
Migrate to ViewBindings ( #1072 ) - WIP
2020-12-16 03:41:02 +01:00
Benoit Marty
4d3c4b5afc
Migrate to ViewBindings ( #1072 ) - WIP
2020-12-16 03:38:07 +01:00
Benoit Marty
7de2494af2
Migrate to ViewBindings ( #1072 ) - WIP
2020-12-16 03:25:17 +01:00
Benoit Marty
409d7e50bb
Migrate to ViewBindings ( #1072 ) - WIP
2020-12-16 02:59:03 +01:00
Benoit Marty
c1222737d6
Migrate to ViewBindings ( #1072 ) - WIP
2020-12-16 02:49:22 +01:00
Benoit Marty
a8c6b1cdf7
Migrate to ViewBindings ( #1072 ) - WIP
2020-12-16 02:33:52 +01:00
Benoit Marty
dba65dcd22
Migrate to ViewBindings ( #1072 ) - WIP
2020-12-16 02:05:38 +01:00
Benoit Marty
706736273c
Migrate to ViewBindings ( #1072 ) - WIP
2020-12-16 00:46:52 +01:00
Benoit Marty
838340bbc8
Remove dependency to Butterknife
2020-12-15 20:33:55 +01:00
Benoit Marty
75ec9ba3d9
Reduce dependency on Butterknife: remove usage of @BindView
2020-12-15 20:32:26 +01:00
Benoit Marty
876359539f
Reduce dependency on Butterknife: remove usage of @OnClick and @OnTextChange
2020-12-15 18:52:36 +01:00
SpiritCroc
77bfa1a687
Automatic SchildiChat string correction
...
Change-Id: Ib449487f435c24214e5856311683d857844d3047
2020-12-15 16:18:37 +01:00
SpiritCroc
a35e246c4d
Automatic color correction
...
Change-Id: I83f5aed8537cf48dc2f9317b1481b84d63625e64
2020-12-15 15:55:57 +01:00
SpiritCroc
38b82fb823
Merge tag 'v1.0.12' into sc
...
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
vector/src/main/java/im/vector/app/features/home/HomeActivity.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/item/MessageTextItem.kt
vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
vector/src/main/java/im/vector/app/features/roomprofile/settings/RoomSettingsController.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/layout/item_bottom_sheet_action.xml
vector/src/main/res/layout/item_timeline_event_base.xml
vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
vector/src/main/res/values-v23/theme_status.xml
vector/src/main/res/values/array.xml
vector/src/main/res/values/theme_status.xml
Note to self: need to check if URL preview works with wrap_content
Change-Id: I028b2873a33bb1a770f2da96d576b97202b5bcf9
2020-12-15 15:55:14 +01:00
SpiritCroc
310b7a262c
Automatic revert to unchanged upstream strings, pt.1
...
Change-Id: I77578d6304946bb60a67134b1b2e034c919d0e73
2020-12-15 15:00:31 +01:00
Benoit Marty
6cdb192955
Version++
2020-12-15 14:18:35 +01:00
Benoit Marty
bb9a08d429
/confetti /snow commands: send emote if text is blank (iso Element Web)
2020-12-15 12:19:31 +01:00
Benoit Marty
88a4dfd094
Ensure the message is understood as a debug indication ( #2509 )
2020-12-15 12:19:31 +01:00
Benoit Marty
7828e3f501
Merge pull request #2485 from vector-im/feature/ons/fix_hide_state_events
...
Fix UTD when hiding member state events.
2020-12-15 12:16:27 +01:00
Benoit Marty
487ef870f9
Add /snow command
2020-12-15 10:56:05 +01:00
Benoit Marty
6957768567
PR Review
2020-12-15 10:21:12 +01:00
Valere
7da8b13cde
Chat Effects
2020-12-15 09:39:16 +01:00
Benoit Marty
a027ef29e5
Merge pull request #2484 from vector-im/feature/bca/social_login
...
Social Login
2020-12-14 18:19:23 +01:00
Benoit Marty
2d4eeb64c5
Translated using Weblate (French)
...
Currently translated at 98.2% (1982 of 2018 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
2020-12-14 16:37:12 +00:00
Weblate
3813f6d659
Merge branch 'origin/develop' into Weblate.
2020-12-14 15:45:20 +00:00
Ihor Hordiichuk
545e13c843
Translated using Weblate (Ukrainian)
...
Currently translated at 48.0% (955 of 1986 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
2020-12-14 15:35:35 +00:00
Besnik Bleta
995ec25990
Translated using Weblate (Albanian)
...
Currently translated at 99.4% (1975 of 1986 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sq/
2020-12-14 15:35:35 +00:00
Benoit Marty
09040b7095
Clear history ( #1933 )
2020-12-14 16:22:22 +01:00
Benoit Marty
5a69b33600
Move style for social login to a dedicated file
2020-12-14 15:53:16 +01:00
Benoit Marty
c8c4e10822
Cleanup layout
2020-12-14 15:46:31 +01:00
Benoit Marty
2f616cb6c5
Add some constants
2020-12-14 15:41:33 +01:00
Benoit Marty
776d7699bc
Do not modify the DB in debug mode, and add to history only if valid
2020-12-14 15:33:32 +01:00
Benoit Marty
f3578e2538
Cleanup
2020-12-14 15:17:07 +01:00
Benoit Marty
8022430f0d
Remove useless override
2020-12-14 15:14:46 +01:00
Benoit Marty
eb72d0c6d3
Revert formatting change
2020-12-14 15:13:08 +01:00
Benoit Marty
ae29cbdc34
Better name
2020-12-14 15:11:02 +01:00
Benoit Marty
cf59c7db95
Cleanup
2020-12-14 15:09:10 +01:00
Benoit Marty
b31dfcfe4f
IdentityProvider -> SsoIdentityProvider
2020-12-14 14:32:20 +01:00
Benoit Marty
bba2daf0fc
Capital H for GitHub
2020-12-14 14:13:50 +01:00
Valere
0fd8641cf6
Fix copyright + lint
2020-12-14 14:05:57 +01:00
Valere
26c01d46a7
Code review + Completion layout res
2020-12-14 14:05:57 +01:00
Valere
42d1bf57f6
Refactor + fix sso in LoginFragment
2020-12-14 14:05:57 +01:00
Valere
351793d456
Fix / support sso_with_password flow when no providers
2020-12-14 14:05:57 +01:00
Valere
03428ea9f5
Social Login
...
And new custom homeserver completion (and remember history)
2020-12-14 14:05:57 +01:00
Onuray Sahin
b321838502
Merge branch 'develop' into feature/ons/fix_hide_state_events
2020-12-14 12:03:49 +03:00
strix aluco
f83b478008
Translated using Weblate (Ukrainian)
...
Currently translated at 48.0% (955 of 1986 strings)
Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
2020-12-13 14:35:36 +00:00