Commit graph

3042 commits

Author SHA1 Message Date
Marcel Hibbe
52b257d027
define other order of tabs
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-28 12:19:58 +02:00
Marcel Hibbe
0e75337caf
show items other than "media" as list (WIP)
extract hardcoding

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-28 12:16:31 +02:00
Marcel Hibbe
fa90155195
hide location and deck for now
because other fileParameters need to be handled

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-28 11:40:03 +02:00
Marcel Hibbe
b22b600352
initially load audio
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-28 10:58:27 +02:00
Marcel Hibbe
0ba74b1a30
replace hardcoded value for file previews
request maximum_file_preview_size instead hardcoded 100px for file previews

but somehow this his no effect because many file previews are not found on sermo?!

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-28 10:48:00 +02:00
Marcel Hibbe
cc2e0348e5
fix to show also files
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-28 10:40:23 +02:00
Nextcloud bot
773da84cd2
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-04-28 04:14:49 +00:00
Andy Scherzinger
5854a93b0d
remove unused string resources
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-27 23:47:46 +02:00
Andy Scherzinger
1ed32ad0a6
visually add tab bar to the toolbar
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-27 23:33:32 +02:00
Andy Scherzinger
9f52fffc11
set correct background color (curerntly creates a new lint warning)
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-27 23:29:03 +02:00
Andy Scherzinger
69b0cc683a
properly theme bars
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-27 23:25:06 +02:00
Marcel Hibbe
cad7b4cb3d
add tabLayout for file types (WIP)
quick&dirty, needs to be improved and might contain bugs

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-27 19:40:55 +02:00
Marcel Hibbe
3a1f3242d8
add fallback images for mimetypes if no preview image was found
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-27 17:17:34 +02:00
Tim Krüger
e1703aac24
Remove dark theme for app bar
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-04-27 15:26:28 +02:00
Marcel Hibbe
912bc3c8fe
open files from media view
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-27 14:16:22 +02:00
Marcel Hibbe
3a5a3cebfb
extract logic for downloading and opening files to helper class
this is done because in a next step this logic should also be used by the SharedItemsAdapter

extracting is not yet done in a clean way. in a next step some better architecture patterns must be used to separate layers

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
2022-04-27 14:15:59 +02:00
Tim Krüger
cf91e2390e
Fix ktlint issues
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-04-27 13:36:58 +02:00
Tim Krüger
df5c0044c1
Add app bar to view 'Shared items'
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-04-27 12:38:21 +02:00
Tim Krüger
d14f4b38ea
Check that header 'x-chat-last-given' exists
Without that check a null pointer exception occurs if the header is not
set.

Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-04-27 12:31:24 +02:00
Andy Scherzinger
a40e4111e1
replace avatar placeholder with file placeholder
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-26 20:58:50 +02:00
Andy Scherzinger
3beda5953c
use correct icon for shared items of a room
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-26 20:41:33 +02:00
Tim Krüger
53a1725606
Correct order of items in grid view
Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-04-26 12:13:41 +02:00
Tim Krüger
a1b7e1260c
Add overview for shared items of a conversation
Via the conversation info or the menu entry in the conversation menu a
overview of shared items can be opened.

Signed-off-by: Tim Krüger <t@timkrueger.me>
2022-04-25 16:15:44 +02:00
Tim Krueger
73b772dfa1
Merge pull request #1941 from nextcloud/fix-call-flags-in-video-calls
Fix call flags in video calls
2022-04-25 12:38:46 +02:00
Daniel Calviño Sánchez
07ca8c1e29
Fix call flags in video calls
The call flags describe the streams provided by the client, so in a
video call both audio and video are provided, not just video.

Note that as publishing permissions are currently not implemented in the
Android app the provided flags do not take into account the available
permissions. Nevertheless, the server restricts the flags based on the
permissions, so the other participants would see the appropriate flags.
In the future it would be better to send the right flags directly from
the Android app.

Similarly, for now, it is just assumed that both audio and video tracks
will be provided by the Android app, but the flags should reflect the
actually available tracks (for example, if it was not possible to get a
video track for some reason the call flags should not include
"WITH_VIDEO").

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2022-04-25 11:54:22 +02:00
Andy Scherzinger
6316c709ad
fix npe if message has no self reactions initially
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2022-04-24 21:51:56 +02:00
Nextcloud bot
7eedbb2a6c
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-04-24 04:16:35 +00:00
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