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

215 Commits

Author SHA1 Message Date
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
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
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
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
Benoit Marty 90035de5f2
Merge pull request #6047 from chagai95/add-presence-indicator-busy-and-away 
add presence indicator busy and away
 2022-05-16 11:26:11 +02:00
Benoit Marty 4c95aafe10 Detekt: enable and fix EndOfSentenceFormat 2022-05-16 08:54:07 +02:00
chagai95 9f033ed623
add presence indicator busy and away 2022-05-13 13:55:10 +02:00
Benoit Marty c19563bed2 Detekt: fix UtilityClassWithPublicConstructor 2022-05-12 17:26:11 +02:00
ariskotsomitopoulos 40de685f1a 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
#	vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt
 2022-05-12 14:41:38 +03:00
Benoit Marty 04cadb94cf
Merge pull request #5987 from vector-im/dependabot/gradle/org.jetbrains.kotlin-kotlin-gradle-plugin-1.6.21 
Bump kotlin-gradle-plugin from 1.6.0 to 1.6.21
 2022-05-10 18:23:51 +02:00
Benoit Marty c04655cd36 Fix warning: w: '-Xopt-in' is deprecated and will be removed in a future release, please use -opt-in instead 2022-05-09 22:08:24 +02:00
Maxime NATUREL bbec3a7c2e Integration into location message item 2022-05-09 15:15:33 +02:00
Maxime NATUREL df1ba8ec88 Custom view for the banner 2022-05-09 15:15:33 +02:00
Benoit Marty e35ee03178 Try to workaround Dependabot issue #5961 2022-05-09 11:40:53 +02:00
Marcel 3f56dad1eb
Fixed dependabot 2022-05-06 18:23:58 +02:00
Benoit Marty 26edf79aa2 Fix detected issues 2022-05-05 15:04:43 +02:00
ariskotsomitopoulos c5fc1e579d Add badge in thread list filtering 2022-05-04 19:24:31 +03:00
ariskotsomitopoulos 4b746ee345 Reduce thread list menu icon size 2022-05-04 13:55:53 +03:00
Olivér Falvai 042ec3628f Extract text size to style 2022-04-28 19:02:48 +02:00
Eric Decanini c21ec983e8
Merge pull request #5805 from vector-im/task/eric/format-project 
Formats project with new code style
 2022-04-21 12:43:28 +02:00
Eric Decanini aebdee1070
Merge pull request #5652 from vector-im/bugfix/eric/sending-images-crashes 
Potentially fixes intermittent crashing from sending gallery images
 2022-04-21 11:54:59 +02:00
ericdecanini de899bbb18 Formats entire project 2022-04-21 11:50:15 +02:00
ericdecanini 6aa0be22c9 Makes MediaType internal 2022-04-21 10:42:08 +02:00
ericdecanini 0556a3d088 Makes MediaFileUtils function internal 2022-04-19 13:31:37 +02:00
ericdecanini b76ec78c5d Fixes build error in CameraVideoPicker 2022-04-14 11:46:59 +02:00
ericdecanini da843443ef Convert MediaFileUtils to a non-object 2022-04-14 11:28:14 +02:00
Adam Brown 1f6068976d updating terms ids and applying design specified colours to the checkbox 2022-04-13 14:50:11 +01:00
ericdecanini 8b66034af5 Adds mkdirs fix to CameraPicker and CameraVideoPicker 2022-04-13 15:16:34 +02:00
Benoit Marty 23d2a290ab Global import optimization 2022-04-12 16:06:27 +02:00
Benoit Marty fac317d122
Merge pull request #5647 from vector-im/feature/aris/threads_beta_feedback 
Feature/aris/threads beta feedback
 2022-04-05 17:25:29 +02:00
Benoit Marty ca418afcbb
Merge pull request #5614 from vector-im/feature/aris/threads_ui_enhancements 
Feature/aris/threads UI enhancements
 2022-04-05 17:21:53 +02:00
Maxime NATUREL bebe819c54
Merge pull request #5671 from vector-im/feature/mna/PSF-673-live-loc-share-duration 
#5667: [Location Sharing] - Set duration of live sharing
 2022-04-05 16:13:26 +02:00
ariskotsomitopoulos 6e06aed627 Merge branch 'develop' into feature/aris/threads_ui_enhancements 
# Conflicts:
#	vector/src/main/res/menu/menu_timeline.xml
 2022-04-05 16:32:49 +03:00
Adam Brown 7e5c3df7a7 adding combined server selection/sign up fragment 2022-03-31 17:50:20 +01:00
Maxime NATUREL 265dd4a0c3 Using resource dimensions for margins 2022-03-31 14:44:40 +02:00
ariskotsomitopoulos 58cc3931b9 Add beta feedback for threads 2022-03-28 13:53:44 +03:00
Onuray Sahin c478503c13 Merge branch 'develop' into feature/ons/voice_message_scrubbing 
* develop: (429 commits)
  fixing the onboarding sanity test failing - adds tapping the new take me home button within the sanity test
  Fix lint issues on weblate sync
  fixing view model tests not collecting flow results - the switch from runBlockingTest to runTest means we need to provide a separate scope from the test in order to asynchronously collect the flow results
  Do not suggest collapse if there is only one section
  Translated using Weblate (Spanish)
  Translated using Weblate (Spanish)
  runBlocking -> runTest https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md
  runBlockingTest -> runTest https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md
  Small cleanup
  The `.exhaustive` trick is not needed anymore in Kotlin 1.6.0 https://kotlinlang.org/docs/whatsnew16.html#stable-exhaustive-when-statements-for-enum-sealed-and-boolean-subjects
  Also upgrade the coroutine lib
  Fix compilation warning (exhaustive when)
  Fix compilation warning (exhaustive when)
  Format file (no other change)
  Fix compilation warning (exhaustive when)
  Bump moshi from 1.12.0 to 1.13.0
  Bump kotlin-gradle-plugin from 1.5.31 to 1.6.0
  fixing presence icon anchoring to the middle of the room icon - creates a secondary verification shield and aligns to the start of the room title when presence is present
  PR remarks
  Increase the thread summaries limit
  ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/VoiceMessageRecorderView.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageVoiceItem.kt
 2022-03-23 13:32:36 +03:00
Benoit Marty ed62a2f1c9 Format file (no other change) 2022-03-22 16:13:06 +01:00
Benoit Marty f07c9bf105 Fix compilation warning (exhaustive when) 2022-03-22 16:13:06 +01:00
ariskotsomitopoulos 3c6dbd0843 Reduce timeline menu thread icon padding 2022-03-22 12:55:50 +02:00
dependabot[bot] c2e3c63100
Bump json from 20211205 to 20220320 
Bumps [json](https://github.com/douglascrockford/JSON-java) from 20211205 to 20220320.
- [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-03-21 23:09:06 +00:00
Benoit Marty 579e6164d6
Merge pull request #5550 from vector-im/feature/adm/presence-theme-patch 
Presence indicator theme attribute
 2022-03-21 15:45:36 +01:00
Maxime Naturel 840a224c9f Fixing coding style issue 2022-03-18 15:01:44 +01:00