Commit graph

3015 commits

Author SHA1 Message Date
Andy Scherzinger
e43c838fe7
convert into constant
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-23 13:22:25 +02:00
Marcel Hibbe
2495c25f22
add workaround to avoid emoji picker to take the full screen height
The toggleEmojiPopup method is a hacky workaround to avoid bug #1914
As the bug happens only for the very first time when the popup is opened,
it is closed after some milliseconds and opened again.

200 milliseconds seems to be a good value to initialize the popup correctly with the desired size

downside: there is even some flickering when opening the "more emojis" window

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-22 19:09:37 +02:00
Tim Krueger
f7dcf58d3c
Merge pull request #1940 from nextcloud/fix-trying-to-establish-a-connection-before-a-participant-joins-the-call
Fix trying to establish a connection before a participant joins the call
2022-04-22 17:16:08 +02:00
Daniel Calviño Sánchez
5bd920142c Create a connection only for offers instead of for any message
The Android app creates a connection with a participant when that
participant joins the call and ends it when the participant leaves the
call. However, it also created a connection when any signaling message
was received from a participant that had no connection yet. Due to this
if a signaling message was received from a participant before that
participant was in the call the Android app tried to establish a
connection too soon, which would be rejected by the HPB.

Similarly, if a signaling message was received from a participant after
that participant left the call a connection will try to be established.
That would fail, but the connection object was not removed, and if that
participant joined the call again no connection would be established, as
a connection for that participant was already found, even if it was not
usable.

To solve that now a connection is created when a signaling message is
received only if that message is an offer (which is necessary without
HPB if the other participant sends the offer before this participant
"noticed" that she is in the call); otherwise the message is ignored.

Besides that a connection will no longer be created either when setting
up the video stream. However, this would be just for correctness and it
should not make any difference, as the MediaStreamEvents that cause that
are only emitted by changes in peer connections, so they should be
already created.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2022-04-22 14:38:26 +02:00
Andy Scherzinger
a823cefb5f
add license header
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-22 11:28:09 +02:00
Andy Scherzinger
9314be1e3d
fix lint score
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-22 11:28:09 +02:00
Andy Scherzinger
4c64686abc
align remaining bottom sheets with clickable background animation
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-22 11:28:09 +02:00
Andy Scherzinger
fc0df0a9b3
remove reaction in case of already reacted
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-22 11:28:08 +02:00
Andy Scherzinger
7450fa6b10
fix emoji picker alignments in bottom sheet
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-22 11:28:08 +02:00
Andy Scherzinger
6f246a1001
add visual to reactions bottom sheet if self is true
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-22 11:28:08 +02:00
Andy Scherzinger
2df414cb63
format kotlin
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-22 11:28:08 +02:00
Andy Scherzinger
a55a5536dc
remove unused color resource
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-22 11:28:08 +02:00
Andy Scherzinger
e2015f2810
further improve padding/margin of reactions
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-22 11:28:08 +02:00
Andy Scherzinger
9ec7feaaee
prevent NPE when adding the very first own reaction to a message
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-22 11:28:07 +02:00
Marcel Hibbe
55a48585a7
don't dismiss dialog when clicked on reaction of someone else
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-22 11:28:07 +02:00
Marcel Hibbe
b136465415
fix more emojis ("...") color
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-22 11:28:07 +02:00
Marcel Hibbe
31bb614bac
highlight own emoji immediately when reacted via app
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-22 11:28:07 +02:00
Andy Scherzinger
dd59d2dd20
improve reactions alignment
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-22 11:28:07 +02:00
Andy Scherzinger
0975968ff9
use lighter color for dark theme reaction chip background
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-22 11:28:06 +02:00
Andy Scherzinger
a5aecbcaa1
replace further contexts for proper day/night theming
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-22 11:28:06 +02:00
Andy Scherzinger
583b52588c
use proper context to be day/night aware
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-22 11:28:06 +02:00
Marcel Hibbe
fd98ccc816
add chip styled background to self reaction (wip)
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-22 11:28:05 +02:00
Marcel Hibbe
454200d797
add error message to log
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-22 11:28:05 +02:00
Marcel Hibbe
f945694a14
fix textcolor for reaction amount
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-22 11:28:04 +02:00
Nextcloud bot
20bebbecc0
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-04-22 04:06:42 +00:00
Daniel Calviño Sánchez
a8045880f9 Rename method to a more consistent name with its sibling method
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2022-04-22 02:31:21 +02:00
Daniel Calviño Sánchez
c769ff0fd0 Rename method to a more accurate name
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2022-04-22 02:30:46 +02:00
Marcel Hibbe
1cf55c6e8e
fix text for reaction notification
hide content title for one2one rooms and reactions

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-21 17:12:50 +02:00
Nextcloud bot
75b0f7af5d
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-04-21 04:04:59 +00:00
Marcel Hibbe
93e9b362b6
avoid crash when clicking on header in conversation search mode
fix #1893

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-20 20:58:11 +02:00
Andy Scherzinger
0123cbbdbf
Merge pull request #1926 from nextcloud/bugfix/1908/nullHardening
Move to a more hardened null-handling profile data handling
2022-04-20 10:20:49 +02:00
Nextcloud bot
938d709217
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-04-20 04:06:13 +00:00
Andy Scherzinger
300e7da172
extract method to reduce complexity
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-19 18:14:18 +02:00
Andy Scherzinger
c93041d402
move to a more hardened null-handling profile data handling
Fixes #1908

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-19 17:40:14 +02:00
Andy Scherzinger
746c3a8a4e
catch NPE when UI is already teared down
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-19 17:09:16 +02:00
Dariusz Olszewski
5dca8bcb7d
Use setBackstack when starting new MainActivity from notification
Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
2022-04-19 12:57:32 +02:00
Nextcloud bot
f19b60a965
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-04-15 04:07:48 +00:00
Nextcloud bot
cfb857461c
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-04-13 04:08:13 +00:00
Nextcloud bot
582099f472
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-04-12 04:06:19 +00:00
Nextcloud bot
883e1eb403
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-04-11 04:05:57 +00:00
Marcel Hibbe
3d4f3eeb54
open reactions menu when long click on emojis in message
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-09 23:05:32 +02:00
Marcel Hibbe
7dd7738c04
use toggle for emoji popup
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-08 17:11:40 +02:00
Marcel Hibbe
17a8c48078
order emojis by amount
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-08 14:57:02 +02:00
Marcel Hibbe
54c40e99ef
hide amount in message if it's only 1
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-08 14:56:18 +02:00
Marcel Hibbe
0b1f7cb783
reorder message action items
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-08 14:24:55 +02:00
Marcel Hibbe
07299bb32a
use light textcolor for reactions for outgoing message
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-08 13:59:24 +02:00
Marcel Hibbe
3f987fcdad
fix import of coil
this must have been removed when auto cleaning imports while there was a problem to find the coil lib

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-08 13:56:57 +02:00
Marcel Hibbe
73d50c4f0e
add reactions for LocationMessageViewHolders
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-08 13:22:26 +02:00
Marcel Hibbe
c4de77ce00
fix to hide MessageActionsDialog for system messages
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-08 12:19:52 +02:00
Andy Scherzinger
7e5056e6e5
fix background color of incoming text messages / system messages
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-08 09:54:32 +02:00
Marcel Hibbe
65fb284c6c
add reactions for previewMessageHolders
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-08 09:21:15 +02:00
Andy Scherzinger
0b49f6fc65
add license header
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-08 09:21:14 +02:00
Andy Scherzinger
f9495e4b89
optimize reactions list height
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-08 09:21:14 +02:00
Andy Scherzinger
b4316ecaad
fix code checks warnings
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-08 09:21:14 +02:00
Andy Scherzinger
2068faa80e
correct tab listerner initialization
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-08 09:21:14 +02:00
Andy Scherzinger
660c3401f2
sort reaction lists
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-08 09:21:14 +02:00
Marcel Hibbe
2aa7a5eb67
rename adapter interface for voice messages
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-08 09:21:14 +02:00
Andy Scherzinger
0051d1d686
pin size of the bottom sheet
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-08 09:21:13 +02:00
Andy Scherzinger
6bda280d15
Add "all" tab for reactions
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-08 09:21:13 +02:00
Marcel Hibbe
357c67db83
fix to update UI only if reaction was actually added
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-08 09:21:13 +02:00
Marcel Hibbe
36b786616a
support reactions for TextMessages (in+out) and VoiceMessages (in+out)
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-08 09:21:13 +02:00
Andy Scherzinger
f17e892acd
improve detekt and format kotlin code
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-08 09:21:13 +02:00
Andy Scherzinger
500d651d69
replace emoji selection with tab layout
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-08 09:21:12 +02:00
Andy Scherzinger
2f16c1c646
polish message bottom sheet
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-08 09:21:12 +02:00
Marcel Hibbe
aa5046cf27
add ability to delete reactions
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-08 09:21:12 +02:00
Marcel Hibbe
4e727924c2
fix to send reaction for message that has no reactions yet
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-08 09:21:12 +02:00
Marcel Hibbe
4670854848
show emoji picker to send reaction (buggy)
emoji picker SOMETIMES opens in full height.
this is a bug inside the emoji picker lib, see https://github.com/vanniktech/Emoji/issues/474

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-08 09:21:12 +02:00
Marcel Hibbe
f4ab037a44
add ability to send emoji
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-08 09:21:12 +02:00
Marcel Hibbe
a8b120a345
fix background color for bg_bottom_sheet
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-08 09:21:11 +02:00
Andy Scherzinger
65e447b6a5
add some margins to the reactions on a message
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-08 09:21:11 +02:00
Andy Scherzinger
deac2059ff
improve lint/detekt
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-08 09:21:11 +02:00
Marcel Hibbe
eb961b0452
minor cleanup after merge
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-08 09:21:11 +02:00
Marcel Hibbe
9c0ea73b5d
fix parsing of json of emoji voters
basic update for emoji voters in UI

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-08 09:21:11 +02:00
Marcel Hibbe
f61872af7c
remove redundant code for reactions recyclerview
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-08 09:21:10 +02:00
Andy Scherzinger
c4632f5d42
load avatars of reaction actors, optimize layout
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-08 09:21:10 +02:00
Andy Scherzinger
646e857e74
remove unused color definition
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-08 09:21:10 +02:00
Andy Scherzinger
6222c6b146
further harmonize the icon colos for bottom sheet menus
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-08 09:21:10 +02:00
Andy Scherzinger
b66474dcb5
update bottom sheet design to latest material3, including icon tinting
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-08 09:21:09 +02:00
Andy Scherzinger
06f42a4c00
Render list of reactions in recycler view in bottom sheet
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-08 09:21:09 +02:00
Andy Scherzinger
c19dd5fc71
hide reactions when not supported by server
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-08 09:21:09 +02:00
Marcel Hibbe
4abe8ae41d
add details view for reactions (WIP)
TODO: encoding for emoji is wrong to send it to server
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-08 09:21:09 +02:00
Andy Scherzinger
402a1bd3c3
organize imports
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-08 09:21:08 +02:00
Andy Scherzinger
3daaa8152e
fic kotlin formatting
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-08 09:21:08 +02:00
Andy Scherzinger
60b277637b
improve detekt score
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-08 09:21:08 +02:00
Andy Scherzinger
b06927726c
emoji bar for chat message bottomsheet
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-08 09:21:08 +02:00
Marcel Hibbe
d845422097
open dialog when clicked on reactions (WIP)
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-08 09:21:08 +02:00
Marcel Hibbe
382f17ca55
add margin between reactions
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-08 09:21:07 +02:00
Marcel Hibbe
818a8341a7
fix to hide avatar for 1to1conversations when reaction is received by system message
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-08 09:21:07 +02:00
Marcel Hibbe
d7e203ee7a
align emojis to left
not sure if this change might introduce bugs.
for now i don't see any reason why there was
app:justifyContent="flex_end"

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-08 09:21:07 +02:00
Marcel Hibbe
34422f7b20
fix to removeAllViews also for messages without emojis
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-08 09:21:06 +02:00
Marcel Hibbe
2a1f2becbd
show max 4 emojis under message
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-08 09:21:06 +02:00
Marcel Hibbe
f45b48898f
update emojis when system message arrived
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-08 09:21:06 +02:00
Marcel Hibbe
db8c4dd18a
move emojis inside bubble
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-08 09:21:06 +02:00
Marcel Hibbe
dd603f25cf
add reactions to incoming text message (wip)
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-08 09:21:05 +02:00
Marcel Hibbe
0b898616a2
hide system messages related to reactions
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-08 09:21:05 +02:00
Marcel Hibbe
2986f7c3a5
add system messages for reactions
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-08 09:21:05 +02:00
Nextcloud bot
2fa871fd51
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-04-06 04:07:42 +00:00
Nextcloud bot
f9cea95547
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-04-05 04:08:15 +00:00
Andy Scherzinger
9dc493b2f7
move popup menu to custom bottom sheet
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-01 11:33:18 +02:00
Marcel Hibbe
49fd2640bf
rename method
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-03-30 12:08:54 +02:00