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

24929 Commits

Author SHA1 Message Date
networkException 7fff7a453d
Enable free style cropping for camera and gallery images 
This feature was disabled in 3ac2296464.

Resolves #2356

Signed-off-by: networkException <git@nwex.de>
 2023-04-11 22:47:04 +02:00
SpiritCroc 9e0ec534d5 [merge] More appropriate pill size for downstream text size 
https://developer.android.com/reference/com/google/android/material/chip/ChipDrawable

Change-Id: Ib21bb1426547c8a49f55e2ecd836f83d9dfe1654
 2023-04-11 17:27:21 +02:00
dependabot[bot] 7f42eb3fb6
Bump peter-evans/create-pull-request from 4 to 5 (#8322) 2023-04-11 10:07:31 +00:00
valere 26a640846e Merge branch 'develop' into feature/bca/rust_flavor 2023-04-11 10:26:36 +02:00
Jorge Martin Espinosa 64508cd2d9
Merge pull request #8311 from vector-im/dependabot/gradle/fragment-1.6.0-alpha09 
Bump fragment from 1.6.0-alpha08 to 1.6.0-alpha09
 2023-04-10 09:09:00 +02:00
valere 70508544cd fix warning equals but no hashcode 2023-04-07 14:09:56 +02:00
valere 4ecbf87cda unused flow 2023-04-07 14:09:25 +02:00
SpiritCroc 89750f74a4 Ensure unique IDs across all emoji autocompletion types 
Change-Id: I522eaf4fb8af214ff9b6a0ac744093cbe6b8b6e4
 2023-04-07 12:40:46 +02:00
SpiritCroc cb593ebb14 Move standard emojis to top of autocompletion 
Now that we can limit emojis per category while allowing to expand them,
makes sense to show standard emojis on top, above custom emotes,
especially when users have lots of emotes.

Change-Id: I822cc091bf595795fa08fef32f0737073a43163a
 2023-04-07 12:38:10 +02:00
valere 1b12db9270 Test framework cleaning 2023-04-07 11:34:27 +02:00
Benoit Marty e5657a6f23
Merge pull request #8315 from vector-im/dependabot/gradle/flipper-0.189.0 
Bump flipper from 0.188.0 to 0.189.0
 2023-04-07 11:19:10 +02:00
SpiritCroc 07a0d315f5 Merge remote-tracking branch 'origin/sc_beta' into sc 
Change-Id: I61bf897abe30e5763047852bdc4128f6df3a1660
 2023-04-07 11:09:14 +02:00
dependabot[bot] 0ec7e7dc34
Bump flipper from 0.188.0 to 0.189.0 
Bumps `flipper` from 0.188.0 to 0.189.0.

Updates `com.facebook.flipper:flipper` from 0.188.0 to 0.189.0
- [Release notes](https://github.com/facebook/flipper/releases)
- [Commits](https://github.com/facebook/flipper/compare/v0.188.0...v0.189.0)

Updates `com.facebook.flipper:flipper-network-plugin` from 0.188.0 to 0.189.0
- [Release notes](https://github.com/facebook/flipper/releases)
- [Commits](https://github.com/facebook/flipper/compare/v0.188.0...v0.189.0)

---
updated-dependencies:
- dependency-name: com.facebook.flipper:flipper
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.facebook.flipper:flipper-network-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-07 00:09:19 +00:00
Linerly ec54ab3d43 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (173 of 173 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/id/
 2023-04-06 17:01:29 +00:00
waclaw66 456a54e192 Translated using Weblate (Czech) 
Currently translated at 100.0% (173 of 173 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/cs/
 2023-04-06 17:01:28 +00:00
valere 89267256ef Fix use if internal API 2023-04-06 16:55:45 +02:00
valere e554ecc030 fix flackiness source 2023-04-06 13:39:38 +02:00
dependabot[bot] eef5ef7d2d
Bump androidx.core:core-ktx from 1.9.0 to 1.10.0 (#8312) 
Bumps androidx.core:core-ktx from 1.9.0 to 1.10.0.

---
updated-dependencies:
- dependency-name: androidx.core:core-ktx
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-06 09:50:00 +00:00
valere ee1580c50e Fix failing test 2023-04-06 09:59:00 +02:00
valere 2077d972bc Fix test deadlock with await latch 2023-04-06 09:58:45 +02:00
valere 3e1b59d062 Merge branch 'develop' into feature/bca/rust_flavor 2023-04-06 08:53:20 +02:00
Florian Renaud 9490ddf53f
Merge pull request #8301 from vector-im/dependabot/gradle/org.checkerframework-checker-3.33.0 
Bump org.checkerframework:checker from 3.32.0 to 3.33.0
 2023-04-06 08:48:32 +02:00
Florian Renaud 10216c70cf
Merge pull request #8291 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.13.9 
Bump com.googlecode.libphonenumber:libphonenumber from 8.13.8 to 8.13.9
 2023-04-06 08:47:43 +02:00
dependabot[bot] ba83e1bbd6
Bump fragment from 1.6.0-alpha08 to 1.6.0-alpha09 
Bumps `fragment` from 1.6.0-alpha08 to 1.6.0-alpha09.

Updates `androidx.fragment:fragment-ktx` from 1.6.0-alpha08 to 1.6.0-alpha09

Updates `androidx.fragment:fragment-testing` from 1.6.0-alpha08 to 1.6.0-alpha09

Updates `androidx.fragment:fragment-testing-manifest` from 1.6.0-alpha08 to 1.6.0-alpha09

---
updated-dependencies:
- dependency-name: androidx.fragment:fragment-ktx
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: androidx.fragment:fragment-testing
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: androidx.fragment:fragment-testing-manifest
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-05 23:57:37 +00:00
valere 17c41fca88 async backup throws now 2023-04-05 19:27:56 +02:00
Florian Renaud 867356f7cb
Merge pull request #8262 from vector-im/dependabot/gradle/androidx.work-work-runtime-ktx-2.8.1 
Bump androidx.work:work-runtime-ktx from 2.8.0 to 2.8.1
 2023-04-05 18:02:51 +02:00
Florian Renaud 90160a9681
Merge pull request #8304 from vector-im/dependabot/gradle/com.gabrielittner.threetenbp-lazythreetenbp-0.16.0 
Bump com.gabrielittner.threetenbp:lazythreetenbp from 0.14.0 to 0.16.0
 2023-04-05 18:01:58 +02:00
valere 1b57770955 put back retry rule, flackiness 2023-04-05 17:58:56 +02:00
Benoit Marty 673c59b3f8
Merge pull request #8310 from vector-im/feature/fga/fix_multiple_read_receipts 
Fix multiple read receipts for the same user in timeline #7882
 2023-04-05 17:56:11 +02:00
Benoit Marty ac65934454
Merge pull request #8298 from vector-im/sync-emojis 
Sync Emojis
 2023-04-05 17:55:38 +02:00
valere a5a95995e1 test flakiness 2023-04-05 16:37:36 +02:00
valere d023d9df7d fix sas test 2023-04-05 15:12:59 +02:00
SpiritCroc 5ea7f03e25 Fix FooteredTextView measurements for overlong pill spans 
Together with https://github.com/vector-im/element-android/pull/8260,
fixes https://github.com/SchildiChat/SchildiChat-android/issues/28

Change-Id: I3c11d1ec89383330fedb4a958d70e89047915024
 2023-04-05 15:03:28 +02:00
ganfra fe69d8e3fa Fix multiple read receipts for the same user in timeline #7882 2023-04-05 13:08:12 +02:00
valere b45b90dcdf Fix verification bottomsheet not updating 2023-04-05 12:12:40 +02:00
SpiritCroc ea2a0e2193 Automatic SchildiChat string correction 
Change-Id: Id3c60521d8640b6253bf8b4e788147b381357bcc
 2023-04-05 11:37:42 +02:00
SpiritCroc 6db0a52db4 Automatic upstream merge postprocessing 
Change-Id: I6864bdf70ee6c5039e10c742fdbb9947f5a79ebb
 2023-04-05 11:37:41 +02:00
SpiritCroc 965ba93de4 Merge tag 'v1.5.30' into sc 
Version 1.5.30

Change-Id: I732e9fe05182e53968eab1d03f99dabdc148fed9

Conflicts:
	dependencies.gradle
	dependencies_groups.gradle
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailAction.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsUrls.kt
	vector/src/main/res/drawable/ic_composer_rich_text_save.xml
 2023-04-05 11:28:26 +02:00
SpiritCroc 4c771bde7f [TMP] Automatic upstream merge preparation 
Change-Id: Iaeede6c1ba4afc5f3481582fe52fd20bfb67421d
 2023-04-05 11:17:40 +02:00
SpiritCroc 877d65a8c8 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Ifbb9c4cdf4e4d86ee2b72b7c4ca4e5216aa0840c
 2023-04-05 11:17:40 +02:00
SpiritCroc 2756877d5b Revert "[TMP] Get widgets / stickers working again" 
This reverts commit c47b9ee64d.
 2023-04-05 11:15:39 +02:00
SpiritCroc 1e3b77824e Fix crash caused by empty span when removing leading newlines 
Change-Id: I9045bf1314b15d3672d1837bca29fa4af4c0fdbd
 2023-04-05 10:25:10 +02:00
SpiritCroc 16afd70294 tmp_icon.sh: Script to quickly try out new launcher icons 
People suggest new icons in png formats, and I'm tired of searching this
scripts, so let's push it to main

Change-Id: Ie3cb2f7f82383c60188ae8499ad64b61264435d8
 2023-04-05 10:19:32 +02:00
Jorge Martín c6e612c058 version++ 2023-04-05 10:18:30 +02:00
Jorge Martín 9e45a31d8f Merge branch 'release/1.5.30' into develop 2023-04-05 10:17:45 +02:00
Jorge Martín 0b09a51bb2 Merge branch 'release/1.5.30' 2023-04-05 10:17:33 +02:00
Jorge Martín 76cea42d4b Adding fastlane file for version 1.5.30 2023-04-05 09:40:08 +02:00
Jorge Martín b61a184297 Changelog for version 1.5.30 2023-04-05 09:38:41 +02:00
valere b704b64255 Fix backup tests 2023-04-05 09:15:07 +02:00
dependabot[bot] be80b46327
Bump flipper from 0.187.0 to 0.188.0 (#8303) 2023-04-04 15:38:11 +00:00