mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-28 11:58:35 +03:00
Code Issues Projects Releases Packages Wiki Activity
13413 commits 7 branches 124 tags 230 MiB
Commit graph

8008 commits

Author SHA1 Message Date
Benoit Marty
c479073583
Merge pull request #5129 from vector-im/feature/aris/threads_fallback_permalink 
Fix fallback permalink when threads are disabled
 2022-02-02 16:06:34 +01:00
NIkita Fedrunov
10f7673be7 removed obsolete room list filter class 2022-02-02 15:53:20 +01:00
NIkita Fedrunov
440c5f7516 spaces restricted promo removed 2022-02-02 15:42:28 +01:00
NIkita Fedrunov
c64c204878 code quality changes 2022-02-02 15:19:48 +01:00
ganfra
1bf2523437 Merge branch 'develop' into feature/fga/message_bubbles 2022-02-02 13:01:43 +01:00
fedrunov
65fd5489a3
"Invite users to space" dialog now closed when user choose invite method (#5126) 2022-02-02 12:54:45 +01:00
ariskotsomitopoulos
36f0283d96 Fix fallback permalink when threads are disabled 2022-02-02 13:51:45 +02:00
Onuray Sahin
a131d28b3e Merge branch 'develop' into feature/ons/generic_location_pin 
* develop: (146 commits)
  exhaustive not needed anymore
  Invert if condition and split long line
  Use kotlin string builder
  Same issue but in the test
  Format
  Fix a crash: java.util.IllegalFormatPrecisionException https://github.com/matrix-org/element-android-rageshakes/issues/33398
  add changelog file for threads feature
  add changelog file for threads feature
  Formatting
  Improve hidden events for threads
  Add TODO for the next Weblate sync
  ktlint format
  PR remarks
  Fix a lint false positive? Anyway this was not used. Restricted API ../../../matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt:61: ListenableWorker.getTaskExecutor can only be called from within the same library group (referenced groupId=androidx.work from groupId=element-android)
  It seems that now lint rule `MissingQuantity` is an error and not a warning by default.
  Whitelist group 'org.webjars' on MavenCentral to fix lint execution
  Fix conflicts
  Formating & remove unused comments
  Fix error in unit test
  ktlint format
  ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
 2022-02-02 14:35:30 +03:00
Onuray Sahin
37d35c9a7f Support generic location pin. 2022-02-02 14:25:54 +03:00
Benoit Marty
ecf356f6eb
Merge pull request #5124 from vector-im/feature/bma/fix_timber_crash 
Fix timber crash
 2022-02-02 12:25:30 +01:00
Benoit Marty
407e065b90
Merge pull request #5041 from vector-im/feature/nfe/qr_scanner_fragments_merge 
qr scanner fragments merged into one
 2022-02-02 12:24:28 +01:00
Benoit Marty
10841ab0a1 exhaustive not needed anymore 2022-02-02 12:24:02 +01:00
Benoit Marty
54fb28c912
Merge pull request #5089 from vector-im/feature/dla/fix_incorrect_call_status 
CallTileTimelineItem.CallStatus.MISSED renders both missed and reject…
 2022-02-02 12:06:11 +01:00
Benoit Marty
a78d88fc0a Invert if condition and split long line 2022-02-02 12:03:38 +01:00
Benoit Marty
1a8c31f926 Inject the context to simplify the API 
And more cleanup
 2022-02-02 11:38:09 +01:00
Benoit Marty
4893429d73 Remove usage of MatrixCallback 2022-02-02 11:38:09 +01:00
NIkita Fedrunov
9dccc398b4 space and room card layout changed in explore rooms, space invite dialog, room invite dialog 2022-02-02 10:45:43 +01:00
Benoit Marty
cd16d3f19b Same issue but in the test 2022-02-02 10:42:39 +01:00
ganfra
cfda76b2d4 Timeline: avoid overflow on getViewType 2022-02-01 20:31:09 +01:00
ganfra
50810065a2 Bubbles: update media sizing (including LocationItem) 2022-02-01 20:19:35 +01:00
Aris Kotsomitopoulos
3d5f8ed7e7
Merge pull request #4746 from vector-im/feature/aris/threads 
Threads P0 Release
 2022-02-01 15:58:32 +02:00
ariskotsomitopoulos
ed992ddc72 Formatting 2022-02-01 14:40:00 +02:00
ariskotsomitopoulos
877c9bec97 Improve hidden events for threads 2022-02-01 14:07:16 +02:00
Benoit Marty
8db5b76676 Add TODO for the next Weblate sync 2022-02-01 11:41:59 +01:00
ariskotsomitopoulos
cfa52d83b4 ktlint format 2022-02-01 12:16:52 +02:00
ariskotsomitopoulos
fcc095a239 PR remarks 2022-02-01 12:13:10 +02:00
ganfra
825c2ca989 Merge branch 'develop' into feature/fga/message_bubbles 2022-02-01 10:05:51 +01:00
ganfra
38f1bbdab2 RTL: better support for some TextViews 2022-01-31 19:20:00 +01:00
ganfra
820bc644b6 Bubble: introduce CornersRadius 2022-01-31 19:18:42 +01:00
ariskotsomitopoulos
15fe9edfbd Fix conflicts 2022-01-31 16:21:46 +02:00
Adam Brown
986d9f92e9
Merge pull request #5009 from vector-im/feature/adm/storing-use-case 
Storing and tracking the onboarding messaging use case
 2022-01-31 14:15:39 +00:00
ariskotsomitopoulos
d509b3324c Merge branch 'develop' into feature/aris/threads 2022-01-31 15:58:12 +02:00
Benoit Marty
91e444ca73
Merge pull request #5084 from vector-im/feature/bma/location_crash 
Fix location crash
 2022-01-31 14:42:53 +01:00
ariskotsomitopoulos
f07c23fdda Formating & remove unused comments 2022-01-31 14:52:09 +02:00
ariskotsomitopoulos
ec9b6aa993 Fix error in unit test 2022-01-31 14:50:57 +02:00
Onuray Sahin
b3288c5acc Fix translation errors. 2022-01-31 15:49:18 +03:00
Onuray Sahin
a584cb876b Fix translation errors. 2022-01-31 15:26:54 +03:00
Adam Brown
9119cf059f adding extra logging around the push rules to help determine if we're incorrectly filter out valid notifications 2022-01-31 12:06:21 +00:00
ariskotsomitopoulos
26eaa843b3 ktlint format 2022-01-31 13:56:17 +02:00
ariskotsomitopoulos
14e56b8f7d MessageComposerViewModel format 2022-01-31 13:53:49 +02:00
Benoit Marty
8ee23c1e6a Merge branch 'develop' into feature/bma/location_crash 2022-01-31 12:49:17 +01:00
Benoit Marty
ecd41d3826 network "not live" lcoation can be more accurate than GPS "not live" location. So do not ignore them. Not sure how if this is a universal rule... 2022-01-31 12:47:17 +01:00
ariskotsomitopoulos
d91f3d2de6 Enhance SlashCommandNotSupportedInThreads 2022-01-31 13:42:20 +02:00
ariskotsomitopoulos
cb3501ea17 Lazy load notSupportedThreadsCommands to improve performance 2022-01-31 13:08:15 +02:00
ariskotsomitopoulos
5ff5f762d4 Revert the use of coerceIn 2022-01-31 12:24:28 +02:00
ariskotsomitopoulos
32a982c287 Improve coerceIn format 2022-01-31 12:19:12 +02:00
Benoit Marty
14c4233cdc Fix some typos 2022-01-31 11:01:29 +01:00
ariskotsomitopoulos
cdd36ce034 Fix IndexOutOfBound crashes while clicking permalinks 2022-01-31 11:56:26 +02:00
Weblate
45360e8d18 Merge branch 'origin/develop' into Weblate. 2022-01-31 08:46:22 +00:00
Weblate
da7edde0a2 Merge branch 'origin/develop' into Weblate. 2022-01-31 08:41:51 +00:00
Jozef Gaal
6564146e91 Translated using Weblate (Slovak) 
Currently translated at 72.6% (1999 of 2752 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sk/
 2022-01-31 08:41:44 +00:00
bmarty
b2bc92eebb Sync analytics plan 2022-01-31 00:02:22 +00:00
Hasan
ed21744402 Translated using Weblate (Turkish) 
Currently translated at 64.0% (1763 of 2752 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/tr/
 2022-01-29 09:26:29 +00:00
Szimszon
c3b4e4f2f9 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2752 of 2752 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/hu/
 2022-01-29 09:26:17 +00:00
Paragoumba
45c0761b74 Translated using Weblate (French) 
Currently translated at 100.0% (2752 of 2752 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2022-01-29 09:26:14 +00:00
libexus
fee155ba1e Translated using Weblate (German) 
Currently translated at 99.6% (2741 of 2752 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2022-01-29 09:26:14 +00:00
Benoit Marty
2fbb434099 Format 2022-01-29 08:52:20 +01:00
Benoit Marty
a8c251f6f5 Avoid taking into account any provider location if we have gps location. 2022-01-29 08:51:30 +01:00
Benoit Marty
99f82d9691 Avoid taking into account network location if we have gps location. 2022-01-29 08:34:20 +01:00
Benoit Marty
303a858423 Create an extension, improve the parsing algorithm, add robustness and unit test it 2022-01-29 08:13:11 +01:00
Benoit Marty
83ed80e6d8 Rename fun for clarity 2022-01-29 07:40:41 +01:00
Benoit Marty
b14e557c36 Use the existing item click mechanism 2022-01-29 07:39:55 +01:00
Benoit Marty
2ce3894562 Create a UrlMapProvider for a better handling of RTL languages, and build the URLs in the controllers 2022-01-28 22:46:58 +01:00
ganfra
fd99d6d7d8 Bubbles: start fixing RTL 2022-01-28 19:53:07 +01:00
Benoit Marty
eff6942f82 Use a MaterialCarView 2022-01-28 18:56:09 +01:00
Benoit Marty
e0ac8ee8b8 No need for an extra FrameLayout 2022-01-28 18:53:30 +01:00
Benoit Marty
0dce0342b3
Merge pull request #5093 from vector-im/feature/adm/test-code-quality-warnings 
UI test clean ups
 2022-01-28 18:49:03 +01:00
Onuray Sahin
2dc52da30c Use static map image in bottom sheet. 2022-01-28 20:48:53 +03:00
ganfra
c425701c20 Bubbles: handle ripple effect 2022-01-28 17:55:32 +01:00
Onuray Sahin
50279e3183 Use static map image in timeline. 2022-01-28 18:51:28 +03:00
ganfra
35674ad401 Bubbles: handle location sharing (need updates) 2022-01-28 15:10:13 +01:00
ganfra
b79a5fd4f4 Bubble: move overlay view to MessageBubbleView (and fix corner radius) 2022-01-28 15:09:43 +01:00
Adam Brown
f66bd4ffe9 waiting for the emoji to become visible instead of a hardcoded sleep 2022-01-28 13:20:56 +00:00
Adam Brown
d6f0e065aa fixing missing when branches warning 2022-01-28 12:49:28 +00:00
Adam Brown
0c2116a95d using espresso long click instead of barista helper and waiting for reaction before interacting 
- the non barista long pressing works for the menu opening, maybe this will fix the CI
 2022-01-28 12:48:26 +00:00
Onuray Sahin
4026ddb34f Fix multiple pin rendering. 2022-01-28 15:07:51 +03:00
Adam Brown
22b64a3e9a resetting text futures when updating recycled text 2022-01-28 12:05:12 +00:00
Onuray Sahin
0f8c3bcc17 Try to get location by using all available providers. 2022-01-28 14:17:07 +03:00
NIkita Fedrunov
f56991f077 code review and lint fixes 2022-01-28 11:02:10 +01:00
David Langley
235f2c78f8
Merge pull request #5083 from vector-im/feature/dla/hold_call_for_transfer_selection 
Hold call for transfer selection
 2022-01-28 09:14:26 +00:00
David Langley
e9ae76da9c CallTileTimelineItem.CallStatus.MISSED renders both missed and rejected calls. Logic should be !answered. 2022-01-28 08:57:19 +00:00
Benoit Marty
26c0fee56d Add a loader waiting for the user location to be known 2022-01-27 22:27:43 +01:00
Benoit Marty
55ed7373f5 Rework the location code - WIP 2022-01-27 22:20:53 +01:00
Benoit Marty
1f53945031 Rework the location code - WIP 2022-01-27 22:10:19 +01:00
Benoit Marty
e9b9406bf1 Rework the location code - WIP 2022-01-27 21:11:31 +01:00
ganfra
c14eb050b1 Merge branch 'develop' into feature/fga/message_bubbles 2022-01-27 18:59:10 +01:00
ganfra
ed9adf8367 Bubbles: fix paddings 2022-01-27 18:18:39 +01:00
ganfra
881b063d45 Bubbles: remove emote from bubble (keep right/left alignment) 2022-01-27 18:18:29 +01:00
ganfra
4de421d663 Timeline html rendering: better reply and pill 2022-01-27 18:17:56 +01:00
ganfra
a9fe21e583 Timeline html rendering: handle code tags 2022-01-27 18:17:23 +01:00
ariskotsomitopoulos
78dfac52a7 ktlint format 2022-01-27 18:39:43 +02:00
ariskotsomitopoulos
bac6d271ca Merge develop into this branch 2022-01-27 18:13:05 +02:00
Benoit Marty
e3242f0deb Prevent the dialog from being cancellable, since OK button finish the Activity. 2022-01-27 16:40:49 +01:00
David Langley
f449b99548 lint 2022-01-27 15:24:39 +00:00
Benoit Marty
db3f60b4b1 Inform the user when the location provider is disabled. 2022-01-27 16:23:39 +01:00
David Langley
3ecc73b42a remove line break 2022-01-27 15:19:08 +00:00
Benoit Marty
7242f1c2f1 Fix a crash when disabling the location on the device 
`LocationListener` does not have default implementation for some methods for Android versions below R
 2022-01-27 16:18:40 +01:00
David Langley
79b11623b5 Call transfer should put other side on hold while the transfer is being selected and unhold when the user cancels selection. 2022-01-27 15:16:46 +00:00
ariskotsomitopoulos
b2a2fe2710 Merge branch 'develop' into feature/aris/threads 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt
#	tools/check/forbidden_strings_in_code.txt
#	vector/build.gradle
#	vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
#	vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
#	vector/src/main/java/im/vector/app/features/command/Command.kt
#	vector/src/main/java/im/vector/app/features/command/CommandParser.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultItem.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/factory/MessageItemFactory.kt
#	vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
#	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
#	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
#	vector/src/main/res/layout/fragment_timeline.xml
#	vector/src/main/res/xml/vector_settings_labs.xml
 2022-01-27 17:11:26 +02:00
ariskotsomitopoulos
b83872d5f0 When show all threads developer mode option is enabled, prevent reply in thread to those events 2022-01-27 16:38:14 +02:00