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

130 Commits

Author SHA1 Message Date
ganfra 04234318e5 Bubble: get LayoutDirection (RTL) from current Locale 2022-02-03 17:53:25 +01:00
ganfra 2e2da16a6b Bubbles: merge develop 2022-02-03 17:10:13 +01:00
Adam Brown ba86834c6b removing forced san fontFamily, fixes other weights being ignored 2022-02-02 16:58:19 +00:00
ganfra 1bf2523437 Merge branch 'develop' into feature/fga/message_bubbles 2022-02-02 13:01:43 +01:00
ganfra 825c2ca989 Merge branch 'develop' into feature/fga/message_bubbles 2022-02-01 10:05:51 +01:00
ariskotsomitopoulos d509b3324c Merge branch 'develop' into feature/aris/threads 2022-01-31 15:58:12 +02: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 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
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
ganfra 608d8a5d54 Bubbles: change colors 2022-01-24 19:31:04 +01:00
ganfra 8c4dff4db9 Bubbles: change again url preview 2022-01-21 16:00:58 +01:00
fedrunov f7aedff418
toolbar management (#4887) 
Toolbar management rework and toolbar style alignment
 2022-01-21 13:38:27 +01:00
Adam Brown 36a26fcfd0 replacing the dark carousel background with a solid colour as par design changes 2022-01-19 10:17:04 +00:00
dependabot[bot] 8d37dc5118
Bump json from 20190722 to 20211205 
Bumps [json](https://github.com/douglascrockford/JSON-java) from 20190722 to 20211205.
- [Release notes](https://github.com/douglascrockford/JSON-java/releases)
- [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md)
- [Commits](https://github.com/douglascrockford/JSON-java/commits)

---
updated-dependencies:
- dependency-name: org.json:json
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-18 23:08:02 +00:00
ganfra 5ee4984ec8 Bubbles: handle images and make small refactoring 2022-01-18 19:27:12 +01:00
Benoit Marty 2dfded7326 Remove comment 2022-01-18 14:42:32 +01:00
Benoit Marty a38a03c980 Use class from common module 2022-01-18 14:41:35 +01:00
Benoit Marty 1c42df7752 Move the file to the new module. 2022-01-18 14:39:02 +01:00
Benoit Marty ffad479dad Move the file to the new module. 2022-01-18 14:30:59 +01:00
Benoit Marty 194a584e4c Merge branch hotfix/1.3.15 2022-01-18 14:21:09 +01:00
Benoit Marty f0d5260be8 Fix unit test 2022-01-18 12:34:14 +01:00
Benoit Marty 2a7719cdf6 ktlint 2022-01-18 12:12:36 +01:00
Benoit Marty bdd30e3b8f Fix crash when viewing source which contains an emoji. 
Import source of jsonviewer as a module of this project.
 2022-01-18 12:04:06 +01:00
ariskotsomitopoulos 636474b748 Merge branch 'develop' into feature/aris/threads 
# Conflicts:
#	matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.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/composer/MessageComposerViewModel.kt
 2022-01-18 12:41:40 +02:00
ganfra 7ff8483592 Merge branch 'develop' into feature/fga/message_bubbles 2022-01-17 19:19:29 +01:00
ariskotsomitopoulos 81a1dfd66d PR Remarks 2022-01-17 17:28:40 +02:00
Adam Brown 256929b78f
Merge pull request #4880 from vector-im/feature/adm/carousel-images-update 
Updated splash carousel images and copy
 2022-01-17 15:11:08 +00:00
Adam Brown f4cacb2d16 applying percentage based heights to the carousel hero image and paddings 2022-01-17 09:24:53 +00:00
Adam Brown c0b855e7c7 adding non light mode carousel background which uses a vertical gradient 2022-01-17 09:24:53 +00:00
ganfra 1108ef9fbe Bubbles: make it works for file, voice and polls. Also add parity for "modern" layout. 2022-01-14 19:19:23 +01:00
Benoit Marty 9a42e1e8c3 Move this class to the correct folder 2022-01-13 20:32:59 +01:00
Benoit Marty b8aaa177c2 Add a module library/core-utils as a base module for all util tools 2022-01-13 20:28:50 +01:00
ganfra d06df45e85 Merge branch 'develop' into feature/fga/message_bubbles 2022-01-13 13:17:23 +01:00
ganfra b9cc795996 Bubbles : fix background colors 2022-01-13 12:33:36 +01:00
Adam Brown ce7a93bcae locking phones to portait during the ftue auth onboarding flow 
- uses a resource bucket flag for determining if the device is big enough to be considered a tablet and in turn, enable a landscape experience
 2022-01-11 17:28:29 +00:00
ariskotsomitopoulos 3bd21d04d8 Merge branch 'develop' into feature/aris/threads 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
#	tools/check/forbidden_strings_in_code.txt
 2022-01-11 14:09:49 +02:00
ganfra f7c9b36cef Bubbles: continue exploration 2022-01-11 11:57:35 +01:00
Adam Brown bdb41b253d flipping the gradient ftue background for rtl locales, fixes the gradient starting from the wrong side 2022-01-07 14:44:21 +00:00
ariskotsomitopoulos 50e51cbe29 Merge branch 'develop' into feature/aris/threads 2022-01-07 16:36:48 +02:00
ariskotsomitopoulos ac5caccdf9 Merge branch 'develop' into feature/aris/threads 
# Conflicts:
#	matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
#	tools/check/forbidden_strings_in_code.txt
#	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
#	vector/src/main/res/menu/menu_timeline.xml
 2022-01-07 13:29:43 +02:00
Adam Brown 785a142720 moving the carousel backgrounds to the ui-styles module 2022-01-07 11:17:39 +00:00
Adam Brown 6929c947b0 adding gradient backgrounds to the carousel pages 
- also coverts the carousel pages to constraint layout and makes use of gutters to provide percentage based sizing
 2022-01-06 19:54:48 +00:00
Adam Brown a2f780bef4 adding carousel content, images are temporary 2022-01-06 19:54:48 +00:00
ganfra ad63d3de1c Bubbles: still R&D. Not sure how to handle every event types. 2022-01-06 19:07:28 +01:00
Adam Brown 9e9b779186 moving the debug icon to the main source set 
- the onboarding uses the icon and it can be displayed for developer mode users
 2022-01-06 10:03:13 +00:00
ganfra bde1df0322 Bubbles: continue R&D on UI 2022-01-05 11:00:12 +01:00
ganfra e540b26112 Merge develop into feature/fga/message_bubbles 2022-01-04 15:13:42 +01:00
Benoit Marty eb875823d5 Remove unused class and resource after new poll implementation 2022-01-04 13:02:17 +01:00
ariskotsomitopoulos 694b8de034 Merge branch 'develop' into feature/aris/threads 
# Conflicts:
#	library/ui-styles/src/main/res/values/dimens.xml
 2022-01-03 11:08:22 +02:00