Commit graph

7243 commits

Author SHA1 Message Date
SpiritCroc
26d178305e Automatic revert to unchanged upstream strings, pt.1
Change-Id: I6d2fe7f0634e303fd12e8d37f2aa2b6274dcaca1
2021-01-15 17:33:21 +01:00
SpiritCroc
0049f48148 Also fallback to other user's avatar for 2-person-rooms not marked as DM
Same behaviour as on desktop.

Change-Id: Ia32fad4f79c0615562b719fcf1013eca4575ee7f
2021-01-11 11:15:27 +01:00
Onuray Sahin
60b92b7d32 Fix membership event visibility condition.
Change-Id: I1a7ad10f845356c9056bb3f6842935a393e75e23
2021-01-07 09:51:15 +01:00
SpiritCroc
7c1361a223 Revert "Fix member state setting filter"
Upstream uses a different fix: https://github.com/vector-im/element-android/pull/2581

This reverts commit 8c2dbc342b.

Change-Id: I8e89dbffca2288a08c0ca95abd8e87890a3801b2
2021-01-07 09:51:12 +01:00
SpiritCroc
1f8dd9fb19 Add beta icon
Change-Id: Ib8623d1e29dc5b958816eb572ac5c075d5c4876d
2020-12-29 11:58:13 +01:00
SpiritCroc
dbda95afd7 fastlane: Fix source code link
Change-Id: I356e7fd2eb0293a73400bc4609f83af15ca77b5e
2020-12-29 10:57:15 +01:00
SpiritCroc
5640d5bebf Remove removed string from translation to fix lint
Change-Id: I45819a0da6e60d4dced58159ff001382d298bcea
2020-12-29 10:07:12 +01: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
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
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
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
89c8c86ec0 Make automated changelog shorter: F-Droid has a character limit here
Change-Id: I096745f1d80d4aed764f8402842c1c5874a47464
2020-12-22 14:30:45 +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
743b72d254 Update correct_strings.sh
Change-Id: I055245121f6abb43802aadf375849c0a5f38cc5d
2020-12-22 12:28:12 +01:00
SpiritCroc
4a726db856 Revert "Automatic SchildiChat string correction"
This reverts commit 40e3f9f097.

Change-Id: I319a351be0ad367102ec3aacaeb0f41c78da6dff
2020-12-22 12:18:00 +01: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
c775fa73ea Automatic upstream merge postprocessing
Change-Id: I3093ec9e4f74fe91ef1894b130b3cd188e5670d5
2020-12-22 09:24:46 +01:00
SpiritCroc
8da4044de6 Merge tag 'v1.0.13' into sc
Change-Id: Ica0f7dfed8acda02772a90e30bfba3f9d284c538
2020-12-22 09:24:31 +01:00
SpiritCroc
d0936d2b25 [TMP] Automatic upstream merge preparation
Change-Id: Ic52efb1677b303fc001ee2c63a912d2a3db63c45
2020-12-22 09:18:49 +01:00
SpiritCroc
c30a9b8a57 Move restore_{sc,upstream} to merge_helpers.sh
Easier to use manually

Change-Id: Ieb87301e2b0b5d7e1299d3d0c8d49992d4cdde63
2020-12-22 09:15:42 +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
SpiritCroc
68aab3b6d3 alternative_package.sh: Patch store description for test releases
Change-Id: Ic81a5753f384c4caa6e4fff21116631c21552f65
2020-12-20 13:11:16 +01:00
SpiritCroc
f689576fbf Allow to enable URL preview in encrypted rooms
Change-Id: Iac2fff47cc86bd77203c44ce0f39ff131c60a16c
2020-12-20 09:33:08 +01:00
SpiritCroc
11ef70d495 increment_version: improve automatic changelog
Change-Id: I532751e7650145f8c2aaef42b1a1dbe9468dd013
2020-12-20 09:25:13 +01: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