filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
18,060 Commits 6 Branches 120 Tags 228 MiB
Commit Graph

261 Commits

Author SHA1 Message Date
Maxime NATUREL 6972622bc6 Handling map loading error in timeline 2022-08-04 16:58:28 +02:00
Eric Decanini e2ed4b4ae1
Merge pull request #6655 from vector-im/feature/eric/app-layout-toolbar 
New App Layout Toolbar
 2022-08-02 17:44:53 +02:00
Maxime NATUREL c616229d53 Missing renaming of stylable file 2022-08-02 09:09:19 +02:00
Maxime NATUREL be696f5a5c Align naming of components for the live location feature 2022-08-02 09:09:19 +02:00
ericdecanini 7334d909d5 Adds options menu 2022-07-26 16:00:46 +02:00
ericdecanini 5958559186 Styles collapsed title text 2022-07-26 14:31:02 +02:00
ericdecanini 3df337fa07 Adds new layout toolbar 2022-07-26 12:38:29 +02:00
Maxime NATUREL e1ea10e0a2 Adding attribute to set the start margin of icon 2022-07-25 14:17:07 +02:00
Maxime NATUREL 5e59eb474a Adding attribute to control alpha of the banner background 2022-07-25 10:36:28 +02:00
Maxime NATUREL 6b403ec224
Merge pull request #6542 from vector-im/feature/mna/lls-standardise-stop-text 
[Location Share] - Standardise "Stop" texts for live (PSG-622)
 2022-07-18 10:43:43 +02:00
Nikita Fedrunov 79762d9133
font scale setting screen (#6453) 2022-07-18 09:49:57 +02:00
Maxime NATUREL cda100e596 Using same string key for stop + fix insets in button styles 2022-07-18 09:43:33 +02:00
Benoit Marty e3b3617b1a Add dependency to opusencoder and remove module from this project 2022-07-06 17:54:57 +02:00
Benoit Marty 7616912411
Merge pull request #6436 from vector-im/feature/bma/activity_fragment_1_5_0 
Upgrade androidx activity and fragment to 1.5.0
 2022-07-06 11:44:22 +02:00
Cadence Ember b8734a23a9 Gallery picker can pick external images 2022-07-04 16:42:43 +12:00
Benoit Marty aae6e20f9c Migration to activity 1.5.0. Rework menu management 2022-07-01 17:06:02 +02:00
Adam Brown 72c4af0026
Merge pull request #6263 from vector-im/feature/adm/ftue-forgot-password 
[FTUE] Forgot password
 2022-06-30 15:40:09 +01:00
Adam Brown c603b780cf extracting common breaker background selection to ftue extensions 2022-06-29 17:47:28 +01:00
Adam Brown d2fbe26182 removing no longer needed butterknife dependency 2022-06-29 17:22:57 +01:00
Adam Brown 33ca5753f1 replacing epoxy item annotation layout references with getDefaultLayoutId override 2022-06-29 17:21:05 +01:00
Benoit Marty 29d4916a2e
Cleanup of #5187 (#6326) 
Update design and behaviour on widget permission bottom sheet
 2022-06-22 15:04:02 +02:00
Jorge Martín b5aedd4626 Re-implement lock screen feature using our own implementation. 2022-06-20 17:38:05 +02:00
Jorge Martín 2fbec133b6 Address review comments, fix quality check issues. 2022-06-15 11:34:23 +02:00
Jorge Martín 155842f8bc Add some doc comments 2022-06-15 11:34:23 +02:00
Jorge Martín fa2d9e90ed Fix copyright in C++ files 2022-06-15 11:34:23 +02:00
Jorge Martín 6fc278eb2b Replace ffmpeg-kit with libopus and libopusenc. 2022-06-15 11:34:23 +02:00
Benoit Marty 990a6832bd
Merge pull request #6247 from vector-im/feature/ons/fix_static_map_copyright_size 
Fix copyright attributions of map views [PSF-1058] - [PSF-1072]
 2022-06-10 13:56:24 +02:00
Onuray Sahin b455bf04aa Create new styles for map view copyright text. 2022-06-07 15:07:41 +03:00
ericdecanini 5cc7deea4e Merge remote-tracking branch 'origin/develop' into task/eric/when-arrow-alignment 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/worker/MatrixWorkerFactory.kt
#	vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt
#	vector/src/main/java/im/vector/app/core/utils/TextUtils.kt
#	vector/src/main/java/im/vector/app/features/crypto/recover/BootstrapSharedViewModel.kt
#	vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheetViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
#	vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.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/timeline/factory/LiveLocationShareMessageItemFactory.kt
#	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
#	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
#	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
#	vector/src/main/java/im/vector/app/features/onboarding/OnboardingViewModel.kt
#	vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
 2022-06-03 12:06:23 +02:00
ericdecanini e6e05317e1 Merge remote-tracking branch 'origin/develop' into task/eric/code-style-parenthesis 
# Conflicts:
#	matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/keysbackup/DefaultKeysBackupService.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/DefaultRoomService.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
#	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
#	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
 2022-05-31 14:21:16 +02:00
Onuray Sahin 4ccd242cbf
Merge pull request #6170 from vector-im/feature/ons/live_location_bottom_sheet 
Live Location Sharing - User List Bottom Sheet [PSF-890]
 2022-05-30 21:07:25 +03:00
Onuray Sahin 453aa28380 Add required resources. 2022-05-27 15:25:59 +03:00
Olivér Falvai 9ce9ad6d3a Merge remote-tracking branch 'origin/develop' into dependency-cleanup 2022-05-26 14:04:39 +02:00
ericdecanini 8647400dda Merge remote-tracking branch 'origin/develop' into task/eric/code-style-parenthesis 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/MXOlmDevice.kt
 2022-05-25 17:35:31 +02:00
Benoit Marty fd252dbaff
Merge pull request #5856 from ofalvai/bugfix/ofa/read-recept-text-scale 
Use fixed text size in read receipt counter
 2022-05-23 13:41:03 +02:00
ericdecanini b3fdb5ed17 Changes code style when arrow alignment 2022-05-23 12:57:57 +02:00
ericdecanini 3f3662e605 Changes code style method parameters new line around parentheses to true 2022-05-23 12:30:42 +02:00
Adam Brown 8a53eafa72 adding gradient background to the waiting for verification screen, matching designs 
- renames drawable which redirects to the attribute colorBackground
 2022-05-20 12:11:44 +01:00
Olivér Falvai f036d35829 Merge branch 'develop' into dependency-cleanup 2022-05-19 12:27:09 +02:00
Benoit Marty 38641c88b7 Fix usage of System.currentTimeMillis(). 
This a bit mocky but anyway it's better to use SystemClock.elapsedRealtime() for this case.
 2022-05-18 20:51:41 +02:00
Benoit Marty 12644e9915
Merge pull request #5947 from vector-im/feature/bma/renaming 
Small changes
 2022-05-18 16:27:48 +02:00
Maxime NATUREL 738ce18a2f
Merge pull request #5989 from vector-im/feature/mna/PSF-884-location-view 
[Location sharing] - Message for live sharing in timeline (PSF-884)
 2022-05-18 15:39:51 +02:00
Olivér Falvai 388e35e828 Remove even more deps 2022-05-18 14:19:11 +02:00
Olivér Falvai 2dcc120cf7 Merge remote-tracking branch 'origin/develop' into dependency-cleanup 
# Conflicts:
#	build.gradle
#	dependencies.gradle
 2022-05-18 11:47:21 +02:00
Benoit Marty 57ae714cbe
Merge pull request #6072 from vector-im/feature/bma/fix_typing 
Feature/bma/fix typing
 2022-05-17 15:34:15 +02:00
Benoit Marty 2e189a1ab0 Fix typing rendering #6063 2022-05-17 11:53:44 +02:00
ariskotsomitopoulos 324856d700 Merge branch 'develop' into feature/aris/threads_post_release_ui_improvements 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
 2022-05-17 11:55:07 +03:00
Benoit Marty afd2804ed3
Merge branch 'develop' into feature/mna/PSF-884-location-view 2022-05-16 14:42:38 +02:00
Benoit Marty 12eb23b198
Merge branch 'develop' into feature/bma/detekt_end_period 2022-05-16 13:14:37 +02:00
ariskotsomitopoulos 72a945ac13 PR remarks 2022-05-16 13:32:30 +03:00